Compare commits
5 Commits
2825ce4ccc
...
a408f4bffa
Author | SHA1 | Date | |
---|---|---|---|
|
a408f4bffa | ||
|
ac5bd7d635 | ||
|
cf84f8c93d | ||
|
4872dee094 | ||
|
b76a933dba |
@ -4,9 +4,13 @@ module.exports = {
|
|||||||
// Resolve node module use of fs
|
// Resolve node module use of fs
|
||||||
fs: "empty",
|
fs: "empty",
|
||||||
Buffer: false,
|
Buffer: false,
|
||||||
http: "empty",
|
http: require.resolve("stream-http"),
|
||||||
https: "empty",
|
https: require.resolve("https-browserify"),
|
||||||
zlib: "empty"
|
url: require.resolve("url/"),
|
||||||
|
zlib: require.resolve('browserify-zlib'),
|
||||||
|
assert: require.resolve("assert/"),
|
||||||
|
util: require.resolve("util/"),
|
||||||
|
buffer: require.resolve("buffer/")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
21699
package-lock.json
generated
21699
package-lock.json
generated
File diff suppressed because it is too large
Load Diff
24
package.json
24
package.json
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "farmmaps-lib-app",
|
"name": "farmmaps-lib-app",
|
||||||
"version": "2.1.3",
|
"version": "2.1.4",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"ng": "ng",
|
"ng": "ng",
|
||||||
"start": "ng serve",
|
"start": "ng serve",
|
||||||
@ -28,22 +28,30 @@
|
|||||||
"@ngrx/router-store": "^12.0",
|
"@ngrx/router-store": "^12.0",
|
||||||
"@ngrx/store": "^12.0",
|
"@ngrx/store": "^12.0",
|
||||||
"angular-oauth2-oidc": "^12.0",
|
"angular-oauth2-oidc": "^12.0",
|
||||||
|
"assert": "^2.0.0",
|
||||||
"bootstrap": "^4.6.0",
|
"bootstrap": "^4.6.0",
|
||||||
"cesium": "^1.82.1",
|
"browserify-zlib": "^0.2.0",
|
||||||
|
"buffer": "^6.0.3",
|
||||||
|
"cesium": "^1.97.0",
|
||||||
"core-js": "^2.6.12",
|
"core-js": "^2.6.12",
|
||||||
"moment": "^2.29.1",
|
"https-browserify": "^1.0.0",
|
||||||
"ngrx-store-localstorage": "^12.0",
|
"moment": "^2.29.4",
|
||||||
|
"ngrx-store-localstorage": "^14",
|
||||||
"ngx-avatar": "^4.1.0",
|
"ngx-avatar": "^4.1.0",
|
||||||
"ngx-clipboard": "^14.0.1",
|
"ngx-clipboard": "^14.0.1",
|
||||||
"ngx-image-cropper": "^3.3.5",
|
"ngx-image-cropper": "^3.3.5",
|
||||||
"ngx-openlayers": "1.0.0-next.19",
|
"ngx-openlayers": "1.0.0-next.19",
|
||||||
"ngx-uploadx": "^3.5.1",
|
"ngx-uploadx": "^5.2.0",
|
||||||
"ol": "6.8.1",
|
"ol": "6.14.1",
|
||||||
"ol-cesium": "^2.13.0",
|
"olcs": "^2.13.1",
|
||||||
"resumablejs": "^1.1.0",
|
"resumablejs": "^1.1.0",
|
||||||
"rxjs": "^6.6.7",
|
"rxjs": "^6.6.7",
|
||||||
|
"stream": "^0.0.2",
|
||||||
|
"stream-http": "^3.2.0",
|
||||||
"tassign": "^1.0.0",
|
"tassign": "^1.0.0",
|
||||||
"tslib": "^2.2.0",
|
"tslib": "^2.4.0",
|
||||||
|
"url": "^0.11.0",
|
||||||
|
"util": "^0.12.4",
|
||||||
"zone.js": "~0.11.4"
|
"zone.js": "~0.11.4"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
@ -55,6 +55,7 @@ export const TOGGLELAYERVALUESENABLED = '[Map] ToggleLayerValuesEnabled'
|
|||||||
export const GETLAYERVALUE = '[Map] GetLayerValue'
|
export const GETLAYERVALUE = '[Map] GetLayerValue'
|
||||||
export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
|
export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
|
||||||
export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
|
export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
|
||||||
|
export const SETVIEWSTATE = '[Map] SetViewState'
|
||||||
|
|
||||||
|
|
||||||
export class Clear implements Action {
|
export class Clear implements Action {
|
||||||
@ -323,6 +324,11 @@ export class ToggleShowDataLayerSlide implements Action {
|
|||||||
constructor() {}
|
constructor() {}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export class SetViewState implements Action {
|
||||||
|
readonly type = SETVIEWSTATE;
|
||||||
|
constructor(public enabled:boolean) {}
|
||||||
|
}
|
||||||
|
|
||||||
export type Actions = SetMapState
|
export type Actions = SetMapState
|
||||||
| Init
|
| Init
|
||||||
| Clear
|
| Clear
|
||||||
@ -367,5 +373,6 @@ export type Actions = SetMapState
|
|||||||
| GetLayerValueSuccess
|
| GetLayerValueSuccess
|
||||||
| GetLayerValue
|
| GetLayerValue
|
||||||
| SetPeriod
|
| SetPeriod
|
||||||
| ToggleShowDataLayerSlide;
|
| ToggleShowDataLayerSlide
|
||||||
|
| SetViewState;
|
||||||
|
|
||||||
|
@ -27,10 +27,12 @@
|
|||||||
<div>
|
<div>
|
||||||
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<aol-view [zoom]="state.mapState.zoom" [rotation]="state.mapState.rotation">
|
<aol-view [zoom]="state.mapState.zoom" [rotation]="state.mapState.rotation">
|
||||||
<aol-coordinate [x]="state.mapState.xCenter" [y]="state.mapState.yCenter" [srid]="'EPSG:4326'"></aol-coordinate>
|
<aol-coordinate [x]="state.mapState.xCenter" [y]="state.mapState.yCenter" [srid]="'EPSG:4326'"></aol-coordinate>
|
||||||
<fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent>
|
<fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent>
|
||||||
</aol-view>
|
</aol-view>
|
||||||
|
|
||||||
<aol-interaction-default></aol-interaction-default>
|
<aol-interaction-default></aol-interaction-default>
|
||||||
<aol-interaction-dragrotateandzoom></aol-interaction-dragrotateandzoom>
|
<aol-interaction-dragrotateandzoom></aol-interaction-dragrotateandzoom>
|
||||||
<fm-map-item-layers [itemLayers]="state.baseLayers"></fm-map-item-layers>
|
<fm-map-item-layers [itemLayers]="state.baseLayers"></fm-map-item-layers>
|
||||||
|
@ -94,6 +94,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
public dataLayerSlideValue:number = 50;
|
public dataLayerSlideValue:number = 50;
|
||||||
public dataLayerSlideEnabled = false;
|
public dataLayerSlideEnabled = false;
|
||||||
private visibleAreaBottom = 0;
|
private visibleAreaBottom = 0;
|
||||||
|
private viewEnabled: boolean = true;
|
||||||
|
|
||||||
@ViewChild('map') map;
|
@ViewChild('map') map;
|
||||||
@ViewChild('contentDiv') contentDiv: ElementRef;
|
@ViewChild('contentDiv') contentDiv: ElementRef;
|
||||||
@ -375,6 +376,9 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
this.dataLayerSlideEnabled=v;
|
this.dataLayerSlideEnabled=v;
|
||||||
this.map.instance.render();
|
this.map.instance.render();
|
||||||
});
|
});
|
||||||
|
this.store.select(mapReducers.selectGetViewEnabled).subscribe((v) => {
|
||||||
|
this.viewEnabled = v;
|
||||||
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
handleSearchCollapse(event) {
|
handleSearchCollapse(event) {
|
||||||
@ -428,7 +432,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
|
|||||||
}
|
}
|
||||||
|
|
||||||
handleOnMoveEnd(event) {
|
handleOnMoveEnd(event) {
|
||||||
if(this.initialized) {
|
if(this.initialized && this.viewEnabled) {
|
||||||
this.zone.run(() =>{
|
this.zone.run(() =>{
|
||||||
console.debug("Move end");
|
console.debug("Move end");
|
||||||
var map = event.map;
|
var map = event.map;
|
||||||
|
@ -72,6 +72,7 @@ export interface State {
|
|||||||
layerValuesEnabled:boolean,
|
layerValuesEnabled:boolean,
|
||||||
layerValues: Array<ILayervalue>
|
layerValues: Array<ILayervalue>
|
||||||
showDataLayerSlide:boolean,
|
showDataLayerSlide:boolean,
|
||||||
|
viewEnabled:boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
export const initialState: State = {
|
export const initialState: State = {
|
||||||
@ -115,7 +116,8 @@ export const initialState: State = {
|
|||||||
layerValuesY:0,
|
layerValuesY:0,
|
||||||
layerValuesEnabled:false,
|
layerValuesEnabled:false,
|
||||||
layerValues:[],
|
layerValues:[],
|
||||||
showDataLayerSlide:false
|
showDataLayerSlide:false,
|
||||||
|
viewEnabled:true
|
||||||
}
|
}
|
||||||
|
|
||||||
export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {
|
export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {
|
||||||
@ -538,6 +540,10 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
|
|||||||
v.push(a.layervalue);
|
v.push(a.layervalue);
|
||||||
return tassign(state,{layerValues:v});
|
return tassign(state,{layerValues:v});
|
||||||
}
|
}
|
||||||
|
case mapActions.SETVIEWSTATE:{
|
||||||
|
let a= action as mapActions.SetViewState;
|
||||||
|
return tassign(state,{viewEnabled:a.enabled});
|
||||||
|
}
|
||||||
case commonActions.ITEMDELETEDEVENT:{
|
case commonActions.ITEMDELETEDEVENT:{
|
||||||
let a= action as commonActions.ItemDeletedEvent;
|
let a= action as commonActions.ItemDeletedEvent;
|
||||||
if(state.selectedItem && state.selectedItem.code == a.itemCode) {
|
if(state.selectedItem && state.selectedItem.code == a.itemCode) {
|
||||||
@ -599,6 +605,7 @@ export const getLayerValuesEnabled = (state:State) => state.layerValuesEnabled;
|
|||||||
export const getLayerValues = (state:State) => state.layerValues;
|
export const getLayerValues = (state:State) => state.layerValues;
|
||||||
export const getLayerValuesX = (state:State) => state.layerValuesX;
|
export const getLayerValuesX = (state:State) => state.layerValuesX;
|
||||||
export const getLayerValuesY = (state:State) => state.layerValuesY;
|
export const getLayerValuesY = (state:State) => state.layerValuesY;
|
||||||
|
export const getViewEnabled = (state:State) => state.viewEnabled;
|
||||||
|
|
||||||
|
|
||||||
export const selectMapState = createFeatureSelector<State>(MODULE_NAME);
|
export const selectMapState = createFeatureSelector<State>(MODULE_NAME);
|
||||||
@ -632,5 +639,6 @@ export const selectGetLayerValuesEnabled = createSelector(selectMapState,getLaye
|
|||||||
export const selectGetLayerValues = createSelector(selectMapState,getLayerValues);
|
export const selectGetLayerValues = createSelector(selectMapState,getLayerValues);
|
||||||
export const selectGetLayerValuesX = createSelector(selectMapState,getLayerValuesX);
|
export const selectGetLayerValuesX = createSelector(selectMapState,getLayerValuesX);
|
||||||
export const selectGetLayerValuesY = createSelector(selectMapState,getLayerValuesY);
|
export const selectGetLayerValuesY = createSelector(selectMapState,getLayerValuesY);
|
||||||
|
export const selectGetViewEnabled = createSelector(selectMapState,getViewEnabled);
|
||||||
|
|
||||||
|
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { Switch2D3DComponent } from './components/olcs/switch2d3d/switch2d3d.component';
|
import { Switch2D3DComponent } from './components/olcs/switch2d3d/switch2d3d.component';
|
||||||
import { AppCommonModule} from '@farmmaps/common';
|
import { AppCommonModule} from '@farmmaps/common';
|
||||||
|
import { AppCommonMapModule} from '@farmmaps/common-map';
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [Switch2D3DComponent],
|
declarations: [Switch2D3DComponent],
|
||||||
imports: [
|
imports: [
|
||||||
AppCommonModule
|
AppCommonModule,
|
||||||
|
AppCommonMapModule
|
||||||
],
|
],
|
||||||
exports: [Switch2D3DComponent]
|
exports: [Switch2D3DComponent]
|
||||||
})
|
})
|
||||||
|
@ -1,8 +1,11 @@
|
|||||||
import { Component, OnInit,Input,Host } from '@angular/core';
|
import { Component, OnInit,Input,Host } from '@angular/core';
|
||||||
|
import { Interaction} from 'ol/interaction';
|
||||||
import { MapComponent } from 'ngx-openlayers';
|
import { MapComponent } from 'ngx-openlayers';
|
||||||
import OLCesium from 'ol-cesium';
|
import OLCesium from 'olcs/OLCesium';
|
||||||
|
import RasterSynchronizer from 'olcs/RasterSynchronizer';
|
||||||
declare var olcs: any;
|
import VectorSynchronizer from 'olcs/VectorSynchronizer';
|
||||||
|
import { mapReducers,mapActions } from '@farmmaps/common-map';
|
||||||
|
import { Store } from '@ngrx/store';
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'fm-map3d-switch2d3d',
|
selector: 'fm-map3d-switch2d3d',
|
||||||
@ -16,9 +19,10 @@ export class Switch2D3DComponent {
|
|||||||
private ol3d: OLCesium;
|
private ol3d: OLCesium;
|
||||||
private synchronizers:any[];
|
private synchronizers:any[];
|
||||||
public loading:boolean = true;
|
public loading:boolean = true;
|
||||||
|
private interactions:Interaction[] = [];
|
||||||
|
|
||||||
|
|
||||||
constructor(private map: MapComponent) {
|
constructor(private map: MapComponent,private store: Store<mapReducers.State>) {
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -26,8 +30,8 @@ export class Switch2D3DComponent {
|
|||||||
|
|
||||||
this.ol3d = new OLCesium({ map: this.map.instance, createSynchronizers: (map,scene) => {
|
this.ol3d = new OLCesium({ map: this.map.instance, createSynchronizers: (map,scene) => {
|
||||||
this.synchronizers = [
|
this.synchronizers = [
|
||||||
new olcs.RasterSynchronizer(map,scene),
|
new RasterSynchronizer(map,scene),
|
||||||
new olcs.VectorSynchronizer(map,scene)
|
new VectorSynchronizer(map,scene)
|
||||||
];
|
];
|
||||||
this.loading=false;
|
this.loading=false;
|
||||||
return this.synchronizers;
|
return this.synchronizers;
|
||||||
@ -41,12 +45,35 @@ export class Switch2D3DComponent {
|
|||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
disableInteractions() {
|
||||||
|
this.interactions=[];
|
||||||
|
this.map.instance.getInteractions().forEach((i) => {
|
||||||
|
if(i.getActive()) {
|
||||||
|
this.interactions.push(i);
|
||||||
|
i.setActive(false);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
enableInteractions() {
|
||||||
|
this.interactions.forEach((i) => {
|
||||||
|
i.setActive(true);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
handleClick(event) {
|
handleClick(event) {
|
||||||
this.enable = !this.enable;
|
this.enable = !this.enable;
|
||||||
if(this.enable) {
|
if(this.enable) {
|
||||||
|
this.store.dispatch(new mapActions.SetViewState(false));
|
||||||
|
this.disableInteractions();
|
||||||
this.synchronize();
|
this.synchronize();
|
||||||
|
this.ol3d.setEnabled(true);
|
||||||
|
} else {
|
||||||
|
this.ol3d.setEnabled(false);
|
||||||
|
this.enableInteractions();
|
||||||
|
this.store.dispatch(new mapActions.SetViewState(true));
|
||||||
}
|
}
|
||||||
this.ol3d.setEnabled(this.enable);
|
|
||||||
this.label = this.enable?"2D":"3D";
|
this.label = this.enable?"2D":"3D";
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -89,7 +89,7 @@ export class ResumableFileUploadService implements OnDestroy{
|
|||||||
addFiles = (files: any[], event: any, metadata:any) => {
|
addFiles = (files: any[], event: any, metadata:any) => {
|
||||||
for (let f of files) {
|
for (let f of files) {
|
||||||
var options:UploadxOptions = {metadata:metadata};
|
var options:UploadxOptions = {metadata:metadata};
|
||||||
this.uploadService.handleFile(f,options);
|
this.uploadService.handleFiles(f,options);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
{
|
{
|
||||||
"issuer": "http://localhost:8094",
|
"issuer": "https://accounts.test.farmmaps.eu",
|
||||||
"clientId": "farmmapsdev",
|
"clientId": "farmmapsdev",
|
||||||
"audience": "http://localhost:8082",
|
"audience": "https://test.farmmaps.eu",
|
||||||
"requireHttps": false,
|
"requireHttps": false,
|
||||||
"apiEndPoint": "http://localhost:8082",
|
"apiEndPoint": "https://test.farmmaps.eu",
|
||||||
"grantType":"code"
|
"grantType":"code"
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user