Review merger of Project and Location extensions

- Merge reference.md content into schema.
- Copy-edit Project and Location subschema.
- Copy-edit Location codelists. Remove normative word imported from RFC 7946.
- Use classification scheme example that conforms to guidance.
- Use "datasets" not "data sets" per style guide.

docs/examples/release_schema_reference/release_package.json

@@ -112,7 +112,7 @@
             {
               "id": "03.04.05",
               "description": "Cycle lanes for road transport.",
-              "scheme": "My local scheme"
+              "scheme": "GB-EXAMPLE"
             }
           ],
           "locations": [

docs/guidance/map/linked_standards.md

@@ -8,7 +8,7 @@ The [Open Contracting for Infrastructure Data Standards](https://standard.open-c
 
 A joint effort by the [Infrastructure Transparency Initiative](https://infrastructuretransparency.org) (CoST) and the Open Contracting Partnership, it builds on best practice in open data and openness of public infrastructure procurement globally.
 
-OCDS and OC4IDS data sets ought to be linked using the `planning.project` field, referencing the OC4IDS project identifier in `planning.project.id`.
+OCDS and OC4IDS datasets ought to be linked using the `planning.project` object, by referencing the OC4IDS project identifier in the `planning.project.id` field.
 
 ## Open Fiscal Data Package
 

docs/history/changelog.md

@@ -75,7 +75,7 @@ Per the [normative and non-normative content and changes policy](../governance/n
   * [#1684](https://github.com/open-contracting/standard/pull/1684) `geometryType`
   * [#1316](https://github.com/open-contracting/standard/pull/1316) `language`
   * [#1326](https://github.com/open-contracting/standard/pull/1326) `linkRelationType`
-  * [#1684](https://github.com/open-contracting/standard/pull/1684) `locationGazetteers`
+  * [#1684](https://github.com/open-contracting/standard/pull/1684) `locationGazetteer`
   * [#1308](https://github.com/open-contracting/standard/pull/1308) `mediaType`
   * [#1459](https://github.com/open-contracting/standard/pull/1459) `partyScale`
   * [#1654](https://github.com/open-contracting/standard/pull/1654) `permission`
@@ -200,7 +200,9 @@ Per the [normative and non-normative content and changes policy](../governance/n
 * Add new fields:
   * [#1335](https://github.com/open-contracting/standard/pull/1335) `planning.id`
   * [#1642](https://github.com/open-contracting/standard/pull/1642) `planning.finalStatus`, `planning.finalStatusDetails` and `planning.finalStatusDate`
+  * [#1684](https://github.com/open-contracting/standard/pull/1684) `planning.project`
   * [#1324](https://github.com/open-contracting/standard/pull/1324) `tender.datePublished`
+  * [#1684](https://github.com/open-contracting/standard/pull/1684) `tender.deliveryLocations` and `tender.deliveryAddresses`
   * [#1296](https://github.com/open-contracting/standard/pull/1296) [#1674](https://github.com/open-contracting/standard/pull/1674) `tender.exclusionGrounds`
   * [#1669](https://github.com/open-contracting/standard/pull/1669) `tender.expressionOfInterestDeadline`
   * [#1490](https://github.com/open-contracting/standard/pull/1490) `tender.identifiers`
@@ -221,13 +223,13 @@ Per the [normative and non-normative content and changes policy](../governance/n
   * [#1372](https://github.com/open-contracting/standard/pull/1372) `Address.country`
   * [#1380](https://github.com/open-contracting/standard/pull/1380) [#1440](https://github.com/open-contracting/standard/pull/1440) `Document.languages`
   * [#1439](https://github.com/open-contracting/standard/pull/1439) `Document.relatedItems`
+  * [#1684](https://github.com/open-contracting/standard/pull/1684) `Item.deliveryLocations` and `Item.deliveryAddresses`
   * [#1455](https://github.com/open-contracting/standard/pull/1455) `Milestone.dueAfterDate`
   * [#1434](https://github.com/open-contracting/standard/pull/1434) `Milestone.value`
   * [#1490](https://github.com/open-contracting/standard/pull/1490) `SimpleIdentifier`
   * [#1519](https://github.com/open-contracting/standard/pull/1519) `Value.amountNet` and `Value.amountGross`
   * [#1490](https://github.com/open-contracting/standard/pull/1490) `contracts.identifiers`
   * [#1679](https://github.com/open-contracting/standard/pull/1679) `Organization.details.classifications`
-  * [#1684](https://github.com/open-contracting/standard/pull/1684) `planning.project`, `deliveryLocations` and `deliveryAddresses` to `Tender` and `Item`
 
 * Deprecate some fields:
   * [#1200](https://github.com/open-contracting/standard/pull/1200) `tender.submissionMethod`, because all codes from the `submissionMethod` codelist are deprecated.

docs/schema/reference.md

@@ -122,7 +122,7 @@ Each organization has a `details` object. Through extensions, this can be used t
 
 ### Planning
 
-The planning section is used in a planning process. This includes information about, for example, needs identification, budget planning, the parent project and market research. Background documents such as feasibility studies and project plans can also be included in this section.
+The planning section is used in a planning process. This includes information about, for example, needs identification, budget planning and market research. Background documents such as feasibility studies and project plans can also be included in this section.
 
 ````{admonition} Example
 :class: hint
@@ -150,8 +150,6 @@ The planning section is used in a planning process. This includes information ab
 
 Apart from documents, the majority of planning information is held within the budget block. This is designed to allow both machine-readable linkable data about budgets, cross-referencing to data held in other standards such as the [Fiscal Data Package](https://specs.frictionlessdata.io/fiscal-data-package/) or [International Aid Transparency Initiative Standard](https://iatistandard.org/en/), and human readable description of the related budgets and projects, supporting users to understand the relationship of the contracting (or planning) process to existing projects and budgets even where linked data is not available.
 
-The `planning.budget.projectID` field should not be used to disclose the identifier of an infrastructure or PPP project. Rather, this field is used to disclose the identifier of a programme of work as it appears in a budget, like a national or state budget. Since such programmes of work can include many infrastructure projects, it is necessary to disclose their identifiers separately. Use the the `planning.project.id` field to disclose the identifier of an infrastructure or PPP project.
-
 ````{admonition} Example
 :class: hint
 
@@ -172,10 +170,6 @@ The `planning.budget.projectID` field should not be used to disclose the identif
 
 #### Project
 
-The `project` object includes details of the infrastructure or public-private partnership (PPP) project to which a planning process is related. This object is designed to allow both machine-readable linkable data about the parent project, cross-referencing to data held in other standards such as the [Open Contracting for Infrastructure Data Standards Toolkit (OC4IDS)](https://standard.open-contracting.org/infrastructure/latest/en/projects/#what-is-a-project) and the [OCDS for PPPs](https://standard.open-contracting.org/profiles/ppp/latest/en/) profile, and human readable description of the parent project, supporting users to understand the relationship of the contracting (or planning) process to their parent project even where linked data is not available.
-
-Where there is a separate OC4IDS dataset that describes the project the identifier from this dataset should be referenced in `project.id`. Where there is not a separate project dataset an appropriate project identifier will need to be generated. For more information on project identifiers see [OC4IDS Project Identifiers](https://standard.open-contracting.org/infrastructure/latest/en/guidance/identifiers/).
-
 ````{admonition} Example
 :class: hint
 
@@ -697,8 +691,6 @@ As well as providing this machine-readable link between processes, publishers ma
 
 ### Location
 
-The `Location` subschema can be used to provide the geographic coordinates or standardized location identifiers of the proposed or executed contract delivery in the `Project`, `tender` and `Item` objects.
-
 ````{admonition} Example
 :class: hint
 

schema/codelists/geometryType.csv

@@ -1,7 +1,7 @@
 Code,Title,Description,Source
-Point,Point,"For type 'Point', the 'coordinates' member is a single position.",https://tools.ietf.org/html/rfc7946#section-3.1
-MultiPoint,MultiPoint,"For type 'MultiPoint', the 'coordinates' member is an array of positions.",https://tools.ietf.org/html/rfc7946#section-3.1
-LineString,LineString,"For type 'LineString', the 'coordinates' member is an array of two or more positions.",https://tools.ietf.org/html/rfc7946#section-3.1
-MultiLineString,MultiLineString,"For type 'MultiLineString', the 'coordinates' member is an array of LineString coordinate arrays.",https://tools.ietf.org/html/rfc7946#section-3.1
-Polygon,Polygon,"For type 'Polygon', the 'coordinates' member must be an array of linear ring coordinate arrays.",https://tools.ietf.org/html/rfc7946#section-3.1
-MultiPolygon,MultiPolygon,"For type 'MultiPolygon', the 'coordinates' member is an array of Polygon coordinate arrays.",https://tools.ietf.org/html/rfc7946#section-3.1
+Point,Point,"For type 'Point', the `coordinates` field is a single position.",https://tools.ietf.org/html/rfc7946#section-3.1
+MultiPoint,MultiPoint,"For type 'MultiPoint', the `coordinates` field is an array of positions.",https://tools.ietf.org/html/rfc7946#section-3.1
+LineString,LineString,"For type 'LineString', the `coordinates` field is an array of two or more positions.",https://tools.ietf.org/html/rfc7946#section-3.1
+MultiLineString,MultiLineString,"For type 'MultiLineString', the `coordinates` field is an array of LineString coordinate arrays.",https://tools.ietf.org/html/rfc7946#section-3.1
+Polygon,Polygon,"For type 'Polygon', the `coordinates` field is an array of linear ring coordinate arrays.",https://tools.ietf.org/html/rfc7946#section-3.1
+MultiPolygon,MultiPolygon,"For type 'MultiPolygon', the `coordinates` field is an array of Polygon coordinate arrays.",https://tools.ietf.org/html/rfc7946#section-3.1

schema/codelists/locationGazetteer.csv

@@ -0,0 +1,7 @@
+Category,Code,Title,Description,Source,URI Pattern
+Sub-National,NUTS,EU Nomenclature of Territorial Units for Statistics,The Nomenclature of Territorial Units for Statistics (NUTS) was established by Eurostat in order to provide a single uniform breakdown of territorial units for the production of regional statistics for the European Union.,https://ec.europa.eu/eurostat/web/nuts/linked-open-data,http://data.europa.eu/nuts/code/
+National,ISO2,ISO 3166-1 alpha-2,ISO 3166-1 alpha-2 assigns two-letter codes to countries.,https://www.iso.org/iso-3166-country-codes.html,
+Universal,GEONAMES,GeoNames,GeoNames assigns numerical identifiers to geographical names.,https://www.geonames.org/,https://www.geonames.org/
+Universal,OSMN,OpenStreetMap node,An OpenStreetMap node defines a point in space.,,https://www.openstreetmap.org/node/
+Universal,OSMW,OpenStreetMap way,"An OpenStreetMap way defines linear features and area boundaries, as an ordered list of nodes.",https://wiki.openstreetmap.org/wiki/Way,https://www.openstreetmap.org/way/
+Universal,OSMR,OpenStreetMap relation,"An OpenStreetMap relation combines nodes, ways, and/or other relations.",https://wiki.openstreetmap.org/wiki/Relation,https://www.openstreetmap.org/relation/