Make bbox optional

package-lock.json

@@ -660,9 +660,9 @@
       }
     },
     "@farmmaps/common": {
-      "version": "0.0.1-prerelease.71",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.71.tgz",
-      "integrity": "sha512-MJPTL8NQzm9wBdKoeADxX5iAa1VmIbaEg1ViXqaFvVug6Sd6q+RLJ+Y7hQA9lxbwWnu4UIy12dhPtqA/+JVQiw==",
+      "version": "0.0.1-prerelease.77",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common/-/common-0.0.1-prerelease.77.tgz",
+      "integrity": "sha512-PCdOnsdcKT4YFZhw3yaiEB/z118gOy5HTRAsf0E9BQvYUtz0NAqtXfcFvCF9pgugoGpJKJZYkP5+dqQTJbBYSQ==",
       "requires": {
         "angular-oauth2-oidc": "^5.0.2",
         "ngx-uploadx": "^3.1.3",
@@ -670,9 +670,9 @@
       }
     },
     "@farmmaps/common-map": {
-      "version": "0.0.1-prerelease.71",
-      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.71.tgz",
-      "integrity": "sha512-1FlsyEphPtClFR/a56cwlzXPa0JxpHyGxomN4x9LRBstCCAUFeFNuNRv784nO0FDNxuGEroFTmWmKtGnMO8yjg==",
+      "version": "0.0.1-prerelease.77",
+      "resolved": "https://repository.akkerweb.nl/repository/npm-group/@farmmaps/common-map/-/common-map-0.0.1-prerelease.77.tgz",
+      "integrity": "sha512-pwWaE1PzWOMan/pJ7mLQTV+S2DRpDZMP27N1+Ah6/KjzVCwSFZOFzl4WjYK3tUuYQJpbyEsAR08CVOK6ArhKEw==",
       "requires": {
         "ngx-openlayers": "1.0.0-next.9",
         "ol": "^5.3.3",

package.json

@@ -20,8 +20,8 @@
     "@angular/platform-browser-dynamic": "~7.2.0",
     "@angular/router": "~7.2.0",
     "@aspnet/signalr": "^1.1.4",
-    "@farmmaps/common": ">=0.0.1-prerelease.69 <0.0.1",
-    "@farmmaps/common-map": ">=0.0.1-prerelease.69 <0.0.1",
+    "@farmmaps/common": ">=0.0.1-prerelease.77 <0.0.1",
+    "@farmmaps/common-map": ">=0.0.1-prerelease.77 <0.0.1",
     "@ng-bootstrap/ng-bootstrap": "^4.2.1",
     "@ngrx/effects": "^7.2.0",
     "@ngrx/router-store": "^7.2.0",

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

@@ -1,6 +1,8 @@
 import { Action } from '@ngrx/store';
 
-import { IMapState,IItemLayer,IQueryState } from '../models';
+import { IMapState } from '../models/map.state';
+import { IItemLayer } from '../models/item.layer';
+import { IQueryState } from '../models/query.state';
 import { IItem } from '@farmmaps/common';
 import { Feature } from 'ol';
 import { Extent } from 'ol/extent';

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

@@ -16,12 +16,12 @@ import * as mapReducers from './reducers/map.reducer';
 import * as mapActions from './actions/map.actions';
 import * as mapEffects from './effects/map.effects';
 
-import { IMapState} from './models';
-import { ISelectedFeatures } from './models';
-import { IItemLayer } from './models';
-import { ItemLayer} from './models';
-import { IQueryState } from './models';
-import { IPeriodState } from './models';
+import { IMapState} from './models/map.state';
+import { ISelectedFeatures } from './models/selected.features';
+import { IItemLayer } from './models/item.layer';
+import { ItemLayer} from './models/item.layer';
+import { IQueryState } from './models/query.state';
+import { IPeriodState } from './models/period.state';
 
 // components
 import { GpsLocation} from './components/aol/gps-location/gps-location.component';
@@ -54,7 +54,7 @@ import { LayerListComponent } from './components/aol/layer-list/layer-list.compo
 import { MetaDataModalComponent } from './components/meta-data-modal/meta-data-modal.component';
 import { SelectPeriodModalComponent } from './components/select-period-modal/select-period-modal.component';
 import { MapComponent } from './components/map/map.component';
-import { MapSearchComponent } from './components/map-search';
+import { MapSearchComponent } from './components/map-search/map-search.component';
 import { MapRoutingModule } from './common-map-routing.module';
 import { LegendComponent } from './components/legend/legend.component';
 import { LayerVectorImageComponent } from './components/aol/layer-vector-image/layer-vector-image.component';

projects/common-map/src/fm-map/components/aol/item-features-source/item-features-source.component.ts

@@ -4,7 +4,7 @@ import { LayerVectorComponent, SourceVectorComponent, MapComponent, LayerImageCo
 import { LayerVectorImageComponent } from '../layer-vector-image/layer-vector-image.component';
 import { ItemService } from '@farmmaps/common';
 import { IItem } from '@farmmaps/common';
-import { ISelectedFeatures } from '../../../models';
+import { ISelectedFeatures } from '../../../models/selected.features';
 
 import {Vector} from 'ol/source';
 import {Feature,Collection} from 'ol';

projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts

@@ -3,8 +3,9 @@ import { HttpClient } from "@angular/common/http";
 import { LayerVectorComponent, LayerTileComponent, LayerGroupComponent, MapComponent } from 'ngx-openlayers';
 import { ItemService } from '@farmmaps/common';
 import { AppConfig } from '@farmmaps/common';
-import { IItemLayer, ILayerData, IRenderoutputTiles, IRenderoutputImage, IGradientstop, ILayer, IHistogram } from '../../../models';
-
+import { IItemLayer} from '../../../models/item.layer';
+import { ILayerData} from '../../../models/layer.data';
+import { IRenderoutputTiles,IRenderoutputImage,IGradientstop,ILayer,IHistogram} from '../../../models/color.map';
 import {Extent} from 'ol/extent';
 import Projection from 'ol/proj/Projection';
 import * as proj from 'ol/proj';

projects/common-map/src/fm-map/components/aol/layer-list/layer-list.component.ts

@@ -1,5 +1,5 @@
 import { Component,Input,Output,EventEmitter } from '@angular/core';
-import { IItemLayer } from '../../../models';
+import { IItemLayer } from '../../../models/item.layer';
 
 @Component({
   selector: 'fm-map-layer-list',

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

@@ -8,7 +8,7 @@ import * as mapActions from '../../actions/map.actions';
 import { Observable, from } from 'rxjs';
 import { withLatestFrom } from 'rxjs/operators';
 import { tassign } from 'tassign';
-import { IQueryState } from '../../models';
+import { IQueryState } from '../../models/query.state';
 
 
 @Injectable()

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

@@ -1,14 +1,10 @@
 import { Component, Input, Injectable } from '@angular/core';
 import { Location } from '@angular/common';
-import { Feature } from 'ol';
 import { Store } from '@ngrx/store';
 import * as mapReducers from '../../reducers/map.reducer';
-import { commonReducers,ItemTypeService, IItem, Item,IListItem } from '@farmmaps/common';
+import { commonReducers,ItemTypeService,IListItem } from '@farmmaps/common';
 import * as mapActions from '../../actions/map.actions';
-import { Observable, from } from 'rxjs';
-import { withLatestFrom } from 'rxjs/operators';
 import { tassign } from 'tassign';
-import { IQueryState } from '../../models';
 
 
 @Injectable()

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

@@ -15,7 +15,7 @@
   </tr>
   <tr *ngFor="let entry of layer.renderer.colorMap.entries; let i = index ">
     <td class="legend-items"><div [style.background-color]="getHex(entry.color)"></div></td>
-    <td class="legend-items-text">{{entry.value | number:'1.0-2'}} {{legendunit}}</td>
+    <td class="legend-items-text"><span *ngIf="!entry.label">{{entry.value | number:'1.0-2'}} {{legendunit}}</span><span *ngIf="entry.label">{{entry.label}}</span></td>
     <!--<td class="histogram-items-text"><span *ngIf="histogramenabled">{{entry.value}} {{histogramunit}}</span></td>
     <td class="histogram-items">
       <div *ngIf="histogramenabled" [style.background-color]="getHex(selectedColorMap.noValue)" [style.width]="getPart(selectedColorMap, entry)">

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

@@ -1,5 +1,5 @@
 import { Component, OnInit, Input,AfterViewInit } from '@angular/core';
-import { IColorMap, IColor, IColorEntry,ILayer } from '../../models';
+import { IColorMap, IColor, IColorEntry,ILayer } from '../../models/color.map';
 
 
 @Component({

projects/common-map/src/fm-map/components/map-search/index.ts

@@ -1 +0,0 @@
-export * from './map-search.component';

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

@@ -2,7 +2,8 @@ import { Component, Input, Output, OnInit, EventEmitter, SimpleChanges, OnChange
 import { Observable ,  of } from 'rxjs';
 import { debounceTime,distinctUntilChanged,tap,switchMap,merge,catchError} from 'rxjs/operators';
 import { TypeaheadService, TimespanService } from '@farmmaps/common';
-import { IQueryState,IPeriodState } from '../../models';
+import { IQueryState } from '../../models/query.state';
+import { IPeriodState } from '../../models/period.state';
 import { fillProperties } from '@angular/core/src/util/property';
 import { tassign } from 'tassign';
 

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

@@ -9,7 +9,11 @@ import { Store } from '@ngrx/store';
 // Map
 import * as mapReducers from '../../reducers/map.reducer';
 import * as mapActions from '../../actions/map.actions';
-import { IMapState,ISelectedFeatures,IItemLayer, ItemLayer,IQueryState,IPeriodState } from '../../models';
+import { IMapState} from '../../models/map.state';
+import { ISelectedFeatures } from '../../models/selected.features';
+import { IItemLayer } from '../../models/item.layer';
+import { IQueryState } from '../../models/query.state';
+import { IPeriodState } from '../../models/period.state';
 import { IDroppedFile } from '../aol/file-drop-target/file-drop-target.component';
 import { IMetaData } from '../meta-data-modal/meta-data-modal.component';
 import { StateSerializerService } from '../../services/state-serializer.service';

projects/common-map/src/fm-map/models/index.ts

@@ -1,7 +0,0 @@
-export * from './map.state';
-export * from './selected.features';
-export * from './item.layer'
-export * from './layer.data'
-export * from './color.map';
-export * from './query.state';
-export * from './period.state';

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

@@ -1,6 +1,9 @@
 import { tassign } from 'tassign';
 import { IItem,Item } from '@farmmaps/common';
-import { IItemLayer,ItemLayer, IMapState,IQueryState,IPeriodState} from '../models'
+import { IItemLayer,ItemLayer} from '../models/item.layer';
+import { IMapState} from '../models/map.state';
+import { IQueryState} from '../models/query.state';
+import { IPeriodState} from '../models/period.state';
 import * as mapActions from '../actions/map.actions';
 import {commonActions} from '@farmmaps/common';
 import { createSelector, createFeatureSelector } from '@ngrx/store';

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

@@ -0,0 +1,105 @@
+// angular modules
+import { NgModule, APP_INITIALIZER, ModuleWithProviders, Injector,Optional,SkipSelf } from '@angular/core';
+import { CommonModule, DatePipe } from '@angular/common';
+import { HttpClientModule, HttpClient, HTTP_INTERCEPTORS } from '@angular/common/http';
+import { FormsModule } from '@angular/forms';
+
+// external modules
+import { OAuthModule,AuthConfig, OAuthService, OAuthStorage } from 'angular-oauth2-oidc';
+
+
+// routing module
+import { AppCommonRoutingModule } from './common-routing.module';
+
+import { MODULE_NAME }  from './module-name';
+
+//components
+import { ItemTypeService } from './services/itemtype.service';
+import { FolderService } from './services/folder.service';
+import { TimespanService} from './services/timespan.service';
+import { ItemService} from './services/item.service';
+import { EventService } from './services/event.service';
+import { TypeaheadService } from './services/typeahead.service';
+import { UserService } from './services/user.service';
+import { AppConfig } from './shared/app.config';
+import { AccessTokenInterceptor } from "./shared/accesstoken.interceptor";
+import { appConfigFactory } from "./shared/app.config.factory";
+import { AuthGuard } from './services/auth-guard.service';
+import { NavBarGuard } from './services/nav-bar-guard.service';
+import { FullScreenGuard } from './services/full-screen-guard.service';
+import { SafePipe } from './shared/safe.pipe';
+import { AppComponent} from './components/app/app.component';
+import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component';
+import { AuthCallbackGuard } from './components/auth-callback/auth-callback.guard';
+import { SessionClearedComponent } from './components/session-cleared/session-cleared.component';
+import { ResumableFileUploadService } from './components/resumable-file-upload/resumable-file-upload.service';
+import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component';
+import { NotFoundComponent } from './components/not-found/not-found.component';
+import { NotImplementedComponent } from './components/not-implemented/not-implemented.component';
+import { SidePanelComponent } from './components/side-panel/side-panel.component';
+import { TimespanComponent } from './components/timespan/timespan.component';
+import { TagInputComponent } from './components/tag-input/tag-input.component';
+import {IEventMessage } from './models/event.message';
+import { IItem, Item } from './models/item';
+import {IItemType} from './models/item.type';
+import {IItemTypes} from './models/item.types';
+import {IItemTask,ItemTask} from './models/itemTask';
+import {IListItem} from './models/list.item';
+import {ITypeaheadItem} from './models/typeahead.item';
+import {IUser} from './models/user';
+import * as commonActions from './actions/app-common.actions';
+import * as commonReducers from './reducers/app-common.reducer';
+import * as commonEffects from './effects/app-common.effects';
+import {NgbDateNativeAdapter} from './services/date-adapter.service'
+import { from } from 'rxjs';
+
+export {FolderService,
+  ItemTypeService,
+  TimespanService,
+  ItemService,
+  EventService,
+  TypeaheadService,
+  UserService,
+  AppConfig,
+  AccessTokenInterceptor,
+  AuthGuard,
+  NavBarGuard,
+  FullScreenGuard,
+  AuthCallbackGuard,
+  ResumableFileUploadService,
+  NgbDateNativeAdapter
+};
+
+@NgModule({
+  imports: [
+    OAuthModule.forRoot(),
+  ]
+})
+export class AppCommonServiceModule {
+  constructor (@Optional() @SkipSelf() parentModule: AppCommonServiceModule) {
+    if (parentModule) {
+      throw new Error(
+        'AppCommonServiceModule is already loaded. Import it in the AppModule only');
+    }
+  }
+  static forRoot(): ModuleWithProviders {
+    return {
+      ngModule: AppCommonServiceModule,
+      providers: [
+        AppConfig,
+        {
+          provide: APP_INITIALIZER,
+          useFactory: appConfigFactory,
+          deps: [Injector, AppConfig, OAuthService],
+          multi: true
+        },       
+        {
+          provide: HTTP_INTERCEPTORS,
+          useClass: AccessTokenInterceptor,
+          multi: true
+        },
+        DatePipe
+      ]
+    };
+  }
+}

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

@@ -18,25 +18,10 @@ import { AppCommonRoutingModule } from './common-routing.module';
 import { MODULE_NAME }  from './module-name';
 
 //components
-import { ItemTypeService } from './services/itemtype.service';
-import { FolderService } from './services/folder.service';
-import { TimespanService} from './services/timespan.service';
-import { ItemService} from './services/item.service';
-import { EventService } from './services/event.service';
-import { TypeaheadService } from './services/typeahead.service';
-import { UserService } from './services/user.service';
-import { AppConfig } from './shared/app.config';
-import { AccessTokenInterceptor } from "./shared/accesstoken.interceptor";
-import { appConfigFactory } from "./shared/app.config.factory";
-import { AuthGuard } from './services/auth-guard.service';
-import { NavBarGuard } from './services/nav-bar-guard.service';
-import { FullScreenGuard } from './services/full-screen-guard.service';
 import { SafePipe } from './shared/safe.pipe';
 import { AppComponent} from './components/app/app.component';
 import { AuthCallbackComponent } from './components/auth-callback/auth-callback.component';
-import { AuthCallbackGuard } from './components/auth-callback/auth-callback.guard';
 import { SessionClearedComponent } from './components/session-cleared/session-cleared.component';
-import { ResumableFileUploadService } from './components/resumable-file-upload/resumable-file-upload.service';
 import { ResumableFileUploadComponent } from './components/resumable-file-upload/resumable-file-upload.component';
 import { NotFoundComponent } from './components/not-found/not-found.component';
 import { NotImplementedComponent } from './components/not-implemented/not-implemented.component';
@@ -54,27 +39,12 @@ import {IUser} from './models/user';
 import * as commonActions from './actions/app-common.actions';
 import * as commonReducers from './reducers/app-common.reducer';
 import * as commonEffects from './effects/app-common.effects';
-import {NgbDateNativeAdapter} from './services/date-adapter.service'
-import { from } from 'rxjs';
 
-export {FolderService,
-  ItemTypeService,
-  TimespanService,
-  ItemService,
-  EventService,
-  TypeaheadService,
-  UserService,
-  AppConfig,
-  AccessTokenInterceptor,
-  AuthGuard,
-  NavBarGuard,
-  FullScreenGuard,
+export {
   SafePipe,
   AuthCallbackComponent,
-  AuthCallbackGuard,
   AppComponent,
   SessionClearedComponent,
-  ResumableFileUploadService,
   ResumableFileUploadComponent,
   NotFoundComponent,
   NotImplementedComponent,
@@ -92,8 +62,7 @@ export {FolderService,
   ITypeaheadItem,
   IUser,
   commonActions,
-  commonReducers,
-  NgbDateNativeAdapter
+  commonReducers
 };
 
 @NgModule({
@@ -108,9 +77,6 @@ export {FolderService,
     FormsModule,
     UploadxModule
   ],
-  providers: [
-    DatePipe
-  ],
   declarations: [
     AppComponent,
     AuthCallbackComponent,
@@ -141,29 +107,4 @@ export {FolderService,
     ]
 })
 export class AppCommonModule {
-  constructor (@Optional() @SkipSelf() parentModule: AppCommonModule) {
-    if (parentModule) {
-      throw new Error(
-        'AppCommonModule is already loaded. Import it in the AppModule only');
-    }
-  }
-  static forRoot(): ModuleWithProviders {
-    return {
-      ngModule: AppCommonModule,
-      providers: [
-        AppConfig,
-        {
-          provide: APP_INITIALIZER,
-          useFactory: appConfigFactory,
-          deps: [Injector, AppConfig, OAuthService],
-          multi: true
-        },       
-        {
-          provide: HTTP_INTERCEPTORS,
-          useClass: AccessTokenInterceptor,
-          multi: true
-        }
-      ]
-    };
-  }
 }

projects/common/src/fm/index.ts

@@ -1 +0,0 @@
-

projects/common/src/fm/services/item.service.ts

@@ -75,7 +75,7 @@ export class ItemService {
       params = params.append("df", JSON.stringify(dataFilter));
     }
     params = params.append("lvl", level.toString());
-    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 }).pipe(map(ia => ia.map(i => this.parseDates(i))));
   }
 
   getChildItemListByExtent(parentcode: string, itemType: string, extent: number[], crs: string, dataFilter?: any, level: number = 1): Observable<IItem[]> {
@@ -87,13 +87,15 @@ export class ItemService {
       params = params.append("df", JSON.stringify(dataFilter));
     }
     params = params.append("lvl", level.toString());
-    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 }).pipe(map(ia => ia.map(i => this.parseDates(i))));
   }
 
   getItemFeatures(code: string, extent: number[], crs: string, layerIndex?:number): Observable<any> {
     var params = new HttpParams();
-    params = params.append("bbox", extent.join(","));
     params = params.append("crs", crs);
+    if(extent != null) {
+      params = params.append("bbox", extent.join(","));
+    }
     if(layerIndex!=null)
       return this.httpClient.get<any>(`${this.ApiEndpoint()}/api/v1/items/${code}/features/layer/${layerIndex}`, { params: params });
     else

projects/common/src/fm/shared/app.config.ts

@@ -1,4 +1,5 @@
 import {Inject, Injectable} from '@angular/core';
+import { Location } from '@angular/common';
 import {HttpClient, HttpXhrBackend} from '@angular/common/http';
 import {Observable} from 'rxjs';
 
@@ -8,7 +9,7 @@ export class AppConfig {
   private config: Object = null;
   private httpClient: HttpClient;
 
-  constructor(xhrBackend: HttpXhrBackend) {
+  constructor(xhrBackend: HttpXhrBackend,private location:Location) {
     this.httpClient = new HttpClient(xhrBackend);
     this.config = null;
   }
@@ -21,7 +22,7 @@ export class AppConfig {
   }
 
   public load(): Promise<any> {
-    return this.httpClient.get('/configuration.json')
+    return this.httpClient.get(this.location.prepareExternalUrl('/configuration.json'))
       .toPromise()
       .then(data => {
         this.config = data;

projects/common/src/public-api.ts

@@ -3,3 +3,4 @@
  */
 
 export * from './fm/common.module';
+export * from './fm/common-service.module';

src/app/app.component.spec.ts

@@ -1,31 +0,0 @@
-import { TestBed, async } from '@angular/core/testing';
-import { AppComponent } from './app.component';
-
-describe('AppComponent', () => {
-  beforeEach(async(() => {
-    TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
-    }).compileComponents();
-  }));
-
-  it('should create the app', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app).toBeTruthy();
-  });
-
-  it(`should have as title 'farmmaps-lib-app'`, () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    const app = fixture.debugElement.componentInstance;
-    expect(app.title).toEqual('farmmaps-lib-app');
-  });
-
-  it('should render title in a h1 tag', () => {
-    const fixture = TestBed.createComponent(AppComponent);
-    fixture.detectChanges();
-    const compiled = fixture.debugElement.nativeElement;
-    expect(compiled.querySelector('h1').textContent).toContain('Welcome to farmmaps-lib-app!');
-  });
-});

src/app/app.module.ts

@@ -6,7 +6,7 @@ import {
 } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 
-import { AppCommonModule,  } from '@farmmaps/common';
+import { AppCommonModule,AppCommonServiceModule  } from '@farmmaps/common';
 import { AppCommonMapModule} from '@farmmaps/common-map';
 
 import {AppRootComponent} from './app.component';
@@ -52,7 +52,8 @@ export function provideBootstrapEffects(effects: Type<any>[]) {
   ],
   imports: [
     AppRoutingModule,
-    AppCommonModule.forRoot() ,
+    AppCommonModule,
+    AppCommonServiceModule.forRoot(),
     AppCommonMapModule.forRoot(),
     BrowserModule,
     StoreModule.forRoot({}),