Skip to content
Merged
Show file tree
Hide file tree
Changes from all 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
16 changes: 8 additions & 8 deletions code/API_definitions/population-density-data.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -133,15 +133,15 @@ info:
license:
name: Apache 2.0
url: https://www.apache.org/licenses/LICENSE-2.0.html
version: 0.3.0
version: wip

x-camara-commonalities: 0.6
externalDocs:
description: Product documentation at CAMARA.
url: https://github.com/camaraproject/PopulationDensityData

servers:
- url: '{apiRoot}/population-density-data/v0.3'
- url: '{apiRoot}/population-density-data/vwip'

variables:
apiRoot:
Expand Down Expand Up @@ -633,16 +633,16 @@ components:
discriminator:
propertyName: dataType
mapping:
NO_DATA: '#/components/schemas/NO_DATA'
LOW_DENSITY: '#/components/schemas/LOW_DENSITY'
DENSITY_ESTIMATION: '#/components/schemas/DENSITY_ESTIMATION'
NO_DATA:
NO_DATA: '#/components/schemas/NoData'
LOW_DENSITY: '#/components/schemas/LowDensity'
DENSITY_ESTIMATION: '#/components/schemas/DensityEstimation'
NoData:
allOf:
- $ref: '#/components/schemas/CellPopulationDensityData'
LOW_DENSITY:
LowDensity:
allOf:
- $ref: '#/components/schemas/CellPopulationDensityData'
DENSITY_ESTIMATION:
DensityEstimation:
allOf:
- $ref: '#/components/schemas/CellPopulationDensityData'
- type: object
Expand Down
4 changes: 2 additions & 2 deletions code/Test_definitions/population-density-data.feature
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Feature: CAMARA Population Density Data API, v0.3.0
Feature: CAMARA Population Density Data API, vwip
# Input to be provided by the implementation to the tester
#
# Implementation indications:
Expand All @@ -16,7 +16,7 @@ Feature: CAMARA Population Density Data API, v0.3.0

Background: Common retrievePopulationDensity setup
Given an environment at "apiRoot"
And the resource "/population-density-data/v0.3/retrieve"
And the resource "/population-density-data/vwip/retrieve"
And the header "Content-Type" is set to "application/json"
And the header "Authorization" is set to a valid access token
And the header "x-correlator" complies with the schema at "#/components/schemas/XCorrelator"
Expand Down