Prerelease wuekis sprint #76

MichaelLangbein · 2021-03-24T15:44:28Z

PR Checklist

Please check if your PR fulfills the following requirements:

The commit message follows our guidelines: https://github.com/dlr-eoc/ukis-frontend-libraries/blob/master/CONTRIBUTING.md#-commit-message-guidelines
Tests for the changes have been added (for bug fixes / features)
Docs have been added / updated (for bug fixes / features)
The Project is building and passes all tests without errors

PR Type

What kind of change does this PR introduce?

What is the current behavior?

Issue Number: 73

What is the new behavior?

This is a PR to merge in our latest developments during the WUEKIS sprint.
As such, against usual procedure, this PR actually bundles two changes:

update to WmsService, including the functionality getLayerFromCapabilities and getTimeDimensionFromLayer that were already developed earlier.
update to owc-json and map-ol to read WFS-layers from files and display them in ol-maps.

Does this PR introduce a breaking change?

Yes
No

Other information

Is it part of one/more packages and which?

and added functionality to parse the returned capabilities-object

ensuring that wf's are covered, too.

projects/utils-ogc/src/lib/wms/wms.service.ts.bak

projects/map-ol/src/lib/helpers.ts

projects/map-ol/src/lib/map-ol.component.ts

projects/map-ol/src/lib/map-ol.service.ts

boeckMt · 2021-03-25T08:59:25Z

projects/map-ol/src/lib/map-ol.service.ts

@@ -953,7 +996,7 @@ export class MapOlService {
    }

    if (l.bbox) {
-      layeroptions.extent = transformExtent(l.bbox, WGS84, this.map.getView().getProjection().getCode());
+      layeroptions.extent = transformExtent(l.bbox.slice(0, 4) as [number, number, number, number], WGS84, this.map.getView().getProjection().getCode());


Do we need to slice all bboxes? I think GeoJSON can handle 3D bboxes https://tools.ietf.org/html/rfc7946#section-5

You'd think so, right?
But when I include map-ol in a ukis-project (as we currently do in WUEKIS) and try to serve the app, I get

ERROR in projects/map-ol/src/lib/map-ol.service.ts:706:45 - error TS2345: Argument of type 'TGeoExtent' is not assignable to parameter of type 'Extent'. Type '[number, number, number, number, number, number]' is not assignable to type '[number, number, number, number]'. Types of property 'length' are incompatible. Type '6' is not assignable to type '4'. 706 layeroptions.extent = transformExtent(l.bbox, WGS84, this.map.getView().getProjection().getCode());

I never had this error but your right, ol extent only accepts for numbers.

projects/map-ol/src/lib/map-ol.service.ts

projects/services-layers/src/lib/types/Layers.ts

projects/services-ogc/assets/exampleContext.ts

boeckMt · 2021-03-25T09:21:14Z

Can you please add @angular/core to the devDependencies of utils-ogc because it is used in the tests.

boeckMt · 2021-03-25T10:32:11Z

I also recognised that we get a build error https://github.com/dlr-eoc/ukis-frontend-libraries/actions/runs/683627826
and @dlr-eoc/owc-control is not build, but I don't can find the reason now.

Building entry point '@dlr-eoc/owc-control'
------------------------------------------------------------------------------
Compiling TypeScript sources through ngc
ERROR: dist/services-ogc/lib/owc/owc-json.service.d.ts:70:88 - error TS2307: Cannot find module '../../../../../dist/services-layers/dlr-eoc-services-layers' or its corresponding type declarations.

70     getTimeDimensions(dimensions: IEocOwsResource['properties']['dimensions']): import("../../../../../dist/services-layers/dlr-eoc-services-layers").ILayerTimeDimension;
                                                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

An unhandled exception occurred: dist/services-ogc/lib/owc/owc-json.service.d.ts:70:88 - error TS2307: Cannot find module '../../../../../dist/services-layers/dlr-eoc-services-layers' or its corresponding type declarations.

70     getTimeDimensions(dimensions: IEocOwsResource['properties']['dimensions']): import("../../../../../dist/services-layers/dlr-eoc-services-layers").ILayerTimeDimension;
                                                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

See "C:\Users\boec_mt\AppData\Local\Temp\ng-L5lsrK\angular-errors.log" for further details.

MichaelLangbein · 2021-03-25T11:20:55Z

I also recognised that we get a build error https://github.com/dlr-eoc/ukis-frontend-libraries/actions/runs/683627826
and @dlr-eoc/owc-control is not build, but I don't can find the reason now.

Building entry point '@dlr-eoc/owc-control'
------------------------------------------------------------------------------
Compiling TypeScript sources through ngc
ERROR: dist/services-ogc/lib/owc/owc-json.service.d.ts:70:88 - error TS2307: Cannot find module '../../../../../dist/services-layers/dlr-eoc-services-layers' or its corresponding type declarations.

70     getTimeDimensions(dimensions: IEocOwsResource['properties']['dimensions']): import("../../../../../dist/services-layers/dlr-eoc-services-layers").ILayerTimeDimension;
                                                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

An unhandled exception occurred: dist/services-ogc/lib/owc/owc-json.service.d.ts:70:88 - error TS2307: Cannot find module '../../../../../dist/services-layers/dlr-eoc-services-layers' or its corresponding type declarations.

70     getTimeDimensions(dimensions: IEocOwsResource['properties']['dimensions']): import("../../../../../dist/services-layers/dlr-eoc-services-layers").ILayerTimeDimension;
                                                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

See "C:\Users\boec_mt\AppData\Local\Temp\ng-L5lsrK\angular-errors.log" for further details.

Oh, that's really interesting!
Turns out adding a type annotation to owc-json.service.getTimeDimensions fixes this error. Cannot quite tell why, however.

map-ol.servce/create_wfs_layer for url-parsing & manipulation

for projection code

boeckMt · 2021-03-25T12:58:53Z

I also recognised that we get a build error https://github.com/dlr-eoc/ukis-frontend-libraries/actions/runs/683627826
and @dlr-eoc/owc-control is not build, but I don't can find the reason now.

Building entry point '@dlr-eoc/owc-control'
------------------------------------------------------------------------------
Compiling TypeScript sources through ngc
ERROR: dist/services-ogc/lib/owc/owc-json.service.d.ts:70:88 - error TS2307: Cannot find module '../../../../../dist/services-layers/dlr-eoc-services-layers' or its corresponding type declarations.

70     getTimeDimensions(dimensions: IEocOwsResource['properties']['dimensions']): import("../../../../../dist/services-layers/dlr-eoc-services-layers").ILayerTimeDimension;
                                                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

An unhandled exception occurred: dist/services-ogc/lib/owc/owc-json.service.d.ts:70:88 - error TS2307: Cannot find module '../../../../../dist/services-layers/dlr-eoc-services-layers' or its corresponding type declarations.

70     getTimeDimensions(dimensions: IEocOwsResource['properties']['dimensions']): import("../../../../../dist/services-layers/dlr-eoc-services-layers").ILayerTimeDimension;
                                                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

See "C:\Users\boec_mt\AppData\Local\Temp\ng-L5lsrK\angular-errors.log" for further details.

Oh, that's really interesting!
Turns out adding a type annotation to owc-json.service.getTimeDimensions fixes this error. Cannot quite tell why, however.

That is really strange, I thought more it is a wrong Import or missing configuration on ng-package.json

MichaelLangbein · 2021-03-25T13:08:53Z

I also recognised that we get a build error https://github.com/dlr-eoc/ukis-frontend-libraries/actions/runs/683627826
and @dlr-eoc/owc-control is not build, but I don't can find the reason now.

Building entry point '@dlr-eoc/owc-control'
------------------------------------------------------------------------------
Compiling TypeScript sources through ngc
ERROR: dist/services-ogc/lib/owc/owc-json.service.d.ts:70:88 - error TS2307: Cannot find module '../../../../../dist/services-layers/dlr-eoc-services-layers' or its corresponding type declarations.

70     getTimeDimensions(dimensions: IEocOwsResource['properties']['dimensions']): import("../../../../../dist/services-layers/dlr-eoc-services-layers").ILayerTimeDimension;
                                                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

An unhandled exception occurred: dist/services-ogc/lib/owc/owc-json.service.d.ts:70:88 - error TS2307: Cannot find module '../../../../../dist/services-layers/dlr-eoc-services-layers' or its corresponding type declarations.

70     getTimeDimensions(dimensions: IEocOwsResource['properties']['dimensions']): import("../../../../../dist/services-layers/dlr-eoc-services-layers").ILayerTimeDimension;
                                                                                          ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

See "C:\Users\boec_mt\AppData\Local\Temp\ng-L5lsrK\angular-errors.log" for further details.

Oh, that's really interesting!
Turns out adding a type annotation to owc-json.service.getTimeDimensions fixes this error. Cannot quite tell why, however.

That is really strange, I thought more it is a wrong Import or missing configuration on ng-package.json

Me too. scripts/library/index.js --check does not report an error, though, and vscode's typechecker doesn't, either.
Just as a side-note: I'm not really sure if we even still need that project owc-control. It doesn't do much besides facilitating a download for owc-files, and for downloading files by now we have dedicated functionality in utils-browser/download.ts, so there is very little of actual value left in this project. Maybe at some point we could remove it (but that is really not for this PR - more like a feature-request for a later version)

boeckMt · 2021-03-25T13:44:59Z

That is really strange, I thought more it is a wrong Import or missing configuration on ng-package.json

Me too. scripts/library/index.js --check does not report an error, though, and vscode's typechecker doesn't, either.
Just as a side-note: I'm not really sure if we even still need that project owc-control. It doesn't do much besides facilitating a > download for owc-files, and for downloading files by now we have dedicated functionality in utils-browser/download.ts, so there > is very little of actual value left in this project. Maybe at some point we could remove it (but that is really not for this PR - more > like a feature-request for a later version)

Yes I also checked this, and don't found type errors in the code...
Maybe we can try typescrips type-only-imports-and-export at some time for this?

Yes, if it is only a button which triggers the download and creates the layers, then we can remove it e.g. in v8.0.0.

Langbein, Michael added 11 commits March 17, 2021 13:04

feat: moved WmsService from services-ogc to utils-ogc

486aa38

and added functionality to parse the returned capabilities-object

feat: all utils-ogc share one common interface for http-clients

7970e3c

feat: added more tests to owc-json,

2fff972

ensuring that wf's are covered, too.

feat: added basic wfs functionality to map-ol

aead48e

Merge branch 'master' into prereleaseWuekisSprint

575f464

feat: added runtime-type-testing for owc-json-files.

a043131

fix: removed superfluous @Injectable decorator from utils-ogc.

5cb9dc0

fix: Meshes in three are not generic

158de6a

test: added WFS to demo-maps

d6f16b5

test: added WmsService to demo-maps

c51da1d

docs: updated readme's and changelog

ba9b133

MichaelLangbein mentioned this pull request Mar 24, 2021

Map-ol: support WFS Layers. #73

Closed

MichaelLangbein requested a review from boeckMt March 24, 2021 15:44

Merge branch 'master' into prereleaseWuekisSprint

c66b28b