Display frontend and backend version

Containerfile

@@ -1,3 +1,4 @@
+# Build: podman build -t code.philo.ydns.eu/philorg/gisaf-frontend -f Containerfile
 FROM docker.io/library/nginx:alpine
 
 EXPOSE 80

README.md

@@ -1,31 +1,7 @@
-# GisafApp
+# Gisaf frontend
 
-This project was generated with [angular-cli](https://github.com/angular/angular-cli) version 1.0.0-beta.24.
+The web app (front-end, user interface) for Gisaf,
+a web based GIS initially developed for CSR Geomatics, Auroville.
 
-## Development server
+See the [Gisaf server repository](https://code.philo.ydns.eu/philorg/gisaf-backend)
-Run `ng serve` for a dev server. Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
+for information about this project.
-
-## Code scaffolding
-
-Run `ng generate component component-name` to generate a new component. You can also use `ng generate directive/pipe/service/class/module`.
-
-## Build
-
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `-prod` flag for a production build.
-
-## Running unit tests
-
-Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.io).
-
-## Running end-to-end tests
-
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
-Before running the tests make sure you are serving the app via `ng serve`.
-
-## Deploying to Github Pages
-
-Run `ng github-pages:deploy` to deploy to Github Pages.
-
-## Further help
-
-To get more help on the `angular-cli` use `ng help` or go check out the [Angular-CLI README](https://github.com/angular/angular-cli/blob/master/README.md).

nginx.conf

@@ -25,14 +25,14 @@ http {
 
 
   server {
-      listen 8899;
+      listen 80 default_server;
+      listen [::]:80 default_server;
 
       gzip on;
       gzip_types      text/plain application/xml;
       gzip_proxied    no-cache no-store private expired auth;
       gzip_min_length 1000;
 
-      server_name localhost;
       charset utf-8;
 
       client_max_body_size 4G;

package.json

@@ -12,12 +12,12 @@
   "angular-cli": {},
   "scripts": {
     "ng": "ng",
-    "start": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng serve --proxy-config proxy.conf.json --watch",
+    "start": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng serve --proxy-config proxy.conf.json --host 0.0.0.0 --watch",
     "build": "node --max_old_space_size=4096 ./node_modules/@angular/cli/bin/ng build",
     "test": "ng test",
     "lint": "ng lint",
     "e2e": "ng e2e",
-    "openapi-ts": "openapi-ts -i http://127.0.0.1:5000/openapi.json -o src/app/openapi --client angular",
+    "openapi-ts": "openapi-ts -i http://127.0.0.1:5080/openapi.json -o src/app/openapi --client angular",
     "source-map-explorer": "source-map-explorer dist/*.js",
     "version": "echo \"{\\\"version\\\":\\\"$(git describe --tags --dirty --always)\\\"}\" > src/version.json"
   },
@@ -28,54 +28,53 @@
     }
   ],
   "dependencies": {
-    "@angular/animations": "^17.3.5",
+    "@angular/animations": "^18.2.13",
-    "@angular/cdk": "^17.3.5",
+    "@angular/cdk": "^18.2.14",
-    "@angular/common": "^17.3.5",
+    "@angular/common": "^18.2.13",
-    "@angular/compiler": "^17.3.5",
+    "@angular/compiler": "^18.2.13",
-    "@angular/core": "^17.3.5",
+    "@angular/core": "^18.2.13",
-    "@angular/forms": "^17.3.5",
+    "@angular/forms": "^18.2.13",
-    "@angular/material": "^17.3.5",
+    "@angular/material": "^18.2.14",
-    "@angular/platform-browser": "^17.3.5",
+    "@angular/platform-browser": "^18.2.13",
-    "@angular/platform-browser-dynamic": "^17.3.5",
+    "@angular/platform-browser-dynamic": "^18.2.13",
-    "@angular/platform-server": "^17.3.5",
+    "@angular/platform-server": "^18.2.13",
-    "@angular/router": "^17.3.5",
+    "@angular/router": "^18.2.13",
     "@mapbox/point-geometry": "^0.1.0",
-    "@maplibre/ngx-maplibre-gl": "^17.4.3",
+    "@maplibre/ngx-maplibre-gl": "^18.1.4",
     "@turf/bbox": "^7.1.0",
     "@turf/distance": "^7.1.0",
     "@turf/helpers": "^7.1.0",
     "angular-plotly.js": "^5.2.2",
-    "maplibre-gl": "^4.1.3",
+    "maplibre-gl": "^4.7.1",
-    "ngx-flexible-layout": "~17.0.4",
+    "ngx-flexible-layout": "~18.0.2",
     "plotly.js-basic-dist-min": "2.31.1",
     "rxjs": "^7.8.1",
     "ts-helpers": "^1.1.2",
-    "zone.js": "~0.14.4"
+    "zone.js": "~0.14.10"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^17.3.5",
+    "@angular-devkit/build-angular": "^18.2.12",
-    "@angular/cli": "^17.3.5",
+    "@angular/cli": "^18.2.12",
-    "@angular/compiler-cli": "^17.3.5",
+    "@angular/compiler-cli": "^18.2.13",
-    "@angular/language-service": "^17.3.5",
+    "@angular/language-service": "^18.2.13",
-    "@hey-api/openapi-ts": "^0.45",
+    "@hey-api/openapi-ts": "^0.45.1",
-    "@types/geojson": "^7946.0.14",
+    "@types/geojson": "^7946.0.15",
-    "@types/jasmine": "~5.1.4",
+    "@types/jasmine": "~5.1.5",
     "@types/jasminewd2": "^2.0.13",
-    "@types/node": "^20.12.7",
+    "@types/node": "^20.17.10",
     "@types/plotly.js-dist-min": "^2.3.4",
-    "codelyzer": "^6.0.2",
     "eslint": "^9.17.0",
     "fontnik": "^0.7.2",
     "jasmine-core": "~5.1.2",
     "jasmine-spec-reporter": "~7.0.0",
-    "karma": "~6.4.3",
+    "karma": "~6.4.4",
     "karma-chrome-launcher": "~3.2.0",
     "karma-cli": "^2.0.0",
     "karma-coverage-istanbul-reporter": "~3.0.3",
     "karma-jasmine": "~5.1.0",
     "source-map-explorer": "^2.5.3",
     "ts-node": "^10.9.2",
-    "tslib": "^2.6.2",
+    "tslib": "^2.8.1",
     "typescript": "~5.4.5"
   },
   "packageManager": "pnpm@9.15",

proxy.conf.json

@@ -1,41 +1,41 @@
 [
   {
-      "context": [
+    "context": [
-          "/static",
+      "/static",
-          "/gj",
+      "/gj",
-          "/openapi.json",
+      "/openapi.json",
-          "/docs",
+      "/docs",
-          "/api"
+      "/api"
-      ],
+    ],
-      "target": "http://127.0.0.1:5000",
+    "target": "http://127.0.0.1:5080",
-      "secure": false,
+    "secure": false,
-      "ws": true
+    "ws": true
   },
   {
-      "context": [
+    "context": [
-          "/sched",
+      "/sched",
-          "/_sched"
+      "/_sched"
-      ],
+    ],
-      "target": "http://127.0.0.1:8000",
+    "target": "http://127.0.0.1:8000",
-      "secure": false,
+    "secure": false,
-      "ws": true
+    "ws": true
-    },
+  },
   {
-      "context": [
+    "context": [
-          "/static/tiles"
+      "/static/tiles"
-      ],
+    ],
-      "target": "/home/phil/gisaf_misc/map/tiles",
+    "target": "/home/phil/gisaf_misc/map/tiles",
-      "secure": false,
+    "secure": false,
-      "changeOrigin": true,
+    "changeOrigin": true,
-      "pathRewrite": {
+    "pathRewrite": {
-          "^/static/tiles" : ""
+      "^/static/tiles": ""
-      }
-    },
-    {
-      "context": [
-          "/terrain"
-      ],
-      "target": "http://127.0.0.1:8899",
-      "secure": false
     }
-]
+  },
+  {
+    "context": [
+      "/terrain"
+    ],
+    "target": "http://127.0.0.1:8899",
+    "secure": false
+  }
+]

src/app/app.component.html

@@ -2,7 +2,7 @@
     <mat-toolbar fxFlex="2em" id='top-toolbar'>
         <span
             style='font-family:GisafSymbols'
-            matTooltip="Gisaf v. {{ (configService.conf | async).bsData?.version }}"
+            matTooltip="Gisaf version: backend {{ version.backend }}, frontend {{ version.frontend }}"
             matTooltipPosition="below"
             class='gisafIcon'
             >
@@ -47,4 +47,4 @@
             <mat-icon>account_circle</mat-icon>
         </a>
     </nav>
-</ng-template>
+</ng-template>

src/app/app.component.ts

@@ -1,5 +1,7 @@
-import { Component, OnInit,
+import {
-    ChangeDetectionStrategy, ChangeDetectorRef } from '@angular/core'
+  Component, OnInit,
+  ChangeDetectionStrategy, ChangeDetectorRef
+} from '@angular/core'
 import { Title } from '@angular/platform-browser'
 import { BootstrapService } from './_services/bootstrap.service'
 import { ConfigService } from './_services/config.service'
@@ -8,80 +10,87 @@ import { MatDialog, MatDialogRef } from '@angular/material/dialog'
 
 import { AuthenticationService } from './_services/authentication.service'
 import { LoginDialogComponent } from './login/login.component'
+import versionJson from '../version.json'
+
+export class Version {
+  public backend: string
+  public frontend: string
+}
 
 @Component({
-    selector: 'app-root',
+  selector: 'app-root',
-    templateUrl: './app.component.html',
+  templateUrl: './app.component.html',
-    styleUrls: ['./app.component.css'],
+  styleUrls: ['./app.component.css'],
-    changeDetection: ChangeDetectionStrategy.OnPush,
+  changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class AppComponent implements OnInit {
-    title = 'Gisaf'
+  title: string = 'Gisaf'
-    version: string
+  version: Version = new Version()
 
-    routes = [
+  routes = [
-        {
+    {
-            'target': 'dashboard',
+      'target': 'dashboard',
-            'icon': 'home',
+      'icon': 'home',
-            'text': 'Home',
+      'text': 'Home',
-        },
+    },
-        {
+    {
-            'target': 'map',
+      'target': 'map',
-            'icon': 'map',
+      'icon': 'map',
-            'text': 'Map',
+      'text': 'Map',
-        },
+    },
-        {
+    {
-            'target': 'measures',
+      'target': 'measures',
-            'icon': 'insert_chart',
+      'icon': 'insert_chart',
-            'text': 'Measures',
+      'text': 'Measures',
-        },
+    },
-    ]
+  ]
 
-    constructor(
+  constructor(
-        public configService: ConfigService,
+    public configService: ConfigService,
-        private titleService: Title,
+    private titleService: Title,
-        private bootstrapService: BootstrapService,
+    private bootstrapService: BootstrapService,
-        public authenticationService: AuthenticationService,
+    public authenticationService: AuthenticationService,
-        private snackBar: MatSnackBar,
+    private snackBar: MatSnackBar,
-        private cdr: ChangeDetectorRef,
+    private cdr: ChangeDetectorRef,
-        public dialogRef: MatDialogRef<LoginDialogComponent>,
+    public dialogRef: MatDialogRef<LoginDialogComponent>,
-        public dialog: MatDialog
+    public dialog: MatDialog
-    ) {}
+  ) { }
 
-    ngOnInit() {
+  ngOnInit() {
-        // Bootstrap: set app wide configuration
+    // Bootstrap: set app wide configuration
-        this.bootstrapService.get().subscribe({
+    this.bootstrapService.get().subscribe({
-            next: res => {
+      next: res => {
-                this.version = res.version
+        this.version.backend = res.version
-                this.title = res.title || this.title
+        this.version.frontend = versionJson["version"]
-                this.titleService.setTitle(res.windowTitle || this.title)
+        this.title = res.title || this.title
-                this.configService.setConf(res)
+        this.titleService.setTitle(res.windowTitle || this.title)
-                if (res.redirect && (window != window.top)) {
+        this.configService.setConf(res)
-                    // Refusing to be embedded in an iframe
+        if (res.redirect && (window != window.top)) {
-                    let loc = res.redirect + window.location.pathname
+          // Refusing to be embedded in an iframe
-                    window.document.body.innerHTML = `
+          let loc = res.redirect + window.location.pathname
+          window.document.body.innerHTML = `
                     The web site you are visiting is trying to embed Gisaf (${this.title}) in an iFrame, it isn't a nice thing to do.</br>
                     Please click this link to go to the real site: <span style='cursor:pointer' onclick="window.open('${loc}')"><b>${loc}</b></span>
                     `
-                }
+        }
-            },
+      },
-            error: err => {
+      error: err => {
-                this.snackBar.open(
+        this.snackBar.open(
-                    'Cannot connect to the server (' + err.statusText + '). Please retry later.',
+          'Cannot connect to the server (' + err.statusText + '). Please retry later.',
-                    'OK'
+          'OK'
-                )
+        )
-            }
+      }
-        })
+    })
-    }
+  }
 
-    openLoginDialog() {
+  openLoginDialog() {
-        const dialogRef = this.dialog.open(LoginDialogComponent, {
+    const dialogRef = this.dialog.open(LoginDialogComponent, {
-            height: '24em',
+      height: '24em',
-            width: '21em'
+      width: '21em'
-        })
+    })
 
-        // dialogRef.afterClosed().subscribe(
+    // dialogRef.afterClosed().subscribe(
-        //     result => {}
+    //     result => {}
-        // )
+    // )
-    }
+  }
 }

src/app/app.module.ts

@@ -2,7 +2,7 @@ import { BrowserModule } from '@angular/platform-browser'
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations'
 import { NgModule, LOCALE_ID } from '@angular/core'
 import { FormsModule } from '@angular/forms'
-import { HttpClientModule } from '@angular/common/http'
+import { provideHttpClient, withInterceptorsFromDi } from '@angular/common/http'
 
 import { MatButtonModule } from '@angular/material/button'
 import { MatIconModule } from '@angular/material/icon'
@@ -32,34 +32,26 @@ import { HtmlSnackbarComponent } from './custom-snackbar/custom-snackbar.compone
 
 import { AppRoutingModule } from './app-routing.module'
 
-@NgModule({
+@NgModule({ declarations: [
-    declarations: [
         AppComponent,
         PageNotFoundComponent,
         HtmlSnackbarComponent,
     ],
-    imports: [
+    bootstrap: [
+        AppComponent
+    ], imports: [
         // ApolloModule,
-
         BrowserModule,
         BrowserAnimationsModule,
-
         FormsModule,
-        HttpClientModule,
-
         MatToolbarModule,
         MatButtonModule,
         MatIconModule,
         MatSnackBarModule,
-
         MatTooltipModule,
-
         FlexLayoutModule,
-
         AppRoutingModule,
-        LoginModule,
+        LoginModule], providers: [
-    ],
-    providers: [
         ActionsService,
         AuthenticationService,
         BootstrapService,
@@ -75,9 +67,6 @@ import { AppRoutingModule } from './app-routing.module'
             provide: LOCALE_ID,
             useValue: "en-IN"
         },
-    ],
+        provideHttpClient(withInterceptorsFromDi()),
-    bootstrap: [
+    ] })
-        AppComponent
-    ]
-})
 export class AppModule {}

src/app/map/gisaf-mapbox/gisaf-mapbox.component.html

@@ -94,4 +94,4 @@
     <gisaf-mgl-control position="bottom-left">
         <div #featureInfo class='featureInfoInner'></div>
     </gisaf-mgl-control>
-</mgl-map>
+</mgl-map>

src/app/map/gisaf-mapbox/gisaf-ruler.directive.ts

@@ -1,6 +1,4 @@
-import { ElementRef, Input, ViewChild, Directive, HostListener } from '@angular/core'
+import { ElementRef, Input, ViewChild, Directive, HostListener, OutputRefSubscription } from '@angular/core'
-
-import { Subscription } from 'rxjs'
 
 import { MatButton } from '@angular/material/button'
 
@@ -41,13 +39,13 @@ export class GisafRulerDirective {
   @Input() secondaryColor: string = 'white'
   @Input() fontHalo: number = 2
   @ViewChild(MatButton) button: MatButton
-  clickSubscription: Subscription
+  clickSubscription: OutputRefSubscription
   lineDrawn: boolean
 
   constructor(
     public elementRef: ElementRef,
     private mapService: MapService
-  ) {}
+  ) { }
 
   @HostListener('click')
   onClick() {
@@ -103,7 +101,7 @@ export class GisafRulerDirective {
   */
 
   labelFormat(n) {
-    return n == 0 ? '0' : n < 1 ? `${(n * 1000).toFixed(2)} m`: `${n.toFixed(3)} km`
+    return n == 0 ? '0' : n < 1 ? `${(n * 1000).toFixed(2)} m` : `${n.toFixed(3)} km`
   }
 
   onMapClick(evt: MapMouseEvent) {
@@ -149,9 +147,9 @@ export class GisafRulerDirective {
   addLayers() {
     const map = this.mapService.mapInstance
     map.addSource(SOURCE_LINE, {
-        type: 'geojson',
+      type: 'geojson',
-        data: this.getLineStringFeatures()
+      data: this.getLineStringFeatures()
-      }
+    }
     )
 
     map.addSource(SOURCE_SYMBOL, {

src/app/map/map-data.service.ts

@@ -8,130 +8,130 @@ import { MapControlService } from './map-control.service'
 import { MapService, MapInitData, BaseMapWithStores, BaseStyle as OApiBaseStyle } from '../openapi'
 
 export class BaseStyle {
-    constructor(
+  constructor(
-        public name: string,
+    public name: string,
-        public style?: StyleSpecification,
+    public style?: StyleSpecification,
-    ) {}
+  ) { }
 }
 
 @Injectable()
 export class MapDataService {
-    constructor(
+  constructor(
-        // private apollo: Apollo,
+    // private apollo: Apollo,
-        protected mapControlService: MapControlService,
+    protected mapControlService: MapControlService,
-        public mapService: MapService,
+    public mapService: MapService,
-    ) {
+  ) {
-        // Get the data on init, as it is (most probably) immutable
+    // Get the data on init, as it is (most probably) immutable
-        this.getMapInitData().subscribe(
+    this.getMapInitData().subscribe(
-            data => {
+      data => {
-                this.mapInitDataLoaded.next(true)
+        this.mapInitDataLoaded.next(true)
-                this.mapInitDataLoaded.complete()
+        this.mapInitDataLoaded.complete()
-            }
+      }
-        )
+    )
-    }
+  }
 
-    public mapInitDataLoaded = new BehaviorSubject<boolean>(false)
+  public mapInitDataLoaded = new BehaviorSubject<boolean>(false)
-    mapInitDataLoaded$ = this.mapInitDataLoaded.asObservable()
+  mapInitDataLoaded$ = this.mapInitDataLoaded.asObservable()
 
-    mapInitData: MapInitData = {}
+  mapInitData: MapInitData = {}
 
-    getMapInitData(): Observable<MapInitData> {
+  getMapInitData(): Observable<MapInitData> {
-        return this.mapService.getInitDataApiMapInitDataGet().pipe(map(
+    return this.mapService.getInitDataApiMapInitDataGet().pipe(map(
-            data => this.mapInitData = data
+      data => this.mapInitData = data
-        ))
+    ))
-    }
+  }
 
-    // getBaseMaps(): Observable<BaseMap[]> {
+  // getBaseMaps(): Observable<BaseMap[]> {
-    //     return this.apollo.query({
+  //     return this.apollo.query({
-    //         query: baseMapQuery,
+  //         query: baseMapQuery,
-    //     }).pipe(map(
+  //     }).pipe(map(
-    //         res => {
+  //         res => {
-    //             let bms: object = res['data']['baseMap']
+  //             let bms: object = res['data']['baseMap']
-    //             return bms['map'](
+  //             return bms['map'](
-    //                 (bm: object) => new BaseMap(
+  //                 (bm: object) => new BaseMap(
-    //                     bm['name'],
+  //                     bm['name'],
-    //                     bm['stores'].map(
+  //                     bm['stores'].map(
-    //                         (store: object) => new Store(store['name'])
+  //                         (store: object) => new Store(store['name'])
-    //                     )
+  //                     )
-    //                 )
+  //                 )
-    //             )
+  //             )
-    //         }
+  //         }
-    //     ))
+  //     ))
-    // }
+  // }
 
-    public createBaseMap(baseMapName: string, stores: string[]): Observable<BaseMapWithStores> {
+  public createBaseMap(baseMapName: string, stores: string[]): Observable<BaseMapWithStores> {
-        console.log('TODO: Migrate Graphql createBaseMap')
+    console.log('TODO: Migrate Graphql createBaseMap')
-        return of({name: '', stores:[]})
+    return of({ name: '', stores: [] })
-        // return this.apollo.mutate({
+    // return this.apollo.mutate({
-        //     mutation: createBaseMapQuery,
+    //     mutation: createBaseMapQuery,
-        //     variables: {
+    //     variables: {
-        //         baseMapName: baseMapName,
+    //         baseMapName: baseMapName,
-        //         stores: stores
+    //         stores: stores
-        //     }
+    //     }
-        // }).pipe(map(
+    // }).pipe(map(
-        //     res => {
+    //     res => {
-        //         let bm: object = res['data']['createBaseMap']['baseMap']
+    //         let bm: object = res['data']['createBaseMap']['baseMap']
-        //         return new BaseMap(
+    //         return new BaseMap(
-        //             bm['name'],
+    //             bm['name'],
-        //             bm['stores'].map((store: object) => new Store(store['name']))
+    //             bm['stores'].map((store: object) => new Store(store['name']))
-        //         )
-        //     }
-        // ))
-    }
-
-    // XXX: unused
-    // getBaseStyleList(): Observable<BaseStyle[]> {
-    //     return this.apollo.query({query: baseStyleListQuery}).pipe(map(
-    //         data => data['data']['base_style_list'].map(
-    //             (baseStyle: string) => new BaseStyle(baseStyle['name'])
     //         )
-    //     ))
+    //     }
-    // }
+    // ))
+  }
 
-    getBaseStyle(styleName: string): Observable<BaseStyle> {
+  // XXX: unused
-        return this.mapService.getBaseStyleApiMapBaseStyleNameGet({name: styleName}).pipe(map(
+  // getBaseStyleList(): Observable<BaseStyle[]> {
-            data => new BaseStyle(data.name, <any>data.style)
+  //     return this.apollo.query({query: baseStyleListQuery}).pipe(map(
-        ))
+  //         data => data['data']['base_style_list'].map(
-    }
+  //             (baseStyle: string) => new BaseStyle(baseStyle['name'])
+  //         )
+  //     ))
+  // }
 
-    // getStores(): Observable<LayerNode[]> {
+  getBaseStyle(styleName: string): Observable<BaseStyle> {
-    //     return this.apollo.query({
+    return this.mapService.getBaseStyleApiMapBaseStyleNameGet({ name: styleName }).pipe(map(
-    //         query: storeQuery,
+      (data: OApiBaseStyle) => new BaseStyle(data.name, <any>data.style)
-    //     }).pipe(map(
+    ))
-    //         res => res['data']['stores'].map(
+  }
-    //             (layer: Object) => new LayerNode(
-    //                 layer['name'],
-    //                 layer['group'],
-    //                 layer['icon'],
-    //                 layer['symbol'] || gisTypeSymbolMap[layer['gisType']],
-    //                 layer['store'],
-    //                 layer['rawSurveyStore'],
-    //                 layer['type'],
-    //                 layer['gisType'],
-    //                 layer['style'],
-    //                 layer['zIndex'],
-    //                 layer['count'],
-    //                 layer['description'],
-    //                 layer['live'],
-    //                 layer['custom'],
-    //                 layer['tagPlugins'],
-    //                 layer['viewableRole']
-    //             )
-    //         )
-    //     ))
-    // }
 
-    // getPrimaryGroups(): Observable<PrimaryGroupNode[]> {
+  // getStores(): Observable<LayerNode[]> {
-    //     return this.apollo.query({
+  //     return this.apollo.query({
-    //         query: geomGroupQuery,
+  //         query: storeQuery,
-    //     }).pipe(map(
+  //     }).pipe(map(
-    //         res => res['data']['geomGroup'] && res['data']['geomGroup'].map(
+  //         res => res['data']['stores'].map(
-    //             (gg: Object) => new PrimaryGroupNode(
+  //             (layer: Object) => new LayerNode(
-    //                 gg['name'],
+  //                 layer['name'],
-    //                 gg['title'],
+  //                 layer['group'],
-    //                 gg['description']
+  //                 layer['icon'],
-    //             )
+  //                 layer['symbol'] || gisTypeSymbolMap[layer['gisType']],
-    //         )
+  //                 layer['store'],
-    //     ))
+  //                 layer['rawSurveyStore'],
-    // }
+  //                 layer['type'],
-}
+  //                 layer['gisType'],
+  //                 layer['style'],
+  //                 layer['zIndex'],
+  //                 layer['count'],
+  //                 layer['description'],
+  //                 layer['live'],
+  //                 layer['custom'],
+  //                 layer['tagPlugins'],
+  //                 layer['viewableRole']
+  //             )
+  //         )
+  //     ))
+  // }
+
+  // getPrimaryGroups(): Observable<PrimaryGroupNode[]> {
+  //     return this.apollo.query({
+  //         query: geomGroupQuery,
+  //     }).pipe(map(
+  //         res => res['data']['geomGroup'] && res['data']['geomGroup'].map(
+  //             (gg: Object) => new PrimaryGroupNode(
+  //                 gg['name'],
+  //                 gg['title'],
+  //                 gg['description']
+  //             )
+  //         )
+  //     ))
+  // }
+}

src/app/openapi/core/OpenAPI.ts

@@ -47,7 +47,7 @@ export const OpenAPI: OpenAPIConfig = {
 	PASSWORD: undefined,
 	TOKEN: undefined,
 	USERNAME: undefined,
-	VERSION: '0.1.dev85+g41e92fa.d20240509',
+	VERSION: '0.6.0a0',
 	WITH_CREDENTIALS: false,
 	interceptors: {
 		response: new Interceptors(),

src/app/openapi/schemas.gen.ts

@@ -259,12 +259,26 @@ export const $BaseStyle = {
             title: 'Style'
         },
         mbtiles: {
-            type: 'string',
+            anyOf: [
+                {
+                    type: 'string'
+                },
+                {
+                    type: 'null'
+                }
+            ],
             title: 'Mbtiles'
         },
-        static_tiles_url: {
+        static_url: {
-            type: 'string',
+            anyOf: [
-            title: 'Static Tiles Url'
+                {
+                    type: 'string'
+                },
+                {
+                    type: 'null'
+                }
+            ],
+            title: 'Static Url'
         },
         enabled: {
             type: 'boolean',
@@ -273,7 +287,7 @@ export const $BaseStyle = {
         }
     },
     type: 'object',
-    required: ['name', 'style', 'mbtiles', 'static_tiles_url'],
+    required: ['name'],
     title: 'BaseStyle'
 } as const;
 
@@ -311,7 +325,6 @@ export const $BasketDefault = {
             title: 'Store'
         }
     },
-    additionalProperties: false,
     type: 'object',
     title: 'BasketDefault'
 } as const;
@@ -514,52 +527,43 @@ export const $BootstrapData = {
         version: {
             type: 'string',
             title: 'Version',
-            default: '0.1.dev85+g41e92fa.d20240509'
+            default: '0.6.0a0'
         },
         title: {
             type: 'string',
             title: 'Title',
-            default: 'Auroville Geomatics Studio (Me)'
+            default: 'Gisaf'
         },
         windowTitle: {
             type: 'string',
             title: 'Windowtitle',
-            default: 'AV Geomatics Studio (Me)'
+            default: 'Gisaf'
         },
         map: {
-            allOf: [
+            '$ref': '#/components/schemas/Map',
-                {
-                    '$ref': '#/components/schemas/Map'
-                }
-            ],
             default: {
-                attribution: '© Auroville CSR Geomatics',
-                bearing: 0,
-                defaultStatus: ['E'],
-                lat: 12.007,
-                lng: 79.8098,
-                opacity: 0.4,
-                pitch: 0,
-                status: ['E', 'F', 'D'],
-                style: 'No base map',
-                tagKeys: ['source'],
                 tileServer: {
-                    baseDir: '/home/phil/gisaf_misc/map',
+                    baseDir: '/home/phil/.local/share/gisaf/mbtiles_files_dir',
-                    openMapTilesKey: 'cS3lrAfYXoM4MDooT6aS',
+                    spriteBaseDir: '/home/phil/.local/share/gisaf/mbtiles_sprites_dir',
-                    spriteBaseDir: '/home/phil/gisaf_misc/map/sprite',
+                    spriteBaseUrl: 'https://gisaf.example.org',
-                    spriteBaseUrl: 'https://gis.auroville.org.in',
                     spriteUrl: '/tiles/sprite/sprite',
-                    useRequestUrl: true
+                    useRequestUrl: false
                 },
-                zoom: 14
+                zoom: 14,
+                pitch: 45,
+                lat: 12,
+                lng: 79.8106,
+                bearing: 0,
+                style: 'OpenFreeMap',
+                opacity: 1,
+                attribution: '',
+                status: ['E', 'F', 'D'],
+                defaultStatus: ['E'],
+                tagKeys: ['source']
             }
         },
         geo: {
-            allOf: [
+            '$ref': '#/components/schemas/Geo',
-                {
-                    '$ref': '#/components/schemas/Geo'
-                }
-            ],
             default: {
                 raw_survey: {
                     spatial_sys_ref: {
@@ -584,19 +588,13 @@ export const $BootstrapData = {
             }
         },
         measures: {
-            allOf: [
+            '$ref': '#/components/schemas/Measures',
-                {
+            default: {}
-                    '$ref': '#/components/schemas/Measures'
-                }
-            ],
-            default: {
-                defaultStore: 'avsm_water.well'
-            }
         },
         redirect: {
             type: 'string',
             title: 'Redirect',
-            default: 'http://gis.auroville.org.in'
+            default: ''
         },
         user: {
             anyOf: [
@@ -1442,11 +1440,7 @@ export const $FormFieldInput = {
 export const $Geo = {
     properties: {
         raw_survey: {
-            allOf: [
+            '$ref': '#/components/schemas/RawSurvey',
-                {
-                    '$ref': '#/components/schemas/RawSurvey'
-                }
-            ],
             default: {
                 spatial_sys_ref: {
                     author: 'AVSM',
@@ -1485,7 +1479,6 @@ export const $Geo = {
             default: 32644
         }
     },
-    additionalProperties: false,
     type: 'object',
     title: 'Geo'
 } as const;
@@ -1568,17 +1561,13 @@ export const $LegendItem = {
 export const $Map = {
     properties: {
         tileServer: {
-            allOf: [
+            '$ref': '#/components/schemas/TileServer',
-                {
-                    '$ref': '#/components/schemas/TileServer'
-                }
-            ],
             default: {
-                baseDir: '/path/to/mbtiles_files_dir',
+                baseDir: '/home/phil/.local/share/gisaf/mbtiles_files_dir',
-                spriteBaseDir: '/path/to/mbtiles_sprites_dir',
+                useRequestUrl: false,
-                spriteBaseUrl: 'https://gisaf.example.org',
+                spriteBaseDir: '/home/phil/.local/share/gisaf/mbtiles_sprites_dir',
                 spriteUrl: '/tiles/sprite/sprite',
-                useRequestUrl: false
+                spriteBaseUrl: 'https://gisaf.example.org'
             }
         },
         zoom: {
@@ -1609,7 +1598,7 @@ export const $Map = {
         style: {
             type: 'string',
             title: 'Style',
-            default: 'OSM (vector)'
+            default: 'OpenFreeMap'
         },
         opacity: {
             type: 'number',
@@ -1646,7 +1635,6 @@ export const $Map = {
             default: ['source']
         }
     },
-    additionalProperties: false,
     type: 'object',
     title: 'Map'
 } as const;
@@ -1790,7 +1778,6 @@ export const $Measures = {
             title: 'Defaultstore'
         }
     },
-    additionalProperties: false,
     type: 'object',
     title: 'Measures'
 } as const;
@@ -2109,11 +2096,7 @@ export const $Project = {
 export const $RawSurvey = {
     properties: {
         spatial_sys_ref: {
-            allOf: [
+            '$ref': '#/components/schemas/SpatialSysRef',
-                {
-                    '$ref': '#/components/schemas/SpatialSysRef'
-                }
-            ],
             default: {
                 author: 'AVSM',
                 ellps: 'WGS84',
@@ -2134,7 +2117,6 @@ export const $RawSurvey = {
             default: 910001
         }
     },
-    additionalProperties: false,
     type: 'object',
     title: 'RawSurvey'
 } as const;
@@ -2237,7 +2219,6 @@ export const $SpatialSysRef = {
             default: 1328608.994
         }
     },
-    additionalProperties: false,
     type: 'object',
     title: 'SpatialSysRef'
 } as const;
@@ -2386,11 +2367,12 @@ export const $Store = {
         },
         z_index: {
             type: 'integer',
-            title: 'Z Index'
+            title: 'Z Index',
+            default: 500
         }
     },
     type: 'object',
-    required: ['name', 'auto_import', 'custom', 'description', 'gis_type', 'group', 'in_menu', 'is_db', 'is_line_work', 'is_live', 'long_name', 'type', 'minor_group_1', 'minor_group_2', 'status', 'style', 'symbol', 'title', 'viewable_role', 'z_index'],
+    required: ['name', 'auto_import', 'custom', 'description', 'gis_type', 'group', 'in_menu', 'is_db', 'is_line_work', 'is_live', 'long_name', 'type', 'minor_group_1', 'minor_group_2', 'status', 'style', 'symbol', 'title'],
     title: 'Store'
 } as const;
 
@@ -2648,8 +2630,9 @@ export const $TileServer = {
     properties: {
         baseDir: {
             type: 'string',
+            format: 'path',
             title: 'Basedir',
-            default: '/path/to/mbtiles_files_dir'
+            default: '/home/phil/.local/share/gisaf/mbtiles_files_dir'
         },
         useRequestUrl: {
             type: 'boolean',
@@ -2658,8 +2641,9 @@ export const $TileServer = {
         },
         spriteBaseDir: {
             type: 'string',
+            format: 'path',
             title: 'Spritebasedir',
-            default: '/path/to/mbtiles_sprites_dir'
+            default: '/home/phil/.local/share/gisaf/mbtiles_sprites_dir'
         },
         spriteUrl: {
             type: 'string',
@@ -2683,7 +2667,6 @@ export const $TileServer = {
             title: 'Openmaptileskey'
         }
     },
-    additionalProperties: false,
     type: 'object',
     title: 'TileServer'
 } as const;

src/app/openapi/types.gen.ts

@@ -54,11 +54,11 @@ export type BaseMapWithStores = {
 export type BaseStyle = {
     id?: number | null;
     name: string;
-    style: {
+    style?: {
     [key: string]: unknown;
 } | null;
-    mbtiles: string;
+    mbtiles?: string | null;
-    static_tiles_url: string;
+    static_url?: string | null;
     enabled?: boolean;
 };
 
@@ -457,8 +457,8 @@ export type Store = {
     style: string | null;
     symbol: string | null;
     title: string;
-    viewable_role: string | null;
+    viewable_role?: string | null;
-    z_index: number;
+    z_index?: number;
 };
 
 export type StoreNameOnly = {
@@ -751,9 +751,7 @@ export type $OpenApiTs = {
     };
     '/api/token': {
         post: {
-            req: {
+            req: LoginForAccessTokenApiTokenPostData;
-                formData: Body_login_for_access_token_api_token_post;
-            };
             res: {
                 /**
                  * Successful Response
@@ -870,9 +868,7 @@ export type $OpenApiTs = {
     };
     '/api/data-provider/{store}': {
         get: {
-            req: {
+            req: GetModelListApiDataProviderStoreGetData;
-                store: string;
-            };
             res: {
                 /**
                  * Successful Response
@@ -891,12 +887,7 @@ export type $OpenApiTs = {
     };
     '/api/{store_name}/values/{value}': {
         get: {
-            req: {
+            req: GetModelValuesApiStoreNameValuesValueGetData;
-                resample?: string | null;
-                storeName: string;
-                value: string;
-                where: string;
-            };
             res: {
                 /**
                  * Successful Response
@@ -957,10 +948,7 @@ export type $OpenApiTs = {
     };
     '/api/feature-info/{store}/{id}': {
         get: {
-            req: {
+            req: GetFeatureInfoApiFeatureInfoStoreIdGetData;
-                id: string;
-                store: string;
-            };
             res: {
                 /**
                  * Successful Response
@@ -979,9 +967,7 @@ export type $OpenApiTs = {
     };
     '/api/model-info/{store}': {
         get: {
-            req: {
+            req: GetModelInfoApiModelInfoStoreGetData;
-                store: string;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1000,11 +986,7 @@ export type $OpenApiTs = {
     };
     '/api/plot-params/{store}': {
         get: {
-            req: {
+            req: GetPlotParamsApiPlotParamsStoreGetData;
-                id: string;
-                store: string;
-                value: string;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1037,9 +1019,7 @@ export type $OpenApiTs = {
     };
     '/api/execTagActions': {
         post: {
-            req: {
+            req: ExecuteTagActionApiExecTagActionsPostData;
-                requestBody: Body_execute_tag_action_api_execTagActions_post;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1058,12 +1038,7 @@ export type $OpenApiTs = {
     };
     '/api/gj/{store_name}': {
         get: {
-            req: {
+            req: GetGeojsonApiGjStoreNameGetData;
-                ifNoneMatch?: string | null;
-                preserveTopology?: boolean | null;
-                simplify?: number | null;
-                storeName: unknown;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1096,9 +1071,7 @@ export type $OpenApiTs = {
     };
     '/api/admin/basket/{name}': {
         get: {
-            req: {
+            req: GetBasketApiAdminBasketNameGetData;
-                name: string;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1117,14 +1090,7 @@ export type $OpenApiTs = {
     };
     '/api/admin/basket/upload/{name}': {
         post: {
-            req: {
+            req: UploadBasketFileApiAdminBasketUploadNamePostData;
-                autoImport?: boolean;
-                equipmentId?: number | null;
-                formData: Body_upload_basket_file_api_admin_basket_upload__name__post;
-                name: string;
-                projectId?: number | null;
-                surveyorId?: number | null;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1143,11 +1109,7 @@ export type $OpenApiTs = {
     };
     '/api/admin/basket/download/{name}/{file_id}/{file_name}': {
         get: {
-            req: {
+            req: DownloadBasketFileApiAdminBasketDownloadNameFileIdFileNameGetData;
-                fileId: number;
-                fileName: string;
-                name: string;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1166,11 +1128,7 @@ export type $OpenApiTs = {
     };
     '/api/admin/basket/import/{basket}/{file_id}': {
         get: {
-            req: {
+            req: ImportBasketFileApiAdminBasketImportBasketFileIdGetData;
-                basket: string;
-                dryRun?: boolean;
-                fileId: number;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1189,10 +1147,7 @@ export type $OpenApiTs = {
     };
     '/api/admin/basket/delete/{basket}/{file_id}': {
         get: {
-            req: {
+            req: DeleteBasketFileApiAdminBasketDeleteBasketFileIdGetData;
-                basket: string;
-                fileId: number;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1239,10 +1194,7 @@ export type $OpenApiTs = {
     };
     '/api/dashboard/page/{group}/{name}': {
         get: {
-            req: {
+            req: GetDashboardPageApiDashboardPageGroupNameGetData;
-                group: string;
-                name: string;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1271,9 +1223,7 @@ export type $OpenApiTs = {
     };
     '/api/map/base_style/{name}': {
         get: {
-            req: {
+            req: GetBaseStyleApiMapBaseStyleNameGetData;
-                name: string;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1288,9 +1238,7 @@ export type $OpenApiTs = {
     };
     '/api/map/layer_style/{store}': {
         get: {
-            req: {
+            req: GetLayerStyleApiMapLayerStyleStoreGetData;
-                store: string;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1305,12 +1253,7 @@ export type $OpenApiTs = {
     };
     '/api/download/csv/{store}/{model_id}/{value}/{resample}': {
         get: {
-            req: {
+            req: DownloadCsvApiDownloadCsvStoreModelIdValueResampleGetData;
-                modelId: number;
-                resample: string;
-                store: string;
-                value: string;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1329,11 +1272,7 @@ export type $OpenApiTs = {
     };
     '/api/download/geodata/{stores}': {
         get: {
-            req: {
+            req: DownloadGeodataApiDownloadGeodataStoresGetData;
-                format?: string;
-                reproject?: boolean;
-                stores: string;
-            };
             res: {
                 /**
                  * Successful Response
@@ -1352,11 +1291,7 @@ export type $OpenApiTs = {
     };
     '/api/download/plugin/{name}/{store}/{id}': {
         get: {
-            req: {
+            req: ExecuteActionApiDownloadPluginNameStoreIdGetData;
-                id: number;
-                name: string;
-                store: string;
-            };
             res: {
                 /**
                  * Successful Response

src/version.json

@@ -0,0 +1,3 @@
+{
+  "version": "0.0.0"
+}

tsconfig.json

@@ -1,27 +1,28 @@
 {
   "compileOnSave": false,
   "compilerOptions": {
-    "importHelpers": true,
-    "module": "es2020",
-    "outDir": "./dist/out-tsc",
-    "sourceMap": true,
     "declaration": false,
-    "moduleResolution": "node",
+    "esModuleInterop": true,
     "experimentalDecorators": true,
-    "target": "ES2022",
+    "importHelpers": true,
-    "typeRoots": [
-      "node_modules/@types",
-      "@types"
-    ],
     "lib": [
       "es2019",
       "dom",
       "esnext.asynciterable"
     ],
-    "allowSyntheticDefaultImports": true,
+    "module": "es2020",
+    "moduleResolution": "node",
+    "resolveJsonModule": true,
+    "outDir": "./dist/out-tsc",
+    "sourceMap": true,
+    "target": "ES2022",
+    "typeRoots": [
+      "node_modules/@types",
+      "@types"
+    ],
     "useDefineForClassFields": false
   },
   "angularCompilerOptions": {
     "strictTemplates": true
   }
-}
+}