FarmMaps/FarmMapsLib
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: FarmMaps:98142fab56d0324996279796af3e95056cbfd66e
Branches Tags
FarmMaps:develop
FarmMaps:master
FarmMaps:AW-4620
FarmMaps:2022.01
FarmMaps:feature/MinimizeSolution
FarmMaps:2024.10
FarmMaps:2024.04
FarmMaps:2023.10
FarmMaps:2023.08
FarmMaps:2023.03
FarmMaps:2022.08
FarmMaps:2022.05
FarmMaps:2022.03
FarmMaps:2021.09
FarmMaps:FarmMapsLib_0_0_1_prerelease_72
..
compare: FarmMaps:4c5b89852b7dab3cf74ada4f1d726d87fc1b9650
Branches Tags
FarmMaps:develop
FarmMaps:master
FarmMaps:AW-4620
FarmMaps:2022.01
FarmMaps:feature/MinimizeSolution
FarmMaps:2024.10
FarmMaps:2024.04
FarmMaps:2023.10
FarmMaps:2023.08
FarmMaps:2023.03
FarmMaps:2022.08
FarmMaps:2022.05
FarmMaps:2022.03
FarmMaps:2021.09
FarmMaps:FarmMapsLib_0_0_1_prerelease_72

No commits in common. "98142fab56d0324996279796af3e95056cbfd66e" and "4c5b89852b7dab3cf74ada4f1d726d87fc1b9650" have entirely different histories.
98142fab56 ... 4c5b89852b

5 changed files with 65 additions and 115 deletions
Show Stats Expand all files Collapse all files

125
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
"version": "3.0.1", "version": "3.0.0",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
"version": "3.0.1", "version": "3.0.0",
"dependencies": { "dependencies": {
"@angular/animations": "^14.1.3", "@angular/animations": "^14.1.3",
"@angular/common": "^14.1.3", "@angular/common": "^14.1.3",
@ -40,7 +40,7 @@
"ngx-image-cropper": "^3.3.5", "ngx-image-cropper": "^3.3.5",
"ngx-openlayers": "1.0.0-next.19", "ngx-openlayers": "1.0.0-next.19",
"ngx-uploadx": "^5.2.0", "ngx-uploadx": "^5.2.0",
"ol": "7.2.2", "ol": "6.14.1",
"olcs": "^2.13.1", "olcs": "^2.13.1",
"resumablejs": "^1.1.0", "resumablejs": "^1.1.0",
"rxjs": "^6.6.7", "rxjs": "^6.6.7",
@ -79,59 +79,18 @@
} }
}, },
"dist/common": { "dist/common": {
"name": "@farmmaps/common",
"version": "2.0.0",
"dependencies": { "dependencies": {
"tslib": "^2.3.0" "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": { "dist/common-map": {
"name": "@farmmaps/common-map",
"version": "2.0.0",
"dependencies": { "dependencies": {
"tslib": "^2.0.0" "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": { "dist/common-map3d": {
"name": "@farmmaps/common-map3d",
"version": "2.0.0",
"dependencies": { "dependencies": {
"tslib": "^2.0.0" "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": { "node_modules/@adobe/css-tools": {
@ -2907,9 +2866,9 @@
} }
}, },
"node_modules/@mapbox/mapbox-gl-style-spec": { "node_modules/@mapbox/mapbox-gl-style-spec": {
"version": "13.28.0", "version": "13.26.0",
"resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.28.0.tgz", "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.26.0.tgz",
"integrity": "sha512-B8xM7Fp1nh5kejfIl4SWeY0gtIeewbuRencqO3cJDrCHZpaPg7uY+V8abuR+esMeuOjRl5cLhVTP40v+1ywxbg==", "integrity": "sha512-Ya1WiNz1qYau7xPYPQUbionrw9pjgZAIebGQdDXgwJuSAWeVCr02P7rqbYFHbXqX5TeAaq4qVpcaJb9oZtgaVQ==",
"dependencies": { "dependencies": {
"@mapbox/jsonlint-lines-primitives": "~2.0.2", "@mapbox/jsonlint-lines-primitives": "~2.0.2",
"@mapbox/point-geometry": "^0.1.0", "@mapbox/point-geometry": "^0.1.0",
@ -9673,9 +9632,9 @@
} }
}, },
"node_modules/mapbox-to-css-font": { "node_modules/mapbox-to-css-font": {
"version": "2.4.2", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.2.tgz", "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.1.tgz",
"integrity": "sha512-f+NBjJJY4T3dHtlEz1wCG7YFlkODEjFIYlxDdLIDMNpkSksqTt+l/d4rjuwItxuzkuMFvPyrjzV2lxRM4ePcIA==" "integrity": "sha512-QQ/iKiM43DM9+aujTL45Iz5o7gDeSFmy4LPl3HZmNcwCE++NxGazf+yFpY+wCb+YS23sDa1ghpo3zrNFOcHlow=="
}, },
"node_modules/media-typer": { "node_modules/media-typer": {
"version": "0.3.0", "version": "0.3.0",
@ -10645,13 +10604,12 @@
"dev": true "dev": true
}, },
"node_modules/ol": { "node_modules/ol": {
"version": "7.2.2", "version": "6.14.1",
"resolved": "https://registry.npmjs.org/ol/-/ol-7.2.2.tgz", "resolved": "https://registry.npmjs.org/ol/-/ol-6.14.1.tgz",
"integrity": "sha512-eqJ1hhVQQ3Ap4OhYq9DRu5pz9RMpLhmoTauDoIqpn7logVi1AJE+lXjEHrPrTSuZYjtFbMgqr07sxoLNR65nrw==", "integrity": "sha512-sIcUWkGud3Y2gT3TJubSHlkyMXiPVh1yxfCPHxmY8+qtm79bB9oRnei9xHVIbRRG0Ro6Ldp5E+BMVSvYCxSpaA==",
"dependencies": { "dependencies": {
"earcut": "^2.2.3", "geotiff": "^2.0.2",
"geotiff": "^2.0.7", "ol-mapbox-style": "^7.1.1",
"ol-mapbox-style": "^9.2.0",
"pbf": "3.2.1", "pbf": "3.2.1",
"rbush": "^3.0.1" "rbush": "^3.0.1"
}, },
@ -10661,12 +10619,13 @@
} }
}, },
"node_modules/ol-mapbox-style": { "node_modules/ol-mapbox-style": {
"version": "9.6.0", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-9.6.0.tgz", "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-7.1.1.tgz",
"integrity": "sha512-5XK1fAikf2q6gFozsdrRUCfRgKeQEj7EORECAb7zzi91MXL97AjSUSaKCMzNXtKhm2yyXx4jQth9KsF5h658Iw==", "integrity": "sha512-GLTEYiH/Ec9Zn1eS4S/zXyR2sierVrUc+OLVP8Ra0FRyqRhoYbXdko0b7OIeSHWdtJfHssWYefDOGxfTRUUZ/A==",
"dependencies": { "dependencies": {
"@mapbox/mapbox-gl-style-spec": "^13.23.1", "@mapbox/mapbox-gl-style-spec": "^13.20.1",
"mapbox-to-css-font": "^2.4.1" "mapbox-to-css-font": "^2.4.1",
"webfont-matcher": "^1.1.0"
} }
}, },
"node_modules/olcs": { "node_modules/olcs": {
@ -15019,6 +14978,11 @@
"node": ">=0.8.0" "node": ">=0.8.0"
} }
}, },
"node_modules/webfont-matcher": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/webfont-matcher/-/webfont-matcher-1.1.0.tgz",
"integrity": "sha512-ov8lMvF9wi4PD7fK2Axn9PQEpO9cYI0fIoGqErwd+wi8xacFFDmX114D5Q2Lw0Wlgmb+Qw/dKI2KTtimrJf85g=="
},
"node_modules/webpack": { "node_modules/webpack": {
"version": "5.74.0", "version": "5.74.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",
@ -17437,9 +17401,9 @@
"integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ==" "integrity": "sha512-rY0o9A5ECsTQRVhv7tL/OyDpGAoUB4tTvLiW1DSzQGq4bvTPhNw1VpSNjDJc5GFZ2XuyOtSWSVN05qOtcD71qQ=="
}, },
"@mapbox/mapbox-gl-style-spec": { "@mapbox/mapbox-gl-style-spec": {
"version": "13.28.0", "version": "13.26.0",
"resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.28.0.tgz", "resolved": "https://registry.npmjs.org/@mapbox/mapbox-gl-style-spec/-/mapbox-gl-style-spec-13.26.0.tgz",
"integrity": "sha512-B8xM7Fp1nh5kejfIl4SWeY0gtIeewbuRencqO3cJDrCHZpaPg7uY+V8abuR+esMeuOjRl5cLhVTP40v+1ywxbg==", "integrity": "sha512-Ya1WiNz1qYau7xPYPQUbionrw9pjgZAIebGQdDXgwJuSAWeVCr02P7rqbYFHbXqX5TeAaq4qVpcaJb9oZtgaVQ==",
"requires": { "requires": {
"@mapbox/jsonlint-lines-primitives": "~2.0.2", "@mapbox/jsonlint-lines-primitives": "~2.0.2",
"@mapbox/point-geometry": "^0.1.0", "@mapbox/point-geometry": "^0.1.0",
@ -22538,9 +22502,9 @@
} }
}, },
"mapbox-to-css-font": { "mapbox-to-css-font": {
"version": "2.4.2", "version": "2.4.1",
"resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.2.tgz", "resolved": "https://registry.npmjs.org/mapbox-to-css-font/-/mapbox-to-css-font-2.4.1.tgz",
"integrity": "sha512-f+NBjJJY4T3dHtlEz1wCG7YFlkODEjFIYlxDdLIDMNpkSksqTt+l/d4rjuwItxuzkuMFvPyrjzV2lxRM4ePcIA==" "integrity": "sha512-QQ/iKiM43DM9+aujTL45Iz5o7gDeSFmy4LPl3HZmNcwCE++NxGazf+yFpY+wCb+YS23sDa1ghpo3zrNFOcHlow=="
}, },
"media-typer": { "media-typer": {
"version": "0.3.0", "version": "0.3.0",
@ -23260,24 +23224,24 @@
"dev": true "dev": true
}, },
"ol": { "ol": {
"version": "7.2.2", "version": "6.14.1",
"resolved": "https://registry.npmjs.org/ol/-/ol-7.2.2.tgz", "resolved": "https://registry.npmjs.org/ol/-/ol-6.14.1.tgz",
"integrity": "sha512-eqJ1hhVQQ3Ap4OhYq9DRu5pz9RMpLhmoTauDoIqpn7logVi1AJE+lXjEHrPrTSuZYjtFbMgqr07sxoLNR65nrw==", "integrity": "sha512-sIcUWkGud3Y2gT3TJubSHlkyMXiPVh1yxfCPHxmY8+qtm79bB9oRnei9xHVIbRRG0Ro6Ldp5E+BMVSvYCxSpaA==",
"requires": { "requires": {
"earcut": "^2.2.3", "geotiff": "^2.0.2",
"geotiff": "^2.0.7", "ol-mapbox-style": "^7.1.1",
"ol-mapbox-style": "^9.2.0",
"pbf": "3.2.1", "pbf": "3.2.1",
"rbush": "^3.0.1" "rbush": "^3.0.1"
} }
}, },
"ol-mapbox-style": { "ol-mapbox-style": {
"version": "9.6.0", "version": "7.1.1",
"resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-9.6.0.tgz", "resolved": "https://registry.npmjs.org/ol-mapbox-style/-/ol-mapbox-style-7.1.1.tgz",
"integrity": "sha512-5XK1fAikf2q6gFozsdrRUCfRgKeQEj7EORECAb7zzi91MXL97AjSUSaKCMzNXtKhm2yyXx4jQth9KsF5h658Iw==", "integrity": "sha512-GLTEYiH/Ec9Zn1eS4S/zXyR2sierVrUc+OLVP8Ra0FRyqRhoYbXdko0b7OIeSHWdtJfHssWYefDOGxfTRUUZ/A==",
"requires": { "requires": {
"@mapbox/mapbox-gl-style-spec": "^13.23.1", "@mapbox/mapbox-gl-style-spec": "^13.20.1",
"mapbox-to-css-font": "^2.4.1" "mapbox-to-css-font": "^2.4.1",
"webfont-matcher": "^1.1.0"
} }
}, },
"olcs": { "olcs": {
@ -26470,6 +26434,11 @@
} }
} }
}, },
"webfont-matcher": {
"version": "1.1.0",
"resolved": "https://registry.npmjs.org/webfont-matcher/-/webfont-matcher-1.1.0.tgz",
"integrity": "sha512-ov8lMvF9wi4PD7fK2Axn9PQEpO9cYI0fIoGqErwd+wi8xacFFDmX114D5Q2Lw0Wlgmb+Qw/dKI2KTtimrJf85g=="
},
"webpack": { "webpack": {
"version": "5.74.0", "version": "5.74.0",
"resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz", "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.74.0.tgz",

4
package.json
View File

@ -43,7 +43,7 @@
"ngx-image-cropper": "^3.3.5", "ngx-image-cropper": "^3.3.5",
"ngx-openlayers": "1.0.0-next.19", "ngx-openlayers": "1.0.0-next.19",
"ngx-uploadx": "^5.2.0", "ngx-uploadx": "^5.2.0",
"ol": "7.2.2", "ol": "6.14.1",
"olcs": "^2.13.1", "olcs": "^2.13.1",
"resumablejs": "^1.1.0", "resumablejs": "^1.1.0",
"rxjs": "^6.6.7", "rxjs": "^6.6.7",
@ -80,4 +80,4 @@
"tslint": "~6.1.0", "tslint": "~6.1.0",
"typescript": "~4.6.4" "typescript": "~4.6.4"
} }
} }

2
projects/common-map/src/fm-map/components/legend/legend.component.html
View File

@ -31,7 +31,7 @@
<td colspan="4" class="pb-1 pt-1"> <td colspan="4" class="pb-1 pt-1">
<div class="info" [ngbCollapse]="hideHistogramDetails"> <div class="info" [ngbCollapse]="hideHistogramDetails">
<ng-container *ngIf="bandContainsStatistics(); else histogram"> <ng-container *ngIf="bandContainsStatistics(); else histogram">
<fm-map-statistics-details [statistics]="layer.renderer.band.statistics" [scale]="layer.scale"></fm-map-statistics-details> <fm-map-statistics-details [statistics]="layer.renderer.band.statistics"></fm-map-statistics-details>
</ng-container> </ng-container>
<ng-template #histogram> <ng-template #histogram>

20
projects/common-map/src/fm-map/components/legend/statistics-details/statistics-details.component.html
View File

@ -2,23 +2,23 @@
<div class="col-8 nopadding"><span i18n>Data points</span>:</div> <div class="col-8 nopadding"><span i18n>Data points</span>:</div>
<div class="col-4 pull-left nopadding">{{statistics.populationCount}}</div> <div class="col-4 pull-left nopadding">{{statistics.populationCount}}</div>
<div class="col-8 nopadding"><span i18n>Min</span>:</div> <div class="col-8 nopadding"><span i18n>Min</span>:</div>
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.min)| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.min| number:'1.0-2'}}</div>
<div class="col-8 nopadding"><span i18n>Max</span>:</div> <div class="col-8 nopadding"><span i18n>Max</span>:</div>
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.max)| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.max| number:'1.0-2'}}</div>
<div class="col-8 nopadding"><span i18n>Min+1</span>:</div> <div class="col-8 nopadding"><span i18n>Min+1</span>:</div>
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.minPlus)| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.minPlus| number:'1.0-2'}}</div>
<div class="col-8 nopadding"><span i18n>Max-1</span>:</div> <div class="col-8 nopadding"><span i18n>Max-1</span>:</div>
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.maxMinus)| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.maxMinus| number:'1.0-2'}}</div>
<div class="col-8 nopadding"><span i18n>Average</span>:</div> <div class="col-8 nopadding"><span i18n>Average</span>:</div>
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.mean)| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.mean| number:'1.0-2'}}</div>
<div class="col-8 nopadding"><span i18n>Standard deviation</span>:</div> <div class="col-8 nopadding"><span i18n>Standard deviation</span>:</div>
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.stddev)| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.stddev| number:'1.0-2'}}</div>
<div class="col-8 nopadding"><span i18n>Mode</span>:</div> <div class="col-8 nopadding"><span i18n>Mode</span>:</div>
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.mode)| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.mode| number:'1.0-2'}}</div>
<div class="col-8 nopadding"><span i18n>Median</span>:</div> <div class="col-8 nopadding"><span i18n>Median</span>:</div>
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.median)| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.median| number:'1.0-2'}}</div>
<div class="col-8 nopadding"><span i18n>Kurtosis</span>:</div> <div class="col-8 nopadding"><span i18n>Kurtosis</span>:</div>
<div class="col-4 pull-left nopadding">{{statistics.curtosis| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.curtosis| number:'1.0-2'}}</div>
@ -26,11 +26,11 @@
<div class="col-4 pull-left nopadding">{{statistics.skewness| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.skewness| number:'1.0-2'}}</div>
<div class="col-8 nopadding"><span i18n>Variance</span>:</div> <div class="col-8 nopadding"><span i18n>Variance</span>:</div>
<div class="col-4 pull-left nopadding">{{getSquaredScaledValue(statistics.variance)| number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.variance| number:'1.0-2'}}</div>
<div class="col-8 nopadding"><span i18n>Coefficient of variation</span>:</div> <div class="col-8 nopadding"><span i18n>Coefficient of variation</span>:</div>
<div class="col-4 pull-left nopadding">{{statistics.variationCoefficient | number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.variationCoefficient | number:'1.0-2'}}</div>
<ng-container *ngIf="statistics.confidenceIntervalLow !== undefined"> <ng-container *ngIf="statistics.confidenceIntervalLow !== undefined">
<div class="col-8 nopadding">90% <span i18n>Confidence interval</span>:</div> <div class="col-8 nopadding">90% <span i18n>Confidence interval</span>:</div>
<div class="col-4 pull-left nopadding">{{getScaledValue(statistics.confidenceIntervalLow) | number:'1.0-2'}} - {{getScaledValue(statistics.confidenceIntervalHigh) | number:'1.0-2'}}</div> <div class="col-4 pull-left nopadding">{{statistics.confidenceIntervalLow | number:'1.0-2'}} - {{statistics.confidenceIntervalHigh | number:'1.0-2'}}</div>
</ng-container> </ng-container>
</div> </div>

29
projects/common-map/src/fm-map/components/legend/statistics-details/statistics-details.component.ts
View File

@ -1,35 +1,16 @@
import { Component, Input } from '@angular/core'; import {Component, Input} from '@angular/core';
import { IStatistics } from '../../../models/color.map'; import {IStatistics} from '../../../models/color.map';
@Component({ @Component({
selector: 'fm-map-statistics-details', selector: 'fm-map-statistics-details',
templateUrl: './statistics-details.component.html', templateUrl: './statistics-details.component.html',
styles: ['.nopadding{\n' + styles: ['.nopadding{\n' +
' padding: 0 !important;\n' + ' padding: 0 !important;\n' +
' margin: 0 !important;\n' + ' margin: 0 !important;\n' +
'}'] '}']
}) })
export class StatisticsDetailsComponent { export class StatisticsDetailsComponent {
@Input() @Input()
statistics: IStatistics; statistics: IStatistics;
@Input()
scale: number | null;
public getScaledValue(value: number): number {
let v = value;
if (this.scale && this.scale != 0) {
v = this.scale * value;
}
return v;
}
public getSquaredScaledValue(value: number): number {
let v = value;
if (this.scale && this.scale != 0) {
v = (this.scale * this.scale) * value;
}
return v;
}
} }