Merge branch 'workflow-optimization' of github.com:geo-engine/geoengine-ui into geoengine-2-rework

Author: jdroenner

package-lock.json

@@ -56,8 +56,8 @@
         "@angular/core": "^20.1.3",
         "@angular/forms": "^20.1.3",
         "@angular/material": "^20.1.3",
-        "@angular/platform-browser-dynamic": "^20.1.3",
         "@angular/platform-browser": "^20.1.3",
+        "@angular/platform-browser-dynamic": "^20.1.3",
         "@angular/router": "^20.1.3",
         "@codemirror/lang-json": "~6.0.2",
         "@codemirror/lang-rust": "~6.0.2",
@@ -66,25 +66,25 @@
         "@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": "https://gitpkg.now.sh/geo-engine/openapi-client/typescript?workflow-optimization",
         "d3": "~7.9.0",
-        "dagre-d3": "~0.6.4",
         "dagre": "~0.8.5",
+        "dagre-d3": "~0.6.4",
         "flatgeobuf": "4.1.1",
         "immutable": "~5.1.3",
         "keycharm": "0.4.0",
         "moment": "~2.30.1",
         "ngx-color-picker": "~20.0.0",
         "ngx-mat-select-search": "~8.0.2",
-        "ol-mapbox-style": "~13.0.1",
         "ol": "~10.6.1",
+        "ol-mapbox-style": "~13.0.1",
         "proj4": "~2.19.10",
         "propagating-hammerjs": "^3.0.0",
         "rxjs": "^7.8.2",
         "uuid": "11.1.0",
+        "vega": "~6.1.2",
         "vega-embed": "~7.0.2",
         "vega-lite": "~6.2.0",
-        "vega": "~6.1.2",
         "vis-data": "8.0.1",
         "vis-timeline": "8.2.1",
         "vis-util": "6.0.0",

package.json

@@ -11,14 +11,14 @@ import {SourceOperatorDict} from '../operators/operator.model';
 import {SpatialGridDescriptor} from '../spatial-grid/spatial-grid-descriptor.model';
 import {SrsString} from '../spatial-references/spatial-reference.model';
 import {Symbology} from '../symbology/symbology.model';
-import {Time} from '../time/time.model';
 import {
     Dataset as DatasetDict,
     TypedResultDescriptor as TypedResultDescriptorDict,
     TypedVectorResultDescriptor as VectorResultDescriptorDict,
     TypedRasterResultDescriptor as RasterResultDescriptorDict,
     Workflow as WorkflowDict,
     RasterBandDescriptor as RasterBandDescriptor,
+    TimeDescriptor,
 } from '@geoengine/openapi-client';
 
 export type UUID = string;
@@ -89,14 +89,14 @@ export class RasterResultDescriptor extends ResultDescriptor {
     readonly dataType: RasterDataType;
     readonly bands: Array<RasterBandDescriptor>;
     readonly spatialGrid: SpatialGridDescriptor;
-    readonly time?: Time;
+    readonly time: TimeDescriptor;
 
     constructor(config: RasterResultDescriptorDict) {
         super(config.spatialReference);
         this.dataType = RasterDataTypes.fromCode(config.dataType);
         this.bands = config.bands;
         this.spatialGrid = SpatialGridDescriptor.fromDict(config.spatialGrid);
-        this.time = config.time ? Time.fromDict(config.time) : undefined;
+        this.time = config.time;
     }
 
     static override fromDict(dict: RasterResultDescriptorDict): RasterResultDescriptor {

projects/common/src/lib/datasets/dataset.model.ts

@@ -122,7 +122,7 @@ export class RasterLayerMetadata extends LayerMetadata {
     static override fromDict(dict: RasterResultDescriptorDict): RasterLayerMetadata {
         const dataType = RasterDataTypes.fromCode(dict.dataType);
         const bands = dict.bands;
-        const time = dict.time ? Time.fromDict(dict.time) : undefined;
+        const time = dict.time?.bounds ? Time.fromDict(dict.time.bounds) : undefined;
         const spatialGrid = SpatialGridDescriptor.fromDict(dict.spatialGrid);
 
         return new RasterLayerMetadata(dataType, SpatialReference.fromSrsString(dict.spatialReference), bands, spatialGrid, time);

projects/common/src/lib/layers/layer-metadata.model.ts

@@ -1,4 +1,4 @@
-import {SpatialGridDescriptor} from '@geoengine/openapi-client';
+import {SpatialGridDescriptor, TimeDescriptor} from '@geoengine/openapi-client';
 
 export type UUID = string;
 export type TimestampString = string;
@@ -288,7 +288,7 @@ export interface PlotDataDict {
 export interface ResultDescriptorDict {
     type: 'raster' | 'vector' | 'plot';
     spatialReference: SrsString;
-    time?: TimeIntervalDict;
+    time?: TimeDescriptor;
 }
 
 export type TypedResultDescriptorDict = VectorResultDescriptorDict | RasterResultDescriptorDict;
@@ -302,7 +302,7 @@ export interface RasterResultDescriptorDict extends ResultDescriptorDict {
     type: 'raster';
     dataType: 'U8' | 'U16' | 'U32' | 'U64' | 'I8' | 'I16' | 'I32' | 'I64' | 'F32' | 'F64';
     bands: RasterBandDescriptorDict[];
-    time?: TimeIntervalDict;
+    time: TimeDescriptor;
     spatialGrid: SpatialGridDescriptor;
     resolution?: SpatialResolution;
 }

projects/core/src/lib/backend/backend.model.ts

@@ -234,6 +234,12 @@ export class GdalMetadataListComponent implements OnChanges {
             spatialReference: resultDescriptorControl.spatialReference.value,
             dataType: resultDescriptorControl.dataType.value,
             spatialGrid: spatialGridDesc.toDict(),
+            time: {
+                bounds: null,
+                dimension: {
+                    type: 'irregular',
+                },
+            },
         };
 
         return {

projects/manager/src/app/datasets/loading-info/gdal-metadata-list/gdal-metadata-list.component.ts

@@ -46,8 +46,32 @@
         </div>
     }
 
-    @if (resultDescriptor().time; as time) {
-        <div class="flex-container">
+    <div class="flex-container">
+        @if (regularTimeDimension) {
+            <mat-form-field>
+                <mat-label>Time Dimension</mat-label>
+                <input matInput type="text" readonly value="regular" />
+            </mat-form-field>
+            <mat-form-field>
+                <mat-label>Time Origin</mat-label>
+                <input matInput type="text" readonly [value]="regularTimeDimension.origin" />
+            </mat-form-field>
+            <mat-form-field>
+                <mat-label>Time Step</mat-label>
+                <input matInput type="text" readonly [value]="regularTimeDimension.step.step" />
+            </mat-form-field>
+            <mat-form-field>
+                <mat-label>Time Granularity</mat-label>
+                <input matInput type="text" readonly [value]="regularTimeDimension.step.granularity" />
+            </mat-form-field>
+        } @else {
+            <mat-form-field>
+                <mat-label>Time Dimension</mat-label>
+                <input matInput type="text" readonly value="irregular" />
+            </mat-form-field>
+        }
+
+        @if (resultDescriptor().time.bounds; as time) {
             <mat-form-field>
                 <mat-label>Time Start</mat-label>
                 <input matInput type="text" readonly [value]="convertUnixToIso(time.start)" />
@@ -56,8 +80,19 @@
                 <mat-label>Time End</mat-label>
                 <input matInput type="text" readonly [value]="convertUnixToIso(time.end)" />
             </mat-form-field>
-        </div>
-    }
+        } @else {
+            <mat-form-field>
+                <mat-label>Time Start</mat-label>
+                <input matInput type="text" readonly value="None" />
+            </mat-form-field>
+            <mat-form-field>
+                <mat-label>Time End</mat-label>
+                <input matInput type="text" readonly value="None" />
+            </mat-form-field>
+        }
+    </div>
+
+    <!-- TODO: time dimension -->
 
     <table mat-table [dataSource]="bandDataSource">
         <ng-container matColumnDef="index">

projects/manager/src/app/result-descriptors/raster-result-descriptor/raster-result-descriptor.component.html

@@ -1,6 +1,6 @@
 import {Component, input} from '@angular/core';
 import {BoundingBox2D, GeoTransform, GridBoundingBox2D} from '@geoengine/common';
-import {RasterBandDescriptor, TypedRasterResultDescriptor} from '@geoengine/openapi-client';
+import {RasterBandDescriptor, TypedRasterResultDescriptor, RegularTimeDimension} from '@geoengine/openapi-client';
 import {FormsModule} from '@angular/forms';
 import {MatFormField, MatLabel, MatInput} from '@angular/material/input';
 import {
@@ -63,6 +63,16 @@ export class RasterResultDescriptorComponent {
             y: this.resultDescriptor().spatialGrid.spatialGrid.geoTransform.yPixelSize,
         };
     }
+
+    get regularTimeDimension(): RegularTimeDimension | undefined {
+        const rd = this.resultDescriptor().time.dimension;
+
+        if (rd && rd.type === 'regular') {
+            return rd;
+        }
+
+        return undefined;
+    }
 }
 
 interface SpatialResolution {