Compare commits
145 Commits
2024.10
...
eed70c449b
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
eed70c449b | ||
| 4bef16aa2b | |||
| 05bc18c291 | |||
| 35ab2f7c90 | |||
| 2eca9b2562 | |||
|
|
e0c89f4358 | ||
| 604c1176c3 | |||
|
|
0ff8992874 | ||
| b5b84c2547 | |||
| c2b016b2b9 | |||
|
|
d44531274b | ||
| c52ee36d1b | |||
|
|
9b86927e2c | ||
|
|
e224b80995 | ||
|
|
88f3d9ef1a | ||
| 6737029a61 | |||
|
|
d4786564bd | ||
| 6fd69d7999 | |||
|
|
4ec75b3d5a | ||
| 04e3f1e71f | |||
| f66187d3a2 | |||
|
|
df77631299 | ||
| a8d0f05c81 | |||
|
|
df0d13e5dd | ||
|
|
c79637be77 | ||
|
|
b347220dd4 | ||
|
|
b5e11da9a8 | ||
|
|
edeadef96f | ||
|
|
267a299589 | ||
|
|
9d45c25a95 | ||
|
|
2ffce50c47 | ||
|
|
f50ff878e0 | ||
| 09c74448a8 | |||
| 205b73b30e | |||
|
|
313cc59fe7 | ||
| c3fb42c65f | |||
|
|
6b73fb0d55 | ||
| ea641caf38 | |||
| ac15b2018d | |||
|
|
fe73f615ad | ||
|
|
3e1b3ee78e | ||
|
|
58391b7828 | ||
|
|
b2b2a1e8be | ||
|
|
0d96a1be4f | ||
| d599430cb0 | |||
|
|
e17911b339 | ||
|
|
9d6cbffb3d | ||
|
|
a11eb81e73 | ||
|
|
4fc3ad933c | ||
|
|
e6d90c9e61 | ||
| 250b3841fe | |||
| 51291cd86f | |||
|
|
e9e3b719a4 | ||
|
|
1c0ad57b0a | ||
|
|
8684ba25c8 | ||
| 78ca3044cf | |||
| 2e55b5a70e | |||
|
|
af0a3dca2d | ||
| f039898c26 | |||
|
|
ab19b1c2ce | ||
| a2641f8ea5 | |||
|
|
d6841c8f83 | ||
| 187b24ab97 | |||
| b80ddf7854 | |||
|
|
79bc3d9082 | ||
| 1c92ad4c28 | |||
|
|
61e6de0052 | ||
| fb25b92349 | |||
|
|
e78f2893ae | ||
| 51170b45e9 | |||
|
|
7365bea145 | ||
| dc096065b4 | |||
|
|
b9850311ea | ||
| ee9c050db3 | |||
|
|
95200d9920 | ||
|
|
ee1ce21cca | ||
|
|
467f7447bf | ||
|
|
1df4496058 | ||
|
|
134220d75f | ||
|
|
80ef4ed6fe | ||
|
|
2137f3f07e | ||
| a46e8040b2 | |||
|
|
2ca9730735 | ||
| 3d2ca8fb9f | |||
| 6810da8b79 | |||
|
|
4866a6f22d | ||
| 84a1004977 | |||
| 39c619a837 | |||
|
|
758613aa12 | ||
| 6914a61bc4 | |||
| 9f43287433 | |||
|
|
10df983ae3 | ||
| 78249811ab | |||
| df14427d60 | |||
|
|
c7c131d437 | ||
| b2fe8f3bd7 | |||
|
|
3027c69fa8 | ||
| 5995d205a4 | |||
|
|
fd479c92d8 | ||
| e9880d6eb2 | |||
|
|
a4438d8a90 | ||
| 89061774de | |||
|
|
362e6c8534 | ||
| 64a0e58238 | |||
|
|
a3d4dfbd59 | ||
| 4c106ebff3 | |||
|
|
d21f304081 | ||
| 2bad3274fd | |||
|
|
5c8fd64521 | ||
| 72ba8eca81 | |||
|
|
f89f741265 | ||
| 50af55acb2 | |||
|
|
cc879b85e5 | ||
| b4a0a4584d | |||
| 8ab1611f39 | |||
|
|
475c522039 | ||
| 068396ac9a | |||
|
|
4a30707ec6 | ||
| 852b1db895 | |||
|
|
fcbd68eca0 | ||
| 3a42f9114e | |||
| 3f664b472c | |||
|
|
57811f3f2e | ||
| 5e1bc6d705 | |||
| d4a230f96d | |||
|
|
ed1e1478b2 | ||
| afe013a59a | |||
| db3734f8a3 | |||
|
|
86f75c7f78 | ||
| a7abb4072b | |||
|
|
61d6446d75 | ||
| 392008ae4b | |||
| 093c26c7f3 | |||
|
|
a8e1ba6c02 | ||
| e64fbfd014 | |||
| 8cd7b85de2 | |||
|
|
ddc7f97e27 | ||
| 24e3765c28 | |||
|
|
86f3ddb34b | ||
| d6c55ef82b | |||
| d977ddfb7b | |||
|
|
0e8bd5343d | ||
| ceeaa89ba3 | |||
|
|
c3dbf85eb6 | ||
| ad5fe95b55 |
@@ -129,7 +129,7 @@
|
|||||||
"extract-i18n": {
|
"extract-i18n": {
|
||||||
"builder": "@angular-devkit/build-angular:extract-i18n",
|
"builder": "@angular-devkit/build-angular:extract-i18n",
|
||||||
"options": {
|
"options": {
|
||||||
"browserTarget": "farmmaps-lib-app:build"
|
"buildTarget": "farmmaps-lib-app:build"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"test": {
|
"test": {
|
||||||
|
|||||||
9397
package-lock.json
generated
9397
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
56
package.json
56
package.json
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "farmmaps-lib-app",
|
"name": "farmmaps-lib-app",
|
||||||
"version": "4.11.1",
|
"version": "4.20.0",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve",
|
"start": "ng serve",
|
||||||
@@ -12,23 +12,23 @@
|
|||||||
"private": true,
|
"private": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@angular-eslint/eslint-plugin": "^18.2.0",
|
"@angular-eslint/eslint-plugin": "^18.2.0",
|
||||||
"@angular/animations": "^18.2.3",
|
"@angular/animations": "19.2.18",
|
||||||
"@angular/common": "^18.2.3",
|
"@angular/common": "19.2.18",
|
||||||
"@angular/compiler": "^18.2.3",
|
"@angular/compiler": "19.2.18",
|
||||||
"@angular/core": "^18.2.3",
|
"@angular/core": "19.2.18",
|
||||||
"@angular/forms": "^18.2.3",
|
"@angular/forms": "19.2.18",
|
||||||
"@angular/platform-browser": "^18.2.3",
|
"@angular/platform-browser": "19.2.18",
|
||||||
"@angular/platform-browser-dynamic": "^18.2.3",
|
"@angular/platform-browser-dynamic": "19.2.18",
|
||||||
"@angular/router": "^18.2.3",
|
"@angular/router": "19.2.18",
|
||||||
"@farmmaps/common": "file:dist/common",
|
"@farmmaps/common": "file:dist/common",
|
||||||
"@farmmaps/common-map": "file:dist/common-map",
|
"@farmmaps/common-map": "file:dist/common-map",
|
||||||
"@farmmaps/common-map3d": "file:dist/common-map3d",
|
"@farmmaps/common-map3d": "file:dist/common-map3d",
|
||||||
"@farmmaps/ng-openlayers": "file:dist/ng-openlayers",
|
"@farmmaps/ng-openlayers": "file:dist/ng-openlayers",
|
||||||
"@microsoft/signalr": "^3.1.16",
|
"@microsoft/signalr": "^3.1.16",
|
||||||
"@ng-bootstrap/ng-bootstrap": "^17.0.1",
|
"@ng-bootstrap/ng-bootstrap": "^18.0.0",
|
||||||
"@ngrx/effects": "^18.0.2",
|
"@ngrx/effects": "19.2.1",
|
||||||
"@ngrx/router-store": "^18.0.2",
|
"@ngrx/router-store": "19.2.1",
|
||||||
"@ngrx/store": "^18.0.2",
|
"@ngrx/store": "19.2.1",
|
||||||
"@popperjs/core": "^2.11.8",
|
"@popperjs/core": "^2.11.8",
|
||||||
"angular-oauth2-oidc": "^17.0.2",
|
"angular-oauth2-oidc": "^17.0.2",
|
||||||
"assert": "^2.0.0",
|
"assert": "^2.0.0",
|
||||||
@@ -39,11 +39,11 @@
|
|||||||
"core-js": "^2.6.12",
|
"core-js": "^2.6.12",
|
||||||
"https-browserify": "^1.0.0",
|
"https-browserify": "^1.0.0",
|
||||||
"moment": "^2.29.4",
|
"moment": "^2.29.4",
|
||||||
"ngrx-store-localstorage": "^18.0.0",
|
"ngrx-store-localstorage": "19.0.2",
|
||||||
"ngx-avatars": "^1.8.0",
|
"ngx-avatars": "1.9.3",
|
||||||
"ngx-clipboard": "^16.0.0",
|
"ngx-clipboard": "^16.0.0",
|
||||||
"ngx-image-cropper": "^7.0.0",
|
"ngx-image-cropper": "^7.0.0",
|
||||||
"ngx-uploadx": "^6.2.0",
|
"ngx-uploadx": "7.0.1",
|
||||||
"ol": "^8.2.0",
|
"ol": "^8.2.0",
|
||||||
"olcs": "^2.13.1",
|
"olcs": "^2.13.1",
|
||||||
"resumablejs": "^1.1.0",
|
"resumablejs": "^1.1.0",
|
||||||
@@ -54,19 +54,19 @@
|
|||||||
"tslib": "^2.4.0",
|
"tslib": "^2.4.0",
|
||||||
"url": "^0.11.0",
|
"url": "^0.11.0",
|
||||||
"util": "^0.12.4",
|
"util": "^0.12.4",
|
||||||
"zone.js": "~0.14.10"
|
"zone.js": "~0.15.1"
|
||||||
},
|
},
|
||||||
"optionalDependencies": {
|
"optionalDependencies": {
|
||||||
"@lmdb/lmdb-linux-x64": "^3.1.0",
|
"@lmdb/lmdb-linux-x64": "^3.1.0",
|
||||||
"@rollup/rollup-linux-x64-gnu": "^4.21.2"
|
"@rollup/rollup-linux-x64-gnu": "^4.21.2"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@angular-builders/custom-webpack": "^18.0.0",
|
"@angular-builders/custom-webpack": "19.0.1",
|
||||||
"@angular-devkit/build-angular": "^18.2.3",
|
"@angular-devkit/build-angular": "19.2.19",
|
||||||
"@angular/cli": "^18.2.3",
|
"@angular/cli": "19.2.19",
|
||||||
"@angular/compiler-cli": "^18.2.3",
|
"@angular/compiler-cli": "19.2.18",
|
||||||
"@angular/language-service": "^18.2.3",
|
"@angular/language-service": "19.2.18",
|
||||||
"@angular/localize": "^18.2.3",
|
"@angular/localize": "19.2.18",
|
||||||
"@types/arcgis-rest-api": "^10.4.5",
|
"@types/arcgis-rest-api": "^10.4.5",
|
||||||
"@types/jasmine": "~2.8.8",
|
"@types/jasmine": "~2.8.8",
|
||||||
"@types/jasminewd2": "^2.0.9",
|
"@types/jasminewd2": "^2.0.9",
|
||||||
@@ -85,9 +85,15 @@
|
|||||||
"karma-coverage-istanbul-reporter": "^3.0.3",
|
"karma-coverage-istanbul-reporter": "^3.0.3",
|
||||||
"karma-jasmine": "^5.1.0",
|
"karma-jasmine": "^5.1.0",
|
||||||
"karma-jasmine-html-reporter": "^2.0.0",
|
"karma-jasmine-html-reporter": "^2.0.0",
|
||||||
"ng-packagr": "^18.2.1",
|
"ng-packagr": "^19.2.2",
|
||||||
"protractor": "~7.0.0",
|
"protractor": "~7.0.0",
|
||||||
"ts-node": "^8.8.1",
|
"ts-node": "^8.8.1",
|
||||||
"typescript": "~5.4.4"
|
"typescript": "~5.8.3"
|
||||||
|
},
|
||||||
|
"overrides": {
|
||||||
|
"some-library": {
|
||||||
|
"@angular/common": "$@angular/common",
|
||||||
|
"@angular/core": "$@angular/core"
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8,11 +8,11 @@
|
|||||||
"tslib": "^2.0.0"
|
"tslib": "^2.0.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@angular/core": "^18.2.3",
|
"@angular/core": "19.2.18",
|
||||||
"ngrx-store-localstorage": "^18.0.0",
|
"ngrx-store-localstorage": "19.0.2",
|
||||||
"@ngrx/effects": "^18.0.2",
|
"@ngrx/effects": "19.2.1",
|
||||||
"@ngrx/router-store": "^18.0.2",
|
"@ngrx/router-store": "19.2.1",
|
||||||
"@ngrx/store": "^18.0.2",
|
"@ngrx/store": "19.2.1",
|
||||||
"tassign": "^1.0.0"
|
"tassign": "^1.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -59,6 +59,8 @@ export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
|
|||||||
export const SETVIEWSTATE = '[Map] SetViewState'
|
export const SETVIEWSTATE = '[Map] SetViewState'
|
||||||
export const CLEARFEATURES = '[Map] ClearFeatures';
|
export const CLEARFEATURES = '[Map] ClearFeatures';
|
||||||
export const SETPANELEXTRAWIDE = '[Map] SetPanelExtraWide';
|
export const SETPANELEXTRAWIDE = '[Map] SetPanelExtraWide';
|
||||||
|
export const BACKUPFEATURES = '[Map] BackupFeatures';
|
||||||
|
export const RESTOREFEATURES = '[Map] RestoreFeatures';
|
||||||
|
|
||||||
export class Clear implements Action {
|
export class Clear implements Action {
|
||||||
readonly type = CLEAR;
|
readonly type = CLEAR;
|
||||||
@@ -300,7 +302,7 @@ export class SetReplaceUrl implements Action {
|
|||||||
export class SetFeatures implements Action {
|
export class SetFeatures implements Action {
|
||||||
readonly type = SETFEATURES;
|
readonly type = SETFEATURES;
|
||||||
|
|
||||||
constructor(public features: Array<Feature<Geometry>>) { }
|
constructor(public features: Array<Feature<Geometry>>, public zoomToExtent: boolean = true) { }
|
||||||
}
|
}
|
||||||
|
|
||||||
export class SetLayerValuesLocation implements Action {
|
export class SetLayerValuesLocation implements Action {
|
||||||
@@ -347,6 +349,16 @@ export class SetPanelExtraWide implements Action {
|
|||||||
constructor(public panelExtraWide:boolean) {}
|
constructor(public panelExtraWide:boolean) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class BackupFeatures implements Action {
|
||||||
|
readonly type = BACKUPFEATURES;
|
||||||
|
constructor() {}
|
||||||
|
}
|
||||||
|
|
||||||
|
export class RestoreFeatures implements Action {
|
||||||
|
readonly type = RESTOREFEATURES;
|
||||||
|
constructor() {}
|
||||||
|
}
|
||||||
|
|
||||||
export type Actions = SetMapState
|
export type Actions = SetMapState
|
||||||
| Init
|
| Init
|
||||||
| Clear
|
| Clear
|
||||||
@@ -395,5 +407,7 @@ export type Actions = SetMapState
|
|||||||
| ToggleShowDataLayerSlide
|
| ToggleShowDataLayerSlide
|
||||||
| SetViewState
|
| SetViewState
|
||||||
| ClearFeatures
|
| ClearFeatures
|
||||||
| SetPanelExtraWide;
|
| SetPanelExtraWide
|
||||||
|
| BackupFeatures
|
||||||
|
| RestoreFeatures;
|
||||||
|
|
||||||
|
|||||||
@@ -36,6 +36,7 @@ import { RotationResetComponent } from './components/aol/rotation-reset/rotation
|
|||||||
import { ZoomToExtentComponent } from './components/aol/zoom-to-extent/zoom-to-extent.component';
|
import { ZoomToExtentComponent } from './components/aol/zoom-to-extent/zoom-to-extent.component';
|
||||||
import { FeatureListContainerComponent } from './components/feature-list-container/feature-list-container.component';
|
import { FeatureListContainerComponent } from './components/feature-list-container/feature-list-container.component';
|
||||||
import { FeatureListCropfieldComponent } from './components/feature-list-cropfield/feature-list-cropfield.component';
|
import { FeatureListCropfieldComponent } from './components/feature-list-cropfield/feature-list-cropfield.component';
|
||||||
|
import { FeatureListObservationComponent } from './components/feature-list-observation/feature-list-observation.component';
|
||||||
import { FeatureListCroppingschemeComponent } from './components/feature-list-croppingscheme/feature-list-croppingscheme.component';
|
import { FeatureListCroppingschemeComponent } from './components/feature-list-croppingscheme/feature-list-croppingscheme.component';
|
||||||
import { FeatureListFeatureContainerComponent } from './components/feature-list-feature-container/feature-list-feature-container.component';
|
import { FeatureListFeatureContainerComponent } from './components/feature-list-feature-container/feature-list-feature-container.component';
|
||||||
import { FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component';
|
import { FeatureListFeatureCropfieldComponent } from './components/feature-list-feature-cropfield/feature-list-feature-cropfield.component';
|
||||||
@@ -105,7 +106,7 @@ const metaReducers: Array<MetaReducer<any, any>> = [LocalStorageSync];
|
|||||||
|
|
||||||
export {
|
export {
|
||||||
AbstractFeatureListComponent,
|
AbstractFeatureListComponent,
|
||||||
AbstractFeatureListFeatureComponent, AbstractItemListComponent, AbstractItemListItemComponent, AbstractItemWidgetComponent, AbstractSelectedItemComponent, DeviceOrientationService, FeatureIconService, FeatureListComponent, FeatureListContainerComponent, FeatureListCropfieldComponent, FeatureListCroppingschemeComponent, FeatureListFeatureComponent, FeatureListFeatureContainerComponent, FeatureListFeatureCropfieldComponent, FeatureListFeatureCroppingschemeComponent, FileDropTargetComponent, ForChild,
|
AbstractFeatureListFeatureComponent, AbstractItemListComponent, AbstractItemListItemComponent, AbstractItemWidgetComponent, AbstractSelectedItemComponent, DeviceOrientationService, FeatureIconService, FeatureListComponent, FeatureListContainerComponent, FeatureListCropfieldComponent, FeatureListObservationComponent, FeatureListCroppingschemeComponent, FeatureListFeatureComponent, FeatureListFeatureContainerComponent, FeatureListFeatureCropfieldComponent, FeatureListFeatureCroppingschemeComponent, FileDropTargetComponent, ForChild,
|
||||||
ForItemType, ForPackage, ForSourceTask, GeolocationService, GeometryThumbnailComponent, GpsLocation, IClickedFeature, ifZoomToShowDirective, IItemLayer, IMapState, IPeriodState, ISelectedFeatures, ItemLayer, ItemLayersComponent, ItemListComponent, ItemListItemComponent,
|
ForItemType, ForPackage, ForSourceTask, GeolocationService, GeometryThumbnailComponent, GpsLocation, IClickedFeature, ifZoomToShowDirective, IItemLayer, IMapState, IPeriodState, ISelectedFeatures, ItemLayer, ItemLayersComponent, ItemListComponent, ItemListItemComponent,
|
||||||
ItemListItemContainerComponent, ITemporalItemLayer, ItemVectorSourceComponent, ItemWidgetListComponent, LayerListComponent, LayerSwitcher, LayerVectorImageComponent, LegendComponent, mapActions, MapComponent, mapEffects,
|
ItemListItemContainerComponent, ITemporalItemLayer, ItemVectorSourceComponent, ItemWidgetListComponent, LayerListComponent, LayerSwitcher, LayerVectorImageComponent, LegendComponent, mapActions, MapComponent, mapEffects,
|
||||||
mapReducers, MapSearchComponent, MetaDataModalComponent, PanToLocation, RotationResetComponent, SelectedItemComponent, SelectedItemContainerComponent, SelectedItemCropfieldComponent,
|
mapReducers, MapSearchComponent, MetaDataModalComponent, PanToLocation, RotationResetComponent, SelectedItemComponent, SelectedItemContainerComponent, SelectedItemCropfieldComponent,
|
||||||
@@ -142,6 +143,7 @@ export {
|
|||||||
FeatureListContainerComponent,
|
FeatureListContainerComponent,
|
||||||
FeatureListCroppingschemeComponent,
|
FeatureListCroppingschemeComponent,
|
||||||
FeatureListCropfieldComponent,
|
FeatureListCropfieldComponent,
|
||||||
|
FeatureListObservationComponent,
|
||||||
FeatureListFeatureContainerComponent,
|
FeatureListFeatureContainerComponent,
|
||||||
FeatureListFeatureComponent,
|
FeatureListFeatureComponent,
|
||||||
FeatureListFeatureCroppingschemeComponent,
|
FeatureListFeatureCroppingschemeComponent,
|
||||||
@@ -201,6 +203,7 @@ export {
|
|||||||
FeatureListContainerComponent,
|
FeatureListContainerComponent,
|
||||||
FeatureListCroppingschemeComponent,
|
FeatureListCroppingschemeComponent,
|
||||||
FeatureListCropfieldComponent,
|
FeatureListCropfieldComponent,
|
||||||
|
FeatureListObservationComponent,
|
||||||
FeatureListFeatureContainerComponent,
|
FeatureListFeatureContainerComponent,
|
||||||
ZoomToExtentComponent,
|
ZoomToExtentComponent,
|
||||||
ifZoomToShowDirective,
|
ifZoomToShowDirective,
|
||||||
@@ -214,6 +217,7 @@ export {
|
|||||||
TemporalService,
|
TemporalService,
|
||||||
{ provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
|
{ provide: AbstractFeatureListComponent, useClass: FeatureListCroppingschemeComponent, multi: true },
|
||||||
{ provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
|
{ provide: AbstractFeatureListComponent, useClass: FeatureListCropfieldComponent, multi: true },
|
||||||
|
{ provide: AbstractFeatureListComponent, useClass: FeatureListObservationComponent, multi: true },
|
||||||
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
|
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureComponent, multi: true },
|
||||||
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
|
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCroppingschemeComponent, multi: true },
|
||||||
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
|
{ provide: AbstractFeatureListFeatureComponent, useClass: FeatureListFeatureCropfieldComponent, multi: true },
|
||||||
|
|||||||
@@ -15,7 +15,8 @@ export interface IDroppedFile {
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-file-drop-target',
|
selector: 'fm-map-file-drop-target',
|
||||||
template: ''
|
template: '',
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class FileDropTargetComponent implements OnInit, OnDestroy {
|
export class FileDropTargetComponent implements OnInit, OnDestroy {
|
||||||
element: Element;
|
element: Element;
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ import { fromLonLat, toLonLat } from 'ol/proj';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-gps-location',
|
selector: 'fm-map-gps-location',
|
||||||
templateUrl: './gps-location.component.html',
|
templateUrl: './gps-location.component.html',
|
||||||
styleUrls: ['./gps-location.component.scss']
|
styleUrls: ['./gps-location.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class GpsLocation implements OnInit,OnChanges{
|
export class GpsLocation implements OnInit,OnChanges{
|
||||||
|
|
||||||
|
|||||||
@@ -26,7 +26,8 @@ import Feature from 'ol/Feature';
|
|||||||
template: `<ng-content></ng-content>`,
|
template: `<ng-content></ng-content>`,
|
||||||
providers: [
|
providers: [
|
||||||
{ provide: LayerGroupComponent, useExisting: forwardRef(() => ItemLayersComponent) }
|
{ provide: LayerGroupComponent, useExisting: forwardRef(() => ItemLayersComponent) }
|
||||||
]
|
],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
|
|
||||||
export class ItemLayersComponent extends LayerGroupComponent implements OnChanges, OnInit,OnDestroy {
|
export class ItemLayersComponent extends LayerGroupComponent implements OnChanges, OnInit,OnDestroy {
|
||||||
|
|||||||
@@ -26,7 +26,8 @@ import { formatNumber } from '@angular/common';
|
|||||||
template: `<ng-content></ng-content>`,
|
template: `<ng-content></ng-content>`,
|
||||||
providers: [
|
providers: [
|
||||||
{ provide: SourceVectorComponent, useExisting: forwardRef(() => ItemVectorSourceComponent) }
|
{ provide: SourceVectorComponent, useExisting: forwardRef(() => ItemVectorSourceComponent) }
|
||||||
]
|
],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnDestroy, OnChanges {
|
export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnDestroy, OnChanges {
|
||||||
instance: Vector<Feature<Geometry>>;
|
instance: Vector<Feature<Geometry>>;
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ import { IItemLayer } from '../../../models/item.layer';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-layer-list',
|
selector: 'fm-map-layer-list',
|
||||||
templateUrl: './layer-list.component.html',
|
templateUrl: './layer-list.component.html',
|
||||||
styleUrls: ['./layer-list.component.scss']
|
styleUrls: ['./layer-list.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
|
|
||||||
export class LayerListComponent {
|
export class LayerListComponent {
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ import { Point } from 'ol/geom';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-layer-values',
|
selector: 'fm-map-layer-values',
|
||||||
templateUrl: './layer-values.component.html',
|
templateUrl: './layer-values.component.html',
|
||||||
styleUrls: ['./layer-values.component.scss']
|
styleUrls: ['./layer-values.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class LayerValuesComponent implements OnInit, AfterViewInit {
|
export class LayerValuesComponent implements OnInit, AfterViewInit {
|
||||||
|
|
||||||
|
|||||||
@@ -10,6 +10,7 @@ import Feature from 'ol/Feature';
|
|||||||
template: `
|
template: `
|
||||||
<ng-content></ng-content>
|
<ng-content></ng-content>
|
||||||
`,
|
`,
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class LayerVectorImageComponent extends LayerVectorComponent implements OnInit, OnDestroy, OnChanges {
|
export class LayerVectorImageComponent extends LayerVectorComponent implements OnInit, OnDestroy, OnChanges {
|
||||||
//public source: Vector;
|
//public source: Vector;
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ import { fromLonLat } from 'ol/proj';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-pan-to-location',
|
selector: 'fm-map-pan-to-location',
|
||||||
templateUrl: './pan-to-location.component.html',
|
templateUrl: './pan-to-location.component.html',
|
||||||
styleUrls: ['./pan-to-location.component.scss']
|
styleUrls: ['./pan-to-location.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class PanToLocation implements OnInit,OnChanges{
|
export class PanToLocation implements OnInit,OnChanges{
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ import {View} from 'ol';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-rotation-reset',
|
selector: 'fm-map-rotation-reset',
|
||||||
templateUrl: './rotation-reset.component.html',
|
templateUrl: './rotation-reset.component.html',
|
||||||
styleUrls: ['./rotation-reset.component.scss']
|
styleUrls: ['./rotation-reset.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class RotationResetComponent implements OnInit {
|
export class RotationResetComponent implements OnInit {
|
||||||
view: View;
|
view: View;
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ import { ViewComponent, MapComponent } from '@farmmaps/ng-openlayers';
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-zoom-to-extent',
|
selector: 'fm-map-zoom-to-extent',
|
||||||
template: `<ng-content></ng-content>`
|
template: `<ng-content></ng-content>`,
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class ZoomToExtentComponent implements OnChanges {
|
export class ZoomToExtentComponent implements OnChanges {
|
||||||
view: ViewComponent;
|
view: ViewComponent;
|
||||||
|
|||||||
@@ -13,7 +13,8 @@ import { Observable } from 'rxjs';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-feature-list-container',
|
selector: 'fm-map-feature-list-container',
|
||||||
templateUrl: './feature-list-container.component.html',
|
templateUrl: './feature-list-container.component.html',
|
||||||
styleUrls: ['./feature-list-container.component.scss']
|
styleUrls: ['./feature-list-container.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class FeatureListContainerComponent {
|
export class FeatureListContainerComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,8 @@ import { Observable } from 'rxjs';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-feature-list-cropfield',
|
selector: 'fm-map-feature-list-cropfield',
|
||||||
templateUrl: './feature-list-cropfield.component.html',
|
templateUrl: './feature-list-cropfield.component.html',
|
||||||
styleUrls: ['./feature-list-cropfield.component.scss']
|
styleUrls: ['./feature-list-cropfield.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class FeatureListCropfieldComponent extends AbstractFeatureListComponent implements OnInit {
|
export class FeatureListCropfieldComponent extends AbstractFeatureListComponent implements OnInit {
|
||||||
|
|
||||||
|
|||||||
@@ -16,7 +16,8 @@ import { Geometry} from 'ol/geom';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-feature-list-croppingscheme',
|
selector: 'fm-map-feature-list-croppingscheme',
|
||||||
templateUrl: './feature-list-croppingscheme.component.html',
|
templateUrl: './feature-list-croppingscheme.component.html',
|
||||||
styleUrls: ['./feature-list-croppingscheme.component.scss']
|
styleUrls: ['./feature-list-croppingscheme.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class FeatureListCroppingschemeComponent extends AbstractFeatureListComponent {
|
export class FeatureListCroppingschemeComponent extends AbstractFeatureListComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ import { WidgetHostDirective } from '../widget-host/widget-host.directive';
|
|||||||
<div>
|
<div>
|
||||||
<ng-template fm-map-widget-host></ng-template>
|
<ng-template fm-map-widget-host></ng-template>
|
||||||
</div>
|
</div>
|
||||||
`
|
`,
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class FeatureListFeatureContainerComponent {
|
export class FeatureListFeatureContainerComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,8 @@ import {getArea} from 'ol/sphere';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-feature-list-feature-cropfield',
|
selector: 'fm-map-feature-list-feature-cropfield',
|
||||||
templateUrl: './feature-list-feature-cropfield.component.html',
|
templateUrl: './feature-list-feature-cropfield.component.html',
|
||||||
styleUrls: ['./feature-list-feature-cropfield.component.scss']
|
styleUrls: ['./feature-list-feature-cropfield.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFeatureComponent {
|
export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFeatureComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,8 @@ import { ForItemType } from '../for-item/for-itemtype.decorator';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-feature-list-feature-croppingscheme',
|
selector: 'fm-map-feature-list-feature-croppingscheme',
|
||||||
templateUrl: './feature-list-feature-croppingscheme.component.html',
|
templateUrl: './feature-list-feature-croppingscheme.component.html',
|
||||||
styleUrls: ['./feature-list-feature-croppingscheme.component.scss']
|
styleUrls: ['./feature-list-feature-croppingscheme.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class FeatureListFeatureCroppingschemeComponent extends AbstractFeatureListFeatureComponent {
|
export class FeatureListFeatureCroppingschemeComponent extends AbstractFeatureListFeatureComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,8 @@ export abstract class AbstractFeatureListFeatureComponent {
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-feature-list-feature',
|
selector: 'fm-map-feature-list-feature',
|
||||||
templateUrl: './feature-list-feature.component.html',
|
templateUrl: './feature-list-feature.component.html',
|
||||||
styleUrls: ['./feature-list-feature.component.scss']
|
styleUrls: ['./feature-list-feature.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class FeatureListFeatureComponent extends AbstractFeatureListFeatureComponent {
|
export class FeatureListFeatureComponent extends AbstractFeatureListFeatureComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,14 @@
|
|||||||
|
<div class="card border-0">
|
||||||
|
<div class="card-body" *ngIf="(schemeItem|async);let schemeItem">
|
||||||
|
<fm-back-button></fm-back-button>
|
||||||
|
<h4 i18n>Farm</h4>
|
||||||
|
<h3>{{schemeItem.name}}</h3>
|
||||||
|
<div *ngIf="features;let features">
|
||||||
|
<div class="cropfields">
|
||||||
|
<div class="row m-0 ps-3 pe-3" *ngFor="let feature of features" [ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">
|
||||||
|
<fm-map-feature-list-feature-container [feature]="feature"></fm-map-feature-list-feature-container>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
fm-map-feature-list-feature-container {
|
||||||
|
width:100%;
|
||||||
|
pointer-events:none;
|
||||||
|
}
|
||||||
|
|
||||||
|
.row {
|
||||||
|
border-bottom: 1px solid var(--bs-gray-500);
|
||||||
|
user-select: none;
|
||||||
|
padding-left:1.5rem;
|
||||||
|
}
|
||||||
|
|
||||||
|
.row.selected {
|
||||||
|
background-color: var(--bs-gray-100);
|
||||||
|
}
|
||||||
|
|
||||||
|
.cropfields {
|
||||||
|
border-top: 1px solid var(--bs-gray-500);
|
||||||
|
margin-left: -1.25rem;
|
||||||
|
margin-right: -1.25rem;
|
||||||
|
}
|
||||||
@@ -0,0 +1,31 @@
|
|||||||
|
import { Component, Injectable,AfterViewInit, OnInit,SimpleChanges, ChangeDetectorRef} from '@angular/core';
|
||||||
|
import { Location } from '@angular/common';
|
||||||
|
import { AbstractFeatureListComponent } from '../feature-list/feature-list.component';
|
||||||
|
import {ForItemType } from '../for-item/for-itemtype.decorator';
|
||||||
|
import {ForChild } from '../for-item/for-child.decorator';
|
||||||
|
import { Store } from '@ngrx/store';
|
||||||
|
import * as mapReducers from '../../reducers/map.reducer';
|
||||||
|
import { commonReducers, ItemTypeService, IItem,ItemService } from '@farmmaps/common';
|
||||||
|
import { Observable } from 'rxjs';
|
||||||
|
|
||||||
|
@ForChild()
|
||||||
|
@ForItemType("vnd.farmmaps.itemtype.observation")
|
||||||
|
@Injectable()
|
||||||
|
@Component({
|
||||||
|
selector: 'fm-map-feature-list-observation',
|
||||||
|
templateUrl: './feature-list-observation.component.html',
|
||||||
|
styleUrls: ['./feature-list-observation.component.scss'],
|
||||||
|
standalone: false
|
||||||
|
})
|
||||||
|
export class FeatureListObservationComponent extends AbstractFeatureListComponent implements OnInit {
|
||||||
|
|
||||||
|
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, private itemService: ItemService) {
|
||||||
|
super(store, itemTypeService,location);
|
||||||
|
}
|
||||||
|
|
||||||
|
public schemeItem: Observable<IItem>
|
||||||
|
|
||||||
|
ngOnInit() {
|
||||||
|
this.schemeItem = this.itemService.getItem(this.queryState.parentCode);
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -60,7 +60,8 @@ export abstract class AbstractFeatureListComponent {
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-feature-list',
|
selector: 'fm-map-feature-list',
|
||||||
templateUrl: './feature-list.component.html',
|
templateUrl: './feature-list.component.html',
|
||||||
styleUrls: ['./feature-list.component.scss']
|
styleUrls: ['./feature-list.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class FeatureListComponent extends AbstractFeatureListComponent {
|
export class FeatureListComponent extends AbstractFeatureListComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ import * as style from 'ol/style';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-feature-thumbnail',
|
selector: 'fm-map-feature-thumbnail',
|
||||||
templateUrl: './feature-thumbnail.component.html',
|
templateUrl: './feature-thumbnail.component.html',
|
||||||
styleUrls: ['./feature-thumbnail.component.scss']
|
styleUrls: ['./feature-thumbnail.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class GeometryThumbnailComponent implements AfterViewInit {
|
export class GeometryThumbnailComponent implements AfterViewInit {
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import { MapComponent } from '@farmmaps/ng-openlayers';
|
|||||||
|
|
||||||
@Directive({
|
@Directive({
|
||||||
selector: '[fmMapIfZoomToShow]',
|
selector: '[fmMapIfZoomToShow]',
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class ifZoomToShowDirective implements OnInit {
|
export class ifZoomToShowDirective implements OnInit {
|
||||||
@Input()
|
@Input()
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ import { IItem, IListItem } from '@farmmaps/common';
|
|||||||
<div style="height:100%">
|
<div style="height:100%">
|
||||||
<ng-template fm-map-widget-host></ng-template>
|
<ng-template fm-map-widget-host></ng-template>
|
||||||
</div>
|
</div>
|
||||||
`
|
`,
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class ItemListItemContainerComponent {
|
export class ItemListItemContainerComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -43,7 +43,8 @@ export abstract class AbstractItemWidgetComponent {
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-item-list-item',
|
selector: 'fm-map-item-list-item',
|
||||||
templateUrl: './item-list-item.component.html',
|
templateUrl: './item-list-item.component.html',
|
||||||
styleUrls: ['./item-list-item.component.scss']
|
styleUrls: ['./item-list-item.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class ItemListItemComponent extends AbstractItemListItemComponent {
|
export class ItemListItemComponent extends AbstractItemListItemComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -30,7 +30,8 @@ export abstract class AbstractItemListComponent {
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-item-list',
|
selector: 'fm-map-item-list',
|
||||||
templateUrl: './item-list.component.html',
|
templateUrl: './item-list.component.html',
|
||||||
styleUrls: ['./item-list.component.scss']
|
styleUrls: ['./item-list.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class ItemListComponent extends AbstractItemListComponent {
|
export class ItemListComponent extends AbstractItemListComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ import { AbstractItemWidgetComponent } from '../item-list-item/item-list-item.co
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-item-widget-list',
|
selector: 'fm-map-item-widget-list',
|
||||||
templateUrl: './item-widget-list.component.html',
|
templateUrl: './item-widget-list.component.html',
|
||||||
styleUrls: ['./item-widget-list.component.scss']
|
styleUrls: ['./item-widget-list.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class ItemWidgetListComponent implements AfterViewInit {
|
export class ItemWidgetListComponent implements AfterViewInit {
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@
|
|||||||
<li class="nav-item py-0">
|
<li class="nav-item py-0">
|
||||||
<span><i class="fal fa-layer-group" aria-hidden="true"></i> <span i18n>Base maps</span></span>
|
<span><i class="fal fa-layer-group" aria-hidden="true"></i> <span i18n>Base maps</span></span>
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
<fm-map-layer-list [baseLayers]="true" [itemLayers]="baseLayers|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
|
<fm-map-layer-list [baseLayers]="true" [itemLayers]="baseMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item py-0">
|
<li class="nav-item py-0">
|
||||||
@@ -20,12 +20,17 @@
|
|||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
<li class="nav-item py-0" *ngIf="selectedItemLayer$ | async as selectedItemLayer">
|
<li class="nav-item py-0" *ngIf="selectedItemLayer$ | async as selectedItemLayer">
|
||||||
<span><i class="fal fa-layer-group" aria-hidden="true"></i> <span i18n>Data</span><span class="slideButton"><a href="#" title="Compare" class="btn btn-light btn-sm" (click)="handleToggleShowDatalayerSlide($event)"><i class="fal fa-sliders-h-square"></i></a></span></span>
|
<span><i class="fal fa-layer-group" aria-hidden="true"></i> <span i18n>Overlay slider</span><span class="slideButton"><a href="#" title="Compare" class="btn btn-light btn-sm" (click)="handleToggleShowDatalayerSlide($event)"><i class="fal fa-sliders-h-square"></i></a></span></span>
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
<fm-map-layer-list [dataLayers]="true" [itemLayers]="[selectedItemLayer]" [selectedLayer]="selectedItemLayer" (onToggleVisibility)="handleOnToggleVisibility($event)" (onSetOpacity)="handleOnSetOpacity($event)" (onZoomToExtent)="handleZoomToExtent($event)" (onSelectLayer)="handleSelectOverlayLayer($event)"></fm-map-layer-list>
|
<fm-map-layer-list [dataLayers]="true" [itemLayers]="[selectedItemLayer]" [selectedLayer]="selectedItemLayer" (onToggleVisibility)="handleOnToggleVisibility($event)" (onSetOpacity)="handleOnSetOpacity($event)" (onZoomToExtent)="handleZoomToExtent($event)" (onSelectLayer)="handleSelectOverlayLayer($event)"></fm-map-layer-list>
|
||||||
</div>
|
</div>
|
||||||
</li>
|
</li>
|
||||||
|
<li class="nav-item py-0">
|
||||||
|
<span><i class="fal fa-layer-group" aria-hidden="true"></i> <span i18n>Aerial photos</span></span>
|
||||||
|
<div class="mb-4">
|
||||||
|
<fm-map-layer-list [baseLayers]="true" [itemLayers]="aerialMaps|async" [selectedLayer]="selectedBaseLayer|async" (onSelectLayer)="handleSelectBaseLayer($event)"></fm-map-layer-list>
|
||||||
|
</div>
|
||||||
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -4,12 +4,13 @@ import { Store } from '@ngrx/store';
|
|||||||
import * as mapReducers from '../../reducers/map.reducer';
|
import * as mapReducers from '../../reducers/map.reducer';
|
||||||
import * as mapActions from '../../actions/map.actions';
|
import * as mapActions from '../../actions/map.actions';
|
||||||
import {createEmpty,extend } from 'ol/extent';
|
import {createEmpty,extend } from 'ol/extent';
|
||||||
import { Observable } from 'rxjs';
|
import { filter, map, Observable } from 'rxjs';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-layer-switcher',
|
selector: 'fm-map-layer-switcher',
|
||||||
templateUrl: './layer-switcher.component.html',
|
templateUrl: './layer-switcher.component.html',
|
||||||
styleUrls: ['./layer-switcher.component.scss']
|
styleUrls: ['./layer-switcher.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class LayerSwitcher implements OnInit,OnChanges{
|
export class LayerSwitcher implements OnInit,OnChanges{
|
||||||
|
|
||||||
@@ -17,7 +18,8 @@ export class LayerSwitcher implements OnInit,OnChanges{
|
|||||||
public overlayLayers: Observable<Array<IItemLayer>>;
|
public overlayLayers: Observable<Array<IItemLayer>>;
|
||||||
public selectedOverlayLayer: Observable<IItemLayer>;
|
public selectedOverlayLayer: Observable<IItemLayer>;
|
||||||
public selectedItemLayer$: Observable<IItemLayer>;
|
public selectedItemLayer$: Observable<IItemLayer>;
|
||||||
public baseLayers: Observable<Array<IItemLayer>>;
|
public baseMaps: Observable<Array<IItemLayer>>;
|
||||||
|
public aerialMaps: Observable<Array<IItemLayer>>;
|
||||||
public selectedBaseLayer: Observable<IItemLayer>;
|
public selectedBaseLayer: Observable<IItemLayer>;
|
||||||
|
|
||||||
constructor( private store: Store<mapReducers.State>) {
|
constructor( private store: Store<mapReducers.State>) {
|
||||||
@@ -26,7 +28,8 @@ export class LayerSwitcher implements OnInit,OnChanges{
|
|||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
this.overlayLayers = this.store.select(mapReducers.selectGetOverlayLayers);
|
this.overlayLayers = this.store.select(mapReducers.selectGetOverlayLayers);
|
||||||
this.selectedOverlayLayer = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
|
this.selectedOverlayLayer = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
|
||||||
this.baseLayers = this.store.select(mapReducers.selectGetBaseLayers);
|
this.baseMaps = this.store.select(mapReducers.selectGetBaseMaps);
|
||||||
|
this.aerialMaps = this.store.select(mapReducers.selectGetArealMaps);
|
||||||
this.selectedBaseLayer = this.store.select(mapReducers.selectGetSelectedBaseLayer);
|
this.selectedBaseLayer = this.store.select(mapReducers.selectGetSelectedBaseLayer);
|
||||||
this.selectedItemLayer$ = this.store.select(mapReducers.selectGetSelectedItemLayer)
|
this.selectedItemLayer$ = this.store.select(mapReducers.selectGetSelectedItemLayer)
|
||||||
this.showLayerSwitcher = this.store.select(mapReducers.selectGetShowLayerSwitcher);
|
this.showLayerSwitcher = this.store.select(mapReducers.selectGetShowLayerSwitcher);
|
||||||
@@ -83,3 +86,4 @@ export class LayerSwitcher implements OnInit,OnChanges{
|
|||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -7,7 +7,8 @@ import {IHistogram, ILayer} from '../../../models/color.map';
|
|||||||
styles: ['.nopadding{\n' +
|
styles: ['.nopadding{\n' +
|
||||||
' padding: 0 !important;\n' +
|
' padding: 0 !important;\n' +
|
||||||
' margin: 0 !important;\n' +
|
' margin: 0 !important;\n' +
|
||||||
'}']
|
'}'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class HistogramDetailsComponent {
|
export class HistogramDetailsComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ import { IColorMap, IColor, IColorEntry,ILayer, IRenderer } from '../../models/c
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-layer-legend',
|
selector: 'fm-map-layer-legend',
|
||||||
templateUrl: './legend.component.html',
|
templateUrl: './legend.component.html',
|
||||||
styleUrls: ['./legend.component.scss']
|
styleUrls: ['./legend.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class LegendComponent implements OnInit,AfterViewInit {
|
export class LegendComponent implements OnInit,AfterViewInit {
|
||||||
|
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ import { IStatistics } from '../../../models/color.map';
|
|||||||
styles: ['.nopadding{\n' +
|
styles: ['.nopadding{\n' +
|
||||||
' padding: 0 !important;\n' +
|
' padding: 0 !important;\n' +
|
||||||
' margin: 0 !important;\n' +
|
' margin: 0 !important;\n' +
|
||||||
'}']
|
'}'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class StatisticsDetailsComponent {
|
export class StatisticsDetailsComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ div.map-search {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.disabled {
|
.disabled {
|
||||||
color:lighten(#000000,80%);
|
color:adjust(#000000,80%);
|
||||||
}
|
}
|
||||||
|
|
||||||
:host ::ng-deep ngb-typeahead-window.dropdown-menu {
|
:host ::ng-deep ngb-typeahead-window.dropdown-menu {
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ import { tassign } from 'tassign';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-map-search',
|
selector: 'fm-map-map-search',
|
||||||
templateUrl: './map-search.component.html',
|
templateUrl: './map-search.component.html',
|
||||||
styleUrls: ['./map-search.component.scss']
|
styleUrls: ['./map-search.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class MapSearchComponent {
|
export class MapSearchComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -52,12 +52,21 @@ aol-map { position:absolute;width:100%;height:calc( 100vh );}
|
|||||||
pointer-events: none;
|
pointer-events: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@media screen and (max-width: 768px) {
|
||||||
|
.control-container {
|
||||||
|
margin-left: 1em;
|
||||||
|
margin-right: 1em;
|
||||||
|
pointer-events: all;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@media screen and (min-width: 768px) {
|
||||||
.control-container {
|
.control-container {
|
||||||
float: right;
|
float: right;
|
||||||
margin-right: 1em;
|
margin-right: 1em;
|
||||||
pointer-events: all;
|
pointer-events: all;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.fullscreen .viewport-container {
|
.fullscreen .viewport-container {
|
||||||
margin-bottom: 1em;
|
margin-bottom: 1em;
|
||||||
|
|||||||
@@ -41,7 +41,8 @@ import * as style from 'ol/style';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-map',
|
selector: 'fm-map-map',
|
||||||
templateUrl: './map.component.html',
|
templateUrl: './map.component.html',
|
||||||
styleUrls: ['./map.component.scss']
|
styleUrls: ['./map.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
|
|
||||||
export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
|
export class MapComponent implements OnInit, OnDestroy, AfterViewInit {
|
||||||
@@ -92,6 +93,8 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
public noContent = false;
|
public noContent = false;
|
||||||
public overrideSelectedItemLayer = false;
|
public overrideSelectedItemLayer = false;
|
||||||
public overrideOverlayLayers = false;
|
public overrideOverlayLayers = false;
|
||||||
|
public hideShowLayerValues = false;
|
||||||
|
public const
|
||||||
public dataLayerSlideValue = 50;
|
public dataLayerSlideValue = 50;
|
||||||
public dataLayerSlideEnabled = false;
|
public dataLayerSlideEnabled = false;
|
||||||
private visibleAreaBottom = 0;
|
private visibleAreaBottom = 0;
|
||||||
@@ -116,6 +119,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
const params = route.snapshot.data["fm-map-map"];
|
const params = route.snapshot.data["fm-map-map"];
|
||||||
this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false;
|
this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false;
|
||||||
this.overrideOverlayLayers = params["overrideOverlayLayers"] ? params["overrideOverlayLayers"] : false;
|
this.overrideOverlayLayers = params["overrideOverlayLayers"] ? params["overrideOverlayLayers"] : false;
|
||||||
|
this.hideShowLayerValues = params["hideShowLayerValues"] ? params["hideShowLayerValues"] : false;
|
||||||
}
|
}
|
||||||
this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query, mapState]) => {
|
this.querySub = this.query$.pipe(skip(1), withLatestFrom(this.mapState$)).subscribe(([query, mapState]) => {
|
||||||
if (query && query.querystate) {
|
if (query && query.querystate) {
|
||||||
@@ -297,11 +301,13 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
|
|
||||||
normalizeMapState(mapState: IMapState): IMapState {
|
normalizeMapState(mapState: IMapState): IMapState {
|
||||||
if (!mapState) return null;
|
if (!mapState) return null;
|
||||||
return {zoom: this.round(mapState.zoom,0),
|
return {
|
||||||
|
zoom: this.round(mapState.zoom, 0),
|
||||||
rotation: this.round(mapState.rotation, 2),
|
rotation: this.round(mapState.rotation, 2),
|
||||||
xCenter: this.round(mapState.xCenter, 5),
|
xCenter: this.round(mapState.xCenter, 5),
|
||||||
yCenter: this.round(mapState.yCenter, 5),
|
yCenter: this.round(mapState.yCenter, 5),
|
||||||
baseLayerCode: mapState.baseLayerCode };
|
baseLayerCode: mapState.baseLayerCode
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
serializeMapState(mapState: IMapState): string {
|
serializeMapState(mapState: IMapState): string {
|
||||||
@@ -472,11 +478,13 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleShowLayerValues(event: MouseEvent) {
|
handleShowLayerValues(event: MouseEvent) {
|
||||||
|
if (!this.hideShowLayerValues) {
|
||||||
event.stopPropagation();
|
event.stopPropagation();
|
||||||
this.zone.run(() => {
|
this.zone.run(() => {
|
||||||
this.store.dispatch(new mapActions.ToggleLayerValuesEnabled());
|
this.store.dispatch(new mapActions.ToggleLayerValuesEnabled());
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
handleOnDownload(event) {
|
handleOnDownload(event) {
|
||||||
|
|
||||||
|
|||||||
@@ -11,7 +11,8 @@ export interface IMetaData {
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-meta-data-modal',
|
selector: 'fm-map-meta-data-modal',
|
||||||
templateUrl: 'meta-data-modal.component.html'
|
templateUrl: 'meta-data-modal.component.html',
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class MetaDataModalComponent {
|
export class MetaDataModalComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -18,7 +18,8 @@ const after = (one: NgbDateStruct, two: NgbDateStruct) =>
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-select-period-modal',
|
selector: 'fm-map-select-period-modal',
|
||||||
templateUrl: 'select-period-modal.component.html',
|
templateUrl: 'select-period-modal.component.html',
|
||||||
styleUrls: ['select-period-modal.component.scss']
|
styleUrls: ['select-period-modal.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class SelectPeriodModalComponent {
|
export class SelectPeriodModalComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ import { IItemLayer } from '../../models/item.layer';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-selected-item-container',
|
selector: 'fm-map-selected-item-container',
|
||||||
templateUrl: './selected-item-container.component.html',
|
templateUrl: './selected-item-container.component.html',
|
||||||
styleUrls: ['./selected-item-container.component.scss']
|
styleUrls: ['./selected-item-container.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class SelectedItemContainerComponent {
|
export class SelectedItemContainerComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -18,14 +18,15 @@ import { withLatestFrom,switchMap,combineLatest } from 'rxjs/operators';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-selected-item-cropfield',
|
selector: 'fm-map-selected-item-cropfield',
|
||||||
templateUrl: './selected-item-cropfield.component.html',
|
templateUrl: './selected-item-cropfield.component.html',
|
||||||
styleUrls: ['./selected-item-cropfield.component.scss']
|
styleUrls: ['./selected-item-cropfield.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponent implements OnInit{
|
export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponent implements OnInit{
|
||||||
|
|
||||||
public items: Observable<IListItem[]>;
|
public items: Observable<IListItem[]>;
|
||||||
|
|
||||||
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
|
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
|
||||||
super(store, itemTypeService,location,router);
|
super(store, itemTypeService, itemService$, location,router);
|
||||||
}
|
}
|
||||||
|
|
||||||
areaInHa(item:IItem):number {
|
areaInHa(item:IItem):number {
|
||||||
|
|||||||
@@ -7,7 +7,8 @@
|
|||||||
<h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
|
<h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
|
||||||
<h1>{{item.name}}</h1>
|
<h1>{{item.name}}</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="legend-container" *ngIf="item?.data.layers;let layers">
|
<ng-container *ngIf="item?.data.layers;let layers">
|
||||||
|
<div class="legend-container">
|
||||||
<div class="card menu-card">
|
<div class="card menu-card">
|
||||||
<div *ngIf="layers.length>1">
|
<div *ngIf="layers.length>1">
|
||||||
<select (change)="onLayerChanged($event.target.value)">
|
<select (change)="onLayerChanged($event.target.value)">
|
||||||
@@ -26,9 +27,11 @@
|
|||||||
<li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i> <span i18n>Remove overlay</span></a></li>
|
<li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i> <span i18n>Remove overlay</span></a></li>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<li><fm-item-link class="text-primary p-0" [itemCode]="item.code" pathSuffix="data" [showText]="true"></fm-item-link></li>
|
<li><fm-item-link class="text-primary p-0" [itemCode]="item.code" pathSuffix="data" [showText]="true"></fm-item-link></li>
|
||||||
|
<li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i> <span i18n>Download</span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
<fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
|
<fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
|
||||||
|
</ng-container>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,12 +1,13 @@
|
|||||||
import { Component, Injectable } from '@angular/core';
|
|
||||||
import { Location } from '@angular/common';
|
import { Location } from '@angular/common';
|
||||||
import { Store } from '@ngrx/store';
|
import { Component, Injectable, OnDestroy } from '@angular/core';
|
||||||
import * as mapReducers from '../../reducers/map.reducer';
|
|
||||||
import { commonReducers, ItemTypeService, ItemService, FolderService } from '@farmmaps/common';
|
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
|
import { commonReducers, FolderService, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
|
||||||
|
import { Store } from '@ngrx/store';
|
||||||
|
import { Subscription } from 'rxjs';
|
||||||
|
import * as mapActions from '../../actions/map.actions';
|
||||||
|
import * as mapReducers from '../../reducers/map.reducer';
|
||||||
import { ForItemType } from '../for-item/for-itemtype.decorator';
|
import { ForItemType } from '../for-item/for-itemtype.decorator';
|
||||||
import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
|
import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
|
||||||
import * as mapActions from '../../actions/map.actions';
|
|
||||||
|
|
||||||
|
|
||||||
@ForItemType("vnd.farmmaps.itemtype.geotiff.processed")
|
@ForItemType("vnd.farmmaps.itemtype.geotiff.processed")
|
||||||
@@ -14,12 +15,18 @@ import * as mapActions from '../../actions/map.actions';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-selected-item-geotiff',
|
selector: 'fm-map-selected-item-geotiff',
|
||||||
templateUrl: './selected-item-geotiff.component.html',
|
templateUrl: './selected-item-geotiff.component.html',
|
||||||
styleUrls: ['./selected-item-geotiff.component.scss']
|
styleUrls: ['./selected-item-geotiff.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent {
|
export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent implements OnDestroy {
|
||||||
|
sub: Subscription;
|
||||||
|
|
||||||
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
|
constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
|
||||||
super(store, itemTypeService,location,router);
|
super(store, itemTypeService,itemService,location,router);
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
if (this.sub) this.sub.unsubscribe();
|
||||||
}
|
}
|
||||||
|
|
||||||
onLayerChanged(layerIndex: number) {
|
onLayerChanged(layerIndex: number) {
|
||||||
@@ -29,4 +36,13 @@ export class SelectedItemGeotiffComponent extends AbstractSelectedItemComponent
|
|||||||
layer(layers:any,layerIndex:number) {
|
layer(layers:any,layerIndex:number) {
|
||||||
return layers.find(l => l.index == layerIndex);
|
return layers.find(l => l.index == layerIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
|
||||||
|
event.stopPropagation();
|
||||||
|
event.preventDefault();
|
||||||
|
const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
|
||||||
|
this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {
|
||||||
|
window.location.href = itemLinkUrl.url;
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,8 @@
|
|||||||
<h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
|
<h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
|
||||||
<h1>{{item.name}}</h1>
|
<h1>{{item.name}}</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="legend-container" *ngIf="item?.data.layers;let layers">
|
<ng-container *ngIf="item?.data.layers;let layers">
|
||||||
|
<div class="legend-container">
|
||||||
<div class="card menu-card">
|
<div class="card menu-card">
|
||||||
<div *ngIf="layers.length>1">
|
<div *ngIf="layers.length>1">
|
||||||
<select (change)="onLayerChanged($event.target.value)">
|
<select (change)="onLayerChanged($event.target.value)">
|
||||||
@@ -24,8 +25,10 @@
|
|||||||
<li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-olus" aria-hidden="true" i18n-title title="Add as layer"></i> <span i18n>Add as overlay</span></a></li>
|
<li *ngIf="!getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleAddAsLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-olus" aria-hidden="true" i18n-title title="Add as layer"></i> <span i18n>Add as overlay</span></a></li>
|
||||||
<li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i> <span i18n>Remove overlay</span></a></li>
|
<li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)" ><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i> <span i18n>Remove overlay</span></a></li>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
|
<li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i> <span i18n>Download</span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
</ng-container>
|
||||||
<fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
|
<fm-map-zoom-to-show-alert [layer]="itemLayer?.layer"></fm-map-zoom-to-show-alert>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,14 +1,13 @@
|
|||||||
import { Component, Input, Injectable, OnInit } from '@angular/core';
|
|
||||||
import { Location } from '@angular/common';
|
import { Location } from '@angular/common';
|
||||||
import { Feature } from 'ol';
|
import { Component, Injectable, OnDestroy } from '@angular/core';
|
||||||
|
import { Router } from '@angular/router';
|
||||||
|
import { commonReducers, FolderService, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
|
||||||
import { Store } from '@ngrx/store';
|
import { Store } from '@ngrx/store';
|
||||||
import * as mapReducers from '../../reducers/map.reducer';
|
|
||||||
import { commonReducers, ItemTypeService, IItem, Item, ItemService, FolderService, IListItem} from '@farmmaps/common';
|
|
||||||
import * as mapActions from '../../actions/map.actions';
|
import * as mapActions from '../../actions/map.actions';
|
||||||
import { Router, ActivatedRoute, ParamMap, Event } from '@angular/router';
|
import * as mapReducers from '../../reducers/map.reducer';
|
||||||
import { ForItemType } from '../for-item/for-itemtype.decorator';
|
import { ForItemType } from '../for-item/for-itemtype.decorator';
|
||||||
import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
|
import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
|
||||||
import { Observable } from 'rxjs';
|
import { Subscription } from 'rxjs';
|
||||||
|
|
||||||
|
|
||||||
@ForItemType("vnd.farmmaps.itemtype.shape.processed")
|
@ForItemType("vnd.farmmaps.itemtype.shape.processed")
|
||||||
@@ -16,14 +15,20 @@ import { Observable } from 'rxjs';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-selected-item-shape',
|
selector: 'fm-map-selected-item-shape',
|
||||||
templateUrl: './selected-item-shape.component.html',
|
templateUrl: './selected-item-shape.component.html',
|
||||||
styleUrls: ['./selected-item-shape.component.scss']
|
styleUrls: ['./selected-item-shape.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
|
export class SelectedItemShapeComponent extends AbstractSelectedItemComponent implements OnDestroy {
|
||||||
|
|
||||||
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
|
|
||||||
super(store, itemTypeService,location,router);
|
|
||||||
}
|
|
||||||
public selectedLayer = 0;
|
public selectedLayer = 0;
|
||||||
|
sub: Subscription;
|
||||||
|
|
||||||
|
constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) {
|
||||||
|
super(store, itemTypeService,itemService,location,router);
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
if (this.sub) this.sub.unsubscribe();
|
||||||
|
}
|
||||||
|
|
||||||
onLayerChanged(layerIndex: number) {
|
onLayerChanged(layerIndex: number) {
|
||||||
this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
|
this.store.dispatch(new mapActions.SetLayerIndex(layerIndex));
|
||||||
@@ -32,4 +37,13 @@ export class SelectedItemShapeComponent extends AbstractSelectedItemComponent {
|
|||||||
layer(layers:any,layerIndex:number) {
|
layer(layers:any,layerIndex:number) {
|
||||||
return layers.find(l => l.index == layerIndex);
|
return layers.find(l => l.index == layerIndex);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
|
||||||
|
event.stopPropagation();
|
||||||
|
event.preventDefault();
|
||||||
|
const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
|
||||||
|
this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {
|
||||||
|
window.location.href = itemLinkUrl.url;
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,8 @@
|
|||||||
<h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
|
<h2 *ngIf="parentOfItemType('vnd.farmmaps.itemtype.cropfield')">{{parentItem.name}}</h2>
|
||||||
<h1>{{item.name}}</h1>
|
<h1>{{item.name}}</h1>
|
||||||
</div>
|
</div>
|
||||||
<div class="legend-container" *ngIf="item?.data.layers;let layers">
|
<ng-container *ngIf="item?.data.layers;let layers">
|
||||||
|
<div class="legend-container">
|
||||||
<div class="card menu-card">
|
<div class="card menu-card">
|
||||||
<h5><span i18n>Date</span>: {{temporalService.selectedDate(itemLayer)}}</h5>
|
<h5><span i18n>Date</span>: {{temporalService.selectedDate(itemLayer)}}</h5>
|
||||||
<div class="d-flex justify-content-between">
|
<div class="d-flex justify-content-between">
|
||||||
@@ -42,8 +43,10 @@
|
|||||||
<li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i> <span i18n>Remove overlay</span></a></li>
|
<li *ngIf="getItemLayer(item,itemLayer.layerIndex)"><a href="#" (click)="handleRemoveLayer(item,itemLayer.layerIndex)"><i class="fas fa-layer-minus" aria-hidden="true" i18n-title title="Remove overlay"></i> <span i18n>Remove overlay</span></a></li>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i> <span i18n>Show chart</span></a></li>
|
<li><a href="#" (click)="handleGoToChart(item)"><i class="fal fa-line-chart" aria-hidden="true" i18m-title title="Show chart"></i> <span i18n>Show chart</span></a></li>
|
||||||
|
<li><a href="#" (click)="download($event,item,layers,itemLayer.layerIndex)"><i class="fal fa-download" aria-hidden="true" i18n-title title="Download"></i> <span i18n>Download</span></a></li>
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
|
</ng-container>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,28 +1,33 @@
|
|||||||
import { Component, Injectable } from '@angular/core';
|
|
||||||
import { Location } from '@angular/common';
|
import { Location } from '@angular/common';
|
||||||
import { Store } from '@ngrx/store';
|
import { Component, Injectable, OnDestroy } from '@angular/core';
|
||||||
import * as mapReducers from '../../reducers/map.reducer';
|
|
||||||
import { commonReducers, ItemTypeService, IItem } from '@farmmaps/common';
|
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
|
import { commonReducers, IItem, IItemLinkType, ItemService, ItemTypeService, IUrlType } from '@farmmaps/common';
|
||||||
|
import { Store } from '@ngrx/store';
|
||||||
|
import { Subscription } from 'rxjs';
|
||||||
|
import * as mapActions from '../../actions/map.actions';
|
||||||
|
import { IItemLayer, ITemporalItemLayer } from '../../models/item.layer';
|
||||||
|
import * as mapReducers from '../../reducers/map.reducer';
|
||||||
|
import { TemporalService } from '../../services/temporal.service';
|
||||||
import { ForItemType } from '../for-item/for-itemtype.decorator';
|
import { ForItemType } from '../for-item/for-itemtype.decorator';
|
||||||
import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
|
import { AbstractSelectedItemComponent } from '../selected-item/selected-item.component';
|
||||||
import { ITemporalItemLayer} from '../../models/item.layer';
|
|
||||||
import * as mapActions from '../../actions/map.actions';
|
|
||||||
import { IItemLayer } from '../../models/item.layer';
|
|
||||||
import {TemporalService} from '../../services/temporal.service';
|
|
||||||
|
|
||||||
|
|
||||||
@ForItemType("vnd.farmmaps.itemtype.temporal")
|
@ForItemType("vnd.farmmaps.itemtype.temporal")
|
||||||
@Injectable()
|
@Injectable()
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-selected-item-temporal',
|
selector: 'fm-map-selected-item-temporal',
|
||||||
templateUrl: './selected-item-temporal.component.html',
|
templateUrl: './selected-item-temporal.component.html',
|
||||||
styleUrls: ['./selected-item-temporal.component.scss']
|
styleUrls: ['./selected-item-temporal.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent {
|
export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent implements OnDestroy {
|
||||||
|
sub: Subscription;
|
||||||
|
|
||||||
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
|
constructor(store: Store<mapReducers.State | commonReducers.State>, public itemService: ItemService, itemTypeService: ItemTypeService, location: Location, router: Router,public temporalService:TemporalService) {
|
||||||
super(store, itemTypeService,location,router);
|
super(store, itemTypeService,itemService,location,router);
|
||||||
|
}
|
||||||
|
|
||||||
|
ngOnDestroy(): void {
|
||||||
|
if (this.sub) this.sub.unsubscribe();
|
||||||
}
|
}
|
||||||
|
|
||||||
onLayerChanged(layerIndex: number) {
|
onLayerChanged(layerIndex: number) {
|
||||||
@@ -33,8 +38,6 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
|
|||||||
return (this.itemLayer as ITemporalItemLayer)?.selectedItemLayer
|
return (this.itemLayer as ITemporalItemLayer)?.selectedItemLayer
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
handleNextTemporal(event:MouseEvent) {
|
handleNextTemporal(event:MouseEvent) {
|
||||||
this.store.dispatch(new mapActions.NextTemporal());
|
this.store.dispatch(new mapActions.NextTemporal());
|
||||||
event.preventDefault();
|
event.preventDefault();
|
||||||
@@ -61,4 +64,13 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent
|
|||||||
this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]);
|
this.router.navigate(['/viewer', 'temporal', 'item', item.parentCode, new Date(Date.parse(item.dataDate)).getUTCFullYear()]);
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
download(event:MouseEvent,item:IItem,layers:any,layerIndex:number) {
|
||||||
|
event.stopPropagation();
|
||||||
|
event.preventDefault();
|
||||||
|
const itemLink : IItemLinkType = {itemcode:item.code,query:`layer=${this.layer(layers,layerIndex).name}`,pathsuffix:"download", validminutes:10}
|
||||||
|
this.sub = this.itemService.getItemLink(itemLink).subscribe((itemLinkUrl:IUrlType) => {
|
||||||
|
window.location.href = itemLinkUrl.url;
|
||||||
|
})
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -2,7 +2,7 @@ import {Component, Injectable, Input, Directive} from '@angular/core';
|
|||||||
import {Location} from '@angular/common';
|
import {Location} from '@angular/common';
|
||||||
import {Store} from '@ngrx/store';
|
import {Store} from '@ngrx/store';
|
||||||
import * as mapReducers from '../../reducers/map.reducer';
|
import * as mapReducers from '../../reducers/map.reducer';
|
||||||
import {AppConfig, commonReducers, IItem, ItemTypeService} from '@farmmaps/common';
|
import {AppConfig, commonReducers, IItem, ItemService, ItemTypeService} from '@farmmaps/common';
|
||||||
import * as mapActions from '../../actions/map.actions';
|
import * as mapActions from '../../actions/map.actions';
|
||||||
import {Router} from '@angular/router';
|
import {Router} from '@angular/router';
|
||||||
import { IItemLayer } from '../../models/item.layer';
|
import { IItemLayer } from '../../models/item.layer';
|
||||||
@@ -15,7 +15,7 @@ export abstract class AbstractSelectedItemComponent {
|
|||||||
@Input() parentItem: IItem;
|
@Input() parentItem: IItem;
|
||||||
@Input() itemLayer: IItemLayer;
|
@Input() itemLayer: IItemLayer;
|
||||||
@Input() overlayLayers: Array<IItemLayer>;
|
@Input() overlayLayers: Array<IItemLayer>;
|
||||||
constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location, public router: Router) {
|
constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, public itemService: ItemService, private location: Location, public router: Router) {
|
||||||
}
|
}
|
||||||
|
|
||||||
handleOnView(item: IItem) {
|
handleOnView(item: IItem) {
|
||||||
@@ -37,6 +37,11 @@ export abstract class AbstractSelectedItemComponent {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
handleOnDelete(item: IItem) {
|
||||||
|
this.itemService.deleteItem(item.code);
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
handleAddAsLayer(item: IItem,layerIndex = -1) {
|
handleAddAsLayer(item: IItem,layerIndex = -1) {
|
||||||
this.store.dispatch(new mapActions.AddLayer(item,layerIndex));
|
this.store.dispatch(new mapActions.AddLayer(item,layerIndex));
|
||||||
return false;
|
return false;
|
||||||
@@ -72,12 +77,13 @@ export abstract class AbstractSelectedItemComponent {
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-selected-item',
|
selector: 'fm-map-selected-item',
|
||||||
templateUrl: './selected-item.component.html',
|
templateUrl: './selected-item.component.html',
|
||||||
styleUrls: ['./selected-item.component.scss']
|
styleUrls: ['./selected-item.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class SelectedItemComponent extends AbstractSelectedItemComponent {
|
export class SelectedItemComponent extends AbstractSelectedItemComponent {
|
||||||
|
|
||||||
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, location: Location, router: Router, public config:AppConfig) {
|
constructor(store: Store<mapReducers.State | commonReducers.State>, itemTypeService: ItemTypeService, itemService: ItemService, location: Location, router: Router, public config:AppConfig) {
|
||||||
super(store, itemTypeService,location,router);
|
super(store, itemTypeService,itemService,location,router);
|
||||||
}
|
}
|
||||||
|
|
||||||
getThumbnailUrl(item:IItem):string {
|
getThumbnailUrl(item:IItem):string {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@ import { Directive, ViewContainerRef } from '@angular/core';
|
|||||||
|
|
||||||
@Directive({
|
@Directive({
|
||||||
selector: '[fm-map-widget-host]',
|
selector: '[fm-map-widget-host]',
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class WidgetHostDirective {
|
export class WidgetHostDirective {
|
||||||
constructor(public viewContainerRef: ViewContainerRef) { }
|
constructor(public viewContainerRef: ViewContainerRef) { }
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ import { Component, OnInit, Input } from '@angular/core';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-widget-status',
|
selector: 'fm-map-widget-status',
|
||||||
templateUrl: './widget-status.component.html',
|
templateUrl: './widget-status.component.html',
|
||||||
styleUrls: ['./widget-status.component.css']
|
styleUrls: ['./widget-status.component.css'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class WidgetStatusComponent implements OnInit {
|
export class WidgetStatusComponent implements OnInit {
|
||||||
@Input() stage: Stage;
|
@Input() stage: Stage;
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ import { Source } from 'ol/source';
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map-zoom-to-show-alert',
|
selector: 'fm-map-zoom-to-show-alert',
|
||||||
template: '<div *fmMapIfZoomToShow="layer$" class="alert alert-info"><i class="fas fa-search-plus" aria-hidden="true" i18n-title title="Add as layer"></i> <span i18n>Zoom in to show layer</span></div>'
|
template: '<div *fmMapIfZoomToShow="layer$" class="alert alert-info"><i class="fas fa-search-plus" aria-hidden="true" i18n-title title="Add as layer"></i> <span i18n>Zoom in to show layer</span></div>',
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class ZoomToShowAlert {
|
export class ZoomToShowAlert {
|
||||||
public layer$: Layer<Source>;
|
public layer$: Layer<Source>;
|
||||||
|
|||||||
@@ -166,6 +166,7 @@ export class MapEffects {
|
|||||||
zoomToExtent2$ = createEffect(() => this.actions$.pipe(
|
zoomToExtent2$ = createEffect(() => this.actions$.pipe(
|
||||||
ofType(mapActions.SETFEATURES),
|
ofType(mapActions.SETFEATURES),
|
||||||
switchMap((action: mapActions.SetFeatures) => {
|
switchMap((action: mapActions.SetFeatures) => {
|
||||||
|
if (action.zoomToExtent) {
|
||||||
const extent = createEmpty();
|
const extent = createEmpty();
|
||||||
if (extent) {
|
if (extent) {
|
||||||
for (const f of action.features) {
|
for (const f of action.features) {
|
||||||
@@ -173,6 +174,7 @@ export class MapEffects {
|
|||||||
}
|
}
|
||||||
if (action.features.length > 0) return of(new mapActions.SetExtent(extent));
|
if (action.features.length > 0) return of(new mapActions.SetExtent(extent));
|
||||||
}
|
}
|
||||||
|
}
|
||||||
return EMPTY;
|
return EMPTY;
|
||||||
})));
|
})));
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { ILayervalue } from '../models/layer.value';
|
|||||||
import * as mapActions from '../actions/map.actions';
|
import * as mapActions from '../actions/map.actions';
|
||||||
import {commonActions} from '@farmmaps/common';
|
import {commonActions} from '@farmmaps/common';
|
||||||
import { createSelector, createFeatureSelector } from '@ngrx/store';
|
import { createSelector, createFeatureSelector } from '@ngrx/store';
|
||||||
|
import * as _ from 'lodash';
|
||||||
|
|
||||||
import {Feature} from 'ol';
|
import {Feature} from 'ol';
|
||||||
import {Geometry} from 'ol/geom';
|
import {Geometry} from 'ol/geom';
|
||||||
@@ -47,6 +48,7 @@ export interface State {
|
|||||||
query:IQuery,
|
query:IQuery,
|
||||||
parentCode: string,
|
parentCode: string,
|
||||||
features: Array<Feature<Geometry>>,
|
features: Array<Feature<Geometry>>,
|
||||||
|
featuresBackup: Array<Feature<Geometry>>,
|
||||||
panelVisible: boolean,
|
panelVisible: boolean,
|
||||||
panelCollapsed: boolean,
|
panelCollapsed: boolean,
|
||||||
panelExtraWide: boolean,
|
panelExtraWide: boolean,
|
||||||
@@ -93,6 +95,7 @@ export const initialState: State = {
|
|||||||
query: null,
|
query: null,
|
||||||
parentCode: null,
|
parentCode: null,
|
||||||
features: [],
|
features: [],
|
||||||
|
featuresBackup: [],
|
||||||
panelVisible: false,
|
panelVisible: false,
|
||||||
panelCollapsed: false,
|
panelCollapsed: false,
|
||||||
panelExtraWide: false,
|
panelExtraWide: false,
|
||||||
@@ -156,13 +159,15 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
const a = action as mapActions.StartSearchSuccess;
|
const a = action as mapActions.StartSearchSuccess;
|
||||||
return tassign(state, {
|
return tassign(state, {
|
||||||
features: a.features,
|
features: a.features,
|
||||||
|
featuresBackup: [],
|
||||||
inSearch:false
|
inSearch:false
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
case mapActions.SETFEATURES: {
|
case mapActions.SETFEATURES: {
|
||||||
const a = action as mapActions.SetFeatures;
|
const a = action as mapActions.SetFeatures;
|
||||||
return tassign(state, {
|
return tassign(state, {
|
||||||
features: a.features
|
features: a.features,
|
||||||
|
featuresBackup: []
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
case mapActions.SELECTFEATURE: {
|
case mapActions.SELECTFEATURE: {
|
||||||
@@ -180,6 +185,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
selectedItemLayer: null,
|
selectedItemLayer: null,
|
||||||
showDataLayerSlide: false,
|
showDataLayerSlide: false,
|
||||||
features:[],
|
features:[],
|
||||||
|
featuresBackup: [],
|
||||||
inSearch:inSearch
|
inSearch:inSearch
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -296,6 +302,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
return tassign(state, {
|
return tassign(state, {
|
||||||
selectedItem: null,
|
selectedItem: null,
|
||||||
features:[],
|
features:[],
|
||||||
|
featuresBackup: [],
|
||||||
selectedItemLayer:null,
|
selectedItemLayer:null,
|
||||||
searchCollapsed: !panelVisible,
|
searchCollapsed: !panelVisible,
|
||||||
panelVisible: panelVisible,
|
panelVisible: panelVisible,
|
||||||
@@ -332,7 +339,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
extent: a.feature.getGeometry().getExtent(),
|
extent: a.feature.getGeometry().getExtent(),
|
||||||
searchCollapsed: false,
|
searchCollapsed: false,
|
||||||
clearEnabled:true,
|
clearEnabled:true,
|
||||||
features:features
|
features:features,
|
||||||
|
featuresBackup:[]
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
case mapActions.UPDATEFEATURESUCCESS: {
|
case mapActions.UPDATEFEATURESUCCESS: {
|
||||||
@@ -346,7 +354,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
features.push(state.features[i]);
|
features.push(state.features[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return tassign(state, { features: features });
|
return tassign(state, { features: features, featuresBackup: [] });
|
||||||
}
|
}
|
||||||
case mapActions.EXPANDSEARCH: {
|
case mapActions.EXPANDSEARCH: {
|
||||||
return tassign(state, { searchCollapsed: false });
|
return tassign(state, { searchCollapsed: false });
|
||||||
@@ -391,7 +399,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
return tassign(state, {overlayLayers: [], selectedOverlayLayer: null});
|
return tassign(state, {overlayLayers: [], selectedOverlayLayer: null});
|
||||||
}
|
}
|
||||||
case mapActions.CLEARFEATURES: {
|
case mapActions.CLEARFEATURES: {
|
||||||
return tassign(state, {features: [], selectedFeature: null});
|
return tassign(state, {features: [], featuresBackup: [], selectedFeature: null});
|
||||||
}
|
}
|
||||||
case mapActions.SETVISIBILITY: {
|
case mapActions.SETVISIBILITY: {
|
||||||
const a = action as mapActions.SetVisibility;
|
const a = action as mapActions.SetVisibility;
|
||||||
@@ -509,6 +517,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
searchCollapsed: true,
|
searchCollapsed: true,
|
||||||
searchMinified: false,
|
searchMinified: false,
|
||||||
features: [],
|
features: [],
|
||||||
|
featuresBackup: [],
|
||||||
query:initialState.query,
|
query:initialState.query,
|
||||||
showLayerSwitcher: false,
|
showLayerSwitcher: false,
|
||||||
extent: null,
|
extent: null,
|
||||||
@@ -556,7 +565,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
selectedItem: null,
|
selectedItem: null,
|
||||||
selectedItemLayer: null,
|
selectedItemLayer: null,
|
||||||
showDataLayerSlide: false,
|
showDataLayerSlide: false,
|
||||||
features:[]
|
features:[],
|
||||||
|
featuresBackup:[]
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
if(state.features.length>0) {
|
if(state.features.length>0) {
|
||||||
@@ -569,7 +579,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
if(index>=0) {
|
if(index>=0) {
|
||||||
const newFeatures = state.features.slice(0);
|
const newFeatures = state.features.slice(0);
|
||||||
newFeatures.splice(index,1);
|
newFeatures.splice(index,1);
|
||||||
return tassign(state,{features:newFeatures});
|
return tassign(state,{features:newFeatures, featuresBackup:[]});
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return state;
|
return state;
|
||||||
@@ -578,6 +588,17 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
const a= action as mapActions.SetPanelExtraWide;
|
const a= action as mapActions.SetPanelExtraWide;
|
||||||
return tassign(state,{panelExtraWide:a.panelExtraWide});
|
return tassign(state,{panelExtraWide:a.panelExtraWide});
|
||||||
}
|
}
|
||||||
|
case mapActions.BACKUPFEATURES: {
|
||||||
|
return tassign(state, {
|
||||||
|
featuresBackup: _.cloneDeep(state.features)
|
||||||
|
});
|
||||||
|
}
|
||||||
|
case mapActions.RESTOREFEATURES: {
|
||||||
|
return tassign(state, {
|
||||||
|
features: _.cloneDeep(state.featuresBackup),
|
||||||
|
featuresBackup: []
|
||||||
|
});
|
||||||
|
}
|
||||||
default: {
|
default: {
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
@@ -637,6 +658,8 @@ export const selectGetExtent = createSelector(selectMapState, getExtent);
|
|||||||
export const selectGetViewExtent = createSelector(selectMapState, getViewExtent);
|
export const selectGetViewExtent = createSelector(selectMapState, getViewExtent);
|
||||||
export const selectGetOverlayLayers = createSelector(selectMapState, getOverlayLayers);
|
export const selectGetOverlayLayers = createSelector(selectMapState, getOverlayLayers);
|
||||||
export const selectGetBaseLayers = createSelector(selectMapState, getBaseLayers);
|
export const selectGetBaseLayers = createSelector(selectMapState, getBaseLayers);
|
||||||
|
export const selectGetBaseMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "baseMap"));
|
||||||
|
export const selectGetArealMaps = createSelector(selectGetBaseLayers, (layers) => layers.filter(layer => layer.item.data.category === "aerialPhoto").sort((a, b) => a.item.dataDate <= b.item.dataDate ? 1 : -1));
|
||||||
export const selectGetProjection = createSelector(selectMapState, getProjection);
|
export const selectGetProjection = createSelector(selectMapState, getProjection);
|
||||||
export const selectGetSelectedBaseLayer = createSelector(selectMapState, getSelectedBaseLayer);
|
export const selectGetSelectedBaseLayer = createSelector(selectMapState, getSelectedBaseLayer);
|
||||||
export const selectGetSelectedOverlayLayer = createSelector(selectMapState, getSelectedOverlayLayer);
|
export const selectGetSelectedOverlayLayer = createSelector(selectMapState, getSelectedOverlayLayer);
|
||||||
|
|||||||
@@ -8,8 +8,8 @@
|
|||||||
"tslib": "^2.0.0"
|
"tslib": "^2.0.0"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@angular/common": "^18.2.3",
|
"@angular/common": "19.2.18",
|
||||||
"@angular/core": "^18.2.3",
|
"@angular/core": "19.2.18",
|
||||||
"cesium": "^1.97.0",
|
"cesium": "^1.97.0",
|
||||||
"ol-cesium": ">=2.13.0"
|
"ol-cesium": ">=2.13.0"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ import { Store } from '@ngrx/store';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map3d-switch2d3d',
|
selector: 'fm-map3d-switch2d3d',
|
||||||
templateUrl: './switch2d3d.component.html',
|
templateUrl: './switch2d3d.component.html',
|
||||||
styleUrls: ['./switch2d3d.component.scss']
|
styleUrls: ['./switch2d3d.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class Switch2D3DComponent {
|
export class Switch2D3DComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -5,20 +5,20 @@
|
|||||||
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
|
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
|
||||||
},
|
},
|
||||||
"peerDependencies": {
|
"peerDependencies": {
|
||||||
"@ng-bootstrap/ng-bootstrap": "^17.0.1",
|
"@ng-bootstrap/ng-bootstrap": "^18.0.0",
|
||||||
"@angular/common": "^18.2.3",
|
"@angular/common": "19.2.18",
|
||||||
"@angular/core": "^18.2.3",
|
"@angular/core": "19.2.18",
|
||||||
"@angular/forms": "^18.2.3",
|
"@angular/forms": "19.2.18",
|
||||||
"@ngrx/effects": "^18.0.2",
|
"@ngrx/effects": "19.2.1",
|
||||||
"@ngrx/router-store": "^18.0.2",
|
"@ngrx/router-store": "19.2.1",
|
||||||
"@ngrx/store": "^18.0.2",
|
"@ngrx/store": "19.2.1",
|
||||||
"tassign": "^1.0.0",
|
"tassign": "^1.0.0",
|
||||||
"bootstrap": "^5.3.3",
|
"bootstrap": "^5.3.3",
|
||||||
"@microsoft/signalr": "^3.1.16",
|
"@microsoft/signalr": "^3.1.16",
|
||||||
"ngx-uploadx": "^6.2.0",
|
"ngx-uploadx": "7.0.1",
|
||||||
"angular-oauth2-oidc": "^17.0.2",
|
"angular-oauth2-oidc": "^17.0.2",
|
||||||
"moment": "^2.29.4",
|
"moment": "^2.29.4",
|
||||||
"ngx-avatars": "^1.8.0",
|
"ngx-avatars": "1.9.3",
|
||||||
"ngx-image-cropper": "^7.0.0",
|
"ngx-image-cropper": "^7.0.0",
|
||||||
"ngx-clipboard": "^16.0.0"
|
"ngx-clipboard": "^16.0.0"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -83,6 +83,11 @@ export const SETPAGEMODE = '[AppCommon] SetPageMode';
|
|||||||
|
|
||||||
export const SETUNREADNOTIFICATIONS = '[AppCommon] SetUnreadNotifications';
|
export const SETUNREADNOTIFICATIONS = '[AppCommon] SetUnreadNotifications';
|
||||||
|
|
||||||
|
export const SWITCHLANGUAGE = '[AppCommon] SwitchLanguage';
|
||||||
|
|
||||||
|
export const SETSETTINGMENUBACKGROUNDCOLOR = '[AppCommon] SetSettingMenuBackgroundColor';
|
||||||
|
|
||||||
|
|
||||||
export class InitUser implements Action {
|
export class InitUser implements Action {
|
||||||
readonly type = INITUSER;
|
readonly type = INITUSER;
|
||||||
|
|
||||||
@@ -371,6 +376,17 @@ export class SetUnreadNotifications implements Action {
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class SwitchLanguage implements Action {
|
||||||
|
readonly type = SWITCHLANGUAGE;
|
||||||
|
|
||||||
|
constructor(public locale:string) { }
|
||||||
|
}
|
||||||
|
|
||||||
|
export class SetSettingMenuBackgroundColor implements Action {
|
||||||
|
readonly type = SETSETTINGMENUBACKGROUNDCOLOR;
|
||||||
|
|
||||||
|
constructor(public color:string) { }
|
||||||
|
}
|
||||||
|
|
||||||
export type Actions = OpenModal
|
export type Actions = OpenModal
|
||||||
| InitRoot
|
| InitRoot
|
||||||
@@ -418,6 +434,8 @@ export type Actions = OpenModal
|
|||||||
| ToggleHelpMenu
|
| ToggleHelpMenu
|
||||||
| ToggleSettingMenu
|
| ToggleSettingMenu
|
||||||
| NotificationEvent
|
| NotificationEvent
|
||||||
| SetUnreadNotifications;
|
| SetUnreadNotifications
|
||||||
|
| SwitchLanguage
|
||||||
|
| SetSettingMenuBackgroundColor;
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
// angular modules
|
// angular modules
|
||||||
import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector, Optional, SkipSelf } from '@angular/core';
|
import { NgModule, ModuleWithProviders, Injector, Optional, SkipSelf, inject, provideAppInitializer } from '@angular/core';
|
||||||
import { DatePipe } from '@angular/common';
|
import { DatePipe } from '@angular/common';
|
||||||
import { HTTP_INTERCEPTORS } from '@angular/common/http';
|
import { HTTP_INTERCEPTORS } from '@angular/common/http';
|
||||||
|
|
||||||
@@ -13,6 +13,7 @@ import { SchemaService } from './services/schema.service';
|
|||||||
import { FolderService } from './services/folder.service';
|
import { FolderService } from './services/folder.service';
|
||||||
import { TimespanService } from './services/timespan.service';
|
import { TimespanService } from './services/timespan.service';
|
||||||
import { ItemService } from './services/item.service';
|
import { ItemService } from './services/item.service';
|
||||||
|
import { TaskService } from './services/task.service';
|
||||||
import { AdminService } from './services/admin.service';
|
import { AdminService } from './services/admin.service';
|
||||||
import { EventService } from './services/event.service';
|
import { EventService } from './services/event.service';
|
||||||
import { TypeaheadService } from './services/typeahead.service';
|
import { TypeaheadService } from './services/typeahead.service';
|
||||||
@@ -44,6 +45,7 @@ export {
|
|||||||
ItemTypeService,
|
ItemTypeService,
|
||||||
TimespanService,
|
TimespanService,
|
||||||
ItemService,
|
ItemService,
|
||||||
|
TaskService,
|
||||||
AdminService,
|
AdminService,
|
||||||
EventService,
|
EventService,
|
||||||
TypeaheadService,
|
TypeaheadService,
|
||||||
@@ -88,12 +90,10 @@ export class AppCommonServiceModule {
|
|||||||
providers: [
|
providers: [
|
||||||
AppConfig,
|
AppConfig,
|
||||||
ItemTypeService,
|
ItemTypeService,
|
||||||
{
|
provideAppInitializer(() => {
|
||||||
provide: APP_INITIALIZER,
|
const initializerFn = (appConfigFactory)(inject(Injector), inject(AppConfig), inject(OAuthService), inject(AuthConfigFactory), inject(OAuthStorage), inject(ItemTypeService));
|
||||||
useFactory: appConfigFactory,
|
return initializerFn();
|
||||||
deps: [Injector, AppConfig, OAuthService, AuthConfigFactory, OAuthStorage, ItemTypeService],
|
}),
|
||||||
multi: true
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
provide: HTTP_INTERCEPTORS,
|
provide: HTTP_INTERCEPTORS,
|
||||||
useClass: AccessTokenInterceptor,
|
useClass: AccessTokenInterceptor,
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ import * as appActions from '../../actions/app-common.actions';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-app-menu',
|
selector: 'fm-app-menu',
|
||||||
templateUrl: './app-menu.component.html',
|
templateUrl: './app-menu.component.html',
|
||||||
styleUrls: ['./app-menu.component.scss']
|
styleUrls: ['./app-menu.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class AppMenuComponent implements OnInit {
|
export class AppMenuComponent implements OnInit {
|
||||||
|
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
<fm-resumable-file-upload></fm-resumable-file-upload>
|
<fm-resumable-file-upload></fm-resumable-file-upload>
|
||||||
</ng-container>
|
</ng-container>
|
||||||
<div class="user-menu apponly">
|
<div class="user-menu apponly">
|
||||||
<fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async"></fm-setting-menu>
|
<fm-setting-menu [user]="user|async" [showMenu]="settingMenuVisible|async" [backgroundColor]="settingMenuBackgroundColor|async"></fm-setting-menu>
|
||||||
<fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu>
|
<fm-help-menu [user]="user|async" [showMenu]="helpMenuVisible|async"></fm-help-menu>
|
||||||
<fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu>
|
<fm-notification-menu [user]="user|async" [unread]="unreadNotifications|async" [showMenu]="notificationMenuVisible|async"></fm-notification-menu>
|
||||||
<fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu>
|
<fm-app-menu [user]="user|async" [showMenu]="appMenuVisible|async"></fm-app-menu>
|
||||||
|
|||||||
@@ -24,7 +24,8 @@ import * as appReducers from '../../reducers/app-common.reducer';
|
|||||||
templateUrl: './app.component.html',
|
templateUrl: './app.component.html',
|
||||||
styleUrls: ['./app.component.scss'],
|
styleUrls: ['./app.component.scss'],
|
||||||
encapsulation: ViewEncapsulation.None,
|
encapsulation: ViewEncapsulation.None,
|
||||||
changeDetection: ChangeDetectionStrategy.OnPush
|
changeDetection: ChangeDetectionStrategy.OnPush,
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class AppComponent implements OnInit, OnDestroy {
|
export class AppComponent implements OnInit, OnDestroy {
|
||||||
|
|
||||||
@@ -50,6 +51,7 @@ export class AppComponent implements OnInit, OnDestroy {
|
|||||||
public unreadNotifications: Observable<number> = this.store$.select(appReducers.SelectgetUnreadNotifications);
|
public unreadNotifications: Observable<number> = this.store$.select(appReducers.SelectgetUnreadNotifications);
|
||||||
public user: Observable<IUser> = this.store$.select(appReducers.SelectGetUser);
|
public user: Observable<IUser> = this.store$.select(appReducers.SelectGetUser);
|
||||||
public isPageMode: Observable<boolean> = this.store$.select(appReducers.SelectGetIsPageMode);
|
public isPageMode: Observable<boolean> = this.store$.select(appReducers.SelectGetIsPageMode);
|
||||||
|
public settingMenuBackgroundColor: Observable<string> = this.store$.select(appReducers.SelectGetSettingMenuBackgroundColor);
|
||||||
@Input() showUploadProgress = true;
|
@Input() showUploadProgress = true;
|
||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ import { Location} from '@angular/common';
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-auth-callback',
|
selector: 'fm-auth-callback',
|
||||||
template:'<div></div>'
|
template: '<div></div>',
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class AuthCallbackComponent {
|
export class AuthCallbackComponent {
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ import { AppConfig } from '../../shared/app.config';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-avatar',
|
selector: 'fm-avatar',
|
||||||
templateUrl: './avatar.component.html',
|
templateUrl: './avatar.component.html',
|
||||||
styleUrls: ['./avatar.component.css']
|
styleUrls: ['./avatar.component.css'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class AvatarComponent implements OnInit {
|
export class AvatarComponent implements OnInit {
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,8 @@ import { DeviceService } from '../../services/device.service';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-back-button',
|
selector: 'fm-back-button',
|
||||||
templateUrl: './back-button.component.html',
|
templateUrl: './back-button.component.html',
|
||||||
styleUrls: ['./back-button.component.scss']
|
styleUrls: ['./back-button.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class BackButtonComponent {
|
export class BackButtonComponent {
|
||||||
@Output() beforeLocationBack = new EventEmitter();
|
@Output() beforeLocationBack = new EventEmitter();
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
<i class="fal fa-image"></i>
|
<i class="fal fa-image"></i>
|
||||||
<div i18n>No image selected</div>
|
<div i18n>No image selected</div>
|
||||||
</div>
|
</div>
|
||||||
<image-cropper #imageCropper
|
<image-cropper #imageCropper output="base64"
|
||||||
[imageChangedEvent]="imageChangedEvent"
|
[imageChangedEvent]="imageChangedEvent"
|
||||||
[maintainAspectRatio]="true"
|
[maintainAspectRatio]="true"
|
||||||
[format]="imageType"
|
[format]="imageType"
|
||||||
|
|||||||
@@ -7,7 +7,8 @@ import {ImageService } from '../../services/image.service';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-edit-image-modal',
|
selector: 'fm-edit-image-modal',
|
||||||
templateUrl: './edit-image-modal.component.html',
|
templateUrl: './edit-image-modal.component.html',
|
||||||
styleUrls: ['./edit-image-modal.component.scss']
|
styleUrls: ['./edit-image-modal.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class EditImageModalComponent implements OnInit {
|
export class EditImageModalComponent implements OnInit {
|
||||||
|
|
||||||
|
|||||||
@@ -4,7 +4,8 @@ import { IItem } from '../../models/item';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-gradient-select',
|
selector: 'fm-gradient-select',
|
||||||
templateUrl: './gradient-select.component.html',
|
templateUrl: './gradient-select.component.html',
|
||||||
styleUrls: ['./gradient-select.component.scss']
|
styleUrls: ['./gradient-select.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class GradientSelectComponent implements OnChanges {
|
export class GradientSelectComponent implements OnChanges {
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ import { GradientService } from '../../common-service.module';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-gradient',
|
selector: 'fm-gradient',
|
||||||
templateUrl: './gradient.component.html',
|
templateUrl: './gradient.component.html',
|
||||||
styleUrls: ['./gradient.component.scss']
|
styleUrls: ['./gradient.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class GradientComponent implements OnInit,OnChanges {
|
export class GradientComponent implements OnInit,OnChanges {
|
||||||
|
|
||||||
|
|||||||
@@ -9,6 +9,7 @@ import { IUser } from '../../models/user';
|
|||||||
|
|
||||||
@Directive({
|
@Directive({
|
||||||
selector: '[fm-hasclaim]',
|
selector: '[fm-hasclaim]',
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class HasClaimDirective implements OnInit{
|
export class HasClaimDirective implements OnInit{
|
||||||
@Input('fm-hasclaim') claim:string;
|
@Input('fm-hasclaim') claim:string;
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import {Store} from '@ngrx/store';
|
|||||||
|
|
||||||
@Directive({
|
@Directive({
|
||||||
selector: '[fmHasPackage]',
|
selector: '[fmHasPackage]',
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class HasPackageDirective implements OnDestroy, AfterViewInit {
|
export class HasPackageDirective implements OnDestroy, AfterViewInit {
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import { IUser } from '../../models/user';
|
|||||||
|
|
||||||
@Directive({
|
@Directive({
|
||||||
selector: '[fmHasRole]',
|
selector: '[fmHasRole]',
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class HasRoleDirective implements OnInit, OnDestroy{
|
export class HasRoleDirective implements OnInit, OnDestroy{
|
||||||
@Input('fmHasRole') role:string;
|
@Input('fmHasRole') role:string;
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ import * as appActions from '../../actions/app-common.actions';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-help-menu',
|
selector: 'fm-help-menu',
|
||||||
templateUrl: './help-menu.component.html',
|
templateUrl: './help-menu.component.html',
|
||||||
styleUrls: ['./help-menu.component.scss']
|
styleUrls: ['./help-menu.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class HelpMenuComponent implements OnInit {
|
export class HelpMenuComponent implements OnInit {
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ import { ClipboardService } from 'ngx-clipboard'
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-item-link',
|
selector: 'fm-item-link',
|
||||||
templateUrl: './item-link.component.html'
|
templateUrl: './item-link.component.html',
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class ItemLinkComponent implements OnDestroy {
|
export class ItemLinkComponent implements OnDestroy {
|
||||||
|
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ import * as commonActions from '../../actions/app-common.actions';
|
|||||||
selector: 'fm-menu-background',
|
selector: 'fm-menu-background',
|
||||||
templateUrl: './menu-background.component.html',
|
templateUrl: './menu-background.component.html',
|
||||||
styleUrls: ['./menu-background.component.scss'],
|
styleUrls: ['./menu-background.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class MenuBackgroundComponent implements OnInit {
|
export class MenuBackgroundComponent implements OnInit {
|
||||||
@Input() visible = false;
|
@Input() visible = false;
|
||||||
|
|||||||
@@ -4,6 +4,8 @@ import { Component, OnInit } from '@angular/core';
|
|||||||
selector: 'fm-not-found',
|
selector: 'fm-not-found',
|
||||||
templateUrl: './not-found.component.html'
|
templateUrl: './not-found.component.html'
|
||||||
// styleUrls: ['./not-found.component.css']
|
// styleUrls: ['./not-found.component.css']
|
||||||
|
,
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class NotFoundComponent implements OnInit {
|
export class NotFoundComponent implements OnInit {
|
||||||
constructor() { }
|
constructor() { }
|
||||||
|
|||||||
@@ -2,7 +2,8 @@ import { Component, OnInit } from '@angular/core';
|
|||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-not-implemented',
|
selector: 'fm-not-implemented',
|
||||||
templateUrl: './not-implemented.component.html'
|
templateUrl: './not-implemented.component.html',
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class NotImplementedComponent implements OnInit {
|
export class NotImplementedComponent implements OnInit {
|
||||||
constructor() { }
|
constructor() { }
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ import * as appActions from '../../actions/app-common.actions';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-notification-menu',
|
selector: 'fm-notification-menu',
|
||||||
templateUrl: './notification-menu.component.html',
|
templateUrl: './notification-menu.component.html',
|
||||||
styleUrls: ['./notification-menu.component.scss']
|
styleUrls: ['./notification-menu.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class NotificationMenuComponent implements OnInit {
|
export class NotificationMenuComponent implements OnInit {
|
||||||
|
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ import {Store} from '@ngrx/store';
|
|||||||
|
|
||||||
@Directive({
|
@Directive({
|
||||||
selector: '[fmPackageExists]',
|
selector: '[fmPackageExists]',
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class PackageExistsDirective implements OnDestroy, AfterViewInit {
|
export class PackageExistsDirective implements OnDestroy, AfterViewInit {
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@ div.resumable-file-upload {
|
|||||||
bottom: 0px;
|
bottom: 0px;
|
||||||
width: 300px;
|
width: 300px;
|
||||||
max-height: 250px;
|
max-height: 250px;
|
||||||
|
z-index: 1;
|
||||||
/*z-index:2000 !important;*/
|
/*z-index:2000 !important;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -44,7 +45,7 @@ div.card-header span.fa {
|
|||||||
|
|
||||||
.upload-file .progress-container .progress-bar {
|
.upload-file .progress-container .progress-bar {
|
||||||
display: block;
|
display: block;
|
||||||
background-color: color("green");
|
background-color: green;
|
||||||
width: 0%;
|
width: 0%;
|
||||||
height: 100%;
|
height: 100%;
|
||||||
}
|
}
|
||||||
@@ -83,7 +84,7 @@ div.card-header span.fa {
|
|||||||
}
|
}
|
||||||
|
|
||||||
.upload-file.done > div > span.fa-check {
|
.upload-file.done > div > span.fa-check {
|
||||||
color: color("green");
|
color: green;
|
||||||
width: 20px;
|
width: 20px;
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
vertical-align: middle;
|
vertical-align: middle;
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ import * as commonActions from '../../actions/app-common.actions';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-resumable-file-upload',
|
selector: 'fm-resumable-file-upload',
|
||||||
templateUrl: './resumable-file-upload.component.html',
|
templateUrl: './resumable-file-upload.component.html',
|
||||||
styleUrls: ['./resumable-file-upload.component.scss']
|
styleUrls: ['./resumable-file-upload.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
|
|
||||||
export class ResumableFileUploadComponent implements OnInit, OnDestroy {
|
export class ResumableFileUploadComponent implements OnInit, OnDestroy {
|
||||||
|
|||||||
@@ -9,7 +9,8 @@ import * as appCommonActions from '../../actions/app-common.actions';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-session-cleared',
|
selector: 'fm-session-cleared',
|
||||||
templateUrl: 'session-cleared.component.html',
|
templateUrl: 'session-cleared.component.html',
|
||||||
styleUrls: ['session-cleared.component.scss']
|
styleUrls: ['session-cleared.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<div>
|
<div>
|
||||||
<div (click)="toggle($event)" class="rounded-circle menu-button hidden" [ngClass]="{'hidden':!user || noContent}">
|
<div (click)="toggle($event)" class="rounded-circle menu-button hidden" [style.background-color]="backgroundColor" [ngClass]="{'hidden':!user || noContent}">
|
||||||
<span i18n-title title="Settings"><i class="fas fa-gear" aria-hidden="true"></i></span>
|
<span i18n-title title="Settings"><i class="fas fa-gear" aria-hidden="true"></i></span>
|
||||||
<div class="menu hidden" [ngClass]="{'hidden':!showMenu}">
|
<div class="menu hidden" [ngClass]="{'hidden':!showMenu}">
|
||||||
<router-outlet name="setting-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>
|
<router-outlet name="setting-menu" (activate)="activateRoute()" (deactivate)="deActivateRoute()"></router-outlet>
|
||||||
|
|||||||
@@ -9,12 +9,14 @@ import * as appActions from '../../actions/app-common.actions';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-setting-menu',
|
selector: 'fm-setting-menu',
|
||||||
templateUrl: './setting-menu.component.html',
|
templateUrl: './setting-menu.component.html',
|
||||||
styleUrls: ['./setting-menu.component.scss']
|
styleUrls: ['./setting-menu.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class SettingMenuComponent implements OnInit {
|
export class SettingMenuComponent implements OnInit {
|
||||||
|
|
||||||
@Input() user:IUser;
|
@Input() user:IUser;
|
||||||
@Input() showMenu:boolean;
|
@Input() showMenu:boolean;
|
||||||
|
@Input() backgroundColor:string;
|
||||||
public noContent = true;
|
public noContent = true;
|
||||||
|
|
||||||
constructor(private store: Store<appReducers.State>) { }
|
constructor(private store: Store<appReducers.State>) { }
|
||||||
|
|||||||
@@ -3,7 +3,8 @@ import { Component, Input,Output,ViewChild,EventEmitter, ElementRef,OnChanges,Si
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-side-panel',
|
selector: 'fm-side-panel',
|
||||||
templateUrl: 'side-panel.component.html',
|
templateUrl: 'side-panel.component.html',
|
||||||
styleUrls: ['side-panel.component.scss']
|
styleUrls: ['side-panel.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -15,7 +15,8 @@ import {NgbTypeahead} from '@ng-bootstrap/ng-bootstrap';
|
|||||||
useExisting: forwardRef(() => TagInputComponent),
|
useExisting: forwardRef(() => TagInputComponent),
|
||||||
multi: true
|
multi: true
|
||||||
}
|
}
|
||||||
]
|
],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
|
|
||||||
export class TagInputComponent implements ControlValueAccessor {
|
export class TagInputComponent implements ControlValueAccessor {
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ import { AppConfig } from "../../shared/app.config";
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-thumbnail',
|
selector: 'fm-thumbnail',
|
||||||
templateUrl: 'thumbnail.component.html',
|
templateUrl: 'thumbnail.component.html',
|
||||||
styleUrls: ['thumbnail.component.scss']
|
styleUrls: ['thumbnail.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -10,7 +10,8 @@ export interface TimeSpan {
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-timespan',
|
selector: 'fm-timespan',
|
||||||
templateUrl: './timespan.component.html',
|
templateUrl: './timespan.component.html',
|
||||||
styleUrls: ['./timespan.component.css']
|
styleUrls: ['./timespan.component.css'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class TimespanComponent implements OnInit, OnChanges {
|
export class TimespanComponent implements OnInit, OnChanges {
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,8 @@ import * as appActions from '../../actions/app-common.actions';
|
|||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-user-menu',
|
selector: 'fm-user-menu',
|
||||||
templateUrl: './user-menu.component.html',
|
templateUrl: './user-menu.component.html',
|
||||||
styleUrls: ['./user-menu.component.scss']
|
styleUrls: ['./user-menu.component.scss'],
|
||||||
|
standalone: false
|
||||||
})
|
})
|
||||||
export class UserMenuComponent implements OnInit {
|
export class UserMenuComponent implements OnInit {
|
||||||
|
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
import { Injectable } from '@angular/core';
|
import { Injectable, Inject, LOCALE_ID } from '@angular/core';
|
||||||
import { Router } from '@angular/router';
|
import { Router } from '@angular/router';
|
||||||
import { OAuthService,UserInfo } from 'angular-oauth2-oidc';
|
import { OAuthService,UserInfo } from 'angular-oauth2-oidc';
|
||||||
import { Store } from '@ngrx/store';
|
import { Store } from '@ngrx/store';
|
||||||
@@ -16,6 +16,7 @@ import {StateSerializerService} from '../services/state-serializer.service';
|
|||||||
|
|
||||||
@Injectable()
|
@Injectable()
|
||||||
export class AppCommonEffects {
|
export class AppCommonEffects {
|
||||||
|
locale: string;
|
||||||
|
|
||||||
login$ = createEffect(() => this.actions$.pipe(
|
login$ = createEffect(() => this.actions$.pipe(
|
||||||
ofType(appCommonActions.LOGIN),
|
ofType(appCommonActions.LOGIN),
|
||||||
@@ -47,11 +48,27 @@ export class AppCommonEffects {
|
|||||||
first(),
|
first(),
|
||||||
switchMap((action) => {
|
switchMap((action) => {
|
||||||
return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe(
|
return zip(this.userService$.getCurrentUser(),from(this.oauthService$.loadUserProfile())).pipe(
|
||||||
switchMap(([user,userInfo]) => {return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))} ),
|
switchMap(([user,userInfo]) => {
|
||||||
|
if (location.hostname === 'localhost' || user.language === undefined || user.language === this.locale)
|
||||||
|
{
|
||||||
|
return of(new appCommonActions.InitUserSuccess(user,userInfo as UserInfo))
|
||||||
|
}
|
||||||
|
return of(new appCommonActions.SwitchLanguage(user.language))
|
||||||
|
}),
|
||||||
catchError(error => of(new appCommonActions.Fail(error))))
|
catchError(error => of(new appCommonActions.Fail(error))))
|
||||||
}
|
}
|
||||||
)));
|
)));
|
||||||
|
|
||||||
|
switchLanguage$ = createEffect(() => this.actions$.pipe(
|
||||||
|
ofType(appCommonActions.SWITCHLANGUAGE),
|
||||||
|
switchMap((action) => {
|
||||||
|
const a = action as appCommonActions.SwitchLanguage;
|
||||||
|
if (location.href.includes(`/${this.locale}/`)) {
|
||||||
|
const newPath = location.href.replace(`/${this.locale}/`, `/${a.locale}/`);
|
||||||
|
location.replace(newPath);
|
||||||
|
}
|
||||||
|
return of(undefined);
|
||||||
|
})),{ dispatch:false});
|
||||||
|
|
||||||
initUserPackages$ = createEffect(() => this.actions$.pipe(
|
initUserPackages$ = createEffect(() => this.actions$.pipe(
|
||||||
ofType(appCommonActions.INITUSERPACKAGES),
|
ofType(appCommonActions.INITUSERPACKAGES),
|
||||||
@@ -139,10 +156,17 @@ export class AppCommonEffects {
|
|||||||
const itemType = itemtypes[a.item.itemType];
|
const itemType = itemtypes[a.item.itemType];
|
||||||
var editor = itemType && itemType.editor ? itemType.editor : editor;
|
var editor = itemType && itemType.editor ? itemType.editor : editor;
|
||||||
}
|
}
|
||||||
|
if (editor == 'croppingscheme') {
|
||||||
|
// Exeception: no 'item' in route
|
||||||
|
this.router$.navigate(['/editor', editor, a.item.code])
|
||||||
|
}
|
||||||
|
else {
|
||||||
this.router$.navigate(['/editor', editor, 'item', a.item.code])
|
this.router$.navigate(['/editor', editor, 'item', a.item.code])
|
||||||
|
}
|
||||||
return [];
|
return [];
|
||||||
}
|
}
|
||||||
)));
|
)
|
||||||
|
));
|
||||||
|
|
||||||
viewItem$ = createEffect(() => this.actions$.pipe(
|
viewItem$ = createEffect(() => this.actions$.pipe(
|
||||||
ofType(appCommonActions.VIEWITEM),
|
ofType(appCommonActions.VIEWITEM),
|
||||||
@@ -201,7 +225,8 @@ export class AppCommonEffects {
|
|||||||
|
|
||||||
|
|
||||||
|
|
||||||
constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService) {
|
constructor(private actions$: Actions, private store$: Store<appCommonReducers.State>, private oauthService$: OAuthService, private itemService$: ItemService, private folderService$:FolderService, private userService$: UserService, private router$: Router, private stateSerializerService$:StateSerializerService, @Inject(LOCALE_ID) locale: string) {
|
||||||
|
this.locale = locale;
|
||||||
store$.dispatch(new appCommonActions.LoadItemTypes());
|
store$.dispatch(new appCommonActions.LoadItemTypes());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -26,6 +26,7 @@ export class Item implements IItem {
|
|||||||
public data?:any;
|
public data?:any;
|
||||||
public isEditable?:boolean;
|
public isEditable?:boolean;
|
||||||
public owner?: string;
|
public owner?: string;
|
||||||
|
public fullPath?: string;
|
||||||
|
|
||||||
constructor() {
|
constructor() {
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
|
|
||||||
export interface IItemTask {
|
export interface IItemTask {
|
||||||
code?: string;
|
code?: string;
|
||||||
|
workflowCode?: string;
|
||||||
taskType?: string;
|
taskType?: string;
|
||||||
attributes?: any;
|
attributes?: any;
|
||||||
message?: string,
|
message?: string,
|
||||||
@@ -11,6 +12,7 @@ export interface IItemTask {
|
|||||||
|
|
||||||
export class ItemTask implements IItemTask {
|
export class ItemTask implements IItemTask {
|
||||||
public code?:string;
|
public code?:string;
|
||||||
|
public workflowCode?: string;
|
||||||
public taskType?: string;
|
public taskType?: string;
|
||||||
public attributes?: any;
|
public attributes?: any;
|
||||||
public message?: string;
|
public message?: string;
|
||||||
|
|||||||
@@ -29,7 +29,8 @@ export interface State {
|
|||||||
settingMenuVisible: boolean,
|
settingMenuVisible: boolean,
|
||||||
unreadNotifications: number,
|
unreadNotifications: number,
|
||||||
isOnline: boolean,
|
isOnline: boolean,
|
||||||
isPageMode:boolean
|
isPageMode:boolean,
|
||||||
|
settingMenuBackgroundColor:string
|
||||||
}
|
}
|
||||||
|
|
||||||
export const initialState: State = {
|
export const initialState: State = {
|
||||||
@@ -51,7 +52,8 @@ export const initialState: State = {
|
|||||||
settingMenuVisible: false,
|
settingMenuVisible: false,
|
||||||
unreadNotifications: 0,
|
unreadNotifications: 0,
|
||||||
isOnline: true,
|
isOnline: true,
|
||||||
isPageMode: true
|
isPageMode: true,
|
||||||
|
settingMenuBackgroundColor:'rgb(128, 128, 128)'
|
||||||
}
|
}
|
||||||
|
|
||||||
export function reducer(state = initialState, action: appCommonActions.Actions ): State {
|
export function reducer(state = initialState, action: appCommonActions.Actions ): State {
|
||||||
@@ -187,6 +189,10 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
|
|||||||
const a = action as appCommonActions.SetUnreadNotifications;
|
const a = action as appCommonActions.SetUnreadNotifications;
|
||||||
return tassign(state,{unreadNotifications:a.unread});
|
return tassign(state,{unreadNotifications:a.unread});
|
||||||
}
|
}
|
||||||
|
case appCommonActions.SETSETTINGMENUBACKGROUNDCOLOR: {
|
||||||
|
const a = action as appCommonActions.SetSettingMenuBackgroundColor;
|
||||||
|
return tassign(state,{settingMenuBackgroundColor:a.color});
|
||||||
|
}
|
||||||
default: {
|
default: {
|
||||||
return state;
|
return state;
|
||||||
}
|
}
|
||||||
@@ -212,6 +218,7 @@ export const getSettingMenuVisible = (state: State) => state.settingMenuVisible;
|
|||||||
export const getUnreadNotifications = (state: State) => state.unreadNotifications;
|
export const getUnreadNotifications = (state: State) => state.unreadNotifications;
|
||||||
export const getIsOnline = (state: State) => state.isOnline;
|
export const getIsOnline = (state: State) => state.isOnline;
|
||||||
export const getIsPageMode = (state: State) => state.isPageMode;
|
export const getIsPageMode = (state: State) => state.isPageMode;
|
||||||
|
export const getSettingMenuBackgroundColor = (state: State) => state.settingMenuBackgroundColor;
|
||||||
|
|
||||||
export const selectAppCommonState = createFeatureSelector<State>(MODULE_NAME);
|
export const selectAppCommonState = createFeatureSelector<State>(MODULE_NAME);
|
||||||
|
|
||||||
@@ -238,5 +245,4 @@ export const SelectgetUnreadNotifications = createSelector(selectAppCommonState,
|
|||||||
|
|
||||||
export const SelectGetIsOnline = createSelector(selectAppCommonState,getIsOnline);
|
export const SelectGetIsOnline = createSelector(selectAppCommonState,getIsOnline);
|
||||||
export const SelectGetIsPageMode = createSelector(selectAppCommonState,getIsPageMode);
|
export const SelectGetIsPageMode = createSelector(selectAppCommonState,getIsPageMode);
|
||||||
|
export const SelectGetSettingMenuBackgroundColor= createSelector(selectAppCommonState,getSettingMenuBackgroundColor);
|
||||||
|
|
||||||
|
|||||||
@@ -52,4 +52,20 @@ export class AdminService {
|
|||||||
postItemTask(item: IItem, task: IItemTask): Observable<IItemTask> {
|
postItemTask(item: IItem, task: IItemTask): Observable<IItemTask> {
|
||||||
return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task);
|
return this.httpClient.post<IItemTask>(`${this.ApiEndpoint()}/api/v1/admin/${item.code}/tasks`, task);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getFileStorageOverview(): Observable<any> {
|
||||||
|
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/overview`);
|
||||||
|
}
|
||||||
|
|
||||||
|
getFileStorageInfo(user: string): Observable<any> {
|
||||||
|
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/${user}`);
|
||||||
|
}
|
||||||
|
|
||||||
|
getFileStorageLog(): Observable<any> {
|
||||||
|
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/admin/filestorage/folderinfo/log`);
|
||||||
|
}
|
||||||
|
|
||||||
|
validateEmail(user: IUser) {
|
||||||
|
return this.httpClient.post(`${this.ApiEndpoint()}/api/v1/admin/user/${user.code}/validateemail`, user);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,12 @@
|
|||||||
import {Injectable} from '@angular/core';
|
import {Injectable} from '@angular/core';
|
||||||
import {Observable} from 'rxjs';
|
import {Observable} from 'rxjs';
|
||||||
import { map } from 'rxjs/operators';
|
|
||||||
import {IItemType} from '../models/item.type';
|
import {IItemType} from '../models/item.type';
|
||||||
import {IItemLinkType} from '../models/itemlink.type';
|
import {IItemLinkType} from '../models/itemlink.type';
|
||||||
import { IUrlType } from '../models/url.type';
|
|
||||||
import {IItem} from '../models/item';
|
import {IItem} from '../models/item';
|
||||||
import {IJsonline} from '../models/json-line';
|
import {IJsonline} from '../models/json-line';
|
||||||
import {IItemTask} from '../models/itemTask';
|
import {IItemTask} from '../models/itemTask';
|
||||||
import { HttpClient, HttpParams, HttpHeaders } from "@angular/common/http";
|
import {HttpClient, HttpHeaders, HttpParams} from '@angular/common/http';
|
||||||
import { AppConfig } from "../shared/app.config";
|
import {AppConfig} from '../shared/app.config';
|
||||||
import {ItemTypeService} from './itemtype.service';
|
import {ItemTypeService} from './itemtype.service';
|
||||||
import {IListItem} from '../models/list.item';
|
import {IListItem} from '../models/list.item';
|
||||||
|
|
||||||
@@ -27,7 +25,8 @@ export class ItemService {
|
|||||||
return this.httpClient.get<{ [id: string]: IItemType }>(`${this.ApiEndpoint()}/api/v1/itemtypes/`);
|
return this.httpClient.get<{ [id: string]: IItemType }>(`${this.ApiEndpoint()}/api/v1/itemtypes/`);
|
||||||
}
|
}
|
||||||
|
|
||||||
getFeatures(extent: number[], crs: string, searchText?: string, searchTags?:string,startDate?:Date,endDate?:Date,itemType?:string,parentCode?:string,dataFilter?:string,level?:number,indexed?:boolean): Observable<any> {
|
getFeatures(extent: number[], crs: string, searchText?: string, searchTags?:string,startDate?:Date,endDate?:Date,
|
||||||
|
itemType?:string,parentCode?:string,dataFilter?:string,level?:number,indexed?:boolean,atItemLocationItemCode?: string): Observable<any> {
|
||||||
let params = new HttpParams();
|
let params = new HttpParams();
|
||||||
params = params.append("crs", crs);
|
params = params.append("crs", crs);
|
||||||
if (extent) params =params.append("bbox", extent.join(","));
|
if (extent) params =params.append("bbox", extent.join(","));
|
||||||
@@ -45,6 +44,7 @@ export class ItemService {
|
|||||||
if (parentCode) params = params.append("pc", parentCode);
|
if (parentCode) params = params.append("pc", parentCode);
|
||||||
if (dataFilter) params = params.append("df", dataFilter);
|
if (dataFilter) params = params.append("df", dataFilter);
|
||||||
if (level) params = params.append("lvl", level.toString());
|
if (level) params = params.append("lvl", level.toString());
|
||||||
|
if (atItemLocationItemCode) params = params.append("ail", atItemLocationItemCode);
|
||||||
params = params.append("ind", indexed ?? true);
|
params = params.append("ind", indexed ?? true);
|
||||||
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/features/`, {params:params});
|
return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/features/`, {params:params});
|
||||||
}
|
}
|
||||||
@@ -81,7 +81,8 @@ export class ItemService {
|
|||||||
|
|
||||||
getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string,
|
getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string,
|
||||||
indexed?: boolean, validToday?: boolean,tags?:string,crs?:string, startDate?: Date, endDate?: Date,
|
indexed?: boolean, validToday?: boolean,tags?:string,crs?:string, startDate?: Date, endDate?: Date,
|
||||||
skip?: number, take?: number, sourceTask?: string): Observable<IItem[]> {
|
skip?: number, take?: number, sourceTask?: string, exactMatchStartOrEndDate?: boolean, owner?:string,
|
||||||
|
includeFullpath?: boolean): Observable<IItem[]> {
|
||||||
let params = new HttpParams();
|
let params = new HttpParams();
|
||||||
if(itemType) params = params.append("it", itemType);
|
if(itemType) params = params.append("it", itemType);
|
||||||
if(dataFilter) params = params.append("df", JSON.stringify(dataFilter));
|
if(dataFilter) params = params.append("df", JSON.stringify(dataFilter));
|
||||||
@@ -96,20 +97,29 @@ export class ItemService {
|
|||||||
if (sourceTask) params = params.append("sourceTask", sourceTask);
|
if (sourceTask) params = params.append("sourceTask", sourceTask);
|
||||||
if(skip) params = params.append("skip", skip);
|
if(skip) params = params.append("skip", skip);
|
||||||
if(take) params = params.append("take", take);
|
if(take) params = params.append("take", take);
|
||||||
|
if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
|
||||||
|
if(owner) params = params.append("owner", owner);
|
||||||
|
if(includeFullpath) params = params.append("includeFullpath",includeFullpath?"true":"false");
|
||||||
return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params });
|
return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/`, { params: params });
|
||||||
}
|
}
|
||||||
|
|
||||||
getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string): Observable<number> {
|
getItemListCount(itemType: string, startDate?: Date, endDate?: Date, sourceTask?: string,
|
||||||
|
indexed?: boolean, exactMatchStartOrEndDate?: boolean, owner?:string): Observable<number> {
|
||||||
let params = new HttpParams();
|
let params = new HttpParams();
|
||||||
params = params.append("it", itemType);
|
params = params.append("it", itemType);
|
||||||
if (sourceTask) params = params.append("sourceTask", sourceTask);
|
if (sourceTask) params = params.append("sourceTask", sourceTask);
|
||||||
if (startDate) params = params.append("sDate", startDate.toISOString());
|
if (startDate) params = params.append("sDate", startDate.toISOString());
|
||||||
if (endDate) params = params.append("eDate", endDate.toISOString());
|
if (endDate) params = params.append("eDate", endDate.toISOString());
|
||||||
|
if(indexed) params = params.append("ind",indexed?"true":"false");
|
||||||
|
if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
|
||||||
|
if(owner) params = params.append("owner", owner);
|
||||||
return this.httpClient.get<number>(`${this.ApiEndpoint()}/api/v1/items/count`, { params: params });
|
return this.httpClient.get<number>(`${this.ApiEndpoint()}/api/v1/items/count`, { params: params });
|
||||||
}
|
}
|
||||||
|
|
||||||
getChildItemList(parentcode: string, itemType?: string, dataFilter?: any, level = 1, deep = true,
|
getChildItemList(parentcode: string, itemType?: string, dataFilter?: any, level = 1, deep = true,
|
||||||
startDate?: Date, endDate?: Date, skip?: number, take?: number): Observable<IItem[]> {
|
startDate?: Date, endDate?: Date, skip?: number, take?: number,
|
||||||
|
exactMatchStartOrEndDate?: boolean, owner?:string, indexed?: boolean,
|
||||||
|
atItemLocationItemCode?: string): Observable<IItem[]> {
|
||||||
let params = new HttpParams();
|
let params = new HttpParams();
|
||||||
if(itemType != null) {
|
if(itemType != null) {
|
||||||
params = params.append("it", itemType);
|
params = params.append("it", itemType);
|
||||||
@@ -121,13 +131,19 @@ export class ItemService {
|
|||||||
params = params.append("deep", deep.toString());
|
params = params.append("deep", deep.toString());
|
||||||
if (startDate) params = params.append("sDate", startDate.toISOString());
|
if (startDate) params = params.append("sDate", startDate.toISOString());
|
||||||
if (endDate) params = params.append("eDate", endDate.toISOString());
|
if (endDate) params = params.append("eDate", endDate.toISOString());
|
||||||
|
if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
|
||||||
|
if(owner) params = params.append("owner", owner);
|
||||||
|
|
||||||
if(skip) params = params.append("skip", skip);
|
if(skip) params = params.append("skip", skip);
|
||||||
if(take) params = params.append("take", take);
|
if(take) params = params.append("take", take);
|
||||||
|
if(indexed) params = params.append("ind",indexed?"true":"false");
|
||||||
|
if(atItemLocationItemCode) params = params.append("ail",atItemLocationItemCode);
|
||||||
return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
|
return this.httpClient.get<IItem[]>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params });
|
||||||
}
|
}
|
||||||
|
|
||||||
getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any): Observable<number> {
|
getChildItemListCount(parentcode: string, itemType?: string,dataFilter?: any,
|
||||||
|
startDate?: Date, endDate?: Date, exactMatchStartOrEndDate?: boolean, owner?:string,
|
||||||
|
indexed?: boolean): Observable<number> {
|
||||||
let params = new HttpParams();
|
let params = new HttpParams();
|
||||||
if(itemType != null) {
|
if(itemType != null) {
|
||||||
params = params.append("it", itemType);
|
params = params.append("it", itemType);
|
||||||
@@ -135,6 +151,11 @@ export class ItemService {
|
|||||||
if (dataFilter != null) {
|
if (dataFilter != null) {
|
||||||
params = params.append("df", JSON.stringify(dataFilter));
|
params = params.append("df", JSON.stringify(dataFilter));
|
||||||
}
|
}
|
||||||
|
if (startDate) params = params.append("sDate", startDate.toISOString());
|
||||||
|
if (endDate) params = params.append("eDate", endDate.toISOString());
|
||||||
|
if(exactMatchStartOrEndDate !== undefined) params = params.append("exactMatchStartOrEndDate", exactMatchStartOrEndDate);
|
||||||
|
if(owner) params = params.append("owner", owner);
|
||||||
|
if(indexed) params = params.append("ind",indexed?"true":"false");
|
||||||
return this.httpClient.get<number>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params });
|
return this.httpClient.get<number>(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -15,37 +15,37 @@ export class ItemTypeService {
|
|||||||
|
|
||||||
getIcon(itemType: string) {
|
getIcon(itemType: string) {
|
||||||
let icon = "fal fa-file";
|
let icon = "fal fa-file";
|
||||||
if (this.itemTypes[itemType]) icon = this.itemTypes[itemType].icon;
|
if (this.itemTypes && this.itemTypes[itemType]) icon = this.itemTypes[itemType].icon;
|
||||||
return icon;
|
return icon;
|
||||||
}
|
}
|
||||||
|
|
||||||
getColor(itemType: string) {
|
getColor(itemType: string) {
|
||||||
let color = "#000000";
|
let color = "#000000";
|
||||||
if (this.itemTypes[itemType]) color = this.itemTypes[itemType].iconColor;
|
if (this.itemTypes && this.itemTypes[itemType]) color = this.itemTypes[itemType].iconColor;
|
||||||
return color;
|
return color;
|
||||||
}
|
}
|
||||||
|
|
||||||
getExtraAttributes(itemType: string) {
|
getExtraAttributes(itemType: string) {
|
||||||
let extraAttributes = null;
|
let extraAttributes = null;
|
||||||
if (this.itemTypes[itemType] && this.itemTypes[itemType].extraAttributes) extraAttributes = this.itemTypes[itemType].extraAttributes;
|
if (this.itemTypes && this.itemTypes[itemType] && this.itemTypes[itemType]?.extraAttributes) extraAttributes = this.itemTypes[itemType]?.extraAttributes;
|
||||||
return extraAttributes;
|
return extraAttributes;
|
||||||
}
|
}
|
||||||
|
|
||||||
getSchema(itemType: string): string {
|
getSchema(itemType: string): string {
|
||||||
let schema = null;
|
let schema = null;
|
||||||
if (this.itemTypes[itemType]) schema = this.itemTypes[itemType].schema;
|
if (this.itemTypes && this.itemTypes[itemType]) schema = this.itemTypes[itemType].schema;
|
||||||
return schema;
|
return schema;
|
||||||
}
|
}
|
||||||
|
|
||||||
hasViewer(item: IItem) {
|
hasViewer(item: IItem) {
|
||||||
const itemType: string = item.itemType;
|
const itemType: string = item.itemType;
|
||||||
if (this.itemTypes[itemType]) return this.itemTypes[itemType].viewer !== undefined;
|
if (this.itemTypes && this.itemTypes[itemType]) return this.itemTypes[itemType].viewer !== undefined;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
hasEditor(item: IItem) {
|
hasEditor(item: IItem) {
|
||||||
const itemType: string = item.itemType;
|
const itemType: string = item.itemType;
|
||||||
if (this.itemTypes[itemType]) return this.itemTypes[itemType].editor !== undefined;
|
if (this.itemTypes && this.itemTypes[itemType]) return this.itemTypes[itemType].editor !== undefined;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user