diff --git a/.generation/Dockerfile b/.generation/Dockerfile index ff7fb287..5163d0cc 100644 --- a/.generation/Dockerfile +++ b/.generation/Dockerfile @@ -1,5 +1,5 @@ # Patched version of openapi-generator-cli with python3 support -FROM docker.io/openapitools/openapi-generator-cli:v7.11.0 +FROM docker.io/openapitools/openapi-generator-cli:v7.12.0 RUN apt-get update && apt-get install -y python3 diff --git a/.generation/config.ini b/.generation/config.ini index bcd822eb..12276fe9 100644 --- a/.generation/config.ini +++ b/.generation/config.ini @@ -1,14 +1,14 @@ [input] -backendTag = nightly-2025-02-09 +backendTag = nightly-2025-03-14 [general] githubUrl = https://github.com/geo-engine/openapi-client [python] name = geoengine_openapi_client -version = 0.0.21 +version = 0.0.22 [typescript] name = @geoengine/openapi-client -version = 0.0.21 +version = 0.0.22 diff --git a/.generation/generate.py b/.generation/generate.py index 8effc286..4cf08c43 100755 --- a/.generation/generate.py +++ b/.generation/generate.py @@ -146,11 +146,28 @@ def build_container(): ) -def clean_test_dirs(*, language: Literal['python', 'typescript']): - '''Remove the test directory, since it will not be overwritten by the generator.''' - test_path = Path(language) / 'test' - if os.path.isdir(test_path): - shutil.rmtree(test_path) +def clean_dirs(*, language: Literal['python', 'typescript']): + '''Remove some directories because they are not be overwritten by the generator.''' + + dirs_to_remove = [ + Path(language) / 'test' + ] + + match language: + case 'typescript': + dirs_to_remove.extend([ + Path(language) / 'src', + Path(language) / 'dist', + ]) + case 'python': + dirs_to_remove.extend([ + Path(language) / 'geoengine_openapi_client', + ]) + + for the_dir in dirs_to_remove: + if not os.path.isdir(the_dir): + continue + shutil.rmtree(the_dir) def generate_python_code(*, package_name: str, package_version: str, package_url: str): @@ -175,6 +192,7 @@ def generate_python_code(*, package_name: str, package_version: str, package_url ]), "--enable-post-process-file", "-o", "/local/python/", + "--openapi-normalizer", "REF_AS_PARENT_IN_ALLOF=true", ], check=True, ) @@ -210,6 +228,7 @@ def generate_typescript_code(*, npm_name: str, npm_version: str, repository_url: "--git-repo-id", git_repo_id, "--enable-post-process-file", "-o", "/local/typescript/", + "--openapi-normalizer", "REF_AS_PARENT_IN_ALLOF=true", ], check=True, ) @@ -232,7 +251,7 @@ def main(): if args.build_container: build_container() - clean_test_dirs(language=args.language) + clean_dirs(language=args.language) if args.language == 'python': generate_python_code( diff --git a/.generation/input/openapi.json b/.generation/input/openapi.json index 0c960a2e..a68008f2 100644 --- a/.generation/input/openapi.json +++ b/.generation/input/openapi.json @@ -1,5 +1,5 @@ { - "openapi": "3.0.3", + "openapi": "3.1.0", "info": { "title": "Geo Engine API", "description": "", @@ -15,7 +15,12 @@ }, "servers": [ { - "url": "http://0.0.0.0:8080/api" + "url": "{server}/api", + "variables": { + "server": { + "default": "https://geoengine.io" + } + } } ], "paths": { @@ -75,8 +80,7 @@ "tags": [ "Datasets" ], - "summary": "Creates a new dataset referencing files.", - "description": "Users can reference previously uploaded files.\nAdmins can reference files from a volume.", + "summary": "Creates a new dataset referencing files.\nUsers can reference previously uploaded files.\nAdmins can reference files from a volume.", "operationId": "create_dataset_handler", "requestBody": { "content": { @@ -90,7 +94,14 @@ }, "responses": { "200": { - "$ref": "#/components/responses/DatasetNameResponse" + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/DatasetNameResponse" + } + } + } } }, "security": [ @@ -105,8 +116,7 @@ "tags": [ "Datasets" ], - "summary": "Creates a new dataset using previously uploaded files.", - "description": "The format of the files will be automatically detected when possible.", + "summary": "Creates a new dataset using previously uploaded files.\nThe format of the files will be automatically detected when possible.", "operationId": "auto_create_dataset_handler", "requestBody": { "content": { @@ -120,7 +130,14 @@ }, "responses": { "200": { - "$ref": "#/components/responses/DatasetNameResponse" + "description": "", + "content": { + "application/json": { + "schema": { + "$ref": "#/components/schemas/DatasetNameResponse" + } + } + } }, "400": { "description": "Bad request", @@ -198,8 +215,7 @@ "tags": [ "Datasets" ], - "summary": "Inspects an upload and suggests metadata that can be used when creating a new dataset based on it.", - "description": "Tries to automatically detect the main file and layer name if not specified.", + "summary": "Inspects an upload and suggests metadata that can be used when creating a new dataset based on it.\nTries to automatically detect the main file and layer name if not specified.", "operationId": "suggest_meta_data_handler", "requestBody": { "content": { @@ -794,8 +810,7 @@ "tags": [ "Workflows" ], - "summary": "Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body.", - "description": "Returns the id of the created task", + "summary": "Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body.\nReturns the id of the created task", "operationId": "dataset_from_workflow_handler", "parameters": [ { @@ -853,8 +868,7 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": "string" }, "example": "Germany" }, @@ -897,8 +911,7 @@ "type": "array", "items": { "type": "string" - }, - "nullable": true + } }, "example": "['tag1', 'tag2']" } @@ -1813,7 +1826,7 @@ "description": "Layer id", "required": true, "schema": { - "$ref": "#/components/schemas/LayerId" + "$ref": "#/components/schemas/LayerCollectionId" } } ], @@ -2053,7 +2066,7 @@ "description": "Layer id", "required": true, "schema": { - "$ref": "#/components/schemas/LayerId" + "$ref": "#/components/schemas/LayerCollectionId" } } ], @@ -2241,7 +2254,7 @@ "Session" ], "summary": "Initializes the Open Id Connect login procedure by requesting a parametrized url to the configured Id Provider.", - "description": "# Errors\n\nThis call fails if Open ID Connect is disabled, misconfigured or the Id Provider is unreachable.\n", + "description": "# Errors\n\nThis call fails if Open ID Connect is disabled, misconfigured or the Id Provider is unreachable.\n\n", "operationId": "oidc_init", "parameters": [ { @@ -2275,8 +2288,8 @@ "tags": [ "Session" ], - "summary": "Creates a session for a user via a login with Open Id Connect.", - "description": "This call must be preceded by a call to oidcInit and match the parameters of that call.\n\n# Errors\n\nThis call fails if the [`AuthCodeResponse`] is invalid,\nif a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved,\nif the Open Id Connect configuration is invalid,\nor if the Id Provider is unreachable.\n", + "summary": "Creates a session for a user via a login with Open Id Connect.\nThis call must be preceded by a call to oidcInit and match the parameters of that call.", + "description": "# Errors\n\nThis call fails if the [`AuthCodeResponse`] is invalid,\nif a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved,\nif the Open Id Connect configuration is invalid,\nor if the Id Provider is unreachable.\n\n", "operationId": "oidc_login", "parameters": [ { @@ -2488,8 +2501,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] }, "example": "EPSG:4326" }, @@ -2685,8 +2700,7 @@ "tags": [ "Projects" ], - "summary": "Updates a project.", - "description": "This will create a new version.", + "summary": "Updates a project.\nThis will create a new version.", "operationId": "update_project_handler", "parameters": [ { @@ -3136,8 +3150,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } } ], @@ -3452,12 +3468,14 @@ "in": "path", "required": true, "schema": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/TaskFilter" } - ], - "nullable": true + ] } }, { @@ -3522,7 +3540,7 @@ "Tasks" ], "summary": "Abort a running task.", - "description": "# Parameters\n\n* `force` - If true, the task will be aborted without clean-up.\nYou can abort a task that is already in the process of aborting.", + "description": "# Parameters\n\n* `force` - If true, the task will be aborted without clean-up.\n You can abort a task that is already in the process of aborting.", "operationId": "abort_handler", "parameters": [ { @@ -3587,7 +3605,7 @@ "description": "Demo", "pctComplete": "0.00%", "timeStarted": "2023-02-16T15:25:45.390Z", - "estimatedTimeRemaining": "? (\u00b1 ?)", + "estimatedTimeRemaining": "? (± ?)", "info": null } } @@ -3984,12 +4002,14 @@ "in": "query", "required": false, "schema": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/WcsVersion" } - ], - "nullable": true + ] } }, { @@ -4135,9 +4155,11 @@ "in": "query", "required": false, "schema": { - "type": "number", - "format": "double", - "nullable": true + "type": [ + "number", + "null" + ], + "format": "double" } }, { @@ -4145,9 +4167,11 @@ "in": "query", "required": false, "schema": { - "type": "number", - "format": "double", - "nullable": true + "type": [ + "number", + "null" + ], + "format": "double" } }, { @@ -4155,9 +4179,11 @@ "in": "query", "required": false, "schema": { - "type": "number", - "format": "double", - "nullable": true + "type": [ + "number", + "null" + ], + "format": "double" } } ], @@ -4195,12 +4221,14 @@ "in": "path", "required": true, "schema": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/WfsVersion" } - ], - "nullable": true + ] } }, { @@ -4261,12 +4289,14 @@ "in": "query", "required": false, "schema": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/WfsVersion" } - ], - "nullable": true + ] } }, { @@ -4317,8 +4347,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] }, "example": "EPSG:4326" }, @@ -4327,8 +4359,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } }, { @@ -4336,9 +4370,11 @@ "in": "query", "required": false, "schema": { - "type": "integer", + "type": [ + "integer", + "null" + ], "format": "int64", - "nullable": true, "minimum": 0 } }, @@ -4347,8 +4383,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } }, { @@ -4356,8 +4394,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } }, { @@ -4365,8 +4405,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } }, { @@ -4374,8 +4416,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } }, { @@ -4384,12 +4428,14 @@ "description": "Vendor parameter for specifying a spatial query resolution", "required": false, "schema": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/WfsResolution" } - ], - "nullable": true + ] } } ], @@ -4529,12 +4575,14 @@ "in": "path", "required": true, "schema": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/WmsVersion" } - ], - "nullable": true + ] } }, { @@ -4558,12 +4606,14 @@ "in": "path", "required": true, "schema": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/GetCapabilitiesFormat" } - ], - "nullable": true + ] } } ], @@ -4743,8 +4793,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] }, "example": "EPSG:4326" }, @@ -4771,8 +4823,10 @@ "in": "query", "required": false, "schema": { - "type": "boolean", - "nullable": true + "type": [ + "boolean", + "null" + ] } }, { @@ -4780,8 +4834,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } }, { @@ -4789,8 +4845,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } }, { @@ -4798,8 +4856,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } }, { @@ -4807,8 +4867,10 @@ "in": "query", "required": false, "schema": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } }, { @@ -4816,12 +4878,14 @@ "in": "query", "required": false, "schema": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/GetMapExceptionFormat" } - ], - "nullable": true + ] } } ], @@ -5187,37 +5251,45 @@ "type": "string" }, "name": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/DatasetName" } - ], - "nullable": true + ] }, "provenance": { - "type": "array", + "type": [ + "array", + "null" + ], "items": { "$ref": "#/components/schemas/Provenance" - }, - "nullable": true + } }, "sourceOperator": { "type": "string" }, "symbology": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/Symbology" } - ], - "nullable": true + ] }, "tags": { - "type": "array", + "type": [ + "array", + "null" + ], "items": { "type": "string" - }, - "nullable": true + } } } }, @@ -5238,6 +5310,9 @@ "description": "metadata used for loading the data", "additionalProperties": { "type": "string" + }, + "propertyNames": { + "type": "string" } }, "name": { @@ -5252,12 +5327,14 @@ "description": "properties, for instance, to be rendered in the UI" }, "symbology": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/Symbology" } - ], - "nullable": true + ] }, "workflow": { "$ref": "#/components/schemas/Workflow" @@ -5345,18 +5422,22 @@ "type": "string" }, "layerName": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] }, "mainFile": { "type": "string" }, "tags": { - "type": "array", + "type": [ + "array", + "null" + ], "items": { "type": "string" - }, - "nullable": true + } }, "upload": { "$ref": "#/components/schemas/UploadId" @@ -5372,14 +5453,6 @@ ] } }, - "AxisLabels": { - "type": "array", - "items": { - "type": "string" - }, - "maxItems": 2, - "minItems": 2 - }, "AxisOrder": { "type": "string", "enum": [ @@ -5433,15 +5506,20 @@ "ClassificationMeasurement": { "type": "object", "required": [ + "type", "measurement", - "classes", - "type" + "classes" ], "properties": { "classes": { "type": "object", "additionalProperties": { "type": "string" + }, + "propertyNames": { + "type": "integer", + "format": "int32", + "minimum": 0 } }, "measurement": { @@ -5481,7 +5559,7 @@ "ColorParam": { "oneOf": [ { - "$ref": "#/components/schemas/ColorParamStatic" + "$ref": "#/components/schemas/StaticColor" }, { "$ref": "#/components/schemas/DerivedColor" @@ -5491,25 +5569,7 @@ "propertyName": "type", "mapping": { "derived": "#/components/schemas/DerivedColor", - "static": "#/components/schemas/ColorParamStatic" - } - } - }, - "ColorParamStatic": { - "type": "object", - "required": [ - "color", - "type" - ], - "properties": { - "color": { - "$ref": "#/components/schemas/RgbaColor" - }, - "type": { - "type": "string", - "enum": [ - "static" - ] + "static": "#/components/schemas/StaticColor" } } }, @@ -5525,6 +5585,7 @@ "$ref": "#/components/schemas/PaletteColorizer" } ], + "description": "A colorizer specifies a mapping between raster values and an output image\nThere are different variants that perform different kinds of mapping.", "discriminator": { "propertyName": "type", "mapping": { @@ -5565,8 +5626,8 @@ "ContinuousMeasurement": { "type": "object", "required": [ - "measurement", - "type" + "type", + "measurement" ], "properties": { "measurement": { @@ -5579,8 +5640,10 @@ ] }, "unit": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } } }, @@ -5634,12 +5697,14 @@ "type": "string" }, "timeStep": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/TimeStep" } - ], - "nullable": true + ] } }, "example": { @@ -5685,6 +5750,7 @@ "$ref": "#/components/schemas/ExternalDataId" } ], + "description": "The identifier for loadable data. It is used in the source operators to get the loading info (aka parametrization)\nfor accessing the data. Internal data is loaded from datasets, external from `DataProvider`s.", "discriminator": { "propertyName": "type", "mapping": { @@ -5801,11 +5867,13 @@ "$ref": "#/components/schemas/DatasetName" }, "provenance": { - "type": "array", + "type": [ + "array", + "null" + ], "items": { "$ref": "#/components/schemas/Provenance" - }, - "nullable": true + } }, "resultDescriptor": { "$ref": "#/components/schemas/TypedResultDescriptor" @@ -5814,19 +5882,23 @@ "type": "string" }, "symbology": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/Symbology" } - ], - "nullable": true + ] }, "tags": { - "type": "array", + "type": [ + "array", + "null" + ], "items": { "type": "string" - }, - "nullable": true + } } } }, @@ -5880,12 +5952,14 @@ "type": "string" }, "symbology": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/Symbology" } - ], - "nullable": true + ] }, "tags": { "type": "array", @@ -5896,11 +5970,25 @@ } }, "DatasetName": { - "type": "string" + "type": "string", + "examples": [ + "ns:name" + ] + }, + "DatasetNameResponse": { + "type": "object", + "title": "Dataset Name Response", + "required": [ + "datasetName" + ], + "properties": { + "datasetName": { + "$ref": "#/components/schemas/DatasetName" + } + } }, "DatasetResource": { "type": "object", - "title": "DatasetResource", "required": [ "type", "id" @@ -5917,28 +6005,18 @@ } } }, - "DateTime": { - "type": "object", - "description": "An object that composes the date and a timestamp with time zone.", - "required": [ - "datetime" - ], - "properties": { - "datetime": { - "type": "string", - "format": "date-time" - } - } - }, "DateTimeParseFormat": { "type": "string" }, + "DateTimeString": { + "type": "string" + }, "DerivedColor": { "type": "object", "required": [ + "type", "attribute", - "colorizer", - "type" + "colorizer" ], "properties": { "attribute": { @@ -5958,10 +6036,10 @@ "DerivedNumber": { "type": "object", "required": [ + "type", "attribute", "factor", - "defaultValue", - "type" + "defaultValue" ], "properties": { "attribute": { @@ -6007,9 +6085,9 @@ "ExternalDataId": { "type": "object", "required": [ + "type", "providerId", - "layerId", - "type" + "layerId" ], "properties": { "layerId": { @@ -6067,14 +6145,6 @@ } ] }, - "GdalConfigOption": { - "type": "array", - "items": { - "type": "string" - }, - "maxItems": 2, - "minItems": 2 - }, "GdalDatasetGeoTransform": { "type": "object", "required": [ @@ -6118,18 +6188,22 @@ "type": "string" }, "gdalConfigOptions": { - "type": "array", + "type": [ + "array", + "null" + ], "items": { - "$ref": "#/components/schemas/GdalConfigOption" - }, - "nullable": true + "$ref": "#/components/schemas/StringPair" + } }, "gdalOpenOptions": { - "type": "array", + "type": [ + "array", + "null" + ], "items": { "type": "string" - }, - "nullable": true + } }, "geoTransform": { "$ref": "#/components/schemas/GdalDatasetGeoTransform" @@ -6139,16 +6213,20 @@ "minimum": 0 }, "noDataValue": { - "type": "number", - "format": "double", - "nullable": true + "type": [ + "number", + "null" + ], + "format": "double" }, "propertiesMapping": { - "type": "array", + "type": [ + "array", + "null" + ], "items": { "$ref": "#/components/schemas/GdalMetadataMapping" - }, - "nullable": true + } }, "rasterbandChannel": { "type": "integer", @@ -6171,12 +6249,14 @@ "$ref": "#/components/schemas/CacheTtlSeconds" }, "params": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/GdalDatasetParameters" } - ], - "nullable": true + ] }, "time": { "$ref": "#/components/schemas/TimeInterval" @@ -6186,9 +6266,9 @@ "GdalMetaDataList": { "type": "object", "required": [ + "type", "resultDescriptor", - "params", - "type" + "params" ], "properties": { "params": { @@ -6211,12 +6291,12 @@ "GdalMetaDataRegular": { "type": "object", "required": [ + "type", "resultDescriptor", "params", "timePlaceholders", "dataTime", - "step", - "type" + "step" ], "properties": { "cacheTtl": { @@ -6238,6 +6318,9 @@ "type": "object", "additionalProperties": { "$ref": "#/components/schemas/GdalSourceTimePlaceholder" + }, + "propertyNames": { + "type": "string" } }, "type": { @@ -6251,9 +6334,9 @@ "GdalMetaDataStatic": { "type": "object", "required": [ + "type", "params", - "resultDescriptor", - "type" + "resultDescriptor" ], "properties": { "cacheTtl": { @@ -6266,12 +6349,14 @@ "$ref": "#/components/schemas/RasterResultDescriptor" }, "time": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/TimeInterval" } - ], - "nullable": true + ] }, "type": { "type": "string", @@ -6304,13 +6389,13 @@ "type": "object", "description": "Meta data for 4D `NetCDF` CF datasets", "required": [ + "type", "resultDescriptor", "params", "start", "end", "step", - "bandOffset", - "type" + "bandOffset" ], "properties": { "bandOffset": { @@ -6322,7 +6407,8 @@ "$ref": "#/components/schemas/CacheTtlSeconds" }, "end": { - "$ref": "#/components/schemas/TimeInstance" + "$ref": "#/components/schemas/TimeInstance", + "description": "We use the end to specify the last, non-inclusive valid time point.\nQueries behind this point return no data.\nTODO: Alternatively, we could think about using the number of possible time steps in the future." }, "params": { "$ref": "#/components/schemas/GdalDatasetParameters" @@ -6339,7 +6425,7 @@ "type": { "type": "string", "enum": [ - "GdalMetadataNetCdfCf" + "GdalMetaDataNetCdfCf" ] } } @@ -6432,10 +6518,9 @@ }, "InternalDataId": { "type": "object", - "title": "InternalDataId", "required": [ - "datasetId", - "type" + "type", + "datasetId" ], "properties": { "datasetId": { @@ -6469,6 +6554,9 @@ "description": "metadata used for loading the data", "additionalProperties": { "type": "string" + }, + "propertyNames": { + "type": "string" } }, "name": { @@ -6482,12 +6570,14 @@ "description": "properties, for instance, to be rendered in the UI" }, "symbology": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/Symbology" } - ], - "nullable": true + ] }, "workflow": { "$ref": "#/components/schemas/Workflow" @@ -6508,9 +6598,11 @@ "type": "string" }, "entryLabel": { - "type": "string", - "description": "a common label for the collection's entries, if there is any", - "nullable": true + "type": [ + "string", + "null" + ], + "description": "a common label for the collection's entries, if there is any" }, "id": { "$ref": "#/components/schemas/ProviderLayerCollectionId" @@ -6538,10 +6630,10 @@ "LayerCollectionListing": { "type": "object", "required": [ + "type", "id", "name", - "description", - "type" + "description" ], "properties": { "description": { @@ -6569,7 +6661,6 @@ }, "LayerCollectionResource": { "type": "object", - "title": "LayerCollectionResource", "required": [ "type", "id" @@ -6592,10 +6683,10 @@ "LayerListing": { "type": "object", "required": [ + "type", "id", "name", - "description", - "type" + "description" ], "properties": { "description": { @@ -6624,7 +6715,6 @@ }, "LayerResource": { "type": "object", - "title": "LayerResource", "required": [ "type", "id" @@ -6641,16 +6731,6 @@ } } }, - "LayerUpdate": { - "oneOf": [ - { - "$ref": "#/components/schemas/ProjectUpdateToken" - }, - { - "$ref": "#/components/schemas/ProjectLayer" - } - ] - }, "LayerVisibility": { "type": "object", "required": [ @@ -6669,9 +6749,9 @@ "LineSymbology": { "type": "object", "required": [ + "type", "stroke", - "autoSimplified", - "type" + "autoSimplified" ], "properties": { "autoSimplified": { @@ -6681,12 +6761,14 @@ "$ref": "#/components/schemas/StrokeParam" }, "text": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/TextSymbology" } - ], - "nullable": true + ] }, "type": { "type": "string", @@ -6699,11 +6781,11 @@ "LinearGradient": { "type": "object", "required": [ + "type", "breakpoints", "noDataColor", "overColor", - "underColor", - "type" + "underColor" ], "properties": { "breakpoints": { @@ -6732,11 +6814,11 @@ "LogarithmicGradient": { "type": "object", "required": [ + "type", "breakpoints", "noDataColor", "overColor", - "underColor", - "type" + "underColor" ], "properties": { "breakpoints": { @@ -6808,8 +6890,8 @@ "propertyName": "type", "mapping": { "GdalMetaDataList": "#/components/schemas/GdalMetaDataList", + "GdalMetaDataNetCdfCf": "#/components/schemas/GdalMetadataNetCdfCf", "GdalMetaDataRegular": "#/components/schemas/GdalMetaDataRegular", - "GdalMetadataNetCdfCf": "#/components/schemas/GdalMetadataNetCdfCf", "GdalStatic": "#/components/schemas/GdalMetaDataStatic", "MockMetaData": "#/components/schemas/MockMetaData", "OgrMetaData": "#/components/schemas/OgrMetaData" @@ -6907,14 +6989,13 @@ }, "MlModelResource": { "type": "object", - "title": "MlModelResource", "required": [ "type", "id" ], "properties": { "id": { - "$ref": "#/components/schemas/MlModelName" + "type": "string" }, "type": { "type": "string", @@ -6941,9 +7022,9 @@ "MockMetaData": { "type": "object", "required": [ + "type", "loadingInfo", - "resultDescriptor", - "type" + "resultDescriptor" ], "properties": { "loadingInfo": { @@ -6962,8 +7043,8 @@ }, "MultiBandRasterColorizer": { "type": "object", - "title": "MultiBandRasterColorizer", "required": [ + "type", "redBand", "redMin", "redMax", @@ -6972,8 +7053,7 @@ "greenMax", "blueBand", "blueMin", - "blueMax", - "type" + "blueMax" ], "properties": { "blueBand": { @@ -7019,7 +7099,8 @@ "description": "A scaling factor for the green channel between 0 and 1." }, "noDataColor": { - "$ref": "#/components/schemas/RgbaColor" + "$ref": "#/components/schemas/RgbaColor", + "description": "The color to use for no data values.\nIf not specified, the no data values will be transparent." }, "redBand": { "type": "integer", @@ -7105,13 +7186,12 @@ "type": "string" }, "NoGeometry": { - "default": null, - "nullable": true + "default": null }, "NumberParam": { "oneOf": [ { - "$ref": "#/components/schemas/StaticNumberParam" + "$ref": "#/components/schemas/StaticNumber" }, { "$ref": "#/components/schemas/DerivedNumber" @@ -7121,7 +7201,7 @@ "propertyName": "type", "mapping": { "derived": "#/components/schemas/DerivedNumber", - "static": "#/components/schemas/StaticNumberParam" + "static": "#/components/schemas/StaticNumber" } } }, @@ -7131,9 +7211,9 @@ "OgrMetaData": { "type": "object", "required": [ + "type", "loadingInfo", - "resultDescriptor", - "type" + "resultDescriptor" ], "properties": { "loadingInfo": { @@ -7175,12 +7255,14 @@ } }, "formatSpecifics": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/FormatSpecifics" } - ], - "nullable": true + ] }, "int": { "type": "array", @@ -7189,11 +7271,16 @@ } }, "rename": { - "type": "object", + "type": [ + "object", + "null" + ], "additionalProperties": { "type": "string" }, - "nullable": true + "propertyNames": { + "type": "string" + } }, "text": { "type": "array", @@ -7205,8 +7292,10 @@ "type": "string" }, "y": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } } }, @@ -7219,35 +7308,43 @@ ], "properties": { "attributeQuery": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] }, "cacheTtl": { "$ref": "#/components/schemas/CacheTtlSeconds" }, "columns": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/OgrSourceColumnSpec" } - ], - "nullable": true + ] }, "dataType": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/VectorDataType" } - ], - "nullable": true + ] }, "defaultGeometry": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/TypedGeometry" } - ], - "nullable": true + ] }, "fileName": { "type": "string" @@ -7265,8 +7362,10 @@ "$ref": "#/components/schemas/OgrSourceErrorSpec" }, "sqlQuery": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] }, "time": { "$ref": "#/components/schemas/OgrSourceDatasetTimeType" @@ -7315,10 +7414,10 @@ "OgrSourceDatasetTimeTypeStart": { "type": "object", "required": [ + "type", "startField", "startFormat", - "duration", - "type" + "duration" ], "properties": { "duration": { @@ -7340,12 +7439,11 @@ }, "OgrSourceDatasetTimeTypeStartDuration": { "type": "object", - "title": "OgrSourceDatasetTimeTypeStartDuration", "required": [ + "type", "startField", "startFormat", - "durationField", - "type" + "durationField" ], "properties": { "durationField": { @@ -7367,13 +7465,12 @@ }, "OgrSourceDatasetTimeTypeStartEnd": { "type": "object", - "title": "OgrSourceDatasetTimeTypeStartEnd", "required": [ + "type", "startField", "startFormat", "endField", - "endFormat", - "type" + "endFormat" ], "properties": { "endField": { @@ -7432,28 +7529,25 @@ } }, "OgrSourceDurationSpecValue": { - "type": "object", - "required": [ - "granularity", - "step", - "type" - ], - "properties": { - "granularity": { - "$ref": "#/components/schemas/TimeGranularity" - }, - "step": { - "type": "integer", - "format": "int32", - "minimum": 0 + "allOf": [ + { + "$ref": "#/components/schemas/TimeStep" }, - "type": { - "type": "string", - "enum": [ - "value" - ] + { + "type": "object", + "required": [ + "type" + ], + "properties": { + "type": { + "type": "string", + "enum": [ + "value" + ] + } + } } - } + ] }, "OgrSourceDurationSpecZero": { "type": "object", @@ -7514,8 +7608,8 @@ "OgrSourceTimeFormatCustom": { "type": "object", "required": [ - "customFormat", - "format" + "format", + "customFormat" ], "properties": { "customFormat": { @@ -7532,8 +7626,8 @@ "OgrSourceTimeFormatUnixTimeStamp": { "type": "object", "required": [ - "timestampType", - "format" + "format", + "timestampType" ], "properties": { "format": { @@ -7580,16 +7674,19 @@ "description": "A map from value to color\n\nIt is assumed that is has at least one and at most 256 entries.", "additionalProperties": { "$ref": "#/components/schemas/RgbaColor" + }, + "propertyNames": { + "type": "number", + "format": "double" } }, "PaletteColorizer": { "type": "object", - "title": "PaletteColorizer", "required": [ + "type", "colors", "noDataColor", - "defaultColor", - "type" + "defaultColor" ], "properties": { "colors": { @@ -7725,43 +7822,37 @@ ], "properties": { "bbox": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/BoundingBox2D" } - ], - "nullable": true + ] }, "spatialReference": { "type": "string" }, "time": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/TimeInterval" } - ], - "nullable": true + ] } } }, - "PlotUpdate": { - "oneOf": [ - { - "$ref": "#/components/schemas/ProjectUpdateToken" - }, - { - "$ref": "#/components/schemas/Plot" - } - ] - }, "PointSymbology": { "type": "object", "required": [ + "type", "radius", "fillColor", - "stroke", - "type" + "stroke" ], "properties": { "fillColor": { @@ -7774,12 +7865,14 @@ "$ref": "#/components/schemas/StrokeParam" }, "text": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/TextSymbology" } - ], - "nullable": true + ] }, "type": { "type": "string", @@ -7792,10 +7885,10 @@ "PolygonSymbology": { "type": "object", "required": [ + "type", "fillColor", "stroke", - "autoSimplified", - "type" + "autoSimplified" ], "properties": { "autoSimplified": { @@ -7808,12 +7901,14 @@ "$ref": "#/components/schemas/StrokeParam" }, "text": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/TextSymbology" } - ], - "nullable": true + ] }, "type": { "type": "string", @@ -7935,7 +8030,6 @@ }, "ProjectResource": { "type": "object", - "title": "ProjectResource", "required": [ "type", "id" @@ -8034,11 +8128,13 @@ "$ref": "#/components/schemas/DataId" }, "provenance": { - "type": "array", + "type": [ + "array", + "null" + ], "items": { "$ref": "#/components/schemas/Provenance" - }, - "nullable": true + } } } }, @@ -8185,19 +8281,23 @@ "default": true }, "description": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] }, "displayName": { "type": "string" }, "name": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/DatasetName" } - ], - "nullable": true + ] }, "query": { "$ref": "#/components/schemas/RasterQueryRectangle" @@ -8259,8 +8359,10 @@ ], "properties": { "domain": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] }, "key": { "type": "string" @@ -8300,34 +8402,40 @@ "$ref": "#/components/schemas/RasterBandDescriptors" }, "bbox": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/SpatialPartition2D" } - ], - "nullable": true + ] }, "dataType": { "$ref": "#/components/schemas/RasterDataType" }, "resolution": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/SpatialResolution" } - ], - "nullable": true + ] }, "spatialReference": { "type": "string" }, "time": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/TimeInterval" } - ], - "nullable": true + ] } } }, @@ -8341,9 +8449,9 @@ "RasterSymbology": { "type": "object", "required": [ + "type", "opacity", - "rasterColorizer", - "type" + "rasterColorizer" ], "properties": { "opacity": { @@ -8379,6 +8487,7 @@ "$ref": "#/components/schemas/MlModelResource" } ], + "description": "A resource that is affected by a permission.", "discriminator": { "propertyName": "type", "mapping": { @@ -8390,125 +8499,6 @@ } } }, - "ResourceId": { - "oneOf": [ - { - "$ref": "#/components/schemas/ResourceIdLayer" - }, - { - "$ref": "#/components/schemas/ResourceIdLayerCollection" - }, - { - "$ref": "#/components/schemas/ResourceIdProject" - }, - { - "$ref": "#/components/schemas/ResourceIdDatasetId" - }, - { - "$ref": "#/components/schemas/ResourceIdMlModel" - } - ], - "discriminator": { - "propertyName": "type", - "mapping": { - "DatasetId": "#/components/schemas/ResourceIdDatasetId", - "Layer": "#/components/schemas/ResourceIdLayer", - "LayerCollection": "#/components/schemas/ResourceIdLayerCollection", - "MlModel": "#/components/schemas/ResourceIdMlModel", - "Project": "#/components/schemas/ResourceIdProject" - } - } - }, - "ResourceIdDatasetId": { - "type": "object", - "required": [ - "type", - "id" - ], - "properties": { - "id": { - "$ref": "#/components/schemas/DatasetId" - }, - "type": { - "type": "string", - "enum": [ - "DatasetId" - ] - } - } - }, - "ResourceIdLayer": { - "type": "object", - "required": [ - "type", - "id" - ], - "properties": { - "id": { - "$ref": "#/components/schemas/LayerId" - }, - "type": { - "type": "string", - "enum": [ - "Layer" - ] - } - } - }, - "ResourceIdLayerCollection": { - "type": "object", - "required": [ - "type", - "id" - ], - "properties": { - "id": { - "$ref": "#/components/schemas/LayerCollectionId" - }, - "type": { - "type": "string", - "enum": [ - "LayerCollection" - ] - } - } - }, - "ResourceIdMlModel": { - "type": "object", - "required": [ - "type", - "id" - ], - "properties": { - "id": { - "$ref": "#/components/schemas/MlModelId" - }, - "type": { - "type": "string", - "enum": [ - "MlModel" - ] - } - } - }, - "ResourceIdProject": { - "type": "object", - "required": [ - "type", - "id" - ], - "properties": { - "id": { - "$ref": "#/components/schemas/ProjectId" - }, - "type": { - "type": "string", - "enum": [ - "Project" - ] - } - } - }, "RgbaColor": { "type": "array", "items": { @@ -8581,11 +8571,13 @@ "type": "boolean" }, "filters": { - "type": "array", + "type": [ + "array", + "null" + ], "items": { "type": "string" - }, - "nullable": true + } }, "searchTypes": { "$ref": "#/components/schemas/SearchTypes" @@ -8643,11 +8635,10 @@ }, "SingleBandRasterColorizer": { "type": "object", - "title": "SingleBandRasterColorizer", "required": [ + "type", "band", - "bandColorizer", - "type" + "bandColorizer" ], "properties": { "band": { @@ -8703,20 +8694,24 @@ ], "properties": { "axisLabels": { - "allOf": [ + "oneOf": [ { - "$ref": "#/components/schemas/AxisLabels" + "type": "null" + }, + { + "$ref": "#/components/schemas/StringPair" } - ], - "nullable": true + ] }, "axisOrder": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/AxisOrder" } - ], - "nullable": true + ] }, "extent": { "$ref": "#/components/schemas/BoundingBox2D" @@ -8750,12 +8745,29 @@ } } }, - "StaticNumberParam": { + "StaticColor": { "type": "object", - "title": "StaticNumberParam", "required": [ - "value", - "type" + "type", + "color" + ], + "properties": { + "color": { + "$ref": "#/components/schemas/RgbaColor" + }, + "type": { + "type": "string", + "enum": [ + "static" + ] + } + } + }, + "StaticNumber": { + "type": "object", + "required": [ + "type", + "value" ], "properties": { "type": { @@ -8770,6 +8782,14 @@ } } }, + "StringPair": { + "type": "array", + "items": { + "type": "string" + }, + "maxItems": 2, + "minItems": 2 + }, "StrokeParam": { "type": "object", "required": [ @@ -8795,12 +8815,16 @@ "$ref": "#/components/schemas/DataPath" }, "layerName": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] }, "mainFile": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } } }, @@ -8854,12 +8878,14 @@ "type": "object", "properties": { "filter": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/TaskFilter" } - ], - "nullable": true + ] }, "limit": { "type": "integer", @@ -8888,123 +8914,115 @@ "TaskStatus": { "oneOf": [ { - "$ref": "#/components/schemas/TaskStatusRunning" + "type": "object", + "title": "TaskStatusRunning", + "required": [ + "status", + "taskType", + "pctComplete", + "estimatedTimeRemaining", + "timeStarted" + ], + "properties": { + "description": { + "type": "string" + }, + "estimatedTimeRemaining": { + "type": "string" + }, + "info": {}, + "pctComplete": { + "type": "string" + }, + "status": { + "type": "string", + "enum": [ + "running" + ] + }, + "taskType": { + "type": "string" + }, + "timeStarted": { + "type": "string" + } + } }, { - "$ref": "#/components/schemas/TaskStatusCompleted" + "type": "object", + "title": "TaskStatusCompleted", + "required": [ + "status", + "taskType", + "timeTotal", + "timeStarted" + ], + "properties": { + "description": { + "type": "string" + }, + "info": {}, + "status": { + "type": "string", + "enum": [ + "completed" + ] + }, + "taskType": { + "type": "string" + }, + "timeStarted": { + "type": "string" + }, + "timeTotal": { + "type": "string" + } + } }, { - "$ref": "#/components/schemas/TaskStatusAborted" + "type": "object", + "title": "TaskStatusAborted", + "required": [ + "status", + "cleanUp" + ], + "properties": { + "cleanUp": {}, + "status": { + "type": "string", + "enum": [ + "aborted" + ] + } + } }, { - "$ref": "#/components/schemas/TaskStatusFailed" + "type": "object", + "title": "TaskStatusFailed", + "required": [ + "status", + "error", + "cleanUp" + ], + "properties": { + "cleanUp": {}, + "error": {}, + "status": { + "type": "string", + "enum": [ + "failed" + ] + } + } } ], "discriminator": { "propertyName": "status", "mapping": { - "aborted": "#/components/schemas/TaskStatusAborted", - "completed": "#/components/schemas/TaskStatusCompleted", - "failed": "#/components/schemas/TaskStatusFailed", - "running": "#/components/schemas/TaskStatusRunning" - } - } - }, - "TaskStatusAborted": { - "type": "object", - "required": [ - "status", - "cleanUp" - ], - "properties": { - "cleanUp": {}, - "status": { - "type": "string", - "enum": [ - "aborted" - ] - } - } - }, - "TaskStatusCompleted": { - "type": "object", - "required": [ - "status", - "taskType", - "timeTotal", - "timeStarted" - ], - "properties": { - "description": { - "type": "string" - }, - "info": {}, - "status": { - "type": "string", - "enum": [ - "completed" - ] - }, - "taskType": { - "type": "string" - }, - "timeStarted": { - "type": "string" - }, - "timeTotal": { - "type": "string" - } - } - }, - "TaskStatusFailed": { - "type": "object", - "required": [ - "status", - "error", - "cleanUp" - ], - "properties": { - "cleanUp": {}, - "error": {}, - "status": { - "type": "string", - "enum": [ - "failed" - ] - } - } - }, - "TaskStatusRunning": { - "type": "object", - "required": [ - "status", - "taskType", - "pctComplete", - "estimatedTimeRemaining", - "timeStarted" - ], - "properties": { - "description": { - "type": "string" - }, - "estimatedTimeRemaining": { - "type": "string" - }, - "info": {}, - "pctComplete": { - "type": "string" - }, - "status": { - "type": "string", - "enum": [ - "running" - ] - }, - "taskType": { - "type": "string" - }, - "timeStarted": { - "type": "string" + "aborted": "TaskStatusAborted", + "completed": "TaskStatusCompleted", + "failed": "TaskStatusFailed", + "running": "TaskStatusRunning" } } }, @@ -9187,107 +9205,65 @@ ] } }, - "example": { - "type": "MockPointSource", - "params": { - "points": [ - { - "x": 0.0, - "y": 0.1 - }, - { - "x": 1.0, - "y": 1.1 - } - ] + "examples": [ + { + "type": "MockPointSource", + "params": { + "points": [ + { + "x": 0.0, + "y": 0.1 + }, + { + "x": 1.0, + "y": 1.1 + } + ] + } } - } + ] }, "TypedPlotResultDescriptor": { - "type": "object", - "description": "A `ResultDescriptor` for plot queries", - "required": [ - "spatialReference", - "type" - ], - "properties": { - "bbox": { - "allOf": [ - { - "$ref": "#/components/schemas/BoundingBox2D" - } - ], - "nullable": true - }, - "spatialReference": { - "type": "string" + "allOf": [ + { + "$ref": "#/components/schemas/PlotResultDescriptor" }, - "time": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeInterval" - } + { + "type": "object", + "required": [ + "type" ], - "nullable": true - }, - "type": { - "type": "string", - "enum": [ - "plot" - ] + "properties": { + "type": { + "type": "string", + "enum": [ + "plot" + ] + } + } } - } + ] }, "TypedRasterResultDescriptor": { - "type": "object", - "description": "A `ResultDescriptor` for raster queries", - "required": [ - "dataType", - "spatialReference", - "bands", - "type" - ], - "properties": { - "bands": { - "$ref": "#/components/schemas/RasterBandDescriptors" - }, - "bbox": { - "allOf": [ - { - "$ref": "#/components/schemas/SpatialPartition2D" - } - ], - "nullable": true - }, - "dataType": { - "$ref": "#/components/schemas/RasterDataType" + "allOf": [ + { + "$ref": "#/components/schemas/RasterResultDescriptor" }, - "resolution": { - "allOf": [ - { - "$ref": "#/components/schemas/SpatialResolution" - } + { + "type": "object", + "required": [ + "type" ], - "nullable": true - }, - "spatialReference": { - "type": "string" - }, - "time": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeInterval" + "properties": { + "type": { + "type": "string", + "enum": [ + "raster" + ] } - ], - "nullable": true - }, - "type": { - "type": "string", - "enum": [ - "raster" - ] + } } - } + ] }, "TypedResultDescriptor": { "oneOf": [ @@ -9311,53 +9287,28 @@ } }, "TypedVectorResultDescriptor": { - "type": "object", - "required": [ - "dataType", - "spatialReference", - "columns", - "type" - ], - "properties": { - "bbox": { - "allOf": [ - { - "$ref": "#/components/schemas/BoundingBox2D" - } - ], - "nullable": true + "allOf": [ + { + "$ref": "#/components/schemas/VectorResultDescriptor" }, - "columns": { + { "type": "object", - "additionalProperties": { - "$ref": "#/components/schemas/VectorColumnInfo" - } - }, - "dataType": { - "$ref": "#/components/schemas/VectorDataType" - }, - "spatialReference": { - "type": "string" - }, - "time": { - "allOf": [ - { - "$ref": "#/components/schemas/TimeInterval" - } + "required": [ + "type" ], - "nullable": true - }, - "type": { - "type": "string", - "enum": [ - "vector" - ] + "properties": { + "type": { + "type": "string", + "enum": [ + "vector" + ] + } + } } - } + ] }, "UnitlessMeasurement": { "type": "object", - "title": "UnitlessMeasurement", "required": [ "type" ], @@ -9420,6 +9371,9 @@ "description": "metadata used for loading the data", "additionalProperties": { "type": "string" + }, + "propertyNames": { + "type": "string" } }, "name": { @@ -9434,12 +9388,14 @@ "description": "properties, for instance, to be rendered in the UI" }, "symbology": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/Symbology" } - ], - "nullable": true + ] }, "workflow": { "$ref": "#/components/schemas/Workflow" @@ -9476,45 +9432,57 @@ ], "properties": { "bounds": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/STRectangle" } - ], - "nullable": true + ] }, "description": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] }, "id": { "$ref": "#/components/schemas/ProjectId" }, "layers": { - "type": "array", + "type": [ + "array", + "null" + ], "items": { - "$ref": "#/components/schemas/LayerUpdate" - }, - "nullable": true + "$ref": "#/components/schemas/VecUpdate" + } }, "name": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] }, "plots": { - "type": "array", + "type": [ + "array", + "null" + ], "items": { - "$ref": "#/components/schemas/PlotUpdate" - }, - "nullable": true + "$ref": "#/components/schemas/VecUpdate" + } }, "timeStep": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/TimeStep" } - ], - "nullable": true + ] } }, "example": { @@ -9661,15 +9629,19 @@ ], "properties": { "email": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] }, "id": { "$ref": "#/components/schemas/UserId" }, "realName": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } } }, @@ -9715,12 +9687,14 @@ "$ref": "#/components/schemas/SessionId" }, "project": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/ProjectId" } - ], - "nullable": true + ] }, "roles": { "type": "array", @@ -9736,15 +9710,27 @@ "format": "date-time" }, "view": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/STRectangle" } - ], - "nullable": true + ] } } }, + "VecUpdate": { + "oneOf": [ + { + "$ref": "#/components/schemas/ProjectUpdateToken" + }, + { + "$ref": "#/components/schemas/Plot" + } + ] + }, "VectorColumnInfo": { "type": "object", "required": [ @@ -9799,17 +9785,22 @@ ], "properties": { "bbox": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/BoundingBox2D" } - ], - "nullable": true + ] }, "columns": { "type": "object", "additionalProperties": { "$ref": "#/components/schemas/VectorColumnInfo" + }, + "propertyNames": { + "type": "string" } }, "dataType": { @@ -9819,12 +9810,14 @@ "type": "string" }, "time": { - "allOf": [ + "oneOf": [ + { + "type": "null" + }, { "$ref": "#/components/schemas/TimeInterval" } - ], - "nullable": true + ] } } }, @@ -9838,8 +9831,10 @@ "type": "string" }, "path": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } } }, @@ -9874,8 +9869,10 @@ } }, "spatial_reference": { - "type": "string", - "nullable": true + "type": [ + "string", + "null" + ] } } }, @@ -9923,9 +9920,6 @@ "allOf": [ { "$ref": "#/components/schemas/TypedOperator" - }, - { - "type": "object" } ] }, @@ -9954,25 +9948,6 @@ } }, "responses": { - "AuthCodeRequestURL": { - "description": "", - "content": { - "application/json": { - "schema": { - "type": "object", - "required": [ - "url" - ], - "properties": { - "url": { - "type": "string", - "format": "uri" - } - } - } - } - } - }, "BadRequestQueryResponse": { "description": "Bad request", "content": { @@ -9997,33 +9972,13 @@ } } }, - "DatasetNameResponse": { - "description": "Name of generated resource", - "content": { - "application/json": { - "schema": { - "type": "object", - "required": [ - "datasetName" - ], - "properties": { - "datasetName": { - "$ref": "#/components/schemas/DatasetName" - } - } - }, - "example": { - "name": "ns:name" - } - } - } - }, "IdResponse": { "description": "Id of generated resource", "content": { "application/json": { "schema": { "type": "object", + "title": "IdResponse", "required": [ "id" ], @@ -10071,8 +10026,7 @@ "schema": { "type": "string", "format": "binary" - }, - "example": "image bytes" + } } } }, @@ -10175,8 +10129,7 @@ "schema": { "type": "string", "format": "binary" - }, - "example": "zip bytes" + } } } } @@ -10186,7 +10139,7 @@ "type": "http", "scheme": "bearer", "bearerFormat": "UUID", - "description": "A valid session token can be obtained via the /anonymous or /login (pro only) endpoints. Alternatively, it can be defined as a fixed value in the Settings.toml file." + "description": "A valid session token can be obtained via the /anonymous or /login endpoints." } } }, @@ -10194,4 +10147,4 @@ "url": "https://docs.geoengine.io", "description": "Geo Engine Docs" } -} \ No newline at end of file +} diff --git a/.generation/post-process/python.py b/.generation/post-process/python.py index c58cfcf6..5ef8a6a4 100644 --- a/.generation/post-process/python.py +++ b/.generation/post-process/python.py @@ -123,7 +123,8 @@ def layers_api_py(file_contents: List[str]) -> Generator[str, None, None]: yield line def ogc_xyz_api_py(ogc_api: Literal['wfs', 'wms']) -> Callable[[List[str]], Generator[str, None, None]]: - def ogc_wfs_api_py(file_contents: List[str]) -> Generator[str, None, None]: + '''Modify the ogc_xyz_api.py file.''' + def _ogc_xyz_api_py(file_contents: List[str]) -> Generator[str, None, None]: '''Modify the ogc_wfs_api.py file.''' for line in file_contents: dedented_line = dedent(line) @@ -134,7 +135,112 @@ def ogc_wfs_api_py(file_contents: List[str]) -> Generator[str, None, None]: '''), 3 * INDENT) yield line - return ogc_wfs_api_py + return _ogc_xyz_api_py + + +def raster_result_descriptor_py(file_contents: List[str]) -> Generator[str, None, None]: + ''' + Modify the raster_result_descriptor.py file. + + TODO: remove when bug is fixed: + https://github.com/OpenAPITools/openapi-generator/issues/19926 + ''' + + for line in file_contents: + dedented_line = dedent(line) + if dedented_line.startswith( + '"""Create an instance of RasterResultDescriptor from a dict"""' + ): + line = line + '\n' + indent(dedent('''\ + # Note: fixed + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + _obj = cls.model_validate({ + "bands": [RasterBandDescriptor.from_dict(_item) for _item in obj["bands"]] if obj.get("bands") is not None else None, + "bbox": SpatialPartition2D.from_dict(obj["bbox"]) if obj.get("bbox") is not None else None, + "dataType": obj.get("dataType"), + "resolution": SpatialResolution.from_dict(obj["resolution"]) if obj.get("resolution") is not None else None, + "spatialReference": obj.get("spatialReference"), + "time": TimeInterval.from_dict(obj["time"]) if obj.get("time") is not None else None, + }) + return _obj + '''), 2 * INDENT) + + yield line + +def vector_result_descriptor_py(file_contents: List[str]) -> Generator[str, None, None]: + ''' + Modify the vector_result_descriptor.py file. + + TODO: remove when bug is fixed: + https://github.com/OpenAPITools/openapi-generator/issues/19926 + ''' + + for line in file_contents: + dedented_line = dedent(line) + if dedented_line.startswith( + '"""Create an instance of VectorResultDescriptor from a dict"""' + ): + line = line + '\n' + indent(dedent('''\ + # Note: fixed + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + _obj = cls.model_validate({ + "bbox": BoundingBox2D.from_dict(obj["bbox"]) if obj.get("bbox") is not None else None, + "columns": dict( + (_k, VectorColumnInfo.from_dict(_v)) + for _k, _v in obj["columns"].items() + ) + if obj.get("columns") is not None + else None, + "dataType": obj.get("dataType"), + "spatialReference": obj.get("spatialReference"), + "time": TimeInterval.from_dict(obj["time"]) if obj.get("time") is not None else None, + }) + return _obj + '''), 2 * INDENT) + + yield line + + +def plot_result_descriptor_py(file_contents: List[str]) -> Generator[str, None, None]: + ''' + Modify the plot_result_descriptor.py file. + + TODO: remove when bug is fixed: + https://github.com/OpenAPITools/openapi-generator/issues/19926 + ''' + + for line in file_contents: + dedented_line = dedent(line) + if dedented_line.startswith( + '"""Create an instance of PlotResultDescriptor from a dict"""' + ): + line = line + '\n' + indent(dedent('''\ + # Note: fixed + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + _obj = cls.model_validate({ + "bbox": BoundingBox2D.from_dict(obj["bbox"]) if obj.get("bbox") is not None else None, + "spatialReference": obj.get("spatialReference"), + "time": TimeInterval.from_dict(obj["time"]) if obj.get("time") is not None else None, + }) + return _obj + '''), 2 * INDENT) + + yield line input_file = Path(sys.argv[1]) @@ -144,8 +250,11 @@ def ogc_wfs_api_py(file_contents: List[str]) -> Generator[str, None, None]: 'layers_api.py': layers_api_py, 'ogcwfs_api.py': ogc_xyz_api_py('wfs'), 'ogcwms_api.py': ogc_xyz_api_py('wms'), + 'plot_result_descriptor.py': plot_result_descriptor_py, + 'raster_result_descriptor.py': raster_result_descriptor_py, 'task_status_with_id.py': task_status_with_id_py, 'tasks_api.py': tasks_api_py, + 'vector_result_descriptor.py': vector_result_descriptor_py, } if modifier_function := file_modifications.get(input_file.name): diff --git a/.generation/post-process/typescript.py b/.generation/post-process/typescript.py index bb74d521..ed653d3c 100644 --- a/.generation/post-process/typescript.py +++ b/.generation/post-process/typescript.py @@ -54,7 +54,7 @@ def layer_update_ts(file_contents: List[str]) -> Generator[str, None, None]: # Fix: interface cannot inherit union type def task_status_with_id_ts(file_contents: List[str]) -> Generator[str, None, None]: - '''Modify the LayerUpdate.ts file.''' + '''Modify the TaskStatusWithId.ts file.''' for line in file_contents: dedented_line = dedent(line) @@ -67,6 +67,16 @@ def task_status_with_id_ts(file_contents: List[str]) -> Generator[str, None, Non yield line +def vec_update_ts(file_contents: List[str]) -> Generator[str, None, None]: + '''Modify the VecUpdate.ts file.''' + for line in file_contents: + dedented_line = dedent(line) + + if dedented_line.startswith('if (instanceOfPlot(value)) {'): + line = indent("if (typeof value === 'object' && instanceOfPlot(value)) {\n", INDENT) + + yield line + input_file = Path(sys.argv[1]) @@ -75,6 +85,7 @@ def task_status_with_id_ts(file_contents: List[str]) -> Generator[str, None, Non 'PlotUpdate.ts': plot_update_ts, 'runtime.ts': runtime_ts, 'TaskStatusWithId.ts': task_status_with_id_ts, + 'VecUpdate.ts': vec_update_ts, } if modifier_function := file_modifications.get(input_file.name): modify_file(input_file, modifier_function) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 9f53ac84..50e0589a 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -17,7 +17,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ["3.8", "3.9", "3.10", "3.11", "3.12"] + python-version: ["3.9", "3.10", "3.11", "3.12", "3.13"] defaults: run: @@ -42,7 +42,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [ 16.20.x, 18.19.x, 20.10.x ] + node-version: [ 18.19.x, 20.11.x, 22.0.x ] defaults: run: diff --git a/.openapi-generator/FILES b/.openapi-generator/FILES deleted file mode 100644 index b33eda64..00000000 --- a/.openapi-generator/FILES +++ /dev/null @@ -1,482 +0,0 @@ -README.md -geoengine_openapi_client/__init__.py -geoengine_openapi_client/api/__init__.py -geoengine_openapi_client/api/datasets_api.py -geoengine_openapi_client/api/general_api.py -geoengine_openapi_client/api/layers_api.py -geoengine_openapi_client/api/ogcwcs_api.py -geoengine_openapi_client/api/ogcwfs_api.py -geoengine_openapi_client/api/ogcwms_api.py -geoengine_openapi_client/api/permissions_api.py -geoengine_openapi_client/api/plots_api.py -geoengine_openapi_client/api/projects_api.py -geoengine_openapi_client/api/session_api.py -geoengine_openapi_client/api/spatial_references_api.py -geoengine_openapi_client/api/tasks_api.py -geoengine_openapi_client/api/uploads_api.py -geoengine_openapi_client/api/user_api.py -geoengine_openapi_client/api/workflows_api.py -geoengine_openapi_client/api_client.py -geoengine_openapi_client/api_response.py -geoengine_openapi_client/configuration.py -geoengine_openapi_client/exceptions.py -geoengine_openapi_client/models/__init__.py -geoengine_openapi_client/models/aborted_task_status.py -geoengine_openapi_client/models/add_collection200_response.py -geoengine_openapi_client/models/add_dataset.py -geoengine_openapi_client/models/add_layer.py -geoengine_openapi_client/models/add_layer_collection.py -geoengine_openapi_client/models/add_role.py -geoengine_openapi_client/models/auto_create_dataset.py -geoengine_openapi_client/models/auto_ogr_source_time_format.py -geoengine_openapi_client/models/axis_order.py -geoengine_openapi_client/models/bounding_box2_d.py -geoengine_openapi_client/models/breakpoint.py -geoengine_openapi_client/models/classification_measurement.py -geoengine_openapi_client/models/classification_measurement_with_type.py -geoengine_openapi_client/models/collection_item.py -geoengine_openapi_client/models/collection_type.py -geoengine_openapi_client/models/color_param.py -geoengine_openapi_client/models/colorizer.py -geoengine_openapi_client/models/completed_task_status.py -geoengine_openapi_client/models/continuous_measurement.py -geoengine_openapi_client/models/continuous_measurement_with_type.py -geoengine_openapi_client/models/coordinate2_d.py -geoengine_openapi_client/models/create_dataset.py -geoengine_openapi_client/models/create_dataset_handler200_response.py -geoengine_openapi_client/models/create_project.py -geoengine_openapi_client/models/csv_header.py -geoengine_openapi_client/models/custom_ogr_source_time_format.py -geoengine_openapi_client/models/data_id.py -geoengine_openapi_client/models/data_path.py -geoengine_openapi_client/models/data_path_one_of.py -geoengine_openapi_client/models/data_path_one_of1.py -geoengine_openapi_client/models/dataset.py -geoengine_openapi_client/models/dataset_definition.py -geoengine_openapi_client/models/dataset_id_resource_id.py -geoengine_openapi_client/models/dataset_listing.py -geoengine_openapi_client/models/dataset_resource.py -geoengine_openapi_client/models/date_time.py -geoengine_openapi_client/models/date_time_parse_format.py -geoengine_openapi_client/models/derived_color.py -geoengine_openapi_client/models/derived_color_with_type.py -geoengine_openapi_client/models/derived_number.py -geoengine_openapi_client/models/derived_number_with_type.py -geoengine_openapi_client/models/describe_coverage_request.py -geoengine_openapi_client/models/error_response.py -geoengine_openapi_client/models/external_data_id.py -geoengine_openapi_client/models/external_data_id_with_type.py -geoengine_openapi_client/models/failed_task_status.py -geoengine_openapi_client/models/feature_data_type.py -geoengine_openapi_client/models/file_not_found_handling.py -geoengine_openapi_client/models/format_specifics.py -geoengine_openapi_client/models/format_specifics_one_of.py -geoengine_openapi_client/models/format_specifics_one_of_csv.py -geoengine_openapi_client/models/gdal_dataset_geo_transform.py -geoengine_openapi_client/models/gdal_dataset_parameters.py -geoengine_openapi_client/models/gdal_loading_info_temporal_slice.py -geoengine_openapi_client/models/gdal_meta_data_list.py -geoengine_openapi_client/models/gdal_meta_data_list_with_type.py -geoengine_openapi_client/models/gdal_meta_data_regular.py -geoengine_openapi_client/models/gdal_meta_data_regular_with_type.py -geoengine_openapi_client/models/gdal_meta_data_static.py -geoengine_openapi_client/models/gdal_meta_data_static_with_type.py -geoengine_openapi_client/models/gdal_metadata_mapping.py -geoengine_openapi_client/models/gdal_metadata_net_cdf_cf.py -geoengine_openapi_client/models/gdal_metadata_net_cdf_cf_with_type.py -geoengine_openapi_client/models/gdal_source_time_placeholder.py -geoengine_openapi_client/models/geo_json.py -geoengine_openapi_client/models/get_capabilities_format.py -geoengine_openapi_client/models/get_capabilities_request.py -geoengine_openapi_client/models/get_coverage_format.py -geoengine_openapi_client/models/get_coverage_request.py -geoengine_openapi_client/models/get_feature_request.py -geoengine_openapi_client/models/get_legend_graphic_request.py -geoengine_openapi_client/models/get_map_exception_format.py -geoengine_openapi_client/models/get_map_format.py -geoengine_openapi_client/models/get_map_request.py -geoengine_openapi_client/models/infinite_ogr_source_duration_spec.py -geoengine_openapi_client/models/internal_data_id.py -geoengine_openapi_client/models/layer.py -geoengine_openapi_client/models/layer_collection.py -geoengine_openapi_client/models/layer_collection_listing.py -geoengine_openapi_client/models/layer_collection_listing_with_type.py -geoengine_openapi_client/models/layer_collection_resource.py -geoengine_openapi_client/models/layer_collection_resource_id.py -geoengine_openapi_client/models/layer_listing.py -geoengine_openapi_client/models/layer_listing_with_type.py -geoengine_openapi_client/models/layer_resource.py -geoengine_openapi_client/models/layer_resource_id.py -geoengine_openapi_client/models/layer_update.py -geoengine_openapi_client/models/layer_visibility.py -geoengine_openapi_client/models/line_symbology.py -geoengine_openapi_client/models/line_symbology_with_type.py -geoengine_openapi_client/models/linear_gradient.py -geoengine_openapi_client/models/linear_gradient_with_type.py -geoengine_openapi_client/models/logarithmic_gradient.py -geoengine_openapi_client/models/logarithmic_gradient_with_type.py -geoengine_openapi_client/models/measurement.py -geoengine_openapi_client/models/meta_data_definition.py -geoengine_openapi_client/models/meta_data_suggestion.py -geoengine_openapi_client/models/mock_dataset_data_source_loading_info.py -geoengine_openapi_client/models/mock_meta_data.py -geoengine_openapi_client/models/mock_meta_data_with_type.py -geoengine_openapi_client/models/model_id_resource_id.py -geoengine_openapi_client/models/multi_line_string.py -geoengine_openapi_client/models/multi_point.py -geoengine_openapi_client/models/multi_polygon.py -geoengine_openapi_client/models/none_ogr_source_dataset_time_type.py -geoengine_openapi_client/models/number_param.py -geoengine_openapi_client/models/ogr_meta_data.py -geoengine_openapi_client/models/ogr_meta_data_with_type.py -geoengine_openapi_client/models/ogr_source_column_spec.py -geoengine_openapi_client/models/ogr_source_dataset.py -geoengine_openapi_client/models/ogr_source_dataset_time_type.py -geoengine_openapi_client/models/ogr_source_duration_spec.py -geoengine_openapi_client/models/ogr_source_error_spec.py -geoengine_openapi_client/models/ogr_source_time_format.py -geoengine_openapi_client/models/order_by.py -geoengine_openapi_client/models/palette_colorizer.py -geoengine_openapi_client/models/permission.py -geoengine_openapi_client/models/permission_request.py -geoengine_openapi_client/models/plot.py -geoengine_openapi_client/models/plot_output_format.py -geoengine_openapi_client/models/plot_query_rectangle.py -geoengine_openapi_client/models/plot_result_descriptor.py -geoengine_openapi_client/models/plot_result_descriptor_with_type.py -geoengine_openapi_client/models/plot_update.py -geoengine_openapi_client/models/point_symbology.py -geoengine_openapi_client/models/point_symbology_with_type.py -geoengine_openapi_client/models/polygon_symbology.py -geoengine_openapi_client/models/polygon_symbology_with_type.py -geoengine_openapi_client/models/project.py -geoengine_openapi_client/models/project_layer.py -geoengine_openapi_client/models/project_listing.py -geoengine_openapi_client/models/project_resource.py -geoengine_openapi_client/models/project_resource_id.py -geoengine_openapi_client/models/project_version.py -geoengine_openapi_client/models/provenance.py -geoengine_openapi_client/models/provenance_entry.py -geoengine_openapi_client/models/provenance_output.py -geoengine_openapi_client/models/provider_layer_collection_id.py -geoengine_openapi_client/models/provider_layer_id.py -geoengine_openapi_client/models/quota.py -geoengine_openapi_client/models/raster_band_descriptor.py -geoengine_openapi_client/models/raster_data_type.py -geoengine_openapi_client/models/raster_dataset_from_workflow.py -geoengine_openapi_client/models/raster_dataset_from_workflow_result.py -geoengine_openapi_client/models/raster_properties_entry_type.py -geoengine_openapi_client/models/raster_properties_key.py -geoengine_openapi_client/models/raster_query_rectangle.py -geoengine_openapi_client/models/raster_result_descriptor.py -geoengine_openapi_client/models/raster_result_descriptor_with_type.py -geoengine_openapi_client/models/raster_stream_websocket_result_type.py -geoengine_openapi_client/models/raster_symbology.py -geoengine_openapi_client/models/raster_symbology_with_type.py -geoengine_openapi_client/models/resource.py -geoengine_openapi_client/models/resource_id.py -geoengine_openapi_client/models/rgba_colorizer.py -geoengine_openapi_client/models/role.py -geoengine_openapi_client/models/role_description.py -geoengine_openapi_client/models/running_task_status.py -geoengine_openapi_client/models/server_info.py -geoengine_openapi_client/models/spatial_partition2_d.py -geoengine_openapi_client/models/spatial_reference_authority.py -geoengine_openapi_client/models/spatial_reference_specification.py -geoengine_openapi_client/models/spatial_resolution.py -geoengine_openapi_client/models/st_rectangle.py -geoengine_openapi_client/models/start_duration_ogr_source_dataset_time_type.py -geoengine_openapi_client/models/start_end_ogr_source_dataset_time_type.py -geoengine_openapi_client/models/start_ogr_source_dataset_time_type.py -geoengine_openapi_client/models/static_color_param.py -geoengine_openapi_client/models/static_number_param.py -geoengine_openapi_client/models/stroke_param.py -geoengine_openapi_client/models/symbology.py -geoengine_openapi_client/models/task_abort_options.py -geoengine_openapi_client/models/task_filter.py -geoengine_openapi_client/models/task_list_options.py -geoengine_openapi_client/models/task_response.py -geoengine_openapi_client/models/task_status.py -geoengine_openapi_client/models/task_status_with_id.py -geoengine_openapi_client/models/text_symbology.py -geoengine_openapi_client/models/time_granularity.py -geoengine_openapi_client/models/time_interval.py -geoengine_openapi_client/models/time_reference.py -geoengine_openapi_client/models/time_step.py -geoengine_openapi_client/models/time_step_with_type.py -geoengine_openapi_client/models/typed_geometry.py -geoengine_openapi_client/models/typed_geometry_one_of.py -geoengine_openapi_client/models/typed_geometry_one_of1.py -geoengine_openapi_client/models/typed_geometry_one_of2.py -geoengine_openapi_client/models/typed_geometry_one_of3.py -geoengine_openapi_client/models/typed_operator.py -geoengine_openapi_client/models/typed_operator_operator.py -geoengine_openapi_client/models/typed_result_descriptor.py -geoengine_openapi_client/models/unitless_measurement.py -geoengine_openapi_client/models/unix_time_stamp_ogr_source_time_format.py -geoengine_openapi_client/models/unix_time_stamp_type.py -geoengine_openapi_client/models/update_project.py -geoengine_openapi_client/models/update_quota.py -geoengine_openapi_client/models/upload_file_layers_response.py -geoengine_openapi_client/models/upload_files_response.py -geoengine_openapi_client/models/user_credentials.py -geoengine_openapi_client/models/user_info.py -geoengine_openapi_client/models/user_registration.py -geoengine_openapi_client/models/user_session.py -geoengine_openapi_client/models/vector_column_info.py -geoengine_openapi_client/models/vector_data_type.py -geoengine_openapi_client/models/vector_query_rectangle.py -geoengine_openapi_client/models/vector_result_descriptor.py -geoengine_openapi_client/models/vector_result_descriptor_with_type.py -geoengine_openapi_client/models/volume.py -geoengine_openapi_client/models/wcs_boundingbox.py -geoengine_openapi_client/models/wcs_service.py -geoengine_openapi_client/models/wcs_version.py -geoengine_openapi_client/models/wfs_service.py -geoengine_openapi_client/models/wfs_version.py -geoengine_openapi_client/models/wms_service.py -geoengine_openapi_client/models/wms_version.py -geoengine_openapi_client/models/workflow.py -geoengine_openapi_client/models/wrapped_plot_output.py -geoengine_openapi_client/models/zero_ogr_source_duration_spec.py -geoengine_openapi_client/py.typed -geoengine_openapi_client/rest.py -pyproject.toml -requirements.txt -setup.cfg -setup.py -test-requirements.txt -test/__init__.py -test/test_aborted_task_status.py -test/test_add_collection200_response.py -test/test_add_dataset.py -test/test_add_layer.py -test/test_add_layer_collection.py -test/test_add_role.py -test/test_auto_create_dataset.py -test/test_auto_ogr_source_time_format.py -test/test_axis_order.py -test/test_bounding_box2_d.py -test/test_breakpoint.py -test/test_classification_measurement.py -test/test_classification_measurement_with_type.py -test/test_collection_item.py -test/test_collection_type.py -test/test_color_param.py -test/test_colorizer.py -test/test_completed_task_status.py -test/test_continuous_measurement.py -test/test_continuous_measurement_with_type.py -test/test_coordinate2_d.py -test/test_create_dataset.py -test/test_create_dataset_handler200_response.py -test/test_create_project.py -test/test_csv_header.py -test/test_custom_ogr_source_time_format.py -test/test_data_id.py -test/test_data_path.py -test/test_data_path_one_of.py -test/test_data_path_one_of1.py -test/test_dataset.py -test/test_dataset_definition.py -test/test_dataset_id_resource_id.py -test/test_dataset_listing.py -test/test_dataset_resource.py -test/test_datasets_api.py -test/test_date_time.py -test/test_date_time_parse_format.py -test/test_derived_color.py -test/test_derived_color_with_type.py -test/test_derived_number.py -test/test_derived_number_with_type.py -test/test_describe_coverage_request.py -test/test_error_response.py -test/test_external_data_id.py -test/test_external_data_id_with_type.py -test/test_failed_task_status.py -test/test_feature_data_type.py -test/test_file_not_found_handling.py -test/test_format_specifics.py -test/test_format_specifics_one_of.py -test/test_format_specifics_one_of_csv.py -test/test_gdal_dataset_geo_transform.py -test/test_gdal_dataset_parameters.py -test/test_gdal_loading_info_temporal_slice.py -test/test_gdal_meta_data_list.py -test/test_gdal_meta_data_list_with_type.py -test/test_gdal_meta_data_regular.py -test/test_gdal_meta_data_regular_with_type.py -test/test_gdal_meta_data_static.py -test/test_gdal_meta_data_static_with_type.py -test/test_gdal_metadata_mapping.py -test/test_gdal_metadata_net_cdf_cf.py -test/test_gdal_metadata_net_cdf_cf_with_type.py -test/test_gdal_source_time_placeholder.py -test/test_general_api.py -test/test_geo_json.py -test/test_get_capabilities_format.py -test/test_get_capabilities_request.py -test/test_get_coverage_format.py -test/test_get_coverage_request.py -test/test_get_feature_request.py -test/test_get_legend_graphic_request.py -test/test_get_map_exception_format.py -test/test_get_map_format.py -test/test_get_map_request.py -test/test_infinite_ogr_source_duration_spec.py -test/test_internal_data_id.py -test/test_layer.py -test/test_layer_collection.py -test/test_layer_collection_listing.py -test/test_layer_collection_listing_with_type.py -test/test_layer_collection_resource.py -test/test_layer_collection_resource_id.py -test/test_layer_listing.py -test/test_layer_listing_with_type.py -test/test_layer_resource.py -test/test_layer_resource_id.py -test/test_layer_update.py -test/test_layer_visibility.py -test/test_layers_api.py -test/test_line_symbology.py -test/test_line_symbology_with_type.py -test/test_linear_gradient.py -test/test_linear_gradient_with_type.py -test/test_logarithmic_gradient.py -test/test_logarithmic_gradient_with_type.py -test/test_measurement.py -test/test_meta_data_definition.py -test/test_meta_data_suggestion.py -test/test_mock_dataset_data_source_loading_info.py -test/test_mock_meta_data.py -test/test_mock_meta_data_with_type.py -test/test_model_id_resource_id.py -test/test_multi_line_string.py -test/test_multi_point.py -test/test_multi_polygon.py -test/test_none_ogr_source_dataset_time_type.py -test/test_number_param.py -test/test_ogcwcs_api.py -test/test_ogcwfs_api.py -test/test_ogcwms_api.py -test/test_ogr_meta_data.py -test/test_ogr_meta_data_with_type.py -test/test_ogr_source_column_spec.py -test/test_ogr_source_dataset.py -test/test_ogr_source_dataset_time_type.py -test/test_ogr_source_duration_spec.py -test/test_ogr_source_error_spec.py -test/test_ogr_source_time_format.py -test/test_order_by.py -test/test_palette_colorizer.py -test/test_permission.py -test/test_permission_request.py -test/test_permissions_api.py -test/test_plot.py -test/test_plot_output_format.py -test/test_plot_query_rectangle.py -test/test_plot_result_descriptor.py -test/test_plot_result_descriptor_with_type.py -test/test_plot_update.py -test/test_plots_api.py -test/test_point_symbology.py -test/test_point_symbology_with_type.py -test/test_polygon_symbology.py -test/test_polygon_symbology_with_type.py -test/test_project.py -test/test_project_layer.py -test/test_project_listing.py -test/test_project_resource.py -test/test_project_resource_id.py -test/test_project_version.py -test/test_projects_api.py -test/test_provenance.py -test/test_provenance_entry.py -test/test_provenance_output.py -test/test_provider_layer_collection_id.py -test/test_provider_layer_id.py -test/test_quota.py -test/test_raster_band_descriptor.py -test/test_raster_data_type.py -test/test_raster_dataset_from_workflow.py -test/test_raster_dataset_from_workflow_result.py -test/test_raster_properties_entry_type.py -test/test_raster_properties_key.py -test/test_raster_query_rectangle.py -test/test_raster_result_descriptor.py -test/test_raster_result_descriptor_with_type.py -test/test_raster_stream_websocket_result_type.py -test/test_raster_symbology.py -test/test_raster_symbology_with_type.py -test/test_resource.py -test/test_resource_id.py -test/test_rgba_colorizer.py -test/test_role.py -test/test_role_description.py -test/test_running_task_status.py -test/test_server_info.py -test/test_session_api.py -test/test_spatial_partition2_d.py -test/test_spatial_reference_authority.py -test/test_spatial_reference_specification.py -test/test_spatial_references_api.py -test/test_spatial_resolution.py -test/test_st_rectangle.py -test/test_start_duration_ogr_source_dataset_time_type.py -test/test_start_end_ogr_source_dataset_time_type.py -test/test_start_ogr_source_dataset_time_type.py -test/test_static_color_param.py -test/test_static_number_param.py -test/test_stroke_param.py -test/test_symbology.py -test/test_task_abort_options.py -test/test_task_filter.py -test/test_task_list_options.py -test/test_task_response.py -test/test_task_status.py -test/test_task_status_with_id.py -test/test_tasks_api.py -test/test_text_symbology.py -test/test_time_granularity.py -test/test_time_interval.py -test/test_time_reference.py -test/test_time_step.py -test/test_time_step_with_type.py -test/test_typed_geometry.py -test/test_typed_geometry_one_of.py -test/test_typed_geometry_one_of1.py -test/test_typed_geometry_one_of2.py -test/test_typed_geometry_one_of3.py -test/test_typed_operator.py -test/test_typed_operator_operator.py -test/test_typed_result_descriptor.py -test/test_unitless_measurement.py -test/test_unix_time_stamp_ogr_source_time_format.py -test/test_unix_time_stamp_type.py -test/test_update_project.py -test/test_update_quota.py -test/test_upload_file_layers_response.py -test/test_upload_files_response.py -test/test_uploads_api.py -test/test_user_api.py -test/test_user_credentials.py -test/test_user_info.py -test/test_user_registration.py -test/test_user_session.py -test/test_vector_column_info.py -test/test_vector_data_type.py -test/test_vector_query_rectangle.py -test/test_vector_result_descriptor.py -test/test_vector_result_descriptor_with_type.py -test/test_volume.py -test/test_wcs_boundingbox.py -test/test_wcs_service.py -test/test_wcs_version.py -test/test_wfs_service.py -test/test_wfs_version.py -test/test_wms_service.py -test/test_wms_version.py -test/test_workflow.py -test/test_workflows_api.py -test/test_wrapped_plot_output.py -test/test_zero_ogr_source_duration_spec.py diff --git a/.openapi-generator/VERSION b/.openapi-generator/VERSION deleted file mode 100644 index 73a86b19..00000000 --- a/.openapi-generator/VERSION +++ /dev/null @@ -1 +0,0 @@ -7.0.1 \ No newline at end of file diff --git a/README.md b/README.md index cee17bd6..e9893724 100644 --- a/README.md +++ b/README.md @@ -11,4 +11,4 @@ For information on how to generate the packages out of an OpenAPI spec, please r ## License -This project is licensed under the MIT License - see the [LICENSE](LICENSE) file for details +This project is licensed under the Apache 2.0 License - see the [LICENSE](LICENSE) file for details diff --git a/package.json b/package.json new file mode 100644 index 00000000..200a7072 --- /dev/null +++ b/package.json @@ -0,0 +1,14 @@ +{ + "name": "@geoengine/openapi-client-dev", + "private": true, + "workspaces": [ + "typescript" + ], + "main": "./typescript/index.js", + "typings": "./typescript/dist/index.d.ts", + "module": "./typescript/dist/esm/index.js", + "scripts": { + "build": "npm run build --workspace=typescript", + "prepare": "npm run build --workspace=typescript" + } +} diff --git a/python/.github/workflows/python.yml b/python/.github/workflows/python.yml index 1cd345df..a7ddaf35 100644 --- a/python/.github/workflows/python.yml +++ b/python/.github/workflows/python.yml @@ -28,4 +28,4 @@ jobs: pip install -r test-requirements.txt - name: Test with pytest run: | - pytest --cov={{packageName}} + pytest --cov=geoengine_openapi_client diff --git a/python/.openapi-generator/FILES b/python/.openapi-generator/FILES index 9f8aa2b0..cd77744f 100644 --- a/python/.openapi-generator/FILES +++ b/python/.openapi-generator/FILES @@ -3,7 +3,6 @@ .gitlab-ci.yml .travis.yml README.md -docs/AddCollection200Response.md docs/AddDataset.md docs/AddLayer.md docs/AddLayerCollection.md @@ -18,13 +17,11 @@ docs/ClassificationMeasurement.md docs/CollectionItem.md docs/CollectionType.md docs/ColorParam.md -docs/ColorParamStatic.md docs/Colorizer.md docs/ComputationQuota.md docs/ContinuousMeasurement.md docs/Coordinate2D.md docs/CreateDataset.md -docs/CreateDatasetHandler200Response.md docs/CreateProject.md docs/CsvHeader.md docs/DataId.md @@ -36,9 +33,9 @@ docs/DataUsageSummary.md docs/Dataset.md docs/DatasetDefinition.md docs/DatasetListing.md +docs/DatasetNameResponse.md docs/DatasetResource.md docs/DatasetsApi.md -docs/DateTime.md docs/DerivedColor.md docs/DerivedNumber.md docs/DescribeCoverageRequest.md @@ -69,7 +66,7 @@ docs/GetLegendGraphicRequest.md docs/GetMapExceptionFormat.md docs/GetMapFormat.md docs/GetMapRequest.md -docs/InlineObject.md +docs/IdResponse.md docs/InternalDataId.md docs/Layer.md docs/LayerCollection.md @@ -77,7 +74,6 @@ docs/LayerCollectionListing.md docs/LayerCollectionResource.md docs/LayerListing.md docs/LayerResource.md -docs/LayerUpdate.md docs/LayerVisibility.md docs/LayersApi.md docs/LineSymbology.md @@ -130,7 +126,6 @@ docs/Plot.md docs/PlotOutputFormat.md docs/PlotQueryRectangle.md docs/PlotResultDescriptor.md -docs/PlotUpdate.md docs/PlotsApi.md docs/PointSymbology.md docs/PolygonSymbology.md @@ -161,12 +156,6 @@ docs/RasterResultDescriptor.md docs/RasterStreamWebsocketResultType.md docs/RasterSymbology.md docs/Resource.md -docs/ResourceId.md -docs/ResourceIdDatasetId.md -docs/ResourceIdLayer.md -docs/ResourceIdLayerCollection.md -docs/ResourceIdMlModel.md -docs/ResourceIdProject.md docs/Role.md docs/RoleDescription.md docs/STRectangle.md @@ -181,7 +170,8 @@ docs/SpatialReferenceAuthority.md docs/SpatialReferenceSpecification.md docs/SpatialReferencesApi.md docs/SpatialResolution.md -docs/StaticNumberParam.md +docs/StaticColor.md +docs/StaticNumber.md docs/StrokeParam.md docs/SuggestMetaData.md docs/Symbology.md @@ -228,6 +218,7 @@ docs/UserCredentials.md docs/UserInfo.md docs/UserRegistration.md docs/UserSession.md +docs/VecUpdate.md docs/VectorColumnInfo.md docs/VectorDataType.md docs/VectorQueryRectangle.md @@ -267,7 +258,6 @@ geoengine_openapi_client/api_response.py geoengine_openapi_client/configuration.py geoengine_openapi_client/exceptions.py geoengine_openapi_client/models/__init__.py -geoengine_openapi_client/models/add_collection200_response.py geoengine_openapi_client/models/add_dataset.py geoengine_openapi_client/models/add_layer.py geoengine_openapi_client/models/add_layer_collection.py @@ -282,13 +272,11 @@ geoengine_openapi_client/models/classification_measurement.py geoengine_openapi_client/models/collection_item.py geoengine_openapi_client/models/collection_type.py geoengine_openapi_client/models/color_param.py -geoengine_openapi_client/models/color_param_static.py geoengine_openapi_client/models/colorizer.py geoengine_openapi_client/models/computation_quota.py geoengine_openapi_client/models/continuous_measurement.py geoengine_openapi_client/models/coordinate2_d.py geoengine_openapi_client/models/create_dataset.py -geoengine_openapi_client/models/create_dataset_handler200_response.py geoengine_openapi_client/models/create_project.py geoengine_openapi_client/models/csv_header.py geoengine_openapi_client/models/data_id.py @@ -300,8 +288,8 @@ geoengine_openapi_client/models/data_usage_summary.py geoengine_openapi_client/models/dataset.py geoengine_openapi_client/models/dataset_definition.py geoengine_openapi_client/models/dataset_listing.py +geoengine_openapi_client/models/dataset_name_response.py geoengine_openapi_client/models/dataset_resource.py -geoengine_openapi_client/models/date_time.py geoengine_openapi_client/models/derived_color.py geoengine_openapi_client/models/derived_number.py geoengine_openapi_client/models/describe_coverage_request.py @@ -331,7 +319,7 @@ geoengine_openapi_client/models/get_legend_graphic_request.py geoengine_openapi_client/models/get_map_exception_format.py geoengine_openapi_client/models/get_map_format.py geoengine_openapi_client/models/get_map_request.py -geoengine_openapi_client/models/inline_object.py +geoengine_openapi_client/models/id_response.py geoengine_openapi_client/models/internal_data_id.py geoengine_openapi_client/models/layer.py geoengine_openapi_client/models/layer_collection.py @@ -339,7 +327,6 @@ geoengine_openapi_client/models/layer_collection_listing.py geoengine_openapi_client/models/layer_collection_resource.py geoengine_openapi_client/models/layer_listing.py geoengine_openapi_client/models/layer_resource.py -geoengine_openapi_client/models/layer_update.py geoengine_openapi_client/models/layer_visibility.py geoengine_openapi_client/models/line_symbology.py geoengine_openapi_client/models/linear_gradient.py @@ -386,7 +373,6 @@ geoengine_openapi_client/models/plot.py geoengine_openapi_client/models/plot_output_format.py geoengine_openapi_client/models/plot_query_rectangle.py geoengine_openapi_client/models/plot_result_descriptor.py -geoengine_openapi_client/models/plot_update.py geoengine_openapi_client/models/point_symbology.py geoengine_openapi_client/models/polygon_symbology.py geoengine_openapi_client/models/project.py @@ -415,12 +401,6 @@ geoengine_openapi_client/models/raster_result_descriptor.py geoengine_openapi_client/models/raster_stream_websocket_result_type.py geoengine_openapi_client/models/raster_symbology.py geoengine_openapi_client/models/resource.py -geoengine_openapi_client/models/resource_id.py -geoengine_openapi_client/models/resource_id_dataset_id.py -geoengine_openapi_client/models/resource_id_layer.py -geoengine_openapi_client/models/resource_id_layer_collection.py -geoengine_openapi_client/models/resource_id_ml_model.py -geoengine_openapi_client/models/resource_id_project.py geoengine_openapi_client/models/role.py geoengine_openapi_client/models/role_description.py geoengine_openapi_client/models/search_capabilities.py @@ -433,7 +413,8 @@ geoengine_openapi_client/models/spatial_reference_authority.py geoengine_openapi_client/models/spatial_reference_specification.py geoengine_openapi_client/models/spatial_resolution.py geoengine_openapi_client/models/st_rectangle.py -geoengine_openapi_client/models/static_number_param.py +geoengine_openapi_client/models/static_color.py +geoengine_openapi_client/models/static_number.py geoengine_openapi_client/models/stroke_param.py geoengine_openapi_client/models/suggest_meta_data.py geoengine_openapi_client/models/symbology.py @@ -477,6 +458,7 @@ geoengine_openapi_client/models/user_credentials.py geoengine_openapi_client/models/user_info.py geoengine_openapi_client/models/user_registration.py geoengine_openapi_client/models/user_session.py +geoengine_openapi_client/models/vec_update.py geoengine_openapi_client/models/vector_column_info.py geoengine_openapi_client/models/vector_data_type.py geoengine_openapi_client/models/vector_query_rectangle.py @@ -501,7 +483,6 @@ setup.cfg setup.py test-requirements.txt test/__init__.py -test/test_add_collection200_response.py test/test_add_dataset.py test/test_add_layer.py test/test_add_layer_collection.py @@ -516,13 +497,11 @@ test/test_classification_measurement.py test/test_collection_item.py test/test_collection_type.py test/test_color_param.py -test/test_color_param_static.py test/test_colorizer.py test/test_computation_quota.py test/test_continuous_measurement.py test/test_coordinate2_d.py test/test_create_dataset.py -test/test_create_dataset_handler200_response.py test/test_create_project.py test/test_csv_header.py test/test_data_id.py @@ -534,9 +513,9 @@ test/test_data_usage_summary.py test/test_dataset.py test/test_dataset_definition.py test/test_dataset_listing.py +test/test_dataset_name_response.py test/test_dataset_resource.py test/test_datasets_api.py -test/test_date_time.py test/test_derived_color.py test/test_derived_number.py test/test_describe_coverage_request.py @@ -567,7 +546,7 @@ test/test_get_legend_graphic_request.py test/test_get_map_exception_format.py test/test_get_map_format.py test/test_get_map_request.py -test/test_inline_object.py +test/test_id_response.py test/test_internal_data_id.py test/test_layer.py test/test_layer_collection.py @@ -575,7 +554,6 @@ test/test_layer_collection_listing.py test/test_layer_collection_resource.py test/test_layer_listing.py test/test_layer_resource.py -test/test_layer_update.py test/test_layer_visibility.py test/test_layers_api.py test/test_line_symbology.py @@ -628,7 +606,6 @@ test/test_plot.py test/test_plot_output_format.py test/test_plot_query_rectangle.py test/test_plot_result_descriptor.py -test/test_plot_update.py test/test_plots_api.py test/test_point_symbology.py test/test_polygon_symbology.py @@ -659,12 +636,6 @@ test/test_raster_result_descriptor.py test/test_raster_stream_websocket_result_type.py test/test_raster_symbology.py test/test_resource.py -test/test_resource_id.py -test/test_resource_id_dataset_id.py -test/test_resource_id_layer.py -test/test_resource_id_layer_collection.py -test/test_resource_id_ml_model.py -test/test_resource_id_project.py test/test_role.py test/test_role_description.py test/test_search_capabilities.py @@ -679,7 +650,8 @@ test/test_spatial_reference_specification.py test/test_spatial_references_api.py test/test_spatial_resolution.py test/test_st_rectangle.py -test/test_static_number_param.py +test/test_static_color.py +test/test_static_number.py test/test_stroke_param.py test/test_suggest_meta_data.py test/test_symbology.py @@ -726,6 +698,7 @@ test/test_user_credentials.py test/test_user_info.py test/test_user_registration.py test/test_user_session.py +test/test_vec_update.py test/test_vector_column_info.py test/test_vector_data_type.py test/test_vector_query_rectangle.py diff --git a/python/.openapi-generator/VERSION b/python/.openapi-generator/VERSION index b23eb275..5f84a81d 100644 --- a/python/.openapi-generator/VERSION +++ b/python/.openapi-generator/VERSION @@ -1 +1 @@ -7.11.0 +7.12.0 diff --git a/python/README.md b/python/README.md index 56255a0d..4fcdc3af 100644 --- a/python/README.md +++ b/python/README.md @@ -4,8 +4,8 @@ No description provided (generated by Openapi Generator https://github.com/opena This Python package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: 0.8.0 -- Package version: 0.0.21 -- Generator version: 7.11.0 +- Package version: 0.0.22 +- Generator version: 7.12.0 - Build package: org.openapitools.codegen.languages.PythonClientCodegen ## Requirements. @@ -55,10 +55,10 @@ import geoengine_openapi_client from geoengine_openapi_client.rest import ApiException from pprint import pprint -# Defining the host is optional and defaults to http://0.0.0.0:8080/api +# Defining the host is optional and defaults to https://geoengine.io/api # See configuration.py for a list of all supported configuration parameters. configuration = geoengine_openapi_client.Configuration( - host = "http://0.0.0.0:8080/api" + host = "https://geoengine.io/api" ) # The client must configure the authentication and authorization parameters @@ -79,7 +79,7 @@ with geoengine_openapi_client.ApiClient(configuration) as api_client: auto_create_dataset = geoengine_openapi_client.AutoCreateDataset() # AutoCreateDataset | try: - # Creates a new dataset using previously uploaded files. + # Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. api_response = api_instance.auto_create_dataset_handler(auto_create_dataset) print("The response of DatasetsApi->auto_create_dataset_handler:\n") pprint(api_response) @@ -90,19 +90,19 @@ with geoengine_openapi_client.ApiClient(configuration) as api_client: ## Documentation for API Endpoints -All URIs are relative to *http://0.0.0.0:8080/api* +All URIs are relative to *https://geoengine.io/api* Class | Method | HTTP request | Description ------------ | ------------- | ------------- | ------------- -*DatasetsApi* | [**auto_create_dataset_handler**](docs/DatasetsApi.md#auto_create_dataset_handler) | **POST** /dataset/auto | Creates a new dataset using previously uploaded files. -*DatasetsApi* | [**create_dataset_handler**](docs/DatasetsApi.md#create_dataset_handler) | **POST** /dataset | Creates a new dataset referencing files. +*DatasetsApi* | [**auto_create_dataset_handler**](docs/DatasetsApi.md#auto_create_dataset_handler) | **POST** /dataset/auto | Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. +*DatasetsApi* | [**create_dataset_handler**](docs/DatasetsApi.md#create_dataset_handler) | **POST** /dataset | Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. *DatasetsApi* | [**delete_dataset_handler**](docs/DatasetsApi.md#delete_dataset_handler) | **DELETE** /dataset/{dataset} | Delete a dataset *DatasetsApi* | [**get_dataset_handler**](docs/DatasetsApi.md#get_dataset_handler) | **GET** /dataset/{dataset} | Retrieves details about a dataset using the internal name. *DatasetsApi* | [**get_loading_info_handler**](docs/DatasetsApi.md#get_loading_info_handler) | **GET** /dataset/{dataset}/loadingInfo | Retrieves the loading information of a dataset *DatasetsApi* | [**list_datasets_handler**](docs/DatasetsApi.md#list_datasets_handler) | **GET** /datasets | Lists available datasets. *DatasetsApi* | [**list_volume_file_layers_handler**](docs/DatasetsApi.md#list_volume_file_layers_handler) | **GET** /dataset/volumes/{volume_name}/files/{file_name}/layers | List the layers of a file in a volume. *DatasetsApi* | [**list_volumes_handler**](docs/DatasetsApi.md#list_volumes_handler) | **GET** /dataset/volumes | Lists available volumes. -*DatasetsApi* | [**suggest_meta_data_handler**](docs/DatasetsApi.md#suggest_meta_data_handler) | **POST** /dataset/suggest | Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. +*DatasetsApi* | [**suggest_meta_data_handler**](docs/DatasetsApi.md#suggest_meta_data_handler) | **POST** /dataset/suggest | Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. *DatasetsApi* | [**update_dataset_handler**](docs/DatasetsApi.md#update_dataset_handler) | **POST** /dataset/{dataset} | Update details about a dataset using the internal name. *DatasetsApi* | [**update_dataset_provenance_handler**](docs/DatasetsApi.md#update_dataset_provenance_handler) | **PUT** /dataset/{dataset}/provenance | *DatasetsApi* | [**update_dataset_symbology_handler**](docs/DatasetsApi.md#update_dataset_symbology_handler) | **PUT** /dataset/{dataset}/symbology | Updates the dataset's symbology @@ -148,12 +148,12 @@ Class | Method | HTTP request | Description *ProjectsApi* | [**load_project_latest_handler**](docs/ProjectsApi.md#load_project_latest_handler) | **GET** /project/{project} | Retrieves details about the latest version of a project. *ProjectsApi* | [**load_project_version_handler**](docs/ProjectsApi.md#load_project_version_handler) | **GET** /project/{project}/{version} | Retrieves details about the given version of a project. *ProjectsApi* | [**project_versions_handler**](docs/ProjectsApi.md#project_versions_handler) | **GET** /project/{project}/versions | Lists all available versions of a project. -*ProjectsApi* | [**update_project_handler**](docs/ProjectsApi.md#update_project_handler) | **PATCH** /project/{project} | Updates a project. +*ProjectsApi* | [**update_project_handler**](docs/ProjectsApi.md#update_project_handler) | **PATCH** /project/{project} | Updates a project. This will create a new version. *SessionApi* | [**anonymous_handler**](docs/SessionApi.md#anonymous_handler) | **POST** /anonymous | Creates session for anonymous user. The session's id serves as a Bearer token for requests. *SessionApi* | [**login_handler**](docs/SessionApi.md#login_handler) | **POST** /login | Creates a session by providing user credentials. The session's id serves as a Bearer token for requests. *SessionApi* | [**logout_handler**](docs/SessionApi.md#logout_handler) | **POST** /logout | Ends a session. *SessionApi* | [**oidc_init**](docs/SessionApi.md#oidc_init) | **POST** /oidcInit | Initializes the Open Id Connect login procedure by requesting a parametrized url to the configured Id Provider. -*SessionApi* | [**oidc_login**](docs/SessionApi.md#oidc_login) | **POST** /oidcLogin | Creates a session for a user via a login with Open Id Connect. +*SessionApi* | [**oidc_login**](docs/SessionApi.md#oidc_login) | **POST** /oidcLogin | Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. *SessionApi* | [**register_user_handler**](docs/SessionApi.md#register_user_handler) | **POST** /user | Registers a user. *SessionApi* | [**session_handler**](docs/SessionApi.md#session_handler) | **GET** /session | Retrieves details about the current session. *SpatialReferencesApi* | [**get_spatial_reference_specification_handler**](docs/SpatialReferencesApi.md#get_spatial_reference_specification_handler) | **GET** /spatialReferenceSpecification/{srsString} | @@ -176,7 +176,7 @@ Class | Method | HTTP request | Description *UserApi* | [**remove_role_handler**](docs/UserApi.md#remove_role_handler) | **DELETE** /roles/{role} | Remove a role. Requires admin privilige. *UserApi* | [**revoke_role_handler**](docs/UserApi.md#revoke_role_handler) | **DELETE** /users/{user}/roles/{role} | Revoke a role from a user. Requires admin privilige. *UserApi* | [**update_user_quota_handler**](docs/UserApi.md#update_user_quota_handler) | **POST** /quotas/{user} | Update the available quota of a specific user. -*WorkflowsApi* | [**dataset_from_workflow_handler**](docs/WorkflowsApi.md#dataset_from_workflow_handler) | **POST** /datasetFromWorkflow/{id} | Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. +*WorkflowsApi* | [**dataset_from_workflow_handler**](docs/WorkflowsApi.md#dataset_from_workflow_handler) | **POST** /datasetFromWorkflow/{id} | Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task *WorkflowsApi* | [**get_workflow_all_metadata_zip_handler**](docs/WorkflowsApi.md#get_workflow_all_metadata_zip_handler) | **GET** /workflow/{id}/allMetadata/zip | Gets a ZIP archive of the worklow, its provenance and the output metadata. *WorkflowsApi* | [**get_workflow_metadata_handler**](docs/WorkflowsApi.md#get_workflow_metadata_handler) | **GET** /workflow/{id}/metadata | Gets the metadata of a workflow *WorkflowsApi* | [**get_workflow_provenance_handler**](docs/WorkflowsApi.md#get_workflow_provenance_handler) | **GET** /workflow/{id}/provenance | Gets the provenance of all datasets used in a workflow. @@ -187,7 +187,6 @@ Class | Method | HTTP request | Description ## Documentation For Models - - [AddCollection200Response](docs/AddCollection200Response.md) - [AddDataset](docs/AddDataset.md) - [AddLayer](docs/AddLayer.md) - [AddLayerCollection](docs/AddLayerCollection.md) @@ -202,13 +201,11 @@ Class | Method | HTTP request | Description - [CollectionItem](docs/CollectionItem.md) - [CollectionType](docs/CollectionType.md) - [ColorParam](docs/ColorParam.md) - - [ColorParamStatic](docs/ColorParamStatic.md) - [Colorizer](docs/Colorizer.md) - [ComputationQuota](docs/ComputationQuota.md) - [ContinuousMeasurement](docs/ContinuousMeasurement.md) - [Coordinate2D](docs/Coordinate2D.md) - [CreateDataset](docs/CreateDataset.md) - - [CreateDatasetHandler200Response](docs/CreateDatasetHandler200Response.md) - [CreateProject](docs/CreateProject.md) - [CsvHeader](docs/CsvHeader.md) - [DataId](docs/DataId.md) @@ -220,8 +217,8 @@ Class | Method | HTTP request | Description - [Dataset](docs/Dataset.md) - [DatasetDefinition](docs/DatasetDefinition.md) - [DatasetListing](docs/DatasetListing.md) + - [DatasetNameResponse](docs/DatasetNameResponse.md) - [DatasetResource](docs/DatasetResource.md) - - [DateTime](docs/DateTime.md) - [DerivedColor](docs/DerivedColor.md) - [DerivedNumber](docs/DerivedNumber.md) - [DescribeCoverageRequest](docs/DescribeCoverageRequest.md) @@ -251,7 +248,7 @@ Class | Method | HTTP request | Description - [GetMapExceptionFormat](docs/GetMapExceptionFormat.md) - [GetMapFormat](docs/GetMapFormat.md) - [GetMapRequest](docs/GetMapRequest.md) - - [InlineObject](docs/InlineObject.md) + - [IdResponse](docs/IdResponse.md) - [InternalDataId](docs/InternalDataId.md) - [Layer](docs/Layer.md) - [LayerCollection](docs/LayerCollection.md) @@ -259,7 +256,6 @@ Class | Method | HTTP request | Description - [LayerCollectionResource](docs/LayerCollectionResource.md) - [LayerListing](docs/LayerListing.md) - [LayerResource](docs/LayerResource.md) - - [LayerUpdate](docs/LayerUpdate.md) - [LayerVisibility](docs/LayerVisibility.md) - [LineSymbology](docs/LineSymbology.md) - [LinearGradient](docs/LinearGradient.md) @@ -306,7 +302,6 @@ Class | Method | HTTP request | Description - [PlotOutputFormat](docs/PlotOutputFormat.md) - [PlotQueryRectangle](docs/PlotQueryRectangle.md) - [PlotResultDescriptor](docs/PlotResultDescriptor.md) - - [PlotUpdate](docs/PlotUpdate.md) - [PointSymbology](docs/PointSymbology.md) - [PolygonSymbology](docs/PolygonSymbology.md) - [Project](docs/Project.md) @@ -335,12 +330,6 @@ Class | Method | HTTP request | Description - [RasterStreamWebsocketResultType](docs/RasterStreamWebsocketResultType.md) - [RasterSymbology](docs/RasterSymbology.md) - [Resource](docs/Resource.md) - - [ResourceId](docs/ResourceId.md) - - [ResourceIdDatasetId](docs/ResourceIdDatasetId.md) - - [ResourceIdLayer](docs/ResourceIdLayer.md) - - [ResourceIdLayerCollection](docs/ResourceIdLayerCollection.md) - - [ResourceIdMlModel](docs/ResourceIdMlModel.md) - - [ResourceIdProject](docs/ResourceIdProject.md) - [Role](docs/Role.md) - [RoleDescription](docs/RoleDescription.md) - [STRectangle](docs/STRectangle.md) @@ -353,7 +342,8 @@ Class | Method | HTTP request | Description - [SpatialReferenceAuthority](docs/SpatialReferenceAuthority.md) - [SpatialReferenceSpecification](docs/SpatialReferenceSpecification.md) - [SpatialResolution](docs/SpatialResolution.md) - - [StaticNumberParam](docs/StaticNumberParam.md) + - [StaticColor](docs/StaticColor.md) + - [StaticNumber](docs/StaticNumber.md) - [StrokeParam](docs/StrokeParam.md) - [SuggestMetaData](docs/SuggestMetaData.md) - [Symbology](docs/Symbology.md) @@ -397,6 +387,7 @@ Class | Method | HTTP request | Description - [UserInfo](docs/UserInfo.md) - [UserRegistration](docs/UserRegistration.md) - [UserSession](docs/UserSession.md) + - [VecUpdate](docs/VecUpdate.md) - [VectorColumnInfo](docs/VectorColumnInfo.md) - [VectorDataType](docs/VectorDataType.md) - [VectorQueryRectangle](docs/VectorQueryRectangle.md) diff --git a/python/geoengine_openapi_client/__init__.py b/python/geoengine_openapi_client/__init__.py index 83eb6daa..4115ee8d 100644 --- a/python/geoengine_openapi_client/__init__.py +++ b/python/geoengine_openapi_client/__init__.py @@ -15,7 +15,7 @@ """ # noqa: E501 -__version__ = "0.0.21" +__version__ = "0.0.22" # import apis into sdk package from geoengine_openapi_client.api.datasets_api import DatasetsApi @@ -47,7 +47,6 @@ from geoengine_openapi_client.exceptions import ApiException # import models into sdk package -from geoengine_openapi_client.models.add_collection200_response import AddCollection200Response from geoengine_openapi_client.models.add_dataset import AddDataset from geoengine_openapi_client.models.add_layer import AddLayer from geoengine_openapi_client.models.add_layer_collection import AddLayerCollection @@ -62,13 +61,11 @@ from geoengine_openapi_client.models.collection_item import CollectionItem from geoengine_openapi_client.models.collection_type import CollectionType from geoengine_openapi_client.models.color_param import ColorParam -from geoengine_openapi_client.models.color_param_static import ColorParamStatic from geoengine_openapi_client.models.colorizer import Colorizer from geoengine_openapi_client.models.computation_quota import ComputationQuota from geoengine_openapi_client.models.continuous_measurement import ContinuousMeasurement from geoengine_openapi_client.models.coordinate2_d import Coordinate2D from geoengine_openapi_client.models.create_dataset import CreateDataset -from geoengine_openapi_client.models.create_dataset_handler200_response import CreateDatasetHandler200Response from geoengine_openapi_client.models.create_project import CreateProject from geoengine_openapi_client.models.csv_header import CsvHeader from geoengine_openapi_client.models.data_id import DataId @@ -80,8 +77,8 @@ from geoengine_openapi_client.models.dataset import Dataset from geoengine_openapi_client.models.dataset_definition import DatasetDefinition from geoengine_openapi_client.models.dataset_listing import DatasetListing +from geoengine_openapi_client.models.dataset_name_response import DatasetNameResponse from geoengine_openapi_client.models.dataset_resource import DatasetResource -from geoengine_openapi_client.models.date_time import DateTime from geoengine_openapi_client.models.derived_color import DerivedColor from geoengine_openapi_client.models.derived_number import DerivedNumber from geoengine_openapi_client.models.describe_coverage_request import DescribeCoverageRequest @@ -111,7 +108,7 @@ from geoengine_openapi_client.models.get_map_exception_format import GetMapExceptionFormat from geoengine_openapi_client.models.get_map_format import GetMapFormat from geoengine_openapi_client.models.get_map_request import GetMapRequest -from geoengine_openapi_client.models.inline_object import InlineObject +from geoengine_openapi_client.models.id_response import IdResponse from geoengine_openapi_client.models.internal_data_id import InternalDataId from geoengine_openapi_client.models.layer import Layer from geoengine_openapi_client.models.layer_collection import LayerCollection @@ -119,7 +116,6 @@ from geoengine_openapi_client.models.layer_collection_resource import LayerCollectionResource from geoengine_openapi_client.models.layer_listing import LayerListing from geoengine_openapi_client.models.layer_resource import LayerResource -from geoengine_openapi_client.models.layer_update import LayerUpdate from geoengine_openapi_client.models.layer_visibility import LayerVisibility from geoengine_openapi_client.models.line_symbology import LineSymbology from geoengine_openapi_client.models.linear_gradient import LinearGradient @@ -166,7 +162,6 @@ from geoengine_openapi_client.models.plot_output_format import PlotOutputFormat from geoengine_openapi_client.models.plot_query_rectangle import PlotQueryRectangle from geoengine_openapi_client.models.plot_result_descriptor import PlotResultDescriptor -from geoengine_openapi_client.models.plot_update import PlotUpdate from geoengine_openapi_client.models.point_symbology import PointSymbology from geoengine_openapi_client.models.polygon_symbology import PolygonSymbology from geoengine_openapi_client.models.project import Project @@ -195,12 +190,6 @@ from geoengine_openapi_client.models.raster_stream_websocket_result_type import RasterStreamWebsocketResultType from geoengine_openapi_client.models.raster_symbology import RasterSymbology from geoengine_openapi_client.models.resource import Resource -from geoengine_openapi_client.models.resource_id import ResourceId -from geoengine_openapi_client.models.resource_id_dataset_id import ResourceIdDatasetId -from geoengine_openapi_client.models.resource_id_layer import ResourceIdLayer -from geoengine_openapi_client.models.resource_id_layer_collection import ResourceIdLayerCollection -from geoengine_openapi_client.models.resource_id_ml_model import ResourceIdMlModel -from geoengine_openapi_client.models.resource_id_project import ResourceIdProject from geoengine_openapi_client.models.role import Role from geoengine_openapi_client.models.role_description import RoleDescription from geoengine_openapi_client.models.st_rectangle import STRectangle @@ -213,7 +202,8 @@ from geoengine_openapi_client.models.spatial_reference_authority import SpatialReferenceAuthority from geoengine_openapi_client.models.spatial_reference_specification import SpatialReferenceSpecification from geoengine_openapi_client.models.spatial_resolution import SpatialResolution -from geoengine_openapi_client.models.static_number_param import StaticNumberParam +from geoengine_openapi_client.models.static_color import StaticColor +from geoengine_openapi_client.models.static_number import StaticNumber from geoengine_openapi_client.models.stroke_param import StrokeParam from geoengine_openapi_client.models.suggest_meta_data import SuggestMetaData from geoengine_openapi_client.models.symbology import Symbology @@ -257,6 +247,7 @@ from geoengine_openapi_client.models.user_info import UserInfo from geoengine_openapi_client.models.user_registration import UserRegistration from geoengine_openapi_client.models.user_session import UserSession +from geoengine_openapi_client.models.vec_update import VecUpdate from geoengine_openapi_client.models.vector_column_info import VectorColumnInfo from geoengine_openapi_client.models.vector_data_type import VectorDataType from geoengine_openapi_client.models.vector_query_rectangle import VectorQueryRectangle diff --git a/python/geoengine_openapi_client/api/datasets_api.py b/python/geoengine_openapi_client/api/datasets_api.py index 86fd941d..bc557a05 100644 --- a/python/geoengine_openapi_client/api/datasets_api.py +++ b/python/geoengine_openapi_client/api/datasets_api.py @@ -22,9 +22,9 @@ from typing_extensions import Annotated from geoengine_openapi_client.models.auto_create_dataset import AutoCreateDataset from geoengine_openapi_client.models.create_dataset import CreateDataset -from geoengine_openapi_client.models.create_dataset_handler200_response import CreateDatasetHandler200Response from geoengine_openapi_client.models.dataset import Dataset from geoengine_openapi_client.models.dataset_listing import DatasetListing +from geoengine_openapi_client.models.dataset_name_response import DatasetNameResponse from geoengine_openapi_client.models.meta_data_definition import MetaDataDefinition from geoengine_openapi_client.models.meta_data_suggestion import MetaDataSuggestion from geoengine_openapi_client.models.order_by import OrderBy @@ -69,10 +69,9 @@ def auto_create_dataset_handler( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> CreateDatasetHandler200Response: - """Creates a new dataset using previously uploaded files. + ) -> DatasetNameResponse: + """Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. - The format of the files will be automatically detected when possible. :param auto_create_dataset: (required) :type auto_create_dataset: AutoCreateDataset @@ -107,7 +106,7 @@ def auto_create_dataset_handler( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "CreateDatasetHandler200Response", + '200': "DatasetNameResponse", '400': "ErrorResponse", '401': "ErrorResponse", '413': "ErrorResponse", @@ -140,10 +139,9 @@ def auto_create_dataset_handler_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[CreateDatasetHandler200Response]: - """Creates a new dataset using previously uploaded files. + ) -> ApiResponse[DatasetNameResponse]: + """Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. - The format of the files will be automatically detected when possible. :param auto_create_dataset: (required) :type auto_create_dataset: AutoCreateDataset @@ -178,7 +176,7 @@ def auto_create_dataset_handler_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "CreateDatasetHandler200Response", + '200': "DatasetNameResponse", '400': "ErrorResponse", '401': "ErrorResponse", '413': "ErrorResponse", @@ -212,9 +210,8 @@ def auto_create_dataset_handler_without_preload_content( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> RESTResponseType: - """Creates a new dataset using previously uploaded files. + """Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. - The format of the files will be automatically detected when possible. :param auto_create_dataset: (required) :type auto_create_dataset: AutoCreateDataset @@ -249,7 +246,7 @@ def auto_create_dataset_handler_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "CreateDatasetHandler200Response", + '200': "DatasetNameResponse", '400': "ErrorResponse", '401': "ErrorResponse", '413': "ErrorResponse", @@ -355,10 +352,9 @@ def create_dataset_handler( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> CreateDatasetHandler200Response: - """Creates a new dataset referencing files. + ) -> DatasetNameResponse: + """Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. - Users can reference previously uploaded files. Admins can reference files from a volume. :param create_dataset: (required) :type create_dataset: CreateDataset @@ -393,7 +389,7 @@ def create_dataset_handler( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "CreateDatasetHandler200Response", + '200': "DatasetNameResponse", } response_data = self.api_client.call_api( *_param, @@ -422,10 +418,9 @@ def create_dataset_handler_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[CreateDatasetHandler200Response]: - """Creates a new dataset referencing files. + ) -> ApiResponse[DatasetNameResponse]: + """Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. - Users can reference previously uploaded files. Admins can reference files from a volume. :param create_dataset: (required) :type create_dataset: CreateDataset @@ -460,7 +455,7 @@ def create_dataset_handler_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "CreateDatasetHandler200Response", + '200': "DatasetNameResponse", } response_data = self.api_client.call_api( *_param, @@ -490,9 +485,8 @@ def create_dataset_handler_without_preload_content( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> RESTResponseType: - """Creates a new dataset referencing files. + """Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. - Users can reference previously uploaded files. Admins can reference files from a volume. :param create_dataset: (required) :type create_dataset: CreateDataset @@ -527,7 +521,7 @@ def create_dataset_handler_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "CreateDatasetHandler200Response", + '200': "DatasetNameResponse", } response_data = self.api_client.call_api( *_param, @@ -2270,9 +2264,8 @@ def suggest_meta_data_handler( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> MetaDataSuggestion: - """Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + """Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. - Tries to automatically detect the main file and layer name if not specified. :param suggest_meta_data: (required) :type suggest_meta_data: SuggestMetaData @@ -2339,9 +2332,8 @@ def suggest_meta_data_handler_with_http_info( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ApiResponse[MetaDataSuggestion]: - """Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + """Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. - Tries to automatically detect the main file and layer name if not specified. :param suggest_meta_data: (required) :type suggest_meta_data: SuggestMetaData @@ -2408,9 +2400,8 @@ def suggest_meta_data_handler_without_preload_content( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> RESTResponseType: - """Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + """Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. - Tries to automatically detect the main file and layer name if not specified. :param suggest_meta_data: (required) :type suggest_meta_data: SuggestMetaData diff --git a/python/geoengine_openapi_client/api/layers_api.py b/python/geoengine_openapi_client/api/layers_api.py index 692309b0..684f48bb 100644 --- a/python/geoengine_openapi_client/api/layers_api.py +++ b/python/geoengine_openapi_client/api/layers_api.py @@ -20,9 +20,9 @@ from pydantic import Field, StrictStr from typing import List from typing_extensions import Annotated -from geoengine_openapi_client.models.add_collection200_response import AddCollection200Response from geoengine_openapi_client.models.add_layer import AddLayer from geoengine_openapi_client.models.add_layer_collection import AddLayerCollection +from geoengine_openapi_client.models.id_response import IdResponse from geoengine_openapi_client.models.layer import Layer from geoengine_openapi_client.models.layer_collection import LayerCollection from geoengine_openapi_client.models.provider_capabilities import ProviderCapabilities @@ -66,7 +66,7 @@ def add_collection( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> AddCollection200Response: + ) -> IdResponse: """Add a new collection to an existing collection @@ -106,7 +106,7 @@ def add_collection( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -136,7 +136,7 @@ def add_collection_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[AddCollection200Response]: + ) -> ApiResponse[IdResponse]: """Add a new collection to an existing collection @@ -176,7 +176,7 @@ def add_collection_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -246,7 +246,7 @@ def add_collection_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -892,7 +892,7 @@ def add_layer( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> AddCollection200Response: + ) -> IdResponse: """Add a new layer to a collection @@ -932,7 +932,7 @@ def add_layer( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -962,7 +962,7 @@ def add_layer_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[AddCollection200Response]: + ) -> ApiResponse[IdResponse]: """Add a new layer to a collection @@ -1002,7 +1002,7 @@ def add_layer_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -1072,7 +1072,7 @@ def add_layer_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -2065,7 +2065,7 @@ def layer_to_workflow_id_handler( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> AddCollection200Response: + ) -> IdResponse: """Registers a layer from a provider as a workflow and returns the workflow id @@ -2105,7 +2105,7 @@ def layer_to_workflow_id_handler( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -2135,7 +2135,7 @@ def layer_to_workflow_id_handler_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[AddCollection200Response]: + ) -> ApiResponse[IdResponse]: """Registers a layer from a provider as a workflow and returns the workflow id @@ -2175,7 +2175,7 @@ def layer_to_workflow_id_handler_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -2245,7 +2245,7 @@ def layer_to_workflow_id_handler_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, diff --git a/python/geoengine_openapi_client/api/ogcwcs_api.py b/python/geoengine_openapi_client/api/ogcwcs_api.py index c88abd70..a5a60097 100644 --- a/python/geoengine_openapi_client/api/ogcwcs_api.py +++ b/python/geoengine_openapi_client/api/ogcwcs_api.py @@ -18,7 +18,7 @@ from typing_extensions import Annotated from pydantic import Field, StrictBytes, StrictFloat, StrictInt, StrictStr -from typing import Any, Optional, Tuple, Union +from typing import Optional, Tuple, Union from typing_extensions import Annotated from geoengine_openapi_client.models.describe_coverage_request import DescribeCoverageRequest from geoengine_openapi_client.models.get_capabilities_request import GetCapabilitiesRequest @@ -51,7 +51,7 @@ def wcs_capabilities_handler( workflow: Annotated[StrictStr, Field(description="Workflow id")], service: WcsService, request: GetCapabilitiesRequest, - version: Optional[Any] = None, + version: Optional[WcsVersion] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -129,7 +129,7 @@ def wcs_capabilities_handler_with_http_info( workflow: Annotated[StrictStr, Field(description="Workflow id")], service: WcsService, request: GetCapabilitiesRequest, - version: Optional[Any] = None, + version: Optional[WcsVersion] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -207,7 +207,7 @@ def wcs_capabilities_handler_without_preload_content( workflow: Annotated[StrictStr, Field(description="Workflow id")], service: WcsService, request: GetCapabilitiesRequest, - version: Optional[Any] = None, + version: Optional[WcsVersion] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], diff --git a/python/geoengine_openapi_client/api/ogcwfs_api.py b/python/geoengine_openapi_client/api/ogcwfs_api.py index 7e94d3d9..0f0e01e8 100644 --- a/python/geoengine_openapi_client/api/ogcwfs_api.py +++ b/python/geoengine_openapi_client/api/ogcwfs_api.py @@ -18,12 +18,13 @@ from typing_extensions import Annotated from pydantic import Field, StrictStr -from typing import Any, Optional +from typing import Optional from typing_extensions import Annotated from geoengine_openapi_client.models.geo_json import GeoJson from geoengine_openapi_client.models.get_capabilities_request import GetCapabilitiesRequest from geoengine_openapi_client.models.get_feature_request import GetFeatureRequest from geoengine_openapi_client.models.wfs_service import WfsService +from geoengine_openapi_client.models.wfs_version import WfsVersion from geoengine_openapi_client.api_client import ApiClient, RequestSerialized from geoengine_openapi_client.api_response import ApiResponse @@ -47,7 +48,7 @@ def __init__(self, api_client=None) -> None: def wfs_capabilities_handler( self, workflow: Annotated[StrictStr, Field(description="Workflow id")], - version: Optional[Any], + version: Optional[WfsVersion], service: WfsService, request: GetCapabilitiesRequest, _request_timeout: Union[ @@ -125,7 +126,7 @@ def wfs_capabilities_handler( def wfs_capabilities_handler_with_http_info( self, workflow: Annotated[StrictStr, Field(description="Workflow id")], - version: Optional[Any], + version: Optional[WfsVersion], service: WfsService, request: GetCapabilitiesRequest, _request_timeout: Union[ @@ -203,7 +204,7 @@ def wfs_capabilities_handler_with_http_info( def wfs_capabilities_handler_without_preload_content( self, workflow: Annotated[StrictStr, Field(description="Workflow id")], - version: Optional[Any], + version: Optional[WfsVersion], service: WfsService, request: GetCapabilitiesRequest, _request_timeout: Union[ @@ -355,7 +356,7 @@ def wfs_feature_handler( request: GetFeatureRequest, type_names: StrictStr, bbox: StrictStr, - version: Optional[Any] = None, + version: Optional[WfsVersion] = None, time: Optional[StrictStr] = None, srs_name: Optional[StrictStr] = None, namespaces: Optional[StrictStr] = None, @@ -364,7 +365,7 @@ def wfs_feature_handler( result_type: Optional[StrictStr] = None, filter: Optional[StrictStr] = None, property_name: Optional[StrictStr] = None, - query_resolution: Annotated[Optional[Any], Field(description="Vendor parameter for specifying a spatial query resolution")] = None, + query_resolution: Annotated[Optional[StrictStr], Field(description="Vendor parameter for specifying a spatial query resolution")] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -477,7 +478,7 @@ def wfs_feature_handler_with_http_info( request: GetFeatureRequest, type_names: StrictStr, bbox: StrictStr, - version: Optional[Any] = None, + version: Optional[WfsVersion] = None, time: Optional[StrictStr] = None, srs_name: Optional[StrictStr] = None, namespaces: Optional[StrictStr] = None, @@ -486,7 +487,7 @@ def wfs_feature_handler_with_http_info( result_type: Optional[StrictStr] = None, filter: Optional[StrictStr] = None, property_name: Optional[StrictStr] = None, - query_resolution: Annotated[Optional[Any], Field(description="Vendor parameter for specifying a spatial query resolution")] = None, + query_resolution: Annotated[Optional[StrictStr], Field(description="Vendor parameter for specifying a spatial query resolution")] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -599,7 +600,7 @@ def wfs_feature_handler_without_preload_content( request: GetFeatureRequest, type_names: StrictStr, bbox: StrictStr, - version: Optional[Any] = None, + version: Optional[WfsVersion] = None, time: Optional[StrictStr] = None, srs_name: Optional[StrictStr] = None, namespaces: Optional[StrictStr] = None, @@ -608,7 +609,7 @@ def wfs_feature_handler_without_preload_content( result_type: Optional[StrictStr] = None, filter: Optional[StrictStr] = None, property_name: Optional[StrictStr] = None, - query_resolution: Annotated[Optional[Any], Field(description="Vendor parameter for specifying a spatial query resolution")] = None, + query_resolution: Annotated[Optional[StrictStr], Field(description="Vendor parameter for specifying a spatial query resolution")] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], diff --git a/python/geoengine_openapi_client/api/ogcwms_api.py b/python/geoengine_openapi_client/api/ogcwms_api.py index 333b7c10..8cd76c71 100644 --- a/python/geoengine_openapi_client/api/ogcwms_api.py +++ b/python/geoengine_openapi_client/api/ogcwms_api.py @@ -18,10 +18,12 @@ from typing_extensions import Annotated from pydantic import Field, StrictBool, StrictBytes, StrictStr -from typing import Any, Optional, Tuple, Union +from typing import Optional, Tuple, Union from typing_extensions import Annotated +from geoengine_openapi_client.models.get_capabilities_format import GetCapabilitiesFormat from geoengine_openapi_client.models.get_capabilities_request import GetCapabilitiesRequest from geoengine_openapi_client.models.get_legend_graphic_request import GetLegendGraphicRequest +from geoengine_openapi_client.models.get_map_exception_format import GetMapExceptionFormat from geoengine_openapi_client.models.get_map_format import GetMapFormat from geoengine_openapi_client.models.get_map_request import GetMapRequest from geoengine_openapi_client.models.wms_service import WmsService @@ -49,10 +51,10 @@ def __init__(self, api_client=None) -> None: def wms_capabilities_handler( self, workflow: Annotated[StrictStr, Field(description="Workflow id")], - version: Optional[Any], + version: Optional[WmsVersion], service: WmsService, request: GetCapabilitiesRequest, - format: Optional[Any], + format: Optional[GetCapabilitiesFormat], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -131,10 +133,10 @@ def wms_capabilities_handler( def wms_capabilities_handler_with_http_info( self, workflow: Annotated[StrictStr, Field(description="Workflow id")], - version: Optional[Any], + version: Optional[WmsVersion], service: WmsService, request: GetCapabilitiesRequest, - format: Optional[Any], + format: Optional[GetCapabilitiesFormat], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -213,10 +215,10 @@ def wms_capabilities_handler_with_http_info( def wms_capabilities_handler_without_preload_content( self, workflow: Annotated[StrictStr, Field(description="Workflow id")], - version: Optional[Any], + version: Optional[WmsVersion], service: WmsService, request: GetCapabilitiesRequest, - format: Optional[Any], + format: Optional[GetCapabilitiesFormat], _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -696,7 +698,7 @@ def wms_map_handler( sld: Optional[StrictStr] = None, sld_body: Optional[StrictStr] = None, elevation: Optional[StrictStr] = None, - exceptions: Optional[Any] = None, + exceptions: Optional[GetMapExceptionFormat] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -830,7 +832,7 @@ def wms_map_handler_with_http_info( sld: Optional[StrictStr] = None, sld_body: Optional[StrictStr] = None, elevation: Optional[StrictStr] = None, - exceptions: Optional[Any] = None, + exceptions: Optional[GetMapExceptionFormat] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], @@ -964,7 +966,7 @@ def wms_map_handler_without_preload_content( sld: Optional[StrictStr] = None, sld_body: Optional[StrictStr] = None, elevation: Optional[StrictStr] = None, - exceptions: Optional[Any] = None, + exceptions: Optional[GetMapExceptionFormat] = None, _request_timeout: Union[ None, Annotated[StrictFloat, Field(gt=0)], diff --git a/python/geoengine_openapi_client/api/projects_api.py b/python/geoengine_openapi_client/api/projects_api.py index 037cd987..81e61bbb 100644 --- a/python/geoengine_openapi_client/api/projects_api.py +++ b/python/geoengine_openapi_client/api/projects_api.py @@ -20,8 +20,8 @@ from pydantic import Field, StrictStr from typing import List from typing_extensions import Annotated -from geoengine_openapi_client.models.add_collection200_response import AddCollection200Response from geoengine_openapi_client.models.create_project import CreateProject +from geoengine_openapi_client.models.id_response import IdResponse from geoengine_openapi_client.models.order_by import OrderBy from geoengine_openapi_client.models.project import Project from geoengine_openapi_client.models.project_listing import ProjectListing @@ -62,7 +62,7 @@ def create_project_handler( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> AddCollection200Response: + ) -> IdResponse: """Create a new project for the user. @@ -99,7 +99,7 @@ def create_project_handler( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -128,7 +128,7 @@ def create_project_handler_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[AddCollection200Response]: + ) -> ApiResponse[IdResponse]: """Create a new project for the user. @@ -165,7 +165,7 @@ def create_project_handler_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -231,7 +231,7 @@ def create_project_handler_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -1663,9 +1663,8 @@ def update_project_handler( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> None: - """Updates a project. + """Updates a project. This will create a new version. - This will create a new version. :param project: Project id (required) :type project: str @@ -1734,9 +1733,8 @@ def update_project_handler_with_http_info( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ApiResponse[None]: - """Updates a project. + """Updates a project. This will create a new version. - This will create a new version. :param project: Project id (required) :type project: str @@ -1805,9 +1803,8 @@ def update_project_handler_without_preload_content( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> RESTResponseType: - """Updates a project. + """Updates a project. This will create a new version. - This will create a new version. :param project: Project id (required) :type project: str diff --git a/python/geoengine_openapi_client/api/session_api.py b/python/geoengine_openapi_client/api/session_api.py index fee91b0f..8cdc4c91 100644 --- a/python/geoengine_openapi_client/api/session_api.py +++ b/python/geoengine_openapi_client/api/session_api.py @@ -809,7 +809,7 @@ def oidc_init( ) -> AuthCodeRequestURL: """Initializes the Open Id Connect login procedure by requesting a parametrized url to the configured Id Provider. - # Errors This call fails if Open ID Connect is disabled, misconfigured or the Id Provider is unreachable. + # Errors This call fails if Open ID Connect is disabled, misconfigured or the Id Provider is unreachable. :param redirect_uri: (required) :type redirect_uri: str @@ -876,7 +876,7 @@ def oidc_init_with_http_info( ) -> ApiResponse[AuthCodeRequestURL]: """Initializes the Open Id Connect login procedure by requesting a parametrized url to the configured Id Provider. - # Errors This call fails if Open ID Connect is disabled, misconfigured or the Id Provider is unreachable. + # Errors This call fails if Open ID Connect is disabled, misconfigured or the Id Provider is unreachable. :param redirect_uri: (required) :type redirect_uri: str @@ -943,7 +943,7 @@ def oidc_init_without_preload_content( ) -> RESTResponseType: """Initializes the Open Id Connect login procedure by requesting a parametrized url to the configured Id Provider. - # Errors This call fails if Open ID Connect is disabled, misconfigured or the Id Provider is unreachable. + # Errors This call fails if Open ID Connect is disabled, misconfigured or the Id Provider is unreachable. :param redirect_uri: (required) :type redirect_uri: str @@ -1070,9 +1070,9 @@ def oidc_login( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> UserSession: - """Creates a session for a user via a login with Open Id Connect. + """Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. - This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. :param redirect_uri: (required) :type redirect_uri: str @@ -1141,9 +1141,9 @@ def oidc_login_with_http_info( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ApiResponse[UserSession]: - """Creates a session for a user via a login with Open Id Connect. + """Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. - This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. :param redirect_uri: (required) :type redirect_uri: str @@ -1212,9 +1212,9 @@ def oidc_login_without_preload_content( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> RESTResponseType: - """Creates a session for a user via a login with Open Id Connect. + """Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. - This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. :param redirect_uri: (required) :type redirect_uri: str diff --git a/python/geoengine_openapi_client/api/tasks_api.py b/python/geoengine_openapi_client/api/tasks_api.py index 403826ff..ebe479f4 100644 --- a/python/geoengine_openapi_client/api/tasks_api.py +++ b/python/geoengine_openapi_client/api/tasks_api.py @@ -18,8 +18,9 @@ from typing_extensions import Annotated from pydantic import Field, StrictBool, StrictStr -from typing import Any, List, Optional +from typing import List, Optional from typing_extensions import Annotated +from geoengine_openapi_client.models.task_filter import TaskFilter from geoengine_openapi_client.models.task_status import TaskStatus from geoengine_openapi_client.models.task_status_with_id import TaskStatusWithId @@ -61,7 +62,7 @@ def abort_handler( ) -> None: """Abort a running task. - # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. :param id: Task id (required) :type id: str @@ -136,7 +137,7 @@ def abort_handler_with_http_info( ) -> ApiResponse[None]: """Abort a running task. - # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. :param id: Task id (required) :type id: str @@ -207,7 +208,7 @@ def abort_handler_without_preload_content( ) -> RESTResponseType: """Abort a running task. - # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. :param id: Task id (required) :type id: str @@ -319,7 +320,7 @@ def _abort_handler_serialize( @validate_call def list_handler( self, - filter: Optional[Any], + filter: Optional[TaskFilter], offset: Annotated[int, Field(strict=True, ge=0)], limit: Annotated[int, Field(strict=True, ge=0)], _request_timeout: Union[ @@ -393,7 +394,7 @@ def list_handler( @validate_call def list_handler_with_http_info( self, - filter: Optional[Any], + filter: Optional[TaskFilter], offset: Annotated[int, Field(strict=True, ge=0)], limit: Annotated[int, Field(strict=True, ge=0)], _request_timeout: Union[ @@ -467,7 +468,7 @@ def list_handler_with_http_info( @validate_call def list_handler_without_preload_content( self, - filter: Optional[Any], + filter: Optional[TaskFilter], offset: Annotated[int, Field(strict=True, ge=0)], limit: Annotated[int, Field(strict=True, ge=0)], _request_timeout: Union[ diff --git a/python/geoengine_openapi_client/api/uploads_api.py b/python/geoengine_openapi_client/api/uploads_api.py index 69ed7317..0970b9ae 100644 --- a/python/geoengine_openapi_client/api/uploads_api.py +++ b/python/geoengine_openapi_client/api/uploads_api.py @@ -20,7 +20,7 @@ from pydantic import Field, StrictBytes, StrictStr from typing import List, Tuple, Union from typing_extensions import Annotated -from geoengine_openapi_client.models.add_collection200_response import AddCollection200Response +from geoengine_openapi_client.models.id_response import IdResponse from geoengine_openapi_client.models.upload_file_layers_response import UploadFileLayersResponse from geoengine_openapi_client.models.upload_files_response import UploadFilesResponse @@ -589,7 +589,7 @@ def upload_handler( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> AddCollection200Response: + ) -> IdResponse: """Uploads files. @@ -626,7 +626,7 @@ def upload_handler( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -655,7 +655,7 @@ def upload_handler_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[AddCollection200Response]: + ) -> ApiResponse[IdResponse]: """Uploads files. @@ -692,7 +692,7 @@ def upload_handler_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -758,7 +758,7 @@ def upload_handler_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, diff --git a/python/geoengine_openapi_client/api/user_api.py b/python/geoengine_openapi_client/api/user_api.py index 89abe9c5..12d3d321 100644 --- a/python/geoengine_openapi_client/api/user_api.py +++ b/python/geoengine_openapi_client/api/user_api.py @@ -20,11 +20,11 @@ from pydantic import Field, StrictStr from typing import List, Optional from typing_extensions import Annotated -from geoengine_openapi_client.models.add_collection200_response import AddCollection200Response from geoengine_openapi_client.models.add_role import AddRole from geoengine_openapi_client.models.computation_quota import ComputationQuota from geoengine_openapi_client.models.data_usage import DataUsage from geoengine_openapi_client.models.data_usage_summary import DataUsageSummary +from geoengine_openapi_client.models.id_response import IdResponse from geoengine_openapi_client.models.operator_quota import OperatorQuota from geoengine_openapi_client.models.quota import Quota from geoengine_openapi_client.models.role_description import RoleDescription @@ -1725,7 +1725,7 @@ def get_role_by_name_handler( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> AddCollection200Response: + ) -> IdResponse: """Get role by name @@ -1762,7 +1762,7 @@ def get_role_by_name_handler( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -1791,7 +1791,7 @@ def get_role_by_name_handler_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[AddCollection200Response]: + ) -> ApiResponse[IdResponse]: """Get role by name @@ -1828,7 +1828,7 @@ def get_role_by_name_handler_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -1894,7 +1894,7 @@ def get_role_by_name_handler_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, diff --git a/python/geoengine_openapi_client/api/workflows_api.py b/python/geoengine_openapi_client/api/workflows_api.py index 36859c28..d2f5dc5f 100644 --- a/python/geoengine_openapi_client/api/workflows_api.py +++ b/python/geoengine_openapi_client/api/workflows_api.py @@ -20,7 +20,7 @@ from pydantic import Field, StrictBytes, StrictStr from typing import List, Tuple, Union from typing_extensions import Annotated -from geoengine_openapi_client.models.add_collection200_response import AddCollection200Response +from geoengine_openapi_client.models.id_response import IdResponse from geoengine_openapi_client.models.provenance_entry import ProvenanceEntry from geoengine_openapi_client.models.raster_dataset_from_workflow import RasterDatasetFromWorkflow from geoengine_openapi_client.models.raster_stream_websocket_result_type import RasterStreamWebsocketResultType @@ -66,9 +66,8 @@ def dataset_from_workflow_handler( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> TaskResponse: - """Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + """Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task - Returns the id of the created task :param id: Workflow id (required) :type id: str @@ -137,9 +136,8 @@ def dataset_from_workflow_handler_with_http_info( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> ApiResponse[TaskResponse]: - """Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + """Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task - Returns the id of the created task :param id: Workflow id (required) :type id: str @@ -208,9 +206,8 @@ def dataset_from_workflow_handler_without_preload_content( _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, ) -> RESTResponseType: - """Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + """Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task - Returns the id of the created task :param id: Workflow id (required) :type id: str @@ -1721,7 +1718,7 @@ def register_workflow_handler( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> AddCollection200Response: + ) -> IdResponse: """Registers a new Workflow. @@ -1758,7 +1755,7 @@ def register_workflow_handler( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -1787,7 +1784,7 @@ def register_workflow_handler_with_http_info( _content_type: Optional[StrictStr] = None, _headers: Optional[Dict[StrictStr, Any]] = None, _host_index: Annotated[StrictInt, Field(ge=0, le=0)] = 0, - ) -> ApiResponse[AddCollection200Response]: + ) -> ApiResponse[IdResponse]: """Registers a new Workflow. @@ -1824,7 +1821,7 @@ def register_workflow_handler_with_http_info( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, @@ -1890,7 +1887,7 @@ def register_workflow_handler_without_preload_content( ) _response_types_map: Dict[str, Optional[str]] = { - '200': "AddCollection200Response", + '200': "IdResponse", } response_data = self.api_client.call_api( *_param, diff --git a/python/geoengine_openapi_client/api_client.py b/python/geoengine_openapi_client/api_client.py index 603021e0..85e17e35 100644 --- a/python/geoengine_openapi_client/api_client.py +++ b/python/geoengine_openapi_client/api_client.py @@ -91,7 +91,7 @@ def __init__( self.default_headers[header_name] = header_value self.cookie = cookie # Set default User-Agent. - self.user_agent = 'geoengine/openapi-client/python/0.0.21' + self.user_agent = 'geoengine/openapi-client/python/0.0.22' self.client_side_validation = configuration.client_side_validation def __enter__(self): diff --git a/python/geoengine_openapi_client/configuration.py b/python/geoengine_openapi_client/configuration.py index 96db43ba..c64b79e7 100644 --- a/python/geoengine_openapi_client/configuration.py +++ b/python/geoengine_openapi_client/configuration.py @@ -19,7 +19,7 @@ from logging import FileHandler import multiprocessing import sys -from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict +from typing import Any, ClassVar, Dict, List, Literal, Optional, TypedDict, Union from typing_extensions import NotRequired, Self import urllib3 @@ -162,6 +162,8 @@ class Configuration: :param ssl_ca_cert: str - the path to a file of concatenated CA certificates in PEM format. :param retries: Number of retries for API requests. + :param ca_cert_data: verify the peer using concatenated CA certificate data + in PEM (str) or DER (bytes) format. :Example: """ @@ -176,19 +178,20 @@ def __init__( username: Optional[str]=None, password: Optional[str]=None, access_token: Optional[str]=None, - server_index: Optional[int]=None, + server_index: Optional[int]=None, server_variables: Optional[ServerVariablesT]=None, server_operation_index: Optional[Dict[int, int]]=None, server_operation_variables: Optional[Dict[int, ServerVariablesT]]=None, ignore_operation_servers: bool=False, ssl_ca_cert: Optional[str]=None, retries: Optional[int] = None, + ca_cert_data: Optional[Union[str, bytes]] = None, *, debug: Optional[bool] = None, ) -> None: """Constructor """ - self._base_path = "http://0.0.0.0:8080/api" if host is None else host + self._base_path = "https://geoengine.io/api" if host is None else host """Default Base url """ self.server_index = 0 if server_index is None and host is None else server_index @@ -260,6 +263,10 @@ def __init__( self.ssl_ca_cert = ssl_ca_cert """Set this to customize the certificate file to verify the peer. """ + self.ca_cert_data = ca_cert_data + """Set this to verify the peer using PEM (str) or DER (bytes) + certificate data. + """ self.cert_file = None """client certificate file """ @@ -505,7 +512,7 @@ def to_debug_report(self) -> str: "OS: {env}\n"\ "Python Version: {pyversion}\n"\ "Version of the API: 0.8.0\n"\ - "SDK Package Version: 0.0.21".\ + "SDK Package Version: 0.0.22".\ format(env=sys.platform, pyversion=sys.version) def get_host_settings(self) -> List[HostSetting]: @@ -515,8 +522,14 @@ def get_host_settings(self) -> List[HostSetting]: """ return [ { - 'url': "http://0.0.0.0:8080/api", + 'url': "{server}/api", 'description': "No description provided", + 'variables': { + 'server': { + 'description': "No description provided", + 'default_value': "https://geoengine.io", + } + } } ] diff --git a/python/geoengine_openapi_client/models/__init__.py b/python/geoengine_openapi_client/models/__init__.py index a9dca166..eb84f304 100644 --- a/python/geoengine_openapi_client/models/__init__.py +++ b/python/geoengine_openapi_client/models/__init__.py @@ -15,7 +15,6 @@ # import models into model package -from geoengine_openapi_client.models.add_collection200_response import AddCollection200Response from geoengine_openapi_client.models.add_dataset import AddDataset from geoengine_openapi_client.models.add_layer import AddLayer from geoengine_openapi_client.models.add_layer_collection import AddLayerCollection @@ -30,13 +29,11 @@ from geoengine_openapi_client.models.collection_item import CollectionItem from geoengine_openapi_client.models.collection_type import CollectionType from geoengine_openapi_client.models.color_param import ColorParam -from geoengine_openapi_client.models.color_param_static import ColorParamStatic from geoengine_openapi_client.models.colorizer import Colorizer from geoengine_openapi_client.models.computation_quota import ComputationQuota from geoengine_openapi_client.models.continuous_measurement import ContinuousMeasurement from geoengine_openapi_client.models.coordinate2_d import Coordinate2D from geoengine_openapi_client.models.create_dataset import CreateDataset -from geoengine_openapi_client.models.create_dataset_handler200_response import CreateDatasetHandler200Response from geoengine_openapi_client.models.create_project import CreateProject from geoengine_openapi_client.models.csv_header import CsvHeader from geoengine_openapi_client.models.data_id import DataId @@ -48,8 +45,8 @@ from geoengine_openapi_client.models.dataset import Dataset from geoengine_openapi_client.models.dataset_definition import DatasetDefinition from geoengine_openapi_client.models.dataset_listing import DatasetListing +from geoengine_openapi_client.models.dataset_name_response import DatasetNameResponse from geoengine_openapi_client.models.dataset_resource import DatasetResource -from geoengine_openapi_client.models.date_time import DateTime from geoengine_openapi_client.models.derived_color import DerivedColor from geoengine_openapi_client.models.derived_number import DerivedNumber from geoengine_openapi_client.models.describe_coverage_request import DescribeCoverageRequest @@ -79,7 +76,7 @@ from geoengine_openapi_client.models.get_map_exception_format import GetMapExceptionFormat from geoengine_openapi_client.models.get_map_format import GetMapFormat from geoengine_openapi_client.models.get_map_request import GetMapRequest -from geoengine_openapi_client.models.inline_object import InlineObject +from geoengine_openapi_client.models.id_response import IdResponse from geoengine_openapi_client.models.internal_data_id import InternalDataId from geoengine_openapi_client.models.layer import Layer from geoengine_openapi_client.models.layer_collection import LayerCollection @@ -87,7 +84,6 @@ from geoengine_openapi_client.models.layer_collection_resource import LayerCollectionResource from geoengine_openapi_client.models.layer_listing import LayerListing from geoengine_openapi_client.models.layer_resource import LayerResource -from geoengine_openapi_client.models.layer_update import LayerUpdate from geoengine_openapi_client.models.layer_visibility import LayerVisibility from geoengine_openapi_client.models.line_symbology import LineSymbology from geoengine_openapi_client.models.linear_gradient import LinearGradient @@ -134,7 +130,6 @@ from geoengine_openapi_client.models.plot_output_format import PlotOutputFormat from geoengine_openapi_client.models.plot_query_rectangle import PlotQueryRectangle from geoengine_openapi_client.models.plot_result_descriptor import PlotResultDescriptor -from geoengine_openapi_client.models.plot_update import PlotUpdate from geoengine_openapi_client.models.point_symbology import PointSymbology from geoengine_openapi_client.models.polygon_symbology import PolygonSymbology from geoengine_openapi_client.models.project import Project @@ -163,12 +158,6 @@ from geoengine_openapi_client.models.raster_stream_websocket_result_type import RasterStreamWebsocketResultType from geoengine_openapi_client.models.raster_symbology import RasterSymbology from geoengine_openapi_client.models.resource import Resource -from geoengine_openapi_client.models.resource_id import ResourceId -from geoengine_openapi_client.models.resource_id_dataset_id import ResourceIdDatasetId -from geoengine_openapi_client.models.resource_id_layer import ResourceIdLayer -from geoengine_openapi_client.models.resource_id_layer_collection import ResourceIdLayerCollection -from geoengine_openapi_client.models.resource_id_ml_model import ResourceIdMlModel -from geoengine_openapi_client.models.resource_id_project import ResourceIdProject from geoengine_openapi_client.models.role import Role from geoengine_openapi_client.models.role_description import RoleDescription from geoengine_openapi_client.models.st_rectangle import STRectangle @@ -181,7 +170,8 @@ from geoengine_openapi_client.models.spatial_reference_authority import SpatialReferenceAuthority from geoengine_openapi_client.models.spatial_reference_specification import SpatialReferenceSpecification from geoengine_openapi_client.models.spatial_resolution import SpatialResolution -from geoengine_openapi_client.models.static_number_param import StaticNumberParam +from geoengine_openapi_client.models.static_color import StaticColor +from geoengine_openapi_client.models.static_number import StaticNumber from geoengine_openapi_client.models.stroke_param import StrokeParam from geoengine_openapi_client.models.suggest_meta_data import SuggestMetaData from geoengine_openapi_client.models.symbology import Symbology @@ -225,6 +215,7 @@ from geoengine_openapi_client.models.user_info import UserInfo from geoengine_openapi_client.models.user_registration import UserRegistration from geoengine_openapi_client.models.user_session import UserSession +from geoengine_openapi_client.models.vec_update import VecUpdate from geoengine_openapi_client.models.vector_column_info import VectorColumnInfo from geoengine_openapi_client.models.vector_data_type import VectorDataType from geoengine_openapi_client.models.vector_query_rectangle import VectorQueryRectangle diff --git a/python/geoengine_openapi_client/models/add_dataset.py b/python/geoengine_openapi_client/models/add_dataset.py index 822ace9f..adfb407b 100644 --- a/python/geoengine_openapi_client/models/add_dataset.py +++ b/python/geoengine_openapi_client/models/add_dataset.py @@ -87,11 +87,6 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of symbology if self.symbology: _dict['symbology'] = self.symbology.to_dict() - # set to None if name (nullable) is None - # and model_fields_set contains the field - if self.name is None and "name" in self.model_fields_set: - _dict['name'] = None - # set to None if provenance (nullable) is None # and model_fields_set contains the field if self.provenance is None and "provenance" in self.model_fields_set: diff --git a/python/geoengine_openapi_client/models/color_param.py b/python/geoengine_openapi_client/models/color_param.py index c7747c01..83f37b19 100644 --- a/python/geoengine_openapi_client/models/color_param.py +++ b/python/geoengine_openapi_client/models/color_param.py @@ -18,24 +18,24 @@ import pprint from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator from typing import Any, List, Optional -from geoengine_openapi_client.models.color_param_static import ColorParamStatic from geoengine_openapi_client.models.derived_color import DerivedColor +from geoengine_openapi_client.models.static_color import StaticColor from pydantic import StrictStr, Field from typing import Union, List, Set, Optional, Dict from typing_extensions import Literal, Self -COLORPARAM_ONE_OF_SCHEMAS = ["ColorParamStatic", "DerivedColor"] +COLORPARAM_ONE_OF_SCHEMAS = ["DerivedColor", "StaticColor"] class ColorParam(BaseModel): """ ColorParam """ - # data type: ColorParamStatic - oneof_schema_1_validator: Optional[ColorParamStatic] = None + # data type: StaticColor + oneof_schema_1_validator: Optional[StaticColor] = None # data type: DerivedColor oneof_schema_2_validator: Optional[DerivedColor] = None - actual_instance: Optional[Union[ColorParamStatic, DerivedColor]] = None - one_of_schemas: Set[str] = { "ColorParamStatic", "DerivedColor" } + actual_instance: Optional[Union[DerivedColor, StaticColor]] = None + one_of_schemas: Set[str] = { "DerivedColor", "StaticColor" } model_config = ConfigDict( validate_assignment=True, @@ -61,9 +61,9 @@ def actual_instance_must_validate_oneof(cls, v): instance = ColorParam.model_construct() error_messages = [] match = 0 - # validate data type: ColorParamStatic - if not isinstance(v, ColorParamStatic): - error_messages.append(f"Error! Input type `{type(v)}` is not `ColorParamStatic`") + # validate data type: StaticColor + if not isinstance(v, StaticColor): + error_messages.append(f"Error! Input type `{type(v)}` is not `StaticColor`") else: match += 1 # validate data type: DerivedColor @@ -73,10 +73,10 @@ def actual_instance_must_validate_oneof(cls, v): match += 1 if match > 1: # more than 1 match - raise ValueError("Multiple matches found when setting `actual_instance` in ColorParam with oneOf schemas: ColorParamStatic, DerivedColor. Details: " + ", ".join(error_messages)) + raise ValueError("Multiple matches found when setting `actual_instance` in ColorParam with oneOf schemas: DerivedColor, StaticColor. Details: " + ", ".join(error_messages)) elif match == 0: # no match - raise ValueError("No match found when setting `actual_instance` in ColorParam with oneOf schemas: ColorParamStatic, DerivedColor. Details: " + ", ".join(error_messages)) + raise ValueError("No match found when setting `actual_instance` in ColorParam with oneOf schemas: DerivedColor, StaticColor. Details: " + ", ".join(error_messages)) else: return v @@ -101,14 +101,9 @@ def from_json(cls, json_str: str) -> Self: instance.actual_instance = DerivedColor.from_json(json_str) return instance - # check if data type is `ColorParamStatic` + # check if data type is `StaticColor` if _data_type == "static": - instance.actual_instance = ColorParamStatic.from_json(json_str) - return instance - - # check if data type is `ColorParamStatic` - if _data_type == "ColorParamStatic": - instance.actual_instance = ColorParamStatic.from_json(json_str) + instance.actual_instance = StaticColor.from_json(json_str) return instance # check if data type is `DerivedColor` @@ -116,9 +111,14 @@ def from_json(cls, json_str: str) -> Self: instance.actual_instance = DerivedColor.from_json(json_str) return instance - # deserialize data into ColorParamStatic + # check if data type is `StaticColor` + if _data_type == "StaticColor": + instance.actual_instance = StaticColor.from_json(json_str) + return instance + + # deserialize data into StaticColor try: - instance.actual_instance = ColorParamStatic.from_json(json_str) + instance.actual_instance = StaticColor.from_json(json_str) match += 1 except (ValidationError, ValueError) as e: error_messages.append(str(e)) @@ -131,10 +131,10 @@ def from_json(cls, json_str: str) -> Self: if match > 1: # more than 1 match - raise ValueError("Multiple matches found when deserializing the JSON string into ColorParam with oneOf schemas: ColorParamStatic, DerivedColor. Details: " + ", ".join(error_messages)) + raise ValueError("Multiple matches found when deserializing the JSON string into ColorParam with oneOf schemas: DerivedColor, StaticColor. Details: " + ", ".join(error_messages)) elif match == 0: # no match - raise ValueError("No match found when deserializing the JSON string into ColorParam with oneOf schemas: ColorParamStatic, DerivedColor. Details: " + ", ".join(error_messages)) + raise ValueError("No match found when deserializing the JSON string into ColorParam with oneOf schemas: DerivedColor, StaticColor. Details: " + ", ".join(error_messages)) else: return instance @@ -148,7 +148,7 @@ def to_json(self) -> str: else: return json.dumps(self.actual_instance) - def to_dict(self) -> Optional[Union[Dict[str, Any], ColorParamStatic, DerivedColor]]: + def to_dict(self) -> Optional[Union[Dict[str, Any], DerivedColor, StaticColor]]: """Returns the dict representation of the actual instance""" if self.actual_instance is None: return None diff --git a/python/geoengine_openapi_client/models/colorizer.py b/python/geoengine_openapi_client/models/colorizer.py index cd242dba..d0bda490 100644 --- a/python/geoengine_openapi_client/models/colorizer.py +++ b/python/geoengine_openapi_client/models/colorizer.py @@ -29,7 +29,7 @@ class Colorizer(BaseModel): """ - Colorizer + A colorizer specifies a mapping between raster values and an output image There are different variants that perform different kinds of mapping. """ # data type: LinearGradient oneof_schema_1_validator: Optional[LinearGradient] = None diff --git a/python/geoengine_openapi_client/models/data_id.py b/python/geoengine_openapi_client/models/data_id.py index e09b8935..aa85e454 100644 --- a/python/geoengine_openapi_client/models/data_id.py +++ b/python/geoengine_openapi_client/models/data_id.py @@ -28,7 +28,7 @@ class DataId(BaseModel): """ - DataId + The identifier for loadable data. It is used in the source operators to get the loading info (aka parametrization) for accessing the data. Internal data is loaded from datasets, external from `DataProvider`s. """ # data type: InternalDataId oneof_schema_1_validator: Optional[InternalDataId] = None diff --git a/python/geoengine_openapi_client/models/create_dataset_handler200_response.py b/python/geoengine_openapi_client/models/dataset_name_response.py similarity index 90% rename from python/geoengine_openapi_client/models/create_dataset_handler200_response.py rename to python/geoengine_openapi_client/models/dataset_name_response.py index 6e095356..7d1b2bbb 100644 --- a/python/geoengine_openapi_client/models/create_dataset_handler200_response.py +++ b/python/geoengine_openapi_client/models/dataset_name_response.py @@ -23,9 +23,9 @@ from typing import Optional, Set from typing_extensions import Self -class CreateDatasetHandler200Response(BaseModel): +class DatasetNameResponse(BaseModel): """ - CreateDatasetHandler200Response + DatasetNameResponse """ # noqa: E501 dataset_name: StrictStr = Field(alias="datasetName") __properties: ClassVar[List[str]] = ["datasetName"] @@ -48,7 +48,7 @@ def to_json(self) -> str: @classmethod def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of CreateDatasetHandler200Response from a JSON string""" + """Create an instance of DatasetNameResponse from a JSON string""" return cls.from_dict(json.loads(json_str)) def to_dict(self) -> Dict[str, Any]: @@ -73,7 +73,7 @@ def to_dict(self) -> Dict[str, Any]: @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of CreateDatasetHandler200Response from a dict""" + """Create an instance of DatasetNameResponse from a dict""" if obj is None: return None diff --git a/python/geoengine_openapi_client/models/date_time.py b/python/geoengine_openapi_client/models/date_time.py deleted file mode 100644 index 2b8fe41d..00000000 --- a/python/geoengine_openapi_client/models/date_time.py +++ /dev/null @@ -1,89 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -from __future__ import annotations -import pprint -import re # noqa: F401 -import json - -from datetime import datetime -from pydantic import BaseModel, ConfigDict -from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self - -class DateTime(BaseModel): - """ - An object that composes the date and a timestamp with time zone. - """ # noqa: E501 - datetime: datetime - __properties: ClassVar[List[str]] = ["datetime"] - - model_config = ConfigDict( - populate_by_name=True, - validate_assignment=True, - protected_namespaces=(), - ) - - - def to_str(self) -> str: - """Returns the string representation of the model using alias""" - return pprint.pformat(self.model_dump(by_alias=True)) - - def to_json(self) -> str: - """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) - - @classmethod - def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of DateTime from a JSON string""" - return cls.from_dict(json.loads(json_str)) - - def to_dict(self) -> Dict[str, Any]: - """Return the dictionary representation of the model using alias. - - This has the following differences from calling pydantic's - `self.model_dump(by_alias=True)`: - - * `None` is only added to the output dict for nullable fields that - were set at model initialization. Other fields with value `None` - are ignored. - """ - excluded_fields: Set[str] = set([ - ]) - - _dict = self.model_dump( - by_alias=True, - exclude=excluded_fields, - exclude_none=True, - ) - return _dict - - @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of DateTime from a dict""" - if obj is None: - return None - - if not isinstance(obj, dict): - return cls.model_validate(obj) - - _obj = cls.model_validate({ - "datetime": obj.get("datetime") - }) - return _obj - - diff --git a/python/geoengine_openapi_client/models/date_time_parse_format.py b/python/geoengine_openapi_client/models/date_time_parse_format.py deleted file mode 100644 index 02a98ada..00000000 --- a/python/geoengine_openapi_client/models/date_time_parse_format.py +++ /dev/null @@ -1,76 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine Pro API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -from __future__ import annotations -import pprint -import re # noqa: F401 -import json - - - -from pydantic import BaseModel, Field, StrictBool, StrictStr - -class DateTimeParseFormat(BaseModel): - """ - DateTimeParseFormat - """ - fmt: StrictStr = Field(...) - has_time: StrictBool = Field(...) - has_tz: StrictBool = Field(...) - __properties = ["fmt", "has_time", "has_tz"] - - class Config: - """Pydantic configuration""" - allow_population_by_field_name = True - validate_assignment = True - - def to_str(self) -> str: - """Returns the string representation of the model using alias""" - return pprint.pformat(self.dict(by_alias=True)) - - def to_json(self) -> str: - """Returns the JSON representation of the model using alias""" - return json.dumps(self.to_dict()) - - @classmethod - def from_json(cls, json_str: str) -> DateTimeParseFormat: - """Create an instance of DateTimeParseFormat from a JSON string""" - return cls.from_dict(json.loads(json_str)) - - def to_dict(self): - """Returns the dictionary representation of the model using alias""" - _dict = self.dict(by_alias=True, - exclude={ - }, - exclude_none=True) - return _dict - - @classmethod - def from_dict(cls, obj: dict) -> DateTimeParseFormat: - """Create an instance of DateTimeParseFormat from a dict""" - if obj is None: - return None - - if not isinstance(obj, dict): - return DateTimeParseFormat.parse_obj(obj) - - _obj = DateTimeParseFormat.parse_obj({ - "fmt": obj.get("fmt"), - "has_time": obj.get("has_time"), - "has_tz": obj.get("has_tz") - }) - return _obj - - diff --git a/python/geoengine_openapi_client/models/gdal_metadata_net_cdf_cf.py b/python/geoengine_openapi_client/models/gdal_metadata_net_cdf_cf.py index 74705d13..b9814199 100644 --- a/python/geoengine_openapi_client/models/gdal_metadata_net_cdf_cf.py +++ b/python/geoengine_openapi_client/models/gdal_metadata_net_cdf_cf.py @@ -44,8 +44,8 @@ class GdalMetadataNetCdfCf(BaseModel): @field_validator('type') def type_validate_enum(cls, value): """Validates the enum""" - if value not in set(['GdalMetadataNetCdfCf']): - raise ValueError("must be one of enum values ('GdalMetadataNetCdfCf')") + if value not in set(['GdalMetaDataNetCdfCf']): + raise ValueError("must be one of enum values ('GdalMetaDataNetCdfCf')") return value model_config = ConfigDict( diff --git a/python/geoengine_openapi_client/models/add_collection200_response.py b/python/geoengine_openapi_client/models/id_response.py similarity index 91% rename from python/geoengine_openapi_client/models/add_collection200_response.py rename to python/geoengine_openapi_client/models/id_response.py index 680651bb..be43ea4c 100644 --- a/python/geoengine_openapi_client/models/add_collection200_response.py +++ b/python/geoengine_openapi_client/models/id_response.py @@ -23,9 +23,9 @@ from typing import Optional, Set from typing_extensions import Self -class AddCollection200Response(BaseModel): +class IdResponse(BaseModel): """ - AddCollection200Response + IdResponse """ # noqa: E501 id: StrictStr __properties: ClassVar[List[str]] = ["id"] @@ -48,7 +48,7 @@ def to_json(self) -> str: @classmethod def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of AddCollection200Response from a JSON string""" + """Create an instance of IdResponse from a JSON string""" return cls.from_dict(json.loads(json_str)) def to_dict(self) -> Dict[str, Any]: @@ -73,7 +73,7 @@ def to_dict(self) -> Dict[str, Any]: @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of AddCollection200Response from a dict""" + """Create an instance of IdResponse from a dict""" if obj is None: return None diff --git a/python/geoengine_openapi_client/models/inline_object.py b/python/geoengine_openapi_client/models/inline_object.py deleted file mode 100644 index 95df4a44..00000000 --- a/python/geoengine_openapi_client/models/inline_object.py +++ /dev/null @@ -1,88 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -from __future__ import annotations -import pprint -import re # noqa: F401 -import json - -from pydantic import BaseModel, ConfigDict, StrictStr -from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self - -class InlineObject(BaseModel): - """ - InlineObject - """ # noqa: E501 - url: StrictStr - __properties: ClassVar[List[str]] = ["url"] - - model_config = ConfigDict( - populate_by_name=True, - validate_assignment=True, - protected_namespaces=(), - ) - - - def to_str(self) -> str: - """Returns the string representation of the model using alias""" - return pprint.pformat(self.model_dump(by_alias=True)) - - def to_json(self) -> str: - """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) - - @classmethod - def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of InlineObject from a JSON string""" - return cls.from_dict(json.loads(json_str)) - - def to_dict(self) -> Dict[str, Any]: - """Return the dictionary representation of the model using alias. - - This has the following differences from calling pydantic's - `self.model_dump(by_alias=True)`: - - * `None` is only added to the output dict for nullable fields that - were set at model initialization. Other fields with value `None` - are ignored. - """ - excluded_fields: Set[str] = set([ - ]) - - _dict = self.model_dump( - by_alias=True, - exclude=excluded_fields, - exclude_none=True, - ) - return _dict - - @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of InlineObject from a dict""" - if obj is None: - return None - - if not isinstance(obj, dict): - return cls.model_validate(obj) - - _obj = cls.model_validate({ - "url": obj.get("url") - }) - return _obj - - diff --git a/python/geoengine_openapi_client/models/layer_update.py b/python/geoengine_openapi_client/models/layer_update.py deleted file mode 100644 index b6731c5c..00000000 --- a/python/geoengine_openapi_client/models/layer_update.py +++ /dev/null @@ -1,138 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -from __future__ import annotations -import json -import pprint -from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from geoengine_openapi_client.models.project_layer import ProjectLayer -from geoengine_openapi_client.models.project_update_token import ProjectUpdateToken -from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self - -LAYERUPDATE_ONE_OF_SCHEMAS = ["ProjectLayer", "ProjectUpdateToken"] - -class LayerUpdate(BaseModel): - """ - LayerUpdate - """ - # data type: ProjectUpdateToken - oneof_schema_1_validator: Optional[ProjectUpdateToken] = None - # data type: ProjectLayer - oneof_schema_2_validator: Optional[ProjectLayer] = None - actual_instance: Optional[Union[ProjectLayer, ProjectUpdateToken]] = None - one_of_schemas: Set[str] = { "ProjectLayer", "ProjectUpdateToken" } - - model_config = ConfigDict( - validate_assignment=True, - protected_namespaces=(), - ) - - - def __init__(self, *args, **kwargs) -> None: - if args: - if len(args) > 1: - raise ValueError("If a position argument is used, only 1 is allowed to set `actual_instance`") - if kwargs: - raise ValueError("If a position argument is used, keyword arguments cannot be used.") - super().__init__(actual_instance=args[0]) - else: - super().__init__(**kwargs) - - @field_validator('actual_instance') - def actual_instance_must_validate_oneof(cls, v): - instance = LayerUpdate.model_construct() - error_messages = [] - match = 0 - # validate data type: ProjectUpdateToken - if not isinstance(v, ProjectUpdateToken): - error_messages.append(f"Error! Input type `{type(v)}` is not `ProjectUpdateToken`") - else: - match += 1 - # validate data type: ProjectLayer - if not isinstance(v, ProjectLayer): - error_messages.append(f"Error! Input type `{type(v)}` is not `ProjectLayer`") - else: - match += 1 - if match > 1: - # more than 1 match - raise ValueError("Multiple matches found when setting `actual_instance` in LayerUpdate with oneOf schemas: ProjectLayer, ProjectUpdateToken. Details: " + ", ".join(error_messages)) - elif match == 0: - # no match - raise ValueError("No match found when setting `actual_instance` in LayerUpdate with oneOf schemas: ProjectLayer, ProjectUpdateToken. Details: " + ", ".join(error_messages)) - else: - return v - - @classmethod - def from_dict(cls, obj: Union[str, Dict[str, Any]]) -> Self: - return cls.from_json(json.dumps(obj)) - - @classmethod - def from_json(cls, json_str: str) -> Self: - """Returns the object represented by the json string""" - instance = cls.model_construct() - error_messages = [] - match = 0 - - # deserialize data into ProjectUpdateToken - try: - instance.actual_instance = ProjectUpdateToken.from_json(json_str) - match += 1 - except (ValidationError, ValueError) as e: - error_messages.append(str(e)) - # deserialize data into ProjectLayer - try: - instance.actual_instance = ProjectLayer.from_json(json_str) - match += 1 - except (ValidationError, ValueError) as e: - error_messages.append(str(e)) - - if match > 1: - # more than 1 match - raise ValueError("Multiple matches found when deserializing the JSON string into LayerUpdate with oneOf schemas: ProjectLayer, ProjectUpdateToken. Details: " + ", ".join(error_messages)) - elif match == 0: - # no match - raise ValueError("No match found when deserializing the JSON string into LayerUpdate with oneOf schemas: ProjectLayer, ProjectUpdateToken. Details: " + ", ".join(error_messages)) - else: - return instance - - def to_json(self) -> str: - """Returns the JSON representation of the actual instance""" - if self.actual_instance is None: - return "null" - - if hasattr(self.actual_instance, "to_json") and callable(self.actual_instance.to_json): - return self.actual_instance.to_json() - else: - return json.dumps(self.actual_instance) - - def to_dict(self) -> Optional[Union[Dict[str, Any], ProjectLayer, ProjectUpdateToken]]: - """Returns the dict representation of the actual instance""" - if self.actual_instance is None: - return None - - if hasattr(self.actual_instance, "to_dict") and callable(self.actual_instance.to_dict): - return self.actual_instance.to_dict() - else: - # primitive type - return self.actual_instance - - def to_str(self) -> str: - """Returns the string representation of the actual instance""" - return pprint.pformat(self.model_dump()) - - diff --git a/python/geoengine_openapi_client/models/meta_data_definition.py b/python/geoengine_openapi_client/models/meta_data_definition.py index 0ce7cf5f..6e892bff 100644 --- a/python/geoengine_openapi_client/models/meta_data_definition.py +++ b/python/geoengine_openapi_client/models/meta_data_definition.py @@ -133,16 +133,16 @@ def from_json(cls, json_str: str) -> Self: instance.actual_instance = GdalMetaDataList.from_json(json_str) return instance + # check if data type is `GdalMetadataNetCdfCf` + if _data_type == "GdalMetaDataNetCdfCf": + instance.actual_instance = GdalMetadataNetCdfCf.from_json(json_str) + return instance + # check if data type is `GdalMetaDataRegular` if _data_type == "GdalMetaDataRegular": instance.actual_instance = GdalMetaDataRegular.from_json(json_str) return instance - # check if data type is `GdalMetadataNetCdfCf` - if _data_type == "GdalMetadataNetCdfCf": - instance.actual_instance = GdalMetadataNetCdfCf.from_json(json_str) - return instance - # check if data type is `GdalMetaDataStatic` if _data_type == "GdalStatic": instance.actual_instance = GdalMetaDataStatic.from_json(json_str) @@ -163,6 +163,11 @@ def from_json(cls, json_str: str) -> Self: instance.actual_instance = GdalMetaDataStatic.from_json(json_str) return instance + # check if data type is `GdalMetadataNetCdfCf` + if _data_type == "GdalMetadataNetCdfCf": + instance.actual_instance = GdalMetadataNetCdfCf.from_json(json_str) + return instance + # deserialize data into MockMetaData try: instance.actual_instance = MockMetaData.from_json(json_str) diff --git a/python/geoengine_openapi_client/models/number_param.py b/python/geoengine_openapi_client/models/number_param.py index 58875910..e766b4c6 100644 --- a/python/geoengine_openapi_client/models/number_param.py +++ b/python/geoengine_openapi_client/models/number_param.py @@ -19,23 +19,23 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator from typing import Any, List, Optional from geoengine_openapi_client.models.derived_number import DerivedNumber -from geoengine_openapi_client.models.static_number_param import StaticNumberParam +from geoengine_openapi_client.models.static_number import StaticNumber from pydantic import StrictStr, Field from typing import Union, List, Set, Optional, Dict from typing_extensions import Literal, Self -NUMBERPARAM_ONE_OF_SCHEMAS = ["DerivedNumber", "StaticNumberParam"] +NUMBERPARAM_ONE_OF_SCHEMAS = ["DerivedNumber", "StaticNumber"] class NumberParam(BaseModel): """ NumberParam """ - # data type: StaticNumberParam - oneof_schema_1_validator: Optional[StaticNumberParam] = None + # data type: StaticNumber + oneof_schema_1_validator: Optional[StaticNumber] = None # data type: DerivedNumber oneof_schema_2_validator: Optional[DerivedNumber] = None - actual_instance: Optional[Union[DerivedNumber, StaticNumberParam]] = None - one_of_schemas: Set[str] = { "DerivedNumber", "StaticNumberParam" } + actual_instance: Optional[Union[DerivedNumber, StaticNumber]] = None + one_of_schemas: Set[str] = { "DerivedNumber", "StaticNumber" } model_config = ConfigDict( validate_assignment=True, @@ -61,9 +61,9 @@ def actual_instance_must_validate_oneof(cls, v): instance = NumberParam.model_construct() error_messages = [] match = 0 - # validate data type: StaticNumberParam - if not isinstance(v, StaticNumberParam): - error_messages.append(f"Error! Input type `{type(v)}` is not `StaticNumberParam`") + # validate data type: StaticNumber + if not isinstance(v, StaticNumber): + error_messages.append(f"Error! Input type `{type(v)}` is not `StaticNumber`") else: match += 1 # validate data type: DerivedNumber @@ -73,10 +73,10 @@ def actual_instance_must_validate_oneof(cls, v): match += 1 if match > 1: # more than 1 match - raise ValueError("Multiple matches found when setting `actual_instance` in NumberParam with oneOf schemas: DerivedNumber, StaticNumberParam. Details: " + ", ".join(error_messages)) + raise ValueError("Multiple matches found when setting `actual_instance` in NumberParam with oneOf schemas: DerivedNumber, StaticNumber. Details: " + ", ".join(error_messages)) elif match == 0: # no match - raise ValueError("No match found when setting `actual_instance` in NumberParam with oneOf schemas: DerivedNumber, StaticNumberParam. Details: " + ", ".join(error_messages)) + raise ValueError("No match found when setting `actual_instance` in NumberParam with oneOf schemas: DerivedNumber, StaticNumber. Details: " + ", ".join(error_messages)) else: return v @@ -101,9 +101,9 @@ def from_json(cls, json_str: str) -> Self: instance.actual_instance = DerivedNumber.from_json(json_str) return instance - # check if data type is `StaticNumberParam` + # check if data type is `StaticNumber` if _data_type == "static": - instance.actual_instance = StaticNumberParam.from_json(json_str) + instance.actual_instance = StaticNumber.from_json(json_str) return instance # check if data type is `DerivedNumber` @@ -111,14 +111,14 @@ def from_json(cls, json_str: str) -> Self: instance.actual_instance = DerivedNumber.from_json(json_str) return instance - # check if data type is `StaticNumberParam` - if _data_type == "StaticNumberParam": - instance.actual_instance = StaticNumberParam.from_json(json_str) + # check if data type is `StaticNumber` + if _data_type == "StaticNumber": + instance.actual_instance = StaticNumber.from_json(json_str) return instance - # deserialize data into StaticNumberParam + # deserialize data into StaticNumber try: - instance.actual_instance = StaticNumberParam.from_json(json_str) + instance.actual_instance = StaticNumber.from_json(json_str) match += 1 except (ValidationError, ValueError) as e: error_messages.append(str(e)) @@ -131,10 +131,10 @@ def from_json(cls, json_str: str) -> Self: if match > 1: # more than 1 match - raise ValueError("Multiple matches found when deserializing the JSON string into NumberParam with oneOf schemas: DerivedNumber, StaticNumberParam. Details: " + ", ".join(error_messages)) + raise ValueError("Multiple matches found when deserializing the JSON string into NumberParam with oneOf schemas: DerivedNumber, StaticNumber. Details: " + ", ".join(error_messages)) elif match == 0: # no match - raise ValueError("No match found when deserializing the JSON string into NumberParam with oneOf schemas: DerivedNumber, StaticNumberParam. Details: " + ", ".join(error_messages)) + raise ValueError("No match found when deserializing the JSON string into NumberParam with oneOf schemas: DerivedNumber, StaticNumber. Details: " + ", ".join(error_messages)) else: return instance @@ -148,7 +148,7 @@ def to_json(self) -> str: else: return json.dumps(self.actual_instance) - def to_dict(self) -> Optional[Union[Dict[str, Any], DerivedNumber, StaticNumberParam]]: + def to_dict(self) -> Optional[Union[Dict[str, Any], DerivedNumber, StaticNumber]]: """Returns the dict representation of the actual instance""" if self.actual_instance is None: return None diff --git a/python/geoengine_openapi_client/models/ogr_source_column_spec.py b/python/geoengine_openapi_client/models/ogr_source_column_spec.py index ba5ff4ea..c2c4f5e5 100644 --- a/python/geoengine_openapi_client/models/ogr_source_column_spec.py +++ b/python/geoengine_openapi_client/models/ogr_source_column_spec.py @@ -86,11 +86,6 @@ def to_dict(self) -> Dict[str, Any]: if self.format_specifics is None and "format_specifics" in self.model_fields_set: _dict['formatSpecifics'] = None - # set to None if rename (nullable) is None - # and model_fields_set contains the field - if self.rename is None and "rename" in self.model_fields_set: - _dict['rename'] = None - # set to None if y (nullable) is None # and model_fields_set contains the field if self.y is None and "y" in self.model_fields_set: diff --git a/python/geoengine_openapi_client/models/ogr_source_duration_spec_value.py b/python/geoengine_openapi_client/models/ogr_source_duration_spec_value.py index b3a2652f..d7ba6747 100644 --- a/python/geoengine_openapi_client/models/ogr_source_duration_spec_value.py +++ b/python/geoengine_openapi_client/models/ogr_source_duration_spec_value.py @@ -18,19 +18,17 @@ import re # noqa: F401 import json -from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator +from pydantic import ConfigDict, StrictStr, field_validator from typing import Any, ClassVar, Dict, List -from typing_extensions import Annotated from geoengine_openapi_client.models.time_granularity import TimeGranularity +from geoengine_openapi_client.models.time_step import TimeStep from typing import Optional, Set from typing_extensions import Self -class OgrSourceDurationSpecValue(BaseModel): +class OgrSourceDurationSpecValue(TimeStep): """ OgrSourceDurationSpecValue """ # noqa: E501 - granularity: TimeGranularity - step: Annotated[int, Field(strict=True, ge=0)] type: StrictStr __properties: ClassVar[List[str]] = ["granularity", "step", "type"] diff --git a/python/geoengine_openapi_client/models/plot_result_descriptor.py b/python/geoengine_openapi_client/models/plot_result_descriptor.py index 0202e6a0..f1dd952d 100644 --- a/python/geoengine_openapi_client/models/plot_result_descriptor.py +++ b/python/geoengine_openapi_client/models/plot_result_descriptor.py @@ -92,8 +92,10 @@ def to_dict(self) -> Dict[str, Any]: return _dict @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: + def from_dict(cls, obj: Dict[str, Any]) -> Optional[Self]: """Create an instance of PlotResultDescriptor from a dict""" + + # Note: fixed if obj is None: return None @@ -103,7 +105,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: _obj = cls.model_validate({ "bbox": BoundingBox2D.from_dict(obj["bbox"]) if obj.get("bbox") is not None else None, "spatialReference": obj.get("spatialReference"), - "time": TimeInterval.from_dict(obj["time"]) if obj.get("time") is not None else None + "time": TimeInterval.from_dict(obj["time"]) if obj.get("time") is not None else None, }) return _obj diff --git a/python/geoengine_openapi_client/models/raster_dataset_from_workflow.py b/python/geoengine_openapi_client/models/raster_dataset_from_workflow.py index 658002c1..383a4807 100644 --- a/python/geoengine_openapi_client/models/raster_dataset_from_workflow.py +++ b/python/geoengine_openapi_client/models/raster_dataset_from_workflow.py @@ -82,11 +82,6 @@ def to_dict(self) -> Dict[str, Any]: if self.description is None and "description" in self.model_fields_set: _dict['description'] = None - # set to None if name (nullable) is None - # and model_fields_set contains the field - if self.name is None and "name" in self.model_fields_set: - _dict['name'] = None - return _dict @classmethod diff --git a/python/geoengine_openapi_client/models/raster_result_descriptor.py b/python/geoengine_openapi_client/models/raster_result_descriptor.py index ebd3a694..76ac7e4e 100644 --- a/python/geoengine_openapi_client/models/raster_result_descriptor.py +++ b/python/geoengine_openapi_client/models/raster_result_descriptor.py @@ -113,8 +113,10 @@ def to_dict(self) -> Dict[str, Any]: return _dict @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: + def from_dict(cls, obj: Dict[str, Any]) -> Optional[Self]: """Create an instance of RasterResultDescriptor from a dict""" + + # Note: fixed if obj is None: return None @@ -127,7 +129,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: "dataType": obj.get("dataType"), "resolution": SpatialResolution.from_dict(obj["resolution"]) if obj.get("resolution") is not None else None, "spatialReference": obj.get("spatialReference"), - "time": TimeInterval.from_dict(obj["time"]) if obj.get("time") is not None else None + "time": TimeInterval.from_dict(obj["time"]) if obj.get("time") is not None else None, }) return _obj diff --git a/python/geoengine_openapi_client/models/resource.py b/python/geoengine_openapi_client/models/resource.py index 945c16a1..c22e3da9 100644 --- a/python/geoengine_openapi_client/models/resource.py +++ b/python/geoengine_openapi_client/models/resource.py @@ -31,7 +31,7 @@ class Resource(BaseModel): """ - Resource + A resource that is affected by a permission. """ # data type: LayerResource oneof_schema_1_validator: Optional[LayerResource] = None diff --git a/python/geoengine_openapi_client/models/resource_id.py b/python/geoengine_openapi_client/models/resource_id.py deleted file mode 100644 index d3c65100..00000000 --- a/python/geoengine_openapi_client/models/resource_id.py +++ /dev/null @@ -1,238 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -from __future__ import annotations -import json -import pprint -from pydantic import BaseModel, ConfigDict, Field, StrictStr, ValidationError, field_validator -from typing import Any, List, Optional -from geoengine_openapi_client.models.resource_id_dataset_id import ResourceIdDatasetId -from geoengine_openapi_client.models.resource_id_layer import ResourceIdLayer -from geoengine_openapi_client.models.resource_id_layer_collection import ResourceIdLayerCollection -from geoengine_openapi_client.models.resource_id_ml_model import ResourceIdMlModel -from geoengine_openapi_client.models.resource_id_project import ResourceIdProject -from pydantic import StrictStr, Field -from typing import Union, List, Set, Optional, Dict -from typing_extensions import Literal, Self - -RESOURCEID_ONE_OF_SCHEMAS = ["ResourceIdDatasetId", "ResourceIdLayer", "ResourceIdLayerCollection", "ResourceIdMlModel", "ResourceIdProject"] - -class ResourceId(BaseModel): - """ - ResourceId - """ - # data type: ResourceIdLayer - oneof_schema_1_validator: Optional[ResourceIdLayer] = None - # data type: ResourceIdLayerCollection - oneof_schema_2_validator: Optional[ResourceIdLayerCollection] = None - # data type: ResourceIdProject - oneof_schema_3_validator: Optional[ResourceIdProject] = None - # data type: ResourceIdDatasetId - oneof_schema_4_validator: Optional[ResourceIdDatasetId] = None - # data type: ResourceIdMlModel - oneof_schema_5_validator: Optional[ResourceIdMlModel] = None - actual_instance: Optional[Union[ResourceIdDatasetId, ResourceIdLayer, ResourceIdLayerCollection, ResourceIdMlModel, ResourceIdProject]] = None - one_of_schemas: Set[str] = { "ResourceIdDatasetId", "ResourceIdLayer", "ResourceIdLayerCollection", "ResourceIdMlModel", "ResourceIdProject" } - - model_config = ConfigDict( - validate_assignment=True, - protected_namespaces=(), - ) - - - discriminator_value_class_map: Dict[str, str] = { - } - - def __init__(self, *args, **kwargs) -> None: - if args: - if len(args) > 1: - raise ValueError("If a position argument is used, only 1 is allowed to set `actual_instance`") - if kwargs: - raise ValueError("If a position argument is used, keyword arguments cannot be used.") - super().__init__(actual_instance=args[0]) - else: - super().__init__(**kwargs) - - @field_validator('actual_instance') - def actual_instance_must_validate_oneof(cls, v): - instance = ResourceId.model_construct() - error_messages = [] - match = 0 - # validate data type: ResourceIdLayer - if not isinstance(v, ResourceIdLayer): - error_messages.append(f"Error! Input type `{type(v)}` is not `ResourceIdLayer`") - else: - match += 1 - # validate data type: ResourceIdLayerCollection - if not isinstance(v, ResourceIdLayerCollection): - error_messages.append(f"Error! Input type `{type(v)}` is not `ResourceIdLayerCollection`") - else: - match += 1 - # validate data type: ResourceIdProject - if not isinstance(v, ResourceIdProject): - error_messages.append(f"Error! Input type `{type(v)}` is not `ResourceIdProject`") - else: - match += 1 - # validate data type: ResourceIdDatasetId - if not isinstance(v, ResourceIdDatasetId): - error_messages.append(f"Error! Input type `{type(v)}` is not `ResourceIdDatasetId`") - else: - match += 1 - # validate data type: ResourceIdMlModel - if not isinstance(v, ResourceIdMlModel): - error_messages.append(f"Error! Input type `{type(v)}` is not `ResourceIdMlModel`") - else: - match += 1 - if match > 1: - # more than 1 match - raise ValueError("Multiple matches found when setting `actual_instance` in ResourceId with oneOf schemas: ResourceIdDatasetId, ResourceIdLayer, ResourceIdLayerCollection, ResourceIdMlModel, ResourceIdProject. Details: " + ", ".join(error_messages)) - elif match == 0: - # no match - raise ValueError("No match found when setting `actual_instance` in ResourceId with oneOf schemas: ResourceIdDatasetId, ResourceIdLayer, ResourceIdLayerCollection, ResourceIdMlModel, ResourceIdProject. Details: " + ", ".join(error_messages)) - else: - return v - - @classmethod - def from_dict(cls, obj: Union[str, Dict[str, Any]]) -> Self: - return cls.from_json(json.dumps(obj)) - - @classmethod - def from_json(cls, json_str: str) -> Self: - """Returns the object represented by the json string""" - instance = cls.model_construct() - error_messages = [] - match = 0 - - # use oneOf discriminator to lookup the data type - _data_type = json.loads(json_str).get("type") - if not _data_type: - raise ValueError("Failed to lookup data type from the field `type` in the input.") - - # check if data type is `ResourceIdDatasetId` - if _data_type == "DatasetId": - instance.actual_instance = ResourceIdDatasetId.from_json(json_str) - return instance - - # check if data type is `ResourceIdLayer` - if _data_type == "Layer": - instance.actual_instance = ResourceIdLayer.from_json(json_str) - return instance - - # check if data type is `ResourceIdLayerCollection` - if _data_type == "LayerCollection": - instance.actual_instance = ResourceIdLayerCollection.from_json(json_str) - return instance - - # check if data type is `ResourceIdMlModel` - if _data_type == "MlModel": - instance.actual_instance = ResourceIdMlModel.from_json(json_str) - return instance - - # check if data type is `ResourceIdProject` - if _data_type == "Project": - instance.actual_instance = ResourceIdProject.from_json(json_str) - return instance - - # check if data type is `ResourceIdDatasetId` - if _data_type == "ResourceIdDatasetId": - instance.actual_instance = ResourceIdDatasetId.from_json(json_str) - return instance - - # check if data type is `ResourceIdLayer` - if _data_type == "ResourceIdLayer": - instance.actual_instance = ResourceIdLayer.from_json(json_str) - return instance - - # check if data type is `ResourceIdLayerCollection` - if _data_type == "ResourceIdLayerCollection": - instance.actual_instance = ResourceIdLayerCollection.from_json(json_str) - return instance - - # check if data type is `ResourceIdMlModel` - if _data_type == "ResourceIdMlModel": - instance.actual_instance = ResourceIdMlModel.from_json(json_str) - return instance - - # check if data type is `ResourceIdProject` - if _data_type == "ResourceIdProject": - instance.actual_instance = ResourceIdProject.from_json(json_str) - return instance - - # deserialize data into ResourceIdLayer - try: - instance.actual_instance = ResourceIdLayer.from_json(json_str) - match += 1 - except (ValidationError, ValueError) as e: - error_messages.append(str(e)) - # deserialize data into ResourceIdLayerCollection - try: - instance.actual_instance = ResourceIdLayerCollection.from_json(json_str) - match += 1 - except (ValidationError, ValueError) as e: - error_messages.append(str(e)) - # deserialize data into ResourceIdProject - try: - instance.actual_instance = ResourceIdProject.from_json(json_str) - match += 1 - except (ValidationError, ValueError) as e: - error_messages.append(str(e)) - # deserialize data into ResourceIdDatasetId - try: - instance.actual_instance = ResourceIdDatasetId.from_json(json_str) - match += 1 - except (ValidationError, ValueError) as e: - error_messages.append(str(e)) - # deserialize data into ResourceIdMlModel - try: - instance.actual_instance = ResourceIdMlModel.from_json(json_str) - match += 1 - except (ValidationError, ValueError) as e: - error_messages.append(str(e)) - - if match > 1: - # more than 1 match - raise ValueError("Multiple matches found when deserializing the JSON string into ResourceId with oneOf schemas: ResourceIdDatasetId, ResourceIdLayer, ResourceIdLayerCollection, ResourceIdMlModel, ResourceIdProject. Details: " + ", ".join(error_messages)) - elif match == 0: - # no match - raise ValueError("No match found when deserializing the JSON string into ResourceId with oneOf schemas: ResourceIdDatasetId, ResourceIdLayer, ResourceIdLayerCollection, ResourceIdMlModel, ResourceIdProject. Details: " + ", ".join(error_messages)) - else: - return instance - - def to_json(self) -> str: - """Returns the JSON representation of the actual instance""" - if self.actual_instance is None: - return "null" - - if hasattr(self.actual_instance, "to_json") and callable(self.actual_instance.to_json): - return self.actual_instance.to_json() - else: - return json.dumps(self.actual_instance) - - def to_dict(self) -> Optional[Union[Dict[str, Any], ResourceIdDatasetId, ResourceIdLayer, ResourceIdLayerCollection, ResourceIdMlModel, ResourceIdProject]]: - """Returns the dict representation of the actual instance""" - if self.actual_instance is None: - return None - - if hasattr(self.actual_instance, "to_dict") and callable(self.actual_instance.to_dict): - return self.actual_instance.to_dict() - else: - # primitive type - return self.actual_instance - - def to_str(self) -> str: - """Returns the string representation of the actual instance""" - return pprint.pformat(self.model_dump()) - - diff --git a/python/geoengine_openapi_client/models/resource_id_dataset_id.py b/python/geoengine_openapi_client/models/resource_id_dataset_id.py deleted file mode 100644 index a7569284..00000000 --- a/python/geoengine_openapi_client/models/resource_id_dataset_id.py +++ /dev/null @@ -1,97 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -from __future__ import annotations -import pprint -import re # noqa: F401 -import json - -from pydantic import BaseModel, ConfigDict, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self - -class ResourceIdDatasetId(BaseModel): - """ - ResourceIdDatasetId - """ # noqa: E501 - id: StrictStr - type: StrictStr - __properties: ClassVar[List[str]] = ["id", "type"] - - @field_validator('type') - def type_validate_enum(cls, value): - """Validates the enum""" - if value not in set(['DatasetId']): - raise ValueError("must be one of enum values ('DatasetId')") - return value - - model_config = ConfigDict( - populate_by_name=True, - validate_assignment=True, - protected_namespaces=(), - ) - - - def to_str(self) -> str: - """Returns the string representation of the model using alias""" - return pprint.pformat(self.model_dump(by_alias=True)) - - def to_json(self) -> str: - """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) - - @classmethod - def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of ResourceIdDatasetId from a JSON string""" - return cls.from_dict(json.loads(json_str)) - - def to_dict(self) -> Dict[str, Any]: - """Return the dictionary representation of the model using alias. - - This has the following differences from calling pydantic's - `self.model_dump(by_alias=True)`: - - * `None` is only added to the output dict for nullable fields that - were set at model initialization. Other fields with value `None` - are ignored. - """ - excluded_fields: Set[str] = set([ - ]) - - _dict = self.model_dump( - by_alias=True, - exclude=excluded_fields, - exclude_none=True, - ) - return _dict - - @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of ResourceIdDatasetId from a dict""" - if obj is None: - return None - - if not isinstance(obj, dict): - return cls.model_validate(obj) - - _obj = cls.model_validate({ - "id": obj.get("id"), - "type": obj.get("type") - }) - return _obj - - diff --git a/python/geoengine_openapi_client/models/resource_id_layer.py b/python/geoengine_openapi_client/models/resource_id_layer.py deleted file mode 100644 index 8522d767..00000000 --- a/python/geoengine_openapi_client/models/resource_id_layer.py +++ /dev/null @@ -1,97 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -from __future__ import annotations -import pprint -import re # noqa: F401 -import json - -from pydantic import BaseModel, ConfigDict, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self - -class ResourceIdLayer(BaseModel): - """ - ResourceIdLayer - """ # noqa: E501 - id: StrictStr - type: StrictStr - __properties: ClassVar[List[str]] = ["id", "type"] - - @field_validator('type') - def type_validate_enum(cls, value): - """Validates the enum""" - if value not in set(['Layer']): - raise ValueError("must be one of enum values ('Layer')") - return value - - model_config = ConfigDict( - populate_by_name=True, - validate_assignment=True, - protected_namespaces=(), - ) - - - def to_str(self) -> str: - """Returns the string representation of the model using alias""" - return pprint.pformat(self.model_dump(by_alias=True)) - - def to_json(self) -> str: - """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) - - @classmethod - def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of ResourceIdLayer from a JSON string""" - return cls.from_dict(json.loads(json_str)) - - def to_dict(self) -> Dict[str, Any]: - """Return the dictionary representation of the model using alias. - - This has the following differences from calling pydantic's - `self.model_dump(by_alias=True)`: - - * `None` is only added to the output dict for nullable fields that - were set at model initialization. Other fields with value `None` - are ignored. - """ - excluded_fields: Set[str] = set([ - ]) - - _dict = self.model_dump( - by_alias=True, - exclude=excluded_fields, - exclude_none=True, - ) - return _dict - - @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of ResourceIdLayer from a dict""" - if obj is None: - return None - - if not isinstance(obj, dict): - return cls.model_validate(obj) - - _obj = cls.model_validate({ - "id": obj.get("id"), - "type": obj.get("type") - }) - return _obj - - diff --git a/python/geoengine_openapi_client/models/resource_id_layer_collection.py b/python/geoengine_openapi_client/models/resource_id_layer_collection.py deleted file mode 100644 index 045fcb6d..00000000 --- a/python/geoengine_openapi_client/models/resource_id_layer_collection.py +++ /dev/null @@ -1,97 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -from __future__ import annotations -import pprint -import re # noqa: F401 -import json - -from pydantic import BaseModel, ConfigDict, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self - -class ResourceIdLayerCollection(BaseModel): - """ - ResourceIdLayerCollection - """ # noqa: E501 - id: StrictStr - type: StrictStr - __properties: ClassVar[List[str]] = ["id", "type"] - - @field_validator('type') - def type_validate_enum(cls, value): - """Validates the enum""" - if value not in set(['LayerCollection']): - raise ValueError("must be one of enum values ('LayerCollection')") - return value - - model_config = ConfigDict( - populate_by_name=True, - validate_assignment=True, - protected_namespaces=(), - ) - - - def to_str(self) -> str: - """Returns the string representation of the model using alias""" - return pprint.pformat(self.model_dump(by_alias=True)) - - def to_json(self) -> str: - """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) - - @classmethod - def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of ResourceIdLayerCollection from a JSON string""" - return cls.from_dict(json.loads(json_str)) - - def to_dict(self) -> Dict[str, Any]: - """Return the dictionary representation of the model using alias. - - This has the following differences from calling pydantic's - `self.model_dump(by_alias=True)`: - - * `None` is only added to the output dict for nullable fields that - were set at model initialization. Other fields with value `None` - are ignored. - """ - excluded_fields: Set[str] = set([ - ]) - - _dict = self.model_dump( - by_alias=True, - exclude=excluded_fields, - exclude_none=True, - ) - return _dict - - @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of ResourceIdLayerCollection from a dict""" - if obj is None: - return None - - if not isinstance(obj, dict): - return cls.model_validate(obj) - - _obj = cls.model_validate({ - "id": obj.get("id"), - "type": obj.get("type") - }) - return _obj - - diff --git a/python/geoengine_openapi_client/models/resource_id_ml_model.py b/python/geoengine_openapi_client/models/resource_id_ml_model.py deleted file mode 100644 index 425a99b4..00000000 --- a/python/geoengine_openapi_client/models/resource_id_ml_model.py +++ /dev/null @@ -1,97 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -from __future__ import annotations -import pprint -import re # noqa: F401 -import json - -from pydantic import BaseModel, ConfigDict, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self - -class ResourceIdMlModel(BaseModel): - """ - ResourceIdMlModel - """ # noqa: E501 - id: StrictStr - type: StrictStr - __properties: ClassVar[List[str]] = ["id", "type"] - - @field_validator('type') - def type_validate_enum(cls, value): - """Validates the enum""" - if value not in set(['MlModel']): - raise ValueError("must be one of enum values ('MlModel')") - return value - - model_config = ConfigDict( - populate_by_name=True, - validate_assignment=True, - protected_namespaces=(), - ) - - - def to_str(self) -> str: - """Returns the string representation of the model using alias""" - return pprint.pformat(self.model_dump(by_alias=True)) - - def to_json(self) -> str: - """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) - - @classmethod - def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of ResourceIdMlModel from a JSON string""" - return cls.from_dict(json.loads(json_str)) - - def to_dict(self) -> Dict[str, Any]: - """Return the dictionary representation of the model using alias. - - This has the following differences from calling pydantic's - `self.model_dump(by_alias=True)`: - - * `None` is only added to the output dict for nullable fields that - were set at model initialization. Other fields with value `None` - are ignored. - """ - excluded_fields: Set[str] = set([ - ]) - - _dict = self.model_dump( - by_alias=True, - exclude=excluded_fields, - exclude_none=True, - ) - return _dict - - @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of ResourceIdMlModel from a dict""" - if obj is None: - return None - - if not isinstance(obj, dict): - return cls.model_validate(obj) - - _obj = cls.model_validate({ - "id": obj.get("id"), - "type": obj.get("type") - }) - return _obj - - diff --git a/python/geoengine_openapi_client/models/resource_id_project.py b/python/geoengine_openapi_client/models/resource_id_project.py deleted file mode 100644 index f295382e..00000000 --- a/python/geoengine_openapi_client/models/resource_id_project.py +++ /dev/null @@ -1,97 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -from __future__ import annotations -import pprint -import re # noqa: F401 -import json - -from pydantic import BaseModel, ConfigDict, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List -from typing import Optional, Set -from typing_extensions import Self - -class ResourceIdProject(BaseModel): - """ - ResourceIdProject - """ # noqa: E501 - id: StrictStr - type: StrictStr - __properties: ClassVar[List[str]] = ["id", "type"] - - @field_validator('type') - def type_validate_enum(cls, value): - """Validates the enum""" - if value not in set(['Project']): - raise ValueError("must be one of enum values ('Project')") - return value - - model_config = ConfigDict( - populate_by_name=True, - validate_assignment=True, - protected_namespaces=(), - ) - - - def to_str(self) -> str: - """Returns the string representation of the model using alias""" - return pprint.pformat(self.model_dump(by_alias=True)) - - def to_json(self) -> str: - """Returns the JSON representation of the model using alias""" - # TODO: pydantic v2: use .model_dump_json(by_alias=True, exclude_unset=True) instead - return json.dumps(self.to_dict()) - - @classmethod - def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of ResourceIdProject from a JSON string""" - return cls.from_dict(json.loads(json_str)) - - def to_dict(self) -> Dict[str, Any]: - """Return the dictionary representation of the model using alias. - - This has the following differences from calling pydantic's - `self.model_dump(by_alias=True)`: - - * `None` is only added to the output dict for nullable fields that - were set at model initialization. Other fields with value `None` - are ignored. - """ - excluded_fields: Set[str] = set([ - ]) - - _dict = self.model_dump( - by_alias=True, - exclude=excluded_fields, - exclude_none=True, - ) - return _dict - - @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of ResourceIdProject from a dict""" - if obj is None: - return None - - if not isinstance(obj, dict): - return cls.model_validate(obj) - - _obj = cls.model_validate({ - "id": obj.get("id"), - "type": obj.get("type") - }) - return _obj - - diff --git a/python/geoengine_openapi_client/models/rgba_colorizer.py b/python/geoengine_openapi_client/models/rgba_colorizer.py deleted file mode 100644 index 7ed5b009..00000000 --- a/python/geoengine_openapi_client/models/rgba_colorizer.py +++ /dev/null @@ -1,79 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine Pro API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -from __future__ import annotations -import pprint -import re # noqa: F401 -import json - - - -from pydantic import BaseModel, Field, StrictStr, validator - -class RgbaColorizer(BaseModel): - """ - RgbaColorizer - """ - type: StrictStr = Field(...) - __properties = ["type"] - - @validator('type') - def type_validate_enum(cls, value): - """Validates the enum""" - if value not in ('rgba'): - raise ValueError("must be one of enum values ('rgba')") - return value - - class Config: - """Pydantic configuration""" - allow_population_by_field_name = True - validate_assignment = True - - def to_str(self) -> str: - """Returns the string representation of the model using alias""" - return pprint.pformat(self.dict(by_alias=True)) - - def to_json(self) -> str: - """Returns the JSON representation of the model using alias""" - return json.dumps(self.to_dict()) - - @classmethod - def from_json(cls, json_str: str) -> RgbaColorizer: - """Create an instance of RgbaColorizer from a JSON string""" - return cls.from_dict(json.loads(json_str)) - - def to_dict(self): - """Returns the dictionary representation of the model using alias""" - _dict = self.dict(by_alias=True, - exclude={ - }, - exclude_none=True) - return _dict - - @classmethod - def from_dict(cls, obj: dict) -> RgbaColorizer: - """Create an instance of RgbaColorizer from a dict""" - if obj is None: - return None - - if not isinstance(obj, dict): - return RgbaColorizer.parse_obj(obj) - - _obj = RgbaColorizer.parse_obj({ - "type": obj.get("type") - }) - return _obj - - diff --git a/python/geoengine_openapi_client/models/spatial_reference_specification.py b/python/geoengine_openapi_client/models/spatial_reference_specification.py index c56f6d0f..62d932eb 100644 --- a/python/geoengine_openapi_client/models/spatial_reference_specification.py +++ b/python/geoengine_openapi_client/models/spatial_reference_specification.py @@ -80,11 +80,6 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of extent if self.extent: _dict['extent'] = self.extent.to_dict() - # set to None if axis_labels (nullable) is None - # and model_fields_set contains the field - if self.axis_labels is None and "axis_labels" in self.model_fields_set: - _dict['axisLabels'] = None - # set to None if axis_order (nullable) is None # and model_fields_set contains the field if self.axis_order is None and "axis_order" in self.model_fields_set: diff --git a/python/geoengine_openapi_client/models/color_param_static.py b/python/geoengine_openapi_client/models/static_color.py similarity index 93% rename from python/geoengine_openapi_client/models/color_param_static.py rename to python/geoengine_openapi_client/models/static_color.py index a5cd7de6..ac169175 100644 --- a/python/geoengine_openapi_client/models/color_param_static.py +++ b/python/geoengine_openapi_client/models/static_color.py @@ -24,9 +24,9 @@ from typing import Optional, Set from typing_extensions import Self -class ColorParamStatic(BaseModel): +class StaticColor(BaseModel): """ - ColorParamStatic + StaticColor """ # noqa: E501 color: Annotated[List[StrictInt], Field(min_length=4, max_length=4)] type: StrictStr @@ -57,7 +57,7 @@ def to_json(self) -> str: @classmethod def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of ColorParamStatic from a JSON string""" + """Create an instance of StaticColor from a JSON string""" return cls.from_dict(json.loads(json_str)) def to_dict(self) -> Dict[str, Any]: @@ -82,7 +82,7 @@ def to_dict(self) -> Dict[str, Any]: @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of ColorParamStatic from a dict""" + """Create an instance of StaticColor from a dict""" if obj is None: return None diff --git a/python/geoengine_openapi_client/models/static_number_param.py b/python/geoengine_openapi_client/models/static_number.py similarity index 93% rename from python/geoengine_openapi_client/models/static_number_param.py rename to python/geoengine_openapi_client/models/static_number.py index d7eb4358..c896b40e 100644 --- a/python/geoengine_openapi_client/models/static_number_param.py +++ b/python/geoengine_openapi_client/models/static_number.py @@ -24,9 +24,9 @@ from typing import Optional, Set from typing_extensions import Self -class StaticNumberParam(BaseModel): +class StaticNumber(BaseModel): """ - StaticNumberParam + StaticNumber """ # noqa: E501 type: StrictStr value: Annotated[int, Field(strict=True, ge=0)] @@ -57,7 +57,7 @@ def to_json(self) -> str: @classmethod def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of StaticNumberParam from a JSON string""" + """Create an instance of StaticNumber from a JSON string""" return cls.from_dict(json.loads(json_str)) def to_dict(self) -> Dict[str, Any]: @@ -82,7 +82,7 @@ def to_dict(self) -> Dict[str, Any]: @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of StaticNumberParam from a dict""" + """Create an instance of StaticNumber from a dict""" if obj is None: return None diff --git a/python/geoengine_openapi_client/models/time_step.py b/python/geoengine_openapi_client/models/time_step.py index 6de7a1c4..07db6cf3 100644 --- a/python/geoengine_openapi_client/models/time_step.py +++ b/python/geoengine_openapi_client/models/time_step.py @@ -75,18 +75,7 @@ def to_dict(self) -> Dict[str, Any]: return _dict @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: + def from_dict(cls, obj: Dict[str, Any]) -> Optional[Self]: """Create an instance of TimeStep from a dict""" - if obj is None: - return None - - if not isinstance(obj, dict): - return cls.model_validate(obj) - - _obj = cls.model_validate({ - "granularity": obj.get("granularity"), - "step": obj.get("step") - }) - return _obj diff --git a/python/geoengine_openapi_client/models/typed_plot_result_descriptor.py b/python/geoengine_openapi_client/models/typed_plot_result_descriptor.py index 96759361..b3d3e07a 100644 --- a/python/geoengine_openapi_client/models/typed_plot_result_descriptor.py +++ b/python/geoengine_openapi_client/models/typed_plot_result_descriptor.py @@ -18,20 +18,18 @@ import re # noqa: F401 import json -from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional +from pydantic import ConfigDict, StrictStr, field_validator +from typing import Any, ClassVar, Dict, List from geoengine_openapi_client.models.bounding_box2_d import BoundingBox2D +from geoengine_openapi_client.models.plot_result_descriptor import PlotResultDescriptor from geoengine_openapi_client.models.time_interval import TimeInterval from typing import Optional, Set from typing_extensions import Self -class TypedPlotResultDescriptor(BaseModel): +class TypedPlotResultDescriptor(PlotResultDescriptor): """ - A `ResultDescriptor` for plot queries + TypedPlotResultDescriptor """ # noqa: E501 - bbox: Optional[BoundingBox2D] = None - spatial_reference: StrictStr = Field(alias="spatialReference") - time: Optional[TimeInterval] = None type: StrictStr __properties: ClassVar[List[str]] = ["bbox", "spatialReference", "time", "type"] diff --git a/python/geoengine_openapi_client/models/typed_raster_result_descriptor.py b/python/geoengine_openapi_client/models/typed_raster_result_descriptor.py index bd6fe2b1..d32c049e 100644 --- a/python/geoengine_openapi_client/models/typed_raster_result_descriptor.py +++ b/python/geoengine_openapi_client/models/typed_raster_result_descriptor.py @@ -18,26 +18,21 @@ import re # noqa: F401 import json -from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional +from pydantic import ConfigDict, StrictStr, field_validator +from typing import Any, ClassVar, Dict, List from geoengine_openapi_client.models.raster_band_descriptor import RasterBandDescriptor from geoengine_openapi_client.models.raster_data_type import RasterDataType +from geoengine_openapi_client.models.raster_result_descriptor import RasterResultDescriptor from geoengine_openapi_client.models.spatial_partition2_d import SpatialPartition2D from geoengine_openapi_client.models.spatial_resolution import SpatialResolution from geoengine_openapi_client.models.time_interval import TimeInterval from typing import Optional, Set from typing_extensions import Self -class TypedRasterResultDescriptor(BaseModel): +class TypedRasterResultDescriptor(RasterResultDescriptor): """ - A `ResultDescriptor` for raster queries + TypedRasterResultDescriptor """ # noqa: E501 - bands: List[RasterBandDescriptor] - bbox: Optional[SpatialPartition2D] = None - data_type: RasterDataType = Field(alias="dataType") - resolution: Optional[SpatialResolution] = None - spatial_reference: StrictStr = Field(alias="spatialReference") - time: Optional[TimeInterval] = None type: StrictStr __properties: ClassVar[List[str]] = ["bands", "bbox", "dataType", "resolution", "spatialReference", "time", "type"] diff --git a/python/geoengine_openapi_client/models/typed_vector_result_descriptor.py b/python/geoengine_openapi_client/models/typed_vector_result_descriptor.py index 90281332..f90e1f9a 100644 --- a/python/geoengine_openapi_client/models/typed_vector_result_descriptor.py +++ b/python/geoengine_openapi_client/models/typed_vector_result_descriptor.py @@ -18,24 +18,20 @@ import re # noqa: F401 import json -from pydantic import BaseModel, ConfigDict, Field, StrictStr, field_validator -from typing import Any, ClassVar, Dict, List, Optional +from pydantic import ConfigDict, StrictStr, field_validator +from typing import Any, ClassVar, Dict, List from geoengine_openapi_client.models.bounding_box2_d import BoundingBox2D from geoengine_openapi_client.models.time_interval import TimeInterval from geoengine_openapi_client.models.vector_column_info import VectorColumnInfo from geoengine_openapi_client.models.vector_data_type import VectorDataType +from geoengine_openapi_client.models.vector_result_descriptor import VectorResultDescriptor from typing import Optional, Set from typing_extensions import Self -class TypedVectorResultDescriptor(BaseModel): +class TypedVectorResultDescriptor(VectorResultDescriptor): """ TypedVectorResultDescriptor """ # noqa: E501 - bbox: Optional[BoundingBox2D] = None - columns: Dict[str, VectorColumnInfo] - data_type: VectorDataType = Field(alias="dataType") - spatial_reference: StrictStr = Field(alias="spatialReference") - time: Optional[TimeInterval] = None type: StrictStr __properties: ClassVar[List[str]] = ["bbox", "columns", "dataType", "spatialReference", "time", "type"] diff --git a/python/geoengine_openapi_client/models/update_project.py b/python/geoengine_openapi_client/models/update_project.py index 685a18e8..bad424d7 100644 --- a/python/geoengine_openapi_client/models/update_project.py +++ b/python/geoengine_openapi_client/models/update_project.py @@ -20,10 +20,9 @@ from pydantic import BaseModel, ConfigDict, Field, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from geoengine_openapi_client.models.layer_update import LayerUpdate -from geoengine_openapi_client.models.plot_update import PlotUpdate from geoengine_openapi_client.models.st_rectangle import STRectangle from geoengine_openapi_client.models.time_step import TimeStep +from geoengine_openapi_client.models.vec_update import VecUpdate from typing import Optional, Set from typing_extensions import Self @@ -34,9 +33,9 @@ class UpdateProject(BaseModel): bounds: Optional[STRectangle] = None description: Optional[StrictStr] = None id: StrictStr - layers: Optional[List[LayerUpdate]] = None + layers: Optional[List[VecUpdate]] = None name: Optional[StrictStr] = None - plots: Optional[List[PlotUpdate]] = None + plots: Optional[List[VecUpdate]] = None time_step: Optional[TimeStep] = Field(default=None, alias="timeStep") __properties: ClassVar[List[str]] = ["bounds", "description", "id", "layers", "name", "plots", "timeStep"] @@ -144,9 +143,9 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: "bounds": STRectangle.from_dict(obj["bounds"]) if obj.get("bounds") is not None else None, "description": obj.get("description"), "id": obj.get("id"), - "layers": [LayerUpdate.from_dict(_item) for _item in obj["layers"]] if obj.get("layers") is not None else None, + "layers": [VecUpdate.from_dict(_item) for _item in obj["layers"]] if obj.get("layers") is not None else None, "name": obj.get("name"), - "plots": [PlotUpdate.from_dict(_item) for _item in obj["plots"]] if obj.get("plots") is not None else None, + "plots": [VecUpdate.from_dict(_item) for _item in obj["plots"]] if obj.get("plots") is not None else None, "timeStep": TimeStep.from_dict(obj["timeStep"]) if obj.get("timeStep") is not None else None }) return _obj diff --git a/python/geoengine_openapi_client/models/user_session.py b/python/geoengine_openapi_client/models/user_session.py index 95c3730d..15d2ac27 100644 --- a/python/geoengine_openapi_client/models/user_session.py +++ b/python/geoengine_openapi_client/models/user_session.py @@ -84,11 +84,6 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of view if self.view: _dict['view'] = self.view.to_dict() - # set to None if project (nullable) is None - # and model_fields_set contains the field - if self.project is None and "project" in self.model_fields_set: - _dict['project'] = None - # set to None if view (nullable) is None # and model_fields_set contains the field if self.view is None and "view" in self.model_fields_set: diff --git a/python/geoengine_openapi_client/models/plot_update.py b/python/geoengine_openapi_client/models/vec_update.py similarity index 88% rename from python/geoengine_openapi_client/models/plot_update.py rename to python/geoengine_openapi_client/models/vec_update.py index de486314..8d60c338 100644 --- a/python/geoengine_openapi_client/models/plot_update.py +++ b/python/geoengine_openapi_client/models/vec_update.py @@ -24,11 +24,11 @@ from typing import Union, List, Set, Optional, Dict from typing_extensions import Literal, Self -PLOTUPDATE_ONE_OF_SCHEMAS = ["Plot", "ProjectUpdateToken"] +VECUPDATE_ONE_OF_SCHEMAS = ["Plot", "ProjectUpdateToken"] -class PlotUpdate(BaseModel): +class VecUpdate(BaseModel): """ - PlotUpdate + VecUpdate """ # data type: ProjectUpdateToken oneof_schema_1_validator: Optional[ProjectUpdateToken] = None @@ -55,7 +55,7 @@ def __init__(self, *args, **kwargs) -> None: @field_validator('actual_instance') def actual_instance_must_validate_oneof(cls, v): - instance = PlotUpdate.model_construct() + instance = VecUpdate.model_construct() error_messages = [] match = 0 # validate data type: ProjectUpdateToken @@ -70,10 +70,10 @@ def actual_instance_must_validate_oneof(cls, v): match += 1 if match > 1: # more than 1 match - raise ValueError("Multiple matches found when setting `actual_instance` in PlotUpdate with oneOf schemas: Plot, ProjectUpdateToken. Details: " + ", ".join(error_messages)) + raise ValueError("Multiple matches found when setting `actual_instance` in VecUpdate with oneOf schemas: Plot, ProjectUpdateToken. Details: " + ", ".join(error_messages)) elif match == 0: # no match - raise ValueError("No match found when setting `actual_instance` in PlotUpdate with oneOf schemas: Plot, ProjectUpdateToken. Details: " + ", ".join(error_messages)) + raise ValueError("No match found when setting `actual_instance` in VecUpdate with oneOf schemas: Plot, ProjectUpdateToken. Details: " + ", ".join(error_messages)) else: return v @@ -103,10 +103,10 @@ def from_json(cls, json_str: str) -> Self: if match > 1: # more than 1 match - raise ValueError("Multiple matches found when deserializing the JSON string into PlotUpdate with oneOf schemas: Plot, ProjectUpdateToken. Details: " + ", ".join(error_messages)) + raise ValueError("Multiple matches found when deserializing the JSON string into VecUpdate with oneOf schemas: Plot, ProjectUpdateToken. Details: " + ", ".join(error_messages)) elif match == 0: # no match - raise ValueError("No match found when deserializing the JSON string into PlotUpdate with oneOf schemas: Plot, ProjectUpdateToken. Details: " + ", ".join(error_messages)) + raise ValueError("No match found when deserializing the JSON string into VecUpdate with oneOf schemas: Plot, ProjectUpdateToken. Details: " + ", ".join(error_messages)) else: return instance diff --git a/python/geoengine_openapi_client/models/vector_result_descriptor.py b/python/geoengine_openapi_client/models/vector_result_descriptor.py index 8899ce67..f48c3cf3 100644 --- a/python/geoengine_openapi_client/models/vector_result_descriptor.py +++ b/python/geoengine_openapi_client/models/vector_result_descriptor.py @@ -103,8 +103,10 @@ def to_dict(self) -> Dict[str, Any]: return _dict @classmethod - def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: + def from_dict(cls, obj: Dict[str, Any]) -> Optional[Self]: """Create an instance of VectorResultDescriptor from a dict""" + + # Note: fixed if obj is None: return None @@ -121,7 +123,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: else None, "dataType": obj.get("dataType"), "spatialReference": obj.get("spatialReference"), - "time": TimeInterval.from_dict(obj["time"]) if obj.get("time") is not None else None + "time": TimeInterval.from_dict(obj["time"]) if obj.get("time") is not None else None, }) return _obj diff --git a/python/geoengine_openapi_client/rest.py b/python/geoengine_openapi_client/rest.py index 7f6bb656..d8024ffe 100644 --- a/python/geoengine_openapi_client/rest.py +++ b/python/geoengine_openapi_client/rest.py @@ -77,6 +77,7 @@ def __init__(self, configuration) -> None: "ca_certs": configuration.ssl_ca_cert, "cert_file": configuration.cert_file, "key_file": configuration.key_file, + "ca_cert_data": configuration.ca_cert_data, } if configuration.assert_hostname is not None: pool_args['assert_hostname'] = ( diff --git a/python/pyproject.toml b/python/pyproject.toml index eb4f908c..28e0969c 100644 --- a/python/pyproject.toml +++ b/python/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "geoengine_openapi_client" -version = "0.0.21" +version = "0.0.22" description = "Geo Engine API" authors = ["Geo Engine Developers "] license = "Apache-2.0" diff --git a/python/setup.py b/python/setup.py index 34c127c1..2a525488 100644 --- a/python/setup.py +++ b/python/setup.py @@ -22,7 +22,7 @@ # prerequisite: setuptools # http://pypi.python.org/pypi/setuptools NAME = "geoengine-openapi-client" -VERSION = "0.0.21" +VERSION = "0.0.22" PYTHON_REQUIRES = ">= 3.8" REQUIRES = [ "urllib3 >= 1.25.3, < 3.0.0", diff --git a/python/test/test_add_collection200_response.py b/python/test/test_add_collection200_response.py deleted file mode 100644 index 85b196df..00000000 --- a/python/test/test_add_collection200_response.py +++ /dev/null @@ -1,53 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -import unittest - -from geoengine_openapi_client.models.add_collection200_response import AddCollection200Response - -class TestAddCollection200Response(unittest.TestCase): - """AddCollection200Response unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def make_instance(self, include_optional) -> AddCollection200Response: - """Test AddCollection200Response - include_optional is a boolean, when False only required - params are included, when True both required and - optional params are included """ - # uncomment below to create an instance of `AddCollection200Response` - """ - model = AddCollection200Response() - if include_optional: - return AddCollection200Response( - id = '' - ) - else: - return AddCollection200Response( - id = '', - ) - """ - - def testAddCollection200Response(self): - """Test AddCollection200Response""" - # inst_req_only = self.make_instance(include_optional=False) - # inst_req_and_optional = self.make_instance(include_optional=True) - -if __name__ == '__main__': - unittest.main() diff --git a/python/test/test_create_dataset.py b/python/test/test_create_dataset.py index 18fb48d1..d5f98844 100644 --- a/python/test/test_create_dataset.py +++ b/python/test/test_create_dataset.py @@ -42,7 +42,7 @@ def make_instance(self, include_optional) -> CreateDataset: properties = geoengine_openapi_client.models.add_dataset.AddDataset( description = '', display_name = '', - name = null, + name = '', provenance = [ geoengine_openapi_client.models.provenance.Provenance( citation = '', @@ -63,7 +63,7 @@ def make_instance(self, include_optional) -> CreateDataset: properties = geoengine_openapi_client.models.add_dataset.AddDataset( description = '', display_name = '', - name = null, + name = '', provenance = [ geoengine_openapi_client.models.provenance.Provenance( citation = '', diff --git a/python/test/test_create_dataset_handler200_response.py b/python/test/test_create_dataset_handler200_response.py deleted file mode 100644 index ac8ea16d..00000000 --- a/python/test/test_create_dataset_handler200_response.py +++ /dev/null @@ -1,53 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -import unittest - -from geoengine_openapi_client.models.create_dataset_handler200_response import CreateDatasetHandler200Response - -class TestCreateDatasetHandler200Response(unittest.TestCase): - """CreateDatasetHandler200Response unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def make_instance(self, include_optional) -> CreateDatasetHandler200Response: - """Test CreateDatasetHandler200Response - include_optional is a boolean, when False only required - params are included, when True both required and - optional params are included """ - # uncomment below to create an instance of `CreateDatasetHandler200Response` - """ - model = CreateDatasetHandler200Response() - if include_optional: - return CreateDatasetHandler200Response( - dataset_name = '' - ) - else: - return CreateDatasetHandler200Response( - dataset_name = '', - ) - """ - - def testCreateDatasetHandler200Response(self): - """Test CreateDatasetHandler200Response""" - # inst_req_only = self.make_instance(include_optional=False) - # inst_req_and_optional = self.make_instance(include_optional=True) - -if __name__ == '__main__': - unittest.main() diff --git a/python/test/test_dataset_definition.py b/python/test/test_dataset_definition.py index 38034e03..f5cb24db 100644 --- a/python/test/test_dataset_definition.py +++ b/python/test/test_dataset_definition.py @@ -40,7 +40,7 @@ def make_instance(self, include_optional) -> DatasetDefinition: properties = geoengine_openapi_client.models.add_dataset.AddDataset( description = '', display_name = '', - name = null, + name = '', provenance = [ geoengine_openapi_client.models.provenance.Provenance( citation = '', @@ -59,7 +59,7 @@ def make_instance(self, include_optional) -> DatasetDefinition: properties = geoengine_openapi_client.models.add_dataset.AddDataset( description = '', display_name = '', - name = null, + name = '', provenance = [ geoengine_openapi_client.models.provenance.Provenance( citation = '', diff --git a/python/test/test_inline_object.py b/python/test/test_dataset_name_response.py similarity index 59% rename from python/test/test_inline_object.py rename to python/test/test_dataset_name_response.py index f179dfd5..fc64554a 100644 --- a/python/test/test_inline_object.py +++ b/python/test/test_dataset_name_response.py @@ -15,10 +15,10 @@ import unittest -from geoengine_openapi_client.models.inline_object import InlineObject +from geoengine_openapi_client.models.dataset_name_response import DatasetNameResponse -class TestInlineObject(unittest.TestCase): - """InlineObject unit test stubs""" +class TestDatasetNameResponse(unittest.TestCase): + """DatasetNameResponse unit test stubs""" def setUp(self): pass @@ -26,26 +26,26 @@ def setUp(self): def tearDown(self): pass - def make_instance(self, include_optional) -> InlineObject: - """Test InlineObject + def make_instance(self, include_optional) -> DatasetNameResponse: + """Test DatasetNameResponse include_optional is a boolean, when False only required params are included, when True both required and optional params are included """ - # uncomment below to create an instance of `InlineObject` + # uncomment below to create an instance of `DatasetNameResponse` """ - model = InlineObject() + model = DatasetNameResponse() if include_optional: - return InlineObject( - url = '' + return DatasetNameResponse( + dataset_name = '' ) else: - return InlineObject( - url = '', + return DatasetNameResponse( + dataset_name = '', ) """ - def testInlineObject(self): - """Test InlineObject""" + def testDatasetNameResponse(self): + """Test DatasetNameResponse""" # inst_req_only = self.make_instance(include_optional=False) # inst_req_and_optional = self.make_instance(include_optional=True) diff --git a/python/test/test_datasets_api.py b/python/test/test_datasets_api.py index 1ea64087..5ef40249 100644 --- a/python/test/test_datasets_api.py +++ b/python/test/test_datasets_api.py @@ -30,14 +30,14 @@ def tearDown(self) -> None: def test_auto_create_dataset_handler(self) -> None: """Test case for auto_create_dataset_handler - Creates a new dataset using previously uploaded files. + Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. """ pass def test_create_dataset_handler(self) -> None: """Test case for create_dataset_handler - Creates a new dataset referencing files. + Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. """ pass @@ -86,7 +86,7 @@ def test_list_volumes_handler(self) -> None: def test_suggest_meta_data_handler(self) -> None: """Test case for suggest_meta_data_handler - Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. """ pass diff --git a/python/test/test_date_time.py b/python/test/test_date_time.py deleted file mode 100644 index 1a992b0b..00000000 --- a/python/test/test_date_time.py +++ /dev/null @@ -1,53 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -import unittest - -from geoengine_openapi_client.models.date_time import DateTime - -class TestDateTime(unittest.TestCase): - """DateTime unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def make_instance(self, include_optional) -> DateTime: - """Test DateTime - include_optional is a boolean, when False only required - params are included, when True both required and - optional params are included """ - # uncomment below to create an instance of `DateTime` - """ - model = DateTime() - if include_optional: - return DateTime( - datetime = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f') - ) - else: - return DateTime( - datetime = datetime.datetime.strptime('2013-10-20 19:20:30.00', '%Y-%m-%d %H:%M:%S.%f'), - ) - """ - - def testDateTime(self): - """Test DateTime""" - # inst_req_only = self.make_instance(include_optional=False) - # inst_req_and_optional = self.make_instance(include_optional=True) - -if __name__ == '__main__': - unittest.main() diff --git a/python/test/test_gdal_meta_data_list.py b/python/test/test_gdal_meta_data_list.py index 715b2690..42d3515f 100644 --- a/python/test/test_gdal_meta_data_list.py +++ b/python/test/test_gdal_meta_data_list.py @@ -39,7 +39,38 @@ def make_instance(self, include_optional) -> GdalMetaDataList: params = [ geoengine_openapi_client.models.gdal_loading_info_temporal_slice.GdalLoadingInfoTemporalSlice( cache_ttl = 0, - params = null, + params = geoengine_openapi_client.models.gdal_dataset_parameters.GdalDatasetParameters( + allow_alphaband_as_mask = True, + file_not_found_handling = 'NoData', + file_path = '', + gdal_config_options = [ + [ + '' + ] + ], + gdal_open_options = [ + '' + ], + geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + x_pixel_size = 1.337, + y_pixel_size = 1.337, ), + height = 0, + no_data_value = 1.337, + properties_mapping = [ + geoengine_openapi_client.models.gdal_metadata_mapping.GdalMetadataMapping( + source_key = geoengine_openapi_client.models.raster_properties_key.RasterPropertiesKey( + domain = '', + key = '', ), + target_key = geoengine_openapi_client.models.raster_properties_key.RasterPropertiesKey( + domain = '', + key = '', ), + target_type = 'Number', ) + ], + rasterband_channel = 0, + width = 0, ), time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, start = 56, ), ) @@ -50,11 +81,21 @@ def make_instance(self, include_optional) -> GdalMetaDataList: measurement = null, name = '', ) ], - bbox = null, + bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( + lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), data_type = 'U8', - resolution = null, + resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( + x = 1.337, + y = 1.337, ), spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'GdalMetaDataList' ) else: @@ -62,7 +103,38 @@ def make_instance(self, include_optional) -> GdalMetaDataList: params = [ geoengine_openapi_client.models.gdal_loading_info_temporal_slice.GdalLoadingInfoTemporalSlice( cache_ttl = 0, - params = null, + params = geoengine_openapi_client.models.gdal_dataset_parameters.GdalDatasetParameters( + allow_alphaband_as_mask = True, + file_not_found_handling = 'NoData', + file_path = '', + gdal_config_options = [ + [ + '' + ] + ], + gdal_open_options = [ + '' + ], + geo_transform = geoengine_openapi_client.models.gdal_dataset_geo_transform.GdalDatasetGeoTransform( + origin_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + x_pixel_size = 1.337, + y_pixel_size = 1.337, ), + height = 0, + no_data_value = 1.337, + properties_mapping = [ + geoengine_openapi_client.models.gdal_metadata_mapping.GdalMetadataMapping( + source_key = geoengine_openapi_client.models.raster_properties_key.RasterPropertiesKey( + domain = '', + key = '', ), + target_key = geoengine_openapi_client.models.raster_properties_key.RasterPropertiesKey( + domain = '', + key = '', ), + target_type = 'Number', ) + ], + rasterband_channel = 0, + width = 0, ), time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, start = 56, ), ) @@ -73,11 +145,21 @@ def make_instance(self, include_optional) -> GdalMetaDataList: measurement = null, name = '', ) ], - bbox = null, + bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( + lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), data_type = 'U8', - resolution = null, + resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( + x = 1.337, + y = 1.337, ), spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'GdalMetaDataList', ) """ diff --git a/python/test/test_gdal_meta_data_regular.py b/python/test/test_gdal_meta_data_regular.py index 261bb905..1e5b317a 100644 --- a/python/test/test_gdal_meta_data_regular.py +++ b/python/test/test_gdal_meta_data_regular.py @@ -78,11 +78,21 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: measurement = null, name = '', ) ], - bbox = null, + bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( + lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), data_type = 'U8', - resolution = null, + resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( + x = 1.337, + y = 1.337, ), spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), step = geoengine_openapi_client.models.time_step.TimeStep( granularity = 'millis', step = 0, ), @@ -136,11 +146,21 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: measurement = null, name = '', ) ], - bbox = null, + bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( + lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), data_type = 'U8', - resolution = null, + resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( + x = 1.337, + y = 1.337, ), spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), step = geoengine_openapi_client.models.time_step.TimeStep( granularity = 'millis', step = 0, ), diff --git a/python/test/test_gdal_meta_data_static.py b/python/test/test_gdal_meta_data_static.py index 39094698..668af720 100644 --- a/python/test/test_gdal_meta_data_static.py +++ b/python/test/test_gdal_meta_data_static.py @@ -75,11 +75,21 @@ def make_instance(self, include_optional) -> GdalMetaDataStatic: measurement = null, name = '', ) ], - bbox = null, + bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( + lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), data_type = 'U8', - resolution = null, + resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( + x = 1.337, + y = 1.337, ), spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, start = 56, ), @@ -125,11 +135,21 @@ def make_instance(self, include_optional) -> GdalMetaDataStatic: measurement = null, name = '', ) ], - bbox = null, + bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( + lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), data_type = 'U8', - resolution = null, + resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( + x = 1.337, + y = 1.337, ), spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'GdalStatic', ) """ diff --git a/python/test/test_gdal_metadata_net_cdf_cf.py b/python/test/test_gdal_metadata_net_cdf_cf.py index e7540edb..287e51ad 100644 --- a/python/test/test_gdal_metadata_net_cdf_cf.py +++ b/python/test/test_gdal_metadata_net_cdf_cf.py @@ -77,16 +77,26 @@ def make_instance(self, include_optional) -> GdalMetadataNetCdfCf: measurement = null, name = '', ) ], - bbox = null, + bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( + lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), data_type = 'U8', - resolution = null, + resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( + x = 1.337, + y = 1.337, ), spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), start = 56, step = geoengine_openapi_client.models.time_step.TimeStep( granularity = 'millis', step = 0, ), - type = 'GdalMetadataNetCdfCf' + type = 'GdalMetaDataNetCdfCf' ) else: return GdalMetadataNetCdfCf( @@ -130,16 +140,26 @@ def make_instance(self, include_optional) -> GdalMetadataNetCdfCf: measurement = null, name = '', ) ], - bbox = null, + bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( + lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), data_type = 'U8', - resolution = null, + resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( + x = 1.337, + y = 1.337, ), spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), start = 56, step = geoengine_openapi_client.models.time_step.TimeStep( granularity = 'millis', step = 0, ), - type = 'GdalMetadataNetCdfCf', + type = 'GdalMetaDataNetCdfCf', ) """ diff --git a/python/test/test_resource_id.py b/python/test/test_id_response.py similarity index 63% rename from python/test/test_resource_id.py rename to python/test/test_id_response.py index c7bff3e9..6641f7a3 100644 --- a/python/test/test_resource_id.py +++ b/python/test/test_id_response.py @@ -15,10 +15,10 @@ import unittest -from geoengine_openapi_client.models.resource_id import ResourceId +from geoengine_openapi_client.models.id_response import IdResponse -class TestResourceId(unittest.TestCase): - """ResourceId unit test stubs""" +class TestIdResponse(unittest.TestCase): + """IdResponse unit test stubs""" def setUp(self): pass @@ -26,28 +26,26 @@ def setUp(self): def tearDown(self): pass - def make_instance(self, include_optional) -> ResourceId: - """Test ResourceId + def make_instance(self, include_optional) -> IdResponse: + """Test IdResponse include_optional is a boolean, when False only required params are included, when True both required and optional params are included """ - # uncomment below to create an instance of `ResourceId` + # uncomment below to create an instance of `IdResponse` """ - model = ResourceId() + model = IdResponse() if include_optional: - return ResourceId( - id = '', - type = 'Layer' + return IdResponse( + id = '' ) else: - return ResourceId( + return IdResponse( id = '', - type = 'Layer', ) """ - def testResourceId(self): - """Test ResourceId""" + def testIdResponse(self): + """Test IdResponse""" # inst_req_only = self.make_instance(include_optional=False) # inst_req_and_optional = self.make_instance(include_optional=True) diff --git a/python/test/test_layer_update.py b/python/test/test_layer_update.py deleted file mode 100644 index c75d8a31..00000000 --- a/python/test/test_layer_update.py +++ /dev/null @@ -1,63 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -import unittest - -from geoengine_openapi_client.models.layer_update import LayerUpdate - -class TestLayerUpdate(unittest.TestCase): - """LayerUpdate unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def make_instance(self, include_optional) -> LayerUpdate: - """Test LayerUpdate - include_optional is a boolean, when False only required - params are included, when True both required and - optional params are included """ - # uncomment below to create an instance of `LayerUpdate` - """ - model = LayerUpdate() - if include_optional: - return LayerUpdate( - name = '', - symbology = None, - visibility = geoengine_openapi_client.models.layer_visibility.LayerVisibility( - data = True, - legend = True, ), - workflow = '' - ) - else: - return LayerUpdate( - name = '', - symbology = None, - visibility = geoengine_openapi_client.models.layer_visibility.LayerVisibility( - data = True, - legend = True, ), - workflow = '', - ) - """ - - def testLayerUpdate(self): - """Test LayerUpdate""" - # inst_req_only = self.make_instance(include_optional=False) - # inst_req_and_optional = self.make_instance(include_optional=True) - -if __name__ == '__main__': - unittest.main() diff --git a/python/test/test_meta_data_definition.py b/python/test/test_meta_data_definition.py index 45ee9538..6f66d120 100644 --- a/python/test/test_meta_data_definition.py +++ b/python/test/test_meta_data_definition.py @@ -39,8 +39,29 @@ def make_instance(self, include_optional) -> MetaDataDefinition: loading_info = geoengine_openapi_client.models.ogr_source_dataset.OgrSourceDataset( attribute_query = '', cache_ttl = 0, - columns = null, - data_type = null, + columns = geoengine_openapi_client.models.ogr_source_column_spec.OgrSourceColumnSpec( + bool = [ + '' + ], + datetime = [ + '' + ], + float = [ + '' + ], + format_specifics = null, + int = [ + '' + ], + rename = { + 'key' : '' + }, + text = [ + '' + ], + x = '', + y = '', ), + data_type = 'Data', default_geometry = null, file_name = '', force_ogr_spatial_filter = True, @@ -55,11 +76,21 @@ def make_instance(self, include_optional) -> MetaDataDefinition: measurement = null, name = '', ) ], - bbox = null, + bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( + lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), data_type = 'U8', - resolution = null, + resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( + x = 1.337, + y = 1.337, ), spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'MockMetaData', cache_ttl = 0, data_time = geoengine_openapi_client.models.time_interval.TimeInterval( @@ -92,8 +123,29 @@ def make_instance(self, include_optional) -> MetaDataDefinition: loading_info = geoengine_openapi_client.models.ogr_source_dataset.OgrSourceDataset( attribute_query = '', cache_ttl = 0, - columns = null, - data_type = null, + columns = geoengine_openapi_client.models.ogr_source_column_spec.OgrSourceColumnSpec( + bool = [ + '' + ], + datetime = [ + '' + ], + float = [ + '' + ], + format_specifics = null, + int = [ + '' + ], + rename = { + 'key' : '' + }, + text = [ + '' + ], + x = '', + y = '', ), + data_type = 'Data', default_geometry = null, file_name = '', force_ogr_spatial_filter = True, @@ -108,11 +160,21 @@ def make_instance(self, include_optional) -> MetaDataDefinition: measurement = null, name = '', ) ], - bbox = null, + bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( + lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), data_type = 'U8', - resolution = null, + resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( + x = 1.337, + y = 1.337, ), spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'MockMetaData', data_time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, diff --git a/python/test/test_mock_meta_data.py b/python/test/test_mock_meta_data.py index 3c761c90..7311c637 100644 --- a/python/test/test_mock_meta_data.py +++ b/python/test/test_mock_meta_data.py @@ -43,7 +43,13 @@ def make_instance(self, include_optional) -> MockMetaData: y = 1.337, ) ], ), result_descriptor = geoengine_openapi_client.models.vector_result_descriptor.VectorResultDescriptor( - bbox = null, + bbox = geoengine_openapi_client.models.bounding_box2_d.BoundingBox2D( + lower_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -51,7 +57,9 @@ def make_instance(self, include_optional) -> MockMetaData: }, data_type = 'Data', spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'MockMetaData' ) else: @@ -63,7 +71,13 @@ def make_instance(self, include_optional) -> MockMetaData: y = 1.337, ) ], ), result_descriptor = geoengine_openapi_client.models.vector_result_descriptor.VectorResultDescriptor( - bbox = null, + bbox = geoengine_openapi_client.models.bounding_box2_d.BoundingBox2D( + lower_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -71,7 +85,9 @@ def make_instance(self, include_optional) -> MockMetaData: }, data_type = 'Data', spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'MockMetaData', ) """ diff --git a/python/test/test_ogr_meta_data.py b/python/test/test_ogr_meta_data.py index f35586b7..d7241528 100644 --- a/python/test/test_ogr_meta_data.py +++ b/python/test/test_ogr_meta_data.py @@ -39,8 +39,29 @@ def make_instance(self, include_optional) -> OgrMetaData: loading_info = geoengine_openapi_client.models.ogr_source_dataset.OgrSourceDataset( attribute_query = '', cache_ttl = 0, - columns = null, - data_type = null, + columns = geoengine_openapi_client.models.ogr_source_column_spec.OgrSourceColumnSpec( + bool = [ + '' + ], + datetime = [ + '' + ], + float = [ + '' + ], + format_specifics = null, + int = [ + '' + ], + rename = { + 'key' : '' + }, + text = [ + '' + ], + x = '', + y = '', ), + data_type = 'Data', default_geometry = null, file_name = '', force_ogr_spatial_filter = True, @@ -50,7 +71,13 @@ def make_instance(self, include_optional) -> OgrMetaData: sql_query = '', time = null, ), result_descriptor = geoengine_openapi_client.models.vector_result_descriptor.VectorResultDescriptor( - bbox = null, + bbox = geoengine_openapi_client.models.bounding_box2_d.BoundingBox2D( + lower_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -58,7 +85,9 @@ def make_instance(self, include_optional) -> OgrMetaData: }, data_type = 'Data', spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'OgrMetaData' ) else: @@ -66,8 +95,29 @@ def make_instance(self, include_optional) -> OgrMetaData: loading_info = geoengine_openapi_client.models.ogr_source_dataset.OgrSourceDataset( attribute_query = '', cache_ttl = 0, - columns = null, - data_type = null, + columns = geoengine_openapi_client.models.ogr_source_column_spec.OgrSourceColumnSpec( + bool = [ + '' + ], + datetime = [ + '' + ], + float = [ + '' + ], + format_specifics = null, + int = [ + '' + ], + rename = { + 'key' : '' + }, + text = [ + '' + ], + x = '', + y = '', ), + data_type = 'Data', default_geometry = null, file_name = '', force_ogr_spatial_filter = True, @@ -77,7 +127,13 @@ def make_instance(self, include_optional) -> OgrMetaData: sql_query = '', time = null, ), result_descriptor = geoengine_openapi_client.models.vector_result_descriptor.VectorResultDescriptor( - bbox = null, + bbox = geoengine_openapi_client.models.bounding_box2_d.BoundingBox2D( + lower_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), + upper_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( + x = 1.337, + y = 1.337, ), ), columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -85,7 +141,9 @@ def make_instance(self, include_optional) -> OgrMetaData: }, data_type = 'Data', spatial_reference = '', - time = null, ), + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), ), type = 'OgrMetaData', ) """ diff --git a/python/test/test_ogr_source_duration_spec.py b/python/test/test_ogr_source_duration_spec.py index 575e691d..feaa6552 100644 --- a/python/test/test_ogr_source_duration_spec.py +++ b/python/test/test_ogr_source_duration_spec.py @@ -36,15 +36,11 @@ def make_instance(self, include_optional) -> OgrSourceDurationSpec: model = OgrSourceDurationSpec() if include_optional: return OgrSourceDurationSpec( - type = 'infinite', - granularity = 'millis', - step = 0 + type = 'infinite' ) else: return OgrSourceDurationSpec( type = 'infinite', - granularity = 'millis', - step = 0, ) """ diff --git a/python/test/test_ogr_source_duration_spec_value.py b/python/test/test_ogr_source_duration_spec_value.py index eafd13b3..638922b4 100644 --- a/python/test/test_ogr_source_duration_spec_value.py +++ b/python/test/test_ogr_source_duration_spec_value.py @@ -36,14 +36,10 @@ def make_instance(self, include_optional) -> OgrSourceDurationSpecValue: model = OgrSourceDurationSpecValue() if include_optional: return OgrSourceDurationSpecValue( - granularity = 'millis', - step = 0, type = 'value' ) else: return OgrSourceDurationSpecValue( - granularity = 'millis', - step = 0, type = 'value', ) """ diff --git a/python/test/test_projects_api.py b/python/test/test_projects_api.py index afb9bacd..9372c2e4 100644 --- a/python/test/test_projects_api.py +++ b/python/test/test_projects_api.py @@ -72,7 +72,7 @@ def test_project_versions_handler(self) -> None: def test_update_project_handler(self) -> None: """Test case for update_project_handler - Updates a project. + Updates a project. This will create a new version. """ pass diff --git a/python/test/test_resource_id_dataset_id.py b/python/test/test_resource_id_dataset_id.py deleted file mode 100644 index 4f864c27..00000000 --- a/python/test/test_resource_id_dataset_id.py +++ /dev/null @@ -1,55 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -import unittest - -from geoengine_openapi_client.models.resource_id_dataset_id import ResourceIdDatasetId - -class TestResourceIdDatasetId(unittest.TestCase): - """ResourceIdDatasetId unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def make_instance(self, include_optional) -> ResourceIdDatasetId: - """Test ResourceIdDatasetId - include_optional is a boolean, when False only required - params are included, when True both required and - optional params are included """ - # uncomment below to create an instance of `ResourceIdDatasetId` - """ - model = ResourceIdDatasetId() - if include_optional: - return ResourceIdDatasetId( - id = '', - type = 'DatasetId' - ) - else: - return ResourceIdDatasetId( - id = '', - type = 'DatasetId', - ) - """ - - def testResourceIdDatasetId(self): - """Test ResourceIdDatasetId""" - # inst_req_only = self.make_instance(include_optional=False) - # inst_req_and_optional = self.make_instance(include_optional=True) - -if __name__ == '__main__': - unittest.main() diff --git a/python/test/test_resource_id_layer.py b/python/test/test_resource_id_layer.py deleted file mode 100644 index 4806f8e6..00000000 --- a/python/test/test_resource_id_layer.py +++ /dev/null @@ -1,55 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -import unittest - -from geoengine_openapi_client.models.resource_id_layer import ResourceIdLayer - -class TestResourceIdLayer(unittest.TestCase): - """ResourceIdLayer unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def make_instance(self, include_optional) -> ResourceIdLayer: - """Test ResourceIdLayer - include_optional is a boolean, when False only required - params are included, when True both required and - optional params are included """ - # uncomment below to create an instance of `ResourceIdLayer` - """ - model = ResourceIdLayer() - if include_optional: - return ResourceIdLayer( - id = '', - type = 'Layer' - ) - else: - return ResourceIdLayer( - id = '', - type = 'Layer', - ) - """ - - def testResourceIdLayer(self): - """Test ResourceIdLayer""" - # inst_req_only = self.make_instance(include_optional=False) - # inst_req_and_optional = self.make_instance(include_optional=True) - -if __name__ == '__main__': - unittest.main() diff --git a/python/test/test_resource_id_layer_collection.py b/python/test/test_resource_id_layer_collection.py deleted file mode 100644 index 93857fbb..00000000 --- a/python/test/test_resource_id_layer_collection.py +++ /dev/null @@ -1,55 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -import unittest - -from geoengine_openapi_client.models.resource_id_layer_collection import ResourceIdLayerCollection - -class TestResourceIdLayerCollection(unittest.TestCase): - """ResourceIdLayerCollection unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def make_instance(self, include_optional) -> ResourceIdLayerCollection: - """Test ResourceIdLayerCollection - include_optional is a boolean, when False only required - params are included, when True both required and - optional params are included """ - # uncomment below to create an instance of `ResourceIdLayerCollection` - """ - model = ResourceIdLayerCollection() - if include_optional: - return ResourceIdLayerCollection( - id = '', - type = 'LayerCollection' - ) - else: - return ResourceIdLayerCollection( - id = '', - type = 'LayerCollection', - ) - """ - - def testResourceIdLayerCollection(self): - """Test ResourceIdLayerCollection""" - # inst_req_only = self.make_instance(include_optional=False) - # inst_req_and_optional = self.make_instance(include_optional=True) - -if __name__ == '__main__': - unittest.main() diff --git a/python/test/test_resource_id_ml_model.py b/python/test/test_resource_id_ml_model.py deleted file mode 100644 index 21027e05..00000000 --- a/python/test/test_resource_id_ml_model.py +++ /dev/null @@ -1,55 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -import unittest - -from geoengine_openapi_client.models.resource_id_ml_model import ResourceIdMlModel - -class TestResourceIdMlModel(unittest.TestCase): - """ResourceIdMlModel unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def make_instance(self, include_optional) -> ResourceIdMlModel: - """Test ResourceIdMlModel - include_optional is a boolean, when False only required - params are included, when True both required and - optional params are included """ - # uncomment below to create an instance of `ResourceIdMlModel` - """ - model = ResourceIdMlModel() - if include_optional: - return ResourceIdMlModel( - id = '', - type = 'MlModel' - ) - else: - return ResourceIdMlModel( - id = '', - type = 'MlModel', - ) - """ - - def testResourceIdMlModel(self): - """Test ResourceIdMlModel""" - # inst_req_only = self.make_instance(include_optional=False) - # inst_req_and_optional = self.make_instance(include_optional=True) - -if __name__ == '__main__': - unittest.main() diff --git a/python/test/test_resource_id_project.py b/python/test/test_resource_id_project.py deleted file mode 100644 index d096b54b..00000000 --- a/python/test/test_resource_id_project.py +++ /dev/null @@ -1,55 +0,0 @@ -# coding: utf-8 - -""" - Geo Engine API - - No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - - The version of the OpenAPI document: 0.8.0 - Contact: dev@geoengine.de - Generated by OpenAPI Generator (https://openapi-generator.tech) - - Do not edit the class manually. -""" # noqa: E501 - - -import unittest - -from geoengine_openapi_client.models.resource_id_project import ResourceIdProject - -class TestResourceIdProject(unittest.TestCase): - """ResourceIdProject unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def make_instance(self, include_optional) -> ResourceIdProject: - """Test ResourceIdProject - include_optional is a boolean, when False only required - params are included, when True both required and - optional params are included """ - # uncomment below to create an instance of `ResourceIdProject` - """ - model = ResourceIdProject() - if include_optional: - return ResourceIdProject( - id = '', - type = 'Project' - ) - else: - return ResourceIdProject( - id = '', - type = 'Project', - ) - """ - - def testResourceIdProject(self): - """Test ResourceIdProject""" - # inst_req_only = self.make_instance(include_optional=False) - # inst_req_and_optional = self.make_instance(include_optional=True) - -if __name__ == '__main__': - unittest.main() diff --git a/python/test/test_session_api.py b/python/test/test_session_api.py index caaf86d0..e140b269 100644 --- a/python/test/test_session_api.py +++ b/python/test/test_session_api.py @@ -58,7 +58,7 @@ def test_oidc_init(self) -> None: def test_oidc_login(self) -> None: """Test case for oidc_login - Creates a session for a user via a login with Open Id Connect. + Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. """ pass diff --git a/python/test/test_color_param_static.py b/python/test/test_static_color.py similarity index 68% rename from python/test/test_color_param_static.py rename to python/test/test_static_color.py index f9a5ed86..5a1531af 100644 --- a/python/test/test_color_param_static.py +++ b/python/test/test_static_color.py @@ -15,10 +15,10 @@ import unittest -from geoengine_openapi_client.models.color_param_static import ColorParamStatic +from geoengine_openapi_client.models.static_color import StaticColor -class TestColorParamStatic(unittest.TestCase): - """ColorParamStatic unit test stubs""" +class TestStaticColor(unittest.TestCase): + """StaticColor unit test stubs""" def setUp(self): pass @@ -26,23 +26,23 @@ def setUp(self): def tearDown(self): pass - def make_instance(self, include_optional) -> ColorParamStatic: - """Test ColorParamStatic + def make_instance(self, include_optional) -> StaticColor: + """Test StaticColor include_optional is a boolean, when False only required params are included, when True both required and optional params are included """ - # uncomment below to create an instance of `ColorParamStatic` + # uncomment below to create an instance of `StaticColor` """ - model = ColorParamStatic() + model = StaticColor() if include_optional: - return ColorParamStatic( + return StaticColor( color = [ 56 ], type = 'static' ) else: - return ColorParamStatic( + return StaticColor( color = [ 56 ], @@ -50,8 +50,8 @@ def make_instance(self, include_optional) -> ColorParamStatic: ) """ - def testColorParamStatic(self): - """Test ColorParamStatic""" + def testStaticColor(self): + """Test StaticColor""" # inst_req_only = self.make_instance(include_optional=False) # inst_req_and_optional = self.make_instance(include_optional=True) diff --git a/python/test/test_static_number_param.py b/python/test/test_static_number.py similarity index 69% rename from python/test/test_static_number_param.py rename to python/test/test_static_number.py index 4e2201c7..76c33ae0 100644 --- a/python/test/test_static_number_param.py +++ b/python/test/test_static_number.py @@ -15,10 +15,10 @@ import unittest -from geoengine_openapi_client.models.static_number_param import StaticNumberParam +from geoengine_openapi_client.models.static_number import StaticNumber -class TestStaticNumberParam(unittest.TestCase): - """StaticNumberParam unit test stubs""" +class TestStaticNumber(unittest.TestCase): + """StaticNumber unit test stubs""" def setUp(self): pass @@ -26,28 +26,28 @@ def setUp(self): def tearDown(self): pass - def make_instance(self, include_optional) -> StaticNumberParam: - """Test StaticNumberParam + def make_instance(self, include_optional) -> StaticNumber: + """Test StaticNumber include_optional is a boolean, when False only required params are included, when True both required and optional params are included """ - # uncomment below to create an instance of `StaticNumberParam` + # uncomment below to create an instance of `StaticNumber` """ - model = StaticNumberParam() + model = StaticNumber() if include_optional: - return StaticNumberParam( + return StaticNumber( type = 'static', value = 0 ) else: - return StaticNumberParam( + return StaticNumber( type = 'static', value = 0, ) """ - def testStaticNumberParam(self): - """Test StaticNumberParam""" + def testStaticNumber(self): + """Test StaticNumber""" # inst_req_only = self.make_instance(include_optional=False) # inst_req_and_optional = self.make_instance(include_optional=True) diff --git a/python/test/test_task_status.py b/python/test/test_task_status.py index 9b35fa67..bbda84ae 100644 --- a/python/test/test_task_status.py +++ b/python/test/test_task_status.py @@ -38,14 +38,14 @@ def make_instance(self, include_optional) -> TaskStatus: return TaskStatus( description = '', estimated_time_remaining = '', - info = geoengine_openapi_client.models.info.info(), + info = None, pct_complete = '', status = 'failed', task_type = '', time_started = '', time_total = '', - clean_up = geoengine_openapi_client.models.clean_up.cleanUp(), - error = geoengine_openapi_client.models.error.error() + clean_up = None, + error = None ) else: return TaskStatus( @@ -55,8 +55,8 @@ def make_instance(self, include_optional) -> TaskStatus: task_type = '', time_started = '', time_total = '', - clean_up = geoengine_openapi_client.models.clean_up.cleanUp(), - error = geoengine_openapi_client.models.error.error(), + clean_up = None, + error = None, ) """ diff --git a/python/test/test_typed_plot_result_descriptor.py b/python/test/test_typed_plot_result_descriptor.py index 7a2c8948..f5013dcd 100644 --- a/python/test/test_typed_plot_result_descriptor.py +++ b/python/test/test_typed_plot_result_descriptor.py @@ -36,22 +36,10 @@ def make_instance(self, include_optional) -> TypedPlotResultDescriptor: model = TypedPlotResultDescriptor() if include_optional: return TypedPlotResultDescriptor( - bbox = geoengine_openapi_client.models.bounding_box2_d.BoundingBox2D( - lower_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), - spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), type = 'plot' ) else: return TypedPlotResultDescriptor( - spatial_reference = '', type = 'plot', ) """ diff --git a/python/test/test_typed_raster_result_descriptor.py b/python/test/test_typed_raster_result_descriptor.py index 906e03b7..de501f12 100644 --- a/python/test/test_typed_raster_result_descriptor.py +++ b/python/test/test_typed_raster_result_descriptor.py @@ -36,37 +36,10 @@ def make_instance(self, include_optional) -> TypedRasterResultDescriptor: model = TypedRasterResultDescriptor() if include_optional: return TypedRasterResultDescriptor( - bands = [ - geoengine_openapi_client.models.raster_band_descriptor.RasterBandDescriptor( - measurement = null, - name = '', ) - ], - bbox = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( - lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), - data_type = 'U8', - resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), - spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), type = 'raster' ) else: return TypedRasterResultDescriptor( - bands = [ - geoengine_openapi_client.models.raster_band_descriptor.RasterBandDescriptor( - measurement = null, - name = '', ) - ], - data_type = 'U8', - spatial_reference = '', type = 'raster', ) """ diff --git a/python/test/test_typed_result_descriptor.py b/python/test/test_typed_result_descriptor.py index fe0f85a1..2ac0d37e 100644 --- a/python/test/test_typed_result_descriptor.py +++ b/python/test/test_typed_result_descriptor.py @@ -36,6 +36,11 @@ def make_instance(self, include_optional) -> TypedResultDescriptor: model = TypedResultDescriptor() if include_optional: return TypedResultDescriptor( + bands = [ + geoengine_openapi_client.models.raster_band_descriptor.RasterBandDescriptor( + measurement = null, + name = '', ) + ], bbox = geoengine_openapi_client.models.bounding_box2_d.BoundingBox2D( lower_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, @@ -43,20 +48,15 @@ def make_instance(self, include_optional) -> TypedResultDescriptor: upper_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), ), - spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), - type = 'plot', - bands = [ - geoengine_openapi_client.models.raster_band_descriptor.RasterBandDescriptor( - measurement = null, - name = '', ) - ], data_type = 'Data', resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( x = 1.337, y = 1.337, ), + spatial_reference = '', + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), + type = 'raster', columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', @@ -65,14 +65,14 @@ def make_instance(self, include_optional) -> TypedResultDescriptor: ) else: return TypedResultDescriptor( - spatial_reference = '', - type = 'plot', bands = [ geoengine_openapi_client.models.raster_band_descriptor.RasterBandDescriptor( measurement = null, name = '', ) ], data_type = 'Data', + spatial_reference = '', + type = 'raster', columns = { 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( data_type = 'category', diff --git a/python/test/test_typed_vector_result_descriptor.py b/python/test/test_typed_vector_result_descriptor.py index e5b9a81b..1994be4b 100644 --- a/python/test/test_typed_vector_result_descriptor.py +++ b/python/test/test_typed_vector_result_descriptor.py @@ -36,34 +36,10 @@ def make_instance(self, include_optional) -> TypedVectorResultDescriptor: model = TypedVectorResultDescriptor() if include_optional: return TypedVectorResultDescriptor( - bbox = geoengine_openapi_client.models.bounding_box2_d.BoundingBox2D( - lower_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), - upper_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( - x = 1.337, - y = 1.337, ), ), - columns = { - 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( - data_type = 'category', - measurement = null, ) - }, - data_type = 'Data', - spatial_reference = '', - time = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), type = 'vector' ) else: return TypedVectorResultDescriptor( - columns = { - 'key' : geoengine_openapi_client.models.vector_column_info.VectorColumnInfo( - data_type = 'category', - measurement = null, ) - }, - data_type = 'Data', - spatial_reference = '', type = 'vector', ) """ diff --git a/python/test/test_plot_update.py b/python/test/test_vec_update.py similarity index 69% rename from python/test/test_plot_update.py rename to python/test/test_vec_update.py index a1766c56..6d5b1c1c 100644 --- a/python/test/test_plot_update.py +++ b/python/test/test_vec_update.py @@ -15,10 +15,10 @@ import unittest -from geoengine_openapi_client.models.plot_update import PlotUpdate +from geoengine_openapi_client.models.vec_update import VecUpdate -class TestPlotUpdate(unittest.TestCase): - """PlotUpdate unit test stubs""" +class TestVecUpdate(unittest.TestCase): + """VecUpdate unit test stubs""" def setUp(self): pass @@ -26,28 +26,28 @@ def setUp(self): def tearDown(self): pass - def make_instance(self, include_optional) -> PlotUpdate: - """Test PlotUpdate + def make_instance(self, include_optional) -> VecUpdate: + """Test VecUpdate include_optional is a boolean, when False only required params are included, when True both required and optional params are included """ - # uncomment below to create an instance of `PlotUpdate` + # uncomment below to create an instance of `VecUpdate` """ - model = PlotUpdate() + model = VecUpdate() if include_optional: - return PlotUpdate( + return VecUpdate( name = '', workflow = '' ) else: - return PlotUpdate( + return VecUpdate( name = '', workflow = '', ) """ - def testPlotUpdate(self): - """Test PlotUpdate""" + def testVecUpdate(self): + """Test VecUpdate""" # inst_req_only = self.make_instance(include_optional=False) # inst_req_and_optional = self.make_instance(include_optional=True) diff --git a/python/test/test_workflows_api.py b/python/test/test_workflows_api.py index 5f1d59cd..1030c705 100644 --- a/python/test/test_workflows_api.py +++ b/python/test/test_workflows_api.py @@ -30,7 +30,7 @@ def tearDown(self) -> None: def test_dataset_from_workflow_handler(self) -> None: """Test case for dataset_from_workflow_handler - Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task """ pass diff --git a/typescript/README.md b/typescript/README.md index 25abd680..d2776a23 100644 --- a/typescript/README.md +++ b/typescript/README.md @@ -1,4 +1,4 @@ -## @geoengine/openapi-client@0.0.21 +## @geoengine/openapi-client@0.0.22 This generator creates TypeScript/JavaScript client that utilizes [Fetch API](https://fetch.spec.whatwg.org/). The generated Node module can be used in the following environments: @@ -36,7 +36,7 @@ navigate to the folder of your consuming project and run one of the following co _published:_ ``` -npm install @geoengine/openapi-client@0.0.21 --save +npm install @geoengine/openapi-client@0.0.22 --save ``` _unPublished (not recommended):_ diff --git a/typescript/dist/apis/DatasetsApi.d.ts b/typescript/dist/apis/DatasetsApi.d.ts index 53a5b7f1..b3130d1c 100644 --- a/typescript/dist/apis/DatasetsApi.d.ts +++ b/typescript/dist/apis/DatasetsApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AutoCreateDataset, CreateDataset, CreateDatasetHandler200Response, Dataset, DatasetListing, MetaDataDefinition, MetaDataSuggestion, OrderBy, Provenances, SuggestMetaData, Symbology, UpdateDataset, Volume, VolumeFileLayersResponse } from '../models/index'; +import type { AutoCreateDataset, CreateDataset, Dataset, DatasetListing, DatasetNameResponse, MetaDataDefinition, MetaDataSuggestion, OrderBy, Provenances, SuggestMetaData, Symbology, UpdateDataset, Volume, VolumeFileLayersResponse } from '../models/index'; export interface AutoCreateDatasetHandlerRequest { autoCreateDataset: AutoCreateDataset; } @@ -30,8 +30,8 @@ export interface ListDatasetsHandlerRequest { order: OrderBy; offset: number; limit: number; - filter?: string | null; - tags?: Array | null; + filter?: string; + tags?: Array; } export interface ListVolumeFileLayersHandlerRequest { volumeName: string; @@ -61,25 +61,21 @@ export interface UpdateLoadingInfoHandlerRequest { */ export declare class DatasetsApi extends runtime.BaseAPI { /** - * The format of the files will be automatically detected when possible. - * Creates a new dataset using previously uploaded files. + * Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. */ - autoCreateDatasetHandlerRaw(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + autoCreateDatasetHandlerRaw(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * The format of the files will be automatically detected when possible. - * Creates a new dataset using previously uploaded files. + * Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. */ - autoCreateDatasetHandler(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + autoCreateDatasetHandler(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** - * Users can reference previously uploaded files. Admins can reference files from a volume. - * Creates a new dataset referencing files. + * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. */ - createDatasetHandlerRaw(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + createDatasetHandlerRaw(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * Users can reference previously uploaded files. Admins can reference files from a volume. - * Creates a new dataset referencing files. + * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. */ - createDatasetHandler(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + createDatasetHandler(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Delete a dataset */ @@ -129,13 +125,11 @@ export declare class DatasetsApi extends runtime.BaseAPI { */ listVolumesHandler(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * Tries to automatically detect the main file and layer name if not specified. - * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. */ suggestMetaDataHandlerRaw(requestParameters: SuggestMetaDataHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * Tries to automatically detect the main file and layer name if not specified. - * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. */ suggestMetaDataHandler(requestParameters: SuggestMetaDataHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** diff --git a/typescript/dist/apis/DatasetsApi.js b/typescript/dist/apis/DatasetsApi.js index 3711af98..390168aa 100644 --- a/typescript/dist/apis/DatasetsApi.js +++ b/typescript/dist/apis/DatasetsApi.js @@ -30,8 +30,7 @@ const index_1 = require("../models/index"); */ class DatasetsApi extends runtime.BaseAPI { /** - * The format of the files will be automatically detected when possible. - * Creates a new dataset using previously uploaded files. + * Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. */ autoCreateDatasetHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -55,12 +54,11 @@ class DatasetsApi extends runtime.BaseAPI { query: queryParameters, body: (0, index_1.AutoCreateDatasetToJSON)(requestParameters['autoCreateDataset']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.CreateDatasetHandler200ResponseFromJSON)(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.DatasetNameResponseFromJSON)(jsonValue)); }); } /** - * The format of the files will be automatically detected when possible. - * Creates a new dataset using previously uploaded files. + * Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. */ autoCreateDatasetHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -69,8 +67,7 @@ class DatasetsApi extends runtime.BaseAPI { }); } /** - * Users can reference previously uploaded files. Admins can reference files from a volume. - * Creates a new dataset referencing files. + * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. */ createDatasetHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -94,12 +91,11 @@ class DatasetsApi extends runtime.BaseAPI { query: queryParameters, body: (0, index_1.CreateDatasetToJSON)(requestParameters['createDataset']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.CreateDatasetHandler200ResponseFromJSON)(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.DatasetNameResponseFromJSON)(jsonValue)); }); } /** - * Users can reference previously uploaded files. Admins can reference files from a volume. - * Creates a new dataset referencing files. + * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. */ createDatasetHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -338,8 +334,7 @@ class DatasetsApi extends runtime.BaseAPI { }); } /** - * Tries to automatically detect the main file and layer name if not specified. - * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. */ suggestMetaDataHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -367,8 +362,7 @@ class DatasetsApi extends runtime.BaseAPI { }); } /** - * Tries to automatically detect the main file and layer name if not specified. - * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. */ suggestMetaDataHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { diff --git a/typescript/dist/apis/LayersApi.d.ts b/typescript/dist/apis/LayersApi.d.ts index 7deece7f..ef8b8106 100644 --- a/typescript/dist/apis/LayersApi.d.ts +++ b/typescript/dist/apis/LayersApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AddCollection200Response, AddLayer, AddLayerCollection, Layer, LayerCollection, ProviderCapabilities, SearchType, TaskResponse, UpdateLayer, UpdateLayerCollection } from '../models/index'; +import type { AddLayer, AddLayerCollection, IdResponse, Layer, LayerCollection, ProviderCapabilities, SearchType, TaskResponse, UpdateLayer, UpdateLayerCollection } from '../models/index'; export interface AddCollectionRequest { collection: string; addLayerCollection: AddLayerCollection; @@ -97,11 +97,11 @@ export declare class LayersApi extends runtime.BaseAPI { /** * Add a new collection to an existing collection */ - addCollectionRaw(requestParameters: AddCollectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + addCollectionRaw(requestParameters: AddCollectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Add a new collection to an existing collection */ - addCollection(requestParameters: AddCollectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + addCollection(requestParameters: AddCollectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Add an existing collection to a collection */ @@ -121,11 +121,11 @@ export declare class LayersApi extends runtime.BaseAPI { /** * Add a new layer to a collection */ - addLayerRaw(requestParameters: AddLayerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + addLayerRaw(requestParameters: AddLayerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Add a new layer to a collection */ - addLayer(requestParameters: AddLayerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + addLayer(requestParameters: AddLayerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Autocompletes the search on the contents of the collection of the given provider */ @@ -153,11 +153,11 @@ export declare class LayersApi extends runtime.BaseAPI { /** * Registers a layer from a provider as a workflow and returns the workflow id */ - layerToWorkflowIdHandlerRaw(requestParameters: LayerToWorkflowIdHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + layerToWorkflowIdHandlerRaw(requestParameters: LayerToWorkflowIdHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Registers a layer from a provider as a workflow and returns the workflow id */ - layerToWorkflowIdHandler(requestParameters: LayerToWorkflowIdHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + layerToWorkflowIdHandler(requestParameters: LayerToWorkflowIdHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * List the contents of the collection of the given provider */ diff --git a/typescript/dist/apis/LayersApi.js b/typescript/dist/apis/LayersApi.js index 98960280..57a14c0b 100644 --- a/typescript/dist/apis/LayersApi.js +++ b/typescript/dist/apis/LayersApi.js @@ -57,7 +57,7 @@ class LayersApi extends runtime.BaseAPI { query: queryParameters, body: (0, index_1.AddLayerCollectionToJSON)(requestParameters['addLayerCollection']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.AddCollection200ResponseFromJSON)(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.IdResponseFromJSON)(jsonValue)); }); } /** @@ -171,7 +171,7 @@ class LayersApi extends runtime.BaseAPI { query: queryParameters, body: (0, index_1.AddLayerToJSON)(requestParameters['addLayer']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.AddCollection200ResponseFromJSON)(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.IdResponseFromJSON)(jsonValue)); }); } /** @@ -347,7 +347,7 @@ class LayersApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.AddCollection200ResponseFromJSON)(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.IdResponseFromJSON)(jsonValue)); }); } /** diff --git a/typescript/dist/apis/OGCWFSApi.d.ts b/typescript/dist/apis/OGCWFSApi.d.ts index e784296b..2c45aa3a 100644 --- a/typescript/dist/apis/OGCWFSApi.d.ts +++ b/typescript/dist/apis/OGCWFSApi.d.ts @@ -32,7 +32,7 @@ export interface WfsFeatureHandlerRequest { resultType?: string | null; filter?: string | null; propertyName?: string | null; - queryResolution?: string | null; + queryResolution?: string; } /** * diff --git a/typescript/dist/apis/ProjectsApi.d.ts b/typescript/dist/apis/ProjectsApi.d.ts index e1dcedd5..6bf469a8 100644 --- a/typescript/dist/apis/ProjectsApi.d.ts +++ b/typescript/dist/apis/ProjectsApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AddCollection200Response, CreateProject, OrderBy, Project, ProjectListing, ProjectVersion, UpdateProject } from '../models/index'; +import type { CreateProject, IdResponse, OrderBy, Project, ProjectListing, ProjectVersion, UpdateProject } from '../models/index'; export interface CreateProjectHandlerRequest { createProject: CreateProject; } @@ -43,11 +43,11 @@ export declare class ProjectsApi extends runtime.BaseAPI { /** * Create a new project for the user. */ - createProjectHandlerRaw(requestParameters: CreateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + createProjectHandlerRaw(requestParameters: CreateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Create a new project for the user. */ - createProjectHandler(requestParameters: CreateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + createProjectHandler(requestParameters: CreateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Deletes a project. */ @@ -89,13 +89,11 @@ export declare class ProjectsApi extends runtime.BaseAPI { */ projectVersionsHandler(requestParameters: ProjectVersionsHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * This will create a new version. - * Updates a project. + * Updates a project. This will create a new version. */ updateProjectHandlerRaw(requestParameters: UpdateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * This will create a new version. - * Updates a project. + * Updates a project. This will create a new version. */ updateProjectHandler(requestParameters: UpdateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; } diff --git a/typescript/dist/apis/ProjectsApi.js b/typescript/dist/apis/ProjectsApi.js index 0de6245e..a4e50e79 100644 --- a/typescript/dist/apis/ProjectsApi.js +++ b/typescript/dist/apis/ProjectsApi.js @@ -54,7 +54,7 @@ class ProjectsApi extends runtime.BaseAPI { query: queryParameters, body: (0, index_1.CreateProjectToJSON)(requestParameters['createProject']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.AddCollection200ResponseFromJSON)(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.IdResponseFromJSON)(jsonValue)); }); } /** @@ -250,8 +250,7 @@ class ProjectsApi extends runtime.BaseAPI { }); } /** - * This will create a new version. - * Updates a project. + * Updates a project. This will create a new version. */ updateProjectHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -282,8 +281,7 @@ class ProjectsApi extends runtime.BaseAPI { }); } /** - * This will create a new version. - * Updates a project. + * Updates a project. This will create a new version. */ updateProjectHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { diff --git a/typescript/dist/apis/SessionApi.d.ts b/typescript/dist/apis/SessionApi.d.ts index 88bc3045..0bf6cb9d 100644 --- a/typescript/dist/apis/SessionApi.d.ts +++ b/typescript/dist/apis/SessionApi.d.ts @@ -63,13 +63,13 @@ export declare class SessionApi extends runtime.BaseAPI { */ oidcInit(requestParameters: OidcInitRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** - * This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. - * Creates a session for a user via a login with Open Id Connect. + * # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + * Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. */ oidcLoginRaw(requestParameters: OidcLoginRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. - * Creates a session for a user via a login with Open Id Connect. + * # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + * Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. */ oidcLogin(requestParameters: OidcLoginRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** diff --git a/typescript/dist/apis/SessionApi.js b/typescript/dist/apis/SessionApi.js index 8668ba13..89dfdfea 100644 --- a/typescript/dist/apis/SessionApi.js +++ b/typescript/dist/apis/SessionApi.js @@ -149,8 +149,8 @@ class SessionApi extends runtime.BaseAPI { }); } /** - * This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. - * Creates a session for a user via a login with Open Id Connect. + * # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + * Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. */ oidcLoginRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -177,8 +177,8 @@ class SessionApi extends runtime.BaseAPI { }); } /** - * This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. - * Creates a session for a user via a login with Open Id Connect. + * # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + * Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. */ oidcLogin(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { diff --git a/typescript/dist/apis/TasksApi.d.ts b/typescript/dist/apis/TasksApi.d.ts index 9e02928f..c579f122 100644 --- a/typescript/dist/apis/TasksApi.d.ts +++ b/typescript/dist/apis/TasksApi.d.ts @@ -28,12 +28,12 @@ export interface StatusHandlerRequest { */ export declare class TasksApi extends runtime.BaseAPI { /** - * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. * Abort a running task. */ abortHandlerRaw(requestParameters: AbortHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. * Abort a running task. */ abortHandler(requestParameters: AbortHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; diff --git a/typescript/dist/apis/TasksApi.js b/typescript/dist/apis/TasksApi.js index 1aac35e6..a14a448a 100644 --- a/typescript/dist/apis/TasksApi.js +++ b/typescript/dist/apis/TasksApi.js @@ -30,7 +30,7 @@ const index_1 = require("../models/index"); */ class TasksApi extends runtime.BaseAPI { /** - * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. * Abort a running task. */ abortHandlerRaw(requestParameters, initOverrides) { @@ -60,7 +60,7 @@ class TasksApi extends runtime.BaseAPI { }); } /** - * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. * Abort a running task. */ abortHandler(requestParameters, initOverrides) { diff --git a/typescript/dist/apis/UploadsApi.d.ts b/typescript/dist/apis/UploadsApi.d.ts index 698dcbda..432e2f98 100644 --- a/typescript/dist/apis/UploadsApi.d.ts +++ b/typescript/dist/apis/UploadsApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AddCollection200Response, UploadFileLayersResponse, UploadFilesResponse } from '../models/index'; +import type { IdResponse, UploadFileLayersResponse, UploadFilesResponse } from '../models/index'; export interface ListUploadFileLayersHandlerRequest { uploadId: string; fileName: string; @@ -44,9 +44,9 @@ export declare class UploadsApi extends runtime.BaseAPI { /** * Uploads files. */ - uploadHandlerRaw(requestParameters: UploadHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + uploadHandlerRaw(requestParameters: UploadHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Uploads files. */ - uploadHandler(requestParameters: UploadHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + uploadHandler(requestParameters: UploadHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; } diff --git a/typescript/dist/apis/UploadsApi.js b/typescript/dist/apis/UploadsApi.js index 18be0c4d..39ac3380 100644 --- a/typescript/dist/apis/UploadsApi.js +++ b/typescript/dist/apis/UploadsApi.js @@ -146,7 +146,7 @@ class UploadsApi extends runtime.BaseAPI { query: queryParameters, body: formParams, }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.AddCollection200ResponseFromJSON)(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.IdResponseFromJSON)(jsonValue)); }); } /** diff --git a/typescript/dist/apis/UserApi.d.ts b/typescript/dist/apis/UserApi.d.ts index 3d1ce1cc..5549a59e 100644 --- a/typescript/dist/apis/UserApi.d.ts +++ b/typescript/dist/apis/UserApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AddCollection200Response, AddRole, ComputationQuota, DataUsage, DataUsageSummary, OperatorQuota, Quota, RoleDescription, UpdateQuota, UsageSummaryGranularity } from '../models/index'; +import type { AddRole, ComputationQuota, DataUsage, DataUsageSummary, IdResponse, OperatorQuota, Quota, RoleDescription, UpdateQuota, UsageSummaryGranularity } from '../models/index'; export interface AddRoleHandlerRequest { addRole: AddRole; } @@ -107,11 +107,11 @@ export declare class UserApi extends runtime.BaseAPI { /** * Get role by name */ - getRoleByNameHandlerRaw(requestParameters: GetRoleByNameHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + getRoleByNameHandlerRaw(requestParameters: GetRoleByNameHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Get role by name */ - getRoleByNameHandler(requestParameters: GetRoleByNameHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + getRoleByNameHandler(requestParameters: GetRoleByNameHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Query roles for the current user. */ diff --git a/typescript/dist/apis/UserApi.js b/typescript/dist/apis/UserApi.js index c35c2a8d..9430628a 100644 --- a/typescript/dist/apis/UserApi.js +++ b/typescript/dist/apis/UserApi.js @@ -307,7 +307,7 @@ class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.AddCollection200ResponseFromJSON)(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.IdResponseFromJSON)(jsonValue)); }); } /** diff --git a/typescript/dist/apis/WorkflowsApi.d.ts b/typescript/dist/apis/WorkflowsApi.d.ts index 271ca5cc..a8919c2c 100644 --- a/typescript/dist/apis/WorkflowsApi.d.ts +++ b/typescript/dist/apis/WorkflowsApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AddCollection200Response, ProvenanceEntry, RasterDatasetFromWorkflow, RasterStreamWebsocketResultType, SpatialPartition2D, SpatialResolution, TaskResponse, TypedResultDescriptor, Workflow } from '../models/index'; +import type { IdResponse, ProvenanceEntry, RasterDatasetFromWorkflow, RasterStreamWebsocketResultType, SpatialPartition2D, SpatialResolution, TaskResponse, TypedResultDescriptor, Workflow } from '../models/index'; export interface DatasetFromWorkflowHandlerRequest { id: string; rasterDatasetFromWorkflow: RasterDatasetFromWorkflow; @@ -43,13 +43,11 @@ export interface RegisterWorkflowHandlerRequest { */ export declare class WorkflowsApi extends runtime.BaseAPI { /** - * Returns the id of the created task - * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task */ datasetFromWorkflowHandlerRaw(requestParameters: DatasetFromWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * Returns the id of the created task - * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task */ datasetFromWorkflowHandler(requestParameters: DatasetFromWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** @@ -95,9 +93,9 @@ export declare class WorkflowsApi extends runtime.BaseAPI { /** * Registers a new Workflow. */ - registerWorkflowHandlerRaw(requestParameters: RegisterWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + registerWorkflowHandlerRaw(requestParameters: RegisterWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Registers a new Workflow. */ - registerWorkflowHandler(requestParameters: RegisterWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + registerWorkflowHandler(requestParameters: RegisterWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; } diff --git a/typescript/dist/apis/WorkflowsApi.js b/typescript/dist/apis/WorkflowsApi.js index 4ae4674a..c2c533b8 100644 --- a/typescript/dist/apis/WorkflowsApi.js +++ b/typescript/dist/apis/WorkflowsApi.js @@ -30,8 +30,7 @@ const index_1 = require("../models/index"); */ class WorkflowsApi extends runtime.BaseAPI { /** - * Returns the id of the created task - * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task */ datasetFromWorkflowHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -62,8 +61,7 @@ class WorkflowsApi extends runtime.BaseAPI { }); } /** - * Returns the id of the created task - * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task */ datasetFromWorkflowHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -300,7 +298,7 @@ class WorkflowsApi extends runtime.BaseAPI { query: queryParameters, body: (0, index_1.WorkflowToJSON)(requestParameters['workflow']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.AddCollection200ResponseFromJSON)(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => (0, index_1.IdResponseFromJSON)(jsonValue)); }); } /** diff --git a/typescript/dist/esm/apis/DatasetsApi.d.ts b/typescript/dist/esm/apis/DatasetsApi.d.ts index 53a5b7f1..b3130d1c 100644 --- a/typescript/dist/esm/apis/DatasetsApi.d.ts +++ b/typescript/dist/esm/apis/DatasetsApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AutoCreateDataset, CreateDataset, CreateDatasetHandler200Response, Dataset, DatasetListing, MetaDataDefinition, MetaDataSuggestion, OrderBy, Provenances, SuggestMetaData, Symbology, UpdateDataset, Volume, VolumeFileLayersResponse } from '../models/index'; +import type { AutoCreateDataset, CreateDataset, Dataset, DatasetListing, DatasetNameResponse, MetaDataDefinition, MetaDataSuggestion, OrderBy, Provenances, SuggestMetaData, Symbology, UpdateDataset, Volume, VolumeFileLayersResponse } from '../models/index'; export interface AutoCreateDatasetHandlerRequest { autoCreateDataset: AutoCreateDataset; } @@ -30,8 +30,8 @@ export interface ListDatasetsHandlerRequest { order: OrderBy; offset: number; limit: number; - filter?: string | null; - tags?: Array | null; + filter?: string; + tags?: Array; } export interface ListVolumeFileLayersHandlerRequest { volumeName: string; @@ -61,25 +61,21 @@ export interface UpdateLoadingInfoHandlerRequest { */ export declare class DatasetsApi extends runtime.BaseAPI { /** - * The format of the files will be automatically detected when possible. - * Creates a new dataset using previously uploaded files. + * Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. */ - autoCreateDatasetHandlerRaw(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + autoCreateDatasetHandlerRaw(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * The format of the files will be automatically detected when possible. - * Creates a new dataset using previously uploaded files. + * Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. */ - autoCreateDatasetHandler(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + autoCreateDatasetHandler(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** - * Users can reference previously uploaded files. Admins can reference files from a volume. - * Creates a new dataset referencing files. + * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. */ - createDatasetHandlerRaw(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + createDatasetHandlerRaw(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * Users can reference previously uploaded files. Admins can reference files from a volume. - * Creates a new dataset referencing files. + * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. */ - createDatasetHandler(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + createDatasetHandler(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Delete a dataset */ @@ -129,13 +125,11 @@ export declare class DatasetsApi extends runtime.BaseAPI { */ listVolumesHandler(initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * Tries to automatically detect the main file and layer name if not specified. - * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. */ suggestMetaDataHandlerRaw(requestParameters: SuggestMetaDataHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * Tries to automatically detect the main file and layer name if not specified. - * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. */ suggestMetaDataHandler(requestParameters: SuggestMetaDataHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** diff --git a/typescript/dist/esm/apis/DatasetsApi.js b/typescript/dist/esm/apis/DatasetsApi.js index dcf90159..8e724f5e 100644 --- a/typescript/dist/esm/apis/DatasetsApi.js +++ b/typescript/dist/esm/apis/DatasetsApi.js @@ -21,14 +21,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; import * as runtime from '../runtime'; -import { AutoCreateDatasetToJSON, CreateDatasetToJSON, CreateDatasetHandler200ResponseFromJSON, DatasetFromJSON, DatasetListingFromJSON, MetaDataDefinitionFromJSON, MetaDataDefinitionToJSON, MetaDataSuggestionFromJSON, ProvenancesToJSON, SuggestMetaDataToJSON, SymbologyToJSON, UpdateDatasetToJSON, VolumeFromJSON, VolumeFileLayersResponseFromJSON, } from '../models/index'; +import { AutoCreateDatasetToJSON, CreateDatasetToJSON, DatasetFromJSON, DatasetListingFromJSON, DatasetNameResponseFromJSON, MetaDataDefinitionFromJSON, MetaDataDefinitionToJSON, MetaDataSuggestionFromJSON, ProvenancesToJSON, SuggestMetaDataToJSON, SymbologyToJSON, UpdateDatasetToJSON, VolumeFromJSON, VolumeFileLayersResponseFromJSON, } from '../models/index'; /** * */ export class DatasetsApi extends runtime.BaseAPI { /** - * The format of the files will be automatically detected when possible. - * Creates a new dataset using previously uploaded files. + * Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. */ autoCreateDatasetHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -52,12 +51,11 @@ export class DatasetsApi extends runtime.BaseAPI { query: queryParameters, body: AutoCreateDatasetToJSON(requestParameters['autoCreateDataset']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => CreateDatasetHandler200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => DatasetNameResponseFromJSON(jsonValue)); }); } /** - * The format of the files will be automatically detected when possible. - * Creates a new dataset using previously uploaded files. + * Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. */ autoCreateDatasetHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -66,8 +64,7 @@ export class DatasetsApi extends runtime.BaseAPI { }); } /** - * Users can reference previously uploaded files. Admins can reference files from a volume. - * Creates a new dataset referencing files. + * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. */ createDatasetHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -91,12 +88,11 @@ export class DatasetsApi extends runtime.BaseAPI { query: queryParameters, body: CreateDatasetToJSON(requestParameters['createDataset']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => CreateDatasetHandler200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => DatasetNameResponseFromJSON(jsonValue)); }); } /** - * Users can reference previously uploaded files. Admins can reference files from a volume. - * Creates a new dataset referencing files. + * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. */ createDatasetHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -335,8 +331,7 @@ export class DatasetsApi extends runtime.BaseAPI { }); } /** - * Tries to automatically detect the main file and layer name if not specified. - * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. */ suggestMetaDataHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -364,8 +359,7 @@ export class DatasetsApi extends runtime.BaseAPI { }); } /** - * Tries to automatically detect the main file and layer name if not specified. - * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. */ suggestMetaDataHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { diff --git a/typescript/dist/esm/apis/LayersApi.d.ts b/typescript/dist/esm/apis/LayersApi.d.ts index 7deece7f..ef8b8106 100644 --- a/typescript/dist/esm/apis/LayersApi.d.ts +++ b/typescript/dist/esm/apis/LayersApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AddCollection200Response, AddLayer, AddLayerCollection, Layer, LayerCollection, ProviderCapabilities, SearchType, TaskResponse, UpdateLayer, UpdateLayerCollection } from '../models/index'; +import type { AddLayer, AddLayerCollection, IdResponse, Layer, LayerCollection, ProviderCapabilities, SearchType, TaskResponse, UpdateLayer, UpdateLayerCollection } from '../models/index'; export interface AddCollectionRequest { collection: string; addLayerCollection: AddLayerCollection; @@ -97,11 +97,11 @@ export declare class LayersApi extends runtime.BaseAPI { /** * Add a new collection to an existing collection */ - addCollectionRaw(requestParameters: AddCollectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + addCollectionRaw(requestParameters: AddCollectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Add a new collection to an existing collection */ - addCollection(requestParameters: AddCollectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + addCollection(requestParameters: AddCollectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Add an existing collection to a collection */ @@ -121,11 +121,11 @@ export declare class LayersApi extends runtime.BaseAPI { /** * Add a new layer to a collection */ - addLayerRaw(requestParameters: AddLayerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + addLayerRaw(requestParameters: AddLayerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Add a new layer to a collection */ - addLayer(requestParameters: AddLayerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + addLayer(requestParameters: AddLayerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Autocompletes the search on the contents of the collection of the given provider */ @@ -153,11 +153,11 @@ export declare class LayersApi extends runtime.BaseAPI { /** * Registers a layer from a provider as a workflow and returns the workflow id */ - layerToWorkflowIdHandlerRaw(requestParameters: LayerToWorkflowIdHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + layerToWorkflowIdHandlerRaw(requestParameters: LayerToWorkflowIdHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Registers a layer from a provider as a workflow and returns the workflow id */ - layerToWorkflowIdHandler(requestParameters: LayerToWorkflowIdHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + layerToWorkflowIdHandler(requestParameters: LayerToWorkflowIdHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * List the contents of the collection of the given provider */ diff --git a/typescript/dist/esm/apis/LayersApi.js b/typescript/dist/esm/apis/LayersApi.js index 21e714f1..2030bc09 100644 --- a/typescript/dist/esm/apis/LayersApi.js +++ b/typescript/dist/esm/apis/LayersApi.js @@ -21,7 +21,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; import * as runtime from '../runtime'; -import { AddCollection200ResponseFromJSON, AddLayerToJSON, AddLayerCollectionToJSON, LayerFromJSON, LayerCollectionFromJSON, ProviderCapabilitiesFromJSON, TaskResponseFromJSON, UpdateLayerToJSON, UpdateLayerCollectionToJSON, } from '../models/index'; +import { AddLayerToJSON, AddLayerCollectionToJSON, IdResponseFromJSON, LayerFromJSON, LayerCollectionFromJSON, ProviderCapabilitiesFromJSON, TaskResponseFromJSON, UpdateLayerToJSON, UpdateLayerCollectionToJSON, } from '../models/index'; /** * */ @@ -54,7 +54,7 @@ export class LayersApi extends runtime.BaseAPI { query: queryParameters, body: AddLayerCollectionToJSON(requestParameters['addLayerCollection']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); }); } /** @@ -168,7 +168,7 @@ export class LayersApi extends runtime.BaseAPI { query: queryParameters, body: AddLayerToJSON(requestParameters['addLayer']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); }); } /** @@ -344,7 +344,7 @@ export class LayersApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); }); } /** diff --git a/typescript/dist/esm/apis/OGCWFSApi.d.ts b/typescript/dist/esm/apis/OGCWFSApi.d.ts index e784296b..2c45aa3a 100644 --- a/typescript/dist/esm/apis/OGCWFSApi.d.ts +++ b/typescript/dist/esm/apis/OGCWFSApi.d.ts @@ -32,7 +32,7 @@ export interface WfsFeatureHandlerRequest { resultType?: string | null; filter?: string | null; propertyName?: string | null; - queryResolution?: string | null; + queryResolution?: string; } /** * diff --git a/typescript/dist/esm/apis/ProjectsApi.d.ts b/typescript/dist/esm/apis/ProjectsApi.d.ts index e1dcedd5..6bf469a8 100644 --- a/typescript/dist/esm/apis/ProjectsApi.d.ts +++ b/typescript/dist/esm/apis/ProjectsApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AddCollection200Response, CreateProject, OrderBy, Project, ProjectListing, ProjectVersion, UpdateProject } from '../models/index'; +import type { CreateProject, IdResponse, OrderBy, Project, ProjectListing, ProjectVersion, UpdateProject } from '../models/index'; export interface CreateProjectHandlerRequest { createProject: CreateProject; } @@ -43,11 +43,11 @@ export declare class ProjectsApi extends runtime.BaseAPI { /** * Create a new project for the user. */ - createProjectHandlerRaw(requestParameters: CreateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + createProjectHandlerRaw(requestParameters: CreateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Create a new project for the user. */ - createProjectHandler(requestParameters: CreateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + createProjectHandler(requestParameters: CreateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Deletes a project. */ @@ -89,13 +89,11 @@ export declare class ProjectsApi extends runtime.BaseAPI { */ projectVersionsHandler(requestParameters: ProjectVersionsHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * This will create a new version. - * Updates a project. + * Updates a project. This will create a new version. */ updateProjectHandlerRaw(requestParameters: UpdateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * This will create a new version. - * Updates a project. + * Updates a project. This will create a new version. */ updateProjectHandler(requestParameters: UpdateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; } diff --git a/typescript/dist/esm/apis/ProjectsApi.js b/typescript/dist/esm/apis/ProjectsApi.js index 16aad0ea..38076862 100644 --- a/typescript/dist/esm/apis/ProjectsApi.js +++ b/typescript/dist/esm/apis/ProjectsApi.js @@ -21,7 +21,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; import * as runtime from '../runtime'; -import { AddCollection200ResponseFromJSON, CreateProjectToJSON, ProjectFromJSON, ProjectListingFromJSON, ProjectVersionFromJSON, UpdateProjectToJSON, } from '../models/index'; +import { CreateProjectToJSON, IdResponseFromJSON, ProjectFromJSON, ProjectListingFromJSON, ProjectVersionFromJSON, UpdateProjectToJSON, } from '../models/index'; /** * */ @@ -51,7 +51,7 @@ export class ProjectsApi extends runtime.BaseAPI { query: queryParameters, body: CreateProjectToJSON(requestParameters['createProject']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); }); } /** @@ -247,8 +247,7 @@ export class ProjectsApi extends runtime.BaseAPI { }); } /** - * This will create a new version. - * Updates a project. + * Updates a project. This will create a new version. */ updateProjectHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -279,8 +278,7 @@ export class ProjectsApi extends runtime.BaseAPI { }); } /** - * This will create a new version. - * Updates a project. + * Updates a project. This will create a new version. */ updateProjectHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { diff --git a/typescript/dist/esm/apis/SessionApi.d.ts b/typescript/dist/esm/apis/SessionApi.d.ts index 88bc3045..0bf6cb9d 100644 --- a/typescript/dist/esm/apis/SessionApi.d.ts +++ b/typescript/dist/esm/apis/SessionApi.d.ts @@ -63,13 +63,13 @@ export declare class SessionApi extends runtime.BaseAPI { */ oidcInit(requestParameters: OidcInitRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** - * This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. - * Creates a session for a user via a login with Open Id Connect. + * # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + * Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. */ oidcLoginRaw(requestParameters: OidcLoginRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. - * Creates a session for a user via a login with Open Id Connect. + * # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + * Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. */ oidcLogin(requestParameters: OidcLoginRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** diff --git a/typescript/dist/esm/apis/SessionApi.js b/typescript/dist/esm/apis/SessionApi.js index 7315e233..340dd9cf 100644 --- a/typescript/dist/esm/apis/SessionApi.js +++ b/typescript/dist/esm/apis/SessionApi.js @@ -146,8 +146,8 @@ export class SessionApi extends runtime.BaseAPI { }); } /** - * This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. - * Creates a session for a user via a login with Open Id Connect. + * # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + * Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. */ oidcLoginRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -174,8 +174,8 @@ export class SessionApi extends runtime.BaseAPI { }); } /** - * This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. - * Creates a session for a user via a login with Open Id Connect. + * # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + * Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. */ oidcLogin(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { diff --git a/typescript/dist/esm/apis/TasksApi.d.ts b/typescript/dist/esm/apis/TasksApi.d.ts index 9e02928f..c579f122 100644 --- a/typescript/dist/esm/apis/TasksApi.d.ts +++ b/typescript/dist/esm/apis/TasksApi.d.ts @@ -28,12 +28,12 @@ export interface StatusHandlerRequest { */ export declare class TasksApi extends runtime.BaseAPI { /** - * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. * Abort a running task. */ abortHandlerRaw(requestParameters: AbortHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. * Abort a running task. */ abortHandler(requestParameters: AbortHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; diff --git a/typescript/dist/esm/apis/TasksApi.js b/typescript/dist/esm/apis/TasksApi.js index 6cab1673..4833808a 100644 --- a/typescript/dist/esm/apis/TasksApi.js +++ b/typescript/dist/esm/apis/TasksApi.js @@ -27,7 +27,7 @@ import { TaskStatusFromJSON, TaskStatusWithIdFromJSON, } from '../models/index'; */ export class TasksApi extends runtime.BaseAPI { /** - * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. * Abort a running task. */ abortHandlerRaw(requestParameters, initOverrides) { @@ -57,7 +57,7 @@ export class TasksApi extends runtime.BaseAPI { }); } /** - * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. * Abort a running task. */ abortHandler(requestParameters, initOverrides) { diff --git a/typescript/dist/esm/apis/UploadsApi.d.ts b/typescript/dist/esm/apis/UploadsApi.d.ts index 698dcbda..432e2f98 100644 --- a/typescript/dist/esm/apis/UploadsApi.d.ts +++ b/typescript/dist/esm/apis/UploadsApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AddCollection200Response, UploadFileLayersResponse, UploadFilesResponse } from '../models/index'; +import type { IdResponse, UploadFileLayersResponse, UploadFilesResponse } from '../models/index'; export interface ListUploadFileLayersHandlerRequest { uploadId: string; fileName: string; @@ -44,9 +44,9 @@ export declare class UploadsApi extends runtime.BaseAPI { /** * Uploads files. */ - uploadHandlerRaw(requestParameters: UploadHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + uploadHandlerRaw(requestParameters: UploadHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Uploads files. */ - uploadHandler(requestParameters: UploadHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + uploadHandler(requestParameters: UploadHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; } diff --git a/typescript/dist/esm/apis/UploadsApi.js b/typescript/dist/esm/apis/UploadsApi.js index 637758c6..1eb8e0d2 100644 --- a/typescript/dist/esm/apis/UploadsApi.js +++ b/typescript/dist/esm/apis/UploadsApi.js @@ -21,7 +21,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; import * as runtime from '../runtime'; -import { AddCollection200ResponseFromJSON, UploadFileLayersResponseFromJSON, UploadFilesResponseFromJSON, } from '../models/index'; +import { IdResponseFromJSON, UploadFileLayersResponseFromJSON, UploadFilesResponseFromJSON, } from '../models/index'; /** * */ @@ -143,7 +143,7 @@ export class UploadsApi extends runtime.BaseAPI { query: queryParameters, body: formParams, }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); }); } /** diff --git a/typescript/dist/esm/apis/UserApi.d.ts b/typescript/dist/esm/apis/UserApi.d.ts index 3d1ce1cc..5549a59e 100644 --- a/typescript/dist/esm/apis/UserApi.d.ts +++ b/typescript/dist/esm/apis/UserApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AddCollection200Response, AddRole, ComputationQuota, DataUsage, DataUsageSummary, OperatorQuota, Quota, RoleDescription, UpdateQuota, UsageSummaryGranularity } from '../models/index'; +import type { AddRole, ComputationQuota, DataUsage, DataUsageSummary, IdResponse, OperatorQuota, Quota, RoleDescription, UpdateQuota, UsageSummaryGranularity } from '../models/index'; export interface AddRoleHandlerRequest { addRole: AddRole; } @@ -107,11 +107,11 @@ export declare class UserApi extends runtime.BaseAPI { /** * Get role by name */ - getRoleByNameHandlerRaw(requestParameters: GetRoleByNameHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + getRoleByNameHandlerRaw(requestParameters: GetRoleByNameHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Get role by name */ - getRoleByNameHandler(requestParameters: GetRoleByNameHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + getRoleByNameHandler(requestParameters: GetRoleByNameHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** * Query roles for the current user. */ diff --git a/typescript/dist/esm/apis/UserApi.js b/typescript/dist/esm/apis/UserApi.js index 676ac3ec..e567c3c1 100644 --- a/typescript/dist/esm/apis/UserApi.js +++ b/typescript/dist/esm/apis/UserApi.js @@ -21,7 +21,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; import * as runtime from '../runtime'; -import { AddCollection200ResponseFromJSON, AddRoleToJSON, ComputationQuotaFromJSON, DataUsageFromJSON, DataUsageSummaryFromJSON, OperatorQuotaFromJSON, QuotaFromJSON, RoleDescriptionFromJSON, UpdateQuotaToJSON, } from '../models/index'; +import { AddRoleToJSON, ComputationQuotaFromJSON, DataUsageFromJSON, DataUsageSummaryFromJSON, IdResponseFromJSON, OperatorQuotaFromJSON, QuotaFromJSON, RoleDescriptionFromJSON, UpdateQuotaToJSON, } from '../models/index'; /** * */ @@ -304,7 +304,7 @@ export class UserApi extends runtime.BaseAPI { headers: headerParameters, query: queryParameters, }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); }); } /** diff --git a/typescript/dist/esm/apis/WorkflowsApi.d.ts b/typescript/dist/esm/apis/WorkflowsApi.d.ts index 271ca5cc..a8919c2c 100644 --- a/typescript/dist/esm/apis/WorkflowsApi.d.ts +++ b/typescript/dist/esm/apis/WorkflowsApi.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import * as runtime from '../runtime'; -import type { AddCollection200Response, ProvenanceEntry, RasterDatasetFromWorkflow, RasterStreamWebsocketResultType, SpatialPartition2D, SpatialResolution, TaskResponse, TypedResultDescriptor, Workflow } from '../models/index'; +import type { IdResponse, ProvenanceEntry, RasterDatasetFromWorkflow, RasterStreamWebsocketResultType, SpatialPartition2D, SpatialResolution, TaskResponse, TypedResultDescriptor, Workflow } from '../models/index'; export interface DatasetFromWorkflowHandlerRequest { id: string; rasterDatasetFromWorkflow: RasterDatasetFromWorkflow; @@ -43,13 +43,11 @@ export interface RegisterWorkflowHandlerRequest { */ export declare class WorkflowsApi extends runtime.BaseAPI { /** - * Returns the id of the created task - * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task */ datasetFromWorkflowHandlerRaw(requestParameters: DatasetFromWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** - * Returns the id of the created task - * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task */ datasetFromWorkflowHandler(requestParameters: DatasetFromWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; /** @@ -95,9 +93,9 @@ export declare class WorkflowsApi extends runtime.BaseAPI { /** * Registers a new Workflow. */ - registerWorkflowHandlerRaw(requestParameters: RegisterWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; + registerWorkflowHandlerRaw(requestParameters: RegisterWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise>; /** * Registers a new Workflow. */ - registerWorkflowHandler(requestParameters: RegisterWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; + registerWorkflowHandler(requestParameters: RegisterWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise; } diff --git a/typescript/dist/esm/apis/WorkflowsApi.js b/typescript/dist/esm/apis/WorkflowsApi.js index 325a86d8..c53025f6 100644 --- a/typescript/dist/esm/apis/WorkflowsApi.js +++ b/typescript/dist/esm/apis/WorkflowsApi.js @@ -21,14 +21,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge }); }; import * as runtime from '../runtime'; -import { AddCollection200ResponseFromJSON, ProvenanceEntryFromJSON, RasterDatasetFromWorkflowToJSON, TaskResponseFromJSON, TypedResultDescriptorFromJSON, WorkflowFromJSON, WorkflowToJSON, } from '../models/index'; +import { IdResponseFromJSON, ProvenanceEntryFromJSON, RasterDatasetFromWorkflowToJSON, TaskResponseFromJSON, TypedResultDescriptorFromJSON, WorkflowFromJSON, WorkflowToJSON, } from '../models/index'; /** * */ export class WorkflowsApi extends runtime.BaseAPI { /** - * Returns the id of the created task - * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task */ datasetFromWorkflowHandlerRaw(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -59,8 +58,7 @@ export class WorkflowsApi extends runtime.BaseAPI { }); } /** - * Returns the id of the created task - * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task */ datasetFromWorkflowHandler(requestParameters, initOverrides) { return __awaiter(this, void 0, void 0, function* () { @@ -297,7 +295,7 @@ export class WorkflowsApi extends runtime.BaseAPI { query: queryParameters, body: WorkflowToJSON(requestParameters['workflow']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); }); } /** diff --git a/typescript/dist/esm/models/AddCollection200Response.d.ts b/typescript/dist/esm/models/AddCollection200Response.d.ts deleted file mode 100644 index 539cbe7d..00000000 --- a/typescript/dist/esm/models/AddCollection200Response.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface AddCollection200Response - */ -export interface AddCollection200Response { - /** - * - * @type {string} - * @memberof AddCollection200Response - */ - id: string; -} -/** - * Check if a given object implements the AddCollection200Response interface. - */ -export declare function instanceOfAddCollection200Response(value: object): value is AddCollection200Response; -export declare function AddCollection200ResponseFromJSON(json: any): AddCollection200Response; -export declare function AddCollection200ResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): AddCollection200Response; -export declare function AddCollection200ResponseToJSON(json: any): AddCollection200Response; -export declare function AddCollection200ResponseToJSONTyped(value?: AddCollection200Response | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/AddDataset.d.ts b/typescript/dist/esm/models/AddDataset.d.ts index 56b75997..3a8d9b2c 100644 --- a/typescript/dist/esm/models/AddDataset.d.ts +++ b/typescript/dist/esm/models/AddDataset.d.ts @@ -34,7 +34,7 @@ export interface AddDataset { * @type {string} * @memberof AddDataset */ - name?: string | null; + name?: string; /** * * @type {Array} diff --git a/typescript/dist/esm/models/ColorParam.d.ts b/typescript/dist/esm/models/ColorParam.d.ts index 27e62d45..94d826c1 100644 --- a/typescript/dist/esm/models/ColorParam.d.ts +++ b/typescript/dist/esm/models/ColorParam.d.ts @@ -9,8 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { ColorParamStatic } from './ColorParamStatic'; import type { DerivedColor } from './DerivedColor'; +import type { StaticColor } from './StaticColor'; /** * @type ColorParam * @@ -20,7 +20,7 @@ export type ColorParam = { type: 'derived'; } & DerivedColor | { type: 'static'; -} & ColorParamStatic; +} & StaticColor; export declare function ColorParamFromJSON(json: any): ColorParam; export declare function ColorParamFromJSONTyped(json: any, ignoreDiscriminator: boolean): ColorParam; export declare function ColorParamToJSON(json: any): any; diff --git a/typescript/dist/esm/models/ColorParam.js b/typescript/dist/esm/models/ColorParam.js index 242f2721..2258ce02 100644 --- a/typescript/dist/esm/models/ColorParam.js +++ b/typescript/dist/esm/models/ColorParam.js @@ -11,8 +11,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { ColorParamStaticFromJSONTyped, ColorParamStaticToJSON, } from './ColorParamStatic'; import { DerivedColorFromJSONTyped, DerivedColorToJSON, } from './DerivedColor'; +import { StaticColorFromJSONTyped, StaticColorToJSON, } from './StaticColor'; export function ColorParamFromJSON(json) { return ColorParamFromJSONTyped(json, false); } @@ -24,7 +24,7 @@ export function ColorParamFromJSONTyped(json, ignoreDiscriminator) { case 'derived': return Object.assign({}, DerivedColorFromJSONTyped(json, true), { type: 'derived' }); case 'static': - return Object.assign({}, ColorParamStaticFromJSONTyped(json, true), { type: 'static' }); + return Object.assign({}, StaticColorFromJSONTyped(json, true), { type: 'static' }); default: throw new Error(`No variant of ColorParam exists with 'type=${json['type']}'`); } @@ -40,7 +40,7 @@ export function ColorParamToJSONTyped(value, ignoreDiscriminator = false) { case 'derived': return Object.assign({}, DerivedColorToJSON(value), { type: 'derived' }); case 'static': - return Object.assign({}, ColorParamStaticToJSON(value), { type: 'static' }); + return Object.assign({}, StaticColorToJSON(value), { type: 'static' }); default: throw new Error(`No variant of ColorParam exists with 'type=${value['type']}'`); } diff --git a/typescript/dist/esm/models/ColorParamStatic.d.ts b/typescript/dist/esm/models/ColorParamStatic.d.ts deleted file mode 100644 index 5b67fd37..00000000 --- a/typescript/dist/esm/models/ColorParamStatic.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface ColorParamStatic - */ -export interface ColorParamStatic { - /** - * - * @type {Array} - * @memberof ColorParamStatic - */ - color: Array; - /** - * - * @type {string} - * @memberof ColorParamStatic - */ - type: ColorParamStaticTypeEnum; -} -/** - * @export - */ -export declare const ColorParamStaticTypeEnum: { - readonly Static: "static"; -}; -export type ColorParamStaticTypeEnum = typeof ColorParamStaticTypeEnum[keyof typeof ColorParamStaticTypeEnum]; -/** - * Check if a given object implements the ColorParamStatic interface. - */ -export declare function instanceOfColorParamStatic(value: object): value is ColorParamStatic; -export declare function ColorParamStaticFromJSON(json: any): ColorParamStatic; -export declare function ColorParamStaticFromJSONTyped(json: any, ignoreDiscriminator: boolean): ColorParamStatic; -export declare function ColorParamStaticToJSON(json: any): ColorParamStatic; -export declare function ColorParamStaticToJSONTyped(value?: ColorParamStatic | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/Colorizer.d.ts b/typescript/dist/esm/models/Colorizer.d.ts index 7d75528c..e8e6b1ed 100644 --- a/typescript/dist/esm/models/Colorizer.d.ts +++ b/typescript/dist/esm/models/Colorizer.d.ts @@ -14,7 +14,8 @@ import type { LogarithmicGradient } from './LogarithmicGradient'; import type { PaletteColorizer } from './PaletteColorizer'; /** * @type Colorizer - * + * A colorizer specifies a mapping between raster values and an output image + * There are different variants that perform different kinds of mapping. * @export */ export type Colorizer = { diff --git a/typescript/dist/esm/models/CreateDatasetHandler200Response.d.ts b/typescript/dist/esm/models/CreateDatasetHandler200Response.d.ts deleted file mode 100644 index 162af55f..00000000 --- a/typescript/dist/esm/models/CreateDatasetHandler200Response.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface CreateDatasetHandler200Response - */ -export interface CreateDatasetHandler200Response { - /** - * - * @type {string} - * @memberof CreateDatasetHandler200Response - */ - datasetName: string; -} -/** - * Check if a given object implements the CreateDatasetHandler200Response interface. - */ -export declare function instanceOfCreateDatasetHandler200Response(value: object): value is CreateDatasetHandler200Response; -export declare function CreateDatasetHandler200ResponseFromJSON(json: any): CreateDatasetHandler200Response; -export declare function CreateDatasetHandler200ResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): CreateDatasetHandler200Response; -export declare function CreateDatasetHandler200ResponseToJSON(json: any): CreateDatasetHandler200Response; -export declare function CreateDatasetHandler200ResponseToJSONTyped(value?: CreateDatasetHandler200Response | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/DataId.d.ts b/typescript/dist/esm/models/DataId.d.ts index 730c86e1..0b62a75c 100644 --- a/typescript/dist/esm/models/DataId.d.ts +++ b/typescript/dist/esm/models/DataId.d.ts @@ -13,7 +13,8 @@ import type { ExternalDataId } from './ExternalDataId'; import type { InternalDataId } from './InternalDataId'; /** * @type DataId - * + * The identifier for loadable data. It is used in the source operators to get the loading info (aka parametrization) + * for accessing the data. Internal data is loaded from datasets, external from `DataProvider`s. * @export */ export type DataId = { diff --git a/typescript/dist/esm/models/DatasetNameResponse.d.ts b/typescript/dist/esm/models/DatasetNameResponse.d.ts new file mode 100644 index 00000000..5295eb28 --- /dev/null +++ b/typescript/dist/esm/models/DatasetNameResponse.d.ts @@ -0,0 +1,32 @@ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.0 + * Contact: dev@geoengine.de + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +/** + * + * @export + * @interface DatasetNameResponse + */ +export interface DatasetNameResponse { + /** + * + * @type {string} + * @memberof DatasetNameResponse + */ + datasetName: string; +} +/** + * Check if a given object implements the DatasetNameResponse interface. + */ +export declare function instanceOfDatasetNameResponse(value: object): value is DatasetNameResponse; +export declare function DatasetNameResponseFromJSON(json: any): DatasetNameResponse; +export declare function DatasetNameResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): DatasetNameResponse; +export declare function DatasetNameResponseToJSON(json: any): DatasetNameResponse; +export declare function DatasetNameResponseToJSONTyped(value?: DatasetNameResponse | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/CreateDatasetHandler200Response.js b/typescript/dist/esm/models/DatasetNameResponse.js similarity index 56% rename from typescript/dist/esm/models/CreateDatasetHandler200Response.js rename to typescript/dist/esm/models/DatasetNameResponse.js index 7c3ee49f..d6ddef4f 100644 --- a/typescript/dist/esm/models/CreateDatasetHandler200Response.js +++ b/typescript/dist/esm/models/DatasetNameResponse.js @@ -12,17 +12,17 @@ * Do not edit the class manually. */ /** - * Check if a given object implements the CreateDatasetHandler200Response interface. + * Check if a given object implements the DatasetNameResponse interface. */ -export function instanceOfCreateDatasetHandler200Response(value) { +export function instanceOfDatasetNameResponse(value) { if (!('datasetName' in value) || value['datasetName'] === undefined) return false; return true; } -export function CreateDatasetHandler200ResponseFromJSON(json) { - return CreateDatasetHandler200ResponseFromJSONTyped(json, false); +export function DatasetNameResponseFromJSON(json) { + return DatasetNameResponseFromJSONTyped(json, false); } -export function CreateDatasetHandler200ResponseFromJSONTyped(json, ignoreDiscriminator) { +export function DatasetNameResponseFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } @@ -30,10 +30,10 @@ export function CreateDatasetHandler200ResponseFromJSONTyped(json, ignoreDiscrim 'datasetName': json['datasetName'], }; } -export function CreateDatasetHandler200ResponseToJSON(json) { - return CreateDatasetHandler200ResponseToJSONTyped(json, false); +export function DatasetNameResponseToJSON(json) { + return DatasetNameResponseToJSONTyped(json, false); } -export function CreateDatasetHandler200ResponseToJSONTyped(value, ignoreDiscriminator = false) { +export function DatasetNameResponseToJSONTyped(value, ignoreDiscriminator = false) { if (value == null) { return value; } diff --git a/typescript/dist/esm/models/DateTime.d.ts b/typescript/dist/esm/models/DateTime.d.ts deleted file mode 100644 index c0634073..00000000 --- a/typescript/dist/esm/models/DateTime.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * An object that composes the date and a timestamp with time zone. - * @export - * @interface DateTime - */ -export interface DateTime { - /** - * - * @type {Date} - * @memberof DateTime - */ - datetime: Date; -} -/** - * Check if a given object implements the DateTime interface. - */ -export declare function instanceOfDateTime(value: object): value is DateTime; -export declare function DateTimeFromJSON(json: any): DateTime; -export declare function DateTimeFromJSONTyped(json: any, ignoreDiscriminator: boolean): DateTime; -export declare function DateTimeToJSON(json: any): DateTime; -export declare function DateTimeToJSONTyped(value?: DateTime | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/DateTime.js b/typescript/dist/esm/models/DateTime.js deleted file mode 100644 index c1dda6fa..00000000 --- a/typescript/dist/esm/models/DateTime.js +++ /dev/null @@ -1,43 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * Check if a given object implements the DateTime interface. - */ -export function instanceOfDateTime(value) { - if (!('datetime' in value) || value['datetime'] === undefined) - return false; - return true; -} -export function DateTimeFromJSON(json) { - return DateTimeFromJSONTyped(json, false); -} -export function DateTimeFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'datetime': (new Date(json['datetime'])), - }; -} -export function DateTimeToJSON(json) { - return DateTimeToJSONTyped(json, false); -} -export function DateTimeToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'datetime': ((value['datetime']).toISOString()), - }; -} diff --git a/typescript/dist/esm/models/DateTimeParseFormat.d.ts b/typescript/dist/esm/models/DateTimeParseFormat.d.ts deleted file mode 100644 index 35141c72..00000000 --- a/typescript/dist/esm/models/DateTimeParseFormat.d.ts +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Geo Engine Pro API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface DateTimeParseFormat - */ -export interface DateTimeParseFormat { - /** - * - * @type {string} - * @memberof DateTimeParseFormat - */ - fmt: string; - /** - * - * @type {boolean} - * @memberof DateTimeParseFormat - */ - hasTime: boolean; - /** - * - * @type {boolean} - * @memberof DateTimeParseFormat - */ - hasTz: boolean; -} -/** - * Check if a given object implements the DateTimeParseFormat interface. - */ -export declare function instanceOfDateTimeParseFormat(value: object): boolean; -export declare function DateTimeParseFormatFromJSON(json: any): DateTimeParseFormat; -export declare function DateTimeParseFormatFromJSONTyped(json: any, ignoreDiscriminator: boolean): DateTimeParseFormat; -export declare function DateTimeParseFormatToJSON(value?: DateTimeParseFormat | null): any; diff --git a/typescript/dist/esm/models/DateTimeParseFormat.js b/typescript/dist/esm/models/DateTimeParseFormat.js deleted file mode 100644 index 635fe452..00000000 --- a/typescript/dist/esm/models/DateTimeParseFormat.js +++ /dev/null @@ -1,49 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine Pro API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * Check if a given object implements the DateTimeParseFormat interface. - */ -export function instanceOfDateTimeParseFormat(value) { - let isInstance = true; - isInstance = isInstance && "fmt" in value; - isInstance = isInstance && "hasTime" in value; - isInstance = isInstance && "hasTz" in value; - return isInstance; -} -export function DateTimeParseFormatFromJSON(json) { - return DateTimeParseFormatFromJSONTyped(json, false); -} -export function DateTimeParseFormatFromJSONTyped(json, ignoreDiscriminator) { - if ((json === undefined) || (json === null)) { - return json; - } - return { - 'fmt': json['fmt'], - 'hasTime': json['has_time'], - 'hasTz': json['has_tz'], - }; -} -export function DateTimeParseFormatToJSON(value) { - if (value === undefined) { - return undefined; - } - if (value === null) { - return null; - } - return { - 'fmt': value.fmt, - 'has_time': value.hasTime, - 'has_tz': value.hasTz, - }; -} diff --git a/typescript/dist/esm/models/GdalMetadataNetCdfCf.d.ts b/typescript/dist/esm/models/GdalMetadataNetCdfCf.d.ts index 2105357e..d24c38e2 100644 --- a/typescript/dist/esm/models/GdalMetadataNetCdfCf.d.ts +++ b/typescript/dist/esm/models/GdalMetadataNetCdfCf.d.ts @@ -72,7 +72,7 @@ export interface GdalMetadataNetCdfCf { * @export */ export declare const GdalMetadataNetCdfCfTypeEnum: { - readonly GdalMetadataNetCdfCf: "GdalMetadataNetCdfCf"; + readonly GdalMetaDataNetCdfCf: "GdalMetaDataNetCdfCf"; }; export type GdalMetadataNetCdfCfTypeEnum = typeof GdalMetadataNetCdfCfTypeEnum[keyof typeof GdalMetadataNetCdfCfTypeEnum]; /** diff --git a/typescript/dist/esm/models/GdalMetadataNetCdfCf.js b/typescript/dist/esm/models/GdalMetadataNetCdfCf.js index aefd5a98..fd26ce41 100644 --- a/typescript/dist/esm/models/GdalMetadataNetCdfCf.js +++ b/typescript/dist/esm/models/GdalMetadataNetCdfCf.js @@ -18,7 +18,7 @@ import { GdalDatasetParametersFromJSON, GdalDatasetParametersToJSON, } from './G * @export */ export const GdalMetadataNetCdfCfTypeEnum = { - GdalMetadataNetCdfCf: 'GdalMetadataNetCdfCf' + GdalMetaDataNetCdfCf: 'GdalMetaDataNetCdfCf' }; /** * Check if a given object implements the GdalMetadataNetCdfCf interface. diff --git a/typescript/dist/esm/models/IdResponse.d.ts b/typescript/dist/esm/models/IdResponse.d.ts new file mode 100644 index 00000000..9ef5bbfd --- /dev/null +++ b/typescript/dist/esm/models/IdResponse.d.ts @@ -0,0 +1,32 @@ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.0 + * Contact: dev@geoengine.de + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +/** + * + * @export + * @interface IdResponse + */ +export interface IdResponse { + /** + * + * @type {string} + * @memberof IdResponse + */ + id: string; +} +/** + * Check if a given object implements the IdResponse interface. + */ +export declare function instanceOfIdResponse(value: object): value is IdResponse; +export declare function IdResponseFromJSON(json: any): IdResponse; +export declare function IdResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): IdResponse; +export declare function IdResponseToJSON(json: any): IdResponse; +export declare function IdResponseToJSONTyped(value?: IdResponse | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/AddCollection200Response.js b/typescript/dist/esm/models/IdResponse.js similarity index 57% rename from typescript/dist/esm/models/AddCollection200Response.js rename to typescript/dist/esm/models/IdResponse.js index a3a51abe..35f98030 100644 --- a/typescript/dist/esm/models/AddCollection200Response.js +++ b/typescript/dist/esm/models/IdResponse.js @@ -12,17 +12,17 @@ * Do not edit the class manually. */ /** - * Check if a given object implements the AddCollection200Response interface. + * Check if a given object implements the IdResponse interface. */ -export function instanceOfAddCollection200Response(value) { +export function instanceOfIdResponse(value) { if (!('id' in value) || value['id'] === undefined) return false; return true; } -export function AddCollection200ResponseFromJSON(json) { - return AddCollection200ResponseFromJSONTyped(json, false); +export function IdResponseFromJSON(json) { + return IdResponseFromJSONTyped(json, false); } -export function AddCollection200ResponseFromJSONTyped(json, ignoreDiscriminator) { +export function IdResponseFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } @@ -30,10 +30,10 @@ export function AddCollection200ResponseFromJSONTyped(json, ignoreDiscriminator) 'id': json['id'], }; } -export function AddCollection200ResponseToJSON(json) { - return AddCollection200ResponseToJSONTyped(json, false); +export function IdResponseToJSON(json) { + return IdResponseToJSONTyped(json, false); } -export function AddCollection200ResponseToJSONTyped(value, ignoreDiscriminator = false) { +export function IdResponseToJSONTyped(value, ignoreDiscriminator = false) { if (value == null) { return value; } diff --git a/typescript/dist/esm/models/InlineObject.d.ts b/typescript/dist/esm/models/InlineObject.d.ts deleted file mode 100644 index ac0931b0..00000000 --- a/typescript/dist/esm/models/InlineObject.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface InlineObject - */ -export interface InlineObject { - /** - * - * @type {string} - * @memberof InlineObject - */ - url: string; -} -/** - * Check if a given object implements the InlineObject interface. - */ -export declare function instanceOfInlineObject(value: object): value is InlineObject; -export declare function InlineObjectFromJSON(json: any): InlineObject; -export declare function InlineObjectFromJSONTyped(json: any, ignoreDiscriminator: boolean): InlineObject; -export declare function InlineObjectToJSON(json: any): InlineObject; -export declare function InlineObjectToJSONTyped(value?: InlineObject | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/InlineObject.js b/typescript/dist/esm/models/InlineObject.js deleted file mode 100644 index 6a372a1b..00000000 --- a/typescript/dist/esm/models/InlineObject.js +++ /dev/null @@ -1,43 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * Check if a given object implements the InlineObject interface. - */ -export function instanceOfInlineObject(value) { - if (!('url' in value) || value['url'] === undefined) - return false; - return true; -} -export function InlineObjectFromJSON(json) { - return InlineObjectFromJSONTyped(json, false); -} -export function InlineObjectFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'url': json['url'], - }; -} -export function InlineObjectToJSON(json) { - return InlineObjectToJSONTyped(json, false); -} -export function InlineObjectToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'url': value['url'], - }; -} diff --git a/typescript/dist/esm/models/LayerUpdate.d.ts b/typescript/dist/esm/models/LayerUpdate.d.ts deleted file mode 100644 index fc0d7a88..00000000 --- a/typescript/dist/esm/models/LayerUpdate.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -import type { ProjectLayer } from './ProjectLayer'; -import type { ProjectUpdateToken } from './ProjectUpdateToken'; -/** - * @type LayerUpdate - * - * @export - */ -export type LayerUpdate = ProjectLayer | ProjectUpdateToken; -export declare function LayerUpdateFromJSON(json: any): LayerUpdate; -export declare function LayerUpdateFromJSONTyped(json: any, ignoreDiscriminator: boolean): LayerUpdate; -export declare function LayerUpdateToJSON(json: any): any; -export declare function LayerUpdateToJSONTyped(value?: LayerUpdate | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/LayerUpdate.js b/typescript/dist/esm/models/LayerUpdate.js deleted file mode 100644 index 3a13fbb7..00000000 --- a/typescript/dist/esm/models/LayerUpdate.js +++ /dev/null @@ -1,45 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -import { instanceOfProjectLayer, ProjectLayerFromJSONTyped, ProjectLayerToJSON, } from './ProjectLayer'; -import { instanceOfProjectUpdateToken, ProjectUpdateTokenFromJSONTyped, ProjectUpdateTokenToJSON, } from './ProjectUpdateToken'; -export function LayerUpdateFromJSON(json) { - return LayerUpdateFromJSONTyped(json, false); -} -export function LayerUpdateFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - if (instanceOfProjectLayer(json)) { - return ProjectLayerFromJSONTyped(json, true); - } - if (instanceOfProjectUpdateToken(json)) { - return ProjectUpdateTokenFromJSONTyped(json, true); - } - return {}; -} -export function LayerUpdateToJSON(json) { - return LayerUpdateToJSONTyped(json, false); -} -export function LayerUpdateToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - if (typeof value === 'object' && instanceOfProjectLayer(value)) { - return ProjectLayerToJSON(value); - } - if (instanceOfProjectUpdateToken(value)) { - return ProjectUpdateTokenToJSON(value); - } - return {}; -} diff --git a/typescript/dist/esm/models/MetaDataDefinition.d.ts b/typescript/dist/esm/models/MetaDataDefinition.d.ts index f1f5da52..89e767ee 100644 --- a/typescript/dist/esm/models/MetaDataDefinition.d.ts +++ b/typescript/dist/esm/models/MetaDataDefinition.d.ts @@ -23,10 +23,10 @@ import type { OgrMetaData } from './OgrMetaData'; export type MetaDataDefinition = { type: 'GdalMetaDataList'; } & GdalMetaDataList | { + type: 'GdalMetaDataNetCdfCf'; +} & GdalMetadataNetCdfCf | { type: 'GdalMetaDataRegular'; } & GdalMetaDataRegular | { - type: 'GdalMetadataNetCdfCf'; -} & GdalMetadataNetCdfCf | { type: 'GdalStatic'; } & GdalMetaDataStatic | { type: 'MockMetaData'; diff --git a/typescript/dist/esm/models/MetaDataDefinition.js b/typescript/dist/esm/models/MetaDataDefinition.js index e2ea6dc7..291cbc25 100644 --- a/typescript/dist/esm/models/MetaDataDefinition.js +++ b/typescript/dist/esm/models/MetaDataDefinition.js @@ -27,10 +27,10 @@ export function MetaDataDefinitionFromJSONTyped(json, ignoreDiscriminator) { switch (json['type']) { case 'GdalMetaDataList': return Object.assign({}, GdalMetaDataListFromJSONTyped(json, true), { type: 'GdalMetaDataList' }); + case 'GdalMetaDataNetCdfCf': + return Object.assign({}, GdalMetadataNetCdfCfFromJSONTyped(json, true), { type: 'GdalMetaDataNetCdfCf' }); case 'GdalMetaDataRegular': return Object.assign({}, GdalMetaDataRegularFromJSONTyped(json, true), { type: 'GdalMetaDataRegular' }); - case 'GdalMetadataNetCdfCf': - return Object.assign({}, GdalMetadataNetCdfCfFromJSONTyped(json, true), { type: 'GdalMetadataNetCdfCf' }); case 'GdalStatic': return Object.assign({}, GdalMetaDataStaticFromJSONTyped(json, true), { type: 'GdalStatic' }); case 'MockMetaData': @@ -51,10 +51,10 @@ export function MetaDataDefinitionToJSONTyped(value, ignoreDiscriminator = false switch (value['type']) { case 'GdalMetaDataList': return Object.assign({}, GdalMetaDataListToJSON(value), { type: 'GdalMetaDataList' }); + case 'GdalMetaDataNetCdfCf': + return Object.assign({}, GdalMetadataNetCdfCfToJSON(value), { type: 'GdalMetaDataNetCdfCf' }); case 'GdalMetaDataRegular': return Object.assign({}, GdalMetaDataRegularToJSON(value), { type: 'GdalMetaDataRegular' }); - case 'GdalMetadataNetCdfCf': - return Object.assign({}, GdalMetadataNetCdfCfToJSON(value), { type: 'GdalMetadataNetCdfCf' }); case 'GdalStatic': return Object.assign({}, GdalMetaDataStaticToJSON(value), { type: 'GdalStatic' }); case 'MockMetaData': diff --git a/typescript/dist/esm/models/NumberParam.d.ts b/typescript/dist/esm/models/NumberParam.d.ts index b142db7b..5d01c672 100644 --- a/typescript/dist/esm/models/NumberParam.d.ts +++ b/typescript/dist/esm/models/NumberParam.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import type { DerivedNumber } from './DerivedNumber'; -import type { StaticNumberParam } from './StaticNumberParam'; +import type { StaticNumber } from './StaticNumber'; /** * @type NumberParam * @@ -20,7 +20,7 @@ export type NumberParam = { type: 'derived'; } & DerivedNumber | { type: 'static'; -} & StaticNumberParam; +} & StaticNumber; export declare function NumberParamFromJSON(json: any): NumberParam; export declare function NumberParamFromJSONTyped(json: any, ignoreDiscriminator: boolean): NumberParam; export declare function NumberParamToJSON(json: any): any; diff --git a/typescript/dist/esm/models/NumberParam.js b/typescript/dist/esm/models/NumberParam.js index c93dcead..794392a5 100644 --- a/typescript/dist/esm/models/NumberParam.js +++ b/typescript/dist/esm/models/NumberParam.js @@ -12,7 +12,7 @@ * Do not edit the class manually. */ import { DerivedNumberFromJSONTyped, DerivedNumberToJSON, } from './DerivedNumber'; -import { StaticNumberParamFromJSONTyped, StaticNumberParamToJSON, } from './StaticNumberParam'; +import { StaticNumberFromJSONTyped, StaticNumberToJSON, } from './StaticNumber'; export function NumberParamFromJSON(json) { return NumberParamFromJSONTyped(json, false); } @@ -24,7 +24,7 @@ export function NumberParamFromJSONTyped(json, ignoreDiscriminator) { case 'derived': return Object.assign({}, DerivedNumberFromJSONTyped(json, true), { type: 'derived' }); case 'static': - return Object.assign({}, StaticNumberParamFromJSONTyped(json, true), { type: 'static' }); + return Object.assign({}, StaticNumberFromJSONTyped(json, true), { type: 'static' }); default: throw new Error(`No variant of NumberParam exists with 'type=${json['type']}'`); } @@ -40,7 +40,7 @@ export function NumberParamToJSONTyped(value, ignoreDiscriminator = false) { case 'derived': return Object.assign({}, DerivedNumberToJSON(value), { type: 'derived' }); case 'static': - return Object.assign({}, StaticNumberParamToJSON(value), { type: 'static' }); + return Object.assign({}, StaticNumberToJSON(value), { type: 'static' }); default: throw new Error(`No variant of NumberParam exists with 'type=${value['type']}'`); } diff --git a/typescript/dist/esm/models/OgrSourceColumnSpec.d.ts b/typescript/dist/esm/models/OgrSourceColumnSpec.d.ts index 07ea4385..f585865a 100644 --- a/typescript/dist/esm/models/OgrSourceColumnSpec.d.ts +++ b/typescript/dist/esm/models/OgrSourceColumnSpec.d.ts @@ -53,7 +53,7 @@ export interface OgrSourceColumnSpec { */ rename?: { [key: string]: string; - } | null; + }; /** * * @type {Array} diff --git a/typescript/dist/esm/models/OgrSourceDurationSpecValue.d.ts b/typescript/dist/esm/models/OgrSourceDurationSpecValue.d.ts index 1eb1a2f0..12063e42 100644 --- a/typescript/dist/esm/models/OgrSourceDurationSpecValue.d.ts +++ b/typescript/dist/esm/models/OgrSourceDurationSpecValue.d.ts @@ -9,25 +9,13 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { TimeGranularity } from './TimeGranularity'; +import type { TimeStep } from './TimeStep'; /** * * @export * @interface OgrSourceDurationSpecValue */ -export interface OgrSourceDurationSpecValue { - /** - * - * @type {TimeGranularity} - * @memberof OgrSourceDurationSpecValue - */ - granularity: TimeGranularity; - /** - * - * @type {number} - * @memberof OgrSourceDurationSpecValue - */ - step: number; +export interface OgrSourceDurationSpecValue extends TimeStep { /** * * @type {string} diff --git a/typescript/dist/esm/models/OgrSourceDurationSpecValue.js b/typescript/dist/esm/models/OgrSourceDurationSpecValue.js index 3ff8ab78..16fe682e 100644 --- a/typescript/dist/esm/models/OgrSourceDurationSpecValue.js +++ b/typescript/dist/esm/models/OgrSourceDurationSpecValue.js @@ -11,7 +11,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { TimeGranularityFromJSON, TimeGranularityToJSON, } from './TimeGranularity'; +import { TimeStepFromJSONTyped, TimeStepToJSONTyped, } from './TimeStep'; /** * @export */ @@ -22,10 +22,6 @@ export const OgrSourceDurationSpecValueTypeEnum = { * Check if a given object implements the OgrSourceDurationSpecValue interface. */ export function instanceOfOgrSourceDurationSpecValue(value) { - if (!('granularity' in value) || value['granularity'] === undefined) - return false; - if (!('step' in value) || value['step'] === undefined) - return false; if (!('type' in value) || value['type'] === undefined) return false; return true; @@ -37,11 +33,7 @@ export function OgrSourceDurationSpecValueFromJSONTyped(json, ignoreDiscriminato if (json == null) { return json; } - return { - 'granularity': TimeGranularityFromJSON(json['granularity']), - 'step': json['step'], - 'type': json['type'], - }; + return Object.assign(Object.assign({}, TimeStepFromJSONTyped(json, true)), { 'type': json['type'] }); } export function OgrSourceDurationSpecValueToJSON(json) { return OgrSourceDurationSpecValueToJSONTyped(json, false); @@ -50,9 +42,5 @@ export function OgrSourceDurationSpecValueToJSONTyped(value, ignoreDiscriminator if (value == null) { return value; } - return { - 'granularity': TimeGranularityToJSON(value['granularity']), - 'step': value['step'], - 'type': value['type'], - }; + return Object.assign(Object.assign({}, TimeStepToJSONTyped(value, true)), { 'type': value['type'] }); } diff --git a/typescript/dist/esm/models/RasterDatasetFromWorkflow.d.ts b/typescript/dist/esm/models/RasterDatasetFromWorkflow.d.ts index 33426d0c..42b64948 100644 --- a/typescript/dist/esm/models/RasterDatasetFromWorkflow.d.ts +++ b/typescript/dist/esm/models/RasterDatasetFromWorkflow.d.ts @@ -39,7 +39,7 @@ export interface RasterDatasetFromWorkflow { * @type {string} * @memberof RasterDatasetFromWorkflow */ - name?: string | null; + name?: string; /** * * @type {RasterQueryRectangle} diff --git a/typescript/dist/esm/models/Resource.d.ts b/typescript/dist/esm/models/Resource.d.ts index 524dd463..ce2e18ec 100644 --- a/typescript/dist/esm/models/Resource.d.ts +++ b/typescript/dist/esm/models/Resource.d.ts @@ -16,7 +16,7 @@ import type { MlModelResource } from './MlModelResource'; import type { ProjectResource } from './ProjectResource'; /** * @type Resource - * + * A resource that is affected by a permission. * @export */ export type Resource = { diff --git a/typescript/dist/esm/models/ResourceId.d.ts b/typescript/dist/esm/models/ResourceId.d.ts deleted file mode 100644 index 8080fd6f..00000000 --- a/typescript/dist/esm/models/ResourceId.d.ts +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -import type { ResourceIdDatasetId } from './ResourceIdDatasetId'; -import type { ResourceIdLayer } from './ResourceIdLayer'; -import type { ResourceIdLayerCollection } from './ResourceIdLayerCollection'; -import type { ResourceIdMlModel } from './ResourceIdMlModel'; -import type { ResourceIdProject } from './ResourceIdProject'; -/** - * @type ResourceId - * - * @export - */ -export type ResourceId = { - type: 'DatasetId'; -} & ResourceIdDatasetId | { - type: 'Layer'; -} & ResourceIdLayer | { - type: 'LayerCollection'; -} & ResourceIdLayerCollection | { - type: 'MlModel'; -} & ResourceIdMlModel | { - type: 'Project'; -} & ResourceIdProject; -export declare function ResourceIdFromJSON(json: any): ResourceId; -export declare function ResourceIdFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceId; -export declare function ResourceIdToJSON(json: any): any; -export declare function ResourceIdToJSONTyped(value?: ResourceId | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/ResourceId.js b/typescript/dist/esm/models/ResourceId.js deleted file mode 100644 index 3296febd..00000000 --- a/typescript/dist/esm/models/ResourceId.js +++ /dev/null @@ -1,62 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -import { ResourceIdDatasetIdFromJSONTyped, ResourceIdDatasetIdToJSON, } from './ResourceIdDatasetId'; -import { ResourceIdLayerFromJSONTyped, ResourceIdLayerToJSON, } from './ResourceIdLayer'; -import { ResourceIdLayerCollectionFromJSONTyped, ResourceIdLayerCollectionToJSON, } from './ResourceIdLayerCollection'; -import { ResourceIdMlModelFromJSONTyped, ResourceIdMlModelToJSON, } from './ResourceIdMlModel'; -import { ResourceIdProjectFromJSONTyped, ResourceIdProjectToJSON, } from './ResourceIdProject'; -export function ResourceIdFromJSON(json) { - return ResourceIdFromJSONTyped(json, false); -} -export function ResourceIdFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - switch (json['type']) { - case 'DatasetId': - return Object.assign({}, ResourceIdDatasetIdFromJSONTyped(json, true), { type: 'DatasetId' }); - case 'Layer': - return Object.assign({}, ResourceIdLayerFromJSONTyped(json, true), { type: 'Layer' }); - case 'LayerCollection': - return Object.assign({}, ResourceIdLayerCollectionFromJSONTyped(json, true), { type: 'LayerCollection' }); - case 'MlModel': - return Object.assign({}, ResourceIdMlModelFromJSONTyped(json, true), { type: 'MlModel' }); - case 'Project': - return Object.assign({}, ResourceIdProjectFromJSONTyped(json, true), { type: 'Project' }); - default: - throw new Error(`No variant of ResourceId exists with 'type=${json['type']}'`); - } -} -export function ResourceIdToJSON(json) { - return ResourceIdToJSONTyped(json, false); -} -export function ResourceIdToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - switch (value['type']) { - case 'DatasetId': - return Object.assign({}, ResourceIdDatasetIdToJSON(value), { type: 'DatasetId' }); - case 'Layer': - return Object.assign({}, ResourceIdLayerToJSON(value), { type: 'Layer' }); - case 'LayerCollection': - return Object.assign({}, ResourceIdLayerCollectionToJSON(value), { type: 'LayerCollection' }); - case 'MlModel': - return Object.assign({}, ResourceIdMlModelToJSON(value), { type: 'MlModel' }); - case 'Project': - return Object.assign({}, ResourceIdProjectToJSON(value), { type: 'Project' }); - default: - throw new Error(`No variant of ResourceId exists with 'type=${value['type']}'`); - } -} diff --git a/typescript/dist/esm/models/ResourceIdDatasetId.d.ts b/typescript/dist/esm/models/ResourceIdDatasetId.d.ts deleted file mode 100644 index 9d2b4942..00000000 --- a/typescript/dist/esm/models/ResourceIdDatasetId.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface ResourceIdDatasetId - */ -export interface ResourceIdDatasetId { - /** - * - * @type {string} - * @memberof ResourceIdDatasetId - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdDatasetId - */ - type: ResourceIdDatasetIdTypeEnum; -} -/** - * @export - */ -export declare const ResourceIdDatasetIdTypeEnum: { - readonly DatasetId: "DatasetId"; -}; -export type ResourceIdDatasetIdTypeEnum = typeof ResourceIdDatasetIdTypeEnum[keyof typeof ResourceIdDatasetIdTypeEnum]; -/** - * Check if a given object implements the ResourceIdDatasetId interface. - */ -export declare function instanceOfResourceIdDatasetId(value: object): value is ResourceIdDatasetId; -export declare function ResourceIdDatasetIdFromJSON(json: any): ResourceIdDatasetId; -export declare function ResourceIdDatasetIdFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdDatasetId; -export declare function ResourceIdDatasetIdToJSON(json: any): ResourceIdDatasetId; -export declare function ResourceIdDatasetIdToJSONTyped(value?: ResourceIdDatasetId | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/ResourceIdDatasetId.js b/typescript/dist/esm/models/ResourceIdDatasetId.js deleted file mode 100644 index 7c48aafc..00000000 --- a/typescript/dist/esm/models/ResourceIdDatasetId.js +++ /dev/null @@ -1,53 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * @export - */ -export const ResourceIdDatasetIdTypeEnum = { - DatasetId: 'DatasetId' -}; -/** - * Check if a given object implements the ResourceIdDatasetId interface. - */ -export function instanceOfResourceIdDatasetId(value) { - if (!('id' in value) || value['id'] === undefined) - return false; - if (!('type' in value) || value['type'] === undefined) - return false; - return true; -} -export function ResourceIdDatasetIdFromJSON(json) { - return ResourceIdDatasetIdFromJSONTyped(json, false); -} -export function ResourceIdDatasetIdFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'id': json['id'], - 'type': json['type'], - }; -} -export function ResourceIdDatasetIdToJSON(json) { - return ResourceIdDatasetIdToJSONTyped(json, false); -} -export function ResourceIdDatasetIdToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'id': value['id'], - 'type': value['type'], - }; -} diff --git a/typescript/dist/esm/models/ResourceIdLayer.d.ts b/typescript/dist/esm/models/ResourceIdLayer.d.ts deleted file mode 100644 index d68024e6..00000000 --- a/typescript/dist/esm/models/ResourceIdLayer.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface ResourceIdLayer - */ -export interface ResourceIdLayer { - /** - * - * @type {string} - * @memberof ResourceIdLayer - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdLayer - */ - type: ResourceIdLayerTypeEnum; -} -/** - * @export - */ -export declare const ResourceIdLayerTypeEnum: { - readonly Layer: "Layer"; -}; -export type ResourceIdLayerTypeEnum = typeof ResourceIdLayerTypeEnum[keyof typeof ResourceIdLayerTypeEnum]; -/** - * Check if a given object implements the ResourceIdLayer interface. - */ -export declare function instanceOfResourceIdLayer(value: object): value is ResourceIdLayer; -export declare function ResourceIdLayerFromJSON(json: any): ResourceIdLayer; -export declare function ResourceIdLayerFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdLayer; -export declare function ResourceIdLayerToJSON(json: any): ResourceIdLayer; -export declare function ResourceIdLayerToJSONTyped(value?: ResourceIdLayer | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/ResourceIdLayer.js b/typescript/dist/esm/models/ResourceIdLayer.js deleted file mode 100644 index 8c5dbdbf..00000000 --- a/typescript/dist/esm/models/ResourceIdLayer.js +++ /dev/null @@ -1,53 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * @export - */ -export const ResourceIdLayerTypeEnum = { - Layer: 'Layer' -}; -/** - * Check if a given object implements the ResourceIdLayer interface. - */ -export function instanceOfResourceIdLayer(value) { - if (!('id' in value) || value['id'] === undefined) - return false; - if (!('type' in value) || value['type'] === undefined) - return false; - return true; -} -export function ResourceIdLayerFromJSON(json) { - return ResourceIdLayerFromJSONTyped(json, false); -} -export function ResourceIdLayerFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'id': json['id'], - 'type': json['type'], - }; -} -export function ResourceIdLayerToJSON(json) { - return ResourceIdLayerToJSONTyped(json, false); -} -export function ResourceIdLayerToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'id': value['id'], - 'type': value['type'], - }; -} diff --git a/typescript/dist/esm/models/ResourceIdLayerCollection.d.ts b/typescript/dist/esm/models/ResourceIdLayerCollection.d.ts deleted file mode 100644 index 51e94abb..00000000 --- a/typescript/dist/esm/models/ResourceIdLayerCollection.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface ResourceIdLayerCollection - */ -export interface ResourceIdLayerCollection { - /** - * - * @type {string} - * @memberof ResourceIdLayerCollection - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdLayerCollection - */ - type: ResourceIdLayerCollectionTypeEnum; -} -/** - * @export - */ -export declare const ResourceIdLayerCollectionTypeEnum: { - readonly LayerCollection: "LayerCollection"; -}; -export type ResourceIdLayerCollectionTypeEnum = typeof ResourceIdLayerCollectionTypeEnum[keyof typeof ResourceIdLayerCollectionTypeEnum]; -/** - * Check if a given object implements the ResourceIdLayerCollection interface. - */ -export declare function instanceOfResourceIdLayerCollection(value: object): value is ResourceIdLayerCollection; -export declare function ResourceIdLayerCollectionFromJSON(json: any): ResourceIdLayerCollection; -export declare function ResourceIdLayerCollectionFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdLayerCollection; -export declare function ResourceIdLayerCollectionToJSON(json: any): ResourceIdLayerCollection; -export declare function ResourceIdLayerCollectionToJSONTyped(value?: ResourceIdLayerCollection | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/ResourceIdLayerCollection.js b/typescript/dist/esm/models/ResourceIdLayerCollection.js deleted file mode 100644 index 18b0c0c5..00000000 --- a/typescript/dist/esm/models/ResourceIdLayerCollection.js +++ /dev/null @@ -1,53 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * @export - */ -export const ResourceIdLayerCollectionTypeEnum = { - LayerCollection: 'LayerCollection' -}; -/** - * Check if a given object implements the ResourceIdLayerCollection interface. - */ -export function instanceOfResourceIdLayerCollection(value) { - if (!('id' in value) || value['id'] === undefined) - return false; - if (!('type' in value) || value['type'] === undefined) - return false; - return true; -} -export function ResourceIdLayerCollectionFromJSON(json) { - return ResourceIdLayerCollectionFromJSONTyped(json, false); -} -export function ResourceIdLayerCollectionFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'id': json['id'], - 'type': json['type'], - }; -} -export function ResourceIdLayerCollectionToJSON(json) { - return ResourceIdLayerCollectionToJSONTyped(json, false); -} -export function ResourceIdLayerCollectionToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'id': value['id'], - 'type': value['type'], - }; -} diff --git a/typescript/dist/esm/models/ResourceIdMlModel.d.ts b/typescript/dist/esm/models/ResourceIdMlModel.d.ts deleted file mode 100644 index a7e47a2a..00000000 --- a/typescript/dist/esm/models/ResourceIdMlModel.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface ResourceIdMlModel - */ -export interface ResourceIdMlModel { - /** - * - * @type {string} - * @memberof ResourceIdMlModel - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdMlModel - */ - type: ResourceIdMlModelTypeEnum; -} -/** - * @export - */ -export declare const ResourceIdMlModelTypeEnum: { - readonly MlModel: "MlModel"; -}; -export type ResourceIdMlModelTypeEnum = typeof ResourceIdMlModelTypeEnum[keyof typeof ResourceIdMlModelTypeEnum]; -/** - * Check if a given object implements the ResourceIdMlModel interface. - */ -export declare function instanceOfResourceIdMlModel(value: object): value is ResourceIdMlModel; -export declare function ResourceIdMlModelFromJSON(json: any): ResourceIdMlModel; -export declare function ResourceIdMlModelFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdMlModel; -export declare function ResourceIdMlModelToJSON(json: any): ResourceIdMlModel; -export declare function ResourceIdMlModelToJSONTyped(value?: ResourceIdMlModel | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/ResourceIdMlModel.js b/typescript/dist/esm/models/ResourceIdMlModel.js deleted file mode 100644 index 5d0ab59b..00000000 --- a/typescript/dist/esm/models/ResourceIdMlModel.js +++ /dev/null @@ -1,53 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * @export - */ -export const ResourceIdMlModelTypeEnum = { - MlModel: 'MlModel' -}; -/** - * Check if a given object implements the ResourceIdMlModel interface. - */ -export function instanceOfResourceIdMlModel(value) { - if (!('id' in value) || value['id'] === undefined) - return false; - if (!('type' in value) || value['type'] === undefined) - return false; - return true; -} -export function ResourceIdMlModelFromJSON(json) { - return ResourceIdMlModelFromJSONTyped(json, false); -} -export function ResourceIdMlModelFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'id': json['id'], - 'type': json['type'], - }; -} -export function ResourceIdMlModelToJSON(json) { - return ResourceIdMlModelToJSONTyped(json, false); -} -export function ResourceIdMlModelToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'id': value['id'], - 'type': value['type'], - }; -} diff --git a/typescript/dist/esm/models/ResourceIdProject.d.ts b/typescript/dist/esm/models/ResourceIdProject.d.ts deleted file mode 100644 index ed026316..00000000 --- a/typescript/dist/esm/models/ResourceIdProject.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface ResourceIdProject - */ -export interface ResourceIdProject { - /** - * - * @type {string} - * @memberof ResourceIdProject - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdProject - */ - type: ResourceIdProjectTypeEnum; -} -/** - * @export - */ -export declare const ResourceIdProjectTypeEnum: { - readonly Project: "Project"; -}; -export type ResourceIdProjectTypeEnum = typeof ResourceIdProjectTypeEnum[keyof typeof ResourceIdProjectTypeEnum]; -/** - * Check if a given object implements the ResourceIdProject interface. - */ -export declare function instanceOfResourceIdProject(value: object): value is ResourceIdProject; -export declare function ResourceIdProjectFromJSON(json: any): ResourceIdProject; -export declare function ResourceIdProjectFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdProject; -export declare function ResourceIdProjectToJSON(json: any): ResourceIdProject; -export declare function ResourceIdProjectToJSONTyped(value?: ResourceIdProject | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/ResourceIdProject.js b/typescript/dist/esm/models/ResourceIdProject.js deleted file mode 100644 index 1719d01a..00000000 --- a/typescript/dist/esm/models/ResourceIdProject.js +++ /dev/null @@ -1,53 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * @export - */ -export const ResourceIdProjectTypeEnum = { - Project: 'Project' -}; -/** - * Check if a given object implements the ResourceIdProject interface. - */ -export function instanceOfResourceIdProject(value) { - if (!('id' in value) || value['id'] === undefined) - return false; - if (!('type' in value) || value['type'] === undefined) - return false; - return true; -} -export function ResourceIdProjectFromJSON(json) { - return ResourceIdProjectFromJSONTyped(json, false); -} -export function ResourceIdProjectFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'id': json['id'], - 'type': json['type'], - }; -} -export function ResourceIdProjectToJSON(json) { - return ResourceIdProjectToJSONTyped(json, false); -} -export function ResourceIdProjectToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'id': value['id'], - 'type': value['type'], - }; -} diff --git a/typescript/dist/esm/models/RgbaColorizer.d.ts b/typescript/dist/esm/models/RgbaColorizer.d.ts deleted file mode 100644 index fbe1a1ec..00000000 --- a/typescript/dist/esm/models/RgbaColorizer.d.ts +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Geo Engine Pro API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface RgbaColorizer - */ -export interface RgbaColorizer { - /** - * - * @type {string} - * @memberof RgbaColorizer - */ - type: RgbaColorizerTypeEnum; -} -/** - * @export - */ -export declare const RgbaColorizerTypeEnum: { - readonly Rgba: "rgba"; -}; -export type RgbaColorizerTypeEnum = typeof RgbaColorizerTypeEnum[keyof typeof RgbaColorizerTypeEnum]; -/** - * Check if a given object implements the RgbaColorizer interface. - */ -export declare function instanceOfRgbaColorizer(value: object): boolean; -export declare function RgbaColorizerFromJSON(json: any): RgbaColorizer; -export declare function RgbaColorizerFromJSONTyped(json: any, ignoreDiscriminator: boolean): RgbaColorizer; -export declare function RgbaColorizerToJSON(value?: RgbaColorizer | null): any; diff --git a/typescript/dist/esm/models/RgbaColorizer.js b/typescript/dist/esm/models/RgbaColorizer.js deleted file mode 100644 index 8e677401..00000000 --- a/typescript/dist/esm/models/RgbaColorizer.js +++ /dev/null @@ -1,49 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine Pro API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * @export - */ -export const RgbaColorizerTypeEnum = { - Rgba: 'rgba' -}; -/** - * Check if a given object implements the RgbaColorizer interface. - */ -export function instanceOfRgbaColorizer(value) { - let isInstance = true; - isInstance = isInstance && "type" in value; - return isInstance; -} -export function RgbaColorizerFromJSON(json) { - return RgbaColorizerFromJSONTyped(json, false); -} -export function RgbaColorizerFromJSONTyped(json, ignoreDiscriminator) { - if ((json === undefined) || (json === null)) { - return json; - } - return { - 'type': json['type'], - }; -} -export function RgbaColorizerToJSON(value) { - if (value === undefined) { - return undefined; - } - if (value === null) { - return null; - } - return { - 'type': value.type, - }; -} diff --git a/typescript/dist/esm/models/SpatialReferenceSpecification.d.ts b/typescript/dist/esm/models/SpatialReferenceSpecification.d.ts index 125610a4..3b20d2b4 100644 --- a/typescript/dist/esm/models/SpatialReferenceSpecification.d.ts +++ b/typescript/dist/esm/models/SpatialReferenceSpecification.d.ts @@ -23,7 +23,7 @@ export interface SpatialReferenceSpecification { * @type {Array} * @memberof SpatialReferenceSpecification */ - axisLabels?: Array | null; + axisLabels?: Array; /** * * @type {AxisOrder} diff --git a/typescript/dist/esm/models/StaticColor.d.ts b/typescript/dist/esm/models/StaticColor.d.ts new file mode 100644 index 00000000..9a04dea7 --- /dev/null +++ b/typescript/dist/esm/models/StaticColor.d.ts @@ -0,0 +1,45 @@ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.0 + * Contact: dev@geoengine.de + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +/** + * + * @export + * @interface StaticColor + */ +export interface StaticColor { + /** + * + * @type {Array} + * @memberof StaticColor + */ + color: Array; + /** + * + * @type {string} + * @memberof StaticColor + */ + type: StaticColorTypeEnum; +} +/** + * @export + */ +export declare const StaticColorTypeEnum: { + readonly Static: "static"; +}; +export type StaticColorTypeEnum = typeof StaticColorTypeEnum[keyof typeof StaticColorTypeEnum]; +/** + * Check if a given object implements the StaticColor interface. + */ +export declare function instanceOfStaticColor(value: object): value is StaticColor; +export declare function StaticColorFromJSON(json: any): StaticColor; +export declare function StaticColorFromJSONTyped(json: any, ignoreDiscriminator: boolean): StaticColor; +export declare function StaticColorToJSON(json: any): StaticColor; +export declare function StaticColorToJSONTyped(value?: StaticColor | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/ColorParamStatic.js b/typescript/dist/esm/models/StaticColor.js similarity index 63% rename from typescript/dist/esm/models/ColorParamStatic.js rename to typescript/dist/esm/models/StaticColor.js index 49ba126f..e044e9ee 100644 --- a/typescript/dist/esm/models/ColorParamStatic.js +++ b/typescript/dist/esm/models/StaticColor.js @@ -14,23 +14,23 @@ /** * @export */ -export const ColorParamStaticTypeEnum = { +export const StaticColorTypeEnum = { Static: 'static' }; /** - * Check if a given object implements the ColorParamStatic interface. + * Check if a given object implements the StaticColor interface. */ -export function instanceOfColorParamStatic(value) { +export function instanceOfStaticColor(value) { if (!('color' in value) || value['color'] === undefined) return false; if (!('type' in value) || value['type'] === undefined) return false; return true; } -export function ColorParamStaticFromJSON(json) { - return ColorParamStaticFromJSONTyped(json, false); +export function StaticColorFromJSON(json) { + return StaticColorFromJSONTyped(json, false); } -export function ColorParamStaticFromJSONTyped(json, ignoreDiscriminator) { +export function StaticColorFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } @@ -39,10 +39,10 @@ export function ColorParamStaticFromJSONTyped(json, ignoreDiscriminator) { 'type': json['type'], }; } -export function ColorParamStaticToJSON(json) { - return ColorParamStaticToJSONTyped(json, false); +export function StaticColorToJSON(json) { + return StaticColorToJSONTyped(json, false); } -export function ColorParamStaticToJSONTyped(value, ignoreDiscriminator = false) { +export function StaticColorToJSONTyped(value, ignoreDiscriminator = false) { if (value == null) { return value; } diff --git a/typescript/dist/esm/models/StaticNumber.d.ts b/typescript/dist/esm/models/StaticNumber.d.ts new file mode 100644 index 00000000..ed7c0b5d --- /dev/null +++ b/typescript/dist/esm/models/StaticNumber.d.ts @@ -0,0 +1,45 @@ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.0 + * Contact: dev@geoengine.de + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +/** + * + * @export + * @interface StaticNumber + */ +export interface StaticNumber { + /** + * + * @type {string} + * @memberof StaticNumber + */ + type: StaticNumberTypeEnum; + /** + * + * @type {number} + * @memberof StaticNumber + */ + value: number; +} +/** + * @export + */ +export declare const StaticNumberTypeEnum: { + readonly Static: "static"; +}; +export type StaticNumberTypeEnum = typeof StaticNumberTypeEnum[keyof typeof StaticNumberTypeEnum]; +/** + * Check if a given object implements the StaticNumber interface. + */ +export declare function instanceOfStaticNumber(value: object): value is StaticNumber; +export declare function StaticNumberFromJSON(json: any): StaticNumber; +export declare function StaticNumberFromJSONTyped(json: any, ignoreDiscriminator: boolean): StaticNumber; +export declare function StaticNumberToJSON(json: any): StaticNumber; +export declare function StaticNumberToJSONTyped(value?: StaticNumber | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/StaticNumberParam.js b/typescript/dist/esm/models/StaticNumber.js similarity index 63% rename from typescript/dist/esm/models/StaticNumberParam.js rename to typescript/dist/esm/models/StaticNumber.js index 4e633b5f..0fa5a087 100644 --- a/typescript/dist/esm/models/StaticNumberParam.js +++ b/typescript/dist/esm/models/StaticNumber.js @@ -14,23 +14,23 @@ /** * @export */ -export const StaticNumberParamTypeEnum = { +export const StaticNumberTypeEnum = { Static: 'static' }; /** - * Check if a given object implements the StaticNumberParam interface. + * Check if a given object implements the StaticNumber interface. */ -export function instanceOfStaticNumberParam(value) { +export function instanceOfStaticNumber(value) { if (!('type' in value) || value['type'] === undefined) return false; if (!('value' in value) || value['value'] === undefined) return false; return true; } -export function StaticNumberParamFromJSON(json) { - return StaticNumberParamFromJSONTyped(json, false); +export function StaticNumberFromJSON(json) { + return StaticNumberFromJSONTyped(json, false); } -export function StaticNumberParamFromJSONTyped(json, ignoreDiscriminator) { +export function StaticNumberFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } @@ -39,10 +39,10 @@ export function StaticNumberParamFromJSONTyped(json, ignoreDiscriminator) { 'value': json['value'], }; } -export function StaticNumberParamToJSON(json) { - return StaticNumberParamToJSONTyped(json, false); +export function StaticNumberToJSON(json) { + return StaticNumberToJSONTyped(json, false); } -export function StaticNumberParamToJSONTyped(value, ignoreDiscriminator = false) { +export function StaticNumberToJSONTyped(value, ignoreDiscriminator = false) { if (value == null) { return value; } diff --git a/typescript/dist/esm/models/StaticNumberParam.d.ts b/typescript/dist/esm/models/StaticNumberParam.d.ts deleted file mode 100644 index f09202f6..00000000 --- a/typescript/dist/esm/models/StaticNumberParam.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface StaticNumberParam - */ -export interface StaticNumberParam { - /** - * - * @type {string} - * @memberof StaticNumberParam - */ - type: StaticNumberParamTypeEnum; - /** - * - * @type {number} - * @memberof StaticNumberParam - */ - value: number; -} -/** - * @export - */ -export declare const StaticNumberParamTypeEnum: { - readonly Static: "static"; -}; -export type StaticNumberParamTypeEnum = typeof StaticNumberParamTypeEnum[keyof typeof StaticNumberParamTypeEnum]; -/** - * Check if a given object implements the StaticNumberParam interface. - */ -export declare function instanceOfStaticNumberParam(value: object): value is StaticNumberParam; -export declare function StaticNumberParamFromJSON(json: any): StaticNumberParam; -export declare function StaticNumberParamFromJSONTyped(json: any, ignoreDiscriminator: boolean): StaticNumberParam; -export declare function StaticNumberParamToJSON(json: any): StaticNumberParam; -export declare function StaticNumberParamToJSONTyped(value?: StaticNumberParam | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/TypedPlotResultDescriptor.d.ts b/typescript/dist/esm/models/TypedPlotResultDescriptor.d.ts index f98a5e4e..d7140281 100644 --- a/typescript/dist/esm/models/TypedPlotResultDescriptor.d.ts +++ b/typescript/dist/esm/models/TypedPlotResultDescriptor.d.ts @@ -9,32 +9,13 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { TimeInterval } from './TimeInterval'; -import type { BoundingBox2D } from './BoundingBox2D'; +import type { PlotResultDescriptor } from './PlotResultDescriptor'; /** - * A `ResultDescriptor` for plot queries + * * @export * @interface TypedPlotResultDescriptor */ -export interface TypedPlotResultDescriptor { - /** - * - * @type {BoundingBox2D} - * @memberof TypedPlotResultDescriptor - */ - bbox?: BoundingBox2D | null; - /** - * - * @type {string} - * @memberof TypedPlotResultDescriptor - */ - spatialReference: string; - /** - * - * @type {TimeInterval} - * @memberof TypedPlotResultDescriptor - */ - time?: TimeInterval | null; +export interface TypedPlotResultDescriptor extends PlotResultDescriptor { /** * * @type {string} diff --git a/typescript/dist/esm/models/TypedPlotResultDescriptor.js b/typescript/dist/esm/models/TypedPlotResultDescriptor.js index e23c6e48..101eaecb 100644 --- a/typescript/dist/esm/models/TypedPlotResultDescriptor.js +++ b/typescript/dist/esm/models/TypedPlotResultDescriptor.js @@ -11,8 +11,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { TimeIntervalFromJSON, TimeIntervalToJSON, } from './TimeInterval'; -import { BoundingBox2DFromJSON, BoundingBox2DToJSON, } from './BoundingBox2D'; +import { PlotResultDescriptorFromJSONTyped, PlotResultDescriptorToJSONTyped, } from './PlotResultDescriptor'; /** * @export */ @@ -23,8 +22,6 @@ export const TypedPlotResultDescriptorTypeEnum = { * Check if a given object implements the TypedPlotResultDescriptor interface. */ export function instanceOfTypedPlotResultDescriptor(value) { - if (!('spatialReference' in value) || value['spatialReference'] === undefined) - return false; if (!('type' in value) || value['type'] === undefined) return false; return true; @@ -36,12 +33,7 @@ export function TypedPlotResultDescriptorFromJSONTyped(json, ignoreDiscriminator if (json == null) { return json; } - return { - 'bbox': json['bbox'] == null ? undefined : BoundingBox2DFromJSON(json['bbox']), - 'spatialReference': json['spatialReference'], - 'time': json['time'] == null ? undefined : TimeIntervalFromJSON(json['time']), - 'type': json['type'], - }; + return Object.assign(Object.assign({}, PlotResultDescriptorFromJSONTyped(json, true)), { 'type': json['type'] }); } export function TypedPlotResultDescriptorToJSON(json) { return TypedPlotResultDescriptorToJSONTyped(json, false); @@ -50,10 +42,5 @@ export function TypedPlotResultDescriptorToJSONTyped(value, ignoreDiscriminator if (value == null) { return value; } - return { - 'bbox': BoundingBox2DToJSON(value['bbox']), - 'spatialReference': value['spatialReference'], - 'time': TimeIntervalToJSON(value['time']), - 'type': value['type'], - }; + return Object.assign(Object.assign({}, PlotResultDescriptorToJSONTyped(value, true)), { 'type': value['type'] }); } diff --git a/typescript/dist/esm/models/TypedRasterResultDescriptor.d.ts b/typescript/dist/esm/models/TypedRasterResultDescriptor.d.ts index b1b7d737..2e585e9b 100644 --- a/typescript/dist/esm/models/TypedRasterResultDescriptor.d.ts +++ b/typescript/dist/esm/models/TypedRasterResultDescriptor.d.ts @@ -9,53 +9,13 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { SpatialResolution } from './SpatialResolution'; -import type { TimeInterval } from './TimeInterval'; -import type { RasterBandDescriptor } from './RasterBandDescriptor'; -import type { RasterDataType } from './RasterDataType'; -import type { SpatialPartition2D } from './SpatialPartition2D'; +import type { RasterResultDescriptor } from './RasterResultDescriptor'; /** - * A `ResultDescriptor` for raster queries + * * @export * @interface TypedRasterResultDescriptor */ -export interface TypedRasterResultDescriptor { - /** - * - * @type {Array} - * @memberof TypedRasterResultDescriptor - */ - bands: Array; - /** - * - * @type {SpatialPartition2D} - * @memberof TypedRasterResultDescriptor - */ - bbox?: SpatialPartition2D | null; - /** - * - * @type {RasterDataType} - * @memberof TypedRasterResultDescriptor - */ - dataType: RasterDataType; - /** - * - * @type {SpatialResolution} - * @memberof TypedRasterResultDescriptor - */ - resolution?: SpatialResolution | null; - /** - * - * @type {string} - * @memberof TypedRasterResultDescriptor - */ - spatialReference: string; - /** - * - * @type {TimeInterval} - * @memberof TypedRasterResultDescriptor - */ - time?: TimeInterval | null; +export interface TypedRasterResultDescriptor extends RasterResultDescriptor { /** * * @type {string} diff --git a/typescript/dist/esm/models/TypedRasterResultDescriptor.js b/typescript/dist/esm/models/TypedRasterResultDescriptor.js index 0f141855..43534b0e 100644 --- a/typescript/dist/esm/models/TypedRasterResultDescriptor.js +++ b/typescript/dist/esm/models/TypedRasterResultDescriptor.js @@ -11,11 +11,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { SpatialResolutionFromJSON, SpatialResolutionToJSON, } from './SpatialResolution'; -import { TimeIntervalFromJSON, TimeIntervalToJSON, } from './TimeInterval'; -import { RasterBandDescriptorFromJSON, RasterBandDescriptorToJSON, } from './RasterBandDescriptor'; -import { RasterDataTypeFromJSON, RasterDataTypeToJSON, } from './RasterDataType'; -import { SpatialPartition2DFromJSON, SpatialPartition2DToJSON, } from './SpatialPartition2D'; +import { RasterResultDescriptorFromJSONTyped, RasterResultDescriptorToJSONTyped, } from './RasterResultDescriptor'; /** * @export */ @@ -26,12 +22,6 @@ export const TypedRasterResultDescriptorTypeEnum = { * Check if a given object implements the TypedRasterResultDescriptor interface. */ export function instanceOfTypedRasterResultDescriptor(value) { - if (!('bands' in value) || value['bands'] === undefined) - return false; - if (!('dataType' in value) || value['dataType'] === undefined) - return false; - if (!('spatialReference' in value) || value['spatialReference'] === undefined) - return false; if (!('type' in value) || value['type'] === undefined) return false; return true; @@ -43,15 +33,7 @@ export function TypedRasterResultDescriptorFromJSONTyped(json, ignoreDiscriminat if (json == null) { return json; } - return { - 'bands': (json['bands'].map(RasterBandDescriptorFromJSON)), - 'bbox': json['bbox'] == null ? undefined : SpatialPartition2DFromJSON(json['bbox']), - 'dataType': RasterDataTypeFromJSON(json['dataType']), - 'resolution': json['resolution'] == null ? undefined : SpatialResolutionFromJSON(json['resolution']), - 'spatialReference': json['spatialReference'], - 'time': json['time'] == null ? undefined : TimeIntervalFromJSON(json['time']), - 'type': json['type'], - }; + return Object.assign(Object.assign({}, RasterResultDescriptorFromJSONTyped(json, true)), { 'type': json['type'] }); } export function TypedRasterResultDescriptorToJSON(json) { return TypedRasterResultDescriptorToJSONTyped(json, false); @@ -60,13 +42,5 @@ export function TypedRasterResultDescriptorToJSONTyped(value, ignoreDiscriminato if (value == null) { return value; } - return { - 'bands': (value['bands'].map(RasterBandDescriptorToJSON)), - 'bbox': SpatialPartition2DToJSON(value['bbox']), - 'dataType': RasterDataTypeToJSON(value['dataType']), - 'resolution': SpatialResolutionToJSON(value['resolution']), - 'spatialReference': value['spatialReference'], - 'time': TimeIntervalToJSON(value['time']), - 'type': value['type'], - }; + return Object.assign(Object.assign({}, RasterResultDescriptorToJSONTyped(value, true)), { 'type': value['type'] }); } diff --git a/typescript/dist/esm/models/TypedVectorResultDescriptor.d.ts b/typescript/dist/esm/models/TypedVectorResultDescriptor.d.ts index a72f8495..fce3b3a9 100644 --- a/typescript/dist/esm/models/TypedVectorResultDescriptor.d.ts +++ b/typescript/dist/esm/models/TypedVectorResultDescriptor.d.ts @@ -9,48 +9,13 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { VectorDataType } from './VectorDataType'; -import type { TimeInterval } from './TimeInterval'; -import type { VectorColumnInfo } from './VectorColumnInfo'; -import type { BoundingBox2D } from './BoundingBox2D'; +import type { VectorResultDescriptor } from './VectorResultDescriptor'; /** * * @export * @interface TypedVectorResultDescriptor */ -export interface TypedVectorResultDescriptor { - /** - * - * @type {BoundingBox2D} - * @memberof TypedVectorResultDescriptor - */ - bbox?: BoundingBox2D | null; - /** - * - * @type {{ [key: string]: VectorColumnInfo; }} - * @memberof TypedVectorResultDescriptor - */ - columns: { - [key: string]: VectorColumnInfo; - }; - /** - * - * @type {VectorDataType} - * @memberof TypedVectorResultDescriptor - */ - dataType: VectorDataType; - /** - * - * @type {string} - * @memberof TypedVectorResultDescriptor - */ - spatialReference: string; - /** - * - * @type {TimeInterval} - * @memberof TypedVectorResultDescriptor - */ - time?: TimeInterval | null; +export interface TypedVectorResultDescriptor extends VectorResultDescriptor { /** * * @type {string} diff --git a/typescript/dist/esm/models/TypedVectorResultDescriptor.js b/typescript/dist/esm/models/TypedVectorResultDescriptor.js index fc72f007..17afa77b 100644 --- a/typescript/dist/esm/models/TypedVectorResultDescriptor.js +++ b/typescript/dist/esm/models/TypedVectorResultDescriptor.js @@ -11,11 +11,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { mapValues } from '../runtime'; -import { VectorDataTypeFromJSON, VectorDataTypeToJSON, } from './VectorDataType'; -import { TimeIntervalFromJSON, TimeIntervalToJSON, } from './TimeInterval'; -import { VectorColumnInfoFromJSON, VectorColumnInfoToJSON, } from './VectorColumnInfo'; -import { BoundingBox2DFromJSON, BoundingBox2DToJSON, } from './BoundingBox2D'; +import { VectorResultDescriptorFromJSONTyped, VectorResultDescriptorToJSONTyped, } from './VectorResultDescriptor'; /** * @export */ @@ -26,12 +22,6 @@ export const TypedVectorResultDescriptorTypeEnum = { * Check if a given object implements the TypedVectorResultDescriptor interface. */ export function instanceOfTypedVectorResultDescriptor(value) { - if (!('columns' in value) || value['columns'] === undefined) - return false; - if (!('dataType' in value) || value['dataType'] === undefined) - return false; - if (!('spatialReference' in value) || value['spatialReference'] === undefined) - return false; if (!('type' in value) || value['type'] === undefined) return false; return true; @@ -43,14 +33,7 @@ export function TypedVectorResultDescriptorFromJSONTyped(json, ignoreDiscriminat if (json == null) { return json; } - return { - 'bbox': json['bbox'] == null ? undefined : BoundingBox2DFromJSON(json['bbox']), - 'columns': (mapValues(json['columns'], VectorColumnInfoFromJSON)), - 'dataType': VectorDataTypeFromJSON(json['dataType']), - 'spatialReference': json['spatialReference'], - 'time': json['time'] == null ? undefined : TimeIntervalFromJSON(json['time']), - 'type': json['type'], - }; + return Object.assign(Object.assign({}, VectorResultDescriptorFromJSONTyped(json, true)), { 'type': json['type'] }); } export function TypedVectorResultDescriptorToJSON(json) { return TypedVectorResultDescriptorToJSONTyped(json, false); @@ -59,12 +42,5 @@ export function TypedVectorResultDescriptorToJSONTyped(value, ignoreDiscriminato if (value == null) { return value; } - return { - 'bbox': BoundingBox2DToJSON(value['bbox']), - 'columns': (mapValues(value['columns'], VectorColumnInfoToJSON)), - 'dataType': VectorDataTypeToJSON(value['dataType']), - 'spatialReference': value['spatialReference'], - 'time': TimeIntervalToJSON(value['time']), - 'type': value['type'], - }; + return Object.assign(Object.assign({}, VectorResultDescriptorToJSONTyped(value, true)), { 'type': value['type'] }); } diff --git a/typescript/dist/esm/models/UpdateProject.d.ts b/typescript/dist/esm/models/UpdateProject.d.ts index 53a9a8c8..092614ce 100644 --- a/typescript/dist/esm/models/UpdateProject.d.ts +++ b/typescript/dist/esm/models/UpdateProject.d.ts @@ -10,9 +10,8 @@ * Do not edit the class manually. */ import type { TimeStep } from './TimeStep'; -import type { PlotUpdate } from './PlotUpdate'; import type { STRectangle } from './STRectangle'; -import type { LayerUpdate } from './LayerUpdate'; +import type { VecUpdate } from './VecUpdate'; /** * * @export @@ -39,10 +38,10 @@ export interface UpdateProject { id: string; /** * - * @type {Array} + * @type {Array} * @memberof UpdateProject */ - layers?: Array | null; + layers?: Array | null; /** * * @type {string} @@ -51,10 +50,10 @@ export interface UpdateProject { name?: string | null; /** * - * @type {Array} + * @type {Array} * @memberof UpdateProject */ - plots?: Array | null; + plots?: Array | null; /** * * @type {TimeStep} diff --git a/typescript/dist/esm/models/UpdateProject.js b/typescript/dist/esm/models/UpdateProject.js index 4b66d697..99adeed6 100644 --- a/typescript/dist/esm/models/UpdateProject.js +++ b/typescript/dist/esm/models/UpdateProject.js @@ -12,9 +12,8 @@ * Do not edit the class manually. */ import { TimeStepFromJSON, TimeStepToJSON, } from './TimeStep'; -import { PlotUpdateFromJSON, PlotUpdateToJSON, } from './PlotUpdate'; import { STRectangleFromJSON, STRectangleToJSON, } from './STRectangle'; -import { LayerUpdateFromJSON, LayerUpdateToJSON, } from './LayerUpdate'; +import { VecUpdateFromJSON, VecUpdateToJSON, } from './VecUpdate'; /** * Check if a given object implements the UpdateProject interface. */ @@ -34,9 +33,9 @@ export function UpdateProjectFromJSONTyped(json, ignoreDiscriminator) { 'bounds': json['bounds'] == null ? undefined : STRectangleFromJSON(json['bounds']), 'description': json['description'] == null ? undefined : json['description'], 'id': json['id'], - 'layers': json['layers'] == null ? undefined : (json['layers'].map(LayerUpdateFromJSON)), + 'layers': json['layers'] == null ? undefined : (json['layers'].map(VecUpdateFromJSON)), 'name': json['name'] == null ? undefined : json['name'], - 'plots': json['plots'] == null ? undefined : (json['plots'].map(PlotUpdateFromJSON)), + 'plots': json['plots'] == null ? undefined : (json['plots'].map(VecUpdateFromJSON)), 'timeStep': json['timeStep'] == null ? undefined : TimeStepFromJSON(json['timeStep']), }; } @@ -51,9 +50,9 @@ export function UpdateProjectToJSONTyped(value, ignoreDiscriminator = false) { 'bounds': STRectangleToJSON(value['bounds']), 'description': value['description'], 'id': value['id'], - 'layers': value['layers'] == null ? undefined : (value['layers'].map(LayerUpdateToJSON)), + 'layers': value['layers'] == null ? undefined : (value['layers'].map(VecUpdateToJSON)), 'name': value['name'], - 'plots': value['plots'] == null ? undefined : (value['plots'].map(PlotUpdateToJSON)), + 'plots': value['plots'] == null ? undefined : (value['plots'].map(VecUpdateToJSON)), 'timeStep': TimeStepToJSON(value['timeStep']), }; } diff --git a/typescript/dist/esm/models/UserSession.d.ts b/typescript/dist/esm/models/UserSession.d.ts index 17e32e54..38531122 100644 --- a/typescript/dist/esm/models/UserSession.d.ts +++ b/typescript/dist/esm/models/UserSession.d.ts @@ -34,7 +34,7 @@ export interface UserSession { * @type {string} * @memberof UserSession */ - project?: string | null; + project?: string; /** * * @type {Array} diff --git a/typescript/dist/esm/models/PlotUpdate.d.ts b/typescript/dist/esm/models/VecUpdate.d.ts similarity index 55% rename from typescript/dist/esm/models/PlotUpdate.d.ts rename to typescript/dist/esm/models/VecUpdate.d.ts index d72055db..ececaa28 100644 --- a/typescript/dist/esm/models/PlotUpdate.d.ts +++ b/typescript/dist/esm/models/VecUpdate.d.ts @@ -12,12 +12,12 @@ import type { Plot } from './Plot'; import type { ProjectUpdateToken } from './ProjectUpdateToken'; /** - * @type PlotUpdate + * @type VecUpdate * * @export */ -export type PlotUpdate = Plot | ProjectUpdateToken; -export declare function PlotUpdateFromJSON(json: any): PlotUpdate; -export declare function PlotUpdateFromJSONTyped(json: any, ignoreDiscriminator: boolean): PlotUpdate; -export declare function PlotUpdateToJSON(json: any): any; -export declare function PlotUpdateToJSONTyped(value?: PlotUpdate | null, ignoreDiscriminator?: boolean): any; +export type VecUpdate = Plot | ProjectUpdateToken; +export declare function VecUpdateFromJSON(json: any): VecUpdate; +export declare function VecUpdateFromJSONTyped(json: any, ignoreDiscriminator: boolean): VecUpdate; +export declare function VecUpdateToJSON(json: any): any; +export declare function VecUpdateToJSONTyped(value?: VecUpdate | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/PlotUpdate.js b/typescript/dist/esm/models/VecUpdate.js similarity index 78% rename from typescript/dist/esm/models/PlotUpdate.js rename to typescript/dist/esm/models/VecUpdate.js index 13189641..a30ebe1b 100644 --- a/typescript/dist/esm/models/PlotUpdate.js +++ b/typescript/dist/esm/models/VecUpdate.js @@ -13,10 +13,10 @@ */ import { instanceOfPlot, PlotFromJSONTyped, PlotToJSON, } from './Plot'; import { instanceOfProjectUpdateToken, ProjectUpdateTokenFromJSONTyped, ProjectUpdateTokenToJSON, } from './ProjectUpdateToken'; -export function PlotUpdateFromJSON(json) { - return PlotUpdateFromJSONTyped(json, false); +export function VecUpdateFromJSON(json) { + return VecUpdateFromJSONTyped(json, false); } -export function PlotUpdateFromJSONTyped(json, ignoreDiscriminator) { +export function VecUpdateFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } @@ -28,10 +28,10 @@ export function PlotUpdateFromJSONTyped(json, ignoreDiscriminator) { } return {}; } -export function PlotUpdateToJSON(json) { - return PlotUpdateToJSONTyped(json, false); +export function VecUpdateToJSON(json) { + return VecUpdateToJSONTyped(json, false); } -export function PlotUpdateToJSONTyped(value, ignoreDiscriminator = false) { +export function VecUpdateToJSONTyped(value, ignoreDiscriminator = false) { if (value == null) { return value; } diff --git a/typescript/dist/esm/models/index.d.ts b/typescript/dist/esm/models/index.d.ts index 4bfa5fb5..636d9880 100644 --- a/typescript/dist/esm/models/index.d.ts +++ b/typescript/dist/esm/models/index.d.ts @@ -1,4 +1,3 @@ -export * from './AddCollection200Response'; export * from './AddDataset'; export * from './AddLayer'; export * from './AddLayerCollection'; @@ -13,13 +12,11 @@ export * from './ClassificationMeasurement'; export * from './CollectionItem'; export * from './CollectionType'; export * from './ColorParam'; -export * from './ColorParamStatic'; export * from './Colorizer'; export * from './ComputationQuota'; export * from './ContinuousMeasurement'; export * from './Coordinate2D'; export * from './CreateDataset'; -export * from './CreateDatasetHandler200Response'; export * from './CreateProject'; export * from './CsvHeader'; export * from './DataId'; @@ -31,8 +28,8 @@ export * from './DataUsageSummary'; export * from './Dataset'; export * from './DatasetDefinition'; export * from './DatasetListing'; +export * from './DatasetNameResponse'; export * from './DatasetResource'; -export * from './DateTime'; export * from './DerivedColor'; export * from './DerivedNumber'; export * from './DescribeCoverageRequest'; @@ -62,7 +59,7 @@ export * from './GetLegendGraphicRequest'; export * from './GetMapExceptionFormat'; export * from './GetMapFormat'; export * from './GetMapRequest'; -export * from './InlineObject'; +export * from './IdResponse'; export * from './InternalDataId'; export * from './Layer'; export * from './LayerCollection'; @@ -70,7 +67,6 @@ export * from './LayerCollectionListing'; export * from './LayerCollectionResource'; export * from './LayerListing'; export * from './LayerResource'; -export * from './LayerUpdate'; export * from './LayerVisibility'; export * from './LineSymbology'; export * from './LinearGradient'; @@ -117,7 +113,6 @@ export * from './Plot'; export * from './PlotOutputFormat'; export * from './PlotQueryRectangle'; export * from './PlotResultDescriptor'; -export * from './PlotUpdate'; export * from './PointSymbology'; export * from './PolygonSymbology'; export * from './Project'; @@ -146,12 +141,6 @@ export * from './RasterResultDescriptor'; export * from './RasterStreamWebsocketResultType'; export * from './RasterSymbology'; export * from './Resource'; -export * from './ResourceId'; -export * from './ResourceIdDatasetId'; -export * from './ResourceIdLayer'; -export * from './ResourceIdLayerCollection'; -export * from './ResourceIdMlModel'; -export * from './ResourceIdProject'; export * from './Role'; export * from './RoleDescription'; export * from './STRectangle'; @@ -164,7 +153,8 @@ export * from './SpatialPartition2D'; export * from './SpatialReferenceAuthority'; export * from './SpatialReferenceSpecification'; export * from './SpatialResolution'; -export * from './StaticNumberParam'; +export * from './StaticColor'; +export * from './StaticNumber'; export * from './StrokeParam'; export * from './SuggestMetaData'; export * from './Symbology'; @@ -208,6 +198,7 @@ export * from './UserCredentials'; export * from './UserInfo'; export * from './UserRegistration'; export * from './UserSession'; +export * from './VecUpdate'; export * from './VectorColumnInfo'; export * from './VectorDataType'; export * from './VectorQueryRectangle'; diff --git a/typescript/dist/esm/models/index.js b/typescript/dist/esm/models/index.js index f2d0bb1b..1fd7bb3c 100644 --- a/typescript/dist/esm/models/index.js +++ b/typescript/dist/esm/models/index.js @@ -1,6 +1,5 @@ /* tslint:disable */ /* eslint-disable */ -export * from './AddCollection200Response'; export * from './AddDataset'; export * from './AddLayer'; export * from './AddLayerCollection'; @@ -15,13 +14,11 @@ export * from './ClassificationMeasurement'; export * from './CollectionItem'; export * from './CollectionType'; export * from './ColorParam'; -export * from './ColorParamStatic'; export * from './Colorizer'; export * from './ComputationQuota'; export * from './ContinuousMeasurement'; export * from './Coordinate2D'; export * from './CreateDataset'; -export * from './CreateDatasetHandler200Response'; export * from './CreateProject'; export * from './CsvHeader'; export * from './DataId'; @@ -33,8 +30,8 @@ export * from './DataUsageSummary'; export * from './Dataset'; export * from './DatasetDefinition'; export * from './DatasetListing'; +export * from './DatasetNameResponse'; export * from './DatasetResource'; -export * from './DateTime'; export * from './DerivedColor'; export * from './DerivedNumber'; export * from './DescribeCoverageRequest'; @@ -64,7 +61,7 @@ export * from './GetLegendGraphicRequest'; export * from './GetMapExceptionFormat'; export * from './GetMapFormat'; export * from './GetMapRequest'; -export * from './InlineObject'; +export * from './IdResponse'; export * from './InternalDataId'; export * from './Layer'; export * from './LayerCollection'; @@ -72,7 +69,6 @@ export * from './LayerCollectionListing'; export * from './LayerCollectionResource'; export * from './LayerListing'; export * from './LayerResource'; -export * from './LayerUpdate'; export * from './LayerVisibility'; export * from './LineSymbology'; export * from './LinearGradient'; @@ -119,7 +115,6 @@ export * from './Plot'; export * from './PlotOutputFormat'; export * from './PlotQueryRectangle'; export * from './PlotResultDescriptor'; -export * from './PlotUpdate'; export * from './PointSymbology'; export * from './PolygonSymbology'; export * from './Project'; @@ -148,12 +143,6 @@ export * from './RasterResultDescriptor'; export * from './RasterStreamWebsocketResultType'; export * from './RasterSymbology'; export * from './Resource'; -export * from './ResourceId'; -export * from './ResourceIdDatasetId'; -export * from './ResourceIdLayer'; -export * from './ResourceIdLayerCollection'; -export * from './ResourceIdMlModel'; -export * from './ResourceIdProject'; export * from './Role'; export * from './RoleDescription'; export * from './STRectangle'; @@ -166,7 +155,8 @@ export * from './SpatialPartition2D'; export * from './SpatialReferenceAuthority'; export * from './SpatialReferenceSpecification'; export * from './SpatialResolution'; -export * from './StaticNumberParam'; +export * from './StaticColor'; +export * from './StaticNumber'; export * from './StrokeParam'; export * from './SuggestMetaData'; export * from './Symbology'; @@ -210,6 +200,7 @@ export * from './UserCredentials'; export * from './UserInfo'; export * from './UserRegistration'; export * from './UserSession'; +export * from './VecUpdate'; export * from './VectorColumnInfo'; export * from './VectorDataType'; export * from './VectorQueryRectangle'; diff --git a/typescript/dist/esm/runtime.js b/typescript/dist/esm/runtime.js index 89f1bca4..4c09eca0 100644 --- a/typescript/dist/esm/runtime.js +++ b/typescript/dist/esm/runtime.js @@ -20,7 +20,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge step((generator = generator.apply(thisArg, _arguments || [])).next()); }); }; -export const BASE_PATH = "http://0.0.0.0:8080/api".replace(/\/+$/, ""); +export const BASE_PATH = "https://geoengine.io/api".replace(/\/+$/, ""); export class Configuration { constructor(configuration = {}) { this.configuration = configuration; @@ -69,7 +69,7 @@ export class Configuration { } export const DefaultConfig = new Configuration({ headers: { - 'User-Agent': 'geoengine/openapi-client/typescript/0.0.21' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.22' } }); /** diff --git a/typescript/dist/models/AddCollection200Response.d.ts b/typescript/dist/models/AddCollection200Response.d.ts deleted file mode 100644 index 539cbe7d..00000000 --- a/typescript/dist/models/AddCollection200Response.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface AddCollection200Response - */ -export interface AddCollection200Response { - /** - * - * @type {string} - * @memberof AddCollection200Response - */ - id: string; -} -/** - * Check if a given object implements the AddCollection200Response interface. - */ -export declare function instanceOfAddCollection200Response(value: object): value is AddCollection200Response; -export declare function AddCollection200ResponseFromJSON(json: any): AddCollection200Response; -export declare function AddCollection200ResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): AddCollection200Response; -export declare function AddCollection200ResponseToJSON(json: any): AddCollection200Response; -export declare function AddCollection200ResponseToJSONTyped(value?: AddCollection200Response | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/AddCollection200Response.js b/typescript/dist/models/AddCollection200Response.js deleted file mode 100644 index 2fb25c21..00000000 --- a/typescript/dist/models/AddCollection200Response.js +++ /dev/null @@ -1,50 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.instanceOfAddCollection200Response = instanceOfAddCollection200Response; -exports.AddCollection200ResponseFromJSON = AddCollection200ResponseFromJSON; -exports.AddCollection200ResponseFromJSONTyped = AddCollection200ResponseFromJSONTyped; -exports.AddCollection200ResponseToJSON = AddCollection200ResponseToJSON; -exports.AddCollection200ResponseToJSONTyped = AddCollection200ResponseToJSONTyped; -/** - * Check if a given object implements the AddCollection200Response interface. - */ -function instanceOfAddCollection200Response(value) { - if (!('id' in value) || value['id'] === undefined) - return false; - return true; -} -function AddCollection200ResponseFromJSON(json) { - return AddCollection200ResponseFromJSONTyped(json, false); -} -function AddCollection200ResponseFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'id': json['id'], - }; -} -function AddCollection200ResponseToJSON(json) { - return AddCollection200ResponseToJSONTyped(json, false); -} -function AddCollection200ResponseToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'id': value['id'], - }; -} diff --git a/typescript/dist/models/AddDataset.d.ts b/typescript/dist/models/AddDataset.d.ts index 56b75997..3a8d9b2c 100644 --- a/typescript/dist/models/AddDataset.d.ts +++ b/typescript/dist/models/AddDataset.d.ts @@ -34,7 +34,7 @@ export interface AddDataset { * @type {string} * @memberof AddDataset */ - name?: string | null; + name?: string; /** * * @type {Array} diff --git a/typescript/dist/models/ColorParam.d.ts b/typescript/dist/models/ColorParam.d.ts index 27e62d45..94d826c1 100644 --- a/typescript/dist/models/ColorParam.d.ts +++ b/typescript/dist/models/ColorParam.d.ts @@ -9,8 +9,8 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { ColorParamStatic } from './ColorParamStatic'; import type { DerivedColor } from './DerivedColor'; +import type { StaticColor } from './StaticColor'; /** * @type ColorParam * @@ -20,7 +20,7 @@ export type ColorParam = { type: 'derived'; } & DerivedColor | { type: 'static'; -} & ColorParamStatic; +} & StaticColor; export declare function ColorParamFromJSON(json: any): ColorParam; export declare function ColorParamFromJSONTyped(json: any, ignoreDiscriminator: boolean): ColorParam; export declare function ColorParamToJSON(json: any): any; diff --git a/typescript/dist/models/ColorParam.js b/typescript/dist/models/ColorParam.js index 1d13aa25..ce4fdb27 100644 --- a/typescript/dist/models/ColorParam.js +++ b/typescript/dist/models/ColorParam.js @@ -17,8 +17,8 @@ exports.ColorParamFromJSON = ColorParamFromJSON; exports.ColorParamFromJSONTyped = ColorParamFromJSONTyped; exports.ColorParamToJSON = ColorParamToJSON; exports.ColorParamToJSONTyped = ColorParamToJSONTyped; -const ColorParamStatic_1 = require("./ColorParamStatic"); const DerivedColor_1 = require("./DerivedColor"); +const StaticColor_1 = require("./StaticColor"); function ColorParamFromJSON(json) { return ColorParamFromJSONTyped(json, false); } @@ -30,7 +30,7 @@ function ColorParamFromJSONTyped(json, ignoreDiscriminator) { case 'derived': return Object.assign({}, (0, DerivedColor_1.DerivedColorFromJSONTyped)(json, true), { type: 'derived' }); case 'static': - return Object.assign({}, (0, ColorParamStatic_1.ColorParamStaticFromJSONTyped)(json, true), { type: 'static' }); + return Object.assign({}, (0, StaticColor_1.StaticColorFromJSONTyped)(json, true), { type: 'static' }); default: throw new Error(`No variant of ColorParam exists with 'type=${json['type']}'`); } @@ -46,7 +46,7 @@ function ColorParamToJSONTyped(value, ignoreDiscriminator = false) { case 'derived': return Object.assign({}, (0, DerivedColor_1.DerivedColorToJSON)(value), { type: 'derived' }); case 'static': - return Object.assign({}, (0, ColorParamStatic_1.ColorParamStaticToJSON)(value), { type: 'static' }); + return Object.assign({}, (0, StaticColor_1.StaticColorToJSON)(value), { type: 'static' }); default: throw new Error(`No variant of ColorParam exists with 'type=${value['type']}'`); } diff --git a/typescript/dist/models/ColorParamStatic.d.ts b/typescript/dist/models/ColorParamStatic.d.ts deleted file mode 100644 index 5b67fd37..00000000 --- a/typescript/dist/models/ColorParamStatic.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface ColorParamStatic - */ -export interface ColorParamStatic { - /** - * - * @type {Array} - * @memberof ColorParamStatic - */ - color: Array; - /** - * - * @type {string} - * @memberof ColorParamStatic - */ - type: ColorParamStaticTypeEnum; -} -/** - * @export - */ -export declare const ColorParamStaticTypeEnum: { - readonly Static: "static"; -}; -export type ColorParamStaticTypeEnum = typeof ColorParamStaticTypeEnum[keyof typeof ColorParamStaticTypeEnum]; -/** - * Check if a given object implements the ColorParamStatic interface. - */ -export declare function instanceOfColorParamStatic(value: object): value is ColorParamStatic; -export declare function ColorParamStaticFromJSON(json: any): ColorParamStatic; -export declare function ColorParamStaticFromJSONTyped(json: any, ignoreDiscriminator: boolean): ColorParamStatic; -export declare function ColorParamStaticToJSON(json: any): ColorParamStatic; -export declare function ColorParamStaticToJSONTyped(value?: ColorParamStatic | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/Colorizer.d.ts b/typescript/dist/models/Colorizer.d.ts index 7d75528c..e8e6b1ed 100644 --- a/typescript/dist/models/Colorizer.d.ts +++ b/typescript/dist/models/Colorizer.d.ts @@ -14,7 +14,8 @@ import type { LogarithmicGradient } from './LogarithmicGradient'; import type { PaletteColorizer } from './PaletteColorizer'; /** * @type Colorizer - * + * A colorizer specifies a mapping between raster values and an output image + * There are different variants that perform different kinds of mapping. * @export */ export type Colorizer = { diff --git a/typescript/dist/models/CreateDatasetHandler200Response.d.ts b/typescript/dist/models/CreateDatasetHandler200Response.d.ts deleted file mode 100644 index 162af55f..00000000 --- a/typescript/dist/models/CreateDatasetHandler200Response.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface CreateDatasetHandler200Response - */ -export interface CreateDatasetHandler200Response { - /** - * - * @type {string} - * @memberof CreateDatasetHandler200Response - */ - datasetName: string; -} -/** - * Check if a given object implements the CreateDatasetHandler200Response interface. - */ -export declare function instanceOfCreateDatasetHandler200Response(value: object): value is CreateDatasetHandler200Response; -export declare function CreateDatasetHandler200ResponseFromJSON(json: any): CreateDatasetHandler200Response; -export declare function CreateDatasetHandler200ResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): CreateDatasetHandler200Response; -export declare function CreateDatasetHandler200ResponseToJSON(json: any): CreateDatasetHandler200Response; -export declare function CreateDatasetHandler200ResponseToJSONTyped(value?: CreateDatasetHandler200Response | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/CreateDatasetHandler200Response.js b/typescript/dist/models/CreateDatasetHandler200Response.js deleted file mode 100644 index b31593cf..00000000 --- a/typescript/dist/models/CreateDatasetHandler200Response.js +++ /dev/null @@ -1,50 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.instanceOfCreateDatasetHandler200Response = instanceOfCreateDatasetHandler200Response; -exports.CreateDatasetHandler200ResponseFromJSON = CreateDatasetHandler200ResponseFromJSON; -exports.CreateDatasetHandler200ResponseFromJSONTyped = CreateDatasetHandler200ResponseFromJSONTyped; -exports.CreateDatasetHandler200ResponseToJSON = CreateDatasetHandler200ResponseToJSON; -exports.CreateDatasetHandler200ResponseToJSONTyped = CreateDatasetHandler200ResponseToJSONTyped; -/** - * Check if a given object implements the CreateDatasetHandler200Response interface. - */ -function instanceOfCreateDatasetHandler200Response(value) { - if (!('datasetName' in value) || value['datasetName'] === undefined) - return false; - return true; -} -function CreateDatasetHandler200ResponseFromJSON(json) { - return CreateDatasetHandler200ResponseFromJSONTyped(json, false); -} -function CreateDatasetHandler200ResponseFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'datasetName': json['datasetName'], - }; -} -function CreateDatasetHandler200ResponseToJSON(json) { - return CreateDatasetHandler200ResponseToJSONTyped(json, false); -} -function CreateDatasetHandler200ResponseToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'datasetName': value['datasetName'], - }; -} diff --git a/typescript/dist/models/DataId.d.ts b/typescript/dist/models/DataId.d.ts index 730c86e1..0b62a75c 100644 --- a/typescript/dist/models/DataId.d.ts +++ b/typescript/dist/models/DataId.d.ts @@ -13,7 +13,8 @@ import type { ExternalDataId } from './ExternalDataId'; import type { InternalDataId } from './InternalDataId'; /** * @type DataId - * + * The identifier for loadable data. It is used in the source operators to get the loading info (aka parametrization) + * for accessing the data. Internal data is loaded from datasets, external from `DataProvider`s. * @export */ export type DataId = { diff --git a/typescript/dist/models/DatasetNameResponse.d.ts b/typescript/dist/models/DatasetNameResponse.d.ts new file mode 100644 index 00000000..5295eb28 --- /dev/null +++ b/typescript/dist/models/DatasetNameResponse.d.ts @@ -0,0 +1,32 @@ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.0 + * Contact: dev@geoengine.de + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +/** + * + * @export + * @interface DatasetNameResponse + */ +export interface DatasetNameResponse { + /** + * + * @type {string} + * @memberof DatasetNameResponse + */ + datasetName: string; +} +/** + * Check if a given object implements the DatasetNameResponse interface. + */ +export declare function instanceOfDatasetNameResponse(value: object): value is DatasetNameResponse; +export declare function DatasetNameResponseFromJSON(json: any): DatasetNameResponse; +export declare function DatasetNameResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): DatasetNameResponse; +export declare function DatasetNameResponseToJSON(json: any): DatasetNameResponse; +export declare function DatasetNameResponseToJSONTyped(value?: DatasetNameResponse | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/DatasetNameResponse.js b/typescript/dist/models/DatasetNameResponse.js new file mode 100644 index 00000000..e9f3918f --- /dev/null +++ b/typescript/dist/models/DatasetNameResponse.js @@ -0,0 +1,50 @@ +"use strict"; +/* tslint:disable */ +/* eslint-disable */ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.0 + * Contact: dev@geoengine.de + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.instanceOfDatasetNameResponse = instanceOfDatasetNameResponse; +exports.DatasetNameResponseFromJSON = DatasetNameResponseFromJSON; +exports.DatasetNameResponseFromJSONTyped = DatasetNameResponseFromJSONTyped; +exports.DatasetNameResponseToJSON = DatasetNameResponseToJSON; +exports.DatasetNameResponseToJSONTyped = DatasetNameResponseToJSONTyped; +/** + * Check if a given object implements the DatasetNameResponse interface. + */ +function instanceOfDatasetNameResponse(value) { + if (!('datasetName' in value) || value['datasetName'] === undefined) + return false; + return true; +} +function DatasetNameResponseFromJSON(json) { + return DatasetNameResponseFromJSONTyped(json, false); +} +function DatasetNameResponseFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'datasetName': json['datasetName'], + }; +} +function DatasetNameResponseToJSON(json) { + return DatasetNameResponseToJSONTyped(json, false); +} +function DatasetNameResponseToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'datasetName': value['datasetName'], + }; +} diff --git a/typescript/dist/models/DateTime.d.ts b/typescript/dist/models/DateTime.d.ts deleted file mode 100644 index c0634073..00000000 --- a/typescript/dist/models/DateTime.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * An object that composes the date and a timestamp with time zone. - * @export - * @interface DateTime - */ -export interface DateTime { - /** - * - * @type {Date} - * @memberof DateTime - */ - datetime: Date; -} -/** - * Check if a given object implements the DateTime interface. - */ -export declare function instanceOfDateTime(value: object): value is DateTime; -export declare function DateTimeFromJSON(json: any): DateTime; -export declare function DateTimeFromJSONTyped(json: any, ignoreDiscriminator: boolean): DateTime; -export declare function DateTimeToJSON(json: any): DateTime; -export declare function DateTimeToJSONTyped(value?: DateTime | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/DateTime.js b/typescript/dist/models/DateTime.js deleted file mode 100644 index 3308e4e0..00000000 --- a/typescript/dist/models/DateTime.js +++ /dev/null @@ -1,50 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.instanceOfDateTime = instanceOfDateTime; -exports.DateTimeFromJSON = DateTimeFromJSON; -exports.DateTimeFromJSONTyped = DateTimeFromJSONTyped; -exports.DateTimeToJSON = DateTimeToJSON; -exports.DateTimeToJSONTyped = DateTimeToJSONTyped; -/** - * Check if a given object implements the DateTime interface. - */ -function instanceOfDateTime(value) { - if (!('datetime' in value) || value['datetime'] === undefined) - return false; - return true; -} -function DateTimeFromJSON(json) { - return DateTimeFromJSONTyped(json, false); -} -function DateTimeFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'datetime': (new Date(json['datetime'])), - }; -} -function DateTimeToJSON(json) { - return DateTimeToJSONTyped(json, false); -} -function DateTimeToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'datetime': ((value['datetime']).toISOString()), - }; -} diff --git a/typescript/dist/models/DateTimeParseFormat.d.ts b/typescript/dist/models/DateTimeParseFormat.d.ts deleted file mode 100644 index 35141c72..00000000 --- a/typescript/dist/models/DateTimeParseFormat.d.ts +++ /dev/null @@ -1,43 +0,0 @@ -/** - * Geo Engine Pro API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface DateTimeParseFormat - */ -export interface DateTimeParseFormat { - /** - * - * @type {string} - * @memberof DateTimeParseFormat - */ - fmt: string; - /** - * - * @type {boolean} - * @memberof DateTimeParseFormat - */ - hasTime: boolean; - /** - * - * @type {boolean} - * @memberof DateTimeParseFormat - */ - hasTz: boolean; -} -/** - * Check if a given object implements the DateTimeParseFormat interface. - */ -export declare function instanceOfDateTimeParseFormat(value: object): boolean; -export declare function DateTimeParseFormatFromJSON(json: any): DateTimeParseFormat; -export declare function DateTimeParseFormatFromJSONTyped(json: any, ignoreDiscriminator: boolean): DateTimeParseFormat; -export declare function DateTimeParseFormatToJSON(value?: DateTimeParseFormat | null): any; diff --git a/typescript/dist/models/DateTimeParseFormat.js b/typescript/dist/models/DateTimeParseFormat.js deleted file mode 100644 index 7b69e798..00000000 --- a/typescript/dist/models/DateTimeParseFormat.js +++ /dev/null @@ -1,55 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine Pro API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.instanceOfDateTimeParseFormat = instanceOfDateTimeParseFormat; -exports.DateTimeParseFormatFromJSON = DateTimeParseFormatFromJSON; -exports.DateTimeParseFormatFromJSONTyped = DateTimeParseFormatFromJSONTyped; -exports.DateTimeParseFormatToJSON = DateTimeParseFormatToJSON; -/** - * Check if a given object implements the DateTimeParseFormat interface. - */ -function instanceOfDateTimeParseFormat(value) { - let isInstance = true; - isInstance = isInstance && "fmt" in value; - isInstance = isInstance && "hasTime" in value; - isInstance = isInstance && "hasTz" in value; - return isInstance; -} -function DateTimeParseFormatFromJSON(json) { - return DateTimeParseFormatFromJSONTyped(json, false); -} -function DateTimeParseFormatFromJSONTyped(json, ignoreDiscriminator) { - if ((json === undefined) || (json === null)) { - return json; - } - return { - 'fmt': json['fmt'], - 'hasTime': json['has_time'], - 'hasTz': json['has_tz'], - }; -} -function DateTimeParseFormatToJSON(value) { - if (value === undefined) { - return undefined; - } - if (value === null) { - return null; - } - return { - 'fmt': value.fmt, - 'has_time': value.hasTime, - 'has_tz': value.hasTz, - }; -} diff --git a/typescript/dist/models/GdalMetadataNetCdfCf.d.ts b/typescript/dist/models/GdalMetadataNetCdfCf.d.ts index 2105357e..d24c38e2 100644 --- a/typescript/dist/models/GdalMetadataNetCdfCf.d.ts +++ b/typescript/dist/models/GdalMetadataNetCdfCf.d.ts @@ -72,7 +72,7 @@ export interface GdalMetadataNetCdfCf { * @export */ export declare const GdalMetadataNetCdfCfTypeEnum: { - readonly GdalMetadataNetCdfCf: "GdalMetadataNetCdfCf"; + readonly GdalMetaDataNetCdfCf: "GdalMetaDataNetCdfCf"; }; export type GdalMetadataNetCdfCfTypeEnum = typeof GdalMetadataNetCdfCfTypeEnum[keyof typeof GdalMetadataNetCdfCfTypeEnum]; /** diff --git a/typescript/dist/models/GdalMetadataNetCdfCf.js b/typescript/dist/models/GdalMetadataNetCdfCf.js index 41727148..cfad2282 100644 --- a/typescript/dist/models/GdalMetadataNetCdfCf.js +++ b/typescript/dist/models/GdalMetadataNetCdfCf.js @@ -26,7 +26,7 @@ const GdalDatasetParameters_1 = require("./GdalDatasetParameters"); * @export */ exports.GdalMetadataNetCdfCfTypeEnum = { - GdalMetadataNetCdfCf: 'GdalMetadataNetCdfCf' + GdalMetaDataNetCdfCf: 'GdalMetaDataNetCdfCf' }; /** * Check if a given object implements the GdalMetadataNetCdfCf interface. diff --git a/typescript/dist/models/IdResponse.d.ts b/typescript/dist/models/IdResponse.d.ts new file mode 100644 index 00000000..9ef5bbfd --- /dev/null +++ b/typescript/dist/models/IdResponse.d.ts @@ -0,0 +1,32 @@ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.0 + * Contact: dev@geoengine.de + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +/** + * + * @export + * @interface IdResponse + */ +export interface IdResponse { + /** + * + * @type {string} + * @memberof IdResponse + */ + id: string; +} +/** + * Check if a given object implements the IdResponse interface. + */ +export declare function instanceOfIdResponse(value: object): value is IdResponse; +export declare function IdResponseFromJSON(json: any): IdResponse; +export declare function IdResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): IdResponse; +export declare function IdResponseToJSON(json: any): IdResponse; +export declare function IdResponseToJSONTyped(value?: IdResponse | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/IdResponse.js b/typescript/dist/models/IdResponse.js new file mode 100644 index 00000000..afdc3ac2 --- /dev/null +++ b/typescript/dist/models/IdResponse.js @@ -0,0 +1,50 @@ +"use strict"; +/* tslint:disable */ +/* eslint-disable */ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.0 + * Contact: dev@geoengine.de + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +Object.defineProperty(exports, "__esModule", { value: true }); +exports.instanceOfIdResponse = instanceOfIdResponse; +exports.IdResponseFromJSON = IdResponseFromJSON; +exports.IdResponseFromJSONTyped = IdResponseFromJSONTyped; +exports.IdResponseToJSON = IdResponseToJSON; +exports.IdResponseToJSONTyped = IdResponseToJSONTyped; +/** + * Check if a given object implements the IdResponse interface. + */ +function instanceOfIdResponse(value) { + if (!('id' in value) || value['id'] === undefined) + return false; + return true; +} +function IdResponseFromJSON(json) { + return IdResponseFromJSONTyped(json, false); +} +function IdResponseFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'id': json['id'], + }; +} +function IdResponseToJSON(json) { + return IdResponseToJSONTyped(json, false); +} +function IdResponseToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'id': value['id'], + }; +} diff --git a/typescript/dist/models/InlineObject.d.ts b/typescript/dist/models/InlineObject.d.ts deleted file mode 100644 index ac0931b0..00000000 --- a/typescript/dist/models/InlineObject.d.ts +++ /dev/null @@ -1,32 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface InlineObject - */ -export interface InlineObject { - /** - * - * @type {string} - * @memberof InlineObject - */ - url: string; -} -/** - * Check if a given object implements the InlineObject interface. - */ -export declare function instanceOfInlineObject(value: object): value is InlineObject; -export declare function InlineObjectFromJSON(json: any): InlineObject; -export declare function InlineObjectFromJSONTyped(json: any, ignoreDiscriminator: boolean): InlineObject; -export declare function InlineObjectToJSON(json: any): InlineObject; -export declare function InlineObjectToJSONTyped(value?: InlineObject | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/InlineObject.js b/typescript/dist/models/InlineObject.js deleted file mode 100644 index 79f6d374..00000000 --- a/typescript/dist/models/InlineObject.js +++ /dev/null @@ -1,50 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.instanceOfInlineObject = instanceOfInlineObject; -exports.InlineObjectFromJSON = InlineObjectFromJSON; -exports.InlineObjectFromJSONTyped = InlineObjectFromJSONTyped; -exports.InlineObjectToJSON = InlineObjectToJSON; -exports.InlineObjectToJSONTyped = InlineObjectToJSONTyped; -/** - * Check if a given object implements the InlineObject interface. - */ -function instanceOfInlineObject(value) { - if (!('url' in value) || value['url'] === undefined) - return false; - return true; -} -function InlineObjectFromJSON(json) { - return InlineObjectFromJSONTyped(json, false); -} -function InlineObjectFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'url': json['url'], - }; -} -function InlineObjectToJSON(json) { - return InlineObjectToJSONTyped(json, false); -} -function InlineObjectToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'url': value['url'], - }; -} diff --git a/typescript/dist/models/LayerUpdate.d.ts b/typescript/dist/models/LayerUpdate.d.ts deleted file mode 100644 index fc0d7a88..00000000 --- a/typescript/dist/models/LayerUpdate.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -import type { ProjectLayer } from './ProjectLayer'; -import type { ProjectUpdateToken } from './ProjectUpdateToken'; -/** - * @type LayerUpdate - * - * @export - */ -export type LayerUpdate = ProjectLayer | ProjectUpdateToken; -export declare function LayerUpdateFromJSON(json: any): LayerUpdate; -export declare function LayerUpdateFromJSONTyped(json: any, ignoreDiscriminator: boolean): LayerUpdate; -export declare function LayerUpdateToJSON(json: any): any; -export declare function LayerUpdateToJSONTyped(value?: LayerUpdate | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/LayerUpdate.js b/typescript/dist/models/LayerUpdate.js deleted file mode 100644 index 12f92738..00000000 --- a/typescript/dist/models/LayerUpdate.js +++ /dev/null @@ -1,51 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.LayerUpdateFromJSON = LayerUpdateFromJSON; -exports.LayerUpdateFromJSONTyped = LayerUpdateFromJSONTyped; -exports.LayerUpdateToJSON = LayerUpdateToJSON; -exports.LayerUpdateToJSONTyped = LayerUpdateToJSONTyped; -const ProjectLayer_1 = require("./ProjectLayer"); -const ProjectUpdateToken_1 = require("./ProjectUpdateToken"); -function LayerUpdateFromJSON(json) { - return LayerUpdateFromJSONTyped(json, false); -} -function LayerUpdateFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - if ((0, ProjectLayer_1.instanceOfProjectLayer)(json)) { - return (0, ProjectLayer_1.ProjectLayerFromJSONTyped)(json, true); - } - if ((0, ProjectUpdateToken_1.instanceOfProjectUpdateToken)(json)) { - return (0, ProjectUpdateToken_1.ProjectUpdateTokenFromJSONTyped)(json, true); - } - return {}; -} -function LayerUpdateToJSON(json) { - return LayerUpdateToJSONTyped(json, false); -} -function LayerUpdateToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - if (typeof value === 'object' && (0, ProjectLayer_1.instanceOfProjectLayer)(value)) { - return (0, ProjectLayer_1.ProjectLayerToJSON)(value); - } - if ((0, ProjectUpdateToken_1.instanceOfProjectUpdateToken)(value)) { - return (0, ProjectUpdateToken_1.ProjectUpdateTokenToJSON)(value); - } - return {}; -} diff --git a/typescript/dist/models/MetaDataDefinition.d.ts b/typescript/dist/models/MetaDataDefinition.d.ts index f1f5da52..89e767ee 100644 --- a/typescript/dist/models/MetaDataDefinition.d.ts +++ b/typescript/dist/models/MetaDataDefinition.d.ts @@ -23,10 +23,10 @@ import type { OgrMetaData } from './OgrMetaData'; export type MetaDataDefinition = { type: 'GdalMetaDataList'; } & GdalMetaDataList | { + type: 'GdalMetaDataNetCdfCf'; +} & GdalMetadataNetCdfCf | { type: 'GdalMetaDataRegular'; } & GdalMetaDataRegular | { - type: 'GdalMetadataNetCdfCf'; -} & GdalMetadataNetCdfCf | { type: 'GdalStatic'; } & GdalMetaDataStatic | { type: 'MockMetaData'; diff --git a/typescript/dist/models/MetaDataDefinition.js b/typescript/dist/models/MetaDataDefinition.js index 9cfda354..8696dfb9 100644 --- a/typescript/dist/models/MetaDataDefinition.js +++ b/typescript/dist/models/MetaDataDefinition.js @@ -33,10 +33,10 @@ function MetaDataDefinitionFromJSONTyped(json, ignoreDiscriminator) { switch (json['type']) { case 'GdalMetaDataList': return Object.assign({}, (0, GdalMetaDataList_1.GdalMetaDataListFromJSONTyped)(json, true), { type: 'GdalMetaDataList' }); + case 'GdalMetaDataNetCdfCf': + return Object.assign({}, (0, GdalMetadataNetCdfCf_1.GdalMetadataNetCdfCfFromJSONTyped)(json, true), { type: 'GdalMetaDataNetCdfCf' }); case 'GdalMetaDataRegular': return Object.assign({}, (0, GdalMetaDataRegular_1.GdalMetaDataRegularFromJSONTyped)(json, true), { type: 'GdalMetaDataRegular' }); - case 'GdalMetadataNetCdfCf': - return Object.assign({}, (0, GdalMetadataNetCdfCf_1.GdalMetadataNetCdfCfFromJSONTyped)(json, true), { type: 'GdalMetadataNetCdfCf' }); case 'GdalStatic': return Object.assign({}, (0, GdalMetaDataStatic_1.GdalMetaDataStaticFromJSONTyped)(json, true), { type: 'GdalStatic' }); case 'MockMetaData': @@ -57,10 +57,10 @@ function MetaDataDefinitionToJSONTyped(value, ignoreDiscriminator = false) { switch (value['type']) { case 'GdalMetaDataList': return Object.assign({}, (0, GdalMetaDataList_1.GdalMetaDataListToJSON)(value), { type: 'GdalMetaDataList' }); + case 'GdalMetaDataNetCdfCf': + return Object.assign({}, (0, GdalMetadataNetCdfCf_1.GdalMetadataNetCdfCfToJSON)(value), { type: 'GdalMetaDataNetCdfCf' }); case 'GdalMetaDataRegular': return Object.assign({}, (0, GdalMetaDataRegular_1.GdalMetaDataRegularToJSON)(value), { type: 'GdalMetaDataRegular' }); - case 'GdalMetadataNetCdfCf': - return Object.assign({}, (0, GdalMetadataNetCdfCf_1.GdalMetadataNetCdfCfToJSON)(value), { type: 'GdalMetadataNetCdfCf' }); case 'GdalStatic': return Object.assign({}, (0, GdalMetaDataStatic_1.GdalMetaDataStaticToJSON)(value), { type: 'GdalStatic' }); case 'MockMetaData': diff --git a/typescript/dist/models/NumberParam.d.ts b/typescript/dist/models/NumberParam.d.ts index b142db7b..5d01c672 100644 --- a/typescript/dist/models/NumberParam.d.ts +++ b/typescript/dist/models/NumberParam.d.ts @@ -10,7 +10,7 @@ * Do not edit the class manually. */ import type { DerivedNumber } from './DerivedNumber'; -import type { StaticNumberParam } from './StaticNumberParam'; +import type { StaticNumber } from './StaticNumber'; /** * @type NumberParam * @@ -20,7 +20,7 @@ export type NumberParam = { type: 'derived'; } & DerivedNumber | { type: 'static'; -} & StaticNumberParam; +} & StaticNumber; export declare function NumberParamFromJSON(json: any): NumberParam; export declare function NumberParamFromJSONTyped(json: any, ignoreDiscriminator: boolean): NumberParam; export declare function NumberParamToJSON(json: any): any; diff --git a/typescript/dist/models/NumberParam.js b/typescript/dist/models/NumberParam.js index f6d21e90..7327c2f7 100644 --- a/typescript/dist/models/NumberParam.js +++ b/typescript/dist/models/NumberParam.js @@ -18,7 +18,7 @@ exports.NumberParamFromJSONTyped = NumberParamFromJSONTyped; exports.NumberParamToJSON = NumberParamToJSON; exports.NumberParamToJSONTyped = NumberParamToJSONTyped; const DerivedNumber_1 = require("./DerivedNumber"); -const StaticNumberParam_1 = require("./StaticNumberParam"); +const StaticNumber_1 = require("./StaticNumber"); function NumberParamFromJSON(json) { return NumberParamFromJSONTyped(json, false); } @@ -30,7 +30,7 @@ function NumberParamFromJSONTyped(json, ignoreDiscriminator) { case 'derived': return Object.assign({}, (0, DerivedNumber_1.DerivedNumberFromJSONTyped)(json, true), { type: 'derived' }); case 'static': - return Object.assign({}, (0, StaticNumberParam_1.StaticNumberParamFromJSONTyped)(json, true), { type: 'static' }); + return Object.assign({}, (0, StaticNumber_1.StaticNumberFromJSONTyped)(json, true), { type: 'static' }); default: throw new Error(`No variant of NumberParam exists with 'type=${json['type']}'`); } @@ -46,7 +46,7 @@ function NumberParamToJSONTyped(value, ignoreDiscriminator = false) { case 'derived': return Object.assign({}, (0, DerivedNumber_1.DerivedNumberToJSON)(value), { type: 'derived' }); case 'static': - return Object.assign({}, (0, StaticNumberParam_1.StaticNumberParamToJSON)(value), { type: 'static' }); + return Object.assign({}, (0, StaticNumber_1.StaticNumberToJSON)(value), { type: 'static' }); default: throw new Error(`No variant of NumberParam exists with 'type=${value['type']}'`); } diff --git a/typescript/dist/models/OgrSourceColumnSpec.d.ts b/typescript/dist/models/OgrSourceColumnSpec.d.ts index 07ea4385..f585865a 100644 --- a/typescript/dist/models/OgrSourceColumnSpec.d.ts +++ b/typescript/dist/models/OgrSourceColumnSpec.d.ts @@ -53,7 +53,7 @@ export interface OgrSourceColumnSpec { */ rename?: { [key: string]: string; - } | null; + }; /** * * @type {Array} diff --git a/typescript/dist/models/OgrSourceDurationSpecValue.d.ts b/typescript/dist/models/OgrSourceDurationSpecValue.d.ts index 1eb1a2f0..12063e42 100644 --- a/typescript/dist/models/OgrSourceDurationSpecValue.d.ts +++ b/typescript/dist/models/OgrSourceDurationSpecValue.d.ts @@ -9,25 +9,13 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { TimeGranularity } from './TimeGranularity'; +import type { TimeStep } from './TimeStep'; /** * * @export * @interface OgrSourceDurationSpecValue */ -export interface OgrSourceDurationSpecValue { - /** - * - * @type {TimeGranularity} - * @memberof OgrSourceDurationSpecValue - */ - granularity: TimeGranularity; - /** - * - * @type {number} - * @memberof OgrSourceDurationSpecValue - */ - step: number; +export interface OgrSourceDurationSpecValue extends TimeStep { /** * * @type {string} diff --git a/typescript/dist/models/OgrSourceDurationSpecValue.js b/typescript/dist/models/OgrSourceDurationSpecValue.js index 251ce651..da4e5cd7 100644 --- a/typescript/dist/models/OgrSourceDurationSpecValue.js +++ b/typescript/dist/models/OgrSourceDurationSpecValue.js @@ -19,7 +19,7 @@ exports.OgrSourceDurationSpecValueFromJSON = OgrSourceDurationSpecValueFromJSON; exports.OgrSourceDurationSpecValueFromJSONTyped = OgrSourceDurationSpecValueFromJSONTyped; exports.OgrSourceDurationSpecValueToJSON = OgrSourceDurationSpecValueToJSON; exports.OgrSourceDurationSpecValueToJSONTyped = OgrSourceDurationSpecValueToJSONTyped; -const TimeGranularity_1 = require("./TimeGranularity"); +const TimeStep_1 = require("./TimeStep"); /** * @export */ @@ -30,10 +30,6 @@ exports.OgrSourceDurationSpecValueTypeEnum = { * Check if a given object implements the OgrSourceDurationSpecValue interface. */ function instanceOfOgrSourceDurationSpecValue(value) { - if (!('granularity' in value) || value['granularity'] === undefined) - return false; - if (!('step' in value) || value['step'] === undefined) - return false; if (!('type' in value) || value['type'] === undefined) return false; return true; @@ -45,11 +41,7 @@ function OgrSourceDurationSpecValueFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } - return { - 'granularity': (0, TimeGranularity_1.TimeGranularityFromJSON)(json['granularity']), - 'step': json['step'], - 'type': json['type'], - }; + return Object.assign(Object.assign({}, (0, TimeStep_1.TimeStepFromJSONTyped)(json, true)), { 'type': json['type'] }); } function OgrSourceDurationSpecValueToJSON(json) { return OgrSourceDurationSpecValueToJSONTyped(json, false); @@ -58,9 +50,5 @@ function OgrSourceDurationSpecValueToJSONTyped(value, ignoreDiscriminator = fals if (value == null) { return value; } - return { - 'granularity': (0, TimeGranularity_1.TimeGranularityToJSON)(value['granularity']), - 'step': value['step'], - 'type': value['type'], - }; + return Object.assign(Object.assign({}, (0, TimeStep_1.TimeStepToJSONTyped)(value, true)), { 'type': value['type'] }); } diff --git a/typescript/dist/models/RasterDatasetFromWorkflow.d.ts b/typescript/dist/models/RasterDatasetFromWorkflow.d.ts index 33426d0c..42b64948 100644 --- a/typescript/dist/models/RasterDatasetFromWorkflow.d.ts +++ b/typescript/dist/models/RasterDatasetFromWorkflow.d.ts @@ -39,7 +39,7 @@ export interface RasterDatasetFromWorkflow { * @type {string} * @memberof RasterDatasetFromWorkflow */ - name?: string | null; + name?: string; /** * * @type {RasterQueryRectangle} diff --git a/typescript/dist/models/Resource.d.ts b/typescript/dist/models/Resource.d.ts index 524dd463..ce2e18ec 100644 --- a/typescript/dist/models/Resource.d.ts +++ b/typescript/dist/models/Resource.d.ts @@ -16,7 +16,7 @@ import type { MlModelResource } from './MlModelResource'; import type { ProjectResource } from './ProjectResource'; /** * @type Resource - * + * A resource that is affected by a permission. * @export */ export type Resource = { diff --git a/typescript/dist/models/ResourceId.d.ts b/typescript/dist/models/ResourceId.d.ts deleted file mode 100644 index 8080fd6f..00000000 --- a/typescript/dist/models/ResourceId.d.ts +++ /dev/null @@ -1,36 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -import type { ResourceIdDatasetId } from './ResourceIdDatasetId'; -import type { ResourceIdLayer } from './ResourceIdLayer'; -import type { ResourceIdLayerCollection } from './ResourceIdLayerCollection'; -import type { ResourceIdMlModel } from './ResourceIdMlModel'; -import type { ResourceIdProject } from './ResourceIdProject'; -/** - * @type ResourceId - * - * @export - */ -export type ResourceId = { - type: 'DatasetId'; -} & ResourceIdDatasetId | { - type: 'Layer'; -} & ResourceIdLayer | { - type: 'LayerCollection'; -} & ResourceIdLayerCollection | { - type: 'MlModel'; -} & ResourceIdMlModel | { - type: 'Project'; -} & ResourceIdProject; -export declare function ResourceIdFromJSON(json: any): ResourceId; -export declare function ResourceIdFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceId; -export declare function ResourceIdToJSON(json: any): any; -export declare function ResourceIdToJSONTyped(value?: ResourceId | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/ResourceId.js b/typescript/dist/models/ResourceId.js deleted file mode 100644 index 1bb71804..00000000 --- a/typescript/dist/models/ResourceId.js +++ /dev/null @@ -1,68 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ResourceIdFromJSON = ResourceIdFromJSON; -exports.ResourceIdFromJSONTyped = ResourceIdFromJSONTyped; -exports.ResourceIdToJSON = ResourceIdToJSON; -exports.ResourceIdToJSONTyped = ResourceIdToJSONTyped; -const ResourceIdDatasetId_1 = require("./ResourceIdDatasetId"); -const ResourceIdLayer_1 = require("./ResourceIdLayer"); -const ResourceIdLayerCollection_1 = require("./ResourceIdLayerCollection"); -const ResourceIdMlModel_1 = require("./ResourceIdMlModel"); -const ResourceIdProject_1 = require("./ResourceIdProject"); -function ResourceIdFromJSON(json) { - return ResourceIdFromJSONTyped(json, false); -} -function ResourceIdFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - switch (json['type']) { - case 'DatasetId': - return Object.assign({}, (0, ResourceIdDatasetId_1.ResourceIdDatasetIdFromJSONTyped)(json, true), { type: 'DatasetId' }); - case 'Layer': - return Object.assign({}, (0, ResourceIdLayer_1.ResourceIdLayerFromJSONTyped)(json, true), { type: 'Layer' }); - case 'LayerCollection': - return Object.assign({}, (0, ResourceIdLayerCollection_1.ResourceIdLayerCollectionFromJSONTyped)(json, true), { type: 'LayerCollection' }); - case 'MlModel': - return Object.assign({}, (0, ResourceIdMlModel_1.ResourceIdMlModelFromJSONTyped)(json, true), { type: 'MlModel' }); - case 'Project': - return Object.assign({}, (0, ResourceIdProject_1.ResourceIdProjectFromJSONTyped)(json, true), { type: 'Project' }); - default: - throw new Error(`No variant of ResourceId exists with 'type=${json['type']}'`); - } -} -function ResourceIdToJSON(json) { - return ResourceIdToJSONTyped(json, false); -} -function ResourceIdToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - switch (value['type']) { - case 'DatasetId': - return Object.assign({}, (0, ResourceIdDatasetId_1.ResourceIdDatasetIdToJSON)(value), { type: 'DatasetId' }); - case 'Layer': - return Object.assign({}, (0, ResourceIdLayer_1.ResourceIdLayerToJSON)(value), { type: 'Layer' }); - case 'LayerCollection': - return Object.assign({}, (0, ResourceIdLayerCollection_1.ResourceIdLayerCollectionToJSON)(value), { type: 'LayerCollection' }); - case 'MlModel': - return Object.assign({}, (0, ResourceIdMlModel_1.ResourceIdMlModelToJSON)(value), { type: 'MlModel' }); - case 'Project': - return Object.assign({}, (0, ResourceIdProject_1.ResourceIdProjectToJSON)(value), { type: 'Project' }); - default: - throw new Error(`No variant of ResourceId exists with 'type=${value['type']}'`); - } -} diff --git a/typescript/dist/models/ResourceIdDatasetId.d.ts b/typescript/dist/models/ResourceIdDatasetId.d.ts deleted file mode 100644 index 9d2b4942..00000000 --- a/typescript/dist/models/ResourceIdDatasetId.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface ResourceIdDatasetId - */ -export interface ResourceIdDatasetId { - /** - * - * @type {string} - * @memberof ResourceIdDatasetId - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdDatasetId - */ - type: ResourceIdDatasetIdTypeEnum; -} -/** - * @export - */ -export declare const ResourceIdDatasetIdTypeEnum: { - readonly DatasetId: "DatasetId"; -}; -export type ResourceIdDatasetIdTypeEnum = typeof ResourceIdDatasetIdTypeEnum[keyof typeof ResourceIdDatasetIdTypeEnum]; -/** - * Check if a given object implements the ResourceIdDatasetId interface. - */ -export declare function instanceOfResourceIdDatasetId(value: object): value is ResourceIdDatasetId; -export declare function ResourceIdDatasetIdFromJSON(json: any): ResourceIdDatasetId; -export declare function ResourceIdDatasetIdFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdDatasetId; -export declare function ResourceIdDatasetIdToJSON(json: any): ResourceIdDatasetId; -export declare function ResourceIdDatasetIdToJSONTyped(value?: ResourceIdDatasetId | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/ResourceIdDatasetId.js b/typescript/dist/models/ResourceIdDatasetId.js deleted file mode 100644 index 2a9f6884..00000000 --- a/typescript/dist/models/ResourceIdDatasetId.js +++ /dev/null @@ -1,61 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ResourceIdDatasetIdTypeEnum = void 0; -exports.instanceOfResourceIdDatasetId = instanceOfResourceIdDatasetId; -exports.ResourceIdDatasetIdFromJSON = ResourceIdDatasetIdFromJSON; -exports.ResourceIdDatasetIdFromJSONTyped = ResourceIdDatasetIdFromJSONTyped; -exports.ResourceIdDatasetIdToJSON = ResourceIdDatasetIdToJSON; -exports.ResourceIdDatasetIdToJSONTyped = ResourceIdDatasetIdToJSONTyped; -/** - * @export - */ -exports.ResourceIdDatasetIdTypeEnum = { - DatasetId: 'DatasetId' -}; -/** - * Check if a given object implements the ResourceIdDatasetId interface. - */ -function instanceOfResourceIdDatasetId(value) { - if (!('id' in value) || value['id'] === undefined) - return false; - if (!('type' in value) || value['type'] === undefined) - return false; - return true; -} -function ResourceIdDatasetIdFromJSON(json) { - return ResourceIdDatasetIdFromJSONTyped(json, false); -} -function ResourceIdDatasetIdFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'id': json['id'], - 'type': json['type'], - }; -} -function ResourceIdDatasetIdToJSON(json) { - return ResourceIdDatasetIdToJSONTyped(json, false); -} -function ResourceIdDatasetIdToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'id': value['id'], - 'type': value['type'], - }; -} diff --git a/typescript/dist/models/ResourceIdLayer.d.ts b/typescript/dist/models/ResourceIdLayer.d.ts deleted file mode 100644 index d68024e6..00000000 --- a/typescript/dist/models/ResourceIdLayer.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface ResourceIdLayer - */ -export interface ResourceIdLayer { - /** - * - * @type {string} - * @memberof ResourceIdLayer - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdLayer - */ - type: ResourceIdLayerTypeEnum; -} -/** - * @export - */ -export declare const ResourceIdLayerTypeEnum: { - readonly Layer: "Layer"; -}; -export type ResourceIdLayerTypeEnum = typeof ResourceIdLayerTypeEnum[keyof typeof ResourceIdLayerTypeEnum]; -/** - * Check if a given object implements the ResourceIdLayer interface. - */ -export declare function instanceOfResourceIdLayer(value: object): value is ResourceIdLayer; -export declare function ResourceIdLayerFromJSON(json: any): ResourceIdLayer; -export declare function ResourceIdLayerFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdLayer; -export declare function ResourceIdLayerToJSON(json: any): ResourceIdLayer; -export declare function ResourceIdLayerToJSONTyped(value?: ResourceIdLayer | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/ResourceIdLayer.js b/typescript/dist/models/ResourceIdLayer.js deleted file mode 100644 index 89a19bfc..00000000 --- a/typescript/dist/models/ResourceIdLayer.js +++ /dev/null @@ -1,61 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ResourceIdLayerTypeEnum = void 0; -exports.instanceOfResourceIdLayer = instanceOfResourceIdLayer; -exports.ResourceIdLayerFromJSON = ResourceIdLayerFromJSON; -exports.ResourceIdLayerFromJSONTyped = ResourceIdLayerFromJSONTyped; -exports.ResourceIdLayerToJSON = ResourceIdLayerToJSON; -exports.ResourceIdLayerToJSONTyped = ResourceIdLayerToJSONTyped; -/** - * @export - */ -exports.ResourceIdLayerTypeEnum = { - Layer: 'Layer' -}; -/** - * Check if a given object implements the ResourceIdLayer interface. - */ -function instanceOfResourceIdLayer(value) { - if (!('id' in value) || value['id'] === undefined) - return false; - if (!('type' in value) || value['type'] === undefined) - return false; - return true; -} -function ResourceIdLayerFromJSON(json) { - return ResourceIdLayerFromJSONTyped(json, false); -} -function ResourceIdLayerFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'id': json['id'], - 'type': json['type'], - }; -} -function ResourceIdLayerToJSON(json) { - return ResourceIdLayerToJSONTyped(json, false); -} -function ResourceIdLayerToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'id': value['id'], - 'type': value['type'], - }; -} diff --git a/typescript/dist/models/ResourceIdLayerCollection.d.ts b/typescript/dist/models/ResourceIdLayerCollection.d.ts deleted file mode 100644 index 51e94abb..00000000 --- a/typescript/dist/models/ResourceIdLayerCollection.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface ResourceIdLayerCollection - */ -export interface ResourceIdLayerCollection { - /** - * - * @type {string} - * @memberof ResourceIdLayerCollection - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdLayerCollection - */ - type: ResourceIdLayerCollectionTypeEnum; -} -/** - * @export - */ -export declare const ResourceIdLayerCollectionTypeEnum: { - readonly LayerCollection: "LayerCollection"; -}; -export type ResourceIdLayerCollectionTypeEnum = typeof ResourceIdLayerCollectionTypeEnum[keyof typeof ResourceIdLayerCollectionTypeEnum]; -/** - * Check if a given object implements the ResourceIdLayerCollection interface. - */ -export declare function instanceOfResourceIdLayerCollection(value: object): value is ResourceIdLayerCollection; -export declare function ResourceIdLayerCollectionFromJSON(json: any): ResourceIdLayerCollection; -export declare function ResourceIdLayerCollectionFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdLayerCollection; -export declare function ResourceIdLayerCollectionToJSON(json: any): ResourceIdLayerCollection; -export declare function ResourceIdLayerCollectionToJSONTyped(value?: ResourceIdLayerCollection | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/ResourceIdLayerCollection.js b/typescript/dist/models/ResourceIdLayerCollection.js deleted file mode 100644 index 2a702474..00000000 --- a/typescript/dist/models/ResourceIdLayerCollection.js +++ /dev/null @@ -1,61 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ResourceIdLayerCollectionTypeEnum = void 0; -exports.instanceOfResourceIdLayerCollection = instanceOfResourceIdLayerCollection; -exports.ResourceIdLayerCollectionFromJSON = ResourceIdLayerCollectionFromJSON; -exports.ResourceIdLayerCollectionFromJSONTyped = ResourceIdLayerCollectionFromJSONTyped; -exports.ResourceIdLayerCollectionToJSON = ResourceIdLayerCollectionToJSON; -exports.ResourceIdLayerCollectionToJSONTyped = ResourceIdLayerCollectionToJSONTyped; -/** - * @export - */ -exports.ResourceIdLayerCollectionTypeEnum = { - LayerCollection: 'LayerCollection' -}; -/** - * Check if a given object implements the ResourceIdLayerCollection interface. - */ -function instanceOfResourceIdLayerCollection(value) { - if (!('id' in value) || value['id'] === undefined) - return false; - if (!('type' in value) || value['type'] === undefined) - return false; - return true; -} -function ResourceIdLayerCollectionFromJSON(json) { - return ResourceIdLayerCollectionFromJSONTyped(json, false); -} -function ResourceIdLayerCollectionFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'id': json['id'], - 'type': json['type'], - }; -} -function ResourceIdLayerCollectionToJSON(json) { - return ResourceIdLayerCollectionToJSONTyped(json, false); -} -function ResourceIdLayerCollectionToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'id': value['id'], - 'type': value['type'], - }; -} diff --git a/typescript/dist/models/ResourceIdMlModel.d.ts b/typescript/dist/models/ResourceIdMlModel.d.ts deleted file mode 100644 index a7e47a2a..00000000 --- a/typescript/dist/models/ResourceIdMlModel.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface ResourceIdMlModel - */ -export interface ResourceIdMlModel { - /** - * - * @type {string} - * @memberof ResourceIdMlModel - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdMlModel - */ - type: ResourceIdMlModelTypeEnum; -} -/** - * @export - */ -export declare const ResourceIdMlModelTypeEnum: { - readonly MlModel: "MlModel"; -}; -export type ResourceIdMlModelTypeEnum = typeof ResourceIdMlModelTypeEnum[keyof typeof ResourceIdMlModelTypeEnum]; -/** - * Check if a given object implements the ResourceIdMlModel interface. - */ -export declare function instanceOfResourceIdMlModel(value: object): value is ResourceIdMlModel; -export declare function ResourceIdMlModelFromJSON(json: any): ResourceIdMlModel; -export declare function ResourceIdMlModelFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdMlModel; -export declare function ResourceIdMlModelToJSON(json: any): ResourceIdMlModel; -export declare function ResourceIdMlModelToJSONTyped(value?: ResourceIdMlModel | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/ResourceIdMlModel.js b/typescript/dist/models/ResourceIdMlModel.js deleted file mode 100644 index 3a172ca2..00000000 --- a/typescript/dist/models/ResourceIdMlModel.js +++ /dev/null @@ -1,61 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ResourceIdMlModelTypeEnum = void 0; -exports.instanceOfResourceIdMlModel = instanceOfResourceIdMlModel; -exports.ResourceIdMlModelFromJSON = ResourceIdMlModelFromJSON; -exports.ResourceIdMlModelFromJSONTyped = ResourceIdMlModelFromJSONTyped; -exports.ResourceIdMlModelToJSON = ResourceIdMlModelToJSON; -exports.ResourceIdMlModelToJSONTyped = ResourceIdMlModelToJSONTyped; -/** - * @export - */ -exports.ResourceIdMlModelTypeEnum = { - MlModel: 'MlModel' -}; -/** - * Check if a given object implements the ResourceIdMlModel interface. - */ -function instanceOfResourceIdMlModel(value) { - if (!('id' in value) || value['id'] === undefined) - return false; - if (!('type' in value) || value['type'] === undefined) - return false; - return true; -} -function ResourceIdMlModelFromJSON(json) { - return ResourceIdMlModelFromJSONTyped(json, false); -} -function ResourceIdMlModelFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'id': json['id'], - 'type': json['type'], - }; -} -function ResourceIdMlModelToJSON(json) { - return ResourceIdMlModelToJSONTyped(json, false); -} -function ResourceIdMlModelToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'id': value['id'], - 'type': value['type'], - }; -} diff --git a/typescript/dist/models/ResourceIdProject.d.ts b/typescript/dist/models/ResourceIdProject.d.ts deleted file mode 100644 index ed026316..00000000 --- a/typescript/dist/models/ResourceIdProject.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface ResourceIdProject - */ -export interface ResourceIdProject { - /** - * - * @type {string} - * @memberof ResourceIdProject - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdProject - */ - type: ResourceIdProjectTypeEnum; -} -/** - * @export - */ -export declare const ResourceIdProjectTypeEnum: { - readonly Project: "Project"; -}; -export type ResourceIdProjectTypeEnum = typeof ResourceIdProjectTypeEnum[keyof typeof ResourceIdProjectTypeEnum]; -/** - * Check if a given object implements the ResourceIdProject interface. - */ -export declare function instanceOfResourceIdProject(value: object): value is ResourceIdProject; -export declare function ResourceIdProjectFromJSON(json: any): ResourceIdProject; -export declare function ResourceIdProjectFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdProject; -export declare function ResourceIdProjectToJSON(json: any): ResourceIdProject; -export declare function ResourceIdProjectToJSONTyped(value?: ResourceIdProject | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/ResourceIdProject.js b/typescript/dist/models/ResourceIdProject.js deleted file mode 100644 index ace07ef5..00000000 --- a/typescript/dist/models/ResourceIdProject.js +++ /dev/null @@ -1,61 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.ResourceIdProjectTypeEnum = void 0; -exports.instanceOfResourceIdProject = instanceOfResourceIdProject; -exports.ResourceIdProjectFromJSON = ResourceIdProjectFromJSON; -exports.ResourceIdProjectFromJSONTyped = ResourceIdProjectFromJSONTyped; -exports.ResourceIdProjectToJSON = ResourceIdProjectToJSON; -exports.ResourceIdProjectToJSONTyped = ResourceIdProjectToJSONTyped; -/** - * @export - */ -exports.ResourceIdProjectTypeEnum = { - Project: 'Project' -}; -/** - * Check if a given object implements the ResourceIdProject interface. - */ -function instanceOfResourceIdProject(value) { - if (!('id' in value) || value['id'] === undefined) - return false; - if (!('type' in value) || value['type'] === undefined) - return false; - return true; -} -function ResourceIdProjectFromJSON(json) { - return ResourceIdProjectFromJSONTyped(json, false); -} -function ResourceIdProjectFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'id': json['id'], - 'type': json['type'], - }; -} -function ResourceIdProjectToJSON(json) { - return ResourceIdProjectToJSONTyped(json, false); -} -function ResourceIdProjectToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'id': value['id'], - 'type': value['type'], - }; -} diff --git a/typescript/dist/models/RgbaColorizer.d.ts b/typescript/dist/models/RgbaColorizer.d.ts deleted file mode 100644 index fbe1a1ec..00000000 --- a/typescript/dist/models/RgbaColorizer.d.ts +++ /dev/null @@ -1,38 +0,0 @@ -/** - * Geo Engine Pro API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface RgbaColorizer - */ -export interface RgbaColorizer { - /** - * - * @type {string} - * @memberof RgbaColorizer - */ - type: RgbaColorizerTypeEnum; -} -/** - * @export - */ -export declare const RgbaColorizerTypeEnum: { - readonly Rgba: "rgba"; -}; -export type RgbaColorizerTypeEnum = typeof RgbaColorizerTypeEnum[keyof typeof RgbaColorizerTypeEnum]; -/** - * Check if a given object implements the RgbaColorizer interface. - */ -export declare function instanceOfRgbaColorizer(value: object): boolean; -export declare function RgbaColorizerFromJSON(json: any): RgbaColorizer; -export declare function RgbaColorizerFromJSONTyped(json: any, ignoreDiscriminator: boolean): RgbaColorizer; -export declare function RgbaColorizerToJSON(value?: RgbaColorizer | null): any; diff --git a/typescript/dist/models/RgbaColorizer.js b/typescript/dist/models/RgbaColorizer.js deleted file mode 100644 index 147bb07f..00000000 --- a/typescript/dist/models/RgbaColorizer.js +++ /dev/null @@ -1,56 +0,0 @@ -"use strict"; -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine Pro API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -Object.defineProperty(exports, "__esModule", { value: true }); -exports.RgbaColorizerTypeEnum = void 0; -exports.instanceOfRgbaColorizer = instanceOfRgbaColorizer; -exports.RgbaColorizerFromJSON = RgbaColorizerFromJSON; -exports.RgbaColorizerFromJSONTyped = RgbaColorizerFromJSONTyped; -exports.RgbaColorizerToJSON = RgbaColorizerToJSON; -/** - * @export - */ -exports.RgbaColorizerTypeEnum = { - Rgba: 'rgba' -}; -/** - * Check if a given object implements the RgbaColorizer interface. - */ -function instanceOfRgbaColorizer(value) { - let isInstance = true; - isInstance = isInstance && "type" in value; - return isInstance; -} -function RgbaColorizerFromJSON(json) { - return RgbaColorizerFromJSONTyped(json, false); -} -function RgbaColorizerFromJSONTyped(json, ignoreDiscriminator) { - if ((json === undefined) || (json === null)) { - return json; - } - return { - 'type': json['type'], - }; -} -function RgbaColorizerToJSON(value) { - if (value === undefined) { - return undefined; - } - if (value === null) { - return null; - } - return { - 'type': value.type, - }; -} diff --git a/typescript/dist/models/SpatialReferenceSpecification.d.ts b/typescript/dist/models/SpatialReferenceSpecification.d.ts index 125610a4..3b20d2b4 100644 --- a/typescript/dist/models/SpatialReferenceSpecification.d.ts +++ b/typescript/dist/models/SpatialReferenceSpecification.d.ts @@ -23,7 +23,7 @@ export interface SpatialReferenceSpecification { * @type {Array} * @memberof SpatialReferenceSpecification */ - axisLabels?: Array | null; + axisLabels?: Array; /** * * @type {AxisOrder} diff --git a/typescript/dist/models/StaticColor.d.ts b/typescript/dist/models/StaticColor.d.ts new file mode 100644 index 00000000..9a04dea7 --- /dev/null +++ b/typescript/dist/models/StaticColor.d.ts @@ -0,0 +1,45 @@ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.0 + * Contact: dev@geoengine.de + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +/** + * + * @export + * @interface StaticColor + */ +export interface StaticColor { + /** + * + * @type {Array} + * @memberof StaticColor + */ + color: Array; + /** + * + * @type {string} + * @memberof StaticColor + */ + type: StaticColorTypeEnum; +} +/** + * @export + */ +export declare const StaticColorTypeEnum: { + readonly Static: "static"; +}; +export type StaticColorTypeEnum = typeof StaticColorTypeEnum[keyof typeof StaticColorTypeEnum]; +/** + * Check if a given object implements the StaticColor interface. + */ +export declare function instanceOfStaticColor(value: object): value is StaticColor; +export declare function StaticColorFromJSON(json: any): StaticColor; +export declare function StaticColorFromJSONTyped(json: any, ignoreDiscriminator: boolean): StaticColor; +export declare function StaticColorToJSON(json: any): StaticColor; +export declare function StaticColorToJSONTyped(value?: StaticColor | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/ColorParamStatic.js b/typescript/dist/models/StaticColor.js similarity index 54% rename from typescript/dist/models/ColorParamStatic.js rename to typescript/dist/models/StaticColor.js index 5c8a56af..3eec9c9e 100644 --- a/typescript/dist/models/ColorParamStatic.js +++ b/typescript/dist/models/StaticColor.js @@ -13,32 +13,32 @@ * Do not edit the class manually. */ Object.defineProperty(exports, "__esModule", { value: true }); -exports.ColorParamStaticTypeEnum = void 0; -exports.instanceOfColorParamStatic = instanceOfColorParamStatic; -exports.ColorParamStaticFromJSON = ColorParamStaticFromJSON; -exports.ColorParamStaticFromJSONTyped = ColorParamStaticFromJSONTyped; -exports.ColorParamStaticToJSON = ColorParamStaticToJSON; -exports.ColorParamStaticToJSONTyped = ColorParamStaticToJSONTyped; +exports.StaticColorTypeEnum = void 0; +exports.instanceOfStaticColor = instanceOfStaticColor; +exports.StaticColorFromJSON = StaticColorFromJSON; +exports.StaticColorFromJSONTyped = StaticColorFromJSONTyped; +exports.StaticColorToJSON = StaticColorToJSON; +exports.StaticColorToJSONTyped = StaticColorToJSONTyped; /** * @export */ -exports.ColorParamStaticTypeEnum = { +exports.StaticColorTypeEnum = { Static: 'static' }; /** - * Check if a given object implements the ColorParamStatic interface. + * Check if a given object implements the StaticColor interface. */ -function instanceOfColorParamStatic(value) { +function instanceOfStaticColor(value) { if (!('color' in value) || value['color'] === undefined) return false; if (!('type' in value) || value['type'] === undefined) return false; return true; } -function ColorParamStaticFromJSON(json) { - return ColorParamStaticFromJSONTyped(json, false); +function StaticColorFromJSON(json) { + return StaticColorFromJSONTyped(json, false); } -function ColorParamStaticFromJSONTyped(json, ignoreDiscriminator) { +function StaticColorFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } @@ -47,10 +47,10 @@ function ColorParamStaticFromJSONTyped(json, ignoreDiscriminator) { 'type': json['type'], }; } -function ColorParamStaticToJSON(json) { - return ColorParamStaticToJSONTyped(json, false); +function StaticColorToJSON(json) { + return StaticColorToJSONTyped(json, false); } -function ColorParamStaticToJSONTyped(value, ignoreDiscriminator = false) { +function StaticColorToJSONTyped(value, ignoreDiscriminator = false) { if (value == null) { return value; } diff --git a/typescript/dist/models/StaticNumber.d.ts b/typescript/dist/models/StaticNumber.d.ts new file mode 100644 index 00000000..ed7c0b5d --- /dev/null +++ b/typescript/dist/models/StaticNumber.d.ts @@ -0,0 +1,45 @@ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.0 + * Contact: dev@geoengine.de + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ +/** + * + * @export + * @interface StaticNumber + */ +export interface StaticNumber { + /** + * + * @type {string} + * @memberof StaticNumber + */ + type: StaticNumberTypeEnum; + /** + * + * @type {number} + * @memberof StaticNumber + */ + value: number; +} +/** + * @export + */ +export declare const StaticNumberTypeEnum: { + readonly Static: "static"; +}; +export type StaticNumberTypeEnum = typeof StaticNumberTypeEnum[keyof typeof StaticNumberTypeEnum]; +/** + * Check if a given object implements the StaticNumber interface. + */ +export declare function instanceOfStaticNumber(value: object): value is StaticNumber; +export declare function StaticNumberFromJSON(json: any): StaticNumber; +export declare function StaticNumberFromJSONTyped(json: any, ignoreDiscriminator: boolean): StaticNumber; +export declare function StaticNumberToJSON(json: any): StaticNumber; +export declare function StaticNumberToJSONTyped(value?: StaticNumber | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/StaticNumberParam.js b/typescript/dist/models/StaticNumber.js similarity index 53% rename from typescript/dist/models/StaticNumberParam.js rename to typescript/dist/models/StaticNumber.js index 10e30d9b..31890df7 100644 --- a/typescript/dist/models/StaticNumberParam.js +++ b/typescript/dist/models/StaticNumber.js @@ -13,32 +13,32 @@ * Do not edit the class manually. */ Object.defineProperty(exports, "__esModule", { value: true }); -exports.StaticNumberParamTypeEnum = void 0; -exports.instanceOfStaticNumberParam = instanceOfStaticNumberParam; -exports.StaticNumberParamFromJSON = StaticNumberParamFromJSON; -exports.StaticNumberParamFromJSONTyped = StaticNumberParamFromJSONTyped; -exports.StaticNumberParamToJSON = StaticNumberParamToJSON; -exports.StaticNumberParamToJSONTyped = StaticNumberParamToJSONTyped; +exports.StaticNumberTypeEnum = void 0; +exports.instanceOfStaticNumber = instanceOfStaticNumber; +exports.StaticNumberFromJSON = StaticNumberFromJSON; +exports.StaticNumberFromJSONTyped = StaticNumberFromJSONTyped; +exports.StaticNumberToJSON = StaticNumberToJSON; +exports.StaticNumberToJSONTyped = StaticNumberToJSONTyped; /** * @export */ -exports.StaticNumberParamTypeEnum = { +exports.StaticNumberTypeEnum = { Static: 'static' }; /** - * Check if a given object implements the StaticNumberParam interface. + * Check if a given object implements the StaticNumber interface. */ -function instanceOfStaticNumberParam(value) { +function instanceOfStaticNumber(value) { if (!('type' in value) || value['type'] === undefined) return false; if (!('value' in value) || value['value'] === undefined) return false; return true; } -function StaticNumberParamFromJSON(json) { - return StaticNumberParamFromJSONTyped(json, false); +function StaticNumberFromJSON(json) { + return StaticNumberFromJSONTyped(json, false); } -function StaticNumberParamFromJSONTyped(json, ignoreDiscriminator) { +function StaticNumberFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } @@ -47,10 +47,10 @@ function StaticNumberParamFromJSONTyped(json, ignoreDiscriminator) { 'value': json['value'], }; } -function StaticNumberParamToJSON(json) { - return StaticNumberParamToJSONTyped(json, false); +function StaticNumberToJSON(json) { + return StaticNumberToJSONTyped(json, false); } -function StaticNumberParamToJSONTyped(value, ignoreDiscriminator = false) { +function StaticNumberToJSONTyped(value, ignoreDiscriminator = false) { if (value == null) { return value; } diff --git a/typescript/dist/models/StaticNumberParam.d.ts b/typescript/dist/models/StaticNumberParam.d.ts deleted file mode 100644 index f09202f6..00000000 --- a/typescript/dist/models/StaticNumberParam.d.ts +++ /dev/null @@ -1,45 +0,0 @@ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ -/** - * - * @export - * @interface StaticNumberParam - */ -export interface StaticNumberParam { - /** - * - * @type {string} - * @memberof StaticNumberParam - */ - type: StaticNumberParamTypeEnum; - /** - * - * @type {number} - * @memberof StaticNumberParam - */ - value: number; -} -/** - * @export - */ -export declare const StaticNumberParamTypeEnum: { - readonly Static: "static"; -}; -export type StaticNumberParamTypeEnum = typeof StaticNumberParamTypeEnum[keyof typeof StaticNumberParamTypeEnum]; -/** - * Check if a given object implements the StaticNumberParam interface. - */ -export declare function instanceOfStaticNumberParam(value: object): value is StaticNumberParam; -export declare function StaticNumberParamFromJSON(json: any): StaticNumberParam; -export declare function StaticNumberParamFromJSONTyped(json: any, ignoreDiscriminator: boolean): StaticNumberParam; -export declare function StaticNumberParamToJSON(json: any): StaticNumberParam; -export declare function StaticNumberParamToJSONTyped(value?: StaticNumberParam | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/TypedPlotResultDescriptor.d.ts b/typescript/dist/models/TypedPlotResultDescriptor.d.ts index f98a5e4e..d7140281 100644 --- a/typescript/dist/models/TypedPlotResultDescriptor.d.ts +++ b/typescript/dist/models/TypedPlotResultDescriptor.d.ts @@ -9,32 +9,13 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { TimeInterval } from './TimeInterval'; -import type { BoundingBox2D } from './BoundingBox2D'; +import type { PlotResultDescriptor } from './PlotResultDescriptor'; /** - * A `ResultDescriptor` for plot queries + * * @export * @interface TypedPlotResultDescriptor */ -export interface TypedPlotResultDescriptor { - /** - * - * @type {BoundingBox2D} - * @memberof TypedPlotResultDescriptor - */ - bbox?: BoundingBox2D | null; - /** - * - * @type {string} - * @memberof TypedPlotResultDescriptor - */ - spatialReference: string; - /** - * - * @type {TimeInterval} - * @memberof TypedPlotResultDescriptor - */ - time?: TimeInterval | null; +export interface TypedPlotResultDescriptor extends PlotResultDescriptor { /** * * @type {string} diff --git a/typescript/dist/models/TypedPlotResultDescriptor.js b/typescript/dist/models/TypedPlotResultDescriptor.js index a48f88d5..2aeb67f3 100644 --- a/typescript/dist/models/TypedPlotResultDescriptor.js +++ b/typescript/dist/models/TypedPlotResultDescriptor.js @@ -19,8 +19,7 @@ exports.TypedPlotResultDescriptorFromJSON = TypedPlotResultDescriptorFromJSON; exports.TypedPlotResultDescriptorFromJSONTyped = TypedPlotResultDescriptorFromJSONTyped; exports.TypedPlotResultDescriptorToJSON = TypedPlotResultDescriptorToJSON; exports.TypedPlotResultDescriptorToJSONTyped = TypedPlotResultDescriptorToJSONTyped; -const TimeInterval_1 = require("./TimeInterval"); -const BoundingBox2D_1 = require("./BoundingBox2D"); +const PlotResultDescriptor_1 = require("./PlotResultDescriptor"); /** * @export */ @@ -31,8 +30,6 @@ exports.TypedPlotResultDescriptorTypeEnum = { * Check if a given object implements the TypedPlotResultDescriptor interface. */ function instanceOfTypedPlotResultDescriptor(value) { - if (!('spatialReference' in value) || value['spatialReference'] === undefined) - return false; if (!('type' in value) || value['type'] === undefined) return false; return true; @@ -44,12 +41,7 @@ function TypedPlotResultDescriptorFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } - return { - 'bbox': json['bbox'] == null ? undefined : (0, BoundingBox2D_1.BoundingBox2DFromJSON)(json['bbox']), - 'spatialReference': json['spatialReference'], - 'time': json['time'] == null ? undefined : (0, TimeInterval_1.TimeIntervalFromJSON)(json['time']), - 'type': json['type'], - }; + return Object.assign(Object.assign({}, (0, PlotResultDescriptor_1.PlotResultDescriptorFromJSONTyped)(json, true)), { 'type': json['type'] }); } function TypedPlotResultDescriptorToJSON(json) { return TypedPlotResultDescriptorToJSONTyped(json, false); @@ -58,10 +50,5 @@ function TypedPlotResultDescriptorToJSONTyped(value, ignoreDiscriminator = false if (value == null) { return value; } - return { - 'bbox': (0, BoundingBox2D_1.BoundingBox2DToJSON)(value['bbox']), - 'spatialReference': value['spatialReference'], - 'time': (0, TimeInterval_1.TimeIntervalToJSON)(value['time']), - 'type': value['type'], - }; + return Object.assign(Object.assign({}, (0, PlotResultDescriptor_1.PlotResultDescriptorToJSONTyped)(value, true)), { 'type': value['type'] }); } diff --git a/typescript/dist/models/TypedRasterResultDescriptor.d.ts b/typescript/dist/models/TypedRasterResultDescriptor.d.ts index b1b7d737..2e585e9b 100644 --- a/typescript/dist/models/TypedRasterResultDescriptor.d.ts +++ b/typescript/dist/models/TypedRasterResultDescriptor.d.ts @@ -9,53 +9,13 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { SpatialResolution } from './SpatialResolution'; -import type { TimeInterval } from './TimeInterval'; -import type { RasterBandDescriptor } from './RasterBandDescriptor'; -import type { RasterDataType } from './RasterDataType'; -import type { SpatialPartition2D } from './SpatialPartition2D'; +import type { RasterResultDescriptor } from './RasterResultDescriptor'; /** - * A `ResultDescriptor` for raster queries + * * @export * @interface TypedRasterResultDescriptor */ -export interface TypedRasterResultDescriptor { - /** - * - * @type {Array} - * @memberof TypedRasterResultDescriptor - */ - bands: Array; - /** - * - * @type {SpatialPartition2D} - * @memberof TypedRasterResultDescriptor - */ - bbox?: SpatialPartition2D | null; - /** - * - * @type {RasterDataType} - * @memberof TypedRasterResultDescriptor - */ - dataType: RasterDataType; - /** - * - * @type {SpatialResolution} - * @memberof TypedRasterResultDescriptor - */ - resolution?: SpatialResolution | null; - /** - * - * @type {string} - * @memberof TypedRasterResultDescriptor - */ - spatialReference: string; - /** - * - * @type {TimeInterval} - * @memberof TypedRasterResultDescriptor - */ - time?: TimeInterval | null; +export interface TypedRasterResultDescriptor extends RasterResultDescriptor { /** * * @type {string} diff --git a/typescript/dist/models/TypedRasterResultDescriptor.js b/typescript/dist/models/TypedRasterResultDescriptor.js index e00f6ca7..c0e627a5 100644 --- a/typescript/dist/models/TypedRasterResultDescriptor.js +++ b/typescript/dist/models/TypedRasterResultDescriptor.js @@ -19,11 +19,7 @@ exports.TypedRasterResultDescriptorFromJSON = TypedRasterResultDescriptorFromJSO exports.TypedRasterResultDescriptorFromJSONTyped = TypedRasterResultDescriptorFromJSONTyped; exports.TypedRasterResultDescriptorToJSON = TypedRasterResultDescriptorToJSON; exports.TypedRasterResultDescriptorToJSONTyped = TypedRasterResultDescriptorToJSONTyped; -const SpatialResolution_1 = require("./SpatialResolution"); -const TimeInterval_1 = require("./TimeInterval"); -const RasterBandDescriptor_1 = require("./RasterBandDescriptor"); -const RasterDataType_1 = require("./RasterDataType"); -const SpatialPartition2D_1 = require("./SpatialPartition2D"); +const RasterResultDescriptor_1 = require("./RasterResultDescriptor"); /** * @export */ @@ -34,12 +30,6 @@ exports.TypedRasterResultDescriptorTypeEnum = { * Check if a given object implements the TypedRasterResultDescriptor interface. */ function instanceOfTypedRasterResultDescriptor(value) { - if (!('bands' in value) || value['bands'] === undefined) - return false; - if (!('dataType' in value) || value['dataType'] === undefined) - return false; - if (!('spatialReference' in value) || value['spatialReference'] === undefined) - return false; if (!('type' in value) || value['type'] === undefined) return false; return true; @@ -51,15 +41,7 @@ function TypedRasterResultDescriptorFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } - return { - 'bands': (json['bands'].map(RasterBandDescriptor_1.RasterBandDescriptorFromJSON)), - 'bbox': json['bbox'] == null ? undefined : (0, SpatialPartition2D_1.SpatialPartition2DFromJSON)(json['bbox']), - 'dataType': (0, RasterDataType_1.RasterDataTypeFromJSON)(json['dataType']), - 'resolution': json['resolution'] == null ? undefined : (0, SpatialResolution_1.SpatialResolutionFromJSON)(json['resolution']), - 'spatialReference': json['spatialReference'], - 'time': json['time'] == null ? undefined : (0, TimeInterval_1.TimeIntervalFromJSON)(json['time']), - 'type': json['type'], - }; + return Object.assign(Object.assign({}, (0, RasterResultDescriptor_1.RasterResultDescriptorFromJSONTyped)(json, true)), { 'type': json['type'] }); } function TypedRasterResultDescriptorToJSON(json) { return TypedRasterResultDescriptorToJSONTyped(json, false); @@ -68,13 +50,5 @@ function TypedRasterResultDescriptorToJSONTyped(value, ignoreDiscriminator = fal if (value == null) { return value; } - return { - 'bands': (value['bands'].map(RasterBandDescriptor_1.RasterBandDescriptorToJSON)), - 'bbox': (0, SpatialPartition2D_1.SpatialPartition2DToJSON)(value['bbox']), - 'dataType': (0, RasterDataType_1.RasterDataTypeToJSON)(value['dataType']), - 'resolution': (0, SpatialResolution_1.SpatialResolutionToJSON)(value['resolution']), - 'spatialReference': value['spatialReference'], - 'time': (0, TimeInterval_1.TimeIntervalToJSON)(value['time']), - 'type': value['type'], - }; + return Object.assign(Object.assign({}, (0, RasterResultDescriptor_1.RasterResultDescriptorToJSONTyped)(value, true)), { 'type': value['type'] }); } diff --git a/typescript/dist/models/TypedVectorResultDescriptor.d.ts b/typescript/dist/models/TypedVectorResultDescriptor.d.ts index a72f8495..fce3b3a9 100644 --- a/typescript/dist/models/TypedVectorResultDescriptor.d.ts +++ b/typescript/dist/models/TypedVectorResultDescriptor.d.ts @@ -9,48 +9,13 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { VectorDataType } from './VectorDataType'; -import type { TimeInterval } from './TimeInterval'; -import type { VectorColumnInfo } from './VectorColumnInfo'; -import type { BoundingBox2D } from './BoundingBox2D'; +import type { VectorResultDescriptor } from './VectorResultDescriptor'; /** * * @export * @interface TypedVectorResultDescriptor */ -export interface TypedVectorResultDescriptor { - /** - * - * @type {BoundingBox2D} - * @memberof TypedVectorResultDescriptor - */ - bbox?: BoundingBox2D | null; - /** - * - * @type {{ [key: string]: VectorColumnInfo; }} - * @memberof TypedVectorResultDescriptor - */ - columns: { - [key: string]: VectorColumnInfo; - }; - /** - * - * @type {VectorDataType} - * @memberof TypedVectorResultDescriptor - */ - dataType: VectorDataType; - /** - * - * @type {string} - * @memberof TypedVectorResultDescriptor - */ - spatialReference: string; - /** - * - * @type {TimeInterval} - * @memberof TypedVectorResultDescriptor - */ - time?: TimeInterval | null; +export interface TypedVectorResultDescriptor extends VectorResultDescriptor { /** * * @type {string} diff --git a/typescript/dist/models/TypedVectorResultDescriptor.js b/typescript/dist/models/TypedVectorResultDescriptor.js index e63c3b6e..aece981f 100644 --- a/typescript/dist/models/TypedVectorResultDescriptor.js +++ b/typescript/dist/models/TypedVectorResultDescriptor.js @@ -19,11 +19,7 @@ exports.TypedVectorResultDescriptorFromJSON = TypedVectorResultDescriptorFromJSO exports.TypedVectorResultDescriptorFromJSONTyped = TypedVectorResultDescriptorFromJSONTyped; exports.TypedVectorResultDescriptorToJSON = TypedVectorResultDescriptorToJSON; exports.TypedVectorResultDescriptorToJSONTyped = TypedVectorResultDescriptorToJSONTyped; -const runtime_1 = require("../runtime"); -const VectorDataType_1 = require("./VectorDataType"); -const TimeInterval_1 = require("./TimeInterval"); -const VectorColumnInfo_1 = require("./VectorColumnInfo"); -const BoundingBox2D_1 = require("./BoundingBox2D"); +const VectorResultDescriptor_1 = require("./VectorResultDescriptor"); /** * @export */ @@ -34,12 +30,6 @@ exports.TypedVectorResultDescriptorTypeEnum = { * Check if a given object implements the TypedVectorResultDescriptor interface. */ function instanceOfTypedVectorResultDescriptor(value) { - if (!('columns' in value) || value['columns'] === undefined) - return false; - if (!('dataType' in value) || value['dataType'] === undefined) - return false; - if (!('spatialReference' in value) || value['spatialReference'] === undefined) - return false; if (!('type' in value) || value['type'] === undefined) return false; return true; @@ -51,14 +41,7 @@ function TypedVectorResultDescriptorFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } - return { - 'bbox': json['bbox'] == null ? undefined : (0, BoundingBox2D_1.BoundingBox2DFromJSON)(json['bbox']), - 'columns': ((0, runtime_1.mapValues)(json['columns'], VectorColumnInfo_1.VectorColumnInfoFromJSON)), - 'dataType': (0, VectorDataType_1.VectorDataTypeFromJSON)(json['dataType']), - 'spatialReference': json['spatialReference'], - 'time': json['time'] == null ? undefined : (0, TimeInterval_1.TimeIntervalFromJSON)(json['time']), - 'type': json['type'], - }; + return Object.assign(Object.assign({}, (0, VectorResultDescriptor_1.VectorResultDescriptorFromJSONTyped)(json, true)), { 'type': json['type'] }); } function TypedVectorResultDescriptorToJSON(json) { return TypedVectorResultDescriptorToJSONTyped(json, false); @@ -67,12 +50,5 @@ function TypedVectorResultDescriptorToJSONTyped(value, ignoreDiscriminator = fal if (value == null) { return value; } - return { - 'bbox': (0, BoundingBox2D_1.BoundingBox2DToJSON)(value['bbox']), - 'columns': ((0, runtime_1.mapValues)(value['columns'], VectorColumnInfo_1.VectorColumnInfoToJSON)), - 'dataType': (0, VectorDataType_1.VectorDataTypeToJSON)(value['dataType']), - 'spatialReference': value['spatialReference'], - 'time': (0, TimeInterval_1.TimeIntervalToJSON)(value['time']), - 'type': value['type'], - }; + return Object.assign(Object.assign({}, (0, VectorResultDescriptor_1.VectorResultDescriptorToJSONTyped)(value, true)), { 'type': value['type'] }); } diff --git a/typescript/dist/models/UpdateProject.d.ts b/typescript/dist/models/UpdateProject.d.ts index 53a9a8c8..092614ce 100644 --- a/typescript/dist/models/UpdateProject.d.ts +++ b/typescript/dist/models/UpdateProject.d.ts @@ -10,9 +10,8 @@ * Do not edit the class manually. */ import type { TimeStep } from './TimeStep'; -import type { PlotUpdate } from './PlotUpdate'; import type { STRectangle } from './STRectangle'; -import type { LayerUpdate } from './LayerUpdate'; +import type { VecUpdate } from './VecUpdate'; /** * * @export @@ -39,10 +38,10 @@ export interface UpdateProject { id: string; /** * - * @type {Array} + * @type {Array} * @memberof UpdateProject */ - layers?: Array | null; + layers?: Array | null; /** * * @type {string} @@ -51,10 +50,10 @@ export interface UpdateProject { name?: string | null; /** * - * @type {Array} + * @type {Array} * @memberof UpdateProject */ - plots?: Array | null; + plots?: Array | null; /** * * @type {TimeStep} diff --git a/typescript/dist/models/UpdateProject.js b/typescript/dist/models/UpdateProject.js index 63a0f8c8..f8ba4bd7 100644 --- a/typescript/dist/models/UpdateProject.js +++ b/typescript/dist/models/UpdateProject.js @@ -19,9 +19,8 @@ exports.UpdateProjectFromJSONTyped = UpdateProjectFromJSONTyped; exports.UpdateProjectToJSON = UpdateProjectToJSON; exports.UpdateProjectToJSONTyped = UpdateProjectToJSONTyped; const TimeStep_1 = require("./TimeStep"); -const PlotUpdate_1 = require("./PlotUpdate"); const STRectangle_1 = require("./STRectangle"); -const LayerUpdate_1 = require("./LayerUpdate"); +const VecUpdate_1 = require("./VecUpdate"); /** * Check if a given object implements the UpdateProject interface. */ @@ -41,9 +40,9 @@ function UpdateProjectFromJSONTyped(json, ignoreDiscriminator) { 'bounds': json['bounds'] == null ? undefined : (0, STRectangle_1.STRectangleFromJSON)(json['bounds']), 'description': json['description'] == null ? undefined : json['description'], 'id': json['id'], - 'layers': json['layers'] == null ? undefined : (json['layers'].map(LayerUpdate_1.LayerUpdateFromJSON)), + 'layers': json['layers'] == null ? undefined : (json['layers'].map(VecUpdate_1.VecUpdateFromJSON)), 'name': json['name'] == null ? undefined : json['name'], - 'plots': json['plots'] == null ? undefined : (json['plots'].map(PlotUpdate_1.PlotUpdateFromJSON)), + 'plots': json['plots'] == null ? undefined : (json['plots'].map(VecUpdate_1.VecUpdateFromJSON)), 'timeStep': json['timeStep'] == null ? undefined : (0, TimeStep_1.TimeStepFromJSON)(json['timeStep']), }; } @@ -58,9 +57,9 @@ function UpdateProjectToJSONTyped(value, ignoreDiscriminator = false) { 'bounds': (0, STRectangle_1.STRectangleToJSON)(value['bounds']), 'description': value['description'], 'id': value['id'], - 'layers': value['layers'] == null ? undefined : (value['layers'].map(LayerUpdate_1.LayerUpdateToJSON)), + 'layers': value['layers'] == null ? undefined : (value['layers'].map(VecUpdate_1.VecUpdateToJSON)), 'name': value['name'], - 'plots': value['plots'] == null ? undefined : (value['plots'].map(PlotUpdate_1.PlotUpdateToJSON)), + 'plots': value['plots'] == null ? undefined : (value['plots'].map(VecUpdate_1.VecUpdateToJSON)), 'timeStep': (0, TimeStep_1.TimeStepToJSON)(value['timeStep']), }; } diff --git a/typescript/dist/models/UserSession.d.ts b/typescript/dist/models/UserSession.d.ts index 17e32e54..38531122 100644 --- a/typescript/dist/models/UserSession.d.ts +++ b/typescript/dist/models/UserSession.d.ts @@ -34,7 +34,7 @@ export interface UserSession { * @type {string} * @memberof UserSession */ - project?: string | null; + project?: string; /** * * @type {Array} diff --git a/typescript/dist/models/PlotUpdate.d.ts b/typescript/dist/models/VecUpdate.d.ts similarity index 55% rename from typescript/dist/models/PlotUpdate.d.ts rename to typescript/dist/models/VecUpdate.d.ts index d72055db..ececaa28 100644 --- a/typescript/dist/models/PlotUpdate.d.ts +++ b/typescript/dist/models/VecUpdate.d.ts @@ -12,12 +12,12 @@ import type { Plot } from './Plot'; import type { ProjectUpdateToken } from './ProjectUpdateToken'; /** - * @type PlotUpdate + * @type VecUpdate * * @export */ -export type PlotUpdate = Plot | ProjectUpdateToken; -export declare function PlotUpdateFromJSON(json: any): PlotUpdate; -export declare function PlotUpdateFromJSONTyped(json: any, ignoreDiscriminator: boolean): PlotUpdate; -export declare function PlotUpdateToJSON(json: any): any; -export declare function PlotUpdateToJSONTyped(value?: PlotUpdate | null, ignoreDiscriminator?: boolean): any; +export type VecUpdate = Plot | ProjectUpdateToken; +export declare function VecUpdateFromJSON(json: any): VecUpdate; +export declare function VecUpdateFromJSONTyped(json: any, ignoreDiscriminator: boolean): VecUpdate; +export declare function VecUpdateToJSON(json: any): any; +export declare function VecUpdateToJSONTyped(value?: VecUpdate | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/PlotUpdate.js b/typescript/dist/models/VecUpdate.js similarity index 71% rename from typescript/dist/models/PlotUpdate.js rename to typescript/dist/models/VecUpdate.js index cbe0a748..e12c74a5 100644 --- a/typescript/dist/models/PlotUpdate.js +++ b/typescript/dist/models/VecUpdate.js @@ -13,16 +13,16 @@ * Do not edit the class manually. */ Object.defineProperty(exports, "__esModule", { value: true }); -exports.PlotUpdateFromJSON = PlotUpdateFromJSON; -exports.PlotUpdateFromJSONTyped = PlotUpdateFromJSONTyped; -exports.PlotUpdateToJSON = PlotUpdateToJSON; -exports.PlotUpdateToJSONTyped = PlotUpdateToJSONTyped; +exports.VecUpdateFromJSON = VecUpdateFromJSON; +exports.VecUpdateFromJSONTyped = VecUpdateFromJSONTyped; +exports.VecUpdateToJSON = VecUpdateToJSON; +exports.VecUpdateToJSONTyped = VecUpdateToJSONTyped; const Plot_1 = require("./Plot"); const ProjectUpdateToken_1 = require("./ProjectUpdateToken"); -function PlotUpdateFromJSON(json) { - return PlotUpdateFromJSONTyped(json, false); +function VecUpdateFromJSON(json) { + return VecUpdateFromJSONTyped(json, false); } -function PlotUpdateFromJSONTyped(json, ignoreDiscriminator) { +function VecUpdateFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } @@ -34,10 +34,10 @@ function PlotUpdateFromJSONTyped(json, ignoreDiscriminator) { } return {}; } -function PlotUpdateToJSON(json) { - return PlotUpdateToJSONTyped(json, false); +function VecUpdateToJSON(json) { + return VecUpdateToJSONTyped(json, false); } -function PlotUpdateToJSONTyped(value, ignoreDiscriminator = false) { +function VecUpdateToJSONTyped(value, ignoreDiscriminator = false) { if (value == null) { return value; } diff --git a/typescript/dist/models/index.d.ts b/typescript/dist/models/index.d.ts index 4bfa5fb5..636d9880 100644 --- a/typescript/dist/models/index.d.ts +++ b/typescript/dist/models/index.d.ts @@ -1,4 +1,3 @@ -export * from './AddCollection200Response'; export * from './AddDataset'; export * from './AddLayer'; export * from './AddLayerCollection'; @@ -13,13 +12,11 @@ export * from './ClassificationMeasurement'; export * from './CollectionItem'; export * from './CollectionType'; export * from './ColorParam'; -export * from './ColorParamStatic'; export * from './Colorizer'; export * from './ComputationQuota'; export * from './ContinuousMeasurement'; export * from './Coordinate2D'; export * from './CreateDataset'; -export * from './CreateDatasetHandler200Response'; export * from './CreateProject'; export * from './CsvHeader'; export * from './DataId'; @@ -31,8 +28,8 @@ export * from './DataUsageSummary'; export * from './Dataset'; export * from './DatasetDefinition'; export * from './DatasetListing'; +export * from './DatasetNameResponse'; export * from './DatasetResource'; -export * from './DateTime'; export * from './DerivedColor'; export * from './DerivedNumber'; export * from './DescribeCoverageRequest'; @@ -62,7 +59,7 @@ export * from './GetLegendGraphicRequest'; export * from './GetMapExceptionFormat'; export * from './GetMapFormat'; export * from './GetMapRequest'; -export * from './InlineObject'; +export * from './IdResponse'; export * from './InternalDataId'; export * from './Layer'; export * from './LayerCollection'; @@ -70,7 +67,6 @@ export * from './LayerCollectionListing'; export * from './LayerCollectionResource'; export * from './LayerListing'; export * from './LayerResource'; -export * from './LayerUpdate'; export * from './LayerVisibility'; export * from './LineSymbology'; export * from './LinearGradient'; @@ -117,7 +113,6 @@ export * from './Plot'; export * from './PlotOutputFormat'; export * from './PlotQueryRectangle'; export * from './PlotResultDescriptor'; -export * from './PlotUpdate'; export * from './PointSymbology'; export * from './PolygonSymbology'; export * from './Project'; @@ -146,12 +141,6 @@ export * from './RasterResultDescriptor'; export * from './RasterStreamWebsocketResultType'; export * from './RasterSymbology'; export * from './Resource'; -export * from './ResourceId'; -export * from './ResourceIdDatasetId'; -export * from './ResourceIdLayer'; -export * from './ResourceIdLayerCollection'; -export * from './ResourceIdMlModel'; -export * from './ResourceIdProject'; export * from './Role'; export * from './RoleDescription'; export * from './STRectangle'; @@ -164,7 +153,8 @@ export * from './SpatialPartition2D'; export * from './SpatialReferenceAuthority'; export * from './SpatialReferenceSpecification'; export * from './SpatialResolution'; -export * from './StaticNumberParam'; +export * from './StaticColor'; +export * from './StaticNumber'; export * from './StrokeParam'; export * from './SuggestMetaData'; export * from './Symbology'; @@ -208,6 +198,7 @@ export * from './UserCredentials'; export * from './UserInfo'; export * from './UserRegistration'; export * from './UserSession'; +export * from './VecUpdate'; export * from './VectorColumnInfo'; export * from './VectorDataType'; export * from './VectorQueryRectangle'; diff --git a/typescript/dist/models/index.js b/typescript/dist/models/index.js index bfb06712..b17b6c8d 100644 --- a/typescript/dist/models/index.js +++ b/typescript/dist/models/index.js @@ -16,7 +16,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) { Object.defineProperty(exports, "__esModule", { value: true }); /* tslint:disable */ /* eslint-disable */ -__exportStar(require("./AddCollection200Response"), exports); __exportStar(require("./AddDataset"), exports); __exportStar(require("./AddLayer"), exports); __exportStar(require("./AddLayerCollection"), exports); @@ -31,13 +30,11 @@ __exportStar(require("./ClassificationMeasurement"), exports); __exportStar(require("./CollectionItem"), exports); __exportStar(require("./CollectionType"), exports); __exportStar(require("./ColorParam"), exports); -__exportStar(require("./ColorParamStatic"), exports); __exportStar(require("./Colorizer"), exports); __exportStar(require("./ComputationQuota"), exports); __exportStar(require("./ContinuousMeasurement"), exports); __exportStar(require("./Coordinate2D"), exports); __exportStar(require("./CreateDataset"), exports); -__exportStar(require("./CreateDatasetHandler200Response"), exports); __exportStar(require("./CreateProject"), exports); __exportStar(require("./CsvHeader"), exports); __exportStar(require("./DataId"), exports); @@ -49,8 +46,8 @@ __exportStar(require("./DataUsageSummary"), exports); __exportStar(require("./Dataset"), exports); __exportStar(require("./DatasetDefinition"), exports); __exportStar(require("./DatasetListing"), exports); +__exportStar(require("./DatasetNameResponse"), exports); __exportStar(require("./DatasetResource"), exports); -__exportStar(require("./DateTime"), exports); __exportStar(require("./DerivedColor"), exports); __exportStar(require("./DerivedNumber"), exports); __exportStar(require("./DescribeCoverageRequest"), exports); @@ -80,7 +77,7 @@ __exportStar(require("./GetLegendGraphicRequest"), exports); __exportStar(require("./GetMapExceptionFormat"), exports); __exportStar(require("./GetMapFormat"), exports); __exportStar(require("./GetMapRequest"), exports); -__exportStar(require("./InlineObject"), exports); +__exportStar(require("./IdResponse"), exports); __exportStar(require("./InternalDataId"), exports); __exportStar(require("./Layer"), exports); __exportStar(require("./LayerCollection"), exports); @@ -88,7 +85,6 @@ __exportStar(require("./LayerCollectionListing"), exports); __exportStar(require("./LayerCollectionResource"), exports); __exportStar(require("./LayerListing"), exports); __exportStar(require("./LayerResource"), exports); -__exportStar(require("./LayerUpdate"), exports); __exportStar(require("./LayerVisibility"), exports); __exportStar(require("./LineSymbology"), exports); __exportStar(require("./LinearGradient"), exports); @@ -135,7 +131,6 @@ __exportStar(require("./Plot"), exports); __exportStar(require("./PlotOutputFormat"), exports); __exportStar(require("./PlotQueryRectangle"), exports); __exportStar(require("./PlotResultDescriptor"), exports); -__exportStar(require("./PlotUpdate"), exports); __exportStar(require("./PointSymbology"), exports); __exportStar(require("./PolygonSymbology"), exports); __exportStar(require("./Project"), exports); @@ -164,12 +159,6 @@ __exportStar(require("./RasterResultDescriptor"), exports); __exportStar(require("./RasterStreamWebsocketResultType"), exports); __exportStar(require("./RasterSymbology"), exports); __exportStar(require("./Resource"), exports); -__exportStar(require("./ResourceId"), exports); -__exportStar(require("./ResourceIdDatasetId"), exports); -__exportStar(require("./ResourceIdLayer"), exports); -__exportStar(require("./ResourceIdLayerCollection"), exports); -__exportStar(require("./ResourceIdMlModel"), exports); -__exportStar(require("./ResourceIdProject"), exports); __exportStar(require("./Role"), exports); __exportStar(require("./RoleDescription"), exports); __exportStar(require("./STRectangle"), exports); @@ -182,7 +171,8 @@ __exportStar(require("./SpatialPartition2D"), exports); __exportStar(require("./SpatialReferenceAuthority"), exports); __exportStar(require("./SpatialReferenceSpecification"), exports); __exportStar(require("./SpatialResolution"), exports); -__exportStar(require("./StaticNumberParam"), exports); +__exportStar(require("./StaticColor"), exports); +__exportStar(require("./StaticNumber"), exports); __exportStar(require("./StrokeParam"), exports); __exportStar(require("./SuggestMetaData"), exports); __exportStar(require("./Symbology"), exports); @@ -226,6 +216,7 @@ __exportStar(require("./UserCredentials"), exports); __exportStar(require("./UserInfo"), exports); __exportStar(require("./UserRegistration"), exports); __exportStar(require("./UserSession"), exports); +__exportStar(require("./VecUpdate"), exports); __exportStar(require("./VectorColumnInfo"), exports); __exportStar(require("./VectorDataType"), exports); __exportStar(require("./VectorQueryRectangle"), exports); diff --git a/typescript/dist/runtime.js b/typescript/dist/runtime.js index 8fcb5f7e..bcb81bbf 100644 --- a/typescript/dist/runtime.js +++ b/typescript/dist/runtime.js @@ -27,7 +27,7 @@ exports.querystring = querystring; exports.exists = exists; exports.mapValues = mapValues; exports.canConsumeForm = canConsumeForm; -exports.BASE_PATH = "http://0.0.0.0:8080/api".replace(/\/+$/, ""); +exports.BASE_PATH = "https://geoengine.io/api".replace(/\/+$/, ""); class Configuration { constructor(configuration = {}) { this.configuration = configuration; @@ -77,7 +77,7 @@ class Configuration { exports.Configuration = Configuration; exports.DefaultConfig = new Configuration({ headers: { - 'User-Agent': 'geoengine/openapi-client/typescript/0.0.21' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.22' } }); /** diff --git a/typescript/package.json b/typescript/package.json index 4e954f74..ca458df8 100644 --- a/typescript/package.json +++ b/typescript/package.json @@ -1,6 +1,6 @@ { "name": "@geoengine/openapi-client", - "version": "0.0.21", + "version": "0.0.22", "description": "OpenAPI client for @geoengine/openapi-client", "author": "OpenAPI-Generator", "repository": { diff --git a/typescript/src/apis/DatasetsApi.ts b/typescript/src/apis/DatasetsApi.ts index 91d9cff6..950d78f7 100644 --- a/typescript/src/apis/DatasetsApi.ts +++ b/typescript/src/apis/DatasetsApi.ts @@ -17,9 +17,9 @@ import * as runtime from '../runtime'; import type { AutoCreateDataset, CreateDataset, - CreateDatasetHandler200Response, Dataset, DatasetListing, + DatasetNameResponse, ErrorResponse, MetaDataDefinition, MetaDataSuggestion, @@ -36,12 +36,12 @@ import { AutoCreateDatasetToJSON, CreateDatasetFromJSON, CreateDatasetToJSON, - CreateDatasetHandler200ResponseFromJSON, - CreateDatasetHandler200ResponseToJSON, DatasetFromJSON, DatasetToJSON, DatasetListingFromJSON, DatasetListingToJSON, + DatasetNameResponseFromJSON, + DatasetNameResponseToJSON, ErrorResponseFromJSON, ErrorResponseToJSON, MetaDataDefinitionFromJSON, @@ -88,8 +88,8 @@ export interface ListDatasetsHandlerRequest { order: OrderBy; offset: number; limit: number; - filter?: string | null; - tags?: Array | null; + filter?: string; + tags?: Array; } export interface ListVolumeFileLayersHandlerRequest { @@ -127,10 +127,9 @@ export interface UpdateLoadingInfoHandlerRequest { export class DatasetsApi extends runtime.BaseAPI { /** - * The format of the files will be automatically detected when possible. - * Creates a new dataset using previously uploaded files. + * Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. */ - async autoCreateDatasetHandlerRaw(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async autoCreateDatasetHandlerRaw(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['autoCreateDataset'] == null) { throw new runtime.RequiredError( 'autoCreateDataset', @@ -160,23 +159,21 @@ export class DatasetsApi extends runtime.BaseAPI { body: AutoCreateDatasetToJSON(requestParameters['autoCreateDataset']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => CreateDatasetHandler200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => DatasetNameResponseFromJSON(jsonValue)); } /** - * The format of the files will be automatically detected when possible. - * Creates a new dataset using previously uploaded files. + * Creates a new dataset using previously uploaded files. The format of the files will be automatically detected when possible. */ - async autoCreateDatasetHandler(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async autoCreateDatasetHandler(requestParameters: AutoCreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.autoCreateDatasetHandlerRaw(requestParameters, initOverrides); return await response.value(); } /** - * Users can reference previously uploaded files. Admins can reference files from a volume. - * Creates a new dataset referencing files. + * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. */ - async createDatasetHandlerRaw(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async createDatasetHandlerRaw(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['createDataset'] == null) { throw new runtime.RequiredError( 'createDataset', @@ -206,14 +203,13 @@ export class DatasetsApi extends runtime.BaseAPI { body: CreateDatasetToJSON(requestParameters['createDataset']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => CreateDatasetHandler200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => DatasetNameResponseFromJSON(jsonValue)); } /** - * Users can reference previously uploaded files. Admins can reference files from a volume. - * Creates a new dataset referencing files. + * Creates a new dataset referencing files. Users can reference previously uploaded files. Admins can reference files from a volume. */ - async createDatasetHandler(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async createDatasetHandler(requestParameters: CreateDatasetHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.createDatasetHandlerRaw(requestParameters, initOverrides); return await response.value(); } @@ -498,8 +494,7 @@ export class DatasetsApi extends runtime.BaseAPI { } /** - * Tries to automatically detect the main file and layer name if not specified. - * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. */ async suggestMetaDataHandlerRaw(requestParameters: SuggestMetaDataHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['suggestMetaData'] == null) { @@ -535,8 +530,7 @@ export class DatasetsApi extends runtime.BaseAPI { } /** - * Tries to automatically detect the main file and layer name if not specified. - * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. + * Inspects an upload and suggests metadata that can be used when creating a new dataset based on it. Tries to automatically detect the main file and layer name if not specified. */ async suggestMetaDataHandler(requestParameters: SuggestMetaDataHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.suggestMetaDataHandlerRaw(requestParameters, initOverrides); diff --git a/typescript/src/apis/LayersApi.ts b/typescript/src/apis/LayersApi.ts index d83907aa..af954e25 100644 --- a/typescript/src/apis/LayersApi.ts +++ b/typescript/src/apis/LayersApi.ts @@ -15,9 +15,9 @@ import * as runtime from '../runtime'; import type { - AddCollection200Response, AddLayer, AddLayerCollection, + IdResponse, Layer, LayerCollection, ProviderCapabilities, @@ -27,12 +27,12 @@ import type { UpdateLayerCollection, } from '../models/index'; import { - AddCollection200ResponseFromJSON, - AddCollection200ResponseToJSON, AddLayerFromJSON, AddLayerToJSON, AddLayerCollectionFromJSON, AddLayerCollectionToJSON, + IdResponseFromJSON, + IdResponseToJSON, LayerFromJSON, LayerToJSON, LayerCollectionFromJSON, @@ -154,7 +154,7 @@ export class LayersApi extends runtime.BaseAPI { /** * Add a new collection to an existing collection */ - async addCollectionRaw(requestParameters: AddCollectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async addCollectionRaw(requestParameters: AddCollectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['collection'] == null) { throw new runtime.RequiredError( 'collection', @@ -191,13 +191,13 @@ export class LayersApi extends runtime.BaseAPI { body: AddLayerCollectionToJSON(requestParameters['addLayerCollection']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); } /** * Add a new collection to an existing collection */ - async addCollection(requestParameters: AddCollectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async addCollection(requestParameters: AddCollectionRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.addCollectionRaw(requestParameters, initOverrides); return await response.value(); } @@ -299,7 +299,7 @@ export class LayersApi extends runtime.BaseAPI { /** * Add a new layer to a collection */ - async addLayerRaw(requestParameters: AddLayerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async addLayerRaw(requestParameters: AddLayerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['collection'] == null) { throw new runtime.RequiredError( 'collection', @@ -336,13 +336,13 @@ export class LayersApi extends runtime.BaseAPI { body: AddLayerToJSON(requestParameters['addLayer']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); } /** * Add a new layer to a collection */ - async addLayer(requestParameters: AddLayerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async addLayer(requestParameters: AddLayerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.addLayerRaw(requestParameters, initOverrides); return await response.value(); } @@ -538,7 +538,7 @@ export class LayersApi extends runtime.BaseAPI { /** * Registers a layer from a provider as a workflow and returns the workflow id */ - async layerToWorkflowIdHandlerRaw(requestParameters: LayerToWorkflowIdHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async layerToWorkflowIdHandlerRaw(requestParameters: LayerToWorkflowIdHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['provider'] == null) { throw new runtime.RequiredError( 'provider', @@ -572,13 +572,13 @@ export class LayersApi extends runtime.BaseAPI { query: queryParameters, }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); } /** * Registers a layer from a provider as a workflow and returns the workflow id */ - async layerToWorkflowIdHandler(requestParameters: LayerToWorkflowIdHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async layerToWorkflowIdHandler(requestParameters: LayerToWorkflowIdHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.layerToWorkflowIdHandlerRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/typescript/src/apis/OGCWFSApi.ts b/typescript/src/apis/OGCWFSApi.ts index 88e36f56..e1d98f1e 100644 --- a/typescript/src/apis/OGCWFSApi.ts +++ b/typescript/src/apis/OGCWFSApi.ts @@ -56,7 +56,7 @@ export interface WfsFeatureHandlerRequest { resultType?: string | null; filter?: string | null; propertyName?: string | null; - queryResolution?: string | null; + queryResolution?: string; } /** diff --git a/typescript/src/apis/ProjectsApi.ts b/typescript/src/apis/ProjectsApi.ts index 4a109db6..0726f989 100644 --- a/typescript/src/apis/ProjectsApi.ts +++ b/typescript/src/apis/ProjectsApi.ts @@ -15,8 +15,8 @@ import * as runtime from '../runtime'; import type { - AddCollection200Response, CreateProject, + IdResponse, OrderBy, Project, ProjectListing, @@ -24,10 +24,10 @@ import type { UpdateProject, } from '../models/index'; import { - AddCollection200ResponseFromJSON, - AddCollection200ResponseToJSON, CreateProjectFromJSON, CreateProjectToJSON, + IdResponseFromJSON, + IdResponseToJSON, OrderByFromJSON, OrderByToJSON, ProjectFromJSON, @@ -80,7 +80,7 @@ export class ProjectsApi extends runtime.BaseAPI { /** * Create a new project for the user. */ - async createProjectHandlerRaw(requestParameters: CreateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async createProjectHandlerRaw(requestParameters: CreateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['createProject'] == null) { throw new runtime.RequiredError( 'createProject', @@ -110,13 +110,13 @@ export class ProjectsApi extends runtime.BaseAPI { body: CreateProjectToJSON(requestParameters['createProject']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); } /** * Create a new project for the user. */ - async createProjectHandler(requestParameters: CreateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async createProjectHandler(requestParameters: CreateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.createProjectHandlerRaw(requestParameters, initOverrides); return await response.value(); } @@ -347,8 +347,7 @@ export class ProjectsApi extends runtime.BaseAPI { } /** - * This will create a new version. - * Updates a project. + * Updates a project. This will create a new version. */ async updateProjectHandlerRaw(requestParameters: UpdateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['project'] == null) { @@ -391,8 +390,7 @@ export class ProjectsApi extends runtime.BaseAPI { } /** - * This will create a new version. - * Updates a project. + * Updates a project. This will create a new version. */ async updateProjectHandler(requestParameters: UpdateProjectHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { await this.updateProjectHandlerRaw(requestParameters, initOverrides); diff --git a/typescript/src/apis/SessionApi.ts b/typescript/src/apis/SessionApi.ts index 6ecb300c..0983907a 100644 --- a/typescript/src/apis/SessionApi.ts +++ b/typescript/src/apis/SessionApi.ts @@ -152,7 +152,7 @@ export class SessionApi extends runtime.BaseAPI { } /** - * # Errors This call fails if Open ID Connect is disabled, misconfigured or the Id Provider is unreachable. + * # Errors This call fails if Open ID Connect is disabled, misconfigured or the Id Provider is unreachable. * Initializes the Open Id Connect login procedure by requesting a parametrized url to the configured Id Provider. */ async oidcInitRaw(requestParameters: OidcInitRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { @@ -182,7 +182,7 @@ export class SessionApi extends runtime.BaseAPI { } /** - * # Errors This call fails if Open ID Connect is disabled, misconfigured or the Id Provider is unreachable. + * # Errors This call fails if Open ID Connect is disabled, misconfigured or the Id Provider is unreachable. * Initializes the Open Id Connect login procedure by requesting a parametrized url to the configured Id Provider. */ async oidcInit(requestParameters: OidcInitRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { @@ -191,8 +191,8 @@ export class SessionApi extends runtime.BaseAPI { } /** - * This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. - * Creates a session for a user via a login with Open Id Connect. + * # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + * Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. */ async oidcLoginRaw(requestParameters: OidcLoginRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['redirectUri'] == null) { @@ -231,8 +231,8 @@ export class SessionApi extends runtime.BaseAPI { } /** - * This call must be preceded by a call to oidcInit and match the parameters of that call. # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. - * Creates a session for a user via a login with Open Id Connect. + * # Errors This call fails if the [`AuthCodeResponse`] is invalid, if a previous oidcLogin call with the same state was already successfully or unsuccessfully resolved, if the Open Id Connect configuration is invalid, or if the Id Provider is unreachable. + * Creates a session for a user via a login with Open Id Connect. This call must be preceded by a call to oidcInit and match the parameters of that call. */ async oidcLogin(requestParameters: OidcLoginRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.oidcLoginRaw(requestParameters, initOverrides); diff --git a/typescript/src/apis/TasksApi.ts b/typescript/src/apis/TasksApi.ts index 11e07912..723ae087 100644 --- a/typescript/src/apis/TasksApi.ts +++ b/typescript/src/apis/TasksApi.ts @@ -49,7 +49,7 @@ export interface StatusHandlerRequest { export class TasksApi extends runtime.BaseAPI { /** - * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. * Abort a running task. */ async abortHandlerRaw(requestParameters: AbortHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { @@ -87,7 +87,7 @@ export class TasksApi extends runtime.BaseAPI { } /** - * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. + * # Parameters * `force` - If true, the task will be aborted without clean-up. You can abort a task that is already in the process of aborting. * Abort a running task. */ async abortHandler(requestParameters: AbortHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { diff --git a/typescript/src/apis/UploadsApi.ts b/typescript/src/apis/UploadsApi.ts index 811263bc..701fd959 100644 --- a/typescript/src/apis/UploadsApi.ts +++ b/typescript/src/apis/UploadsApi.ts @@ -15,13 +15,13 @@ import * as runtime from '../runtime'; import type { - AddCollection200Response, + IdResponse, UploadFileLayersResponse, UploadFilesResponse, } from '../models/index'; import { - AddCollection200ResponseFromJSON, - AddCollection200ResponseToJSON, + IdResponseFromJSON, + IdResponseToJSON, UploadFileLayersResponseFromJSON, UploadFileLayersResponseToJSON, UploadFilesResponseFromJSON, @@ -138,7 +138,7 @@ export class UploadsApi extends runtime.BaseAPI { /** * Uploads files. */ - async uploadHandlerRaw(requestParameters: UploadHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async uploadHandlerRaw(requestParameters: UploadHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['files'] == null) { throw new runtime.RequiredError( 'files', @@ -188,13 +188,13 @@ export class UploadsApi extends runtime.BaseAPI { body: formParams, }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); } /** * Uploads files. */ - async uploadHandler(requestParameters: UploadHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async uploadHandler(requestParameters: UploadHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.uploadHandlerRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/typescript/src/apis/UserApi.ts b/typescript/src/apis/UserApi.ts index 3853c200..952038af 100644 --- a/typescript/src/apis/UserApi.ts +++ b/typescript/src/apis/UserApi.ts @@ -15,11 +15,11 @@ import * as runtime from '../runtime'; import type { - AddCollection200Response, AddRole, ComputationQuota, DataUsage, DataUsageSummary, + IdResponse, OperatorQuota, Quota, RoleDescription, @@ -27,8 +27,6 @@ import type { UsageSummaryGranularity, } from '../models/index'; import { - AddCollection200ResponseFromJSON, - AddCollection200ResponseToJSON, AddRoleFromJSON, AddRoleToJSON, ComputationQuotaFromJSON, @@ -37,6 +35,8 @@ import { DataUsageToJSON, DataUsageSummaryFromJSON, DataUsageSummaryToJSON, + IdResponseFromJSON, + IdResponseToJSON, OperatorQuotaFromJSON, OperatorQuotaToJSON, QuotaFromJSON, @@ -428,7 +428,7 @@ export class UserApi extends runtime.BaseAPI { /** * Get role by name */ - async getRoleByNameHandlerRaw(requestParameters: GetRoleByNameHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async getRoleByNameHandlerRaw(requestParameters: GetRoleByNameHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['name'] == null) { throw new runtime.RequiredError( 'name', @@ -455,13 +455,13 @@ export class UserApi extends runtime.BaseAPI { query: queryParameters, }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); } /** * Get role by name */ - async getRoleByNameHandler(requestParameters: GetRoleByNameHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async getRoleByNameHandler(requestParameters: GetRoleByNameHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.getRoleByNameHandlerRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/typescript/src/apis/WorkflowsApi.ts b/typescript/src/apis/WorkflowsApi.ts index 3b4047e9..beaf9649 100644 --- a/typescript/src/apis/WorkflowsApi.ts +++ b/typescript/src/apis/WorkflowsApi.ts @@ -15,7 +15,7 @@ import * as runtime from '../runtime'; import type { - AddCollection200Response, + IdResponse, ProvenanceEntry, RasterDatasetFromWorkflow, RasterStreamWebsocketResultType, @@ -26,8 +26,8 @@ import type { Workflow, } from '../models/index'; import { - AddCollection200ResponseFromJSON, - AddCollection200ResponseToJSON, + IdResponseFromJSON, + IdResponseToJSON, ProvenanceEntryFromJSON, ProvenanceEntryToJSON, RasterDatasetFromWorkflowFromJSON, @@ -86,8 +86,7 @@ export interface RegisterWorkflowHandlerRequest { export class WorkflowsApi extends runtime.BaseAPI { /** - * Returns the id of the created task - * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task */ async datasetFromWorkflowHandlerRaw(requestParameters: DatasetFromWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['id'] == null) { @@ -130,8 +129,7 @@ export class WorkflowsApi extends runtime.BaseAPI { } /** - * Returns the id of the created task - * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. + * Create a task for creating a new dataset from the result of the workflow given by its `id` and the dataset parameters in the request body. Returns the id of the created task */ async datasetFromWorkflowHandler(requestParameters: DatasetFromWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.datasetFromWorkflowHandlerRaw(requestParameters, initOverrides); @@ -400,7 +398,7 @@ export class WorkflowsApi extends runtime.BaseAPI { /** * Registers a new Workflow. */ - async registerWorkflowHandlerRaw(requestParameters: RegisterWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { + async registerWorkflowHandlerRaw(requestParameters: RegisterWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise> { if (requestParameters['workflow'] == null) { throw new runtime.RequiredError( 'workflow', @@ -430,13 +428,13 @@ export class WorkflowsApi extends runtime.BaseAPI { body: WorkflowToJSON(requestParameters['workflow']), }, initOverrides); - return new runtime.JSONApiResponse(response, (jsonValue) => AddCollection200ResponseFromJSON(jsonValue)); + return new runtime.JSONApiResponse(response, (jsonValue) => IdResponseFromJSON(jsonValue)); } /** * Registers a new Workflow. */ - async registerWorkflowHandler(requestParameters: RegisterWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { + async registerWorkflowHandler(requestParameters: RegisterWorkflowHandlerRequest, initOverrides?: RequestInit | runtime.InitOverrideFunction): Promise { const response = await this.registerWorkflowHandlerRaw(requestParameters, initOverrides); return await response.value(); } diff --git a/typescript/src/models/AddDataset.ts b/typescript/src/models/AddDataset.ts index ed060de1..1ea1c71f 100644 --- a/typescript/src/models/AddDataset.ts +++ b/typescript/src/models/AddDataset.ts @@ -51,7 +51,7 @@ export interface AddDataset { * @type {string} * @memberof AddDataset */ - name?: string | null; + name?: string; /** * * @type {Array} diff --git a/typescript/src/models/ColorParam.ts b/typescript/src/models/ColorParam.ts index fc216bbd..e6da5bd7 100644 --- a/typescript/src/models/ColorParam.ts +++ b/typescript/src/models/ColorParam.ts @@ -12,13 +12,6 @@ * Do not edit the class manually. */ -import type { ColorParamStatic } from './ColorParamStatic'; -import { - instanceOfColorParamStatic, - ColorParamStaticFromJSON, - ColorParamStaticFromJSONTyped, - ColorParamStaticToJSON, -} from './ColorParamStatic'; import type { DerivedColor } from './DerivedColor'; import { instanceOfDerivedColor, @@ -26,13 +19,20 @@ import { DerivedColorFromJSONTyped, DerivedColorToJSON, } from './DerivedColor'; +import type { StaticColor } from './StaticColor'; +import { + instanceOfStaticColor, + StaticColorFromJSON, + StaticColorFromJSONTyped, + StaticColorToJSON, +} from './StaticColor'; /** * @type ColorParam * * @export */ -export type ColorParam = { type: 'derived' } & DerivedColor | { type: 'static' } & ColorParamStatic; +export type ColorParam = { type: 'derived' } & DerivedColor | { type: 'static' } & StaticColor; export function ColorParamFromJSON(json: any): ColorParam { return ColorParamFromJSONTyped(json, false); @@ -46,7 +46,7 @@ export function ColorParamFromJSONTyped(json: any, ignoreDiscriminator: boolean) case 'derived': return Object.assign({}, DerivedColorFromJSONTyped(json, true), { type: 'derived' } as const); case 'static': - return Object.assign({}, ColorParamStaticFromJSONTyped(json, true), { type: 'static' } as const); + return Object.assign({}, StaticColorFromJSONTyped(json, true), { type: 'static' } as const); default: throw new Error(`No variant of ColorParam exists with 'type=${json['type']}'`); } @@ -64,7 +64,7 @@ export function ColorParamToJSONTyped(value?: ColorParam | null, ignoreDiscrimin case 'derived': return Object.assign({}, DerivedColorToJSON(value), { type: 'derived' } as const); case 'static': - return Object.assign({}, ColorParamStaticToJSON(value), { type: 'static' } as const); + return Object.assign({}, StaticColorToJSON(value), { type: 'static' } as const); default: throw new Error(`No variant of ColorParam exists with 'type=${value['type']}'`); } diff --git a/typescript/src/models/Colorizer.ts b/typescript/src/models/Colorizer.ts index f71e755e..5061c292 100644 --- a/typescript/src/models/Colorizer.ts +++ b/typescript/src/models/Colorizer.ts @@ -36,7 +36,8 @@ import { /** * @type Colorizer - * + * A colorizer specifies a mapping between raster values and an output image + * There are different variants that perform different kinds of mapping. * @export */ export type Colorizer = { type: 'linearGradient' } & LinearGradient | { type: 'logarithmicGradient' } & LogarithmicGradient | { type: 'palette' } & PaletteColorizer; diff --git a/typescript/src/models/CreateDatasetHandler200Response.ts b/typescript/src/models/CreateDatasetHandler200Response.ts deleted file mode 100644 index e1d546af..00000000 --- a/typescript/src/models/CreateDatasetHandler200Response.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import { mapValues } from '../runtime'; -/** - * - * @export - * @interface CreateDatasetHandler200Response - */ -export interface CreateDatasetHandler200Response { - /** - * - * @type {string} - * @memberof CreateDatasetHandler200Response - */ - datasetName: string; -} - -/** - * Check if a given object implements the CreateDatasetHandler200Response interface. - */ -export function instanceOfCreateDatasetHandler200Response(value: object): value is CreateDatasetHandler200Response { - if (!('datasetName' in value) || value['datasetName'] === undefined) return false; - return true; -} - -export function CreateDatasetHandler200ResponseFromJSON(json: any): CreateDatasetHandler200Response { - return CreateDatasetHandler200ResponseFromJSONTyped(json, false); -} - -export function CreateDatasetHandler200ResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): CreateDatasetHandler200Response { - if (json == null) { - return json; - } - return { - - 'datasetName': json['datasetName'], - }; -} - -export function CreateDatasetHandler200ResponseToJSON(json: any): CreateDatasetHandler200Response { - return CreateDatasetHandler200ResponseToJSONTyped(json, false); -} - -export function CreateDatasetHandler200ResponseToJSONTyped(value?: CreateDatasetHandler200Response | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - - return { - - 'datasetName': value['datasetName'], - }; -} - diff --git a/typescript/src/models/DataId.ts b/typescript/src/models/DataId.ts index 9d38e5eb..fa87841e 100644 --- a/typescript/src/models/DataId.ts +++ b/typescript/src/models/DataId.ts @@ -29,7 +29,8 @@ import { /** * @type DataId - * + * The identifier for loadable data. It is used in the source operators to get the loading info (aka parametrization) + * for accessing the data. Internal data is loaded from datasets, external from `DataProvider`s. * @export */ export type DataId = { type: 'external' } & ExternalDataId | { type: 'internal' } & InternalDataId; diff --git a/typescript/src/models/DatasetNameResponse.ts b/typescript/src/models/DatasetNameResponse.ts new file mode 100644 index 00000000..7fefa310 --- /dev/null +++ b/typescript/src/models/DatasetNameResponse.ts @@ -0,0 +1,66 @@ +/* tslint:disable */ +/* eslint-disable */ +/** + * Geo Engine API + * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) + * + * The version of the OpenAPI document: 0.8.0 + * Contact: dev@geoengine.de + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + +import { mapValues } from '../runtime'; +/** + * + * @export + * @interface DatasetNameResponse + */ +export interface DatasetNameResponse { + /** + * + * @type {string} + * @memberof DatasetNameResponse + */ + datasetName: string; +} + +/** + * Check if a given object implements the DatasetNameResponse interface. + */ +export function instanceOfDatasetNameResponse(value: object): value is DatasetNameResponse { + if (!('datasetName' in value) || value['datasetName'] === undefined) return false; + return true; +} + +export function DatasetNameResponseFromJSON(json: any): DatasetNameResponse { + return DatasetNameResponseFromJSONTyped(json, false); +} + +export function DatasetNameResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): DatasetNameResponse { + if (json == null) { + return json; + } + return { + + 'datasetName': json['datasetName'], + }; +} + +export function DatasetNameResponseToJSON(json: any): DatasetNameResponse { + return DatasetNameResponseToJSONTyped(json, false); +} + +export function DatasetNameResponseToJSONTyped(value?: DatasetNameResponse | null, ignoreDiscriminator: boolean = false): any { + if (value == null) { + return value; + } + + return { + + 'datasetName': value['datasetName'], + }; +} + diff --git a/typescript/src/models/DateTime.ts b/typescript/src/models/DateTime.ts deleted file mode 100644 index e03a61f4..00000000 --- a/typescript/src/models/DateTime.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import { mapValues } from '../runtime'; -/** - * An object that composes the date and a timestamp with time zone. - * @export - * @interface DateTime - */ -export interface DateTime { - /** - * - * @type {Date} - * @memberof DateTime - */ - datetime: Date; -} - -/** - * Check if a given object implements the DateTime interface. - */ -export function instanceOfDateTime(value: object): value is DateTime { - if (!('datetime' in value) || value['datetime'] === undefined) return false; - return true; -} - -export function DateTimeFromJSON(json: any): DateTime { - return DateTimeFromJSONTyped(json, false); -} - -export function DateTimeFromJSONTyped(json: any, ignoreDiscriminator: boolean): DateTime { - if (json == null) { - return json; - } - return { - - 'datetime': (new Date(json['datetime'])), - }; -} - -export function DateTimeToJSON(json: any): DateTime { - return DateTimeToJSONTyped(json, false); -} - -export function DateTimeToJSONTyped(value?: DateTime | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - - return { - - 'datetime': ((value['datetime']).toISOString()), - }; -} - diff --git a/typescript/src/models/DateTimeParseFormat.ts b/typescript/src/models/DateTimeParseFormat.ts deleted file mode 100644 index e8a1f204..00000000 --- a/typescript/src/models/DateTimeParseFormat.ts +++ /dev/null @@ -1,84 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine Pro API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import { exists, mapValues } from '../runtime'; -/** - * - * @export - * @interface DateTimeParseFormat - */ -export interface DateTimeParseFormat { - /** - * - * @type {string} - * @memberof DateTimeParseFormat - */ - fmt: string; - /** - * - * @type {boolean} - * @memberof DateTimeParseFormat - */ - hasTime: boolean; - /** - * - * @type {boolean} - * @memberof DateTimeParseFormat - */ - hasTz: boolean; -} - -/** - * Check if a given object implements the DateTimeParseFormat interface. - */ -export function instanceOfDateTimeParseFormat(value: object): boolean { - let isInstance = true; - isInstance = isInstance && "fmt" in value; - isInstance = isInstance && "hasTime" in value; - isInstance = isInstance && "hasTz" in value; - - return isInstance; -} - -export function DateTimeParseFormatFromJSON(json: any): DateTimeParseFormat { - return DateTimeParseFormatFromJSONTyped(json, false); -} - -export function DateTimeParseFormatFromJSONTyped(json: any, ignoreDiscriminator: boolean): DateTimeParseFormat { - if ((json === undefined) || (json === null)) { - return json; - } - return { - - 'fmt': json['fmt'], - 'hasTime': json['has_time'], - 'hasTz': json['has_tz'], - }; -} - -export function DateTimeParseFormatToJSON(value?: DateTimeParseFormat | null): any { - if (value === undefined) { - return undefined; - } - if (value === null) { - return null; - } - return { - - 'fmt': value.fmt, - 'has_time': value.hasTime, - 'has_tz': value.hasTz, - }; -} - diff --git a/typescript/src/models/GdalMetadataNetCdfCf.ts b/typescript/src/models/GdalMetadataNetCdfCf.ts index 3582352e..a74c10e6 100644 --- a/typescript/src/models/GdalMetadataNetCdfCf.ts +++ b/typescript/src/models/GdalMetadataNetCdfCf.ts @@ -97,7 +97,7 @@ export interface GdalMetadataNetCdfCf { * @export */ export const GdalMetadataNetCdfCfTypeEnum = { - GdalMetadataNetCdfCf: 'GdalMetadataNetCdfCf' + GdalMetaDataNetCdfCf: 'GdalMetaDataNetCdfCf' } as const; export type GdalMetadataNetCdfCfTypeEnum = typeof GdalMetadataNetCdfCfTypeEnum[keyof typeof GdalMetadataNetCdfCfTypeEnum]; diff --git a/typescript/src/models/AddCollection200Response.ts b/typescript/src/models/IdResponse.ts similarity index 50% rename from typescript/src/models/AddCollection200Response.ts rename to typescript/src/models/IdResponse.ts index ec3e36e2..ba6bf79f 100644 --- a/typescript/src/models/AddCollection200Response.ts +++ b/typescript/src/models/IdResponse.ts @@ -16,30 +16,30 @@ import { mapValues } from '../runtime'; /** * * @export - * @interface AddCollection200Response + * @interface IdResponse */ -export interface AddCollection200Response { +export interface IdResponse { /** * * @type {string} - * @memberof AddCollection200Response + * @memberof IdResponse */ id: string; } /** - * Check if a given object implements the AddCollection200Response interface. + * Check if a given object implements the IdResponse interface. */ -export function instanceOfAddCollection200Response(value: object): value is AddCollection200Response { +export function instanceOfIdResponse(value: object): value is IdResponse { if (!('id' in value) || value['id'] === undefined) return false; return true; } -export function AddCollection200ResponseFromJSON(json: any): AddCollection200Response { - return AddCollection200ResponseFromJSONTyped(json, false); +export function IdResponseFromJSON(json: any): IdResponse { + return IdResponseFromJSONTyped(json, false); } -export function AddCollection200ResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): AddCollection200Response { +export function IdResponseFromJSONTyped(json: any, ignoreDiscriminator: boolean): IdResponse { if (json == null) { return json; } @@ -49,11 +49,11 @@ export function AddCollection200ResponseFromJSONTyped(json: any, ignoreDiscrimin }; } -export function AddCollection200ResponseToJSON(json: any): AddCollection200Response { - return AddCollection200ResponseToJSONTyped(json, false); +export function IdResponseToJSON(json: any): IdResponse { + return IdResponseToJSONTyped(json, false); } -export function AddCollection200ResponseToJSONTyped(value?: AddCollection200Response | null, ignoreDiscriminator: boolean = false): any { +export function IdResponseToJSONTyped(value?: IdResponse | null, ignoreDiscriminator: boolean = false): any { if (value == null) { return value; } diff --git a/typescript/src/models/InlineObject.ts b/typescript/src/models/InlineObject.ts deleted file mode 100644 index 78eb213b..00000000 --- a/typescript/src/models/InlineObject.ts +++ /dev/null @@ -1,66 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import { mapValues } from '../runtime'; -/** - * - * @export - * @interface InlineObject - */ -export interface InlineObject { - /** - * - * @type {string} - * @memberof InlineObject - */ - url: string; -} - -/** - * Check if a given object implements the InlineObject interface. - */ -export function instanceOfInlineObject(value: object): value is InlineObject { - if (!('url' in value) || value['url'] === undefined) return false; - return true; -} - -export function InlineObjectFromJSON(json: any): InlineObject { - return InlineObjectFromJSONTyped(json, false); -} - -export function InlineObjectFromJSONTyped(json: any, ignoreDiscriminator: boolean): InlineObject { - if (json == null) { - return json; - } - return { - - 'url': json['url'], - }; -} - -export function InlineObjectToJSON(json: any): InlineObject { - return InlineObjectToJSONTyped(json, false); -} - -export function InlineObjectToJSONTyped(value?: InlineObject | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - - return { - - 'url': value['url'], - }; -} - diff --git a/typescript/src/models/LayerUpdate.ts b/typescript/src/models/LayerUpdate.ts deleted file mode 100644 index 87eaa5b6..00000000 --- a/typescript/src/models/LayerUpdate.ts +++ /dev/null @@ -1,73 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import type { ProjectLayer } from './ProjectLayer'; -import { - instanceOfProjectLayer, - ProjectLayerFromJSON, - ProjectLayerFromJSONTyped, - ProjectLayerToJSON, -} from './ProjectLayer'; -import type { ProjectUpdateToken } from './ProjectUpdateToken'; -import { - instanceOfProjectUpdateToken, - ProjectUpdateTokenFromJSON, - ProjectUpdateTokenFromJSONTyped, - ProjectUpdateTokenToJSON, -} from './ProjectUpdateToken'; - -/** - * @type LayerUpdate - * - * @export - */ -export type LayerUpdate = ProjectLayer | ProjectUpdateToken; - -export function LayerUpdateFromJSON(json: any): LayerUpdate { - return LayerUpdateFromJSONTyped(json, false); -} - -export function LayerUpdateFromJSONTyped(json: any, ignoreDiscriminator: boolean): LayerUpdate { - if (json == null) { - return json; - } - if (instanceOfProjectLayer(json)) { - return ProjectLayerFromJSONTyped(json, true); - } - if (instanceOfProjectUpdateToken(json)) { - return ProjectUpdateTokenFromJSONTyped(json, true); - } - - return {} as any; -} - -export function LayerUpdateToJSON(json: any): any { - return LayerUpdateToJSONTyped(json, false); -} - -export function LayerUpdateToJSONTyped(value?: LayerUpdate | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - - if (typeof value === 'object' && instanceOfProjectLayer(value)) { - return ProjectLayerToJSON(value as ProjectLayer); - } - if (instanceOfProjectUpdateToken(value)) { - return ProjectUpdateTokenToJSON(value as ProjectUpdateToken); - } - - return {}; -} - diff --git a/typescript/src/models/MetaDataDefinition.ts b/typescript/src/models/MetaDataDefinition.ts index 3d9b6fcc..c5ba7610 100644 --- a/typescript/src/models/MetaDataDefinition.ts +++ b/typescript/src/models/MetaDataDefinition.ts @@ -60,7 +60,7 @@ import { * * @export */ -export type MetaDataDefinition = { type: 'GdalMetaDataList' } & GdalMetaDataList | { type: 'GdalMetaDataRegular' } & GdalMetaDataRegular | { type: 'GdalMetadataNetCdfCf' } & GdalMetadataNetCdfCf | { type: 'GdalStatic' } & GdalMetaDataStatic | { type: 'MockMetaData' } & MockMetaData | { type: 'OgrMetaData' } & OgrMetaData; +export type MetaDataDefinition = { type: 'GdalMetaDataList' } & GdalMetaDataList | { type: 'GdalMetaDataNetCdfCf' } & GdalMetadataNetCdfCf | { type: 'GdalMetaDataRegular' } & GdalMetaDataRegular | { type: 'GdalStatic' } & GdalMetaDataStatic | { type: 'MockMetaData' } & MockMetaData | { type: 'OgrMetaData' } & OgrMetaData; export function MetaDataDefinitionFromJSON(json: any): MetaDataDefinition { return MetaDataDefinitionFromJSONTyped(json, false); @@ -73,10 +73,10 @@ export function MetaDataDefinitionFromJSONTyped(json: any, ignoreDiscriminator: switch (json['type']) { case 'GdalMetaDataList': return Object.assign({}, GdalMetaDataListFromJSONTyped(json, true), { type: 'GdalMetaDataList' } as const); + case 'GdalMetaDataNetCdfCf': + return Object.assign({}, GdalMetadataNetCdfCfFromJSONTyped(json, true), { type: 'GdalMetaDataNetCdfCf' } as const); case 'GdalMetaDataRegular': return Object.assign({}, GdalMetaDataRegularFromJSONTyped(json, true), { type: 'GdalMetaDataRegular' } as const); - case 'GdalMetadataNetCdfCf': - return Object.assign({}, GdalMetadataNetCdfCfFromJSONTyped(json, true), { type: 'GdalMetadataNetCdfCf' } as const); case 'GdalStatic': return Object.assign({}, GdalMetaDataStaticFromJSONTyped(json, true), { type: 'GdalStatic' } as const); case 'MockMetaData': @@ -99,10 +99,10 @@ export function MetaDataDefinitionToJSONTyped(value?: MetaDataDefinition | null, switch (value['type']) { case 'GdalMetaDataList': return Object.assign({}, GdalMetaDataListToJSON(value), { type: 'GdalMetaDataList' } as const); + case 'GdalMetaDataNetCdfCf': + return Object.assign({}, GdalMetadataNetCdfCfToJSON(value), { type: 'GdalMetaDataNetCdfCf' } as const); case 'GdalMetaDataRegular': return Object.assign({}, GdalMetaDataRegularToJSON(value), { type: 'GdalMetaDataRegular' } as const); - case 'GdalMetadataNetCdfCf': - return Object.assign({}, GdalMetadataNetCdfCfToJSON(value), { type: 'GdalMetadataNetCdfCf' } as const); case 'GdalStatic': return Object.assign({}, GdalMetaDataStaticToJSON(value), { type: 'GdalStatic' } as const); case 'MockMetaData': diff --git a/typescript/src/models/NumberParam.ts b/typescript/src/models/NumberParam.ts index 6d8aa8b5..c4f4a83c 100644 --- a/typescript/src/models/NumberParam.ts +++ b/typescript/src/models/NumberParam.ts @@ -19,20 +19,20 @@ import { DerivedNumberFromJSONTyped, DerivedNumberToJSON, } from './DerivedNumber'; -import type { StaticNumberParam } from './StaticNumberParam'; +import type { StaticNumber } from './StaticNumber'; import { - instanceOfStaticNumberParam, - StaticNumberParamFromJSON, - StaticNumberParamFromJSONTyped, - StaticNumberParamToJSON, -} from './StaticNumberParam'; + instanceOfStaticNumber, + StaticNumberFromJSON, + StaticNumberFromJSONTyped, + StaticNumberToJSON, +} from './StaticNumber'; /** * @type NumberParam * * @export */ -export type NumberParam = { type: 'derived' } & DerivedNumber | { type: 'static' } & StaticNumberParam; +export type NumberParam = { type: 'derived' } & DerivedNumber | { type: 'static' } & StaticNumber; export function NumberParamFromJSON(json: any): NumberParam { return NumberParamFromJSONTyped(json, false); @@ -46,7 +46,7 @@ export function NumberParamFromJSONTyped(json: any, ignoreDiscriminator: boolean case 'derived': return Object.assign({}, DerivedNumberFromJSONTyped(json, true), { type: 'derived' } as const); case 'static': - return Object.assign({}, StaticNumberParamFromJSONTyped(json, true), { type: 'static' } as const); + return Object.assign({}, StaticNumberFromJSONTyped(json, true), { type: 'static' } as const); default: throw new Error(`No variant of NumberParam exists with 'type=${json['type']}'`); } @@ -64,7 +64,7 @@ export function NumberParamToJSONTyped(value?: NumberParam | null, ignoreDiscrim case 'derived': return Object.assign({}, DerivedNumberToJSON(value), { type: 'derived' } as const); case 'static': - return Object.assign({}, StaticNumberParamToJSON(value), { type: 'static' } as const); + return Object.assign({}, StaticNumberToJSON(value), { type: 'static' } as const); default: throw new Error(`No variant of NumberParam exists with 'type=${value['type']}'`); } diff --git a/typescript/src/models/OgrSourceColumnSpec.ts b/typescript/src/models/OgrSourceColumnSpec.ts index 558966b8..797ebdf1 100644 --- a/typescript/src/models/OgrSourceColumnSpec.ts +++ b/typescript/src/models/OgrSourceColumnSpec.ts @@ -62,7 +62,7 @@ export interface OgrSourceColumnSpec { * @type {{ [key: string]: string; }} * @memberof OgrSourceColumnSpec */ - rename?: { [key: string]: string; } | null; + rename?: { [key: string]: string; }; /** * * @type {Array} diff --git a/typescript/src/models/OgrSourceDurationSpecValue.ts b/typescript/src/models/OgrSourceDurationSpecValue.ts index 2e621192..b6bdcaaf 100644 --- a/typescript/src/models/OgrSourceDurationSpecValue.ts +++ b/typescript/src/models/OgrSourceDurationSpecValue.ts @@ -13,6 +13,13 @@ */ import { mapValues } from '../runtime'; +import type { TimeStep } from './TimeStep'; +import { + TimeStepFromJSON, + TimeStepFromJSONTyped, + TimeStepToJSON, + TimeStepToJSONTyped, +} from './TimeStep'; import type { TimeGranularity } from './TimeGranularity'; import { TimeGranularityFromJSON, @@ -26,19 +33,7 @@ import { * @export * @interface OgrSourceDurationSpecValue */ -export interface OgrSourceDurationSpecValue { - /** - * - * @type {TimeGranularity} - * @memberof OgrSourceDurationSpecValue - */ - granularity: TimeGranularity; - /** - * - * @type {number} - * @memberof OgrSourceDurationSpecValue - */ - step: number; +export interface OgrSourceDurationSpecValue extends TimeStep { /** * * @type {string} @@ -61,8 +56,6 @@ export type OgrSourceDurationSpecValueTypeEnum = typeof OgrSourceDurationSpecVal * Check if a given object implements the OgrSourceDurationSpecValue interface. */ export function instanceOfOgrSourceDurationSpecValue(value: object): value is OgrSourceDurationSpecValue { - if (!('granularity' in value) || value['granularity'] === undefined) return false; - if (!('step' in value) || value['step'] === undefined) return false; if (!('type' in value) || value['type'] === undefined) return false; return true; } @@ -76,9 +69,7 @@ export function OgrSourceDurationSpecValueFromJSONTyped(json: any, ignoreDiscrim return json; } return { - - 'granularity': TimeGranularityFromJSON(json['granularity']), - 'step': json['step'], + ...TimeStepFromJSONTyped(json, true), 'type': json['type'], }; } @@ -93,9 +84,7 @@ export function OgrSourceDurationSpecValueToJSONTyped(value?: OgrSourceDurationS } return { - - 'granularity': TimeGranularityToJSON(value['granularity']), - 'step': value['step'], + ...TimeStepToJSONTyped(value, true), 'type': value['type'], }; } diff --git a/typescript/src/models/RasterDatasetFromWorkflow.ts b/typescript/src/models/RasterDatasetFromWorkflow.ts index 5b492fb7..7476e10c 100644 --- a/typescript/src/models/RasterDatasetFromWorkflow.ts +++ b/typescript/src/models/RasterDatasetFromWorkflow.ts @@ -50,7 +50,7 @@ export interface RasterDatasetFromWorkflow { * @type {string} * @memberof RasterDatasetFromWorkflow */ - name?: string | null; + name?: string; /** * * @type {RasterQueryRectangle} diff --git a/typescript/src/models/Resource.ts b/typescript/src/models/Resource.ts index db2e5c72..191dbebb 100644 --- a/typescript/src/models/Resource.ts +++ b/typescript/src/models/Resource.ts @@ -50,7 +50,7 @@ import { /** * @type Resource - * + * A resource that is affected by a permission. * @export */ export type Resource = { type: 'dataset' } & DatasetResource | { type: 'layer' } & LayerResource | { type: 'layerCollection' } & LayerCollectionResource | { type: 'mlModel' } & MlModelResource | { type: 'project' } & ProjectResource; diff --git a/typescript/src/models/ResourceId.ts b/typescript/src/models/ResourceId.ts deleted file mode 100644 index bafea98f..00000000 --- a/typescript/src/models/ResourceId.ts +++ /dev/null @@ -1,106 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import type { ResourceIdDatasetId } from './ResourceIdDatasetId'; -import { - instanceOfResourceIdDatasetId, - ResourceIdDatasetIdFromJSON, - ResourceIdDatasetIdFromJSONTyped, - ResourceIdDatasetIdToJSON, -} from './ResourceIdDatasetId'; -import type { ResourceIdLayer } from './ResourceIdLayer'; -import { - instanceOfResourceIdLayer, - ResourceIdLayerFromJSON, - ResourceIdLayerFromJSONTyped, - ResourceIdLayerToJSON, -} from './ResourceIdLayer'; -import type { ResourceIdLayerCollection } from './ResourceIdLayerCollection'; -import { - instanceOfResourceIdLayerCollection, - ResourceIdLayerCollectionFromJSON, - ResourceIdLayerCollectionFromJSONTyped, - ResourceIdLayerCollectionToJSON, -} from './ResourceIdLayerCollection'; -import type { ResourceIdMlModel } from './ResourceIdMlModel'; -import { - instanceOfResourceIdMlModel, - ResourceIdMlModelFromJSON, - ResourceIdMlModelFromJSONTyped, - ResourceIdMlModelToJSON, -} from './ResourceIdMlModel'; -import type { ResourceIdProject } from './ResourceIdProject'; -import { - instanceOfResourceIdProject, - ResourceIdProjectFromJSON, - ResourceIdProjectFromJSONTyped, - ResourceIdProjectToJSON, -} from './ResourceIdProject'; - -/** - * @type ResourceId - * - * @export - */ -export type ResourceId = { type: 'DatasetId' } & ResourceIdDatasetId | { type: 'Layer' } & ResourceIdLayer | { type: 'LayerCollection' } & ResourceIdLayerCollection | { type: 'MlModel' } & ResourceIdMlModel | { type: 'Project' } & ResourceIdProject; - -export function ResourceIdFromJSON(json: any): ResourceId { - return ResourceIdFromJSONTyped(json, false); -} - -export function ResourceIdFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceId { - if (json == null) { - return json; - } - switch (json['type']) { - case 'DatasetId': - return Object.assign({}, ResourceIdDatasetIdFromJSONTyped(json, true), { type: 'DatasetId' } as const); - case 'Layer': - return Object.assign({}, ResourceIdLayerFromJSONTyped(json, true), { type: 'Layer' } as const); - case 'LayerCollection': - return Object.assign({}, ResourceIdLayerCollectionFromJSONTyped(json, true), { type: 'LayerCollection' } as const); - case 'MlModel': - return Object.assign({}, ResourceIdMlModelFromJSONTyped(json, true), { type: 'MlModel' } as const); - case 'Project': - return Object.assign({}, ResourceIdProjectFromJSONTyped(json, true), { type: 'Project' } as const); - default: - throw new Error(`No variant of ResourceId exists with 'type=${json['type']}'`); - } -} - -export function ResourceIdToJSON(json: any): any { - return ResourceIdToJSONTyped(json, false); -} - -export function ResourceIdToJSONTyped(value?: ResourceId | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - switch (value['type']) { - case 'DatasetId': - return Object.assign({}, ResourceIdDatasetIdToJSON(value), { type: 'DatasetId' } as const); - case 'Layer': - return Object.assign({}, ResourceIdLayerToJSON(value), { type: 'Layer' } as const); - case 'LayerCollection': - return Object.assign({}, ResourceIdLayerCollectionToJSON(value), { type: 'LayerCollection' } as const); - case 'MlModel': - return Object.assign({}, ResourceIdMlModelToJSON(value), { type: 'MlModel' } as const); - case 'Project': - return Object.assign({}, ResourceIdProjectToJSON(value), { type: 'Project' } as const); - default: - throw new Error(`No variant of ResourceId exists with 'type=${value['type']}'`); - } - -} - diff --git a/typescript/src/models/ResourceIdDatasetId.ts b/typescript/src/models/ResourceIdDatasetId.ts deleted file mode 100644 index 3dc81595..00000000 --- a/typescript/src/models/ResourceIdDatasetId.ts +++ /dev/null @@ -1,85 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import { mapValues } from '../runtime'; -/** - * - * @export - * @interface ResourceIdDatasetId - */ -export interface ResourceIdDatasetId { - /** - * - * @type {string} - * @memberof ResourceIdDatasetId - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdDatasetId - */ - type: ResourceIdDatasetIdTypeEnum; -} - - -/** - * @export - */ -export const ResourceIdDatasetIdTypeEnum = { - DatasetId: 'DatasetId' -} as const; -export type ResourceIdDatasetIdTypeEnum = typeof ResourceIdDatasetIdTypeEnum[keyof typeof ResourceIdDatasetIdTypeEnum]; - - -/** - * Check if a given object implements the ResourceIdDatasetId interface. - */ -export function instanceOfResourceIdDatasetId(value: object): value is ResourceIdDatasetId { - if (!('id' in value) || value['id'] === undefined) return false; - if (!('type' in value) || value['type'] === undefined) return false; - return true; -} - -export function ResourceIdDatasetIdFromJSON(json: any): ResourceIdDatasetId { - return ResourceIdDatasetIdFromJSONTyped(json, false); -} - -export function ResourceIdDatasetIdFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdDatasetId { - if (json == null) { - return json; - } - return { - - 'id': json['id'], - 'type': json['type'], - }; -} - -export function ResourceIdDatasetIdToJSON(json: any): ResourceIdDatasetId { - return ResourceIdDatasetIdToJSONTyped(json, false); -} - -export function ResourceIdDatasetIdToJSONTyped(value?: ResourceIdDatasetId | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - - return { - - 'id': value['id'], - 'type': value['type'], - }; -} - diff --git a/typescript/src/models/ResourceIdLayer.ts b/typescript/src/models/ResourceIdLayer.ts deleted file mode 100644 index bab28649..00000000 --- a/typescript/src/models/ResourceIdLayer.ts +++ /dev/null @@ -1,85 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import { mapValues } from '../runtime'; -/** - * - * @export - * @interface ResourceIdLayer - */ -export interface ResourceIdLayer { - /** - * - * @type {string} - * @memberof ResourceIdLayer - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdLayer - */ - type: ResourceIdLayerTypeEnum; -} - - -/** - * @export - */ -export const ResourceIdLayerTypeEnum = { - Layer: 'Layer' -} as const; -export type ResourceIdLayerTypeEnum = typeof ResourceIdLayerTypeEnum[keyof typeof ResourceIdLayerTypeEnum]; - - -/** - * Check if a given object implements the ResourceIdLayer interface. - */ -export function instanceOfResourceIdLayer(value: object): value is ResourceIdLayer { - if (!('id' in value) || value['id'] === undefined) return false; - if (!('type' in value) || value['type'] === undefined) return false; - return true; -} - -export function ResourceIdLayerFromJSON(json: any): ResourceIdLayer { - return ResourceIdLayerFromJSONTyped(json, false); -} - -export function ResourceIdLayerFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdLayer { - if (json == null) { - return json; - } - return { - - 'id': json['id'], - 'type': json['type'], - }; -} - -export function ResourceIdLayerToJSON(json: any): ResourceIdLayer { - return ResourceIdLayerToJSONTyped(json, false); -} - -export function ResourceIdLayerToJSONTyped(value?: ResourceIdLayer | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - - return { - - 'id': value['id'], - 'type': value['type'], - }; -} - diff --git a/typescript/src/models/ResourceIdLayerCollection.ts b/typescript/src/models/ResourceIdLayerCollection.ts deleted file mode 100644 index 9c4df428..00000000 --- a/typescript/src/models/ResourceIdLayerCollection.ts +++ /dev/null @@ -1,85 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import { mapValues } from '../runtime'; -/** - * - * @export - * @interface ResourceIdLayerCollection - */ -export interface ResourceIdLayerCollection { - /** - * - * @type {string} - * @memberof ResourceIdLayerCollection - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdLayerCollection - */ - type: ResourceIdLayerCollectionTypeEnum; -} - - -/** - * @export - */ -export const ResourceIdLayerCollectionTypeEnum = { - LayerCollection: 'LayerCollection' -} as const; -export type ResourceIdLayerCollectionTypeEnum = typeof ResourceIdLayerCollectionTypeEnum[keyof typeof ResourceIdLayerCollectionTypeEnum]; - - -/** - * Check if a given object implements the ResourceIdLayerCollection interface. - */ -export function instanceOfResourceIdLayerCollection(value: object): value is ResourceIdLayerCollection { - if (!('id' in value) || value['id'] === undefined) return false; - if (!('type' in value) || value['type'] === undefined) return false; - return true; -} - -export function ResourceIdLayerCollectionFromJSON(json: any): ResourceIdLayerCollection { - return ResourceIdLayerCollectionFromJSONTyped(json, false); -} - -export function ResourceIdLayerCollectionFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdLayerCollection { - if (json == null) { - return json; - } - return { - - 'id': json['id'], - 'type': json['type'], - }; -} - -export function ResourceIdLayerCollectionToJSON(json: any): ResourceIdLayerCollection { - return ResourceIdLayerCollectionToJSONTyped(json, false); -} - -export function ResourceIdLayerCollectionToJSONTyped(value?: ResourceIdLayerCollection | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - - return { - - 'id': value['id'], - 'type': value['type'], - }; -} - diff --git a/typescript/src/models/ResourceIdMlModel.ts b/typescript/src/models/ResourceIdMlModel.ts deleted file mode 100644 index 31a4206e..00000000 --- a/typescript/src/models/ResourceIdMlModel.ts +++ /dev/null @@ -1,85 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import { mapValues } from '../runtime'; -/** - * - * @export - * @interface ResourceIdMlModel - */ -export interface ResourceIdMlModel { - /** - * - * @type {string} - * @memberof ResourceIdMlModel - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdMlModel - */ - type: ResourceIdMlModelTypeEnum; -} - - -/** - * @export - */ -export const ResourceIdMlModelTypeEnum = { - MlModel: 'MlModel' -} as const; -export type ResourceIdMlModelTypeEnum = typeof ResourceIdMlModelTypeEnum[keyof typeof ResourceIdMlModelTypeEnum]; - - -/** - * Check if a given object implements the ResourceIdMlModel interface. - */ -export function instanceOfResourceIdMlModel(value: object): value is ResourceIdMlModel { - if (!('id' in value) || value['id'] === undefined) return false; - if (!('type' in value) || value['type'] === undefined) return false; - return true; -} - -export function ResourceIdMlModelFromJSON(json: any): ResourceIdMlModel { - return ResourceIdMlModelFromJSONTyped(json, false); -} - -export function ResourceIdMlModelFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdMlModel { - if (json == null) { - return json; - } - return { - - 'id': json['id'], - 'type': json['type'], - }; -} - -export function ResourceIdMlModelToJSON(json: any): ResourceIdMlModel { - return ResourceIdMlModelToJSONTyped(json, false); -} - -export function ResourceIdMlModelToJSONTyped(value?: ResourceIdMlModel | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - - return { - - 'id': value['id'], - 'type': value['type'], - }; -} - diff --git a/typescript/src/models/ResourceIdProject.ts b/typescript/src/models/ResourceIdProject.ts deleted file mode 100644 index 402c2bff..00000000 --- a/typescript/src/models/ResourceIdProject.ts +++ /dev/null @@ -1,85 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import { mapValues } from '../runtime'; -/** - * - * @export - * @interface ResourceIdProject - */ -export interface ResourceIdProject { - /** - * - * @type {string} - * @memberof ResourceIdProject - */ - id: string; - /** - * - * @type {string} - * @memberof ResourceIdProject - */ - type: ResourceIdProjectTypeEnum; -} - - -/** - * @export - */ -export const ResourceIdProjectTypeEnum = { - Project: 'Project' -} as const; -export type ResourceIdProjectTypeEnum = typeof ResourceIdProjectTypeEnum[keyof typeof ResourceIdProjectTypeEnum]; - - -/** - * Check if a given object implements the ResourceIdProject interface. - */ -export function instanceOfResourceIdProject(value: object): value is ResourceIdProject { - if (!('id' in value) || value['id'] === undefined) return false; - if (!('type' in value) || value['type'] === undefined) return false; - return true; -} - -export function ResourceIdProjectFromJSON(json: any): ResourceIdProject { - return ResourceIdProjectFromJSONTyped(json, false); -} - -export function ResourceIdProjectFromJSONTyped(json: any, ignoreDiscriminator: boolean): ResourceIdProject { - if (json == null) { - return json; - } - return { - - 'id': json['id'], - 'type': json['type'], - }; -} - -export function ResourceIdProjectToJSON(json: any): ResourceIdProject { - return ResourceIdProjectToJSONTyped(json, false); -} - -export function ResourceIdProjectToJSONTyped(value?: ResourceIdProject | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - - return { - - 'id': value['id'], - 'type': value['type'], - }; -} - diff --git a/typescript/src/models/RgbaColorizer.ts b/typescript/src/models/RgbaColorizer.ts deleted file mode 100644 index 3b78f68c..00000000 --- a/typescript/src/models/RgbaColorizer.ts +++ /dev/null @@ -1,76 +0,0 @@ -/* tslint:disable */ -/* eslint-disable */ -/** - * Geo Engine Pro API - * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator) - * - * The version of the OpenAPI document: 0.8.0 - * Contact: dev@geoengine.de - * - * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). - * https://openapi-generator.tech - * Do not edit the class manually. - */ - -import { exists, mapValues } from '../runtime'; -/** - * - * @export - * @interface RgbaColorizer - */ -export interface RgbaColorizer { - /** - * - * @type {string} - * @memberof RgbaColorizer - */ - type: RgbaColorizerTypeEnum; -} - - -/** - * @export - */ -export const RgbaColorizerTypeEnum = { - Rgba: 'rgba' -} as const; -export type RgbaColorizerTypeEnum = typeof RgbaColorizerTypeEnum[keyof typeof RgbaColorizerTypeEnum]; - - -/** - * Check if a given object implements the RgbaColorizer interface. - */ -export function instanceOfRgbaColorizer(value: object): boolean { - let isInstance = true; - isInstance = isInstance && "type" in value; - - return isInstance; -} - -export function RgbaColorizerFromJSON(json: any): RgbaColorizer { - return RgbaColorizerFromJSONTyped(json, false); -} - -export function RgbaColorizerFromJSONTyped(json: any, ignoreDiscriminator: boolean): RgbaColorizer { - if ((json === undefined) || (json === null)) { - return json; - } - return { - - 'type': json['type'], - }; -} - -export function RgbaColorizerToJSON(value?: RgbaColorizer | null): any { - if (value === undefined) { - return undefined; - } - if (value === null) { - return null; - } - return { - - 'type': value.type, - }; -} - diff --git a/typescript/src/models/SpatialReferenceSpecification.ts b/typescript/src/models/SpatialReferenceSpecification.ts index a3080c82..f7fe9484 100644 --- a/typescript/src/models/SpatialReferenceSpecification.ts +++ b/typescript/src/models/SpatialReferenceSpecification.ts @@ -40,7 +40,7 @@ export interface SpatialReferenceSpecification { * @type {Array} * @memberof SpatialReferenceSpecification */ - axisLabels?: Array | null; + axisLabels?: Array; /** * * @type {AxisOrder} diff --git a/typescript/src/models/ColorParamStatic.ts b/typescript/src/models/StaticColor.ts similarity index 54% rename from typescript/src/models/ColorParamStatic.ts rename to typescript/src/models/StaticColor.ts index 6238c2af..539b26ed 100644 --- a/typescript/src/models/ColorParamStatic.ts +++ b/typescript/src/models/StaticColor.ts @@ -16,47 +16,47 @@ import { mapValues } from '../runtime'; /** * * @export - * @interface ColorParamStatic + * @interface StaticColor */ -export interface ColorParamStatic { +export interface StaticColor { /** * * @type {Array} - * @memberof ColorParamStatic + * @memberof StaticColor */ color: Array; /** * * @type {string} - * @memberof ColorParamStatic + * @memberof StaticColor */ - type: ColorParamStaticTypeEnum; + type: StaticColorTypeEnum; } /** * @export */ -export const ColorParamStaticTypeEnum = { +export const StaticColorTypeEnum = { Static: 'static' } as const; -export type ColorParamStaticTypeEnum = typeof ColorParamStaticTypeEnum[keyof typeof ColorParamStaticTypeEnum]; +export type StaticColorTypeEnum = typeof StaticColorTypeEnum[keyof typeof StaticColorTypeEnum]; /** - * Check if a given object implements the ColorParamStatic interface. + * Check if a given object implements the StaticColor interface. */ -export function instanceOfColorParamStatic(value: object): value is ColorParamStatic { +export function instanceOfStaticColor(value: object): value is StaticColor { if (!('color' in value) || value['color'] === undefined) return false; if (!('type' in value) || value['type'] === undefined) return false; return true; } -export function ColorParamStaticFromJSON(json: any): ColorParamStatic { - return ColorParamStaticFromJSONTyped(json, false); +export function StaticColorFromJSON(json: any): StaticColor { + return StaticColorFromJSONTyped(json, false); } -export function ColorParamStaticFromJSONTyped(json: any, ignoreDiscriminator: boolean): ColorParamStatic { +export function StaticColorFromJSONTyped(json: any, ignoreDiscriminator: boolean): StaticColor { if (json == null) { return json; } @@ -67,11 +67,11 @@ export function ColorParamStaticFromJSONTyped(json: any, ignoreDiscriminator: bo }; } -export function ColorParamStaticToJSON(json: any): ColorParamStatic { - return ColorParamStaticToJSONTyped(json, false); +export function StaticColorToJSON(json: any): StaticColor { + return StaticColorToJSONTyped(json, false); } -export function ColorParamStaticToJSONTyped(value?: ColorParamStatic | null, ignoreDiscriminator: boolean = false): any { +export function StaticColorToJSONTyped(value?: StaticColor | null, ignoreDiscriminator: boolean = false): any { if (value == null) { return value; } diff --git a/typescript/src/models/StaticNumberParam.ts b/typescript/src/models/StaticNumber.ts similarity index 53% rename from typescript/src/models/StaticNumberParam.ts rename to typescript/src/models/StaticNumber.ts index da343e28..5e969b32 100644 --- a/typescript/src/models/StaticNumberParam.ts +++ b/typescript/src/models/StaticNumber.ts @@ -16,19 +16,19 @@ import { mapValues } from '../runtime'; /** * * @export - * @interface StaticNumberParam + * @interface StaticNumber */ -export interface StaticNumberParam { +export interface StaticNumber { /** * * @type {string} - * @memberof StaticNumberParam + * @memberof StaticNumber */ - type: StaticNumberParamTypeEnum; + type: StaticNumberTypeEnum; /** * * @type {number} - * @memberof StaticNumberParam + * @memberof StaticNumber */ value: number; } @@ -37,26 +37,26 @@ export interface StaticNumberParam { /** * @export */ -export const StaticNumberParamTypeEnum = { +export const StaticNumberTypeEnum = { Static: 'static' } as const; -export type StaticNumberParamTypeEnum = typeof StaticNumberParamTypeEnum[keyof typeof StaticNumberParamTypeEnum]; +export type StaticNumberTypeEnum = typeof StaticNumberTypeEnum[keyof typeof StaticNumberTypeEnum]; /** - * Check if a given object implements the StaticNumberParam interface. + * Check if a given object implements the StaticNumber interface. */ -export function instanceOfStaticNumberParam(value: object): value is StaticNumberParam { +export function instanceOfStaticNumber(value: object): value is StaticNumber { if (!('type' in value) || value['type'] === undefined) return false; if (!('value' in value) || value['value'] === undefined) return false; return true; } -export function StaticNumberParamFromJSON(json: any): StaticNumberParam { - return StaticNumberParamFromJSONTyped(json, false); +export function StaticNumberFromJSON(json: any): StaticNumber { + return StaticNumberFromJSONTyped(json, false); } -export function StaticNumberParamFromJSONTyped(json: any, ignoreDiscriminator: boolean): StaticNumberParam { +export function StaticNumberFromJSONTyped(json: any, ignoreDiscriminator: boolean): StaticNumber { if (json == null) { return json; } @@ -67,11 +67,11 @@ export function StaticNumberParamFromJSONTyped(json: any, ignoreDiscriminator: b }; } -export function StaticNumberParamToJSON(json: any): StaticNumberParam { - return StaticNumberParamToJSONTyped(json, false); +export function StaticNumberToJSON(json: any): StaticNumber { + return StaticNumberToJSONTyped(json, false); } -export function StaticNumberParamToJSONTyped(value?: StaticNumberParam | null, ignoreDiscriminator: boolean = false): any { +export function StaticNumberToJSONTyped(value?: StaticNumber | null, ignoreDiscriminator: boolean = false): any { if (value == null) { return value; } diff --git a/typescript/src/models/TypedPlotResultDescriptor.ts b/typescript/src/models/TypedPlotResultDescriptor.ts index b3d424a9..dba4e47c 100644 --- a/typescript/src/models/TypedPlotResultDescriptor.ts +++ b/typescript/src/models/TypedPlotResultDescriptor.ts @@ -27,31 +27,20 @@ import { BoundingBox2DToJSON, BoundingBox2DToJSONTyped, } from './BoundingBox2D'; +import type { PlotResultDescriptor } from './PlotResultDescriptor'; +import { + PlotResultDescriptorFromJSON, + PlotResultDescriptorFromJSONTyped, + PlotResultDescriptorToJSON, + PlotResultDescriptorToJSONTyped, +} from './PlotResultDescriptor'; /** - * A `ResultDescriptor` for plot queries + * * @export * @interface TypedPlotResultDescriptor */ -export interface TypedPlotResultDescriptor { - /** - * - * @type {BoundingBox2D} - * @memberof TypedPlotResultDescriptor - */ - bbox?: BoundingBox2D | null; - /** - * - * @type {string} - * @memberof TypedPlotResultDescriptor - */ - spatialReference: string; - /** - * - * @type {TimeInterval} - * @memberof TypedPlotResultDescriptor - */ - time?: TimeInterval | null; +export interface TypedPlotResultDescriptor extends PlotResultDescriptor { /** * * @type {string} @@ -74,7 +63,6 @@ export type TypedPlotResultDescriptorTypeEnum = typeof TypedPlotResultDescriptor * Check if a given object implements the TypedPlotResultDescriptor interface. */ export function instanceOfTypedPlotResultDescriptor(value: object): value is TypedPlotResultDescriptor { - if (!('spatialReference' in value) || value['spatialReference'] === undefined) return false; if (!('type' in value) || value['type'] === undefined) return false; return true; } @@ -88,10 +76,7 @@ export function TypedPlotResultDescriptorFromJSONTyped(json: any, ignoreDiscrimi return json; } return { - - 'bbox': json['bbox'] == null ? undefined : BoundingBox2DFromJSON(json['bbox']), - 'spatialReference': json['spatialReference'], - 'time': json['time'] == null ? undefined : TimeIntervalFromJSON(json['time']), + ...PlotResultDescriptorFromJSONTyped(json, true), 'type': json['type'], }; } @@ -106,10 +91,7 @@ export function TypedPlotResultDescriptorToJSONTyped(value?: TypedPlotResultDesc } return { - - 'bbox': BoundingBox2DToJSON(value['bbox']), - 'spatialReference': value['spatialReference'], - 'time': TimeIntervalToJSON(value['time']), + ...PlotResultDescriptorToJSONTyped(value, true), 'type': value['type'], }; } diff --git a/typescript/src/models/TypedRasterResultDescriptor.ts b/typescript/src/models/TypedRasterResultDescriptor.ts index 4371c41f..6d269a93 100644 --- a/typescript/src/models/TypedRasterResultDescriptor.ts +++ b/typescript/src/models/TypedRasterResultDescriptor.ts @@ -27,6 +27,13 @@ import { TimeIntervalToJSON, TimeIntervalToJSONTyped, } from './TimeInterval'; +import type { RasterResultDescriptor } from './RasterResultDescriptor'; +import { + RasterResultDescriptorFromJSON, + RasterResultDescriptorFromJSONTyped, + RasterResultDescriptorToJSON, + RasterResultDescriptorToJSONTyped, +} from './RasterResultDescriptor'; import type { RasterBandDescriptor } from './RasterBandDescriptor'; import { RasterBandDescriptorFromJSON, @@ -50,47 +57,11 @@ import { } from './SpatialPartition2D'; /** - * A `ResultDescriptor` for raster queries + * * @export * @interface TypedRasterResultDescriptor */ -export interface TypedRasterResultDescriptor { - /** - * - * @type {Array} - * @memberof TypedRasterResultDescriptor - */ - bands: Array; - /** - * - * @type {SpatialPartition2D} - * @memberof TypedRasterResultDescriptor - */ - bbox?: SpatialPartition2D | null; - /** - * - * @type {RasterDataType} - * @memberof TypedRasterResultDescriptor - */ - dataType: RasterDataType; - /** - * - * @type {SpatialResolution} - * @memberof TypedRasterResultDescriptor - */ - resolution?: SpatialResolution | null; - /** - * - * @type {string} - * @memberof TypedRasterResultDescriptor - */ - spatialReference: string; - /** - * - * @type {TimeInterval} - * @memberof TypedRasterResultDescriptor - */ - time?: TimeInterval | null; +export interface TypedRasterResultDescriptor extends RasterResultDescriptor { /** * * @type {string} @@ -113,9 +84,6 @@ export type TypedRasterResultDescriptorTypeEnum = typeof TypedRasterResultDescri * Check if a given object implements the TypedRasterResultDescriptor interface. */ export function instanceOfTypedRasterResultDescriptor(value: object): value is TypedRasterResultDescriptor { - if (!('bands' in value) || value['bands'] === undefined) return false; - if (!('dataType' in value) || value['dataType'] === undefined) return false; - if (!('spatialReference' in value) || value['spatialReference'] === undefined) return false; if (!('type' in value) || value['type'] === undefined) return false; return true; } @@ -129,13 +97,7 @@ export function TypedRasterResultDescriptorFromJSONTyped(json: any, ignoreDiscri return json; } return { - - 'bands': ((json['bands'] as Array).map(RasterBandDescriptorFromJSON)), - 'bbox': json['bbox'] == null ? undefined : SpatialPartition2DFromJSON(json['bbox']), - 'dataType': RasterDataTypeFromJSON(json['dataType']), - 'resolution': json['resolution'] == null ? undefined : SpatialResolutionFromJSON(json['resolution']), - 'spatialReference': json['spatialReference'], - 'time': json['time'] == null ? undefined : TimeIntervalFromJSON(json['time']), + ...RasterResultDescriptorFromJSONTyped(json, true), 'type': json['type'], }; } @@ -150,13 +112,7 @@ export function TypedRasterResultDescriptorToJSONTyped(value?: TypedRasterResult } return { - - 'bands': ((value['bands'] as Array).map(RasterBandDescriptorToJSON)), - 'bbox': SpatialPartition2DToJSON(value['bbox']), - 'dataType': RasterDataTypeToJSON(value['dataType']), - 'resolution': SpatialResolutionToJSON(value['resolution']), - 'spatialReference': value['spatialReference'], - 'time': TimeIntervalToJSON(value['time']), + ...RasterResultDescriptorToJSONTyped(value, true), 'type': value['type'], }; } diff --git a/typescript/src/models/TypedVectorResultDescriptor.ts b/typescript/src/models/TypedVectorResultDescriptor.ts index 4d9f4284..979ccc0b 100644 --- a/typescript/src/models/TypedVectorResultDescriptor.ts +++ b/typescript/src/models/TypedVectorResultDescriptor.ts @@ -20,6 +20,13 @@ import { VectorDataTypeToJSON, VectorDataTypeToJSONTyped, } from './VectorDataType'; +import type { VectorResultDescriptor } from './VectorResultDescriptor'; +import { + VectorResultDescriptorFromJSON, + VectorResultDescriptorFromJSONTyped, + VectorResultDescriptorToJSON, + VectorResultDescriptorToJSONTyped, +} from './VectorResultDescriptor'; import type { TimeInterval } from './TimeInterval'; import { TimeIntervalFromJSON, @@ -47,37 +54,7 @@ import { * @export * @interface TypedVectorResultDescriptor */ -export interface TypedVectorResultDescriptor { - /** - * - * @type {BoundingBox2D} - * @memberof TypedVectorResultDescriptor - */ - bbox?: BoundingBox2D | null; - /** - * - * @type {{ [key: string]: VectorColumnInfo; }} - * @memberof TypedVectorResultDescriptor - */ - columns: { [key: string]: VectorColumnInfo; }; - /** - * - * @type {VectorDataType} - * @memberof TypedVectorResultDescriptor - */ - dataType: VectorDataType; - /** - * - * @type {string} - * @memberof TypedVectorResultDescriptor - */ - spatialReference: string; - /** - * - * @type {TimeInterval} - * @memberof TypedVectorResultDescriptor - */ - time?: TimeInterval | null; +export interface TypedVectorResultDescriptor extends VectorResultDescriptor { /** * * @type {string} @@ -100,9 +77,6 @@ export type TypedVectorResultDescriptorTypeEnum = typeof TypedVectorResultDescri * Check if a given object implements the TypedVectorResultDescriptor interface. */ export function instanceOfTypedVectorResultDescriptor(value: object): value is TypedVectorResultDescriptor { - if (!('columns' in value) || value['columns'] === undefined) return false; - if (!('dataType' in value) || value['dataType'] === undefined) return false; - if (!('spatialReference' in value) || value['spatialReference'] === undefined) return false; if (!('type' in value) || value['type'] === undefined) return false; return true; } @@ -116,12 +90,7 @@ export function TypedVectorResultDescriptorFromJSONTyped(json: any, ignoreDiscri return json; } return { - - 'bbox': json['bbox'] == null ? undefined : BoundingBox2DFromJSON(json['bbox']), - 'columns': (mapValues(json['columns'], VectorColumnInfoFromJSON)), - 'dataType': VectorDataTypeFromJSON(json['dataType']), - 'spatialReference': json['spatialReference'], - 'time': json['time'] == null ? undefined : TimeIntervalFromJSON(json['time']), + ...VectorResultDescriptorFromJSONTyped(json, true), 'type': json['type'], }; } @@ -136,12 +105,7 @@ export function TypedVectorResultDescriptorToJSONTyped(value?: TypedVectorResult } return { - - 'bbox': BoundingBox2DToJSON(value['bbox']), - 'columns': (mapValues(value['columns'], VectorColumnInfoToJSON)), - 'dataType': VectorDataTypeToJSON(value['dataType']), - 'spatialReference': value['spatialReference'], - 'time': TimeIntervalToJSON(value['time']), + ...VectorResultDescriptorToJSONTyped(value, true), 'type': value['type'], }; } diff --git a/typescript/src/models/UpdateProject.ts b/typescript/src/models/UpdateProject.ts index 5dbed48d..4bbec168 100644 --- a/typescript/src/models/UpdateProject.ts +++ b/typescript/src/models/UpdateProject.ts @@ -20,13 +20,6 @@ import { TimeStepToJSON, TimeStepToJSONTyped, } from './TimeStep'; -import type { PlotUpdate } from './PlotUpdate'; -import { - PlotUpdateFromJSON, - PlotUpdateFromJSONTyped, - PlotUpdateToJSON, - PlotUpdateToJSONTyped, -} from './PlotUpdate'; import type { STRectangle } from './STRectangle'; import { STRectangleFromJSON, @@ -34,13 +27,13 @@ import { STRectangleToJSON, STRectangleToJSONTyped, } from './STRectangle'; -import type { LayerUpdate } from './LayerUpdate'; +import type { VecUpdate } from './VecUpdate'; import { - LayerUpdateFromJSON, - LayerUpdateFromJSONTyped, - LayerUpdateToJSON, - LayerUpdateToJSONTyped, -} from './LayerUpdate'; + VecUpdateFromJSON, + VecUpdateFromJSONTyped, + VecUpdateToJSON, + VecUpdateToJSONTyped, +} from './VecUpdate'; /** * @@ -68,10 +61,10 @@ export interface UpdateProject { id: string; /** * - * @type {Array} + * @type {Array} * @memberof UpdateProject */ - layers?: Array | null; + layers?: Array | null; /** * * @type {string} @@ -80,10 +73,10 @@ export interface UpdateProject { name?: string | null; /** * - * @type {Array} + * @type {Array} * @memberof UpdateProject */ - plots?: Array | null; + plots?: Array | null; /** * * @type {TimeStep} @@ -113,9 +106,9 @@ export function UpdateProjectFromJSONTyped(json: any, ignoreDiscriminator: boole 'bounds': json['bounds'] == null ? undefined : STRectangleFromJSON(json['bounds']), 'description': json['description'] == null ? undefined : json['description'], 'id': json['id'], - 'layers': json['layers'] == null ? undefined : ((json['layers'] as Array).map(LayerUpdateFromJSON)), + 'layers': json['layers'] == null ? undefined : ((json['layers'] as Array).map(VecUpdateFromJSON)), 'name': json['name'] == null ? undefined : json['name'], - 'plots': json['plots'] == null ? undefined : ((json['plots'] as Array).map(PlotUpdateFromJSON)), + 'plots': json['plots'] == null ? undefined : ((json['plots'] as Array).map(VecUpdateFromJSON)), 'timeStep': json['timeStep'] == null ? undefined : TimeStepFromJSON(json['timeStep']), }; } @@ -134,9 +127,9 @@ export function UpdateProjectToJSONTyped(value?: UpdateProject | null, ignoreDis 'bounds': STRectangleToJSON(value['bounds']), 'description': value['description'], 'id': value['id'], - 'layers': value['layers'] == null ? undefined : ((value['layers'] as Array).map(LayerUpdateToJSON)), + 'layers': value['layers'] == null ? undefined : ((value['layers'] as Array).map(VecUpdateToJSON)), 'name': value['name'], - 'plots': value['plots'] == null ? undefined : ((value['plots'] as Array).map(PlotUpdateToJSON)), + 'plots': value['plots'] == null ? undefined : ((value['plots'] as Array).map(VecUpdateToJSON)), 'timeStep': TimeStepToJSON(value['timeStep']), }; } diff --git a/typescript/src/models/UserSession.ts b/typescript/src/models/UserSession.ts index 6f0115b3..09a0ac24 100644 --- a/typescript/src/models/UserSession.ts +++ b/typescript/src/models/UserSession.ts @@ -51,7 +51,7 @@ export interface UserSession { * @type {string} * @memberof UserSession */ - project?: string | null; + project?: string; /** * * @type {Array} diff --git a/typescript/src/models/PlotUpdate.ts b/typescript/src/models/VecUpdate.ts similarity index 74% rename from typescript/src/models/PlotUpdate.ts rename to typescript/src/models/VecUpdate.ts index 887d0ca4..5fdccd10 100644 --- a/typescript/src/models/PlotUpdate.ts +++ b/typescript/src/models/VecUpdate.ts @@ -28,17 +28,17 @@ import { } from './ProjectUpdateToken'; /** - * @type PlotUpdate + * @type VecUpdate * * @export */ -export type PlotUpdate = Plot | ProjectUpdateToken; +export type VecUpdate = Plot | ProjectUpdateToken; -export function PlotUpdateFromJSON(json: any): PlotUpdate { - return PlotUpdateFromJSONTyped(json, false); +export function VecUpdateFromJSON(json: any): VecUpdate { + return VecUpdateFromJSONTyped(json, false); } -export function PlotUpdateFromJSONTyped(json: any, ignoreDiscriminator: boolean): PlotUpdate { +export function VecUpdateFromJSONTyped(json: any, ignoreDiscriminator: boolean): VecUpdate { if (json == null) { return json; } @@ -52,11 +52,11 @@ export function PlotUpdateFromJSONTyped(json: any, ignoreDiscriminator: boolean) return {} as any; } -export function PlotUpdateToJSON(json: any): any { - return PlotUpdateToJSONTyped(json, false); +export function VecUpdateToJSON(json: any): any { + return VecUpdateToJSONTyped(json, false); } -export function PlotUpdateToJSONTyped(value?: PlotUpdate | null, ignoreDiscriminator: boolean = false): any { +export function VecUpdateToJSONTyped(value?: VecUpdate | null, ignoreDiscriminator: boolean = false): any { if (value == null) { return value; } diff --git a/typescript/src/models/index.ts b/typescript/src/models/index.ts index f2d0bb1b..1fd7bb3c 100644 --- a/typescript/src/models/index.ts +++ b/typescript/src/models/index.ts @@ -1,6 +1,5 @@ /* tslint:disable */ /* eslint-disable */ -export * from './AddCollection200Response'; export * from './AddDataset'; export * from './AddLayer'; export * from './AddLayerCollection'; @@ -15,13 +14,11 @@ export * from './ClassificationMeasurement'; export * from './CollectionItem'; export * from './CollectionType'; export * from './ColorParam'; -export * from './ColorParamStatic'; export * from './Colorizer'; export * from './ComputationQuota'; export * from './ContinuousMeasurement'; export * from './Coordinate2D'; export * from './CreateDataset'; -export * from './CreateDatasetHandler200Response'; export * from './CreateProject'; export * from './CsvHeader'; export * from './DataId'; @@ -33,8 +30,8 @@ export * from './DataUsageSummary'; export * from './Dataset'; export * from './DatasetDefinition'; export * from './DatasetListing'; +export * from './DatasetNameResponse'; export * from './DatasetResource'; -export * from './DateTime'; export * from './DerivedColor'; export * from './DerivedNumber'; export * from './DescribeCoverageRequest'; @@ -64,7 +61,7 @@ export * from './GetLegendGraphicRequest'; export * from './GetMapExceptionFormat'; export * from './GetMapFormat'; export * from './GetMapRequest'; -export * from './InlineObject'; +export * from './IdResponse'; export * from './InternalDataId'; export * from './Layer'; export * from './LayerCollection'; @@ -72,7 +69,6 @@ export * from './LayerCollectionListing'; export * from './LayerCollectionResource'; export * from './LayerListing'; export * from './LayerResource'; -export * from './LayerUpdate'; export * from './LayerVisibility'; export * from './LineSymbology'; export * from './LinearGradient'; @@ -119,7 +115,6 @@ export * from './Plot'; export * from './PlotOutputFormat'; export * from './PlotQueryRectangle'; export * from './PlotResultDescriptor'; -export * from './PlotUpdate'; export * from './PointSymbology'; export * from './PolygonSymbology'; export * from './Project'; @@ -148,12 +143,6 @@ export * from './RasterResultDescriptor'; export * from './RasterStreamWebsocketResultType'; export * from './RasterSymbology'; export * from './Resource'; -export * from './ResourceId'; -export * from './ResourceIdDatasetId'; -export * from './ResourceIdLayer'; -export * from './ResourceIdLayerCollection'; -export * from './ResourceIdMlModel'; -export * from './ResourceIdProject'; export * from './Role'; export * from './RoleDescription'; export * from './STRectangle'; @@ -166,7 +155,8 @@ export * from './SpatialPartition2D'; export * from './SpatialReferenceAuthority'; export * from './SpatialReferenceSpecification'; export * from './SpatialResolution'; -export * from './StaticNumberParam'; +export * from './StaticColor'; +export * from './StaticNumber'; export * from './StrokeParam'; export * from './SuggestMetaData'; export * from './Symbology'; @@ -210,6 +200,7 @@ export * from './UserCredentials'; export * from './UserInfo'; export * from './UserRegistration'; export * from './UserSession'; +export * from './VecUpdate'; export * from './VectorColumnInfo'; export * from './VectorDataType'; export * from './VectorQueryRectangle'; diff --git a/typescript/src/runtime.ts b/typescript/src/runtime.ts index 04c5abfe..992178a1 100644 --- a/typescript/src/runtime.ts +++ b/typescript/src/runtime.ts @@ -13,7 +13,7 @@ */ -export const BASE_PATH = "http://0.0.0.0:8080/api".replace(/\/+$/, ""); +export const BASE_PATH = "https://geoengine.io/api".replace(/\/+$/, ""); export interface ConfigurationParameters { basePath?: string; // override base path @@ -86,7 +86,7 @@ export class Configuration { export const DefaultConfig = new Configuration({ headers: { - 'User-Agent': 'geoengine/openapi-client/typescript/0.0.21' + 'User-Agent': 'geoengine/openapi-client/typescript/0.0.22' } });