diff --git a/package-lock.json b/package-lock.json index b3cddc9aa..e4e0f060f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -26,7 +26,7 @@ "@codemirror/state": "~6.5.2", "@codemirror/view": "~6.38.1", "@egjs/hammerjs": "^2.0.17", - "@geoengine/openapi-client": "git://github.com/geo-engine/openapi-client.git#backend_pixel_rewrite_v4", + "@geoengine/openapi-client": "github:geo-engine/openapi-client#ogc_apis_fix", "d3": "~7.9.0", "dagre": "~0.8.5", "dagre-d3": "~0.6.4", @@ -3436,7 +3436,7 @@ }, "node_modules/@geoengine/openapi-client": { "name": "@geoengine/openapi-client-dev", - "resolved": "git+ssh://git@github.com/geo-engine/openapi-client.git#4b0a0698a072f528cf570a31a0460dbc143fc4a2", + "resolved": "git+ssh://git@github.com/geo-engine/openapi-client.git#5de34f95c356e91d45f9855a5a4508c1789b70d8", "workspaces": [ "typescript" ] diff --git a/package.json b/package.json index 88da3b9f9..e2de834bb 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "@codemirror/state": "~6.5.2", "@codemirror/view": "~6.38.1", "@egjs/hammerjs": "^2.0.17", - "@geoengine/openapi-client": "git://github.com/geo-engine/openapi-client.git#backend_pixel_rewrite_v4", + "@geoengine/openapi-client": "github:geo-engine/openapi-client#ogc_apis_fix", "d3": "~7.9.0", "dagre": "~0.8.5", "dagre-d3": "~0.6.4", diff --git a/projects/core/src/lib/backend/backend.model.ts b/projects/core/src/lib/backend/backend.model.ts index 2a237fb75..339076f17 100644 --- a/projects/core/src/lib/backend/backend.model.ts +++ b/projects/core/src/lib/backend/backend.model.ts @@ -570,8 +570,6 @@ export interface WfsParamsDict { resultType?: string; filter?: string; propertyName?: string; - // vendor parameter for specifying the spatial resolution - queryResolution?: number; // TODO: allow x and y seperately } export interface QuotaDict { diff --git a/projects/core/src/lib/backend/backend.service.ts b/projects/core/src/lib/backend/backend.service.ts index ab7bee046..7d5c11798 100644 --- a/projects/core/src/lib/backend/backend.service.ts +++ b/projects/core/src/lib/backend/backend.service.ts @@ -226,7 +226,6 @@ export class BackendService { params.setMapped('bbox', request.bbox, (bbox) => bboxDictToExtent(bbox).join(',')); params.setMapped('time', request.time, (time) => `${unixTimestampToIsoString(time.start)}/${unixTimestampToIsoString(time.end)}`); params.set('srsName', request.srsName); - params.setMapped('queryResolution', request.queryResolution, (r) => r.toString()); // these probably do not work yet params.set('namespaces', request.namespaces); diff --git a/projects/core/src/lib/download-layer/download-layer.component.ts b/projects/core/src/lib/download-layer/download-layer.component.ts index e0714e6cd..cfa2d9a66 100644 --- a/projects/core/src/lib/download-layer/download-layer.component.ts +++ b/projects/core/src/lib/download-layer/download-layer.component.ts @@ -360,11 +360,8 @@ export class DownloadLayerComponent implements OnInit { const time = this.formToTime().toDict(); - const resolution = this.formToResolution().x; - return { bbox: bbox, - queryResolution: resolution, time: time, srsName: sref.srsString, workflowId: this.layer().workflowId, diff --git a/projects/core/src/lib/project/project.service.ts b/projects/core/src/lib/project/project.service.ts index 9254f231d..2134b7888 100644 --- a/projects/core/src/lib/project/project.service.ts +++ b/projects/core/src/lib/project/project.service.ts @@ -1416,7 +1416,7 @@ export class ProjectService implements OnDestroy { const ogcWfsApi = await firstValueFrom(this.ogcWfsApi); - const wfsResponse = await ogcWfsApi.wfsFeatureHandler({ + const wfsResponse = await ogcWfsApi.wfsHandler({ service: 'WFS', version: '2.0.0', request: 'GetFeature', diff --git a/projects/dashboards/esg-indicator-service/src/app/dashboard/dashboard.component.ts b/projects/dashboards/esg-indicator-service/src/app/dashboard/dashboard.component.ts index fc5cd5d83..24e8bd87d 100644 --- a/projects/dashboards/esg-indicator-service/src/app/dashboard/dashboard.component.ts +++ b/projects/dashboards/esg-indicator-service/src/app/dashboard/dashboard.component.ts @@ -261,7 +261,6 @@ export class DashboardComponent implements AfterViewInit, AfterContentInit { start: time.start.unix() * 1_000, end: time.end.unix() * 1_000, }, - queryResolution: CLASSIFICATION_RESOLUTION, srsName: 'EPSG:32632', }; @@ -335,8 +334,6 @@ const CLASSIFICATION_WORKFLOW: Workflow = { operator: CLASSIFICATION_SOURCE_OP, }; -const CLASSIFICATION_RESOLUTION = 10; - const CLASSIFICIATION_DATA_RANGE = { min: 0, max: 5,