diff --git a/bundledApi.yaml b/bundledApi.yaml index 7578bf4..856dd8c 100644 --- a/bundledApi.yaml +++ b/bundledApi.yaml @@ -208,6 +208,19 @@ components: - Failed - Expired - Aborted + productType: + type: string + enum: + - 3DPhotoRealistic + - 3DPhotoRealisticBest + - 3DSemantic + - 3DSemanticMesh + - 3DPointCloud + description: Type of 3D product + productSubType: + type: string + nullable: true + description: Sub-Type of 3D product Point3D: type: array minItems: 2 @@ -462,9 +475,9 @@ components: maxLength: 120 description: Name of product productType: - type: string - description: Type of product (3DPhotoRealistic) - example: 3DPhotoRealistic + $ref: '#/components/schemas/productType' + productSubType: + $ref: '#/components/schemas/productSubType' description: type: string maxLength: 500 @@ -544,8 +557,7 @@ components: allOf: - $ref: '#/components/schemas/Geometry' - description: Geographic demarcation of the product - - example: >- - {"type":"Polygon","coordinates":[[[1,2],[3,4],[5,6],[7,8],[1,2]]]} + - example: '{"type":"Polygon","coordinates":[[[1,2],[3,4],[5,6],[7,8],[1,2]]]}' heightRangeFrom: type: number format: double diff --git a/package-lock.json b/package-lock.json index 45ea125..482495e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,12 +15,12 @@ "@map-colonies/error-express-handler": "^2.1.0", "@map-colonies/express-access-log-middleware": "^2.0.1", "@map-colonies/js-logger": "^1.0.1", - "@map-colonies/mc-model-types": "^19.0.0", + "@map-colonies/mc-model-types": "^19.1.3", "@map-colonies/mc-priority-queue": "^8.2.1", "@map-colonies/openapi-express-viewer": "^3.0.0", "@map-colonies/read-pkg": "0.0.1", "@map-colonies/telemetry": "^6.1.0", - "@map-colonies/types": "^1.7.0", + "@map-colonies/types": "^1.10.0", "@opentelemetry/api": "1.7.0", "@opentelemetry/api-metrics": "0.23.0", "@opentelemetry/context-async-hooks": "^1.24.1", @@ -4155,10 +4155,10 @@ } }, "node_modules/@map-colonies/mc-model-types": { - "version": "19.0.0", - "resolved": "https://registry.npmjs.org/@map-colonies/mc-model-types/-/mc-model-types-19.0.0.tgz", - "integrity": "sha512-K/F+7UQcAHN4utMCXMkQ3ggCeBzl0NLjsoVcOM85aMimZ+lY5LpT0NPbmfqM2DJg2p2WHyzNIe/Z3IgT6faZ4w==", - "license": "MIT", + "version": "19.1.3", + "resolved": "https://registry.npmjs.org/@map-colonies/mc-model-types/-/mc-model-types-19.1.3.tgz", + "integrity": "sha512-E9sgqaCEBYldZLsOURveljiH65sM4YT+teeWZjNk6NZeEYeURMbL7/bJOxlfs/42uLcnE9aLEw2gW6WFd3brYw==", + "license": "ISC", "dependencies": { "@map-colonies/raster-shared": "^1.10.0", "@types/geojson": "^7946.0.7", @@ -4168,7 +4168,7 @@ }, "peerDependencies": { "@map-colonies/mc-utils": ">=1.8.0", - "@map-colonies/types": ">=1.6.0" + "@map-colonies/types": ">=1.10.0" } }, "node_modules/@map-colonies/mc-priority-queue": { @@ -4438,9 +4438,9 @@ } }, "node_modules/@map-colonies/types": { - "version": "1.7.0", - "resolved": "https://registry.npmjs.org/@map-colonies/types/-/types-1.7.0.tgz", - "integrity": "sha512-FcLWRAQT97XonULRr6RuTgc5eng5Cw91WOzzrL4hYFGUVUbKy8kBhc/xBQlVB7NoRllByao4xjpvwdRNfYgpBA==", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/@map-colonies/types/-/types-1.10.0.tgz", + "integrity": "sha512-FwVrBAYzjnpmd9Jnq7Mex7axl8KR6o8JjKVGu3kDCGHz26Ru9qSCpzkA+zUVV8fKNxWVZSmDi7IiHEe9WsOalw==", "license": "ISC", "dependencies": { "@types/geojson": "^7946.0.16", diff --git a/package.json b/package.json index ef464fc..5e74667 100644 --- a/package.json +++ b/package.json @@ -48,8 +48,8 @@ "@map-colonies/error-express-handler": "^2.1.0", "@map-colonies/express-access-log-middleware": "^2.0.1", "@map-colonies/js-logger": "^1.0.1", - "@map-colonies/types": "^1.7.0", - "@map-colonies/mc-model-types": "^19.0.0", + "@map-colonies/types": "^1.10.0", + "@map-colonies/mc-model-types": "^19.1.3", "@map-colonies/mc-priority-queue": "^8.2.1", "@map-colonies/openapi-express-viewer": "^3.0.0", "@map-colonies/read-pkg": "0.0.1",