diff --git a/.generation/config.ini b/.generation/config.ini index 74e872a2..bcda842f 100644 --- a/.generation/config.ini +++ b/.generation/config.ini @@ -1,5 +1,5 @@ [input] -backendCommit = 1076a616369dcc33e86b422a9364ac99553a18f8 +backendCommit = aa2b2f9e64c539a66cda18f40d0f9ee670868852 [general] githubUrl = https://github.com/geo-engine/openapi-client diff --git a/.generation/input/openapi.json b/.generation/input/openapi.json index a68008f2..24c8d924 100644 --- a/.generation/input/openapi.json +++ b/.generation/input/openapi.json @@ -5196,14 +5196,6 @@ "type": "string" } }, - { - "name": "spatialResolution", - "in": "query", - "required": true, - "schema": { - "$ref": "#/components/schemas/SpatialResolution" - } - }, { "name": "attributes", "in": "query", @@ -5460,6 +5452,15 @@ "eastNorth" ] }, + "BTreeMap": { + "type": "object", + "additionalProperties": { + "type": "string" + }, + "propertyNames": { + "type": "string" + } + }, "BandSelection": { "type": "array", "items": { @@ -5512,15 +5513,7 @@ ], "properties": { "classes": { - "type": "object", - "additionalProperties": { - "type": "string" - }, - "propertyNames": { - "type": "integer", - "format": "int32", - "minimum": 0 - } + "$ref": "#/components/schemas/BTreeMap" }, "measurement": { "type": "string" @@ -6461,6 +6454,27 @@ } } }, + "GeoTransform": { + "type": "object", + "required": [ + "originCoordinate", + "xPixelSize", + "yPixelSize" + ], + "properties": { + "originCoordinate": { + "$ref": "#/components/schemas/Coordinate2D" + }, + "xPixelSize": { + "type": "number", + "format": "double" + }, + "yPixelSize": { + "type": "number", + "format": "double" + } + } + }, "GetCapabilitiesFormat": { "type": "string", "enum": [ @@ -6516,6 +6530,36 @@ "GetMap" ] }, + "GridBoundingBox2D": { + "type": "object", + "required": [ + "topLeftIdx", + "bottomRightIdx" + ], + "properties": { + "bottomRightIdx": { + "$ref": "#/components/schemas/GridIdx2D" + }, + "topLeftIdx": { + "$ref": "#/components/schemas/GridIdx2D" + } + } + }, + "GridIdx2D": { + "type": "object", + "required": [ + "yIdx", + "xIdx" + ], + "properties": { + "xIdx": { + "type": "integer" + }, + "yIdx": { + "type": "integer" + } + } + }, "InternalDataId": { "type": "object", "required": [ @@ -7794,26 +7838,6 @@ "ImagePng" ] }, - "PlotQueryRectangle": { - "type": "object", - "description": "A spatio-temporal rectangle with a specified resolution", - "required": [ - "spatialBounds", - "timeInterval", - "spatialResolution" - ], - "properties": { - "spatialBounds": { - "$ref": "#/components/schemas/BoundingBox2D" - }, - "spatialResolution": { - "$ref": "#/components/schemas/SpatialResolution" - }, - "timeInterval": { - "$ref": "#/components/schemas/TimeInterval" - } - } - }, "PlotResultDescriptor": { "type": "object", "description": "A `ResultDescriptor` for plot queries", @@ -8300,7 +8324,7 @@ ] }, "query": { - "$ref": "#/components/schemas/RasterQueryRectangle" + "$ref": "#/components/schemas/RasterToDatasetQueryRectangle" } }, "example": { @@ -8321,10 +8345,6 @@ "timeInterval": { "start": 1388534400000, "end": 1388534401000 - }, - "spatialResolution": { - "x": 0.1, - "y": 0.1 } } } @@ -8369,60 +8389,24 @@ } } }, - "RasterQueryRectangle": { - "type": "object", - "description": "A spatio-temporal rectangle with a specified resolution", - "required": [ - "spatialBounds", - "timeInterval", - "spatialResolution" - ], - "properties": { - "spatialBounds": { - "$ref": "#/components/schemas/SpatialPartition2D" - }, - "spatialResolution": { - "$ref": "#/components/schemas/SpatialResolution" - }, - "timeInterval": { - "$ref": "#/components/schemas/TimeInterval" - } - } - }, "RasterResultDescriptor": { "type": "object", "description": "A `ResultDescriptor` for raster queries", "required": [ "dataType", "spatialReference", + "spatialGrid", "bands" ], "properties": { "bands": { "$ref": "#/components/schemas/RasterBandDescriptors" }, - "bbox": { - "oneOf": [ - { - "type": "null" - }, - { - "$ref": "#/components/schemas/SpatialPartition2D" - } - ] - }, "dataType": { "$ref": "#/components/schemas/RasterDataType" }, - "resolution": { - "oneOf": [ - { - "type": "null" - }, - { - "$ref": "#/components/schemas/SpatialResolution" - } - ] + "spatialGrid": { + "$ref": "#/components/schemas/SpatialGridDescriptor" }, "spatialReference": { "type": "string" @@ -8469,6 +8453,22 @@ } } }, + "RasterToDatasetQueryRectangle": { + "type": "object", + "description": "A spatio-temporal rectangle with a specified resolution", + "required": [ + "spatialBounds", + "timeInterval" + ], + "properties": { + "spatialBounds": { + "$ref": "#/components/schemas/SpatialPartition2D" + }, + "timeInterval": { + "$ref": "#/components/schemas/TimeInterval" + } + } + }, "Resource": { "oneOf": [ { @@ -8657,6 +8657,43 @@ } } }, + "SpatialGridDefinition": { + "type": "object", + "required": [ + "geoTransform", + "gridBounds" + ], + "properties": { + "geoTransform": { + "$ref": "#/components/schemas/GeoTransform" + }, + "gridBounds": { + "$ref": "#/components/schemas/GridBoundingBox2D" + } + } + }, + "SpatialGridDescriptor": { + "type": "object", + "required": [ + "spatialGrid", + "descriptor" + ], + "properties": { + "descriptor": { + "$ref": "#/components/schemas/SpatialGridDescriptorState" + }, + "spatialGrid": { + "$ref": "#/components/schemas/SpatialGridDefinition" + } + } + }, + "SpatialGridDescriptorState": { + "type": "string", + "enum": [ + "source", + "derived" + ] + }, "SpatialPartition2D": { "type": "object", "description": "A partition of space that include the upper left but excludes the lower right coordinate", @@ -9756,26 +9793,6 @@ "MultiPolygon" ] }, - "VectorQueryRectangle": { - "type": "object", - "description": "A spatio-temporal rectangle with a specified resolution", - "required": [ - "spatialBounds", - "timeInterval", - "spatialResolution" - ], - "properties": { - "spatialBounds": { - "$ref": "#/components/schemas/BoundingBox2D" - }, - "spatialResolution": { - "$ref": "#/components/schemas/SpatialResolution" - }, - "timeInterval": { - "$ref": "#/components/schemas/TimeInterval" - } - } - }, "VectorResultDescriptor": { "type": "object", "required": [ diff --git a/.generation/post-process/python.py b/.generation/post-process/python.py index 894d675e..60be8bcc 100644 --- a/.generation/post-process/python.py +++ b/.generation/post-process/python.py @@ -13,6 +13,7 @@ INDENT = ' ' HALF_INDENT = ' ' + def api_client_py(file_contents: List[str]) -> Generator[str, None, None]: '''Modify the api_client.py file.''' for line in file_contents: @@ -25,6 +26,7 @@ def api_client_py(file_contents: List[str]) -> Generator[str, None, None]: yield line + def exceptions_py(file_contents: List[str]) -> Generator[str, None, None]: '''Modify the exceptions.py file.''' for line in file_contents: @@ -39,6 +41,7 @@ def exceptions_py(file_contents: List[str]) -> Generator[str, None, None]: yield line + def task_status_with_id_py(file_contents: List[str]) -> Generator[str, None, None]: '''Modify the task_status_with_id.py file.''' for line in file_contents: @@ -73,12 +76,14 @@ def task_status_with_id_py(file_contents: List[str]) -> Generator[str, None, Non yield line + EARLY_RETURN_EMPTY_HTTP_RESPONSE = indent(dedent('''\ # Note: fixed handling of empty responses if response_data.data is None: return None '''), 2 * INDENT) + def tasks_api_py(file_contents: List[str]) -> Generator[str, None, None]: '''Modify the tasks_api.py file.''' state: Literal[None, 'abort_handler'] = None @@ -88,12 +93,13 @@ def tasks_api_py(file_contents: List[str]) -> Generator[str, None, None]: state = 'abort_handler' elif state == 'abort_handler' and \ - dedented_line.startswith('return self.api_client.response_deserialize('): + dedented_line.startswith('return self.api_client.response_deserialize('): line = EARLY_RETURN_EMPTY_HTTP_RESPONSE + '\n' + line state = None yield line + def layers_api_py(file_contents: List[str]) -> Generator[str, None, None]: '''Modify the tasks_api.py file.''' state: Literal[ @@ -105,7 +111,8 @@ def layers_api_py(file_contents: List[str]) -> Generator[str, None, None]: if state is None and ( dedented_line.startswith('def add_existing_layer_to_collection(') or - dedented_line.startswith('def add_existing_collection_to_collection(') + dedented_line.startswith( + 'def add_existing_collection_to_collection(') or dedented_line.startswith('def remove_collection_from_collection(') or @@ -116,12 +123,13 @@ def layers_api_py(file_contents: List[str]) -> Generator[str, None, None]: state = 'add_early_return_empty_http_response' elif state == 'add_early_return_empty_http_response' and \ - dedented_line.startswith('return self.api_client.response_deserialize('): + dedented_line.startswith('return self.api_client.response_deserialize('): line = EARLY_RETURN_EMPTY_HTTP_RESPONSE + '\n' + line state = None yield line + def ogc_xyz_api_py(ogc_api: Literal['wfs', 'wms']) -> Callable[[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]: @@ -141,7 +149,7 @@ def _ogc_xyz_api_py(file_contents: List[str]) -> Generator[str, None, None]: 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 ''' @@ -161,9 +169,8 @@ def raster_result_descriptor_py(file_contents: List[str]) -> Generator[str, None _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, + "spatialGrid": SpatialGridDescriptor.from_dict(obj["spatialGrid"]) if obj.get("spatialGrid") 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, }) @@ -172,10 +179,11 @@ def raster_result_descriptor_py(file_contents: List[str]) -> Generator[str, None 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 ''' @@ -214,7 +222,7 @@ def vector_result_descriptor_py(file_contents: List[str]) -> Generator[str, None 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 ''' @@ -242,6 +250,7 @@ def plot_result_descriptor_py(file_contents: List[str]) -> Generator[str, None, yield line + input_file = Path(sys.argv[1]) file_modifications = { @@ -260,6 +269,6 @@ def plot_result_descriptor_py(file_contents: List[str]) -> Generator[str, None, if modifier_function := file_modifications.get(input_file.name): modify_file(input_file, modifier_function) else: - pass # leave file untouched + pass # leave file untouched exit(0) diff --git a/python/.openapi-generator/FILES b/python/.openapi-generator/FILES index cd77744f..c5bcf5dd 100644 --- a/python/.openapi-generator/FILES +++ b/python/.openapi-generator/FILES @@ -57,6 +57,7 @@ docs/GdalMetadataNetCdfCf.md docs/GdalSourceTimePlaceholder.md docs/GeneralApi.md docs/GeoJson.md +docs/GeoTransform.md docs/GetCapabilitiesFormat.md docs/GetCapabilitiesRequest.md docs/GetCoverageFormat.md @@ -66,6 +67,8 @@ docs/GetLegendGraphicRequest.md docs/GetMapExceptionFormat.md docs/GetMapFormat.md docs/GetMapRequest.md +docs/GridBoundingBox2D.md +docs/GridIdx2D.md docs/IdResponse.md docs/InternalDataId.md docs/Layer.md @@ -124,7 +127,6 @@ docs/PermissionRequest.md docs/PermissionsApi.md docs/Plot.md docs/PlotOutputFormat.md -docs/PlotQueryRectangle.md docs/PlotResultDescriptor.md docs/PlotsApi.md docs/PointSymbology.md @@ -151,10 +153,10 @@ docs/RasterDatasetFromWorkflow.md docs/RasterDatasetFromWorkflowResult.md docs/RasterPropertiesEntryType.md docs/RasterPropertiesKey.md -docs/RasterQueryRectangle.md docs/RasterResultDescriptor.md docs/RasterStreamWebsocketResultType.md docs/RasterSymbology.md +docs/RasterToDatasetQueryRectangle.md docs/Resource.md docs/Role.md docs/RoleDescription.md @@ -165,6 +167,9 @@ docs/SearchTypes.md docs/ServerInfo.md docs/SessionApi.md docs/SingleBandRasterColorizer.md +docs/SpatialGridDefinition.md +docs/SpatialGridDescriptor.md +docs/SpatialGridDescriptorState.md docs/SpatialPartition2D.md docs/SpatialReferenceAuthority.md docs/SpatialReferenceSpecification.md @@ -221,7 +226,6 @@ docs/UserSession.md docs/VecUpdate.md docs/VectorColumnInfo.md docs/VectorDataType.md -docs/VectorQueryRectangle.md docs/VectorResultDescriptor.md docs/Volume.md docs/VolumeFileLayersResponse.md @@ -310,6 +314,7 @@ geoengine_openapi_client/models/gdal_metadata_mapping.py geoengine_openapi_client/models/gdal_metadata_net_cdf_cf.py geoengine_openapi_client/models/gdal_source_time_placeholder.py geoengine_openapi_client/models/geo_json.py +geoengine_openapi_client/models/geo_transform.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 @@ -319,6 +324,8 @@ 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/grid_bounding_box2_d.py +geoengine_openapi_client/models/grid_idx2_d.py geoengine_openapi_client/models/id_response.py geoengine_openapi_client/models/internal_data_id.py geoengine_openapi_client/models/layer.py @@ -371,7 +378,6 @@ geoengine_openapi_client/models/permission_listing.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/point_symbology.py geoengine_openapi_client/models/polygon_symbology.py @@ -396,10 +402,10 @@ 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_stream_websocket_result_type.py geoengine_openapi_client/models/raster_symbology.py +geoengine_openapi_client/models/raster_to_dataset_query_rectangle.py geoengine_openapi_client/models/resource.py geoengine_openapi_client/models/role.py geoengine_openapi_client/models/role_description.py @@ -408,6 +414,9 @@ geoengine_openapi_client/models/search_type.py geoengine_openapi_client/models/search_types.py geoengine_openapi_client/models/server_info.py geoengine_openapi_client/models/single_band_raster_colorizer.py +geoengine_openapi_client/models/spatial_grid_definition.py +geoengine_openapi_client/models/spatial_grid_descriptor.py +geoengine_openapi_client/models/spatial_grid_descriptor_state.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 @@ -461,7 +470,6 @@ 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 geoengine_openapi_client/models/vector_result_descriptor.py geoengine_openapi_client/models/volume.py geoengine_openapi_client/models/volume_file_layers_response.py @@ -537,6 +545,7 @@ test/test_gdal_metadata_net_cdf_cf.py test/test_gdal_source_time_placeholder.py test/test_general_api.py test/test_geo_json.py +test/test_geo_transform.py test/test_get_capabilities_format.py test/test_get_capabilities_request.py test/test_get_coverage_format.py @@ -546,6 +555,8 @@ 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_grid_bounding_box2_d.py +test/test_grid_idx2_d.py test/test_id_response.py test/test_internal_data_id.py test/test_layer.py @@ -604,7 +615,6 @@ 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_plots_api.py test/test_point_symbology.py @@ -631,10 +641,10 @@ 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_stream_websocket_result_type.py test/test_raster_symbology.py +test/test_raster_to_dataset_query_rectangle.py test/test_resource.py test/test_role.py test/test_role_description.py @@ -644,6 +654,9 @@ test/test_search_types.py test/test_server_info.py test/test_session_api.py test/test_single_band_raster_colorizer.py +test/test_spatial_grid_definition.py +test/test_spatial_grid_descriptor.py +test/test_spatial_grid_descriptor_state.py test/test_spatial_partition2_d.py test/test_spatial_reference_authority.py test/test_spatial_reference_specification.py @@ -701,7 +714,6 @@ 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 test/test_vector_result_descriptor.py test/test_volume.py test/test_volume_file_layers_response.py diff --git a/python/README.md b/python/README.md index 9485a987..b7653030 100644 --- a/python/README.md +++ b/python/README.md @@ -239,6 +239,7 @@ Class | Method | HTTP request | Description - [GdalMetadataNetCdfCf](docs/GdalMetadataNetCdfCf.md) - [GdalSourceTimePlaceholder](docs/GdalSourceTimePlaceholder.md) - [GeoJson](docs/GeoJson.md) + - [GeoTransform](docs/GeoTransform.md) - [GetCapabilitiesFormat](docs/GetCapabilitiesFormat.md) - [GetCapabilitiesRequest](docs/GetCapabilitiesRequest.md) - [GetCoverageFormat](docs/GetCoverageFormat.md) @@ -248,6 +249,8 @@ Class | Method | HTTP request | Description - [GetMapExceptionFormat](docs/GetMapExceptionFormat.md) - [GetMapFormat](docs/GetMapFormat.md) - [GetMapRequest](docs/GetMapRequest.md) + - [GridBoundingBox2D](docs/GridBoundingBox2D.md) + - [GridIdx2D](docs/GridIdx2D.md) - [IdResponse](docs/IdResponse.md) - [InternalDataId](docs/InternalDataId.md) - [Layer](docs/Layer.md) @@ -300,7 +303,6 @@ Class | Method | HTTP request | Description - [PermissionRequest](docs/PermissionRequest.md) - [Plot](docs/Plot.md) - [PlotOutputFormat](docs/PlotOutputFormat.md) - - [PlotQueryRectangle](docs/PlotQueryRectangle.md) - [PlotResultDescriptor](docs/PlotResultDescriptor.md) - [PointSymbology](docs/PointSymbology.md) - [PolygonSymbology](docs/PolygonSymbology.md) @@ -325,10 +327,10 @@ Class | Method | HTTP request | Description - [RasterDatasetFromWorkflowResult](docs/RasterDatasetFromWorkflowResult.md) - [RasterPropertiesEntryType](docs/RasterPropertiesEntryType.md) - [RasterPropertiesKey](docs/RasterPropertiesKey.md) - - [RasterQueryRectangle](docs/RasterQueryRectangle.md) - [RasterResultDescriptor](docs/RasterResultDescriptor.md) - [RasterStreamWebsocketResultType](docs/RasterStreamWebsocketResultType.md) - [RasterSymbology](docs/RasterSymbology.md) + - [RasterToDatasetQueryRectangle](docs/RasterToDatasetQueryRectangle.md) - [Resource](docs/Resource.md) - [Role](docs/Role.md) - [RoleDescription](docs/RoleDescription.md) @@ -338,6 +340,9 @@ Class | Method | HTTP request | Description - [SearchTypes](docs/SearchTypes.md) - [ServerInfo](docs/ServerInfo.md) - [SingleBandRasterColorizer](docs/SingleBandRasterColorizer.md) + - [SpatialGridDefinition](docs/SpatialGridDefinition.md) + - [SpatialGridDescriptor](docs/SpatialGridDescriptor.md) + - [SpatialGridDescriptorState](docs/SpatialGridDescriptorState.md) - [SpatialPartition2D](docs/SpatialPartition2D.md) - [SpatialReferenceAuthority](docs/SpatialReferenceAuthority.md) - [SpatialReferenceSpecification](docs/SpatialReferenceSpecification.md) @@ -390,7 +395,6 @@ Class | Method | HTTP request | Description - [VecUpdate](docs/VecUpdate.md) - [VectorColumnInfo](docs/VectorColumnInfo.md) - [VectorDataType](docs/VectorDataType.md) - - [VectorQueryRectangle](docs/VectorQueryRectangle.md) - [VectorResultDescriptor](docs/VectorResultDescriptor.md) - [Volume](docs/Volume.md) - [VolumeFileLayersResponse](docs/VolumeFileLayersResponse.md) diff --git a/python/geoengine_openapi_client/__init__.py b/python/geoengine_openapi_client/__init__.py index 02f22047..1fa2caf7 100644 --- a/python/geoengine_openapi_client/__init__.py +++ b/python/geoengine_openapi_client/__init__.py @@ -99,6 +99,7 @@ from geoengine_openapi_client.models.gdal_metadata_net_cdf_cf import GdalMetadataNetCdfCf from geoengine_openapi_client.models.gdal_source_time_placeholder import GdalSourceTimePlaceholder from geoengine_openapi_client.models.geo_json import GeoJson +from geoengine_openapi_client.models.geo_transform import GeoTransform 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_coverage_format import GetCoverageFormat @@ -108,6 +109,8 @@ 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.grid_bounding_box2_d import GridBoundingBox2D +from geoengine_openapi_client.models.grid_idx2_d import GridIdx2D 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 @@ -160,7 +163,6 @@ from geoengine_openapi_client.models.permission_request import PermissionRequest from geoengine_openapi_client.models.plot import Plot 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.point_symbology import PointSymbology from geoengine_openapi_client.models.polygon_symbology import PolygonSymbology @@ -185,10 +187,10 @@ from geoengine_openapi_client.models.raster_dataset_from_workflow_result import RasterDatasetFromWorkflowResult from geoengine_openapi_client.models.raster_properties_entry_type import RasterPropertiesEntryType from geoengine_openapi_client.models.raster_properties_key import RasterPropertiesKey -from geoengine_openapi_client.models.raster_query_rectangle import RasterQueryRectangle from geoengine_openapi_client.models.raster_result_descriptor import RasterResultDescriptor 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.raster_to_dataset_query_rectangle import RasterToDatasetQueryRectangle from geoengine_openapi_client.models.resource import Resource from geoengine_openapi_client.models.role import Role from geoengine_openapi_client.models.role_description import RoleDescription @@ -198,6 +200,9 @@ from geoengine_openapi_client.models.search_types import SearchTypes from geoengine_openapi_client.models.server_info import ServerInfo from geoengine_openapi_client.models.single_band_raster_colorizer import SingleBandRasterColorizer +from geoengine_openapi_client.models.spatial_grid_definition import SpatialGridDefinition +from geoengine_openapi_client.models.spatial_grid_descriptor import SpatialGridDescriptor +from geoengine_openapi_client.models.spatial_grid_descriptor_state import SpatialGridDescriptorState from geoengine_openapi_client.models.spatial_partition2_d import SpatialPartition2D from geoengine_openapi_client.models.spatial_reference_authority import SpatialReferenceAuthority from geoengine_openapi_client.models.spatial_reference_specification import SpatialReferenceSpecification @@ -250,7 +255,6 @@ 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 from geoengine_openapi_client.models.vector_result_descriptor import VectorResultDescriptor from geoengine_openapi_client.models.volume import Volume from geoengine_openapi_client.models.volume_file_layers_response import VolumeFileLayersResponse diff --git a/python/geoengine_openapi_client/api/workflows_api.py b/python/geoengine_openapi_client/api/workflows_api.py index d2f5dc5f..a02a5783 100644 --- a/python/geoengine_openapi_client/api/workflows_api.py +++ b/python/geoengine_openapi_client/api/workflows_api.py @@ -25,7 +25,6 @@ from geoengine_openapi_client.models.raster_dataset_from_workflow import RasterDatasetFromWorkflow from geoengine_openapi_client.models.raster_stream_websocket_result_type import RasterStreamWebsocketResultType from geoengine_openapi_client.models.spatial_partition2_d import SpatialPartition2D -from geoengine_openapi_client.models.spatial_resolution import SpatialResolution from geoengine_openapi_client.models.task_response import TaskResponse from geoengine_openapi_client.models.typed_result_descriptor import TypedResultDescriptor from geoengine_openapi_client.models.workflow import Workflow @@ -1372,7 +1371,6 @@ def raster_stream_websocket( id: Annotated[StrictStr, Field(description="Workflow id")], spatial_bounds: SpatialPartition2D, time_interval: StrictStr, - spatial_resolution: SpatialResolution, attributes: StrictStr, result_type: RasterStreamWebsocketResultType, _request_timeout: Union[ @@ -1397,8 +1395,6 @@ def raster_stream_websocket( :type spatial_bounds: SpatialPartition2D :param time_interval: (required) :type time_interval: str - :param spatial_resolution: (required) - :type spatial_resolution: SpatialResolution :param attributes: (required) :type attributes: str :param result_type: (required) @@ -1429,7 +1425,6 @@ def raster_stream_websocket( id=id, spatial_bounds=spatial_bounds, time_interval=time_interval, - spatial_resolution=spatial_resolution, attributes=attributes, result_type=result_type, _request_auth=_request_auth, @@ -1458,7 +1453,6 @@ def raster_stream_websocket_with_http_info( id: Annotated[StrictStr, Field(description="Workflow id")], spatial_bounds: SpatialPartition2D, time_interval: StrictStr, - spatial_resolution: SpatialResolution, attributes: StrictStr, result_type: RasterStreamWebsocketResultType, _request_timeout: Union[ @@ -1483,8 +1477,6 @@ def raster_stream_websocket_with_http_info( :type spatial_bounds: SpatialPartition2D :param time_interval: (required) :type time_interval: str - :param spatial_resolution: (required) - :type spatial_resolution: SpatialResolution :param attributes: (required) :type attributes: str :param result_type: (required) @@ -1515,7 +1507,6 @@ def raster_stream_websocket_with_http_info( id=id, spatial_bounds=spatial_bounds, time_interval=time_interval, - spatial_resolution=spatial_resolution, attributes=attributes, result_type=result_type, _request_auth=_request_auth, @@ -1544,7 +1535,6 @@ def raster_stream_websocket_without_preload_content( id: Annotated[StrictStr, Field(description="Workflow id")], spatial_bounds: SpatialPartition2D, time_interval: StrictStr, - spatial_resolution: SpatialResolution, attributes: StrictStr, result_type: RasterStreamWebsocketResultType, _request_timeout: Union[ @@ -1569,8 +1559,6 @@ def raster_stream_websocket_without_preload_content( :type spatial_bounds: SpatialPartition2D :param time_interval: (required) :type time_interval: str - :param spatial_resolution: (required) - :type spatial_resolution: SpatialResolution :param attributes: (required) :type attributes: str :param result_type: (required) @@ -1601,7 +1589,6 @@ def raster_stream_websocket_without_preload_content( id=id, spatial_bounds=spatial_bounds, time_interval=time_interval, - spatial_resolution=spatial_resolution, attributes=attributes, result_type=result_type, _request_auth=_request_auth, @@ -1625,7 +1612,6 @@ def _raster_stream_websocket_serialize( id, spatial_bounds, time_interval, - spatial_resolution, attributes, result_type, _request_auth, @@ -1660,10 +1646,6 @@ def _raster_stream_websocket_serialize( _query_params.append(('timeInterval', time_interval)) - if spatial_resolution is not None: - - _query_params.append(('spatialResolution', spatial_resolution)) - if attributes is not None: _query_params.append(('attributes', attributes)) diff --git a/python/geoengine_openapi_client/models/__init__.py b/python/geoengine_openapi_client/models/__init__.py index eb84f304..d5207335 100644 --- a/python/geoengine_openapi_client/models/__init__.py +++ b/python/geoengine_openapi_client/models/__init__.py @@ -67,6 +67,7 @@ from geoengine_openapi_client.models.gdal_metadata_net_cdf_cf import GdalMetadataNetCdfCf from geoengine_openapi_client.models.gdal_source_time_placeholder import GdalSourceTimePlaceholder from geoengine_openapi_client.models.geo_json import GeoJson +from geoengine_openapi_client.models.geo_transform import GeoTransform 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_coverage_format import GetCoverageFormat @@ -76,6 +77,8 @@ 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.grid_bounding_box2_d import GridBoundingBox2D +from geoengine_openapi_client.models.grid_idx2_d import GridIdx2D 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 @@ -128,7 +131,6 @@ from geoengine_openapi_client.models.permission_request import PermissionRequest from geoengine_openapi_client.models.plot import Plot 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.point_symbology import PointSymbology from geoengine_openapi_client.models.polygon_symbology import PolygonSymbology @@ -153,10 +155,10 @@ from geoengine_openapi_client.models.raster_dataset_from_workflow_result import RasterDatasetFromWorkflowResult from geoengine_openapi_client.models.raster_properties_entry_type import RasterPropertiesEntryType from geoengine_openapi_client.models.raster_properties_key import RasterPropertiesKey -from geoengine_openapi_client.models.raster_query_rectangle import RasterQueryRectangle from geoengine_openapi_client.models.raster_result_descriptor import RasterResultDescriptor 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.raster_to_dataset_query_rectangle import RasterToDatasetQueryRectangle from geoengine_openapi_client.models.resource import Resource from geoengine_openapi_client.models.role import Role from geoengine_openapi_client.models.role_description import RoleDescription @@ -166,6 +168,9 @@ from geoengine_openapi_client.models.search_types import SearchTypes from geoengine_openapi_client.models.server_info import ServerInfo from geoengine_openapi_client.models.single_band_raster_colorizer import SingleBandRasterColorizer +from geoengine_openapi_client.models.spatial_grid_definition import SpatialGridDefinition +from geoengine_openapi_client.models.spatial_grid_descriptor import SpatialGridDescriptor +from geoengine_openapi_client.models.spatial_grid_descriptor_state import SpatialGridDescriptorState from geoengine_openapi_client.models.spatial_partition2_d import SpatialPartition2D from geoengine_openapi_client.models.spatial_reference_authority import SpatialReferenceAuthority from geoengine_openapi_client.models.spatial_reference_specification import SpatialReferenceSpecification @@ -218,7 +223,6 @@ 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 from geoengine_openapi_client.models.vector_result_descriptor import VectorResultDescriptor from geoengine_openapi_client.models.volume import Volume from geoengine_openapi_client.models.volume_file_layers_response import VolumeFileLayersResponse diff --git a/python/geoengine_openapi_client/models/geo_transform.py b/python/geoengine_openapi_client/models/geo_transform.py new file mode 100644 index 00000000..47d0286d --- /dev/null +++ b/python/geoengine_openapi_client/models/geo_transform.py @@ -0,0 +1,96 @@ +# 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, Field, StrictFloat, StrictInt +from typing import Any, ClassVar, Dict, List, Union +from geoengine_openapi_client.models.coordinate2_d import Coordinate2D +from typing import Optional, Set +from typing_extensions import Self + +class GeoTransform(BaseModel): + """ + GeoTransform + """ # noqa: E501 + origin_coordinate: Coordinate2D = Field(alias="originCoordinate") + x_pixel_size: Union[StrictFloat, StrictInt] = Field(alias="xPixelSize") + y_pixel_size: Union[StrictFloat, StrictInt] = Field(alias="yPixelSize") + __properties: ClassVar[List[str]] = ["originCoordinate", "xPixelSize", "yPixelSize"] + + 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 GeoTransform 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, + ) + # override the default output from pydantic by calling `to_dict()` of origin_coordinate + if self.origin_coordinate: + _dict['originCoordinate'] = self.origin_coordinate.to_dict() + return _dict + + @classmethod + def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: + """Create an instance of GeoTransform from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + _obj = cls.model_validate({ + "originCoordinate": Coordinate2D.from_dict(obj["originCoordinate"]) if obj.get("originCoordinate") is not None else None, + "xPixelSize": obj.get("xPixelSize"), + "yPixelSize": obj.get("yPixelSize") + }) + return _obj + + diff --git a/python/geoengine_openapi_client/models/vector_query_rectangle.py b/python/geoengine_openapi_client/models/grid_bounding_box2_d.py similarity index 59% rename from python/geoengine_openapi_client/models/vector_query_rectangle.py rename to python/geoengine_openapi_client/models/grid_bounding_box2_d.py index e1887eb5..8bc2c4f8 100644 --- a/python/geoengine_openapi_client/models/vector_query_rectangle.py +++ b/python/geoengine_openapi_client/models/grid_bounding_box2_d.py @@ -20,20 +20,17 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List -from geoengine_openapi_client.models.bounding_box2_d import BoundingBox2D -from geoengine_openapi_client.models.spatial_resolution import SpatialResolution -from geoengine_openapi_client.models.time_interval import TimeInterval +from geoengine_openapi_client.models.grid_idx2_d import GridIdx2D from typing import Optional, Set from typing_extensions import Self -class VectorQueryRectangle(BaseModel): +class GridBoundingBox2D(BaseModel): """ - A spatio-temporal rectangle with a specified resolution + GridBoundingBox2D """ # noqa: E501 - spatial_bounds: BoundingBox2D = Field(alias="spatialBounds") - spatial_resolution: SpatialResolution = Field(alias="spatialResolution") - time_interval: TimeInterval = Field(alias="timeInterval") - __properties: ClassVar[List[str]] = ["spatialBounds", "spatialResolution", "timeInterval"] + bottom_right_idx: GridIdx2D = Field(alias="bottomRightIdx") + top_left_idx: GridIdx2D = Field(alias="topLeftIdx") + __properties: ClassVar[List[str]] = ["bottomRightIdx", "topLeftIdx"] model_config = ConfigDict( populate_by_name=True, @@ -53,7 +50,7 @@ def to_json(self) -> str: @classmethod def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of VectorQueryRectangle from a JSON string""" + """Create an instance of GridBoundingBox2D from a JSON string""" return cls.from_dict(json.loads(json_str)) def to_dict(self) -> Dict[str, Any]: @@ -74,20 +71,17 @@ def to_dict(self) -> Dict[str, Any]: exclude=excluded_fields, exclude_none=True, ) - # override the default output from pydantic by calling `to_dict()` of spatial_bounds - if self.spatial_bounds: - _dict['spatialBounds'] = self.spatial_bounds.to_dict() - # override the default output from pydantic by calling `to_dict()` of spatial_resolution - if self.spatial_resolution: - _dict['spatialResolution'] = self.spatial_resolution.to_dict() - # override the default output from pydantic by calling `to_dict()` of time_interval - if self.time_interval: - _dict['timeInterval'] = self.time_interval.to_dict() + # override the default output from pydantic by calling `to_dict()` of bottom_right_idx + if self.bottom_right_idx: + _dict['bottomRightIdx'] = self.bottom_right_idx.to_dict() + # override the default output from pydantic by calling `to_dict()` of top_left_idx + if self.top_left_idx: + _dict['topLeftIdx'] = self.top_left_idx.to_dict() return _dict @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of VectorQueryRectangle from a dict""" + """Create an instance of GridBoundingBox2D from a dict""" if obj is None: return None @@ -95,9 +89,8 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: return cls.model_validate(obj) _obj = cls.model_validate({ - "spatialBounds": BoundingBox2D.from_dict(obj["spatialBounds"]) if obj.get("spatialBounds") is not None else None, - "spatialResolution": SpatialResolution.from_dict(obj["spatialResolution"]) if obj.get("spatialResolution") is not None else None, - "timeInterval": TimeInterval.from_dict(obj["timeInterval"]) if obj.get("timeInterval") is not None else None + "bottomRightIdx": GridIdx2D.from_dict(obj["bottomRightIdx"]) if obj.get("bottomRightIdx") is not None else None, + "topLeftIdx": GridIdx2D.from_dict(obj["topLeftIdx"]) if obj.get("topLeftIdx") is not None else None }) return _obj diff --git a/python/geoengine_openapi_client/models/grid_idx2_d.py b/python/geoengine_openapi_client/models/grid_idx2_d.py new file mode 100644 index 00000000..a78dbee4 --- /dev/null +++ b/python/geoengine_openapi_client/models/grid_idx2_d.py @@ -0,0 +1,90 @@ +# 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, Field, StrictInt +from typing import Any, ClassVar, Dict, List +from typing import Optional, Set +from typing_extensions import Self + +class GridIdx2D(BaseModel): + """ + GridIdx2D + """ # noqa: E501 + x_idx: StrictInt = Field(alias="xIdx") + y_idx: StrictInt = Field(alias="yIdx") + __properties: ClassVar[List[str]] = ["xIdx", "yIdx"] + + 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 GridIdx2D 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 GridIdx2D from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + _obj = cls.model_validate({ + "xIdx": obj.get("xIdx"), + "yIdx": obj.get("yIdx") + }) + 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 383a4807..16d4ea77 100644 --- a/python/geoengine_openapi_client/models/raster_dataset_from_workflow.py +++ b/python/geoengine_openapi_client/models/raster_dataset_from_workflow.py @@ -20,7 +20,7 @@ from pydantic import BaseModel, ConfigDict, Field, StrictBool, StrictStr from typing import Any, ClassVar, Dict, List, Optional -from geoengine_openapi_client.models.raster_query_rectangle import RasterQueryRectangle +from geoengine_openapi_client.models.raster_to_dataset_query_rectangle import RasterToDatasetQueryRectangle from typing import Optional, Set from typing_extensions import Self @@ -32,7 +32,7 @@ class RasterDatasetFromWorkflow(BaseModel): description: Optional[StrictStr] = None display_name: StrictStr = Field(alias="displayName") name: Optional[StrictStr] = None - query: RasterQueryRectangle + query: RasterToDatasetQueryRectangle __properties: ClassVar[List[str]] = ["asCog", "description", "displayName", "name", "query"] model_config = ConfigDict( @@ -98,7 +98,7 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: "description": obj.get("description"), "displayName": obj.get("displayName"), "name": obj.get("name"), - "query": RasterQueryRectangle.from_dict(obj["query"]) if obj.get("query") is not None else None + "query": RasterToDatasetQueryRectangle.from_dict(obj["query"]) if obj.get("query") is not None else None }) return _obj diff --git a/python/geoengine_openapi_client/models/raster_result_descriptor.py b/python/geoengine_openapi_client/models/raster_result_descriptor.py index 76ac7e4e..586e5cb3 100644 --- a/python/geoengine_openapi_client/models/raster_result_descriptor.py +++ b/python/geoengine_openapi_client/models/raster_result_descriptor.py @@ -22,8 +22,7 @@ from typing import Any, ClassVar, Dict, List, Optional 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.spatial_partition2_d import SpatialPartition2D -from geoengine_openapi_client.models.spatial_resolution import SpatialResolution +from geoengine_openapi_client.models.spatial_grid_descriptor import SpatialGridDescriptor from geoengine_openapi_client.models.time_interval import TimeInterval from typing import Optional, Set from typing_extensions import Self @@ -33,12 +32,11 @@ class RasterResultDescriptor(BaseModel): A `ResultDescriptor` for raster queries """ # noqa: E501 bands: List[RasterBandDescriptor] - bbox: Optional[SpatialPartition2D] = None data_type: RasterDataType = Field(alias="dataType") - resolution: Optional[SpatialResolution] = None + spatial_grid: SpatialGridDescriptor = Field(alias="spatialGrid") spatial_reference: StrictStr = Field(alias="spatialReference") time: Optional[TimeInterval] = None - __properties: ClassVar[List[str]] = ["bands", "bbox", "dataType", "resolution", "spatialReference", "time"] + __properties: ClassVar[List[str]] = ["bands", "dataType", "spatialGrid", "spatialReference", "time"] model_config = ConfigDict( populate_by_name=True, @@ -86,25 +84,12 @@ def to_dict(self) -> Dict[str, Any]: if _item_bands: _items.append(_item_bands.to_dict()) _dict['bands'] = _items - # override the default output from pydantic by calling `to_dict()` of bbox - if self.bbox: - _dict['bbox'] = self.bbox.to_dict() - # override the default output from pydantic by calling `to_dict()` of resolution - if self.resolution: - _dict['resolution'] = self.resolution.to_dict() + # override the default output from pydantic by calling `to_dict()` of spatial_grid + if self.spatial_grid: + _dict['spatialGrid'] = self.spatial_grid.to_dict() # override the default output from pydantic by calling `to_dict()` of time if self.time: _dict['time'] = self.time.to_dict() - # set to None if bbox (nullable) is None - # and model_fields_set contains the field - if self.bbox is None and "bbox" in self.model_fields_set: - _dict['bbox'] = None - - # set to None if resolution (nullable) is None - # and model_fields_set contains the field - if self.resolution is None and "resolution" in self.model_fields_set: - _dict['resolution'] = None - # set to None if time (nullable) is None # and model_fields_set contains the field if self.time is None and "time" in self.model_fields_set: @@ -125,9 +110,8 @@ def from_dict(cls, obj: Dict[str, Any]) -> Optional[Self]: _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, + "spatialGrid": SpatialGridDescriptor.from_dict(obj["spatialGrid"]) if obj.get("spatialGrid") 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, }) diff --git a/python/geoengine_openapi_client/models/raster_query_rectangle.py b/python/geoengine_openapi_client/models/raster_to_dataset_query_rectangle.py similarity index 80% rename from python/geoengine_openapi_client/models/raster_query_rectangle.py rename to python/geoengine_openapi_client/models/raster_to_dataset_query_rectangle.py index 54b23f83..990d1bf1 100644 --- a/python/geoengine_openapi_client/models/raster_query_rectangle.py +++ b/python/geoengine_openapi_client/models/raster_to_dataset_query_rectangle.py @@ -21,19 +21,17 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List 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 RasterQueryRectangle(BaseModel): +class RasterToDatasetQueryRectangle(BaseModel): """ A spatio-temporal rectangle with a specified resolution """ # noqa: E501 spatial_bounds: SpatialPartition2D = Field(alias="spatialBounds") - spatial_resolution: SpatialResolution = Field(alias="spatialResolution") time_interval: TimeInterval = Field(alias="timeInterval") - __properties: ClassVar[List[str]] = ["spatialBounds", "spatialResolution", "timeInterval"] + __properties: ClassVar[List[str]] = ["spatialBounds", "timeInterval"] model_config = ConfigDict( populate_by_name=True, @@ -53,7 +51,7 @@ def to_json(self) -> str: @classmethod def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of RasterQueryRectangle from a JSON string""" + """Create an instance of RasterToDatasetQueryRectangle from a JSON string""" return cls.from_dict(json.loads(json_str)) def to_dict(self) -> Dict[str, Any]: @@ -77,9 +75,6 @@ def to_dict(self) -> Dict[str, Any]: # override the default output from pydantic by calling `to_dict()` of spatial_bounds if self.spatial_bounds: _dict['spatialBounds'] = self.spatial_bounds.to_dict() - # override the default output from pydantic by calling `to_dict()` of spatial_resolution - if self.spatial_resolution: - _dict['spatialResolution'] = self.spatial_resolution.to_dict() # override the default output from pydantic by calling `to_dict()` of time_interval if self.time_interval: _dict['timeInterval'] = self.time_interval.to_dict() @@ -87,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 RasterQueryRectangle from a dict""" + """Create an instance of RasterToDatasetQueryRectangle from a dict""" if obj is None: return None @@ -96,7 +91,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: _obj = cls.model_validate({ "spatialBounds": SpatialPartition2D.from_dict(obj["spatialBounds"]) if obj.get("spatialBounds") is not None else None, - "spatialResolution": SpatialResolution.from_dict(obj["spatialResolution"]) if obj.get("spatialResolution") is not None else None, "timeInterval": TimeInterval.from_dict(obj["timeInterval"]) if obj.get("timeInterval") is not None else None }) return _obj diff --git a/python/geoengine_openapi_client/models/plot_query_rectangle.py b/python/geoengine_openapi_client/models/spatial_grid_definition.py similarity index 59% rename from python/geoengine_openapi_client/models/plot_query_rectangle.py rename to python/geoengine_openapi_client/models/spatial_grid_definition.py index ff6626cd..1cd9f727 100644 --- a/python/geoengine_openapi_client/models/plot_query_rectangle.py +++ b/python/geoengine_openapi_client/models/spatial_grid_definition.py @@ -20,20 +20,18 @@ from pydantic import BaseModel, ConfigDict, Field from typing import Any, ClassVar, Dict, List -from geoengine_openapi_client.models.bounding_box2_d import BoundingBox2D -from geoengine_openapi_client.models.spatial_resolution import SpatialResolution -from geoengine_openapi_client.models.time_interval import TimeInterval +from geoengine_openapi_client.models.geo_transform import GeoTransform +from geoengine_openapi_client.models.grid_bounding_box2_d import GridBoundingBox2D from typing import Optional, Set from typing_extensions import Self -class PlotQueryRectangle(BaseModel): +class SpatialGridDefinition(BaseModel): """ - A spatio-temporal rectangle with a specified resolution + SpatialGridDefinition """ # noqa: E501 - spatial_bounds: BoundingBox2D = Field(alias="spatialBounds") - spatial_resolution: SpatialResolution = Field(alias="spatialResolution") - time_interval: TimeInterval = Field(alias="timeInterval") - __properties: ClassVar[List[str]] = ["spatialBounds", "spatialResolution", "timeInterval"] + geo_transform: GeoTransform = Field(alias="geoTransform") + grid_bounds: GridBoundingBox2D = Field(alias="gridBounds") + __properties: ClassVar[List[str]] = ["geoTransform", "gridBounds"] model_config = ConfigDict( populate_by_name=True, @@ -53,7 +51,7 @@ def to_json(self) -> str: @classmethod def from_json(cls, json_str: str) -> Optional[Self]: - """Create an instance of PlotQueryRectangle from a JSON string""" + """Create an instance of SpatialGridDefinition from a JSON string""" return cls.from_dict(json.loads(json_str)) def to_dict(self) -> Dict[str, Any]: @@ -74,20 +72,17 @@ def to_dict(self) -> Dict[str, Any]: exclude=excluded_fields, exclude_none=True, ) - # override the default output from pydantic by calling `to_dict()` of spatial_bounds - if self.spatial_bounds: - _dict['spatialBounds'] = self.spatial_bounds.to_dict() - # override the default output from pydantic by calling `to_dict()` of spatial_resolution - if self.spatial_resolution: - _dict['spatialResolution'] = self.spatial_resolution.to_dict() - # override the default output from pydantic by calling `to_dict()` of time_interval - if self.time_interval: - _dict['timeInterval'] = self.time_interval.to_dict() + # override the default output from pydantic by calling `to_dict()` of geo_transform + if self.geo_transform: + _dict['geoTransform'] = self.geo_transform.to_dict() + # override the default output from pydantic by calling `to_dict()` of grid_bounds + if self.grid_bounds: + _dict['gridBounds'] = self.grid_bounds.to_dict() return _dict @classmethod def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: - """Create an instance of PlotQueryRectangle from a dict""" + """Create an instance of SpatialGridDefinition from a dict""" if obj is None: return None @@ -95,9 +90,8 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: return cls.model_validate(obj) _obj = cls.model_validate({ - "spatialBounds": BoundingBox2D.from_dict(obj["spatialBounds"]) if obj.get("spatialBounds") is not None else None, - "spatialResolution": SpatialResolution.from_dict(obj["spatialResolution"]) if obj.get("spatialResolution") is not None else None, - "timeInterval": TimeInterval.from_dict(obj["timeInterval"]) if obj.get("timeInterval") is not None else None + "geoTransform": GeoTransform.from_dict(obj["geoTransform"]) if obj.get("geoTransform") is not None else None, + "gridBounds": GridBoundingBox2D.from_dict(obj["gridBounds"]) if obj.get("gridBounds") is not None else None }) return _obj diff --git a/python/geoengine_openapi_client/models/spatial_grid_descriptor.py b/python/geoengine_openapi_client/models/spatial_grid_descriptor.py new file mode 100644 index 00000000..b92e7fa0 --- /dev/null +++ b/python/geoengine_openapi_client/models/spatial_grid_descriptor.py @@ -0,0 +1,95 @@ +# 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, Field +from typing import Any, ClassVar, Dict, List +from geoengine_openapi_client.models.spatial_grid_definition import SpatialGridDefinition +from geoengine_openapi_client.models.spatial_grid_descriptor_state import SpatialGridDescriptorState +from typing import Optional, Set +from typing_extensions import Self + +class SpatialGridDescriptor(BaseModel): + """ + SpatialGridDescriptor + """ # noqa: E501 + descriptor: SpatialGridDescriptorState + spatial_grid: SpatialGridDefinition = Field(alias="spatialGrid") + __properties: ClassVar[List[str]] = ["descriptor", "spatialGrid"] + + 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 SpatialGridDescriptor 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, + ) + # override the default output from pydantic by calling `to_dict()` of spatial_grid + if self.spatial_grid: + _dict['spatialGrid'] = self.spatial_grid.to_dict() + return _dict + + @classmethod + def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: + """Create an instance of SpatialGridDescriptor from a dict""" + if obj is None: + return None + + if not isinstance(obj, dict): + return cls.model_validate(obj) + + _obj = cls.model_validate({ + "descriptor": obj.get("descriptor"), + "spatialGrid": SpatialGridDefinition.from_dict(obj["spatialGrid"]) if obj.get("spatialGrid") is not None else None + }) + return _obj + + diff --git a/python/geoengine_openapi_client/models/spatial_grid_descriptor_state.py b/python/geoengine_openapi_client/models/spatial_grid_descriptor_state.py new file mode 100644 index 00000000..2d71be0f --- /dev/null +++ b/python/geoengine_openapi_client/models/spatial_grid_descriptor_state.py @@ -0,0 +1,38 @@ +# 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 +from enum import Enum +from typing_extensions import Self + + +class SpatialGridDescriptorState(str, Enum): + """ + SpatialGridDescriptorState + """ + + """ + allowed enum values + """ + SOURCE = 'source' + DERIVED = 'derived' + + @classmethod + def from_json(cls, json_str: str) -> Self: + """Create an instance of SpatialGridDescriptorState from a JSON string""" + return cls(json.loads(json_str)) + + 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 d32c049e..73a5124a 100644 --- a/python/geoengine_openapi_client/models/typed_raster_result_descriptor.py +++ b/python/geoengine_openapi_client/models/typed_raster_result_descriptor.py @@ -23,8 +23,7 @@ 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.spatial_grid_descriptor import SpatialGridDescriptor from geoengine_openapi_client.models.time_interval import TimeInterval from typing import Optional, Set from typing_extensions import Self @@ -34,7 +33,7 @@ class TypedRasterResultDescriptor(RasterResultDescriptor): TypedRasterResultDescriptor """ # noqa: E501 type: StrictStr - __properties: ClassVar[List[str]] = ["bands", "bbox", "dataType", "resolution", "spatialReference", "time", "type"] + __properties: ClassVar[List[str]] = ["bands", "dataType", "spatialGrid", "spatialReference", "time", "type"] @field_validator('type') def type_validate_enum(cls, value): @@ -89,25 +88,12 @@ def to_dict(self) -> Dict[str, Any]: if _item_bands: _items.append(_item_bands.to_dict()) _dict['bands'] = _items - # override the default output from pydantic by calling `to_dict()` of bbox - if self.bbox: - _dict['bbox'] = self.bbox.to_dict() - # override the default output from pydantic by calling `to_dict()` of resolution - if self.resolution: - _dict['resolution'] = self.resolution.to_dict() + # override the default output from pydantic by calling `to_dict()` of spatial_grid + if self.spatial_grid: + _dict['spatialGrid'] = self.spatial_grid.to_dict() # override the default output from pydantic by calling `to_dict()` of time if self.time: _dict['time'] = self.time.to_dict() - # set to None if bbox (nullable) is None - # and model_fields_set contains the field - if self.bbox is None and "bbox" in self.model_fields_set: - _dict['bbox'] = None - - # set to None if resolution (nullable) is None - # and model_fields_set contains the field - if self.resolution is None and "resolution" in self.model_fields_set: - _dict['resolution'] = None - # set to None if time (nullable) is None # and model_fields_set contains the field if self.time is None and "time" in self.model_fields_set: @@ -126,9 +112,8 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]: _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, + "spatialGrid": SpatialGridDescriptor.from_dict(obj["spatialGrid"]) if obj.get("spatialGrid") is not None else None, "spatialReference": obj.get("spatialReference"), "time": TimeInterval.from_dict(obj["time"]) if obj.get("time") is not None else None, "type": obj.get("type") diff --git a/python/test/test_gdal_meta_data_list.py b/python/test/test_gdal_meta_data_list.py index 42d3515f..2cedb9c2 100644 --- a/python/test/test_gdal_meta_data_list.py +++ b/python/test/test_gdal_meta_data_list.py @@ -81,17 +81,23 @@ def make_instance(self, include_optional) -> GdalMetaDataList: 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_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, @@ -145,17 +151,23 @@ def make_instance(self, include_optional) -> GdalMetaDataList: 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_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, diff --git a/python/test/test_gdal_meta_data_regular.py b/python/test/test_gdal_meta_data_regular.py index 1e5b317a..e22feaf6 100644 --- a/python/test/test_gdal_meta_data_regular.py +++ b/python/test/test_gdal_meta_data_regular.py @@ -78,17 +78,23 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: 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_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, @@ -146,17 +152,23 @@ def make_instance(self, include_optional) -> GdalMetaDataRegular: 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_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, diff --git a/python/test/test_gdal_meta_data_static.py b/python/test/test_gdal_meta_data_static.py index 668af720..4b1f777a 100644 --- a/python/test/test_gdal_meta_data_static.py +++ b/python/test/test_gdal_meta_data_static.py @@ -75,17 +75,23 @@ def make_instance(self, include_optional) -> GdalMetaDataStatic: 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_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, @@ -135,17 +141,23 @@ def make_instance(self, include_optional) -> GdalMetaDataStatic: 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_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, diff --git a/python/test/test_gdal_metadata_net_cdf_cf.py b/python/test/test_gdal_metadata_net_cdf_cf.py index 287e51ad..d9e13f41 100644 --- a/python/test/test_gdal_metadata_net_cdf_cf.py +++ b/python/test/test_gdal_metadata_net_cdf_cf.py @@ -77,17 +77,23 @@ def make_instance(self, include_optional) -> GdalMetadataNetCdfCf: 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_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, @@ -140,17 +146,23 @@ def make_instance(self, include_optional) -> GdalMetadataNetCdfCf: 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_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, diff --git a/python/test/test_geo_transform.py b/python/test/test_geo_transform.py new file mode 100644 index 00000000..877e4e97 --- /dev/null +++ b/python/test/test_geo_transform.py @@ -0,0 +1,61 @@ +# 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.geo_transform import GeoTransform + +class TestGeoTransform(unittest.TestCase): + """GeoTransform unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> GeoTransform: + """Test GeoTransform + 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 `GeoTransform` + """ + model = GeoTransform() + if include_optional: + return GeoTransform( + 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 + ) + else: + return GeoTransform( + 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, + ) + """ + + def testGeoTransform(self): + """Test GeoTransform""" + # 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_grid_bounding_box2_d.py b/python/test/test_grid_bounding_box2_d.py new file mode 100644 index 00000000..1acbdda8 --- /dev/null +++ b/python/test/test_grid_bounding_box2_d.py @@ -0,0 +1,63 @@ +# 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.grid_bounding_box2_d import GridBoundingBox2D + +class TestGridBoundingBox2D(unittest.TestCase): + """GridBoundingBox2D unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> GridBoundingBox2D: + """Test GridBoundingBox2D + 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 `GridBoundingBox2D` + """ + model = GridBoundingBox2D() + if include_optional: + return GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ) + ) + else: + return GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + ) + """ + + def testGridBoundingBox2D(self): + """Test GridBoundingBox2D""" + # 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_grid_idx2_d.py b/python/test/test_grid_idx2_d.py new file mode 100644 index 00000000..d8870686 --- /dev/null +++ b/python/test/test_grid_idx2_d.py @@ -0,0 +1,55 @@ +# 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.grid_idx2_d import GridIdx2D + +class TestGridIdx2D(unittest.TestCase): + """GridIdx2D unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> GridIdx2D: + """Test GridIdx2D + 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 `GridIdx2D` + """ + model = GridIdx2D() + if include_optional: + return GridIdx2D( + x_idx = 56, + y_idx = 56 + ) + else: + return GridIdx2D( + x_idx = 56, + y_idx = 56, + ) + """ + + def testGridIdx2D(self): + """Test GridIdx2D""" + # 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 6f66d120..d13f5d76 100644 --- a/python/test/test_meta_data_definition.py +++ b/python/test/test_meta_data_definition.py @@ -76,17 +76,23 @@ def make_instance(self, include_optional) -> MetaDataDefinition: 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_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, @@ -160,17 +166,23 @@ def make_instance(self, include_optional) -> MetaDataDefinition: 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_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, diff --git a/python/test/test_plot_query_rectangle.py b/python/test/test_plot_query_rectangle.py deleted file mode 100644 index a29de7ce..00000000 --- a/python/test/test_plot_query_rectangle.py +++ /dev/null @@ -1,77 +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.plot_query_rectangle import PlotQueryRectangle - -class TestPlotQueryRectangle(unittest.TestCase): - """PlotQueryRectangle unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def make_instance(self, include_optional) -> PlotQueryRectangle: - """Test PlotQueryRectangle - 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 `PlotQueryRectangle` - """ - model = PlotQueryRectangle() - if include_optional: - return PlotQueryRectangle( - spatial_bounds = 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_resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), - time_interval = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ) - ) - else: - return PlotQueryRectangle( - spatial_bounds = 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_resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), - time_interval = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), - ) - """ - - def testPlotQueryRectangle(self): - """Test PlotQueryRectangle""" - # 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_raster_dataset_from_workflow.py b/python/test/test_raster_dataset_from_workflow.py index 63635691..1671838a 100644 --- a/python/test/test_raster_dataset_from_workflow.py +++ b/python/test/test_raster_dataset_from_workflow.py @@ -40,7 +40,7 @@ def make_instance(self, include_optional) -> RasterDatasetFromWorkflow: description = '', display_name = '', name = '', - query = geoengine_openapi_client.models.raster_query_rectangle.RasterQueryRectangle( + query = geoengine_openapi_client.models.raster_to_dataset_query_rectangle.RasterToDatasetQueryRectangle( spatial_bounds = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, @@ -48,9 +48,6 @@ def make_instance(self, include_optional) -> RasterDatasetFromWorkflow: upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), ), - spatial_resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), time_interval = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, start = 56, ), ) @@ -58,7 +55,7 @@ def make_instance(self, include_optional) -> RasterDatasetFromWorkflow: else: return RasterDatasetFromWorkflow( display_name = '', - query = geoengine_openapi_client.models.raster_query_rectangle.RasterQueryRectangle( + query = geoengine_openapi_client.models.raster_to_dataset_query_rectangle.RasterToDatasetQueryRectangle( spatial_bounds = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, @@ -66,9 +63,6 @@ def make_instance(self, include_optional) -> RasterDatasetFromWorkflow: upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), ), - spatial_resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), time_interval = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, start = 56, ), ), diff --git a/python/test/test_raster_result_descriptor.py b/python/test/test_raster_result_descriptor.py index 8ce8ad2e..ded0d8d4 100644 --- a/python/test/test_raster_result_descriptor.py +++ b/python/test/test_raster_result_descriptor.py @@ -41,17 +41,23 @@ def make_instance(self, include_optional) -> RasterResultDescriptor: 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_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', time = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, @@ -65,6 +71,22 @@ def make_instance(self, include_optional) -> RasterResultDescriptor: name = '', ) ], data_type = 'U8', + spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', ) """ diff --git a/python/test/test_raster_query_rectangle.py b/python/test/test_raster_to_dataset_query_rectangle.py similarity index 70% rename from python/test/test_raster_query_rectangle.py rename to python/test/test_raster_to_dataset_query_rectangle.py index bbcf57bd..507ce136 100644 --- a/python/test/test_raster_query_rectangle.py +++ b/python/test/test_raster_to_dataset_query_rectangle.py @@ -15,10 +15,10 @@ import unittest -from geoengine_openapi_client.models.raster_query_rectangle import RasterQueryRectangle +from geoengine_openapi_client.models.raster_to_dataset_query_rectangle import RasterToDatasetQueryRectangle -class TestRasterQueryRectangle(unittest.TestCase): - """RasterQueryRectangle unit test stubs""" +class TestRasterToDatasetQueryRectangle(unittest.TestCase): + """RasterToDatasetQueryRectangle unit test stubs""" def setUp(self): pass @@ -26,16 +26,16 @@ def setUp(self): def tearDown(self): pass - def make_instance(self, include_optional) -> RasterQueryRectangle: - """Test RasterQueryRectangle + def make_instance(self, include_optional) -> RasterToDatasetQueryRectangle: + """Test RasterToDatasetQueryRectangle 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 `RasterQueryRectangle` + # uncomment below to create an instance of `RasterToDatasetQueryRectangle` """ - model = RasterQueryRectangle() + model = RasterToDatasetQueryRectangle() if include_optional: - return RasterQueryRectangle( + return RasterToDatasetQueryRectangle( spatial_bounds = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, @@ -43,15 +43,12 @@ def make_instance(self, include_optional) -> RasterQueryRectangle: upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), ), - spatial_resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), time_interval = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, start = 56, ) ) else: - return RasterQueryRectangle( + return RasterToDatasetQueryRectangle( spatial_bounds = geoengine_openapi_client.models.spatial_partition2_d.SpatialPartition2D( lower_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, @@ -59,17 +56,14 @@ def make_instance(self, include_optional) -> RasterQueryRectangle: upper_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), ), - spatial_resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), time_interval = geoengine_openapi_client.models.time_interval.TimeInterval( end = 56, start = 56, ), ) """ - def testRasterQueryRectangle(self): - """Test RasterQueryRectangle""" + def testRasterToDatasetQueryRectangle(self): + """Test RasterToDatasetQueryRectangle""" # 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_spatial_grid_definition.py b/python/test/test_spatial_grid_definition.py new file mode 100644 index 00000000..8cf83da0 --- /dev/null +++ b/python/test/test_spatial_grid_definition.py @@ -0,0 +1,77 @@ +# 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.spatial_grid_definition import SpatialGridDefinition + +class TestSpatialGridDefinition(unittest.TestCase): + """SpatialGridDefinition unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> SpatialGridDefinition: + """Test SpatialGridDefinition + 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 `SpatialGridDefinition` + """ + model = SpatialGridDefinition() + if include_optional: + return SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ) + ) + else: + return SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), + ) + """ + + def testSpatialGridDefinition(self): + """Test SpatialGridDefinition""" + # 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_spatial_grid_descriptor.py b/python/test/test_spatial_grid_descriptor.py new file mode 100644 index 00000000..adec81f6 --- /dev/null +++ b/python/test/test_spatial_grid_descriptor.py @@ -0,0 +1,81 @@ +# 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.spatial_grid_descriptor import SpatialGridDescriptor + +class TestSpatialGridDescriptor(unittest.TestCase): + """SpatialGridDescriptor unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def make_instance(self, include_optional) -> SpatialGridDescriptor: + """Test SpatialGridDescriptor + 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 `SpatialGridDescriptor` + """ + model = SpatialGridDescriptor() + if include_optional: + return SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ) + ) + else: + return SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), + ) + """ + + def testSpatialGridDescriptor(self): + """Test SpatialGridDescriptor""" + # 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_spatial_grid_descriptor_state.py b/python/test/test_spatial_grid_descriptor_state.py new file mode 100644 index 00000000..c173c33f --- /dev/null +++ b/python/test/test_spatial_grid_descriptor_state.py @@ -0,0 +1,34 @@ +# 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.spatial_grid_descriptor_state import SpatialGridDescriptorState + +class TestSpatialGridDescriptorState(unittest.TestCase): + """SpatialGridDescriptorState unit test stubs""" + + def setUp(self): + pass + + def tearDown(self): + pass + + def testSpatialGridDescriptorState(self): + """Test SpatialGridDescriptorState""" + # inst = SpatialGridDescriptorState() + +if __name__ == '__main__': + unittest.main() diff --git a/python/test/test_typed_result_descriptor.py b/python/test/test_typed_result_descriptor.py index 2ac0d37e..70982f3c 100644 --- a/python/test/test_typed_result_descriptor.py +++ b/python/test/test_typed_result_descriptor.py @@ -41,6 +41,28 @@ def make_instance(self, include_optional) -> TypedResultDescriptor: measurement = null, name = '', ) ], + data_type = 'Data', + spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), + spatial_reference = '', + time = geoengine_openapi_client.models.time_interval.TimeInterval( + end = 56, + start = 56, ), + type = 'raster', bbox = geoengine_openapi_client.models.bounding_box2_d.BoundingBox2D( lower_left_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, @@ -48,15 +70,6 @@ def make_instance(self, include_optional) -> TypedResultDescriptor: upper_right_coordinate = geoengine_openapi_client.models.coordinate2_d.Coordinate2D( x = 1.337, y = 1.337, ), ), - 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', @@ -71,6 +84,22 @@ def make_instance(self, include_optional) -> TypedResultDescriptor: name = '', ) ], data_type = 'Data', + spatial_grid = geoengine_openapi_client.models.spatial_grid_descriptor.SpatialGridDescriptor( + descriptor = 'source', + spatial_grid = geoengine_openapi_client.models.spatial_grid_definition.SpatialGridDefinition( + 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, ), + grid_bounds = geoengine_openapi_client.models.grid_bounding_box2_d.GridBoundingBox2D( + bottom_right_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), + top_left_idx = geoengine_openapi_client.models.grid_idx2_d.GridIdx2D( + x_idx = 56, + y_idx = 56, ), ), ), ), spatial_reference = '', type = 'raster', columns = { diff --git a/python/test/test_vector_query_rectangle.py b/python/test/test_vector_query_rectangle.py deleted file mode 100644 index ab67ac7a..00000000 --- a/python/test/test_vector_query_rectangle.py +++ /dev/null @@ -1,77 +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.vector_query_rectangle import VectorQueryRectangle - -class TestVectorQueryRectangle(unittest.TestCase): - """VectorQueryRectangle unit test stubs""" - - def setUp(self): - pass - - def tearDown(self): - pass - - def make_instance(self, include_optional) -> VectorQueryRectangle: - """Test VectorQueryRectangle - 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 `VectorQueryRectangle` - """ - model = VectorQueryRectangle() - if include_optional: - return VectorQueryRectangle( - spatial_bounds = 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_resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), - time_interval = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ) - ) - else: - return VectorQueryRectangle( - spatial_bounds = 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_resolution = geoengine_openapi_client.models.spatial_resolution.SpatialResolution( - x = 1.337, - y = 1.337, ), - time_interval = geoengine_openapi_client.models.time_interval.TimeInterval( - end = 56, - start = 56, ), - ) - """ - - def testVectorQueryRectangle(self): - """Test VectorQueryRectangle""" - # 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/typescript/dist/apis/WorkflowsApi.d.ts b/typescript/dist/apis/WorkflowsApi.d.ts index a8919c2c..ba499340 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 { IdResponse, ProvenanceEntry, RasterDatasetFromWorkflow, RasterStreamWebsocketResultType, SpatialPartition2D, SpatialResolution, TaskResponse, TypedResultDescriptor, Workflow } from '../models/index'; +import type { IdResponse, ProvenanceEntry, RasterDatasetFromWorkflow, RasterStreamWebsocketResultType, SpatialPartition2D, TaskResponse, TypedResultDescriptor, Workflow } from '../models/index'; export interface DatasetFromWorkflowHandlerRequest { id: string; rasterDatasetFromWorkflow: RasterDatasetFromWorkflow; @@ -31,7 +31,6 @@ export interface RasterStreamWebsocketRequest { id: string; spatialBounds: SpatialPartition2D; timeInterval: string; - spatialResolution: SpatialResolution; attributes: string; resultType: RasterStreamWebsocketResultType; } diff --git a/typescript/dist/apis/WorkflowsApi.js b/typescript/dist/apis/WorkflowsApi.js index c2c533b8..07444409 100644 --- a/typescript/dist/apis/WorkflowsApi.js +++ b/typescript/dist/apis/WorkflowsApi.js @@ -223,9 +223,6 @@ class WorkflowsApi extends runtime.BaseAPI { if (requestParameters['timeInterval'] == null) { throw new runtime.RequiredError('timeInterval', 'Required parameter "timeInterval" was null or undefined when calling rasterStreamWebsocket().'); } - if (requestParameters['spatialResolution'] == null) { - throw new runtime.RequiredError('spatialResolution', 'Required parameter "spatialResolution" was null or undefined when calling rasterStreamWebsocket().'); - } if (requestParameters['attributes'] == null) { throw new runtime.RequiredError('attributes', 'Required parameter "attributes" was null or undefined when calling rasterStreamWebsocket().'); } @@ -239,9 +236,6 @@ class WorkflowsApi extends runtime.BaseAPI { if (requestParameters['timeInterval'] != null) { queryParameters['timeInterval'] = requestParameters['timeInterval']; } - if (requestParameters['spatialResolution'] != null) { - queryParameters['spatialResolution'] = requestParameters['spatialResolution']; - } if (requestParameters['attributes'] != null) { queryParameters['attributes'] = requestParameters['attributes']; } diff --git a/typescript/dist/esm/apis/WorkflowsApi.d.ts b/typescript/dist/esm/apis/WorkflowsApi.d.ts index a8919c2c..ba499340 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 { IdResponse, ProvenanceEntry, RasterDatasetFromWorkflow, RasterStreamWebsocketResultType, SpatialPartition2D, SpatialResolution, TaskResponse, TypedResultDescriptor, Workflow } from '../models/index'; +import type { IdResponse, ProvenanceEntry, RasterDatasetFromWorkflow, RasterStreamWebsocketResultType, SpatialPartition2D, TaskResponse, TypedResultDescriptor, Workflow } from '../models/index'; export interface DatasetFromWorkflowHandlerRequest { id: string; rasterDatasetFromWorkflow: RasterDatasetFromWorkflow; @@ -31,7 +31,6 @@ export interface RasterStreamWebsocketRequest { id: string; spatialBounds: SpatialPartition2D; timeInterval: string; - spatialResolution: SpatialResolution; attributes: string; resultType: RasterStreamWebsocketResultType; } diff --git a/typescript/dist/esm/apis/WorkflowsApi.js b/typescript/dist/esm/apis/WorkflowsApi.js index c53025f6..c40a0f40 100644 --- a/typescript/dist/esm/apis/WorkflowsApi.js +++ b/typescript/dist/esm/apis/WorkflowsApi.js @@ -220,9 +220,6 @@ export class WorkflowsApi extends runtime.BaseAPI { if (requestParameters['timeInterval'] == null) { throw new runtime.RequiredError('timeInterval', 'Required parameter "timeInterval" was null or undefined when calling rasterStreamWebsocket().'); } - if (requestParameters['spatialResolution'] == null) { - throw new runtime.RequiredError('spatialResolution', 'Required parameter "spatialResolution" was null or undefined when calling rasterStreamWebsocket().'); - } if (requestParameters['attributes'] == null) { throw new runtime.RequiredError('attributes', 'Required parameter "attributes" was null or undefined when calling rasterStreamWebsocket().'); } @@ -236,9 +233,6 @@ export class WorkflowsApi extends runtime.BaseAPI { if (requestParameters['timeInterval'] != null) { queryParameters['timeInterval'] = requestParameters['timeInterval']; } - if (requestParameters['spatialResolution'] != null) { - queryParameters['spatialResolution'] = requestParameters['spatialResolution']; - } if (requestParameters['attributes'] != null) { queryParameters['attributes'] = requestParameters['attributes']; } diff --git a/typescript/dist/esm/models/GeoTransform.d.ts b/typescript/dist/esm/models/GeoTransform.d.ts new file mode 100644 index 00000000..1fd8c3ba --- /dev/null +++ b/typescript/dist/esm/models/GeoTransform.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. + */ +import type { Coordinate2D } from './Coordinate2D'; +/** + * + * @export + * @interface GeoTransform + */ +export interface GeoTransform { + /** + * + * @type {Coordinate2D} + * @memberof GeoTransform + */ + originCoordinate: Coordinate2D; + /** + * + * @type {number} + * @memberof GeoTransform + */ + xPixelSize: number; + /** + * + * @type {number} + * @memberof GeoTransform + */ + yPixelSize: number; +} +/** + * Check if a given object implements the GeoTransform interface. + */ +export declare function instanceOfGeoTransform(value: object): value is GeoTransform; +export declare function GeoTransformFromJSON(json: any): GeoTransform; +export declare function GeoTransformFromJSONTyped(json: any, ignoreDiscriminator: boolean): GeoTransform; +export declare function GeoTransformToJSON(json: any): GeoTransform; +export declare function GeoTransformToJSONTyped(value?: GeoTransform | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/GeoTransform.js b/typescript/dist/esm/models/GeoTransform.js new file mode 100644 index 00000000..91d3d032 --- /dev/null +++ b/typescript/dist/esm/models/GeoTransform.js @@ -0,0 +1,52 @@ +/* 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 { Coordinate2DFromJSON, Coordinate2DToJSON, } from './Coordinate2D'; +/** + * Check if a given object implements the GeoTransform interface. + */ +export function instanceOfGeoTransform(value) { + if (!('originCoordinate' in value) || value['originCoordinate'] === undefined) + return false; + if (!('xPixelSize' in value) || value['xPixelSize'] === undefined) + return false; + if (!('yPixelSize' in value) || value['yPixelSize'] === undefined) + return false; + return true; +} +export function GeoTransformFromJSON(json) { + return GeoTransformFromJSONTyped(json, false); +} +export function GeoTransformFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'originCoordinate': Coordinate2DFromJSON(json['originCoordinate']), + 'xPixelSize': json['xPixelSize'], + 'yPixelSize': json['yPixelSize'], + }; +} +export function GeoTransformToJSON(json) { + return GeoTransformToJSONTyped(json, false); +} +export function GeoTransformToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'originCoordinate': Coordinate2DToJSON(value['originCoordinate']), + 'xPixelSize': value['xPixelSize'], + 'yPixelSize': value['yPixelSize'], + }; +} diff --git a/typescript/dist/esm/models/GridBoundingBox2D.d.ts b/typescript/dist/esm/models/GridBoundingBox2D.d.ts new file mode 100644 index 00000000..7203d881 --- /dev/null +++ b/typescript/dist/esm/models/GridBoundingBox2D.d.ts @@ -0,0 +1,39 @@ +/** + * 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 { GridIdx2D } from './GridIdx2D'; +/** + * + * @export + * @interface GridBoundingBox2D + */ +export interface GridBoundingBox2D { + /** + * + * @type {GridIdx2D} + * @memberof GridBoundingBox2D + */ + bottomRightIdx: GridIdx2D; + /** + * + * @type {GridIdx2D} + * @memberof GridBoundingBox2D + */ + topLeftIdx: GridIdx2D; +} +/** + * Check if a given object implements the GridBoundingBox2D interface. + */ +export declare function instanceOfGridBoundingBox2D(value: object): value is GridBoundingBox2D; +export declare function GridBoundingBox2DFromJSON(json: any): GridBoundingBox2D; +export declare function GridBoundingBox2DFromJSONTyped(json: any, ignoreDiscriminator: boolean): GridBoundingBox2D; +export declare function GridBoundingBox2DToJSON(json: any): GridBoundingBox2D; +export declare function GridBoundingBox2DToJSONTyped(value?: GridBoundingBox2D | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/GridBoundingBox2D.js b/typescript/dist/esm/models/GridBoundingBox2D.js new file mode 100644 index 00000000..8385efec --- /dev/null +++ b/typescript/dist/esm/models/GridBoundingBox2D.js @@ -0,0 +1,48 @@ +/* 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 { GridIdx2DFromJSON, GridIdx2DToJSON, } from './GridIdx2D'; +/** + * Check if a given object implements the GridBoundingBox2D interface. + */ +export function instanceOfGridBoundingBox2D(value) { + if (!('bottomRightIdx' in value) || value['bottomRightIdx'] === undefined) + return false; + if (!('topLeftIdx' in value) || value['topLeftIdx'] === undefined) + return false; + return true; +} +export function GridBoundingBox2DFromJSON(json) { + return GridBoundingBox2DFromJSONTyped(json, false); +} +export function GridBoundingBox2DFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'bottomRightIdx': GridIdx2DFromJSON(json['bottomRightIdx']), + 'topLeftIdx': GridIdx2DFromJSON(json['topLeftIdx']), + }; +} +export function GridBoundingBox2DToJSON(json) { + return GridBoundingBox2DToJSONTyped(json, false); +} +export function GridBoundingBox2DToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'bottomRightIdx': GridIdx2DToJSON(value['bottomRightIdx']), + 'topLeftIdx': GridIdx2DToJSON(value['topLeftIdx']), + }; +} diff --git a/typescript/dist/esm/models/GridIdx2D.d.ts b/typescript/dist/esm/models/GridIdx2D.d.ts new file mode 100644 index 00000000..1a265133 --- /dev/null +++ b/typescript/dist/esm/models/GridIdx2D.d.ts @@ -0,0 +1,38 @@ +/** + * 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 GridIdx2D + */ +export interface GridIdx2D { + /** + * + * @type {number} + * @memberof GridIdx2D + */ + xIdx: number; + /** + * + * @type {number} + * @memberof GridIdx2D + */ + yIdx: number; +} +/** + * Check if a given object implements the GridIdx2D interface. + */ +export declare function instanceOfGridIdx2D(value: object): value is GridIdx2D; +export declare function GridIdx2DFromJSON(json: any): GridIdx2D; +export declare function GridIdx2DFromJSONTyped(json: any, ignoreDiscriminator: boolean): GridIdx2D; +export declare function GridIdx2DToJSON(json: any): GridIdx2D; +export declare function GridIdx2DToJSONTyped(value?: GridIdx2D | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/GridIdx2D.js b/typescript/dist/esm/models/GridIdx2D.js new file mode 100644 index 00000000..b6bf3899 --- /dev/null +++ b/typescript/dist/esm/models/GridIdx2D.js @@ -0,0 +1,47 @@ +/* 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 GridIdx2D interface. + */ +export function instanceOfGridIdx2D(value) { + if (!('xIdx' in value) || value['xIdx'] === undefined) + return false; + if (!('yIdx' in value) || value['yIdx'] === undefined) + return false; + return true; +} +export function GridIdx2DFromJSON(json) { + return GridIdx2DFromJSONTyped(json, false); +} +export function GridIdx2DFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'xIdx': json['xIdx'], + 'yIdx': json['yIdx'], + }; +} +export function GridIdx2DToJSON(json) { + return GridIdx2DToJSONTyped(json, false); +} +export function GridIdx2DToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'xIdx': value['xIdx'], + 'yIdx': value['yIdx'], + }; +} diff --git a/typescript/dist/esm/models/PlotQueryRectangle.d.ts b/typescript/dist/esm/models/PlotQueryRectangle.d.ts deleted file mode 100644 index a704eb37..00000000 --- a/typescript/dist/esm/models/PlotQueryRectangle.d.ts +++ /dev/null @@ -1,47 +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 { SpatialResolution } from './SpatialResolution'; -import type { TimeInterval } from './TimeInterval'; -import type { BoundingBox2D } from './BoundingBox2D'; -/** - * A spatio-temporal rectangle with a specified resolution - * @export - * @interface PlotQueryRectangle - */ -export interface PlotQueryRectangle { - /** - * - * @type {BoundingBox2D} - * @memberof PlotQueryRectangle - */ - spatialBounds: BoundingBox2D; - /** - * - * @type {SpatialResolution} - * @memberof PlotQueryRectangle - */ - spatialResolution: SpatialResolution; - /** - * - * @type {TimeInterval} - * @memberof PlotQueryRectangle - */ - timeInterval: TimeInterval; -} -/** - * Check if a given object implements the PlotQueryRectangle interface. - */ -export declare function instanceOfPlotQueryRectangle(value: object): value is PlotQueryRectangle; -export declare function PlotQueryRectangleFromJSON(json: any): PlotQueryRectangle; -export declare function PlotQueryRectangleFromJSONTyped(json: any, ignoreDiscriminator: boolean): PlotQueryRectangle; -export declare function PlotQueryRectangleToJSON(json: any): PlotQueryRectangle; -export declare function PlotQueryRectangleToJSONTyped(value?: PlotQueryRectangle | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/PlotQueryRectangle.js b/typescript/dist/esm/models/PlotQueryRectangle.js deleted file mode 100644 index 00e7bab4..00000000 --- a/typescript/dist/esm/models/PlotQueryRectangle.js +++ /dev/null @@ -1,54 +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 { SpatialResolutionFromJSON, SpatialResolutionToJSON, } from './SpatialResolution'; -import { TimeIntervalFromJSON, TimeIntervalToJSON, } from './TimeInterval'; -import { BoundingBox2DFromJSON, BoundingBox2DToJSON, } from './BoundingBox2D'; -/** - * Check if a given object implements the PlotQueryRectangle interface. - */ -export function instanceOfPlotQueryRectangle(value) { - if (!('spatialBounds' in value) || value['spatialBounds'] === undefined) - return false; - if (!('spatialResolution' in value) || value['spatialResolution'] === undefined) - return false; - if (!('timeInterval' in value) || value['timeInterval'] === undefined) - return false; - return true; -} -export function PlotQueryRectangleFromJSON(json) { - return PlotQueryRectangleFromJSONTyped(json, false); -} -export function PlotQueryRectangleFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'spatialBounds': BoundingBox2DFromJSON(json['spatialBounds']), - 'spatialResolution': SpatialResolutionFromJSON(json['spatialResolution']), - 'timeInterval': TimeIntervalFromJSON(json['timeInterval']), - }; -} -export function PlotQueryRectangleToJSON(json) { - return PlotQueryRectangleToJSONTyped(json, false); -} -export function PlotQueryRectangleToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'spatialBounds': BoundingBox2DToJSON(value['spatialBounds']), - 'spatialResolution': SpatialResolutionToJSON(value['spatialResolution']), - 'timeInterval': TimeIntervalToJSON(value['timeInterval']), - }; -} diff --git a/typescript/dist/esm/models/RasterDatasetFromWorkflow.d.ts b/typescript/dist/esm/models/RasterDatasetFromWorkflow.d.ts index 42b64948..8ec5d61b 100644 --- a/typescript/dist/esm/models/RasterDatasetFromWorkflow.d.ts +++ b/typescript/dist/esm/models/RasterDatasetFromWorkflow.d.ts @@ -9,7 +9,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { RasterQueryRectangle } from './RasterQueryRectangle'; +import type { RasterToDatasetQueryRectangle } from './RasterToDatasetQueryRectangle'; /** * parameter for the dataset from workflow handler (body) * @export @@ -42,10 +42,10 @@ export interface RasterDatasetFromWorkflow { name?: string; /** * - * @type {RasterQueryRectangle} + * @type {RasterToDatasetQueryRectangle} * @memberof RasterDatasetFromWorkflow */ - query: RasterQueryRectangle; + query: RasterToDatasetQueryRectangle; } /** * Check if a given object implements the RasterDatasetFromWorkflow interface. diff --git a/typescript/dist/esm/models/RasterDatasetFromWorkflow.js b/typescript/dist/esm/models/RasterDatasetFromWorkflow.js index 8a8366ca..71cde946 100644 --- a/typescript/dist/esm/models/RasterDatasetFromWorkflow.js +++ b/typescript/dist/esm/models/RasterDatasetFromWorkflow.js @@ -11,7 +11,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { RasterQueryRectangleFromJSON, RasterQueryRectangleToJSON, } from './RasterQueryRectangle'; +import { RasterToDatasetQueryRectangleFromJSON, RasterToDatasetQueryRectangleToJSON, } from './RasterToDatasetQueryRectangle'; /** * Check if a given object implements the RasterDatasetFromWorkflow interface. */ @@ -34,7 +34,7 @@ export function RasterDatasetFromWorkflowFromJSONTyped(json, ignoreDiscriminator 'description': json['description'] == null ? undefined : json['description'], 'displayName': json['displayName'], 'name': json['name'] == null ? undefined : json['name'], - 'query': RasterQueryRectangleFromJSON(json['query']), + 'query': RasterToDatasetQueryRectangleFromJSON(json['query']), }; } export function RasterDatasetFromWorkflowToJSON(json) { @@ -49,6 +49,6 @@ export function RasterDatasetFromWorkflowToJSONTyped(value, ignoreDiscriminator 'description': value['description'], 'displayName': value['displayName'], 'name': value['name'], - 'query': RasterQueryRectangleToJSON(value['query']), + 'query': RasterToDatasetQueryRectangleToJSON(value['query']), }; } diff --git a/typescript/dist/esm/models/RasterQueryRectangle.d.ts b/typescript/dist/esm/models/RasterQueryRectangle.d.ts deleted file mode 100644 index 03d13584..00000000 --- a/typescript/dist/esm/models/RasterQueryRectangle.d.ts +++ /dev/null @@ -1,47 +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 { SpatialResolution } from './SpatialResolution'; -import type { TimeInterval } from './TimeInterval'; -import type { SpatialPartition2D } from './SpatialPartition2D'; -/** - * A spatio-temporal rectangle with a specified resolution - * @export - * @interface RasterQueryRectangle - */ -export interface RasterQueryRectangle { - /** - * - * @type {SpatialPartition2D} - * @memberof RasterQueryRectangle - */ - spatialBounds: SpatialPartition2D; - /** - * - * @type {SpatialResolution} - * @memberof RasterQueryRectangle - */ - spatialResolution: SpatialResolution; - /** - * - * @type {TimeInterval} - * @memberof RasterQueryRectangle - */ - timeInterval: TimeInterval; -} -/** - * Check if a given object implements the RasterQueryRectangle interface. - */ -export declare function instanceOfRasterQueryRectangle(value: object): value is RasterQueryRectangle; -export declare function RasterQueryRectangleFromJSON(json: any): RasterQueryRectangle; -export declare function RasterQueryRectangleFromJSONTyped(json: any, ignoreDiscriminator: boolean): RasterQueryRectangle; -export declare function RasterQueryRectangleToJSON(json: any): RasterQueryRectangle; -export declare function RasterQueryRectangleToJSONTyped(value?: RasterQueryRectangle | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/RasterResultDescriptor.d.ts b/typescript/dist/esm/models/RasterResultDescriptor.d.ts index d8decd8a..fb9ec1e9 100644 --- a/typescript/dist/esm/models/RasterResultDescriptor.d.ts +++ b/typescript/dist/esm/models/RasterResultDescriptor.d.ts @@ -9,11 +9,10 @@ * 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 { SpatialGridDescriptor } from './SpatialGridDescriptor'; import type { RasterDataType } from './RasterDataType'; -import type { SpatialPartition2D } from './SpatialPartition2D'; /** * A `ResultDescriptor` for raster queries * @export @@ -26,12 +25,6 @@ export interface RasterResultDescriptor { * @memberof RasterResultDescriptor */ bands: Array; - /** - * - * @type {SpatialPartition2D} - * @memberof RasterResultDescriptor - */ - bbox?: SpatialPartition2D | null; /** * * @type {RasterDataType} @@ -40,10 +33,10 @@ export interface RasterResultDescriptor { dataType: RasterDataType; /** * - * @type {SpatialResolution} + * @type {SpatialGridDescriptor} * @memberof RasterResultDescriptor */ - resolution?: SpatialResolution | null; + spatialGrid: SpatialGridDescriptor; /** * * @type {string} diff --git a/typescript/dist/esm/models/RasterResultDescriptor.js b/typescript/dist/esm/models/RasterResultDescriptor.js index 4a061bc3..1d5e7822 100644 --- a/typescript/dist/esm/models/RasterResultDescriptor.js +++ b/typescript/dist/esm/models/RasterResultDescriptor.js @@ -11,11 +11,10 @@ * 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 { SpatialGridDescriptorFromJSON, SpatialGridDescriptorToJSON, } from './SpatialGridDescriptor'; import { RasterDataTypeFromJSON, RasterDataTypeToJSON, } from './RasterDataType'; -import { SpatialPartition2DFromJSON, SpatialPartition2DToJSON, } from './SpatialPartition2D'; /** * Check if a given object implements the RasterResultDescriptor interface. */ @@ -24,6 +23,8 @@ export function instanceOfRasterResultDescriptor(value) { return false; if (!('dataType' in value) || value['dataType'] === undefined) return false; + if (!('spatialGrid' in value) || value['spatialGrid'] === undefined) + return false; if (!('spatialReference' in value) || value['spatialReference'] === undefined) return false; return true; @@ -37,9 +38,8 @@ export function RasterResultDescriptorFromJSONTyped(json, ignoreDiscriminator) { } 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']), + 'spatialGrid': SpatialGridDescriptorFromJSON(json['spatialGrid']), 'spatialReference': json['spatialReference'], 'time': json['time'] == null ? undefined : TimeIntervalFromJSON(json['time']), }; @@ -53,9 +53,8 @@ export function RasterResultDescriptorToJSONTyped(value, ignoreDiscriminator = f } return { 'bands': (value['bands'].map(RasterBandDescriptorToJSON)), - 'bbox': SpatialPartition2DToJSON(value['bbox']), 'dataType': RasterDataTypeToJSON(value['dataType']), - 'resolution': SpatialResolutionToJSON(value['resolution']), + 'spatialGrid': SpatialGridDescriptorToJSON(value['spatialGrid']), 'spatialReference': value['spatialReference'], 'time': TimeIntervalToJSON(value['time']), }; diff --git a/typescript/dist/esm/models/RasterToDatasetQueryRectangle.d.ts b/typescript/dist/esm/models/RasterToDatasetQueryRectangle.d.ts new file mode 100644 index 00000000..a85743ab --- /dev/null +++ b/typescript/dist/esm/models/RasterToDatasetQueryRectangle.d.ts @@ -0,0 +1,40 @@ +/** + * 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 { TimeInterval } from './TimeInterval'; +import type { SpatialPartition2D } from './SpatialPartition2D'; +/** + * A spatio-temporal rectangle with a specified resolution + * @export + * @interface RasterToDatasetQueryRectangle + */ +export interface RasterToDatasetQueryRectangle { + /** + * + * @type {SpatialPartition2D} + * @memberof RasterToDatasetQueryRectangle + */ + spatialBounds: SpatialPartition2D; + /** + * + * @type {TimeInterval} + * @memberof RasterToDatasetQueryRectangle + */ + timeInterval: TimeInterval; +} +/** + * Check if a given object implements the RasterToDatasetQueryRectangle interface. + */ +export declare function instanceOfRasterToDatasetQueryRectangle(value: object): value is RasterToDatasetQueryRectangle; +export declare function RasterToDatasetQueryRectangleFromJSON(json: any): RasterToDatasetQueryRectangle; +export declare function RasterToDatasetQueryRectangleFromJSONTyped(json: any, ignoreDiscriminator: boolean): RasterToDatasetQueryRectangle; +export declare function RasterToDatasetQueryRectangleToJSON(json: any): RasterToDatasetQueryRectangle; +export declare function RasterToDatasetQueryRectangleToJSONTyped(value?: RasterToDatasetQueryRectangle | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/RasterQueryRectangle.js b/typescript/dist/esm/models/RasterToDatasetQueryRectangle.js similarity index 58% rename from typescript/dist/esm/models/RasterQueryRectangle.js rename to typescript/dist/esm/models/RasterToDatasetQueryRectangle.js index 98807fb0..95aab4fe 100644 --- a/typescript/dist/esm/models/RasterQueryRectangle.js +++ b/typescript/dist/esm/models/RasterToDatasetQueryRectangle.js @@ -11,44 +11,39 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import { SpatialResolutionFromJSON, SpatialResolutionToJSON, } from './SpatialResolution'; import { TimeIntervalFromJSON, TimeIntervalToJSON, } from './TimeInterval'; import { SpatialPartition2DFromJSON, SpatialPartition2DToJSON, } from './SpatialPartition2D'; /** - * Check if a given object implements the RasterQueryRectangle interface. + * Check if a given object implements the RasterToDatasetQueryRectangle interface. */ -export function instanceOfRasterQueryRectangle(value) { +export function instanceOfRasterToDatasetQueryRectangle(value) { if (!('spatialBounds' in value) || value['spatialBounds'] === undefined) return false; - if (!('spatialResolution' in value) || value['spatialResolution'] === undefined) - return false; if (!('timeInterval' in value) || value['timeInterval'] === undefined) return false; return true; } -export function RasterQueryRectangleFromJSON(json) { - return RasterQueryRectangleFromJSONTyped(json, false); +export function RasterToDatasetQueryRectangleFromJSON(json) { + return RasterToDatasetQueryRectangleFromJSONTyped(json, false); } -export function RasterQueryRectangleFromJSONTyped(json, ignoreDiscriminator) { +export function RasterToDatasetQueryRectangleFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } return { 'spatialBounds': SpatialPartition2DFromJSON(json['spatialBounds']), - 'spatialResolution': SpatialResolutionFromJSON(json['spatialResolution']), 'timeInterval': TimeIntervalFromJSON(json['timeInterval']), }; } -export function RasterQueryRectangleToJSON(json) { - return RasterQueryRectangleToJSONTyped(json, false); +export function RasterToDatasetQueryRectangleToJSON(json) { + return RasterToDatasetQueryRectangleToJSONTyped(json, false); } -export function RasterQueryRectangleToJSONTyped(value, ignoreDiscriminator = false) { +export function RasterToDatasetQueryRectangleToJSONTyped(value, ignoreDiscriminator = false) { if (value == null) { return value; } return { 'spatialBounds': SpatialPartition2DToJSON(value['spatialBounds']), - 'spatialResolution': SpatialResolutionToJSON(value['spatialResolution']), 'timeInterval': TimeIntervalToJSON(value['timeInterval']), }; } diff --git a/typescript/dist/esm/models/SpatialGridDefinition.d.ts b/typescript/dist/esm/models/SpatialGridDefinition.d.ts new file mode 100644 index 00000000..aeb8cd0b --- /dev/null +++ b/typescript/dist/esm/models/SpatialGridDefinition.d.ts @@ -0,0 +1,40 @@ +/** + * 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 { GridBoundingBox2D } from './GridBoundingBox2D'; +import type { GeoTransform } from './GeoTransform'; +/** + * + * @export + * @interface SpatialGridDefinition + */ +export interface SpatialGridDefinition { + /** + * + * @type {GeoTransform} + * @memberof SpatialGridDefinition + */ + geoTransform: GeoTransform; + /** + * + * @type {GridBoundingBox2D} + * @memberof SpatialGridDefinition + */ + gridBounds: GridBoundingBox2D; +} +/** + * Check if a given object implements the SpatialGridDefinition interface. + */ +export declare function instanceOfSpatialGridDefinition(value: object): value is SpatialGridDefinition; +export declare function SpatialGridDefinitionFromJSON(json: any): SpatialGridDefinition; +export declare function SpatialGridDefinitionFromJSONTyped(json: any, ignoreDiscriminator: boolean): SpatialGridDefinition; +export declare function SpatialGridDefinitionToJSON(json: any): SpatialGridDefinition; +export declare function SpatialGridDefinitionToJSONTyped(value?: SpatialGridDefinition | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/SpatialGridDefinition.js b/typescript/dist/esm/models/SpatialGridDefinition.js new file mode 100644 index 00000000..5d40c46d --- /dev/null +++ b/typescript/dist/esm/models/SpatialGridDefinition.js @@ -0,0 +1,49 @@ +/* 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 { GridBoundingBox2DFromJSON, GridBoundingBox2DToJSON, } from './GridBoundingBox2D'; +import { GeoTransformFromJSON, GeoTransformToJSON, } from './GeoTransform'; +/** + * Check if a given object implements the SpatialGridDefinition interface. + */ +export function instanceOfSpatialGridDefinition(value) { + if (!('geoTransform' in value) || value['geoTransform'] === undefined) + return false; + if (!('gridBounds' in value) || value['gridBounds'] === undefined) + return false; + return true; +} +export function SpatialGridDefinitionFromJSON(json) { + return SpatialGridDefinitionFromJSONTyped(json, false); +} +export function SpatialGridDefinitionFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'geoTransform': GeoTransformFromJSON(json['geoTransform']), + 'gridBounds': GridBoundingBox2DFromJSON(json['gridBounds']), + }; +} +export function SpatialGridDefinitionToJSON(json) { + return SpatialGridDefinitionToJSONTyped(json, false); +} +export function SpatialGridDefinitionToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'geoTransform': GeoTransformToJSON(value['geoTransform']), + 'gridBounds': GridBoundingBox2DToJSON(value['gridBounds']), + }; +} diff --git a/typescript/dist/esm/models/SpatialGridDescriptor.d.ts b/typescript/dist/esm/models/SpatialGridDescriptor.d.ts new file mode 100644 index 00000000..8af1744e --- /dev/null +++ b/typescript/dist/esm/models/SpatialGridDescriptor.d.ts @@ -0,0 +1,40 @@ +/** + * 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 { SpatialGridDefinition } from './SpatialGridDefinition'; +import type { SpatialGridDescriptorState } from './SpatialGridDescriptorState'; +/** + * + * @export + * @interface SpatialGridDescriptor + */ +export interface SpatialGridDescriptor { + /** + * + * @type {SpatialGridDescriptorState} + * @memberof SpatialGridDescriptor + */ + descriptor: SpatialGridDescriptorState; + /** + * + * @type {SpatialGridDefinition} + * @memberof SpatialGridDescriptor + */ + spatialGrid: SpatialGridDefinition; +} +/** + * Check if a given object implements the SpatialGridDescriptor interface. + */ +export declare function instanceOfSpatialGridDescriptor(value: object): value is SpatialGridDescriptor; +export declare function SpatialGridDescriptorFromJSON(json: any): SpatialGridDescriptor; +export declare function SpatialGridDescriptorFromJSONTyped(json: any, ignoreDiscriminator: boolean): SpatialGridDescriptor; +export declare function SpatialGridDescriptorToJSON(json: any): SpatialGridDescriptor; +export declare function SpatialGridDescriptorToJSONTyped(value?: SpatialGridDescriptor | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/SpatialGridDescriptor.js b/typescript/dist/esm/models/SpatialGridDescriptor.js new file mode 100644 index 00000000..235c12c4 --- /dev/null +++ b/typescript/dist/esm/models/SpatialGridDescriptor.js @@ -0,0 +1,49 @@ +/* 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 { SpatialGridDefinitionFromJSON, SpatialGridDefinitionToJSON, } from './SpatialGridDefinition'; +import { SpatialGridDescriptorStateFromJSON, SpatialGridDescriptorStateToJSON, } from './SpatialGridDescriptorState'; +/** + * Check if a given object implements the SpatialGridDescriptor interface. + */ +export function instanceOfSpatialGridDescriptor(value) { + if (!('descriptor' in value) || value['descriptor'] === undefined) + return false; + if (!('spatialGrid' in value) || value['spatialGrid'] === undefined) + return false; + return true; +} +export function SpatialGridDescriptorFromJSON(json) { + return SpatialGridDescriptorFromJSONTyped(json, false); +} +export function SpatialGridDescriptorFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'descriptor': SpatialGridDescriptorStateFromJSON(json['descriptor']), + 'spatialGrid': SpatialGridDefinitionFromJSON(json['spatialGrid']), + }; +} +export function SpatialGridDescriptorToJSON(json) { + return SpatialGridDescriptorToJSONTyped(json, false); +} +export function SpatialGridDescriptorToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'descriptor': SpatialGridDescriptorStateToJSON(value['descriptor']), + 'spatialGrid': SpatialGridDefinitionToJSON(value['spatialGrid']), + }; +} diff --git a/typescript/dist/esm/models/SpatialGridDescriptorState.d.ts b/typescript/dist/esm/models/SpatialGridDescriptorState.d.ts new file mode 100644 index 00000000..c1fd411e --- /dev/null +++ b/typescript/dist/esm/models/SpatialGridDescriptorState.d.ts @@ -0,0 +1,25 @@ +/** + * 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 declare const SpatialGridDescriptorState: { + readonly Source: "source"; + readonly Derived: "derived"; +}; +export type SpatialGridDescriptorState = typeof SpatialGridDescriptorState[keyof typeof SpatialGridDescriptorState]; +export declare function instanceOfSpatialGridDescriptorState(value: any): boolean; +export declare function SpatialGridDescriptorStateFromJSON(json: any): SpatialGridDescriptorState; +export declare function SpatialGridDescriptorStateFromJSONTyped(json: any, ignoreDiscriminator: boolean): SpatialGridDescriptorState; +export declare function SpatialGridDescriptorStateToJSON(value?: SpatialGridDescriptorState | null): any; +export declare function SpatialGridDescriptorStateToJSONTyped(value: any, ignoreDiscriminator: boolean): SpatialGridDescriptorState; diff --git a/typescript/dist/esm/models/SpatialGridDescriptorState.js b/typescript/dist/esm/models/SpatialGridDescriptorState.js new file mode 100644 index 00000000..b7d27aa5 --- /dev/null +++ b/typescript/dist/esm/models/SpatialGridDescriptorState.js @@ -0,0 +1,43 @@ +/* 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 SpatialGridDescriptorState = { + Source: 'source', + Derived: 'derived' +}; +export function instanceOfSpatialGridDescriptorState(value) { + for (const key in SpatialGridDescriptorState) { + if (Object.prototype.hasOwnProperty.call(SpatialGridDescriptorState, key)) { + if (SpatialGridDescriptorState[key] === value) { + return true; + } + } + } + return false; +} +export function SpatialGridDescriptorStateFromJSON(json) { + return SpatialGridDescriptorStateFromJSONTyped(json, false); +} +export function SpatialGridDescriptorStateFromJSONTyped(json, ignoreDiscriminator) { + return json; +} +export function SpatialGridDescriptorStateToJSON(value) { + return value; +} +export function SpatialGridDescriptorStateToJSONTyped(value, ignoreDiscriminator) { + return value; +} diff --git a/typescript/dist/esm/models/VectorQueryRectangle.d.ts b/typescript/dist/esm/models/VectorQueryRectangle.d.ts deleted file mode 100644 index 6b878b63..00000000 --- a/typescript/dist/esm/models/VectorQueryRectangle.d.ts +++ /dev/null @@ -1,47 +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 { SpatialResolution } from './SpatialResolution'; -import type { TimeInterval } from './TimeInterval'; -import type { BoundingBox2D } from './BoundingBox2D'; -/** - * A spatio-temporal rectangle with a specified resolution - * @export - * @interface VectorQueryRectangle - */ -export interface VectorQueryRectangle { - /** - * - * @type {BoundingBox2D} - * @memberof VectorQueryRectangle - */ - spatialBounds: BoundingBox2D; - /** - * - * @type {SpatialResolution} - * @memberof VectorQueryRectangle - */ - spatialResolution: SpatialResolution; - /** - * - * @type {TimeInterval} - * @memberof VectorQueryRectangle - */ - timeInterval: TimeInterval; -} -/** - * Check if a given object implements the VectorQueryRectangle interface. - */ -export declare function instanceOfVectorQueryRectangle(value: object): value is VectorQueryRectangle; -export declare function VectorQueryRectangleFromJSON(json: any): VectorQueryRectangle; -export declare function VectorQueryRectangleFromJSONTyped(json: any, ignoreDiscriminator: boolean): VectorQueryRectangle; -export declare function VectorQueryRectangleToJSON(json: any): VectorQueryRectangle; -export declare function VectorQueryRectangleToJSONTyped(value?: VectorQueryRectangle | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/esm/models/VectorQueryRectangle.js b/typescript/dist/esm/models/VectorQueryRectangle.js deleted file mode 100644 index 9ff2114b..00000000 --- a/typescript/dist/esm/models/VectorQueryRectangle.js +++ /dev/null @@ -1,54 +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 { SpatialResolutionFromJSON, SpatialResolutionToJSON, } from './SpatialResolution'; -import { TimeIntervalFromJSON, TimeIntervalToJSON, } from './TimeInterval'; -import { BoundingBox2DFromJSON, BoundingBox2DToJSON, } from './BoundingBox2D'; -/** - * Check if a given object implements the VectorQueryRectangle interface. - */ -export function instanceOfVectorQueryRectangle(value) { - if (!('spatialBounds' in value) || value['spatialBounds'] === undefined) - return false; - if (!('spatialResolution' in value) || value['spatialResolution'] === undefined) - return false; - if (!('timeInterval' in value) || value['timeInterval'] === undefined) - return false; - return true; -} -export function VectorQueryRectangleFromJSON(json) { - return VectorQueryRectangleFromJSONTyped(json, false); -} -export function VectorQueryRectangleFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'spatialBounds': BoundingBox2DFromJSON(json['spatialBounds']), - 'spatialResolution': SpatialResolutionFromJSON(json['spatialResolution']), - 'timeInterval': TimeIntervalFromJSON(json['timeInterval']), - }; -} -export function VectorQueryRectangleToJSON(json) { - return VectorQueryRectangleToJSONTyped(json, false); -} -export function VectorQueryRectangleToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'spatialBounds': BoundingBox2DToJSON(value['spatialBounds']), - 'spatialResolution': SpatialResolutionToJSON(value['spatialResolution']), - 'timeInterval': TimeIntervalToJSON(value['timeInterval']), - }; -} diff --git a/typescript/dist/esm/models/index.d.ts b/typescript/dist/esm/models/index.d.ts index 636d9880..d9a84229 100644 --- a/typescript/dist/esm/models/index.d.ts +++ b/typescript/dist/esm/models/index.d.ts @@ -50,6 +50,7 @@ export * from './GdalMetadataMapping'; export * from './GdalMetadataNetCdfCf'; export * from './GdalSourceTimePlaceholder'; export * from './GeoJson'; +export * from './GeoTransform'; export * from './GetCapabilitiesFormat'; export * from './GetCapabilitiesRequest'; export * from './GetCoverageFormat'; @@ -59,6 +60,8 @@ export * from './GetLegendGraphicRequest'; export * from './GetMapExceptionFormat'; export * from './GetMapFormat'; export * from './GetMapRequest'; +export * from './GridBoundingBox2D'; +export * from './GridIdx2D'; export * from './IdResponse'; export * from './InternalDataId'; export * from './Layer'; @@ -111,7 +114,6 @@ export * from './PermissionListing'; export * from './PermissionRequest'; export * from './Plot'; export * from './PlotOutputFormat'; -export * from './PlotQueryRectangle'; export * from './PlotResultDescriptor'; export * from './PointSymbology'; export * from './PolygonSymbology'; @@ -136,10 +138,10 @@ export * from './RasterDatasetFromWorkflow'; export * from './RasterDatasetFromWorkflowResult'; export * from './RasterPropertiesEntryType'; export * from './RasterPropertiesKey'; -export * from './RasterQueryRectangle'; export * from './RasterResultDescriptor'; export * from './RasterStreamWebsocketResultType'; export * from './RasterSymbology'; +export * from './RasterToDatasetQueryRectangle'; export * from './Resource'; export * from './Role'; export * from './RoleDescription'; @@ -149,6 +151,9 @@ export * from './SearchType'; export * from './SearchTypes'; export * from './ServerInfo'; export * from './SingleBandRasterColorizer'; +export * from './SpatialGridDefinition'; +export * from './SpatialGridDescriptor'; +export * from './SpatialGridDescriptorState'; export * from './SpatialPartition2D'; export * from './SpatialReferenceAuthority'; export * from './SpatialReferenceSpecification'; @@ -201,7 +206,6 @@ export * from './UserSession'; export * from './VecUpdate'; export * from './VectorColumnInfo'; export * from './VectorDataType'; -export * from './VectorQueryRectangle'; export * from './VectorResultDescriptor'; export * from './Volume'; export * from './VolumeFileLayersResponse'; diff --git a/typescript/dist/esm/models/index.js b/typescript/dist/esm/models/index.js index 1fd7bb3c..802fa5ba 100644 --- a/typescript/dist/esm/models/index.js +++ b/typescript/dist/esm/models/index.js @@ -52,6 +52,7 @@ export * from './GdalMetadataMapping'; export * from './GdalMetadataNetCdfCf'; export * from './GdalSourceTimePlaceholder'; export * from './GeoJson'; +export * from './GeoTransform'; export * from './GetCapabilitiesFormat'; export * from './GetCapabilitiesRequest'; export * from './GetCoverageFormat'; @@ -61,6 +62,8 @@ export * from './GetLegendGraphicRequest'; export * from './GetMapExceptionFormat'; export * from './GetMapFormat'; export * from './GetMapRequest'; +export * from './GridBoundingBox2D'; +export * from './GridIdx2D'; export * from './IdResponse'; export * from './InternalDataId'; export * from './Layer'; @@ -113,7 +116,6 @@ export * from './PermissionListing'; export * from './PermissionRequest'; export * from './Plot'; export * from './PlotOutputFormat'; -export * from './PlotQueryRectangle'; export * from './PlotResultDescriptor'; export * from './PointSymbology'; export * from './PolygonSymbology'; @@ -138,10 +140,10 @@ export * from './RasterDatasetFromWorkflow'; export * from './RasterDatasetFromWorkflowResult'; export * from './RasterPropertiesEntryType'; export * from './RasterPropertiesKey'; -export * from './RasterQueryRectangle'; export * from './RasterResultDescriptor'; export * from './RasterStreamWebsocketResultType'; export * from './RasterSymbology'; +export * from './RasterToDatasetQueryRectangle'; export * from './Resource'; export * from './Role'; export * from './RoleDescription'; @@ -151,6 +153,9 @@ export * from './SearchType'; export * from './SearchTypes'; export * from './ServerInfo'; export * from './SingleBandRasterColorizer'; +export * from './SpatialGridDefinition'; +export * from './SpatialGridDescriptor'; +export * from './SpatialGridDescriptorState'; export * from './SpatialPartition2D'; export * from './SpatialReferenceAuthority'; export * from './SpatialReferenceSpecification'; @@ -203,7 +208,6 @@ export * from './UserSession'; export * from './VecUpdate'; export * from './VectorColumnInfo'; export * from './VectorDataType'; -export * from './VectorQueryRectangle'; export * from './VectorResultDescriptor'; export * from './Volume'; export * from './VolumeFileLayersResponse'; diff --git a/typescript/dist/models/GeoTransform.d.ts b/typescript/dist/models/GeoTransform.d.ts new file mode 100644 index 00000000..1fd8c3ba --- /dev/null +++ b/typescript/dist/models/GeoTransform.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. + */ +import type { Coordinate2D } from './Coordinate2D'; +/** + * + * @export + * @interface GeoTransform + */ +export interface GeoTransform { + /** + * + * @type {Coordinate2D} + * @memberof GeoTransform + */ + originCoordinate: Coordinate2D; + /** + * + * @type {number} + * @memberof GeoTransform + */ + xPixelSize: number; + /** + * + * @type {number} + * @memberof GeoTransform + */ + yPixelSize: number; +} +/** + * Check if a given object implements the GeoTransform interface. + */ +export declare function instanceOfGeoTransform(value: object): value is GeoTransform; +export declare function GeoTransformFromJSON(json: any): GeoTransform; +export declare function GeoTransformFromJSONTyped(json: any, ignoreDiscriminator: boolean): GeoTransform; +export declare function GeoTransformToJSON(json: any): GeoTransform; +export declare function GeoTransformToJSONTyped(value?: GeoTransform | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/GeoTransform.js b/typescript/dist/models/GeoTransform.js new file mode 100644 index 00000000..3cf85845 --- /dev/null +++ b/typescript/dist/models/GeoTransform.js @@ -0,0 +1,59 @@ +"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.instanceOfGeoTransform = instanceOfGeoTransform; +exports.GeoTransformFromJSON = GeoTransformFromJSON; +exports.GeoTransformFromJSONTyped = GeoTransformFromJSONTyped; +exports.GeoTransformToJSON = GeoTransformToJSON; +exports.GeoTransformToJSONTyped = GeoTransformToJSONTyped; +const Coordinate2D_1 = require("./Coordinate2D"); +/** + * Check if a given object implements the GeoTransform interface. + */ +function instanceOfGeoTransform(value) { + if (!('originCoordinate' in value) || value['originCoordinate'] === undefined) + return false; + if (!('xPixelSize' in value) || value['xPixelSize'] === undefined) + return false; + if (!('yPixelSize' in value) || value['yPixelSize'] === undefined) + return false; + return true; +} +function GeoTransformFromJSON(json) { + return GeoTransformFromJSONTyped(json, false); +} +function GeoTransformFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'originCoordinate': (0, Coordinate2D_1.Coordinate2DFromJSON)(json['originCoordinate']), + 'xPixelSize': json['xPixelSize'], + 'yPixelSize': json['yPixelSize'], + }; +} +function GeoTransformToJSON(json) { + return GeoTransformToJSONTyped(json, false); +} +function GeoTransformToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'originCoordinate': (0, Coordinate2D_1.Coordinate2DToJSON)(value['originCoordinate']), + 'xPixelSize': value['xPixelSize'], + 'yPixelSize': value['yPixelSize'], + }; +} diff --git a/typescript/dist/models/GridBoundingBox2D.d.ts b/typescript/dist/models/GridBoundingBox2D.d.ts new file mode 100644 index 00000000..7203d881 --- /dev/null +++ b/typescript/dist/models/GridBoundingBox2D.d.ts @@ -0,0 +1,39 @@ +/** + * 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 { GridIdx2D } from './GridIdx2D'; +/** + * + * @export + * @interface GridBoundingBox2D + */ +export interface GridBoundingBox2D { + /** + * + * @type {GridIdx2D} + * @memberof GridBoundingBox2D + */ + bottomRightIdx: GridIdx2D; + /** + * + * @type {GridIdx2D} + * @memberof GridBoundingBox2D + */ + topLeftIdx: GridIdx2D; +} +/** + * Check if a given object implements the GridBoundingBox2D interface. + */ +export declare function instanceOfGridBoundingBox2D(value: object): value is GridBoundingBox2D; +export declare function GridBoundingBox2DFromJSON(json: any): GridBoundingBox2D; +export declare function GridBoundingBox2DFromJSONTyped(json: any, ignoreDiscriminator: boolean): GridBoundingBox2D; +export declare function GridBoundingBox2DToJSON(json: any): GridBoundingBox2D; +export declare function GridBoundingBox2DToJSONTyped(value?: GridBoundingBox2D | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/GridBoundingBox2D.js b/typescript/dist/models/GridBoundingBox2D.js new file mode 100644 index 00000000..7ff23465 --- /dev/null +++ b/typescript/dist/models/GridBoundingBox2D.js @@ -0,0 +1,55 @@ +"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.instanceOfGridBoundingBox2D = instanceOfGridBoundingBox2D; +exports.GridBoundingBox2DFromJSON = GridBoundingBox2DFromJSON; +exports.GridBoundingBox2DFromJSONTyped = GridBoundingBox2DFromJSONTyped; +exports.GridBoundingBox2DToJSON = GridBoundingBox2DToJSON; +exports.GridBoundingBox2DToJSONTyped = GridBoundingBox2DToJSONTyped; +const GridIdx2D_1 = require("./GridIdx2D"); +/** + * Check if a given object implements the GridBoundingBox2D interface. + */ +function instanceOfGridBoundingBox2D(value) { + if (!('bottomRightIdx' in value) || value['bottomRightIdx'] === undefined) + return false; + if (!('topLeftIdx' in value) || value['topLeftIdx'] === undefined) + return false; + return true; +} +function GridBoundingBox2DFromJSON(json) { + return GridBoundingBox2DFromJSONTyped(json, false); +} +function GridBoundingBox2DFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'bottomRightIdx': (0, GridIdx2D_1.GridIdx2DFromJSON)(json['bottomRightIdx']), + 'topLeftIdx': (0, GridIdx2D_1.GridIdx2DFromJSON)(json['topLeftIdx']), + }; +} +function GridBoundingBox2DToJSON(json) { + return GridBoundingBox2DToJSONTyped(json, false); +} +function GridBoundingBox2DToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'bottomRightIdx': (0, GridIdx2D_1.GridIdx2DToJSON)(value['bottomRightIdx']), + 'topLeftIdx': (0, GridIdx2D_1.GridIdx2DToJSON)(value['topLeftIdx']), + }; +} diff --git a/typescript/dist/models/GridIdx2D.d.ts b/typescript/dist/models/GridIdx2D.d.ts new file mode 100644 index 00000000..1a265133 --- /dev/null +++ b/typescript/dist/models/GridIdx2D.d.ts @@ -0,0 +1,38 @@ +/** + * 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 GridIdx2D + */ +export interface GridIdx2D { + /** + * + * @type {number} + * @memberof GridIdx2D + */ + xIdx: number; + /** + * + * @type {number} + * @memberof GridIdx2D + */ + yIdx: number; +} +/** + * Check if a given object implements the GridIdx2D interface. + */ +export declare function instanceOfGridIdx2D(value: object): value is GridIdx2D; +export declare function GridIdx2DFromJSON(json: any): GridIdx2D; +export declare function GridIdx2DFromJSONTyped(json: any, ignoreDiscriminator: boolean): GridIdx2D; +export declare function GridIdx2DToJSON(json: any): GridIdx2D; +export declare function GridIdx2DToJSONTyped(value?: GridIdx2D | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/GridIdx2D.js b/typescript/dist/models/GridIdx2D.js new file mode 100644 index 00000000..9e514f0b --- /dev/null +++ b/typescript/dist/models/GridIdx2D.js @@ -0,0 +1,54 @@ +"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.instanceOfGridIdx2D = instanceOfGridIdx2D; +exports.GridIdx2DFromJSON = GridIdx2DFromJSON; +exports.GridIdx2DFromJSONTyped = GridIdx2DFromJSONTyped; +exports.GridIdx2DToJSON = GridIdx2DToJSON; +exports.GridIdx2DToJSONTyped = GridIdx2DToJSONTyped; +/** + * Check if a given object implements the GridIdx2D interface. + */ +function instanceOfGridIdx2D(value) { + if (!('xIdx' in value) || value['xIdx'] === undefined) + return false; + if (!('yIdx' in value) || value['yIdx'] === undefined) + return false; + return true; +} +function GridIdx2DFromJSON(json) { + return GridIdx2DFromJSONTyped(json, false); +} +function GridIdx2DFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'xIdx': json['xIdx'], + 'yIdx': json['yIdx'], + }; +} +function GridIdx2DToJSON(json) { + return GridIdx2DToJSONTyped(json, false); +} +function GridIdx2DToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'xIdx': value['xIdx'], + 'yIdx': value['yIdx'], + }; +} diff --git a/typescript/dist/models/PlotQueryRectangle.d.ts b/typescript/dist/models/PlotQueryRectangle.d.ts deleted file mode 100644 index a704eb37..00000000 --- a/typescript/dist/models/PlotQueryRectangle.d.ts +++ /dev/null @@ -1,47 +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 { SpatialResolution } from './SpatialResolution'; -import type { TimeInterval } from './TimeInterval'; -import type { BoundingBox2D } from './BoundingBox2D'; -/** - * A spatio-temporal rectangle with a specified resolution - * @export - * @interface PlotQueryRectangle - */ -export interface PlotQueryRectangle { - /** - * - * @type {BoundingBox2D} - * @memberof PlotQueryRectangle - */ - spatialBounds: BoundingBox2D; - /** - * - * @type {SpatialResolution} - * @memberof PlotQueryRectangle - */ - spatialResolution: SpatialResolution; - /** - * - * @type {TimeInterval} - * @memberof PlotQueryRectangle - */ - timeInterval: TimeInterval; -} -/** - * Check if a given object implements the PlotQueryRectangle interface. - */ -export declare function instanceOfPlotQueryRectangle(value: object): value is PlotQueryRectangle; -export declare function PlotQueryRectangleFromJSON(json: any): PlotQueryRectangle; -export declare function PlotQueryRectangleFromJSONTyped(json: any, ignoreDiscriminator: boolean): PlotQueryRectangle; -export declare function PlotQueryRectangleToJSON(json: any): PlotQueryRectangle; -export declare function PlotQueryRectangleToJSONTyped(value?: PlotQueryRectangle | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/PlotQueryRectangle.js b/typescript/dist/models/PlotQueryRectangle.js deleted file mode 100644 index d8b1cc40..00000000 --- a/typescript/dist/models/PlotQueryRectangle.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.instanceOfPlotQueryRectangle = instanceOfPlotQueryRectangle; -exports.PlotQueryRectangleFromJSON = PlotQueryRectangleFromJSON; -exports.PlotQueryRectangleFromJSONTyped = PlotQueryRectangleFromJSONTyped; -exports.PlotQueryRectangleToJSON = PlotQueryRectangleToJSON; -exports.PlotQueryRectangleToJSONTyped = PlotQueryRectangleToJSONTyped; -const SpatialResolution_1 = require("./SpatialResolution"); -const TimeInterval_1 = require("./TimeInterval"); -const BoundingBox2D_1 = require("./BoundingBox2D"); -/** - * Check if a given object implements the PlotQueryRectangle interface. - */ -function instanceOfPlotQueryRectangle(value) { - if (!('spatialBounds' in value) || value['spatialBounds'] === undefined) - return false; - if (!('spatialResolution' in value) || value['spatialResolution'] === undefined) - return false; - if (!('timeInterval' in value) || value['timeInterval'] === undefined) - return false; - return true; -} -function PlotQueryRectangleFromJSON(json) { - return PlotQueryRectangleFromJSONTyped(json, false); -} -function PlotQueryRectangleFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'spatialBounds': (0, BoundingBox2D_1.BoundingBox2DFromJSON)(json['spatialBounds']), - 'spatialResolution': (0, SpatialResolution_1.SpatialResolutionFromJSON)(json['spatialResolution']), - 'timeInterval': (0, TimeInterval_1.TimeIntervalFromJSON)(json['timeInterval']), - }; -} -function PlotQueryRectangleToJSON(json) { - return PlotQueryRectangleToJSONTyped(json, false); -} -function PlotQueryRectangleToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'spatialBounds': (0, BoundingBox2D_1.BoundingBox2DToJSON)(value['spatialBounds']), - 'spatialResolution': (0, SpatialResolution_1.SpatialResolutionToJSON)(value['spatialResolution']), - 'timeInterval': (0, TimeInterval_1.TimeIntervalToJSON)(value['timeInterval']), - }; -} diff --git a/typescript/dist/models/RasterDatasetFromWorkflow.d.ts b/typescript/dist/models/RasterDatasetFromWorkflow.d.ts index 42b64948..8ec5d61b 100644 --- a/typescript/dist/models/RasterDatasetFromWorkflow.d.ts +++ b/typescript/dist/models/RasterDatasetFromWorkflow.d.ts @@ -9,7 +9,7 @@ * https://openapi-generator.tech * Do not edit the class manually. */ -import type { RasterQueryRectangle } from './RasterQueryRectangle'; +import type { RasterToDatasetQueryRectangle } from './RasterToDatasetQueryRectangle'; /** * parameter for the dataset from workflow handler (body) * @export @@ -42,10 +42,10 @@ export interface RasterDatasetFromWorkflow { name?: string; /** * - * @type {RasterQueryRectangle} + * @type {RasterToDatasetQueryRectangle} * @memberof RasterDatasetFromWorkflow */ - query: RasterQueryRectangle; + query: RasterToDatasetQueryRectangle; } /** * Check if a given object implements the RasterDatasetFromWorkflow interface. diff --git a/typescript/dist/models/RasterDatasetFromWorkflow.js b/typescript/dist/models/RasterDatasetFromWorkflow.js index 3405d194..6203879d 100644 --- a/typescript/dist/models/RasterDatasetFromWorkflow.js +++ b/typescript/dist/models/RasterDatasetFromWorkflow.js @@ -18,7 +18,7 @@ exports.RasterDatasetFromWorkflowFromJSON = RasterDatasetFromWorkflowFromJSON; exports.RasterDatasetFromWorkflowFromJSONTyped = RasterDatasetFromWorkflowFromJSONTyped; exports.RasterDatasetFromWorkflowToJSON = RasterDatasetFromWorkflowToJSON; exports.RasterDatasetFromWorkflowToJSONTyped = RasterDatasetFromWorkflowToJSONTyped; -const RasterQueryRectangle_1 = require("./RasterQueryRectangle"); +const RasterToDatasetQueryRectangle_1 = require("./RasterToDatasetQueryRectangle"); /** * Check if a given object implements the RasterDatasetFromWorkflow interface. */ @@ -41,7 +41,7 @@ function RasterDatasetFromWorkflowFromJSONTyped(json, ignoreDiscriminator) { 'description': json['description'] == null ? undefined : json['description'], 'displayName': json['displayName'], 'name': json['name'] == null ? undefined : json['name'], - 'query': (0, RasterQueryRectangle_1.RasterQueryRectangleFromJSON)(json['query']), + 'query': (0, RasterToDatasetQueryRectangle_1.RasterToDatasetQueryRectangleFromJSON)(json['query']), }; } function RasterDatasetFromWorkflowToJSON(json) { @@ -56,6 +56,6 @@ function RasterDatasetFromWorkflowToJSONTyped(value, ignoreDiscriminator = false 'description': value['description'], 'displayName': value['displayName'], 'name': value['name'], - 'query': (0, RasterQueryRectangle_1.RasterQueryRectangleToJSON)(value['query']), + 'query': (0, RasterToDatasetQueryRectangle_1.RasterToDatasetQueryRectangleToJSON)(value['query']), }; } diff --git a/typescript/dist/models/RasterQueryRectangle.d.ts b/typescript/dist/models/RasterQueryRectangle.d.ts deleted file mode 100644 index 03d13584..00000000 --- a/typescript/dist/models/RasterQueryRectangle.d.ts +++ /dev/null @@ -1,47 +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 { SpatialResolution } from './SpatialResolution'; -import type { TimeInterval } from './TimeInterval'; -import type { SpatialPartition2D } from './SpatialPartition2D'; -/** - * A spatio-temporal rectangle with a specified resolution - * @export - * @interface RasterQueryRectangle - */ -export interface RasterQueryRectangle { - /** - * - * @type {SpatialPartition2D} - * @memberof RasterQueryRectangle - */ - spatialBounds: SpatialPartition2D; - /** - * - * @type {SpatialResolution} - * @memberof RasterQueryRectangle - */ - spatialResolution: SpatialResolution; - /** - * - * @type {TimeInterval} - * @memberof RasterQueryRectangle - */ - timeInterval: TimeInterval; -} -/** - * Check if a given object implements the RasterQueryRectangle interface. - */ -export declare function instanceOfRasterQueryRectangle(value: object): value is RasterQueryRectangle; -export declare function RasterQueryRectangleFromJSON(json: any): RasterQueryRectangle; -export declare function RasterQueryRectangleFromJSONTyped(json: any, ignoreDiscriminator: boolean): RasterQueryRectangle; -export declare function RasterQueryRectangleToJSON(json: any): RasterQueryRectangle; -export declare function RasterQueryRectangleToJSONTyped(value?: RasterQueryRectangle | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/RasterResultDescriptor.d.ts b/typescript/dist/models/RasterResultDescriptor.d.ts index d8decd8a..fb9ec1e9 100644 --- a/typescript/dist/models/RasterResultDescriptor.d.ts +++ b/typescript/dist/models/RasterResultDescriptor.d.ts @@ -9,11 +9,10 @@ * 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 { SpatialGridDescriptor } from './SpatialGridDescriptor'; import type { RasterDataType } from './RasterDataType'; -import type { SpatialPartition2D } from './SpatialPartition2D'; /** * A `ResultDescriptor` for raster queries * @export @@ -26,12 +25,6 @@ export interface RasterResultDescriptor { * @memberof RasterResultDescriptor */ bands: Array; - /** - * - * @type {SpatialPartition2D} - * @memberof RasterResultDescriptor - */ - bbox?: SpatialPartition2D | null; /** * * @type {RasterDataType} @@ -40,10 +33,10 @@ export interface RasterResultDescriptor { dataType: RasterDataType; /** * - * @type {SpatialResolution} + * @type {SpatialGridDescriptor} * @memberof RasterResultDescriptor */ - resolution?: SpatialResolution | null; + spatialGrid: SpatialGridDescriptor; /** * * @type {string} diff --git a/typescript/dist/models/RasterResultDescriptor.js b/typescript/dist/models/RasterResultDescriptor.js index 78f8cc7f..95128ed8 100644 --- a/typescript/dist/models/RasterResultDescriptor.js +++ b/typescript/dist/models/RasterResultDescriptor.js @@ -18,11 +18,10 @@ exports.RasterResultDescriptorFromJSON = RasterResultDescriptorFromJSON; exports.RasterResultDescriptorFromJSONTyped = RasterResultDescriptorFromJSONTyped; exports.RasterResultDescriptorToJSON = RasterResultDescriptorToJSON; exports.RasterResultDescriptorToJSONTyped = RasterResultDescriptorToJSONTyped; -const SpatialResolution_1 = require("./SpatialResolution"); const TimeInterval_1 = require("./TimeInterval"); const RasterBandDescriptor_1 = require("./RasterBandDescriptor"); +const SpatialGridDescriptor_1 = require("./SpatialGridDescriptor"); const RasterDataType_1 = require("./RasterDataType"); -const SpatialPartition2D_1 = require("./SpatialPartition2D"); /** * Check if a given object implements the RasterResultDescriptor interface. */ @@ -31,6 +30,8 @@ function instanceOfRasterResultDescriptor(value) { return false; if (!('dataType' in value) || value['dataType'] === undefined) return false; + if (!('spatialGrid' in value) || value['spatialGrid'] === undefined) + return false; if (!('spatialReference' in value) || value['spatialReference'] === undefined) return false; return true; @@ -44,9 +45,8 @@ function RasterResultDescriptorFromJSONTyped(json, ignoreDiscriminator) { } 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']), + 'spatialGrid': (0, SpatialGridDescriptor_1.SpatialGridDescriptorFromJSON)(json['spatialGrid']), 'spatialReference': json['spatialReference'], 'time': json['time'] == null ? undefined : (0, TimeInterval_1.TimeIntervalFromJSON)(json['time']), }; @@ -60,9 +60,8 @@ function RasterResultDescriptorToJSONTyped(value, ignoreDiscriminator = false) { } 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']), + 'spatialGrid': (0, SpatialGridDescriptor_1.SpatialGridDescriptorToJSON)(value['spatialGrid']), 'spatialReference': value['spatialReference'], 'time': (0, TimeInterval_1.TimeIntervalToJSON)(value['time']), }; diff --git a/typescript/dist/models/RasterToDatasetQueryRectangle.d.ts b/typescript/dist/models/RasterToDatasetQueryRectangle.d.ts new file mode 100644 index 00000000..a85743ab --- /dev/null +++ b/typescript/dist/models/RasterToDatasetQueryRectangle.d.ts @@ -0,0 +1,40 @@ +/** + * 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 { TimeInterval } from './TimeInterval'; +import type { SpatialPartition2D } from './SpatialPartition2D'; +/** + * A spatio-temporal rectangle with a specified resolution + * @export + * @interface RasterToDatasetQueryRectangle + */ +export interface RasterToDatasetQueryRectangle { + /** + * + * @type {SpatialPartition2D} + * @memberof RasterToDatasetQueryRectangle + */ + spatialBounds: SpatialPartition2D; + /** + * + * @type {TimeInterval} + * @memberof RasterToDatasetQueryRectangle + */ + timeInterval: TimeInterval; +} +/** + * Check if a given object implements the RasterToDatasetQueryRectangle interface. + */ +export declare function instanceOfRasterToDatasetQueryRectangle(value: object): value is RasterToDatasetQueryRectangle; +export declare function RasterToDatasetQueryRectangleFromJSON(json: any): RasterToDatasetQueryRectangle; +export declare function RasterToDatasetQueryRectangleFromJSONTyped(json: any, ignoreDiscriminator: boolean): RasterToDatasetQueryRectangle; +export declare function RasterToDatasetQueryRectangleToJSON(json: any): RasterToDatasetQueryRectangle; +export declare function RasterToDatasetQueryRectangleToJSONTyped(value?: RasterToDatasetQueryRectangle | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/RasterQueryRectangle.js b/typescript/dist/models/RasterToDatasetQueryRectangle.js similarity index 52% rename from typescript/dist/models/RasterQueryRectangle.js rename to typescript/dist/models/RasterToDatasetQueryRectangle.js index 42c3c453..8e6c4aca 100644 --- a/typescript/dist/models/RasterQueryRectangle.js +++ b/typescript/dist/models/RasterToDatasetQueryRectangle.js @@ -13,49 +13,44 @@ * Do not edit the class manually. */ Object.defineProperty(exports, "__esModule", { value: true }); -exports.instanceOfRasterQueryRectangle = instanceOfRasterQueryRectangle; -exports.RasterQueryRectangleFromJSON = RasterQueryRectangleFromJSON; -exports.RasterQueryRectangleFromJSONTyped = RasterQueryRectangleFromJSONTyped; -exports.RasterQueryRectangleToJSON = RasterQueryRectangleToJSON; -exports.RasterQueryRectangleToJSONTyped = RasterQueryRectangleToJSONTyped; -const SpatialResolution_1 = require("./SpatialResolution"); +exports.instanceOfRasterToDatasetQueryRectangle = instanceOfRasterToDatasetQueryRectangle; +exports.RasterToDatasetQueryRectangleFromJSON = RasterToDatasetQueryRectangleFromJSON; +exports.RasterToDatasetQueryRectangleFromJSONTyped = RasterToDatasetQueryRectangleFromJSONTyped; +exports.RasterToDatasetQueryRectangleToJSON = RasterToDatasetQueryRectangleToJSON; +exports.RasterToDatasetQueryRectangleToJSONTyped = RasterToDatasetQueryRectangleToJSONTyped; const TimeInterval_1 = require("./TimeInterval"); const SpatialPartition2D_1 = require("./SpatialPartition2D"); /** - * Check if a given object implements the RasterQueryRectangle interface. + * Check if a given object implements the RasterToDatasetQueryRectangle interface. */ -function instanceOfRasterQueryRectangle(value) { +function instanceOfRasterToDatasetQueryRectangle(value) { if (!('spatialBounds' in value) || value['spatialBounds'] === undefined) return false; - if (!('spatialResolution' in value) || value['spatialResolution'] === undefined) - return false; if (!('timeInterval' in value) || value['timeInterval'] === undefined) return false; return true; } -function RasterQueryRectangleFromJSON(json) { - return RasterQueryRectangleFromJSONTyped(json, false); +function RasterToDatasetQueryRectangleFromJSON(json) { + return RasterToDatasetQueryRectangleFromJSONTyped(json, false); } -function RasterQueryRectangleFromJSONTyped(json, ignoreDiscriminator) { +function RasterToDatasetQueryRectangleFromJSONTyped(json, ignoreDiscriminator) { if (json == null) { return json; } return { 'spatialBounds': (0, SpatialPartition2D_1.SpatialPartition2DFromJSON)(json['spatialBounds']), - 'spatialResolution': (0, SpatialResolution_1.SpatialResolutionFromJSON)(json['spatialResolution']), 'timeInterval': (0, TimeInterval_1.TimeIntervalFromJSON)(json['timeInterval']), }; } -function RasterQueryRectangleToJSON(json) { - return RasterQueryRectangleToJSONTyped(json, false); +function RasterToDatasetQueryRectangleToJSON(json) { + return RasterToDatasetQueryRectangleToJSONTyped(json, false); } -function RasterQueryRectangleToJSONTyped(value, ignoreDiscriminator = false) { +function RasterToDatasetQueryRectangleToJSONTyped(value, ignoreDiscriminator = false) { if (value == null) { return value; } return { 'spatialBounds': (0, SpatialPartition2D_1.SpatialPartition2DToJSON)(value['spatialBounds']), - 'spatialResolution': (0, SpatialResolution_1.SpatialResolutionToJSON)(value['spatialResolution']), 'timeInterval': (0, TimeInterval_1.TimeIntervalToJSON)(value['timeInterval']), }; } diff --git a/typescript/dist/models/SpatialGridDefinition.d.ts b/typescript/dist/models/SpatialGridDefinition.d.ts new file mode 100644 index 00000000..aeb8cd0b --- /dev/null +++ b/typescript/dist/models/SpatialGridDefinition.d.ts @@ -0,0 +1,40 @@ +/** + * 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 { GridBoundingBox2D } from './GridBoundingBox2D'; +import type { GeoTransform } from './GeoTransform'; +/** + * + * @export + * @interface SpatialGridDefinition + */ +export interface SpatialGridDefinition { + /** + * + * @type {GeoTransform} + * @memberof SpatialGridDefinition + */ + geoTransform: GeoTransform; + /** + * + * @type {GridBoundingBox2D} + * @memberof SpatialGridDefinition + */ + gridBounds: GridBoundingBox2D; +} +/** + * Check if a given object implements the SpatialGridDefinition interface. + */ +export declare function instanceOfSpatialGridDefinition(value: object): value is SpatialGridDefinition; +export declare function SpatialGridDefinitionFromJSON(json: any): SpatialGridDefinition; +export declare function SpatialGridDefinitionFromJSONTyped(json: any, ignoreDiscriminator: boolean): SpatialGridDefinition; +export declare function SpatialGridDefinitionToJSON(json: any): SpatialGridDefinition; +export declare function SpatialGridDefinitionToJSONTyped(value?: SpatialGridDefinition | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/SpatialGridDefinition.js b/typescript/dist/models/SpatialGridDefinition.js new file mode 100644 index 00000000..7d9400c7 --- /dev/null +++ b/typescript/dist/models/SpatialGridDefinition.js @@ -0,0 +1,56 @@ +"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.instanceOfSpatialGridDefinition = instanceOfSpatialGridDefinition; +exports.SpatialGridDefinitionFromJSON = SpatialGridDefinitionFromJSON; +exports.SpatialGridDefinitionFromJSONTyped = SpatialGridDefinitionFromJSONTyped; +exports.SpatialGridDefinitionToJSON = SpatialGridDefinitionToJSON; +exports.SpatialGridDefinitionToJSONTyped = SpatialGridDefinitionToJSONTyped; +const GridBoundingBox2D_1 = require("./GridBoundingBox2D"); +const GeoTransform_1 = require("./GeoTransform"); +/** + * Check if a given object implements the SpatialGridDefinition interface. + */ +function instanceOfSpatialGridDefinition(value) { + if (!('geoTransform' in value) || value['geoTransform'] === undefined) + return false; + if (!('gridBounds' in value) || value['gridBounds'] === undefined) + return false; + return true; +} +function SpatialGridDefinitionFromJSON(json) { + return SpatialGridDefinitionFromJSONTyped(json, false); +} +function SpatialGridDefinitionFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'geoTransform': (0, GeoTransform_1.GeoTransformFromJSON)(json['geoTransform']), + 'gridBounds': (0, GridBoundingBox2D_1.GridBoundingBox2DFromJSON)(json['gridBounds']), + }; +} +function SpatialGridDefinitionToJSON(json) { + return SpatialGridDefinitionToJSONTyped(json, false); +} +function SpatialGridDefinitionToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'geoTransform': (0, GeoTransform_1.GeoTransformToJSON)(value['geoTransform']), + 'gridBounds': (0, GridBoundingBox2D_1.GridBoundingBox2DToJSON)(value['gridBounds']), + }; +} diff --git a/typescript/dist/models/SpatialGridDescriptor.d.ts b/typescript/dist/models/SpatialGridDescriptor.d.ts new file mode 100644 index 00000000..8af1744e --- /dev/null +++ b/typescript/dist/models/SpatialGridDescriptor.d.ts @@ -0,0 +1,40 @@ +/** + * 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 { SpatialGridDefinition } from './SpatialGridDefinition'; +import type { SpatialGridDescriptorState } from './SpatialGridDescriptorState'; +/** + * + * @export + * @interface SpatialGridDescriptor + */ +export interface SpatialGridDescriptor { + /** + * + * @type {SpatialGridDescriptorState} + * @memberof SpatialGridDescriptor + */ + descriptor: SpatialGridDescriptorState; + /** + * + * @type {SpatialGridDefinition} + * @memberof SpatialGridDescriptor + */ + spatialGrid: SpatialGridDefinition; +} +/** + * Check if a given object implements the SpatialGridDescriptor interface. + */ +export declare function instanceOfSpatialGridDescriptor(value: object): value is SpatialGridDescriptor; +export declare function SpatialGridDescriptorFromJSON(json: any): SpatialGridDescriptor; +export declare function SpatialGridDescriptorFromJSONTyped(json: any, ignoreDiscriminator: boolean): SpatialGridDescriptor; +export declare function SpatialGridDescriptorToJSON(json: any): SpatialGridDescriptor; +export declare function SpatialGridDescriptorToJSONTyped(value?: SpatialGridDescriptor | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/SpatialGridDescriptor.js b/typescript/dist/models/SpatialGridDescriptor.js new file mode 100644 index 00000000..c6511d9b --- /dev/null +++ b/typescript/dist/models/SpatialGridDescriptor.js @@ -0,0 +1,56 @@ +"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.instanceOfSpatialGridDescriptor = instanceOfSpatialGridDescriptor; +exports.SpatialGridDescriptorFromJSON = SpatialGridDescriptorFromJSON; +exports.SpatialGridDescriptorFromJSONTyped = SpatialGridDescriptorFromJSONTyped; +exports.SpatialGridDescriptorToJSON = SpatialGridDescriptorToJSON; +exports.SpatialGridDescriptorToJSONTyped = SpatialGridDescriptorToJSONTyped; +const SpatialGridDefinition_1 = require("./SpatialGridDefinition"); +const SpatialGridDescriptorState_1 = require("./SpatialGridDescriptorState"); +/** + * Check if a given object implements the SpatialGridDescriptor interface. + */ +function instanceOfSpatialGridDescriptor(value) { + if (!('descriptor' in value) || value['descriptor'] === undefined) + return false; + if (!('spatialGrid' in value) || value['spatialGrid'] === undefined) + return false; + return true; +} +function SpatialGridDescriptorFromJSON(json) { + return SpatialGridDescriptorFromJSONTyped(json, false); +} +function SpatialGridDescriptorFromJSONTyped(json, ignoreDiscriminator) { + if (json == null) { + return json; + } + return { + 'descriptor': (0, SpatialGridDescriptorState_1.SpatialGridDescriptorStateFromJSON)(json['descriptor']), + 'spatialGrid': (0, SpatialGridDefinition_1.SpatialGridDefinitionFromJSON)(json['spatialGrid']), + }; +} +function SpatialGridDescriptorToJSON(json) { + return SpatialGridDescriptorToJSONTyped(json, false); +} +function SpatialGridDescriptorToJSONTyped(value, ignoreDiscriminator = false) { + if (value == null) { + return value; + } + return { + 'descriptor': (0, SpatialGridDescriptorState_1.SpatialGridDescriptorStateToJSON)(value['descriptor']), + 'spatialGrid': (0, SpatialGridDefinition_1.SpatialGridDefinitionToJSON)(value['spatialGrid']), + }; +} diff --git a/typescript/dist/models/SpatialGridDescriptorState.d.ts b/typescript/dist/models/SpatialGridDescriptorState.d.ts new file mode 100644 index 00000000..c1fd411e --- /dev/null +++ b/typescript/dist/models/SpatialGridDescriptorState.d.ts @@ -0,0 +1,25 @@ +/** + * 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 declare const SpatialGridDescriptorState: { + readonly Source: "source"; + readonly Derived: "derived"; +}; +export type SpatialGridDescriptorState = typeof SpatialGridDescriptorState[keyof typeof SpatialGridDescriptorState]; +export declare function instanceOfSpatialGridDescriptorState(value: any): boolean; +export declare function SpatialGridDescriptorStateFromJSON(json: any): SpatialGridDescriptorState; +export declare function SpatialGridDescriptorStateFromJSONTyped(json: any, ignoreDiscriminator: boolean): SpatialGridDescriptorState; +export declare function SpatialGridDescriptorStateToJSON(value?: SpatialGridDescriptorState | null): any; +export declare function SpatialGridDescriptorStateToJSONTyped(value: any, ignoreDiscriminator: boolean): SpatialGridDescriptorState; diff --git a/typescript/dist/models/SpatialGridDescriptorState.js b/typescript/dist/models/SpatialGridDescriptorState.js new file mode 100644 index 00000000..e3ebb2f3 --- /dev/null +++ b/typescript/dist/models/SpatialGridDescriptorState.js @@ -0,0 +1,51 @@ +"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.SpatialGridDescriptorState = void 0; +exports.instanceOfSpatialGridDescriptorState = instanceOfSpatialGridDescriptorState; +exports.SpatialGridDescriptorStateFromJSON = SpatialGridDescriptorStateFromJSON; +exports.SpatialGridDescriptorStateFromJSONTyped = SpatialGridDescriptorStateFromJSONTyped; +exports.SpatialGridDescriptorStateToJSON = SpatialGridDescriptorStateToJSON; +exports.SpatialGridDescriptorStateToJSONTyped = SpatialGridDescriptorStateToJSONTyped; +/** + * + * @export + */ +exports.SpatialGridDescriptorState = { + Source: 'source', + Derived: 'derived' +}; +function instanceOfSpatialGridDescriptorState(value) { + for (const key in exports.SpatialGridDescriptorState) { + if (Object.prototype.hasOwnProperty.call(exports.SpatialGridDescriptorState, key)) { + if (exports.SpatialGridDescriptorState[key] === value) { + return true; + } + } + } + return false; +} +function SpatialGridDescriptorStateFromJSON(json) { + return SpatialGridDescriptorStateFromJSONTyped(json, false); +} +function SpatialGridDescriptorStateFromJSONTyped(json, ignoreDiscriminator) { + return json; +} +function SpatialGridDescriptorStateToJSON(value) { + return value; +} +function SpatialGridDescriptorStateToJSONTyped(value, ignoreDiscriminator) { + return value; +} diff --git a/typescript/dist/models/VectorQueryRectangle.d.ts b/typescript/dist/models/VectorQueryRectangle.d.ts deleted file mode 100644 index 6b878b63..00000000 --- a/typescript/dist/models/VectorQueryRectangle.d.ts +++ /dev/null @@ -1,47 +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 { SpatialResolution } from './SpatialResolution'; -import type { TimeInterval } from './TimeInterval'; -import type { BoundingBox2D } from './BoundingBox2D'; -/** - * A spatio-temporal rectangle with a specified resolution - * @export - * @interface VectorQueryRectangle - */ -export interface VectorQueryRectangle { - /** - * - * @type {BoundingBox2D} - * @memberof VectorQueryRectangle - */ - spatialBounds: BoundingBox2D; - /** - * - * @type {SpatialResolution} - * @memberof VectorQueryRectangle - */ - spatialResolution: SpatialResolution; - /** - * - * @type {TimeInterval} - * @memberof VectorQueryRectangle - */ - timeInterval: TimeInterval; -} -/** - * Check if a given object implements the VectorQueryRectangle interface. - */ -export declare function instanceOfVectorQueryRectangle(value: object): value is VectorQueryRectangle; -export declare function VectorQueryRectangleFromJSON(json: any): VectorQueryRectangle; -export declare function VectorQueryRectangleFromJSONTyped(json: any, ignoreDiscriminator: boolean): VectorQueryRectangle; -export declare function VectorQueryRectangleToJSON(json: any): VectorQueryRectangle; -export declare function VectorQueryRectangleToJSONTyped(value?: VectorQueryRectangle | null, ignoreDiscriminator?: boolean): any; diff --git a/typescript/dist/models/VectorQueryRectangle.js b/typescript/dist/models/VectorQueryRectangle.js deleted file mode 100644 index 9d2f700e..00000000 --- a/typescript/dist/models/VectorQueryRectangle.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.instanceOfVectorQueryRectangle = instanceOfVectorQueryRectangle; -exports.VectorQueryRectangleFromJSON = VectorQueryRectangleFromJSON; -exports.VectorQueryRectangleFromJSONTyped = VectorQueryRectangleFromJSONTyped; -exports.VectorQueryRectangleToJSON = VectorQueryRectangleToJSON; -exports.VectorQueryRectangleToJSONTyped = VectorQueryRectangleToJSONTyped; -const SpatialResolution_1 = require("./SpatialResolution"); -const TimeInterval_1 = require("./TimeInterval"); -const BoundingBox2D_1 = require("./BoundingBox2D"); -/** - * Check if a given object implements the VectorQueryRectangle interface. - */ -function instanceOfVectorQueryRectangle(value) { - if (!('spatialBounds' in value) || value['spatialBounds'] === undefined) - return false; - if (!('spatialResolution' in value) || value['spatialResolution'] === undefined) - return false; - if (!('timeInterval' in value) || value['timeInterval'] === undefined) - return false; - return true; -} -function VectorQueryRectangleFromJSON(json) { - return VectorQueryRectangleFromJSONTyped(json, false); -} -function VectorQueryRectangleFromJSONTyped(json, ignoreDiscriminator) { - if (json == null) { - return json; - } - return { - 'spatialBounds': (0, BoundingBox2D_1.BoundingBox2DFromJSON)(json['spatialBounds']), - 'spatialResolution': (0, SpatialResolution_1.SpatialResolutionFromJSON)(json['spatialResolution']), - 'timeInterval': (0, TimeInterval_1.TimeIntervalFromJSON)(json['timeInterval']), - }; -} -function VectorQueryRectangleToJSON(json) { - return VectorQueryRectangleToJSONTyped(json, false); -} -function VectorQueryRectangleToJSONTyped(value, ignoreDiscriminator = false) { - if (value == null) { - return value; - } - return { - 'spatialBounds': (0, BoundingBox2D_1.BoundingBox2DToJSON)(value['spatialBounds']), - 'spatialResolution': (0, SpatialResolution_1.SpatialResolutionToJSON)(value['spatialResolution']), - 'timeInterval': (0, TimeInterval_1.TimeIntervalToJSON)(value['timeInterval']), - }; -} diff --git a/typescript/dist/models/index.d.ts b/typescript/dist/models/index.d.ts index 636d9880..d9a84229 100644 --- a/typescript/dist/models/index.d.ts +++ b/typescript/dist/models/index.d.ts @@ -50,6 +50,7 @@ export * from './GdalMetadataMapping'; export * from './GdalMetadataNetCdfCf'; export * from './GdalSourceTimePlaceholder'; export * from './GeoJson'; +export * from './GeoTransform'; export * from './GetCapabilitiesFormat'; export * from './GetCapabilitiesRequest'; export * from './GetCoverageFormat'; @@ -59,6 +60,8 @@ export * from './GetLegendGraphicRequest'; export * from './GetMapExceptionFormat'; export * from './GetMapFormat'; export * from './GetMapRequest'; +export * from './GridBoundingBox2D'; +export * from './GridIdx2D'; export * from './IdResponse'; export * from './InternalDataId'; export * from './Layer'; @@ -111,7 +114,6 @@ export * from './PermissionListing'; export * from './PermissionRequest'; export * from './Plot'; export * from './PlotOutputFormat'; -export * from './PlotQueryRectangle'; export * from './PlotResultDescriptor'; export * from './PointSymbology'; export * from './PolygonSymbology'; @@ -136,10 +138,10 @@ export * from './RasterDatasetFromWorkflow'; export * from './RasterDatasetFromWorkflowResult'; export * from './RasterPropertiesEntryType'; export * from './RasterPropertiesKey'; -export * from './RasterQueryRectangle'; export * from './RasterResultDescriptor'; export * from './RasterStreamWebsocketResultType'; export * from './RasterSymbology'; +export * from './RasterToDatasetQueryRectangle'; export * from './Resource'; export * from './Role'; export * from './RoleDescription'; @@ -149,6 +151,9 @@ export * from './SearchType'; export * from './SearchTypes'; export * from './ServerInfo'; export * from './SingleBandRasterColorizer'; +export * from './SpatialGridDefinition'; +export * from './SpatialGridDescriptor'; +export * from './SpatialGridDescriptorState'; export * from './SpatialPartition2D'; export * from './SpatialReferenceAuthority'; export * from './SpatialReferenceSpecification'; @@ -201,7 +206,6 @@ export * from './UserSession'; export * from './VecUpdate'; export * from './VectorColumnInfo'; export * from './VectorDataType'; -export * from './VectorQueryRectangle'; export * from './VectorResultDescriptor'; export * from './Volume'; export * from './VolumeFileLayersResponse'; diff --git a/typescript/dist/models/index.js b/typescript/dist/models/index.js index b17b6c8d..1d200f50 100644 --- a/typescript/dist/models/index.js +++ b/typescript/dist/models/index.js @@ -68,6 +68,7 @@ __exportStar(require("./GdalMetadataMapping"), exports); __exportStar(require("./GdalMetadataNetCdfCf"), exports); __exportStar(require("./GdalSourceTimePlaceholder"), exports); __exportStar(require("./GeoJson"), exports); +__exportStar(require("./GeoTransform"), exports); __exportStar(require("./GetCapabilitiesFormat"), exports); __exportStar(require("./GetCapabilitiesRequest"), exports); __exportStar(require("./GetCoverageFormat"), exports); @@ -77,6 +78,8 @@ __exportStar(require("./GetLegendGraphicRequest"), exports); __exportStar(require("./GetMapExceptionFormat"), exports); __exportStar(require("./GetMapFormat"), exports); __exportStar(require("./GetMapRequest"), exports); +__exportStar(require("./GridBoundingBox2D"), exports); +__exportStar(require("./GridIdx2D"), exports); __exportStar(require("./IdResponse"), exports); __exportStar(require("./InternalDataId"), exports); __exportStar(require("./Layer"), exports); @@ -129,7 +132,6 @@ __exportStar(require("./PermissionListing"), exports); __exportStar(require("./PermissionRequest"), exports); __exportStar(require("./Plot"), exports); __exportStar(require("./PlotOutputFormat"), exports); -__exportStar(require("./PlotQueryRectangle"), exports); __exportStar(require("./PlotResultDescriptor"), exports); __exportStar(require("./PointSymbology"), exports); __exportStar(require("./PolygonSymbology"), exports); @@ -154,10 +156,10 @@ __exportStar(require("./RasterDatasetFromWorkflow"), exports); __exportStar(require("./RasterDatasetFromWorkflowResult"), exports); __exportStar(require("./RasterPropertiesEntryType"), exports); __exportStar(require("./RasterPropertiesKey"), exports); -__exportStar(require("./RasterQueryRectangle"), exports); __exportStar(require("./RasterResultDescriptor"), exports); __exportStar(require("./RasterStreamWebsocketResultType"), exports); __exportStar(require("./RasterSymbology"), exports); +__exportStar(require("./RasterToDatasetQueryRectangle"), exports); __exportStar(require("./Resource"), exports); __exportStar(require("./Role"), exports); __exportStar(require("./RoleDescription"), exports); @@ -167,6 +169,9 @@ __exportStar(require("./SearchType"), exports); __exportStar(require("./SearchTypes"), exports); __exportStar(require("./ServerInfo"), exports); __exportStar(require("./SingleBandRasterColorizer"), exports); +__exportStar(require("./SpatialGridDefinition"), exports); +__exportStar(require("./SpatialGridDescriptor"), exports); +__exportStar(require("./SpatialGridDescriptorState"), exports); __exportStar(require("./SpatialPartition2D"), exports); __exportStar(require("./SpatialReferenceAuthority"), exports); __exportStar(require("./SpatialReferenceSpecification"), exports); @@ -219,7 +224,6 @@ __exportStar(require("./UserSession"), exports); __exportStar(require("./VecUpdate"), exports); __exportStar(require("./VectorColumnInfo"), exports); __exportStar(require("./VectorDataType"), exports); -__exportStar(require("./VectorQueryRectangle"), exports); __exportStar(require("./VectorResultDescriptor"), exports); __exportStar(require("./Volume"), exports); __exportStar(require("./VolumeFileLayersResponse"), exports); diff --git a/typescript/src/apis/WorkflowsApi.ts b/typescript/src/apis/WorkflowsApi.ts index beaf9649..f6c2a5f3 100644 --- a/typescript/src/apis/WorkflowsApi.ts +++ b/typescript/src/apis/WorkflowsApi.ts @@ -20,7 +20,6 @@ import type { RasterDatasetFromWorkflow, RasterStreamWebsocketResultType, SpatialPartition2D, - SpatialResolution, TaskResponse, TypedResultDescriptor, Workflow, @@ -36,8 +35,6 @@ import { RasterStreamWebsocketResultTypeToJSON, SpatialPartition2DFromJSON, SpatialPartition2DToJSON, - SpatialResolutionFromJSON, - SpatialResolutionToJSON, TaskResponseFromJSON, TaskResponseToJSON, TypedResultDescriptorFromJSON, @@ -71,7 +68,6 @@ export interface RasterStreamWebsocketRequest { id: string; spatialBounds: SpatialPartition2D; timeInterval: string; - spatialResolution: SpatialResolution; attributes: string; resultType: RasterStreamWebsocketResultType; } @@ -325,13 +321,6 @@ export class WorkflowsApi extends runtime.BaseAPI { ); } - if (requestParameters['spatialResolution'] == null) { - throw new runtime.RequiredError( - 'spatialResolution', - 'Required parameter "spatialResolution" was null or undefined when calling rasterStreamWebsocket().' - ); - } - if (requestParameters['attributes'] == null) { throw new runtime.RequiredError( 'attributes', @@ -356,10 +345,6 @@ export class WorkflowsApi extends runtime.BaseAPI { queryParameters['timeInterval'] = requestParameters['timeInterval']; } - if (requestParameters['spatialResolution'] != null) { - queryParameters['spatialResolution'] = requestParameters['spatialResolution']; - } - if (requestParameters['attributes'] != null) { queryParameters['attributes'] = requestParameters['attributes']; } diff --git a/typescript/src/models/GeoTransform.ts b/typescript/src/models/GeoTransform.ts new file mode 100644 index 00000000..dbe05c61 --- /dev/null +++ b/typescript/src/models/GeoTransform.ts @@ -0,0 +1,92 @@ +/* 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'; +import type { Coordinate2D } from './Coordinate2D'; +import { + Coordinate2DFromJSON, + Coordinate2DFromJSONTyped, + Coordinate2DToJSON, + Coordinate2DToJSONTyped, +} from './Coordinate2D'; + +/** + * + * @export + * @interface GeoTransform + */ +export interface GeoTransform { + /** + * + * @type {Coordinate2D} + * @memberof GeoTransform + */ + originCoordinate: Coordinate2D; + /** + * + * @type {number} + * @memberof GeoTransform + */ + xPixelSize: number; + /** + * + * @type {number} + * @memberof GeoTransform + */ + yPixelSize: number; +} + +/** + * Check if a given object implements the GeoTransform interface. + */ +export function instanceOfGeoTransform(value: object): value is GeoTransform { + if (!('originCoordinate' in value) || value['originCoordinate'] === undefined) return false; + if (!('xPixelSize' in value) || value['xPixelSize'] === undefined) return false; + if (!('yPixelSize' in value) || value['yPixelSize'] === undefined) return false; + return true; +} + +export function GeoTransformFromJSON(json: any): GeoTransform { + return GeoTransformFromJSONTyped(json, false); +} + +export function GeoTransformFromJSONTyped(json: any, ignoreDiscriminator: boolean): GeoTransform { + if (json == null) { + return json; + } + return { + + 'originCoordinate': Coordinate2DFromJSON(json['originCoordinate']), + 'xPixelSize': json['xPixelSize'], + 'yPixelSize': json['yPixelSize'], + }; +} + +export function GeoTransformToJSON(json: any): GeoTransform { + return GeoTransformToJSONTyped(json, false); +} + +export function GeoTransformToJSONTyped(value?: GeoTransform | null, ignoreDiscriminator: boolean = false): any { + if (value == null) { + return value; + } + + return { + + 'originCoordinate': Coordinate2DToJSON(value['originCoordinate']), + 'xPixelSize': value['xPixelSize'], + 'yPixelSize': value['yPixelSize'], + }; +} + diff --git a/typescript/src/models/GridBoundingBox2D.ts b/typescript/src/models/GridBoundingBox2D.ts new file mode 100644 index 00000000..5fa6eec4 --- /dev/null +++ b/typescript/src/models/GridBoundingBox2D.ts @@ -0,0 +1,83 @@ +/* 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'; +import type { GridIdx2D } from './GridIdx2D'; +import { + GridIdx2DFromJSON, + GridIdx2DFromJSONTyped, + GridIdx2DToJSON, + GridIdx2DToJSONTyped, +} from './GridIdx2D'; + +/** + * + * @export + * @interface GridBoundingBox2D + */ +export interface GridBoundingBox2D { + /** + * + * @type {GridIdx2D} + * @memberof GridBoundingBox2D + */ + bottomRightIdx: GridIdx2D; + /** + * + * @type {GridIdx2D} + * @memberof GridBoundingBox2D + */ + topLeftIdx: GridIdx2D; +} + +/** + * Check if a given object implements the GridBoundingBox2D interface. + */ +export function instanceOfGridBoundingBox2D(value: object): value is GridBoundingBox2D { + if (!('bottomRightIdx' in value) || value['bottomRightIdx'] === undefined) return false; + if (!('topLeftIdx' in value) || value['topLeftIdx'] === undefined) return false; + return true; +} + +export function GridBoundingBox2DFromJSON(json: any): GridBoundingBox2D { + return GridBoundingBox2DFromJSONTyped(json, false); +} + +export function GridBoundingBox2DFromJSONTyped(json: any, ignoreDiscriminator: boolean): GridBoundingBox2D { + if (json == null) { + return json; + } + return { + + 'bottomRightIdx': GridIdx2DFromJSON(json['bottomRightIdx']), + 'topLeftIdx': GridIdx2DFromJSON(json['topLeftIdx']), + }; +} + +export function GridBoundingBox2DToJSON(json: any): GridBoundingBox2D { + return GridBoundingBox2DToJSONTyped(json, false); +} + +export function GridBoundingBox2DToJSONTyped(value?: GridBoundingBox2D | null, ignoreDiscriminator: boolean = false): any { + if (value == null) { + return value; + } + + return { + + 'bottomRightIdx': GridIdx2DToJSON(value['bottomRightIdx']), + 'topLeftIdx': GridIdx2DToJSON(value['topLeftIdx']), + }; +} + diff --git a/typescript/src/models/GridIdx2D.ts b/typescript/src/models/GridIdx2D.ts new file mode 100644 index 00000000..3a8ef319 --- /dev/null +++ b/typescript/src/models/GridIdx2D.ts @@ -0,0 +1,75 @@ +/* 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 GridIdx2D + */ +export interface GridIdx2D { + /** + * + * @type {number} + * @memberof GridIdx2D + */ + xIdx: number; + /** + * + * @type {number} + * @memberof GridIdx2D + */ + yIdx: number; +} + +/** + * Check if a given object implements the GridIdx2D interface. + */ +export function instanceOfGridIdx2D(value: object): value is GridIdx2D { + if (!('xIdx' in value) || value['xIdx'] === undefined) return false; + if (!('yIdx' in value) || value['yIdx'] === undefined) return false; + return true; +} + +export function GridIdx2DFromJSON(json: any): GridIdx2D { + return GridIdx2DFromJSONTyped(json, false); +} + +export function GridIdx2DFromJSONTyped(json: any, ignoreDiscriminator: boolean): GridIdx2D { + if (json == null) { + return json; + } + return { + + 'xIdx': json['xIdx'], + 'yIdx': json['yIdx'], + }; +} + +export function GridIdx2DToJSON(json: any): GridIdx2D { + return GridIdx2DToJSONTyped(json, false); +} + +export function GridIdx2DToJSONTyped(value?: GridIdx2D | null, ignoreDiscriminator: boolean = false): any { + if (value == null) { + return value; + } + + return { + + 'xIdx': value['xIdx'], + 'yIdx': value['yIdx'], + }; +} + diff --git a/typescript/src/models/PlotQueryRectangle.ts b/typescript/src/models/PlotQueryRectangle.ts deleted file mode 100644 index 1802eb96..00000000 --- a/typescript/src/models/PlotQueryRectangle.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 { mapValues } from '../runtime'; -import type { SpatialResolution } from './SpatialResolution'; -import { - SpatialResolutionFromJSON, - SpatialResolutionFromJSONTyped, - SpatialResolutionToJSON, - SpatialResolutionToJSONTyped, -} from './SpatialResolution'; -import type { TimeInterval } from './TimeInterval'; -import { - TimeIntervalFromJSON, - TimeIntervalFromJSONTyped, - TimeIntervalToJSON, - TimeIntervalToJSONTyped, -} from './TimeInterval'; -import type { BoundingBox2D } from './BoundingBox2D'; -import { - BoundingBox2DFromJSON, - BoundingBox2DFromJSONTyped, - BoundingBox2DToJSON, - BoundingBox2DToJSONTyped, -} from './BoundingBox2D'; - -/** - * A spatio-temporal rectangle with a specified resolution - * @export - * @interface PlotQueryRectangle - */ -export interface PlotQueryRectangle { - /** - * - * @type {BoundingBox2D} - * @memberof PlotQueryRectangle - */ - spatialBounds: BoundingBox2D; - /** - * - * @type {SpatialResolution} - * @memberof PlotQueryRectangle - */ - spatialResolution: SpatialResolution; - /** - * - * @type {TimeInterval} - * @memberof PlotQueryRectangle - */ - timeInterval: TimeInterval; -} - -/** - * Check if a given object implements the PlotQueryRectangle interface. - */ -export function instanceOfPlotQueryRectangle(value: object): value is PlotQueryRectangle { - if (!('spatialBounds' in value) || value['spatialBounds'] === undefined) return false; - if (!('spatialResolution' in value) || value['spatialResolution'] === undefined) return false; - if (!('timeInterval' in value) || value['timeInterval'] === undefined) return false; - return true; -} - -export function PlotQueryRectangleFromJSON(json: any): PlotQueryRectangle { - return PlotQueryRectangleFromJSONTyped(json, false); -} - -export function PlotQueryRectangleFromJSONTyped(json: any, ignoreDiscriminator: boolean): PlotQueryRectangle { - if (json == null) { - return json; - } - return { - - 'spatialBounds': BoundingBox2DFromJSON(json['spatialBounds']), - 'spatialResolution': SpatialResolutionFromJSON(json['spatialResolution']), - 'timeInterval': TimeIntervalFromJSON(json['timeInterval']), - }; -} - -export function PlotQueryRectangleToJSON(json: any): PlotQueryRectangle { - return PlotQueryRectangleToJSONTyped(json, false); -} - -export function PlotQueryRectangleToJSONTyped(value?: PlotQueryRectangle | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - - return { - - 'spatialBounds': BoundingBox2DToJSON(value['spatialBounds']), - 'spatialResolution': SpatialResolutionToJSON(value['spatialResolution']), - 'timeInterval': TimeIntervalToJSON(value['timeInterval']), - }; -} - diff --git a/typescript/src/models/RasterDatasetFromWorkflow.ts b/typescript/src/models/RasterDatasetFromWorkflow.ts index 7476e10c..6ec5eb50 100644 --- a/typescript/src/models/RasterDatasetFromWorkflow.ts +++ b/typescript/src/models/RasterDatasetFromWorkflow.ts @@ -13,13 +13,13 @@ */ import { mapValues } from '../runtime'; -import type { RasterQueryRectangle } from './RasterQueryRectangle'; +import type { RasterToDatasetQueryRectangle } from './RasterToDatasetQueryRectangle'; import { - RasterQueryRectangleFromJSON, - RasterQueryRectangleFromJSONTyped, - RasterQueryRectangleToJSON, - RasterQueryRectangleToJSONTyped, -} from './RasterQueryRectangle'; + RasterToDatasetQueryRectangleFromJSON, + RasterToDatasetQueryRectangleFromJSONTyped, + RasterToDatasetQueryRectangleToJSON, + RasterToDatasetQueryRectangleToJSONTyped, +} from './RasterToDatasetQueryRectangle'; /** * parameter for the dataset from workflow handler (body) @@ -53,10 +53,10 @@ export interface RasterDatasetFromWorkflow { name?: string; /** * - * @type {RasterQueryRectangle} + * @type {RasterToDatasetQueryRectangle} * @memberof RasterDatasetFromWorkflow */ - query: RasterQueryRectangle; + query: RasterToDatasetQueryRectangle; } /** @@ -82,7 +82,7 @@ export function RasterDatasetFromWorkflowFromJSONTyped(json: any, ignoreDiscrimi 'description': json['description'] == null ? undefined : json['description'], 'displayName': json['displayName'], 'name': json['name'] == null ? undefined : json['name'], - 'query': RasterQueryRectangleFromJSON(json['query']), + 'query': RasterToDatasetQueryRectangleFromJSON(json['query']), }; } @@ -101,7 +101,7 @@ export function RasterDatasetFromWorkflowToJSONTyped(value?: RasterDatasetFromWo 'description': value['description'], 'displayName': value['displayName'], 'name': value['name'], - 'query': RasterQueryRectangleToJSON(value['query']), + 'query': RasterToDatasetQueryRectangleToJSON(value['query']), }; } diff --git a/typescript/src/models/RasterResultDescriptor.ts b/typescript/src/models/RasterResultDescriptor.ts index cae54dd2..22005f8d 100644 --- a/typescript/src/models/RasterResultDescriptor.ts +++ b/typescript/src/models/RasterResultDescriptor.ts @@ -13,13 +13,6 @@ */ import { mapValues } from '../runtime'; -import type { SpatialResolution } from './SpatialResolution'; -import { - SpatialResolutionFromJSON, - SpatialResolutionFromJSONTyped, - SpatialResolutionToJSON, - SpatialResolutionToJSONTyped, -} from './SpatialResolution'; import type { TimeInterval } from './TimeInterval'; import { TimeIntervalFromJSON, @@ -34,6 +27,13 @@ import { RasterBandDescriptorToJSON, RasterBandDescriptorToJSONTyped, } from './RasterBandDescriptor'; +import type { SpatialGridDescriptor } from './SpatialGridDescriptor'; +import { + SpatialGridDescriptorFromJSON, + SpatialGridDescriptorFromJSONTyped, + SpatialGridDescriptorToJSON, + SpatialGridDescriptorToJSONTyped, +} from './SpatialGridDescriptor'; import type { RasterDataType } from './RasterDataType'; import { RasterDataTypeFromJSON, @@ -41,13 +41,6 @@ import { RasterDataTypeToJSON, RasterDataTypeToJSONTyped, } from './RasterDataType'; -import type { SpatialPartition2D } from './SpatialPartition2D'; -import { - SpatialPartition2DFromJSON, - SpatialPartition2DFromJSONTyped, - SpatialPartition2DToJSON, - SpatialPartition2DToJSONTyped, -} from './SpatialPartition2D'; /** * A `ResultDescriptor` for raster queries @@ -61,12 +54,6 @@ export interface RasterResultDescriptor { * @memberof RasterResultDescriptor */ bands: Array; - /** - * - * @type {SpatialPartition2D} - * @memberof RasterResultDescriptor - */ - bbox?: SpatialPartition2D | null; /** * * @type {RasterDataType} @@ -75,10 +62,10 @@ export interface RasterResultDescriptor { dataType: RasterDataType; /** * - * @type {SpatialResolution} + * @type {SpatialGridDescriptor} * @memberof RasterResultDescriptor */ - resolution?: SpatialResolution | null; + spatialGrid: SpatialGridDescriptor; /** * * @type {string} @@ -101,6 +88,7 @@ export interface RasterResultDescriptor { export function instanceOfRasterResultDescriptor(value: object): value is RasterResultDescriptor { if (!('bands' in value) || value['bands'] === undefined) return false; if (!('dataType' in value) || value['dataType'] === undefined) return false; + if (!('spatialGrid' in value) || value['spatialGrid'] === undefined) return false; if (!('spatialReference' in value) || value['spatialReference'] === undefined) return false; return true; } @@ -116,9 +104,8 @@ export function RasterResultDescriptorFromJSONTyped(json: any, ignoreDiscriminat 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']), + 'spatialGrid': SpatialGridDescriptorFromJSON(json['spatialGrid']), 'spatialReference': json['spatialReference'], 'time': json['time'] == null ? undefined : TimeIntervalFromJSON(json['time']), }; @@ -136,9 +123,8 @@ export function RasterResultDescriptorToJSONTyped(value?: RasterResultDescriptor return { 'bands': ((value['bands'] as Array).map(RasterBandDescriptorToJSON)), - 'bbox': SpatialPartition2DToJSON(value['bbox']), 'dataType': RasterDataTypeToJSON(value['dataType']), - 'resolution': SpatialResolutionToJSON(value['resolution']), + 'spatialGrid': SpatialGridDescriptorToJSON(value['spatialGrid']), 'spatialReference': value['spatialReference'], 'time': TimeIntervalToJSON(value['time']), }; diff --git a/typescript/src/models/RasterQueryRectangle.ts b/typescript/src/models/RasterToDatasetQueryRectangle.ts similarity index 55% rename from typescript/src/models/RasterQueryRectangle.ts rename to typescript/src/models/RasterToDatasetQueryRectangle.ts index 39728af0..fabbff69 100644 --- a/typescript/src/models/RasterQueryRectangle.ts +++ b/typescript/src/models/RasterToDatasetQueryRectangle.ts @@ -13,13 +13,6 @@ */ import { mapValues } from '../runtime'; -import type { SpatialResolution } from './SpatialResolution'; -import { - SpatialResolutionFromJSON, - SpatialResolutionFromJSONTyped, - SpatialResolutionToJSON, - SpatialResolutionToJSONTyped, -} from './SpatialResolution'; import type { TimeInterval } from './TimeInterval'; import { TimeIntervalFromJSON, @@ -38,60 +31,52 @@ import { /** * A spatio-temporal rectangle with a specified resolution * @export - * @interface RasterQueryRectangle + * @interface RasterToDatasetQueryRectangle */ -export interface RasterQueryRectangle { +export interface RasterToDatasetQueryRectangle { /** * * @type {SpatialPartition2D} - * @memberof RasterQueryRectangle + * @memberof RasterToDatasetQueryRectangle */ spatialBounds: SpatialPartition2D; - /** - * - * @type {SpatialResolution} - * @memberof RasterQueryRectangle - */ - spatialResolution: SpatialResolution; /** * * @type {TimeInterval} - * @memberof RasterQueryRectangle + * @memberof RasterToDatasetQueryRectangle */ timeInterval: TimeInterval; } /** - * Check if a given object implements the RasterQueryRectangle interface. + * Check if a given object implements the RasterToDatasetQueryRectangle interface. */ -export function instanceOfRasterQueryRectangle(value: object): value is RasterQueryRectangle { +export function instanceOfRasterToDatasetQueryRectangle(value: object): value is RasterToDatasetQueryRectangle { if (!('spatialBounds' in value) || value['spatialBounds'] === undefined) return false; - if (!('spatialResolution' in value) || value['spatialResolution'] === undefined) return false; if (!('timeInterval' in value) || value['timeInterval'] === undefined) return false; return true; } -export function RasterQueryRectangleFromJSON(json: any): RasterQueryRectangle { - return RasterQueryRectangleFromJSONTyped(json, false); +export function RasterToDatasetQueryRectangleFromJSON(json: any): RasterToDatasetQueryRectangle { + return RasterToDatasetQueryRectangleFromJSONTyped(json, false); } -export function RasterQueryRectangleFromJSONTyped(json: any, ignoreDiscriminator: boolean): RasterQueryRectangle { +export function RasterToDatasetQueryRectangleFromJSONTyped(json: any, ignoreDiscriminator: boolean): RasterToDatasetQueryRectangle { if (json == null) { return json; } return { 'spatialBounds': SpatialPartition2DFromJSON(json['spatialBounds']), - 'spatialResolution': SpatialResolutionFromJSON(json['spatialResolution']), 'timeInterval': TimeIntervalFromJSON(json['timeInterval']), }; } -export function RasterQueryRectangleToJSON(json: any): RasterQueryRectangle { - return RasterQueryRectangleToJSONTyped(json, false); +export function RasterToDatasetQueryRectangleToJSON(json: any): RasterToDatasetQueryRectangle { + return RasterToDatasetQueryRectangleToJSONTyped(json, false); } -export function RasterQueryRectangleToJSONTyped(value?: RasterQueryRectangle | null, ignoreDiscriminator: boolean = false): any { +export function RasterToDatasetQueryRectangleToJSONTyped(value?: RasterToDatasetQueryRectangle | null, ignoreDiscriminator: boolean = false): any { if (value == null) { return value; } @@ -99,7 +84,6 @@ export function RasterQueryRectangleToJSONTyped(value?: RasterQueryRectangle | n return { 'spatialBounds': SpatialPartition2DToJSON(value['spatialBounds']), - 'spatialResolution': SpatialResolutionToJSON(value['spatialResolution']), 'timeInterval': TimeIntervalToJSON(value['timeInterval']), }; } diff --git a/typescript/src/models/SpatialGridDefinition.ts b/typescript/src/models/SpatialGridDefinition.ts new file mode 100644 index 00000000..a2ff9ff3 --- /dev/null +++ b/typescript/src/models/SpatialGridDefinition.ts @@ -0,0 +1,90 @@ +/* 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'; +import type { GridBoundingBox2D } from './GridBoundingBox2D'; +import { + GridBoundingBox2DFromJSON, + GridBoundingBox2DFromJSONTyped, + GridBoundingBox2DToJSON, + GridBoundingBox2DToJSONTyped, +} from './GridBoundingBox2D'; +import type { GeoTransform } from './GeoTransform'; +import { + GeoTransformFromJSON, + GeoTransformFromJSONTyped, + GeoTransformToJSON, + GeoTransformToJSONTyped, +} from './GeoTransform'; + +/** + * + * @export + * @interface SpatialGridDefinition + */ +export interface SpatialGridDefinition { + /** + * + * @type {GeoTransform} + * @memberof SpatialGridDefinition + */ + geoTransform: GeoTransform; + /** + * + * @type {GridBoundingBox2D} + * @memberof SpatialGridDefinition + */ + gridBounds: GridBoundingBox2D; +} + +/** + * Check if a given object implements the SpatialGridDefinition interface. + */ +export function instanceOfSpatialGridDefinition(value: object): value is SpatialGridDefinition { + if (!('geoTransform' in value) || value['geoTransform'] === undefined) return false; + if (!('gridBounds' in value) || value['gridBounds'] === undefined) return false; + return true; +} + +export function SpatialGridDefinitionFromJSON(json: any): SpatialGridDefinition { + return SpatialGridDefinitionFromJSONTyped(json, false); +} + +export function SpatialGridDefinitionFromJSONTyped(json: any, ignoreDiscriminator: boolean): SpatialGridDefinition { + if (json == null) { + return json; + } + return { + + 'geoTransform': GeoTransformFromJSON(json['geoTransform']), + 'gridBounds': GridBoundingBox2DFromJSON(json['gridBounds']), + }; +} + +export function SpatialGridDefinitionToJSON(json: any): SpatialGridDefinition { + return SpatialGridDefinitionToJSONTyped(json, false); +} + +export function SpatialGridDefinitionToJSONTyped(value?: SpatialGridDefinition | null, ignoreDiscriminator: boolean = false): any { + if (value == null) { + return value; + } + + return { + + 'geoTransform': GeoTransformToJSON(value['geoTransform']), + 'gridBounds': GridBoundingBox2DToJSON(value['gridBounds']), + }; +} + diff --git a/typescript/src/models/SpatialGridDescriptor.ts b/typescript/src/models/SpatialGridDescriptor.ts new file mode 100644 index 00000000..b7de510b --- /dev/null +++ b/typescript/src/models/SpatialGridDescriptor.ts @@ -0,0 +1,92 @@ +/* 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'; +import type { SpatialGridDefinition } from './SpatialGridDefinition'; +import { + SpatialGridDefinitionFromJSON, + SpatialGridDefinitionFromJSONTyped, + SpatialGridDefinitionToJSON, + SpatialGridDefinitionToJSONTyped, +} from './SpatialGridDefinition'; +import type { SpatialGridDescriptorState } from './SpatialGridDescriptorState'; +import { + SpatialGridDescriptorStateFromJSON, + SpatialGridDescriptorStateFromJSONTyped, + SpatialGridDescriptorStateToJSON, + SpatialGridDescriptorStateToJSONTyped, +} from './SpatialGridDescriptorState'; + +/** + * + * @export + * @interface SpatialGridDescriptor + */ +export interface SpatialGridDescriptor { + /** + * + * @type {SpatialGridDescriptorState} + * @memberof SpatialGridDescriptor + */ + descriptor: SpatialGridDescriptorState; + /** + * + * @type {SpatialGridDefinition} + * @memberof SpatialGridDescriptor + */ + spatialGrid: SpatialGridDefinition; +} + + + +/** + * Check if a given object implements the SpatialGridDescriptor interface. + */ +export function instanceOfSpatialGridDescriptor(value: object): value is SpatialGridDescriptor { + if (!('descriptor' in value) || value['descriptor'] === undefined) return false; + if (!('spatialGrid' in value) || value['spatialGrid'] === undefined) return false; + return true; +} + +export function SpatialGridDescriptorFromJSON(json: any): SpatialGridDescriptor { + return SpatialGridDescriptorFromJSONTyped(json, false); +} + +export function SpatialGridDescriptorFromJSONTyped(json: any, ignoreDiscriminator: boolean): SpatialGridDescriptor { + if (json == null) { + return json; + } + return { + + 'descriptor': SpatialGridDescriptorStateFromJSON(json['descriptor']), + 'spatialGrid': SpatialGridDefinitionFromJSON(json['spatialGrid']), + }; +} + +export function SpatialGridDescriptorToJSON(json: any): SpatialGridDescriptor { + return SpatialGridDescriptorToJSONTyped(json, false); +} + +export function SpatialGridDescriptorToJSONTyped(value?: SpatialGridDescriptor | null, ignoreDiscriminator: boolean = false): any { + if (value == null) { + return value; + } + + return { + + 'descriptor': SpatialGridDescriptorStateToJSON(value['descriptor']), + 'spatialGrid': SpatialGridDefinitionToJSON(value['spatialGrid']), + }; +} + diff --git a/typescript/src/models/SpatialGridDescriptorState.ts b/typescript/src/models/SpatialGridDescriptorState.ts new file mode 100644 index 00000000..4e956e07 --- /dev/null +++ b/typescript/src/models/SpatialGridDescriptorState.ts @@ -0,0 +1,53 @@ +/* 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 SpatialGridDescriptorState = { + Source: 'source', + Derived: 'derived' +} as const; +export type SpatialGridDescriptorState = typeof SpatialGridDescriptorState[keyof typeof SpatialGridDescriptorState]; + + +export function instanceOfSpatialGridDescriptorState(value: any): boolean { + for (const key in SpatialGridDescriptorState) { + if (Object.prototype.hasOwnProperty.call(SpatialGridDescriptorState, key)) { + if (SpatialGridDescriptorState[key as keyof typeof SpatialGridDescriptorState] === value) { + return true; + } + } + } + return false; +} + +export function SpatialGridDescriptorStateFromJSON(json: any): SpatialGridDescriptorState { + return SpatialGridDescriptorStateFromJSONTyped(json, false); +} + +export function SpatialGridDescriptorStateFromJSONTyped(json: any, ignoreDiscriminator: boolean): SpatialGridDescriptorState { + return json as SpatialGridDescriptorState; +} + +export function SpatialGridDescriptorStateToJSON(value?: SpatialGridDescriptorState | null): any { + return value as any; +} + +export function SpatialGridDescriptorStateToJSONTyped(value: any, ignoreDiscriminator: boolean): SpatialGridDescriptorState { + return value as SpatialGridDescriptorState; +} + diff --git a/typescript/src/models/TypedRasterResultDescriptor.ts b/typescript/src/models/TypedRasterResultDescriptor.ts index 6d269a93..47e46a8a 100644 --- a/typescript/src/models/TypedRasterResultDescriptor.ts +++ b/typescript/src/models/TypedRasterResultDescriptor.ts @@ -13,13 +13,6 @@ */ import { mapValues } from '../runtime'; -import type { SpatialResolution } from './SpatialResolution'; -import { - SpatialResolutionFromJSON, - SpatialResolutionFromJSONTyped, - SpatialResolutionToJSON, - SpatialResolutionToJSONTyped, -} from './SpatialResolution'; import type { TimeInterval } from './TimeInterval'; import { TimeIntervalFromJSON, @@ -41,6 +34,13 @@ import { RasterBandDescriptorToJSON, RasterBandDescriptorToJSONTyped, } from './RasterBandDescriptor'; +import type { SpatialGridDescriptor } from './SpatialGridDescriptor'; +import { + SpatialGridDescriptorFromJSON, + SpatialGridDescriptorFromJSONTyped, + SpatialGridDescriptorToJSON, + SpatialGridDescriptorToJSONTyped, +} from './SpatialGridDescriptor'; import type { RasterDataType } from './RasterDataType'; import { RasterDataTypeFromJSON, @@ -48,13 +48,6 @@ import { RasterDataTypeToJSON, RasterDataTypeToJSONTyped, } from './RasterDataType'; -import type { SpatialPartition2D } from './SpatialPartition2D'; -import { - SpatialPartition2DFromJSON, - SpatialPartition2DFromJSONTyped, - SpatialPartition2DToJSON, - SpatialPartition2DToJSONTyped, -} from './SpatialPartition2D'; /** * diff --git a/typescript/src/models/VectorQueryRectangle.ts b/typescript/src/models/VectorQueryRectangle.ts deleted file mode 100644 index 2f3b7256..00000000 --- a/typescript/src/models/VectorQueryRectangle.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 { mapValues } from '../runtime'; -import type { SpatialResolution } from './SpatialResolution'; -import { - SpatialResolutionFromJSON, - SpatialResolutionFromJSONTyped, - SpatialResolutionToJSON, - SpatialResolutionToJSONTyped, -} from './SpatialResolution'; -import type { TimeInterval } from './TimeInterval'; -import { - TimeIntervalFromJSON, - TimeIntervalFromJSONTyped, - TimeIntervalToJSON, - TimeIntervalToJSONTyped, -} from './TimeInterval'; -import type { BoundingBox2D } from './BoundingBox2D'; -import { - BoundingBox2DFromJSON, - BoundingBox2DFromJSONTyped, - BoundingBox2DToJSON, - BoundingBox2DToJSONTyped, -} from './BoundingBox2D'; - -/** - * A spatio-temporal rectangle with a specified resolution - * @export - * @interface VectorQueryRectangle - */ -export interface VectorQueryRectangle { - /** - * - * @type {BoundingBox2D} - * @memberof VectorQueryRectangle - */ - spatialBounds: BoundingBox2D; - /** - * - * @type {SpatialResolution} - * @memberof VectorQueryRectangle - */ - spatialResolution: SpatialResolution; - /** - * - * @type {TimeInterval} - * @memberof VectorQueryRectangle - */ - timeInterval: TimeInterval; -} - -/** - * Check if a given object implements the VectorQueryRectangle interface. - */ -export function instanceOfVectorQueryRectangle(value: object): value is VectorQueryRectangle { - if (!('spatialBounds' in value) || value['spatialBounds'] === undefined) return false; - if (!('spatialResolution' in value) || value['spatialResolution'] === undefined) return false; - if (!('timeInterval' in value) || value['timeInterval'] === undefined) return false; - return true; -} - -export function VectorQueryRectangleFromJSON(json: any): VectorQueryRectangle { - return VectorQueryRectangleFromJSONTyped(json, false); -} - -export function VectorQueryRectangleFromJSONTyped(json: any, ignoreDiscriminator: boolean): VectorQueryRectangle { - if (json == null) { - return json; - } - return { - - 'spatialBounds': BoundingBox2DFromJSON(json['spatialBounds']), - 'spatialResolution': SpatialResolutionFromJSON(json['spatialResolution']), - 'timeInterval': TimeIntervalFromJSON(json['timeInterval']), - }; -} - -export function VectorQueryRectangleToJSON(json: any): VectorQueryRectangle { - return VectorQueryRectangleToJSONTyped(json, false); -} - -export function VectorQueryRectangleToJSONTyped(value?: VectorQueryRectangle | null, ignoreDiscriminator: boolean = false): any { - if (value == null) { - return value; - } - - return { - - 'spatialBounds': BoundingBox2DToJSON(value['spatialBounds']), - 'spatialResolution': SpatialResolutionToJSON(value['spatialResolution']), - 'timeInterval': TimeIntervalToJSON(value['timeInterval']), - }; -} - diff --git a/typescript/src/models/index.ts b/typescript/src/models/index.ts index 1fd7bb3c..802fa5ba 100644 --- a/typescript/src/models/index.ts +++ b/typescript/src/models/index.ts @@ -52,6 +52,7 @@ export * from './GdalMetadataMapping'; export * from './GdalMetadataNetCdfCf'; export * from './GdalSourceTimePlaceholder'; export * from './GeoJson'; +export * from './GeoTransform'; export * from './GetCapabilitiesFormat'; export * from './GetCapabilitiesRequest'; export * from './GetCoverageFormat'; @@ -61,6 +62,8 @@ export * from './GetLegendGraphicRequest'; export * from './GetMapExceptionFormat'; export * from './GetMapFormat'; export * from './GetMapRequest'; +export * from './GridBoundingBox2D'; +export * from './GridIdx2D'; export * from './IdResponse'; export * from './InternalDataId'; export * from './Layer'; @@ -113,7 +116,6 @@ export * from './PermissionListing'; export * from './PermissionRequest'; export * from './Plot'; export * from './PlotOutputFormat'; -export * from './PlotQueryRectangle'; export * from './PlotResultDescriptor'; export * from './PointSymbology'; export * from './PolygonSymbology'; @@ -138,10 +140,10 @@ export * from './RasterDatasetFromWorkflow'; export * from './RasterDatasetFromWorkflowResult'; export * from './RasterPropertiesEntryType'; export * from './RasterPropertiesKey'; -export * from './RasterQueryRectangle'; export * from './RasterResultDescriptor'; export * from './RasterStreamWebsocketResultType'; export * from './RasterSymbology'; +export * from './RasterToDatasetQueryRectangle'; export * from './Resource'; export * from './Role'; export * from './RoleDescription'; @@ -151,6 +153,9 @@ export * from './SearchType'; export * from './SearchTypes'; export * from './ServerInfo'; export * from './SingleBandRasterColorizer'; +export * from './SpatialGridDefinition'; +export * from './SpatialGridDescriptor'; +export * from './SpatialGridDescriptorState'; export * from './SpatialPartition2D'; export * from './SpatialReferenceAuthority'; export * from './SpatialReferenceSpecification'; @@ -203,7 +208,6 @@ export * from './UserSession'; export * from './VecUpdate'; export * from './VectorColumnInfo'; export * from './VectorDataType'; -export * from './VectorQueryRectangle'; export * from './VectorResultDescriptor'; export * from './Volume'; export * from './VolumeFileLayersResponse';