custom-webpack.config.js

@@ -4,13 +4,9 @@ module.exports = {
       // Resolve node module use of fs
       fs: "empty",
       Buffer: false,
-      http: require.resolve("stream-http"),
-      https: require.resolve("https-browserify"),
-      url: require.resolve("url/"),
-      zlib: require.resolve('browserify-zlib'),
-      assert: require.resolve("assert/"),
-      util: require.resolve("util/"),
-      buffer: require.resolve("buffer/")
+      http: "empty",
+      https: "empty",
+      zlib: "empty"
     }
   }
 };

package.json

@@ -1,6 +1,6 @@
 {
   "name": "farmmaps-lib-app",
-  "version": "2.1.4",
+  "version": "2.1.3",
   "scripts": {
     "ng": "ng",
     "start": "ng serve",
@@ -28,30 +28,22 @@
     "@ngrx/router-store": "^12.0",
     "@ngrx/store": "^12.0",
     "angular-oauth2-oidc": "^12.0",
-    "assert": "^2.0.0",
     "bootstrap": "^4.6.0",
-    "browserify-zlib": "^0.2.0",
-    "buffer": "^6.0.3",
-    "cesium": "^1.97.0",
+    "cesium": "^1.82.1",
     "core-js": "^2.6.12",
-    "https-browserify": "^1.0.0",
-    "moment": "^2.29.4",
-    "ngrx-store-localstorage": "^14",
+    "moment": "^2.29.1",
+    "ngrx-store-localstorage": "^12.0",
     "ngx-avatar": "^4.1.0",
     "ngx-clipboard": "^14.0.1",
     "ngx-image-cropper": "^3.3.5",
     "ngx-openlayers": "1.0.0-next.19",
-    "ngx-uploadx": "^5.2.0",
-    "ol": "6.14.1",
-    "olcs": "^2.13.1",
+    "ngx-uploadx": "^3.5.1",
+    "ol": "6.8.1",
+    "ol-cesium": "^2.13.0",
     "resumablejs": "^1.1.0",
     "rxjs": "^6.6.7",
-    "stream": "^0.0.2",
-    "stream-http": "^3.2.0",
     "tassign": "^1.0.0",
-    "tslib": "^2.4.0",
-    "url": "^0.11.0",
-    "util": "^0.12.4",
+    "tslib": "^2.2.0",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {

projects/common-map/src/fm-map/actions/map.actions.ts

@@ -55,7 +55,6 @@ export const TOGGLELAYERVALUESENABLED = '[Map] ToggleLayerValuesEnabled'
 export const GETLAYERVALUE = '[Map] GetLayerValue'
 export const GETLAYERVALUESUCCESS = '[Map] GetLayerValueSuccess'
 export const TOGGLESHOWDATALAYERSLIDE = '[Map] ToggleShowDataLayerSlide'
-export const SETVIEWSTATE = '[Map] SetViewState'
 
 
 export class Clear implements Action {
@@ -324,11 +323,6 @@ export class ToggleShowDataLayerSlide implements Action {
   constructor() {}
 }
 
-export class SetViewState implements Action {
-  readonly type = SETVIEWSTATE;
-  constructor(public enabled:boolean) {}
-}
-
 export type Actions = SetMapState
   | Init
   | Clear
@@ -373,6 +367,5 @@ export type Actions = SetMapState
   | GetLayerValueSuccess
   | GetLayerValue
   | SetPeriod
-  | ToggleShowDataLayerSlide
-  | SetViewState;
+  | ToggleShowDataLayerSlide;
 

projects/common-map/src/fm-map/components/map/map.component.html

@@ -27,12 +27,10 @@
     <div>
 
     </div>
-   
-      <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>
-        <fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent>
-     </aol-view> 
-
+    <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>
+       <fm-map-zoom-to-extent [extent]="state.extent" [animate]="true"></fm-map-zoom-to-extent>
+    </aol-view>
     <aol-interaction-default></aol-interaction-default>
     <aol-interaction-dragrotateandzoom></aol-interaction-dragrotateandzoom>
     <fm-map-item-layers [itemLayers]="state.baseLayers"></fm-map-item-layers>

projects/common-map/src/fm-map/components/map/map.component.ts

@@ -94,7 +94,6 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   public dataLayerSlideValue:number = 50;
   public dataLayerSlideEnabled = false;
   private visibleAreaBottom = 0;
-  private viewEnabled: boolean = true;
   
   @ViewChild('map') map;
   @ViewChild('contentDiv') contentDiv: ElementRef;
@@ -376,9 +375,6 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
       this.dataLayerSlideEnabled=v;
       this.map.instance.render();
     });
-    this.store.select(mapReducers.selectGetViewEnabled).subscribe((v) => {
-      this.viewEnabled = v;
-    });
   }
 
   handleSearchCollapse(event) {
@@ -432,7 +428,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
   }
 
   handleOnMoveEnd(event) {    
-    if(this.initialized && this.viewEnabled) {
+    if(this.initialized) {
       this.zone.run(() =>{
         console.debug("Move end");
         var map = event.map;

projects/common-map/src/fm-map/reducers/map.reducer.ts

@@ -72,7 +72,6 @@ export interface State {
   layerValuesEnabled:boolean,
   layerValues: Array<ILayervalue>
   showDataLayerSlide:boolean,
-  viewEnabled:boolean
 }
 
 export const initialState: State = {
@@ -116,8 +115,7 @@ export const initialState: State = {
   layerValuesY:0,
   layerValuesEnabled:false,
   layerValues:[],
-  showDataLayerSlide:false,
-  viewEnabled:true
+  showDataLayerSlide:false
 }
 
 export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State {
@@ -540,10 +538,6 @@ export function reducer(state = initialState, action: mapActions.Actions | commo
       v.push(a.layervalue);
       return tassign(state,{layerValues:v});
     }
-    case mapActions.SETVIEWSTATE:{
-      let a= action as mapActions.SetViewState;
-      return tassign(state,{viewEnabled:a.enabled});
-    }
     case commonActions.ITEMDELETEDEVENT:{
       let a= action as commonActions.ItemDeletedEvent;
       if(state.selectedItem && state.selectedItem.code == a.itemCode) {
@@ -605,7 +599,6 @@ export const getLayerValuesEnabled = (state:State) => state.layerValuesEnabled;
 export const getLayerValues = (state:State) => state.layerValues;
 export const getLayerValuesX = (state:State) => state.layerValuesX;
 export const getLayerValuesY = (state:State) => state.layerValuesY;
-export const getViewEnabled = (state:State) => state.viewEnabled;
 
 
 export const selectMapState = createFeatureSelector<State>(MODULE_NAME);
@@ -639,6 +632,5 @@ export const selectGetLayerValuesEnabled = createSelector(selectMapState,getLaye
 export const selectGetLayerValues = createSelector(selectMapState,getLayerValues);
 export const selectGetLayerValuesX = createSelector(selectMapState,getLayerValuesX);
 export const selectGetLayerValuesY = createSelector(selectMapState,getLayerValuesY);
-export const selectGetViewEnabled = createSelector(selectMapState,getViewEnabled);
 
 

projects/common-map3d/src/fm-map3d/common-map3d.module.ts

@@ -1,14 +1,12 @@
 import { NgModule } from '@angular/core';
 import { Switch2D3DComponent } from './components/olcs/switch2d3d/switch2d3d.component';
 import { AppCommonModule} from '@farmmaps/common';
-import { AppCommonMapModule} from '@farmmaps/common-map';
 
 
 @NgModule({
   declarations: [Switch2D3DComponent],
   imports: [
-    AppCommonModule,
-    AppCommonMapModule
+    AppCommonModule
   ],
   exports: [Switch2D3DComponent]
 })

projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts

@@ -1,11 +1,8 @@
 import { Component, OnInit,Input,Host  } from '@angular/core';
-import { Interaction} from 'ol/interaction';
 import { MapComponent } from 'ngx-openlayers';
-import OLCesium from 'olcs/OLCesium';
-import RasterSynchronizer from 'olcs/RasterSynchronizer';
-import VectorSynchronizer from 'olcs/VectorSynchronizer';
-import { mapReducers,mapActions } from '@farmmaps/common-map';
-import { Store } from '@ngrx/store';
+import OLCesium from 'ol-cesium';
+
+declare var olcs: any;
 
 @Component({
   selector: 'fm-map3d-switch2d3d',
@@ -19,10 +16,9 @@ export class Switch2D3DComponent {
   private ol3d: OLCesium;
   private synchronizers:any[];
   public loading:boolean = true;
-  private interactions:Interaction[] = [];
 
 
-  constructor(private map: MapComponent,private store: Store<mapReducers.State>) {
+  constructor(private map: MapComponent) {
     
   }
 
@@ -30,8 +26,8 @@ export class Switch2D3DComponent {
    
     this.ol3d = new OLCesium({ map: this.map.instance, createSynchronizers: (map,scene) => {
         this.synchronizers = [
-            new RasterSynchronizer(map,scene),
-            new VectorSynchronizer(map,scene)
+            new olcs.RasterSynchronizer(map,scene),
+            new olcs.VectorSynchronizer(map,scene)
         ];
         this.loading=false;
         return this.synchronizers;
@@ -45,35 +41,12 @@ 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) {
     this.enable = !this.enable; 
     if(this.enable) {
-      this.store.dispatch(new mapActions.SetViewState(false));
-      this.disableInteractions();
-      this.synchronize();
-      this.ol3d.setEnabled(true);
-    } else {
-      this.ol3d.setEnabled(false);
-      this.enableInteractions();
-      this.store.dispatch(new mapActions.SetViewState(true));
+        this.synchronize();
     }
-    
+    this.ol3d.setEnabled(this.enable);
     this.label = this.enable?"2D":"3D";    
   }
 }

projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.service.ts

@@ -89,7 +89,7 @@ export class ResumableFileUploadService implements OnDestroy{
   addFiles = (files: any[], event: any, metadata:any) => {
     for (let f of files) {
       var options:UploadxOptions = {metadata:metadata};
-      this.uploadService.handleFiles(f,options);
+      this.uploadService.handleFile(f,options);
     }
   }
   

src/configuration.json

@@ -1,9 +1,9 @@
 {
-    "issuer": "https://accounts.test.farmmaps.eu",
+    "issuer": "http://localhost:8094",
     "clientId": "farmmapsdev",
-    "audience": "https://test.farmmaps.eu",
+    "audience": "http://localhost:8082",
     "requireHttps": false,
-    "apiEndPoint": "https://test.farmmaps.eu",
+    "apiEndPoint": "http://localhost:8082",
     "grantType":"code"
 }