Merge branch 'develop' of https://git.akkerweb.nl/FarmMaps/FarmMapsLib into develop

Aw3998 Add click
[ci skip] Changed by Jenkins: 2394
2023-12-15 14:01:02 +01:00 · 2023-12-15 14:00:48 +01:00 · 2023-12-15 12:51:48 +00:00 · 2023-12-15 13:49:13 +01:00 · 2023-12-15 10:10:59 +00:00 · 2023-12-15 11:05:40 +01:00
11 changed files with 157 additions and 114 deletions
@@ -1,24 +1,24 @@
-@Library('farmmaps-shared-library') _
-
-pipeline {
-  agent any;
-  options {
-    copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
-    disableConcurrentBuilds abortPrevious: true;
-  }
-  stages {
-    stage('FarmmapsLibBuildAll') {
-      steps {
-        stepFarmmapsLibBuildAll();
-      }
-    }
-  }
-  post {
-    success {
-      postSuccess();
-    }
-    always {
-      postAlways();
-    }
-  }
+@Library('farmmaps-shared-library') _
+
+pipeline {
+  agent any;
+  options {
+    copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
+    disableConcurrentBuilds();
+  }
+  stages {
+    stage('FarmmapsLibBuildAll') {
+      steps {
+        stepFarmmapsLibBuildAll();
+      }
+    }
+  }
+  post {
+    success {
+      postSuccess();
+    }
+    always {
+      postAlways();
+    }
+  }
 }
@@ -1,24 +1,24 @@
-@Library('farmmaps-shared-library') _
-
-pipeline {
-  agent any;
-  options {
-    copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
-    disableConcurrentBuilds abortPrevious: true;
-  }
-  stages {
-    stage('FarmmapsLibBuildAll') {
-      steps {
-        stepFarmmapsLibBuildAll();
-      }
-    }
-  }
-  post {
-    success {
-      postSuccess();
-    }
-    always {
-      postAlways();
-    }
-  }
+@Library('farmmaps-shared-library') _
+
+pipeline {
+  agent any;
+  options {
+    copyArtifactPermission projectNames: env.allProjectsArtifactPermission;
+    disableConcurrentBuilds();
+  }
+  stages {
+    stage('FarmmapsLibBuildAll') {
+      steps {
+        stepFarmmapsLibBuildAll();
+      }
+    }
+  }
+  post {
+    success {
+      postSuccess();
+    }
+    always {
+      postAlways();
+    }
+  }
 }
@@ -1,12 +1,12 @@
 {
  "name": "farmmaps-lib-app",
-  "version": "3.5.0",
+  "version": "4.2.0",
  "lockfileVersion": 2,
  "requires": true,
  "packages": {
    "": {
      "name": "farmmaps-lib-app",
-      "version": "3.5.0",
+      "version": "4.2.0",
      "dependencies": {
        "@angular-eslint/eslint-plugin": "^15.2.1",
        "@angular/animations": "^14.1.3",
@@ -84,6 +84,62 @@
        "typescript": "~4.6.4"
      }
    },
+    "dist/common": {
+      "name": "@farmmaps/common",
+      "version": "4.2.0-prerelease.2393",
+      "dependencies": {
+        "tslib": "^2.3.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=14.0.0",
+        "@angular/core": ">=14.0.0",
+        "@angular/forms": ">=14.0.0",
+        "@microsoft/signalr": ">=3.1.3",
+        "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
+        "@ngrx/effects": ">=14.0.0",
+        "@ngrx/router-store": ">=14.0.0",
+        "@ngrx/store": ">=14.0.0",
+        "angular-oauth2-oidc": ">=13.0.0",
+        "bootstrap": ">=4.4.1",
+        "moment": ">=2.27.0",
+        "ngx-avatar": ">=4.1.0",
+        "ngx-clipboard": ">=14.0.1",
+        "ngx-image-cropper": ">=3.3.5",
+        "ngx-uploadx": ">=5.1.0",
+        "tassign": ">=1.0.0"
+      }
+    },
+    "dist/common-map": {
+      "name": "@farmmaps/common-map",
+      "version": "4.2.0-prerelease.2393",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/core": ">=14.0.0",
+        "@ngrx/effects": ">=14.0.0",
+        "@ngrx/router-store": ">=14.0.0",
+        "@ngrx/store": ">=14.0.0",
+        "ngrx-store-localstorage": ">=14.0.0",
+        "ngx-openlayers": ">=1.0.0-next.19",
+        "ol": ">=6.8.1",
+        "tassign": ">=1.0.0"
+      }
+    },
+    "dist/common-map3d": {
+      "name": "@farmmaps/common-map3d",
+      "version": "4.2.0-prerelease.2393",
+      "dependencies": {
+        "tslib": "^2.0.0"
+      },
+      "peerDependencies": {
+        "@angular/common": ">=14.0.0",
+        "@angular/core": ">=14.0.0",
+        "cesium": ">=1.82.1",
+        "ngx-openlayers": "1.0.0-next.19",
+        "ol-cesium": ">=2.13.0"
+      }
+    },
    "node_modules/@adobe/css-tools": {
      "version": "4.0.1",
      "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.0.1.tgz",
@@ -2971,60 +3027,16 @@
      }
    },
    "node_modules/@farmmaps/common": {
-      "version": "2.0.0",
-      "resolved": "file:dist/common",
-      "dependencies": {
-        "tslib": "^2.3.0"
-      },
-      "peerDependencies": {
-        "@angular/common": ">=14.0.0",
-        "@angular/core": ">=14.0.0",
-        "@angular/forms": ">=14.0.0",
-        "@microsoft/signalr": ">=3.1.3",
-        "@ng-bootstrap/ng-bootstrap": ">=10.0.0",
-        "@ngrx/effects": ">=14.0.0",
-        "@ngrx/router-store": ">=14.0.0",
-        "@ngrx/store": ">=14.0.0",
-        "angular-oauth2-oidc": ">=13.0.0",
-        "bootstrap": ">=4.4.1",
-        "moment": ">=2.27.0",
-        "ngx-avatar": ">=4.1.0",
-        "ngx-clipboard": ">=14.0.1",
-        "ngx-image-cropper": ">=3.3.5",
-        "ngx-uploadx": ">=5.1.0",
-        "tassign": ">=1.0.0"
-      }
+      "resolved": "dist/common",
+      "link": true
    },
    "node_modules/@farmmaps/common-map": {
-      "version": "2.0.0",
-      "resolved": "file:dist/common-map",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@angular/core": ">=14.0.0",
-        "@ngrx/effects": ">=14.0.0",
-        "@ngrx/router-store": ">=14.0.0",
-        "@ngrx/store": ">=14.0.0",
-        "ngrx-store-localstorage": ">=14.0.0",
-        "ngx-openlayers": ">=1.0.0-next.19",
-        "ol": ">=6.8.1",
-        "tassign": ">=1.0.0"
-      }
+      "resolved": "dist/common-map",
+      "link": true
    },
    "node_modules/@farmmaps/common-map3d": {
-      "version": "2.0.0",
-      "resolved": "file:dist/common-map3d",
-      "dependencies": {
-        "tslib": "^2.0.0"
-      },
-      "peerDependencies": {
-        "@angular/common": ">=14.0.0",
-        "@angular/core": ">=14.0.0",
-        "cesium": ">=1.82.1",
-        "ngx-openlayers": "1.0.0-next.19",
-        "ol-cesium": ">=2.13.0"
-      }
+      "resolved": "dist/common-map3d",
+      "link": true
    },
    "node_modules/@gar/promisify": {
      "version": "1.1.3",
@@ -19071,19 +19083,19 @@
      "dev": true
    },
    "@farmmaps/common": {
-      "version": "2.0.0",
+      "version": "file:dist/common",
      "requires": {
        "tslib": "^2.3.0"
      }
    },
    "@farmmaps/common-map": {
-      "version": "2.0.0",
+      "version": "file:dist/common-map",
      "requires": {
        "tslib": "^2.0.0"
      }
    },
    "@farmmaps/common-map3d": {
-      "version": "2.0.0",
+      "version": "file:dist/common-map3d",
      "requires": {
        "tslib": "^2.0.0"
      }
@@ -1,7 +1,7 @@
 {
  "name": "farmmaps-lib-app",
-  "version": "3.5.0",
-  "scripts": {
+  "version": "4.2.0",
+  "scripts":   {
    "ng": "ng",
    "start": "ng serve",
    "build": "ng build",
@@ -10,7 +10,7 @@
    "e2e": "ng e2e"
  },
  "private": true,
-  "dependencies": {
+  "dependencies":   {
    "@angular/animations": "^14.1.3",
    "@angular/common": "^14.1.3",
    "@angular/compiler": "^14.1.3",
@@ -56,7 +56,7 @@
    "util": "^0.12.4",
    "zone.js": "~0.11.4"
  },
-  "devDependencies": {
+  "devDependencies":   {
    "@angular-builders/custom-webpack": "^14",
    "@angular-devkit/build-angular": "^14.1.3",
    "@angular/cli": "^14.1.3",
@@ -86,4 +86,4 @@
    "ts-node": "^8.8.1",
    "typescript": "~4.6.4"
  }
-}
+}
@@ -18,6 +18,7 @@ export const SETPARENT = '[Map] SetParent';
 export const SETPERIOD = '[Map] SetPeriod';
 export const STARTSEARCH = '[Map] StartSearch';
 export const STARTSEARCHSUCCESS = '[Map] StartSearchSuccess';
+export const CLICKFEATURE = '[Map] ClickFeature';
 export const SELECTFEATURE = '[Map] SelectFeature';
 export const SELECTITEM = '[Map] SelectItem';
 export const SELECTITEMSUCCESS = '[Map] SelectItemSuccess';
@@ -56,6 +57,7 @@ export const GETLAYERVALUE = '[Map] GetLayerValue'
 export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
 export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
 export const SETVIEWSTATE = '[Map] SetViewState'
+export const CLEARFEATURES = '[Map] ClearFeatures';


 export class Clear implements Action {
@@ -111,6 +113,12 @@ export class StartSearchSuccess implements Action {
  constructor(public features: Array<Feature<Geometry>>, public query:IQueryState) { }
 }

+export class ClickFeature implements Action {
+  readonly type = CLICKFEATURE;
+
+  constructor(public feature:Feature<Geometry>) { }
+}
+
 export class SelectFeature implements Action {
  readonly type = SELECTFEATURE;

@@ -329,12 +337,18 @@ export class SetViewState implements Action {
  constructor(public enabled:boolean) {}
 }

+export class ClearFeatures implements Action {
+  readonly type = CLEARFEATURES;
+  constructor() {}
+}
+
 export type Actions = SetMapState
  | Init
  | Clear
  | SetParent
  | StartSearch
  | StartSearchSuccess
+  | ClickFeature
  | SelectFeature
  | SelectItem
  | SelectItemSuccess
@@ -374,5 +388,6 @@ export type Actions = SetMapState
  | GetLayerValue
  | SetPeriod
  | ToggleShowDataLayerSlide
-  | SetViewState;
+  | SetViewState
+  | ClearFeatures;

@@ -23,8 +23,9 @@ export abstract class AbstractFeatureListComponent {

  handleFeatureClick(feature:Feature<Geometry>) {
    if(feature) {
+      this.store.dispatch(new mapActions.ClickFeature(feature));
      const action = this.getAction(feature);
-      this.store.dispatch(action);  
+      this.store.dispatch(action);
    }
  }

@@ -1,15 +1,15 @@
 <div class="row ps-3">
  <div class="col-8 nopadding"><span i18n>Average</span>:</div>
-  <div class="col-4 pull-left nopadding">{{histogram.mean| number:'1.0-2'}}</div>
+  <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.mean)| number:'1.0-2'}}</div>
  <div class="col-8 nopadding"><span i18n>Standard deviation</span>:</div>
-  <div class="col-4 pull-left nopadding">{{histogram.stddev| number:'1.0-2'}}</div>
+  <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.stddev)| number:'1.0-2'}}</div>
  <div class="col-8 nopadding"><span i18n>Min</span>:</div>
-  <div class="col-4 pull-left nopadding">{{histogram.min| number:'1.0-2'}}</div>
+  <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.min)| number:'1.0-2'}}</div>
  <div class="col-8 nopadding" ><span i18n>Max</span>:</div>
-  <div class="col-4 pull-left nopadding">{{histogram.max| number:'1.0-2'}}</div>
+  <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.max)| number:'1.0-2'}}</div>

  <ng-container *ngIf="showConfidenceInterval()">
    <div class="col-8 nopadding"><span i18n>Confidence interval</span>:</div>
-    <div class="col-4 pull-left nopadding">{{histogram.confidence * 100| number:'1.0-0'}}%</div>
+    <div class="col-4 pull-left nopadding">{{ getScaledValue(histogram.confidence * 100)| number:'1.0-0'}}%</div>
  </ng-container>
 </div>
@@ -14,6 +14,17 @@ export class HistogramDetailsComponent {
  @Input()
  histogram: IHistogram;

+  @Input()
+  scale: number | null;
+
+  public getScaledValue(value: number): number {
+    let v = value;
+    if (this.scale && this.scale != 0) {
+      v = this.scale * value;
+    }
+    return v;
+  }
+
  showConfidenceInterval(): boolean {
    return this.histogram.confidence != null && this.histogram.confidence !== 1;
  }
@@ -35,7 +35,7 @@
        </ng-container>

        <ng-template #histogram>
-          <fm-map-histogram-details [histogram]="layer.renderer.band.histogram"></fm-map-histogram-details>
+          <fm-map-histogram-details [histogram]="layer.renderer.band.histogram" [scale]="layer.scale"></fm-map-histogram-details>
        </ng-template>
      </div>
    </td>
@@ -192,6 +192,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
  }

  handleFeatureClick(feature: Feature<Geometry>) {
+    this.store.dispatch(new mapActions.ClickFeature(feature));
    this.clickedFeature.next(feature);
  }

@@ -388,6 +388,9 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
    case mapActions.CLEARLAYERS: {
      return tassign(state, {overlayLayers: [], selectedOverlayLayer: null});
    }
+    case mapActions.CLEARFEATURES: {
+      return tassign(state, {features: [], selectedFeature: null});
+    }
    case mapActions.SETVISIBILITY: {
      const a = action as mapActions.SetVisibility;
      if(state.selectedItemLayer == a.itemLayer) {