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

Merge branch 'develop'
Some checks failed
FarmMaps.Develop/FarmMapsLib/pipeline/head There was a failure building this commit
Details

Browse Source 
# Conflicts:
#	package.json
#	projects/common-map/src/fm-map/common-map.module.ts
#	projects/common/src/fm/reducers/app-common.reducer.ts
This commit is contained in:
Willem Dantuma 2022-01-31 21:04:52 +01:00
commit 2161951cbb
51 changed files with 6185 additions and 6128 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Jenkinsfile.develop
View File

@ -8,21 +8,21 @@ pipeline {
stage('npm install'){ stage('npm install'){
steps { steps {
sh '''rm -rf node_modules/ sh '''rm -rf node_modules/
npm install npm install --legacy-peer-deps
cd projects/common cd projects/common
npm install npm install --legacy-peer-deps
cd ../common-map cd ../common-map
npm install npm install --legacy-peer-deps
cd ../common-map3d cd ../common-map3d
npm install npm install --legacy-peer-deps
''' '''
} }
} }
stage('build'){ stage('build'){
steps { steps {
sh '''ng build common sh '''ng build common --configuration production
ng build common-map ng build common-map --configuration production
ng build common-map3d''' ng build common-map3d --configuration production'''
} }
} }
stage('npm publish'){ stage('npm publish'){

31
angular.json
View File

@ -83,6 +83,31 @@
"maximumWarning": "6kb" "maximumWarning": "6kb"
} }
] ]
},
"development": {
"fileReplacements": [
{
"replace": "src/environments/environment.ts",
"with": "src/environments/environment.prod.ts"
}
],
"optimization": false,
"sourceMap": true,
"namedChunks": true,
"extractLicenses": false,
"vendorChunk": false,
"buildOptimizer": false,
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "7mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb"
}
]
} }
} }
}, },
@ -94,8 +119,12 @@
"configurations": { "configurations": {
"production": { "production": {
"browserTarget": "farmmaps-lib-app:build:production" "browserTarget": "farmmaps-lib-app:build:production"
},
"development": {
"browserTarget": "farmmaps-lib-app:build:development"
} }
} },
"defaultConfiguration": "development"
}, },
"extract-i18n": { "extract-i18n": {
"builder": "@angular-devkit/build-angular:extract-i18n", "builder": "@angular-devkit/build-angular:extract-i18n",

6
custom-webpack.config.js
View File

@ -1,5 +1,6 @@
module.exports = { module.exports = {
node: { resolve: {
fallback: {
// Resolve node module use of fs // Resolve node module use of fs
fs: "empty", fs: "empty",
Buffer: false, Buffer: false,
@ -7,4 +8,5 @@ module.exports = {
https: "empty", https: "empty",
zlib: "empty" zlib: "empty"
} }
}; }
};

11717
package-lock.json generated
View File

File diff suppressed because it is too large Load Diff

56
package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "farmmaps-lib-app", "name": "farmmaps-lib-app",
"version": "1.1.12", "version": "2.0.0",
"scripts": { "scripts": {
"ng": "ng", "ng": "ng",
"start": "ng serve", "start": "ng serve",
@ -11,47 +11,49 @@
}, },
"private": true, "private": true,
"dependencies": { "dependencies": {
"@angular/animations": "~11.2.14", "@angular/animations": "~12.2.8",
"@angular/common": "~11.2.14", "@angular/common": "~12.2.8",
"@angular/compiler": "~11.2.14", "@angular/compiler": "~12.2.8",
"@angular/core": "~11.2.14", "@angular/core": "~12.2.8",
"@angular/forms": "~11.2.14", "@angular/forms": "~12.2.8",
"@angular/platform-browser": "~11.2.14", "@angular/platform-browser": "~12.2.8",
"@angular/platform-browser-dynamic": "~11.2.14", "@angular/platform-browser-dynamic": "~12.2.8",
"@angular/router": "~11.2.14", "@angular/router": "~12.2.8",
"@farmmaps/common": "1.1.4", "@farmmaps/common": "file:dist/common",
"@farmmaps/common-map": "1.1.4", "@farmmaps/common-map": "file:dist/common-map",
"@farmmaps/common-map3d": "1.1.4", "@farmmaps/common-map3d": "file:dist/common-map3d",
"@microsoft/signalr": "^3.1.16", "@microsoft/signalr": "^3.1.16",
"@ng-bootstrap/ng-bootstrap": "^9.0", "@ng-bootstrap/ng-bootstrap": "^9.0",
"@ngrx/effects": "^11.0", "@ngrx/effects": "^12.0",
"@ngrx/router-store": "^11.0", "@ngrx/router-store": "^12.0",
"@ngrx/store": "^11.0", "@ngrx/store": "^12.0",
"angular-oauth2-oidc": "^10.0.3", "angular-oauth2-oidc": "^12.0",
"bootstrap": "^4.6.0", "bootstrap": "^4.6.0",
"cesium": "^1.82.1", "cesium": "^1.82.1",
"core-js": "^2.6.12", "core-js": "^2.6.12",
"moment": "^2.29.1", "moment": "^2.29.1",
"ngrx-store-localstorage": "^11.0.0", "ngrx-store-localstorage": "^12.0",
"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.17", "ngx-openlayers": "1.0.0-next.19",
"ngx-uploadx": "^3.5.1", "ngx-uploadx": "^3.5.1",
"ol": "6.5.0", "ol": "6.8.1",
"ol-cesium": "^2.13.0", "ol-cesium": "^2.13.0",
"resumablejs": "^1.1.0", "resumablejs": "^1.1.0",
"rxjs": "^6.6.7", "rxjs": "^6.6.7",
"tassign": "^1.0.0", "tassign": "^1.0.0",
"tslib": "^2.2.0", "tslib": "^2.2.0",
"zone.js": "~0.10.2" "zone.js": "~0.11.4"
}, },
"devDependencies": { "devDependencies": {
"@angular-builders/custom-webpack": "^11.1.1", "@angular-builders/custom-webpack": "^12.1.3",
"@angular-devkit/build-angular": "^0.1102.14", "@angular-devkit/build-angular": "^12.2.8",
"@angular/cli": "^11.2.14", "@angular/cli": "^12.2.8",
"@angular/compiler-cli": "~11.2.14", "@angular/compiler-cli": "~12.2.8",
"@angular/language-service": "~11.2.14", "@angular/language-service": "~12.2.8",
"@angular/localize": "^12.2.8",
"@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",
"@types/node": "^12.20.15", "@types/node": "^12.20.15",
@ -63,10 +65,10 @@
"karma-coverage-istanbul-reporter": "~3.0.2", "karma-coverage-istanbul-reporter": "~3.0.2",
"karma-jasmine": "~4.0.0", "karma-jasmine": "~4.0.0",
"karma-jasmine-html-reporter": "^1.6.0", "karma-jasmine-html-reporter": "^1.6.0",
"ng-packagr": "^11.2.4", "ng-packagr": "^12.2.2",
"protractor": "~7.0.0", "protractor": "~7.0.0",
"ts-node": "^8.8.1", "ts-node": "^8.8.1",
"tslint": "~6.1.0", "tslint": "~6.1.0",
"typescript": "~4.1.0" "typescript": "~4.3.5"
} }
} }

2
projects/common-map/ng-package.json
View File

@ -4,7 +4,7 @@
"lib": { "lib": {
"entryFile": "src/public-api.ts" "entryFile": "src/public-api.ts"
}, },
"whitelistedNonPeerDependencies": [ "allowedNonPeerDependencies": [
"." "."
] ]
} }

18
projects/common-map/package.json
View File

@ -1,6 +1,6 @@
{ {
"name": "@farmmaps/common-map", "name": "@farmmaps/common-map",
"version": "1.0.0", "version": "2.0.0",
"publishConfig": { "publishConfig": {
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/" "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
}, },
@ -8,14 +8,14 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/core": "^10.2.4", "@angular/core": "~12.2.8",
"ngrx-store-localstorage": "^10.0", "ngrx-store-localstorage": "^12.0",
"@ngrx/effects": "^10.0", "@ngrx/effects": "^12.0",
"@ngrx/router-store": "^10.0", "@ngrx/router-store":"^12.0",
"@ngrx/store": "^10.0", "@ngrx/store":"^12.0",
"tassign": "^1.0.0", "tassign": "^1.0.0",
"@farmmaps/common": "~1.0", "@farmmaps/common": "~2.0",
"ngx-openlayers": "1.0.0-next.17", "ngx-openlayers": "1.0.0-next.19",
"ol": "6.4.3" "ol": "6.8.1"
} }
} }

16
projects/common-map/src/fm-map/actions/map.actions.ts
View File

@ -5,7 +5,9 @@ import { IItemLayer } from '../models/item.layer';
import { ILayervalue } from '../models/layer.value'; import { ILayervalue } from '../models/layer.value';
import { IQueryState } from '@farmmaps/common'; import { IQueryState } from '@farmmaps/common';
import { IItem } from '@farmmaps/common'; import { IItem } from '@farmmaps/common';
import { Feature,Style } from 'ol'; import { Feature } from 'ol';
import { Style } from 'ol/style';
import { Geometry } from 'ol/geom';
import { IPeriodState } from '../models/period.state'; import { IPeriodState } from '../models/period.state';
export const SETSTATE = '[Map] SetState'; export const SETSTATE = '[Map] SetState';
@ -103,13 +105,13 @@ export class StartSearch implements Action {
export class StartSearchSuccess implements Action { export class StartSearchSuccess implements Action {
readonly type = STARTSEARCHSUCCESS; readonly type = STARTSEARCHSUCCESS;
constructor(public features: Array<Feature>, public query:IQueryState) { } constructor(public features: Array<Feature<Geometry>>, public query:IQueryState) { }
} }
export class SelectFeature implements Action { export class SelectFeature implements Action {
readonly type = SELECTFEATURE; readonly type = SELECTFEATURE;
constructor(public feature:Feature) { } constructor(public feature:Feature<Geometry>) { }
} }
export class SelectItem implements Action { export class SelectItem implements Action {
@ -151,13 +153,13 @@ export class SelectTemporal implements Action {
export class AddFeatureSuccess implements Action { export class AddFeatureSuccess implements Action {
readonly type = ADDFEATURESUCCESS; readonly type = ADDFEATURESUCCESS;
constructor(public feature: Feature) { } constructor(public feature: Feature<Geometry>) { }
} }
export class UpdateFeatureSuccess implements Action { export class UpdateFeatureSuccess implements Action {
readonly type = UPDATEFEATURESUCCESS; readonly type = UPDATEFEATURESUCCESS;
constructor(public feature: Feature) { } constructor(public feature: Feature<Geometry>) { }
} }
export class ExpandSearch implements Action { export class ExpandSearch implements Action {
@ -271,7 +273,7 @@ export class DoQuery implements Action {
export class SetStyle implements Action { export class SetStyle implements Action {
readonly type = SETSTYLE; readonly type = SETSTYLE;
constructor(public itemType:string,public style: Style | (Feature)) { } constructor(public itemType:string,public style: Style | ((feature:Feature<Geometry>) => Style )) { }
} }
export class ShowLayerSwitcher implements Action { export class ShowLayerSwitcher implements Action {
@ -287,7 +289,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>) { } constructor(public features: Array<Feature<Geometry>>) { }
} }
export class SetLayerValuesLocation implements Action { export class SetLayerValuesLocation implements Action {

6
projects/common-map/src/fm-map/common-map.module.ts
View File

@ -84,7 +84,7 @@ export function LocalStorageSync(reducer: ActionReducer<any>): ActionReducer<any
r2["mapState"] = JSON.parse(ms); r2["mapState"] = JSON.parse(ms);
} }
let sp = window.localStorage.getItem(MODULE_NAME+"_searchPeriod"); let sp = window.localStorage.getItem(MODULE_NAME+"_searchPeriod");
if(sp) { if(sp) {
let p = JSON.parse(sp); let p = JSON.parse(sp);
r2["period"] = { startDate: new Date(Date.parse(p.startDate)),endDate:new Date(Date.parse(p.endDate))}; r2["period"] = { startDate: new Date(Date.parse(p.startDate)),endDate:new Date(Date.parse(p.endDate))};
} }
@ -277,7 +277,7 @@ export {
ZoomToExtentComponent, ZoomToExtentComponent,
ifZoomToShowDirective, ifZoomToShowDirective,
ZoomToShowAlert, ZoomToShowAlert,
GeometryThumbnailComponent GeometryThumbnailComponent
], ],
providers: [ providers: [
FeatureIconService, FeatureIconService,
@ -300,5 +300,5 @@ export {
}) })
export class AppCommonMapModule { export class AppCommonMapModule {
} }

4
projects/common-map/src/fm-map/components/aol/file-drop-target/file-drop-target.component.ts
View File

@ -4,7 +4,7 @@ import { MapComponent } from 'ngx-openlayers';
import * as proj from 'ol/proj'; import * as proj from 'ol/proj';
import {Point,Geometry} from 'ol/geom'; import {Point,Geometry} from 'ol/geom';
import { GeoJSON } from 'ol/format'; import { GeoJSON } from 'ol/format';
import { Feature } from 'ol'; import { Feature} from 'ol';
export interface IDroppedFile { export interface IDroppedFile {
files: any, files: any,
@ -21,7 +21,7 @@ export class FileDropTargetComponent implements OnInit, OnDestroy {
element: Element; element: Element;
@Output() onFileDropped = new EventEmitter<IDroppedFile>(); @Output() onFileDropped = new EventEmitter<IDroppedFile>();
@Input() parentCode: string; @Input() parentCode: string;
@Input() features: Array<Feature>; @Input() features: Array<Feature<Geometry>>;
constructor(private map: MapComponent) { constructor(private map: MapComponent) {
} }

4
projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts
View File

@ -1,6 +1,6 @@
import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges ,Host} from '@angular/core'; import { Component, OnInit, Input, ViewChild, ElementRef, OnChanges, SimpleChanges ,Host} from '@angular/core';
import { MapComponent } from 'ngx-openlayers'; import { MapComponent } from 'ngx-openlayers';
import Overlay from 'ol/Overlay'; import Overlay from 'ol/Overlay';
import { fromLonLat, toLonLat } from 'ol/proj'; import { fromLonLat, toLonLat } from 'ol/proj';
@ -52,7 +52,7 @@ export class GpsLocation implements OnInit,OnChanges{
this.rotate = "rotate(" + Math.round(this.heading) + " 500 500)"; this.rotate = "rotate(" + Math.round(this.heading) + " 500 500)";
this.locTolerancePixels = this.locationTolerance; this.locTolerancePixels = this.locationTolerance;
this.map.instance.addOverlay(this.instance); this.map.instance.addOverlay(this.instance);
this.map.instance.getView().on('change:resolution', (evt) => { this.map.instance.getView().on('change:resolution', (evt:any) => {
this.resolution = evt.target.get('resolution'); this.resolution = evt.target.get('resolution');
this.recalcLocationTolerance(); this.recalcLocationTolerance();
}); });

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

@ -10,12 +10,14 @@ import * as proj from 'ol/proj';
import * as loadingstrategy from 'ol/loadingstrategy'; import * as loadingstrategy from 'ol/loadingstrategy';
import * as style from 'ol/style'; import * as style from 'ol/style';
import {Tile,Layer,Image} from 'ol/layer'; import {Tile,Layer,Image} from 'ol/layer';
import {XYZ,ImageStatic,OSM,BingMaps,TileWMS,TileArcGISRest,TileJSON} from 'ol/source'; import {XYZ,ImageStatic,OSM,BingMaps,TileWMS,TileArcGISRest,TileJSON,Source} from 'ol/source';
import {Vector as VectorSource} from 'ol/source'; import {Vector as VectorSource} from 'ol/source';
import { Vector as VectorLayer } from 'ol/layer'; import { Vector as VectorLayer } from 'ol/layer';
import VectorTileSource from 'ol/source/VectorTile'; import VectorTileSource from 'ol/source/VectorTile';
import VectorTileLayer from 'ol/layer/VectorTile'; import VectorTileLayer from 'ol/layer/VectorTile';
import {GeoJSON,MVT} from 'ol/format'; import {GeoJSON,MVT} from 'ol/format';
import { Geometry } from 'ol/geom';
import TileSource from 'ol/source/Tile';
@Component({ @Component({
selector: 'fm-map-item-layers', selector: 'fm-map-item-layers',
@ -34,7 +36,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
private initialized:boolean = false; private initialized:boolean = false;
private mapEventHandlerInstalled = false; private mapEventHandlerInstalled = false;
private selectedFeatures = {}; private selectedFeatures = {};
private selectionLayer:Layer = null; private selectionLayer:Layer<Source> = null;
constructor(private itemService: ItemService, private map: MapComponent, public appConfig: AppConfig) { constructor(private itemService: ItemService, private map: MapComponent, public appConfig: AppConfig) {
super(map); super(map);
@ -119,9 +121,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
return this.styleCache[key]; return this.styleCache[key];
} }
createGeotiffLayer(item:IItem,itemLayer:IItemLayer):Layer { createGeotiffLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
var layerIndex = -1; var layerIndex = -1;
var layer: Layer = null; var layer: Layer<Source> = null;
layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index; layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` }); let source = new XYZ({ maxZoom: 19, minZoom: 1, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` });
layer = new Tile({ source: source }); layer = new Tile({ source: source });
@ -142,9 +144,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
return layer; return layer;
} }
createShapeLayer(item:IItem,itemLayer:IItemLayer):Layer { createShapeLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
var layerIndex = -1; var layerIndex = -1;
var layer: Layer = null; var layer: Layer<Source> = null;
layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index; layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index;
var data = item.data; var data = item.data;
var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null; var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
@ -177,7 +179,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
let source = new VectorSource({ let source = new VectorSource({
strategy: loadingstrategy.bbox, strategy: loadingstrategy.bbox,
loader: function (extent: Extent, resolution: number, projection: Projection) { loader: function (extent: Extent, resolution: number, projection: Projection) {
var source = this as VectorSource; var source = this as VectorSource<Geometry>;
__this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) { __this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) {
var features = format.readFeatures(data); var features = format.readFeatures(data);
for (let f of features) { for (let f of features) {
@ -230,16 +232,16 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
return layer; return layer;
} }
createSelectionLayer(itemLayer:IItemLayer):Layer { createSelectionLayer(itemLayer:IItemLayer):Layer<Source> {
var layerIndex = -1; var layerIndex = -1;
var layer: Layer = null; var layer: Layer<Source> = null;
layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index; layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index;
var data = itemLayer.item.data; var data = itemLayer.item.data;
var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null; var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null;
if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") { if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") {
return new VectorTileLayer({ return new VectorTileLayer({
renderMode: 'vector', renderMode: 'vector',
source: itemLayer.layer.getSource(), source: (itemLayer.layer as VectorTileLayer).getSource(),
style: (feature) => { style: (feature) => {
if (feature.getId() in this.selectedFeatures) { if (feature.getId() in this.selectedFeatures) {
@ -260,9 +262,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
return null; return null;
} }
createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer { createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer<Source> {
let data = item.data as ILayerData; let data = item.data as ILayerData;
var layer: Layer = null; var layer: Layer<Source> = null;
switch (data.interfaceType) { switch (data.interfaceType) {
case 'OSM': { case 'OSM': {
let source = new OSM(); let source = new OSM();
@ -312,8 +314,8 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
return layer; return layer;
} }
createLayer(itemLayer: IItemLayer): Layer { createLayer(itemLayer: IItemLayer): Layer<Source> {
var layer: Layer = null; var layer: Layer<Source> = null;
var layerIndex = -1; var layerIndex = -1;
if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') { if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') {
layer = this.createGeotiffLayer(itemLayer.item,itemLayer); layer = this.createGeotiffLayer(itemLayer.item,itemLayer);
@ -360,7 +362,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
} }
} }
addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer { addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer<Source> {
if(!itemLayer) return null; if(!itemLayer) return null;
var olLayers = this.instance.getLayers(); var olLayers = this.instance.getLayers();
var layer = itemLayer.layer; var layer = itemLayer.layer;
@ -385,7 +387,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange
} }
updateLayers(itemLayers: IItemLayer[]) { updateLayers(itemLayers: IItemLayer[]) {
let newLayers: IItemLayer[] = []; let newLayers: Layer<Source>[] = [];
if (itemLayers) { if (itemLayers) {
itemLayers.forEach((itemLayer, index) => { itemLayers.forEach((itemLayer, index) => {
if(itemLayer.item.itemType == 'vnd.farmmaps.itemtype.temporal') { if(itemLayer.item.itemType == 'vnd.farmmaps.itemtype.temporal') {

39
projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts
View File

@ -1,16 +1,17 @@
import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken } from '@angular/core'; import { Component, Host, Input, Output, EventEmitter, OnInit, OnChanges, SimpleChanges, forwardRef, Inject, InjectionToken } from '@angular/core';
import { LayerVectorComponent, SourceVectorComponent, MapComponent } from 'ngx-openlayers'; import { LayerVectorComponent, SourceVectorComponent, MapComponent } from 'ngx-openlayers';
import { ItemService,ItemTypeService,IItem, IItemType } from '@farmmaps/common'; import { ItemService,ItemTypeService,IItem, IItemType } from '@farmmaps/common';
import { Feature } from 'ol'; import { Feature } from 'ol';
import { Point } from 'ol/geom'; import { Point,Geometry } from 'ol/geom';
import { MapBrowserEvent } from 'ol'; import { MapBrowserEvent } from 'ol';
import { Types } from 'ol/MapBrowserEventType';
import * as style from 'ol/style'; import * as style from 'ol/style';
import * as color from 'ol/color'; import * as color from 'ol/color';
import * as loadingstrategy from 'ol/loadingstrategy'; import * as loadingstrategy from 'ol/loadingstrategy';
import * as condition from 'ol/events/condition'; import * as condition from 'ol/events/condition';
import * as extent from 'ol/extent'; import * as extent from 'ol/extent';
import {Vector,Cluster} from 'ol/source'; import {Vector,Cluster,Source} from 'ol/source';
import {Layer} from 'ol/layer'; import {Layer} from 'ol/layer';
import {GeoJSON} from 'ol/format'; import {GeoJSON} from 'ol/format';
import {Select} from 'ol/interaction'; import {Select} from 'ol/interaction';
@ -25,17 +26,17 @@ import {FeatureIconService} from '../../../services/feature-icon.service';
] ]
}) })
export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnChanges { export class ItemVectorSourceComponent extends SourceVectorComponent implements OnInit, OnChanges {
instance: Vector; instance: Vector<Geometry>;
private _format: GeoJSON; private _format: GeoJSON;
private _select: Select; private _select: Select;
private _hoverSelect: Select; private _hoverSelect: Select;
private _iconScale: number = 0.05; private _iconScale: number = 0.05;
@Input() features: Array<Feature>; @Input() features: Array<Feature<Geometry>>;
@Input() selectedFeature: Feature; @Input() selectedFeature: Feature<Geometry>;
@Input() selectedItem: IItem; @Input() selectedItem: IItem;
@Input() styles:IStyles; @Input() styles:IStyles;
@Output() onFeatureSelected: EventEmitter<Feature> = new EventEmitter<Feature>(); @Output() onFeatureSelected: EventEmitter<Feature<Geometry>> = new EventEmitter<Feature<Geometry>>();
@Output() onFeatureHover: EventEmitter<Feature> = new EventEmitter<Feature>(); @Output() onFeatureHover: EventEmitter<Feature<Geometry>> = new EventEmitter<Feature<Geometry>>();
private stylesCache:IStyles = {}; private stylesCache:IStyles = {};
constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, private map: MapComponent, private itemTypeService: ItemTypeService,private featureIconService$:FeatureIconService) { constructor(@Host() private layer: LayerVectorComponent, private itemService: ItemService, private map: MapComponent, private itemTypeService: ItemTypeService,private featureIconService$:FeatureIconService) {
@ -43,7 +44,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
this._format = new GeoJSON(); this._format = new GeoJSON();
} }
geometry(feature: Feature) { geometry(feature: Feature<Geometry>) {
let view = this.map.instance.getView(); let view = this.map.instance.getView();
let resolution = view.getResolution(); let resolution = view.getResolution();
var geometry = feature.getGeometry(); var geometry = feature.getGeometry();
@ -55,9 +56,9 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
return geometry; return geometry;
} }
getSelectedStyle(feature:Feature):style.Style { getSelectedStyle(feature:Feature<Geometry>):style.Style {
let key = feature.get('itemType')+"_selected"; let key = feature.get('itemType')+"_selected";
let evaluatedStyle =null; let evaluatedStyle: style.Style =undefined;
var styleEntry = this.stylesCache[key]; var styleEntry = this.stylesCache[key];
if(styleEntry) { if(styleEntry) {
if(typeof styleEntry === 'function') { if(typeof styleEntry === 'function') {
@ -66,12 +67,12 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
evaluatedStyle = styleEntry; evaluatedStyle = styleEntry;
} }
} else { } else {
evaluatedStyle = this.stylesCache["selected"]; evaluatedStyle = this.stylesCache["selected"] as style.Style;
} }
if(evaluatedStyle ) { if(evaluatedStyle ) {
evaluatedStyle.setGeometry((feature) => this.geometry(feature)); evaluatedStyle .setGeometry((feature:Feature<Geometry>) => this.geometry(feature));
} }
return evaluatedStyle return evaluatedStyle as style.Style
} }
ngOnInit() { ngOnInit() {
@ -80,17 +81,17 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
this._select = new Select({ this._select = new Select({
style:null, style:null,
hitTolerance: 10, hitTolerance: 10,
layers: [this.layer.instance as Layer] layers: [this.layer.instance as Layer<Source>]
}); });
this._hoverSelect = new Select({ this._hoverSelect = new Select({
style: (feature) => { style: (feature:Feature<Geometry>) => {
return this.getSelectedStyle(feature); return this.getSelectedStyle(feature);
}, },
hitTolerance: 10, hitTolerance: 10,
condition: (e: MapBrowserEvent) => { condition: (e: MapBrowserEvent<UIEvent>) => {
return e.type == 'pointermove'; return e.type == 'pointermove';
}, },
layers: [this.layer.instance as Layer] layers: [this.layer.instance as Layer<Source>]
}); });
this.map.instance.addInteraction(this._select); this.map.instance.addInteraction(this._select);
this.map.instance.addInteraction(this._hoverSelect); this.map.instance.addInteraction(this._hoverSelect);
@ -132,7 +133,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements
fill: new style.Fill({ fill: new style.Fill({
color: fillColor color: fillColor
}), }),
geometry:(feature) => this.geometry(feature) geometry:(feature:Feature<Geometry>) => this.geometry(feature)
}); });
} else { } else {
key = 'file'; key = 'file';

15
projects/common-map/src/fm-map/components/aol/layer-vector-image/layer-vector-image.component.ts
View File

@ -1,9 +1,8 @@
import { Component, OnDestroy, OnInit, Input, Optional, OnChanges, SimpleChanges } from '@angular/core'; import { Component, OnDestroy, OnInit, Input, OnChanges, SimpleChanges } from '@angular/core';
import { Vector } from 'ol/layer'; import { LayerVectorComponent, MapComponent } from 'ngx-openlayers';
import { Style } from 'ol/style'; import RenderType from 'ol/layer/Vector';
import { StyleFunction } from 'ol/style/Style'; import { Vector as VectorSource } from 'ol/source';
import { LayerVectorComponent, LayerGroupComponent, MapComponent } from 'ngx-openlayers'; import { Geometry } from 'ol/geom';
import { RenderType } from 'ol/layer/Vector';
@Component({ @Component({
selector: 'fm-map-aol-layer-vector-image', selector: 'fm-map-aol-layer-vector-image',
@ -12,10 +11,10 @@ import { RenderType } from 'ol/layer/Vector';
`, `,
}) })
export class LayerVectorImageComponent extends LayerVectorComponent implements OnInit, OnDestroy, OnChanges { export class LayerVectorImageComponent extends LayerVectorComponent implements OnInit, OnDestroy, OnChanges {
public source: Vector; //public source: Vector;
@Input() @Input()
renderMode: RenderType | string = "image"; renderMode: RenderType<VectorSource<Geometry>> | string = "image";
constructor(map: MapComponent) { constructor(map: MapComponent) {
super(map); super(map);

7
projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.ts
View File

@ -1,5 +1,6 @@
import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject} from '@angular/core'; import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject} from '@angular/core';
import { Feature } from 'ol'; import { Feature } from 'ol';
import { Geometry} from 'ol/geom';
import { FeatureListComponent,AbstractFeatureListComponent } from '../feature-list/feature-list.component'; import { FeatureListComponent,AbstractFeatureListComponent } from '../feature-list/feature-list.component';
import { WidgetHostDirective } from '../widget-host/widget-host.directive'; import { WidgetHostDirective } from '../widget-host/widget-host.directive';
import {IQueryState,PackageService } from '@farmmaps/common'; import {IQueryState,PackageService } from '@farmmaps/common';
@ -20,10 +21,10 @@ export class FeatureListContainerComponent {
this.featureLists = [...this.featureLists].reverse(); this.featureLists = [...this.featureLists].reverse();
} }
@Input() features: Array<Feature> @Input() features: Array<Feature<Geometry>>
@Input() queryState: IQueryState; @Input() queryState: IQueryState;
@Input() selectedFeature: Feature; @Input() selectedFeature: Feature<Geometry>;
@Input() clickedFeature:Observable<Feature>; @Input() clickedFeature:Observable<Feature<Geometry>>;
@ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective;
componentRef:any; componentRef:any;

2
projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.html
View File

@ -1,7 +1,7 @@
<div class="card border-0"> <div class="card border-0">
<div class="card-body"> <div class="card-body">
<fm-back-button></fm-back-button> <fm-back-button></fm-back-button>
<h3><i class="fm fm-farm"></i>&nbsp;<span i18n>Farms</span></h3> <h3><i class="far fa-farm"></i>&nbsp;<span i18n>Farms</span></h3>
<div *ngIf="features;let features"> <div *ngIf="features;let features">
<div class="farms"> <div class="farms">
<div class="row m-0 pl-3 pr-3" *ngFor="let feature of features"[ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)"> <div class="row m-0 pl-3 pr-3" *ngFor="let feature of features"[ngClass]="{'selected':isFeatureSelected(feature)}" (click)="handleFeatureClick(feature)" (mouseenter)="handleFeatureMouseEnter(feature)" (mouseleave)="handleFeatureMouseLeave(feature)">

3
projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.ts
View File

@ -9,6 +9,7 @@ import * as mapActions from '../../actions/map.actions';
import { tassign } from 'tassign'; import { tassign } from 'tassign';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { Feature } from 'ol'; import { Feature } from 'ol';
import { Geometry} from 'ol/geom';
@ForItemType("vnd.farmmaps.itemtype.croppingscheme") @ForItemType("vnd.farmmaps.itemtype.croppingscheme")
@Injectable() @Injectable()
@ -23,7 +24,7 @@ export class FeatureListCroppingschemeComponent extends AbstractFeatureListCompo
super(store, itemTypeService, location); super(store, itemTypeService, location);
} }
getAction(feature:Feature):Action { getAction(feature:Feature<Geometry>):Action {
var queryState = tassign(mapReducers.initialState.queryState, { parentCode: feature.get('code'), itemType: "vnd.farmmaps.itemtype.cropfield" }); var queryState = tassign(mapReducers.initialState.queryState, { parentCode: feature.get('code'), itemType: "vnd.farmmaps.itemtype.cropfield" });
return new mapActions.DoQuery(queryState); return new mapActions.DoQuery(queryState);
} }

3
projects/common-map/src/fm-map/components/feature-list-feature-container/feature-list-feature-container.component.ts
View File

@ -1,5 +1,6 @@
import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core'; import { Component, Input, OnInit, ComponentFactoryResolver, ViewChild, SimpleChanges, ComponentFactory, Inject, Type} from '@angular/core';
import { Feature } from 'ol'; import { Feature } from 'ol';
import { Geometry } from 'ol/geom';
import { AbstractFeatureListFeatureComponent,FeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component'; import { AbstractFeatureListFeatureComponent,FeatureListFeatureComponent } from '../feature-list-feature/feature-list-feature.component';
import { WidgetHostDirective } from '../widget-host/widget-host.directive'; import { WidgetHostDirective } from '../widget-host/widget-host.directive';
@ -18,7 +19,7 @@ export class FeatureListFeatureContainerComponent {
this.featureLists = [...this.featureLists].reverse(); this.featureLists = [...this.featureLists].reverse();
} }
@Input() feature: Feature; @Input() feature: Feature<Geometry>;
@ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective;

5
projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts
View File

@ -1,5 +1,6 @@
import { Component, Injectable,ViewChild,AfterViewInit} from '@angular/core'; import { Component, Injectable,ViewChild,AfterViewInit} from '@angular/core';
import { Feature } from 'ol'; import { Feature } from 'ol';
import { Geometry } from 'ol/geom';
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 { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common'; import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
@ -23,11 +24,11 @@ export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFea
super(store, itemTypeService,config); super(store, itemTypeService,config);
} }
areaInHa(feature:Feature):number { areaInHa(feature:Feature<Geometry>):number {
if(!feature) return 0; if(!feature) return 0;
// get area from faeture if 0 calculate from polygon // get area from faeture if 0 calculate from polygon
let a = feature.get('area'); let a = feature.get('area');
if(a) return a; if(a) return a;
return getArea(feature.getGeometry(),{projectio:"EPSG:3857"}) / 10000; return getArea(feature.getGeometry(),{projection:"EPSG:3857"}) / 10000;
} }
} }

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

@ -1,5 +1,6 @@
import { Component, Input, Injectable,Directive} from '@angular/core'; import { Component, Input, Injectable,Directive} from '@angular/core';
import { Feature } from 'ol'; import { Feature } from 'ol';
import { Geometry } from 'ol/geom';
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 { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common'; import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
@ -9,7 +10,7 @@ import { commonReducers,ItemTypeService,AppConfig } from '@farmmaps/common';
@Injectable() @Injectable()
@Directive() @Directive()
export abstract class AbstractFeatureListFeatureComponent { export abstract class AbstractFeatureListFeatureComponent {
@Input() feature: Feature @Input() feature: Feature<Geometry>
constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService,public config:AppConfig) { constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService,public config:AppConfig) {
} }

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

@ -1,6 +1,7 @@
import { Component, Input, Injectable,Directive,SimpleChanges } from '@angular/core'; import { Component, Input, Injectable,Directive,SimpleChanges } from '@angular/core';
import { Location } from '@angular/common'; import { Location } from '@angular/common';
import { Feature } from 'ol'; import { Feature } from 'ol';
import { Geometry} from 'ol/geom';
import { Store,Action} from '@ngrx/store'; import { Store,Action} from '@ngrx/store';
import * as mapReducers from '../../reducers/map.reducer'; import * as mapReducers from '../../reducers/map.reducer';
import { commonReducers,ItemTypeService, IItem, Item } from '@farmmaps/common'; import { commonReducers,ItemTypeService, IItem, Item } from '@farmmaps/common';
@ -14,20 +15,20 @@ import { IQueryState } from '@farmmaps/common';
@Injectable() @Injectable()
@Directive() @Directive()
export abstract class AbstractFeatureListComponent { export abstract class AbstractFeatureListComponent {
@Input() features: Array<Feature>; @Input() features: Array<Feature<Geometry>>;
@Input() queryState: IQueryState; @Input() queryState: IQueryState;
@Input() selectedFeature: Feature; @Input() selectedFeature: Feature<Geometry>;
constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location) { constructor(public store: Store<mapReducers.State | commonReducers.State>, public itemTypeService: ItemTypeService, private location: Location) {
} }
handleFeatureClick(feature:Feature) { handleFeatureClick(feature:Feature<Geometry>) {
if(feature) { if(feature) {
let action = this.getAction(feature); let action = this.getAction(feature);
this.store.dispatch(action); this.store.dispatch(action);
} }
} }
getAction(feature:Feature):Action { getAction(feature:Feature<Geometry>):Action {
var newQuery: any = tassign(mapReducers.initialState.queryState); var newQuery: any = tassign(mapReducers.initialState.queryState);
newQuery.parentCode = feature.get('parentCode'); newQuery.parentCode = feature.get('parentCode');
newQuery.itemCode = feature.get('code'); newQuery.itemCode = feature.get('code');
@ -48,7 +49,7 @@ export abstract class AbstractFeatureListComponent {
this.location.back(); this.location.back();
} }
isFeatureSelected(feature:Feature):boolean { isFeatureSelected(feature:Feature<Geometry>):boolean {
if(!this.selectedFeature) return false; if(!this.selectedFeature) return false;
return feature.getId() == this.selectedFeature.getId(); return feature.getId() == this.selectedFeature.getId();
} }

6
projects/common-map/src/fm-map/components/feature-thumbnail/feature-thumbnail.component.ts
View File

@ -1,6 +1,6 @@
import { Component, Input, AfterViewInit, ViewChild } from '@angular/core'; import { Component, Input, AfterViewInit, ViewChild } from '@angular/core';
import { Feature} from 'ol'; import { Feature} from 'ol';
import { Geometry } from 'ol/geom'; import { Geometry,Polygon,MultiPolygon } from 'ol/geom';
import * as extent from 'ol/extent'; import * as extent from 'ol/extent';
import * as render from 'ol/render'; import * as render from 'ol/render';
import * as style from 'ol/style'; import * as style from 'ol/style';
@ -19,7 +19,7 @@ export class GeometryThumbnailComponent implements AfterViewInit {
@ViewChild('container') container; @ViewChild('container') container;
private geometry:Geometry = null; private geometry:Geometry = null;
@Input() set feature(value:Feature) { @Input() set feature(value:Feature<Geometry>) {
if(value) { if(value) {
this.geometry = value.getGeometry(); this.geometry = value.getGeometry();
} else { } else {
@ -59,7 +59,7 @@ export class GeometryThumbnailComponent implements AfterViewInit {
if(canvas && canvas.nativeElement && geometry && style) { if(canvas && canvas.nativeElement && geometry && style) {
let renderContext = render.toContext(canvas.nativeElement.getContext( '2d'),{ size: [width, height] }); let renderContext = render.toContext(canvas.nativeElement.getContext( '2d'),{ size: [width, height] });
let geom = geometry.clone(), let geom = geometry.clone() as Polygon,
line = geom.getCoordinates()[0], line = geom.getCoordinates()[0],
e = extent.boundingExtent( line ); e = extent.boundingExtent( line );

7
projects/common-map/src/fm-map/components/if-zoom-to-show/if-zoom-to-show.directive.ts
View File

@ -1,5 +1,6 @@
import { Directive, ViewContainerRef,TemplateRef,OnInit,Input, OnChanges } from '@angular/core'; import { Directive, ViewContainerRef,TemplateRef,OnInit,Input, OnChanges } from '@angular/core';
import { layer } from 'ol'; import { Layer } from 'ol/layer';
import { Source } from 'ol/source';
import { MapComponent } from 'ngx-openlayers'; import { MapComponent } from 'ngx-openlayers';
@Directive({ @Directive({
@ -7,7 +8,7 @@ import { MapComponent } from 'ngx-openlayers';
}) })
export class ifZoomToShowDirective implements OnInit { export class ifZoomToShowDirective implements OnInit {
@Input() @Input()
set fmMapIfZoomToShow(layer:layer) { set fmMapIfZoomToShow(layer:Layer<Source>) {
this.layer$=layer; this.layer$=layer;
this.checkZoom(); this.checkZoom();
} }
@ -24,7 +25,7 @@ export class ifZoomToShowDirective implements OnInit {
this.checkZoom(); this.checkZoom();
} }
private layer$:layer; private layer$:Layer<Source>;
private thenTemplate$:TemplateRef<any>; private thenTemplate$:TemplateRef<any>;
private elseTemplate$:TemplateRef<any>; private elseTemplate$:TemplateRef<any>;
private showView = false; private showView = false;

11
projects/common-map/src/fm-map/components/map/map.component.ts
View File

@ -30,6 +30,7 @@ import {commonReducers} from '@farmmaps/common';
import {commonActions} from '@farmmaps/common'; import {commonActions} from '@farmmaps/common';
import {Feature} from 'ol'; import {Feature} from 'ol';
import {Geometry} from 'ol/geom';
import {Extent,createEmpty,extend } from 'ol/extent'; import {Extent,createEmpty,extend } from 'ol/extent';
import {transform} from 'ol/proj'; import {transform} from 'ol/proj';
import { tassign } from 'tassign'; import { tassign } from 'tassign';
@ -47,7 +48,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
public openedModalName$: Observable<string> = this.store.select(commonReducers.selectOpenedModalName); public openedModalName$: Observable<string> = this.store.select(commonReducers.selectOpenedModalName);
public itemTypes$: Observable<{ [id: string]: IItemType }>; public itemTypes$: Observable<{ [id: string]: IItemType }>;
public mapState$: Observable<IMapState> = this.store.select(mapReducers.selectGetMapState); public mapState$: Observable<IMapState> = this.store.select(mapReducers.selectGetMapState);
public features$: Observable<Array<Feature>> = this.store.select(mapReducers.selectGetFeatures); public features$: Observable<Array<Feature<Geometry>>> = this.store.select(mapReducers.selectGetFeatures);
public overlayLayers$: Observable<Array<IItemLayer>> = this.store.select(mapReducers.selectGetOverlayLayers); public overlayLayers$: Observable<Array<IItemLayer>> = this.store.select(mapReducers.selectGetOverlayLayers);
public selectedOverlayLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedOverlayLayer); public selectedOverlayLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedOverlayLayer);
public selectedItemLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedItemLayer); public selectedItemLayer$: Observable<IItemLayer> = this.store.select(mapReducers.selectGetSelectedItemLayer);
@ -64,8 +65,8 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode); public parentCode$: Observable<string> =this.store.select(mapReducers.selectGetParentCode);
public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible); public panelVisible$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelVisible);
public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed); public panelCollapsed$: Observable<boolean> = this.store.select(mapReducers.selectGetPanelCollapsed);
public selectedFeature$: Observable<Feature> = this.store.select(mapReducers.selectGetSelectedFeature); public selectedFeature$: Observable<Feature<Geometry>> = this.store.select(mapReducers.selectGetSelectedFeature);
public clickedFeature: Subject<Feature> = new Subject<Feature>(); public clickedFeature: Subject<Feature<Geometry>> = new Subject<Feature<Geometry>>();
public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem); public selectedItem$: Observable<IItem> = this.store.select(mapReducers.selectGetSelectedItem);
public parentItem$: Observable<IItem> =this.store.select(mapReducers.selectGetParentItem); public parentItem$: Observable<IItem> =this.store.select(mapReducers.selectGetParentItem);
public queryState$: Observable<IQueryState> = this.store.select(mapReducers.selectGetQueryState); public queryState$: Observable<IQueryState> = this.store.select(mapReducers.selectGetQueryState);
@ -164,11 +165,11 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit {
this.uploadService.addFiles(droppedFile.files, droppedFile.event, { parentCode:droppedFile.parentCode, geometry:droppedFile.geometry }); this.uploadService.addFiles(droppedFile.files, droppedFile.event, { parentCode:droppedFile.parentCode, geometry:droppedFile.geometry });
} }
handleFeatureClick(feature: Feature) { handleFeatureClick(feature: Feature<Geometry>) {
this.clickedFeature.next(feature); this.clickedFeature.next(feature);
} }
handleFeatureHover(feature: Feature) { handleFeatureHover(feature: Feature<Geometry>) {
this.store.dispatch(new mapActions.SelectFeature(feature)); this.store.dispatch(new mapActions.SelectFeature(feature));
} }

7
projects/common-map/src/fm-map/components/zoom-to-show-alert/zoom-to-show-alert.component.ts
View File

@ -1,14 +1,15 @@
import { Component, Input } from '@angular/core'; import { Component, Input } from '@angular/core';
import { layer } from 'ol'; import { Layer } from 'ol/layer';
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>&nbsp;<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>&nbsp;<span i18n>Zoom in to show layer</span></div>'
}) })
export class ZoomToShowAlert { export class ZoomToShowAlert {
public layer$: layer; public layer$: Layer<Source>;
@Input() @Input()
set layer(layer:layer) { set layer(layer:Layer<Source>) {
this.layer$ = layer; this.layer$ = layer;
} }
} }

10
projects/common-map/src/fm-map/effects/map.effects.ts
View File

@ -11,7 +11,7 @@ import { withLatestFrom, switchMap, map, catchError, mergeMap } from 'rxjs/opera
import {GeoJSON,WKT} from 'ol/format'; import {GeoJSON,WKT} from 'ol/format';
import {Feature} from 'ol'; import {Feature} from 'ol';
import { getCenter,createEmpty,extend } from 'ol/extent'; import { getCenter,createEmpty,extend } from 'ol/extent';
import {Point} from 'ol/geom' import {Point,Geometry} from 'ol/geom'
import * as mapActions from '../actions/map.actions'; import * as mapActions from '../actions/map.actions';
@ -50,7 +50,7 @@ export class MapEffects {
private _wktFormat: WKT; private _wktFormat: WKT;
private overrideSelectedItemLayer: boolean = false; private overrideSelectedItemLayer: boolean = false;
private updateFeatureGeometry(feature:Feature, updateEvent:commonActions.DeviceUpdateEvent): Feature { private updateFeatureGeometry(feature:Feature<Geometry>, updateEvent:commonActions.DeviceUpdateEvent): Feature<Geometry> {
let newFeature = feature.clone(); let newFeature = feature.clone();
var f = this._wktFormat.readFeature(updateEvent.attributes["geometry"],{ var f = this._wktFormat.readFeature(updateEvent.attributes["geometry"],{
dataProjection: 'EPSG:4326', dataProjection: 'EPSG:4326',
@ -153,7 +153,7 @@ export class MapEffects {
if (!action.query.bboxFilter) { if (!action.query.bboxFilter) {
if (extent) { if (extent) {
for (let f of action.features) { for (let f of action.features) {
extend(extent, (f as Feature).getGeometry().getExtent()); extend(extent, (f as Feature<Geometry>).getGeometry().getExtent());
} }
if(action.features && action.features.length >0) { if(action.features && action.features.length >0) {
actions.push(new mapActions.SetExtent(extent)); actions.push(new mapActions.SetExtent(extent));
@ -169,7 +169,7 @@ export class MapEffects {
let extent = createEmpty(); let extent = createEmpty();
if (extent) { if (extent) {
for (let f of action.features) { for (let f of action.features) {
extend(extent, (f as Feature).getGeometry().getExtent()); extend(extent, (f as Feature<Geometry>).getGeometry().getExtent());
} }
if(action.features.length>0) return of(new mapActions.SetExtent(extent)); if(action.features.length>0) return of(new mapActions.SetExtent(extent));
} }
@ -256,7 +256,7 @@ export class MapEffects {
withLatestFrom(this.store$.select(mapReducers.selectGetFeatures)), withLatestFrom(this.store$.select(mapReducers.selectGetFeatures)),
mergeMap(([action, features]) => { mergeMap(([action, features]) => {
let deviceUpdateEventAction = action as commonActions.DeviceUpdateEvent; let deviceUpdateEventAction = action as commonActions.DeviceUpdateEvent;
var feature: Feature = null; var feature: Feature<Geometry> = null;
for (let f of features) { for (let f of features) {
if (f.getId() == deviceUpdateEventAction.itemCode) { if (f.getId() == deviceUpdateEventAction.itemCode) {
feature = f; feature = f;

5
projects/common-map/src/fm-map/models/item.layer.ts
View File

@ -1,9 +1,10 @@
import { IItem,IListItem } from '@farmmaps/common'; import { IItem,IListItem } from '@farmmaps/common';
import {Layer} from 'ol/layer'; import {Layer} from 'ol/layer';
import { Source } from 'ol/source';
export interface IItemLayer { export interface IItemLayer {
item: IItem, item: IItem,
layer: Layer, layer: Layer<Source>,
visible: boolean, visible: boolean,
legendVisible:boolean, legendVisible:boolean,
projection: string, projection: string,
@ -13,7 +14,7 @@ export interface IItemLayer {
export class ItemLayer implements IItemLayer { export class ItemLayer implements IItemLayer {
public item: IItem; public item: IItem;
public layer: Layer = null; public layer: Layer<Source> = null;
public visible: boolean = true; public visible: boolean = true;
public legendVisible: boolean = false; public legendVisible: boolean = false;
public projection: string; public projection: string;

6
projects/common-map/src/fm-map/models/style.cache.ts
View File

@ -1,5 +1,7 @@
import {Style,Feature} from 'ol'; import {Feature} from 'ol';
import { Style } from 'ol/style';
import {Geometry } from 'ol/geom';
export interface IStyles{ export interface IStyles{
[id: string]: Style | (Feature); [id: string]: Style | ((featue:Feature<Geometry>) => Style);
}; };

5
projects/common-map/src/fm-map/reducers/map.reducer.ts
View File

@ -11,6 +11,7 @@ import {commonActions} from '@farmmaps/common';
import { createSelector, createFeatureSelector } from '@ngrx/store'; import { createSelector, createFeatureSelector } from '@ngrx/store';
import {Feature} from 'ol'; import {Feature} from 'ol';
import {Geometry} from 'ol/geom';
import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store'; import { ROUTER_NAVIGATION, RouterNavigationAction } from '@ngrx/router-store';
@ -45,10 +46,10 @@ export interface State {
queryState: IQueryState, queryState: IQueryState,
query:IQuery, query:IQuery,
parentCode: string, parentCode: string,
features: Array<Feature>, features: Array<Feature<Geometry>>,
panelVisible: boolean, panelVisible: boolean,
panelCollapsed: boolean, panelCollapsed: boolean,
selectedFeature: Feature, selectedFeature: Feature<Geometry>,
selectedItem:IItem, selectedItem:IItem,
parentItem:IItem, parentItem:IItem,
clearEnabled: boolean, clearEnabled: boolean,

4
projects/common-map/src/test.ts
View File

@ -1,8 +1,8 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files // This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'core-js/es7/reflect'; import 'core-js/es7/reflect';
import 'zone.js/dist/zone'; import 'zone.js';
import 'zone.js/dist/zone-testing'; import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing'; import { getTestBed } from '@angular/core/testing';
import { import {
BrowserDynamicTestingModule, BrowserDynamicTestingModule,

3
projects/common-map/tsconfig.lib.json
View File

@ -22,8 +22,7 @@
"strictMetadataEmit": true, "strictMetadataEmit": true,
"fullTemplateTypeCheck": true, "fullTemplateTypeCheck": true,
"strictInjectionParameters": true, "strictInjectionParameters": true,
"enableResourceInlining": true, "enableResourceInlining": true
"enableIvy": false
}, },
"exclude": [ "exclude": [
"src/test.ts", "src/test.ts",

40
projects/common-map/tsconfig.lib.prod.json Normal file
View File

@ -0,0 +1,40 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"outDir": "../../out-tsc/lib",
"target": "es2015",
"module": "es2015",
"moduleResolution": "node",
"declaration": true,
"sourceMap": true,
"inlineSources": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"importHelpers": true,
"esModuleInterop": true,
"types": [],
"lib": [
"dom",
"es2018"
],
"paths": {
"@angular/*": [
"node_modules/@angular/*"
]
}
},
"angularCompilerOptions": {
"skipTemplateCodegen": true,
"strictMetadataEmit": true,
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true,
"enableResourceInlining": true,
"compilationMode": "partial"
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
}

12
projects/common-map3d/package.json
View File

@ -1,15 +1,15 @@
{ {
"name": "@farmmaps/common-map3d", "name": "@farmmaps/common-map3d",
"version": "1.0.0", "version": "2.0.0",
"publishConfig": { "publishConfig": {
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/" "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
}, },
"peerDependencies": { "peerDependencies": {
"@angular/common": "^10.1.3", "@angular/common": "~12.2.8",
"@angular/core": "^10.1.3", "@angular/core": "~12.2.8",
"ngx-openlayers": "1.0.0-next.16", "ngx-openlayers": "1.0.0-next.19",
"cesium": "^1.73.0", "cesium": "^1.82.1",
"ol-cesium": "^2.11.3" "ol-cesium": "^2.13.0"
}, },
"dependencies": { "dependencies": {
"tslib": "^2.0.0" "tslib": "^2.0.0"

4
projects/common-map3d/src/test.ts
View File

@ -1,7 +1,7 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files // This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js/dist/zone'; import 'zone.js';
import 'zone.js/dist/zone-testing'; import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing'; import { getTestBed } from '@angular/core/testing';
import { import {
BrowserDynamicTestingModule, BrowserDynamicTestingModule,

3
projects/common-map3d/tsconfig.lib.json
View File

@ -22,8 +22,7 @@
"strictMetadataEmit": true, "strictMetadataEmit": true,
"fullTemplateTypeCheck": true, "fullTemplateTypeCheck": true,
"strictInjectionParameters": true, "strictInjectionParameters": true,
"enableResourceInlining": true, "enableResourceInlining": true
"enableIvy": false
}, },
"exclude": [ "exclude": [
"src/test.ts", "src/test.ts",

40
projects/common-map3d/tsconfig.lib.prod.json
View File

@ -1,10 +1,40 @@
/* To learn more about this file see: https://angular.io/config/tsconfig. */
{ {
"extends": "./tsconfig.lib.json", "extends": "../../tsconfig.json",
"compilerOptions": { "compilerOptions": {
"declarationMap": false "outDir": "../../out-tsc/lib",
"target": "es2015",
"module": "es2015",
"moduleResolution": "node",
"declaration": true,
"sourceMap": true,
"inlineSources": true,
"emitDecoratorMetadata": true,
"experimentalDecorators": true,
"importHelpers": true,
"esModuleInterop": true,
"types": [],
"lib": [
"dom",
"es2018"
],
"paths": {
"@angular/*": [
"node_modules/@angular/*"
]
}
}, },
"angularCompilerOptions": { "angularCompilerOptions": {
"enableIvy": false "skipTemplateCodegen": true,
} "strictMetadataEmit": true,
"fullTemplateTypeCheck": true,
"strictInjectionParameters": true,
"enableResourceInlining": true,
"compilationMode": "partial"
},
"exclude": [
"src/test.ts",
"**/*.spec.ts"
]
} }

2
projects/common/ng-package.json
View File

@ -7,7 +7,7 @@
"my-data": "my-data" "my-data": "my-data"
} }
}, },
"whitelistedNonPeerDependencies": [ "allowedNonPeerDependencies": [
"." "."
] ]
} }

16
projects/common/package.json
View File

@ -1,22 +1,22 @@
{ {
"name": "@farmmaps/common", "name": "@farmmaps/common",
"version": "1.0.0", "version": "2.0.0",
"publishConfig": { "publishConfig": {
"registry": "https://repository.akkerweb.nl/repository/npm-hosted/" "registry": "https://repository.akkerweb.nl/repository/npm-hosted/"
}, },
"peerDependencies": { "peerDependencies": {
"@ng-bootstrap/ng-bootstrap": "^7.0", "@ng-bootstrap/ng-bootstrap": "^7.0",
"@angular/common": "~10.2.4", "@angular/common": "~12.2.8",
"@angular/core": "~10.2.4", "@angular/core": "~12.2.8",
"@angular/forms": "~10.2.4", "@angular/forms": "~12.2.8",
"@ngrx/effects": "^10.0", "@ngrx/effects": "^12.0",
"@ngrx/router-store": "^10.0", "@ngrx/router-store": "^12.0",
"@ngrx/store": "^10.0", "@ngrx/store": "^12.0",
"tassign": "^1.0.0", "tassign": "^1.0.0",
"bootstrap": "^4.4.1", "bootstrap": "^4.4.1",
"@microsoft/signalr": "^3.1.3", "@microsoft/signalr": "^3.1.3",
"ngx-uploadx": "^3.3.4", "ngx-uploadx": "^3.3.4",
"angular-oauth2-oidc": "^10.0.3", "angular-oauth2-oidc": "^12.0",
"moment": "^2.27.0", "moment": "^2.27.0",
"ngx-avatar": "^4.0.0", "ngx-avatar": "^4.0.0",
"ngx-image-cropper": "^3.3.5", "ngx-image-cropper": "^3.3.5",

4
projects/common/src/fm/common.module.ts
View File

@ -110,7 +110,9 @@ export {
IGradientstop, IGradientstop,
BackButtonComponent, BackButtonComponent,
AvatarComponent, AvatarComponent,
EditImageModalComponent EditImageModalComponent,
GradientComponent,
GradientSelectComponent
}; };
@NgModule({ @NgModule({

1
projects/common/src/fm/components/avatar/avatar.component.ts
View File

@ -40,6 +40,7 @@ export class AvatarComponent implements OnInit {
refresh(user: IUser) { refresh(user: IUser) {
if (!user) return null; if (!user) return null;
debugger;
const apiEndpoint = this.appConfig.getConfig("apiEndPoint"); const apiEndpoint = this.appConfig.getConfig("apiEndPoint");
this.src = `${apiEndpoint}/api/v1/users/${user.code}/avatar`; this.src = `${apiEndpoint}/api/v1/users/${user.code}/avatar`;
this.name = user.firstName && user.lastName ? this.name = user.firstName && user.lastName ?

23
projects/common/src/fm/reducers/app-common.reducer.ts
View File

@ -8,7 +8,7 @@ import { createSelector, createFeatureSelector, ActionReducerMap } from '@ngrx/s
import { MODULE_NAME } from '../module-name'; import { MODULE_NAME } from '../module-name';
import { IItem } from '../models/item'; import { IItem } from '../models/item';
import {getValidPackages, isValidPackage} from '../services/package.service'; import { userInfo } from 'os';
export interface State { export interface State {
openedModalName: string, openedModalName: string,
@ -58,16 +58,16 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
case appCommonActions.INITUSERSUCCESS: { case appCommonActions.INITUSERSUCCESS: {
let a = action as appCommonActions.InitUserSuccess; let a = action as appCommonActions.InitUserSuccess;
let claims = {} let claims = {}
Object.getOwnPropertyNames(a.userinfo).forEach((k) => { Object.getOwnPropertyNames(a.userinfo.info).forEach((k) => {
claims[k] = a.userinfo[k]; claims[k] = a.userinfo[k];
}); });
var user:IUser = { var user:IUser = {
code:a.user.code, code:a.user.code,
email:a.userinfo["email"], email:a.user?.name?a.user.name : claims["email"],
name:a.userinfo["name"], name:a.user?.email?a.user.email : claims["name"],
claims:claims, claims:claims,
searchable: false searchable: false
}; };
return tassign(state, { user: user }); return tassign(state, { user: user });
} }
case appCommonActions.INITROOTSUCCESS: { case appCommonActions.INITROOTSUCCESS: {
@ -76,10 +76,10 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
} }
case appCommonActions.OPENMODAL: { case appCommonActions.OPENMODAL: {
return tassign(state, { openedModalName: action.modalName }); return tassign(state, { openedModalName: action.modalName });
} }
case appCommonActions.CLOSEMODAL: { case appCommonActions.CLOSEMODAL: {
return tassign(state, { openedModalName: null }); return tassign(state, { openedModalName: null });
} }
case appCommonActions.LOADITEMTYPESSUCCESS: { case appCommonActions.LOADITEMTYPESSUCCESS: {
let a = action as appCommonActions.LoadItemTypesSuccess; let a = action as appCommonActions.LoadItemTypesSuccess;
return tassign(state, { itemTypes: a.itemTypes }); return tassign(state, { itemTypes: a.itemTypes });
@ -132,10 +132,7 @@ export function reducer(state = initialState, action: appCommonActions.Actions )
a.items.forEach((item) => { a.items.forEach((item) => {
item.data.dataDate = item.dataDate; item.data.dataDate = item.dataDate;
item.data.dataEndDate = item.dataEndDate; item.data.dataEndDate = item.dataEndDate;
if (!packages[item.data.id]) { packages[item.data.id]=item.data;
packages[item.data.id] = [];
}
packages[item.data.id].push(item.data);
}); });
return tassign(state,{userPackages:packages}); return tassign(state,{userPackages:packages});
@ -207,9 +204,6 @@ export const selectGetRouteLoading = createSelector(selectAppCommonState, getRou
export const SelectGetMenuVisible = createSelector(selectAppCommonState,getMenuVisible); export const SelectGetMenuVisible = createSelector(selectAppCommonState,getMenuVisible);
export const SelectGetUser = createSelector(selectAppCommonState,getUser); export const SelectGetUser = createSelector(selectAppCommonState,getUser);
export const SelectGetUserPackages = createSelector(selectAppCommonState,getUserPackages); export const SelectGetUserPackages = createSelector(selectAppCommonState,getUserPackages);
export const SelectGetValidUserPackages = createSelector(SelectGetUserPackages, (packageMap) => {
return getValidPackages(packageMap);
});
export const SelectGetUserSettingsRoot = createSelector(selectAppCommonState,getUserSettingsRoot); export const SelectGetUserSettingsRoot = createSelector(selectAppCommonState,getUserSettingsRoot);
export const SelectGetAccountMenuVisible = createSelector(selectAppCommonState,getAccountMenuVisible); export const SelectGetAccountMenuVisible = createSelector(selectAppCommonState,getAccountMenuVisible);
export const SelectGetAppMenuVisible = createSelector(selectAppCommonState,getAppMenuVisible); export const SelectGetAppMenuVisible = createSelector(selectAppCommonState,getAppMenuVisible);
@ -220,4 +214,3 @@ 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);

16
projects/common/src/fm/services/weather.service.ts
View File

@ -49,6 +49,22 @@ export class WeatherService {
return this.getWeatherRange(centroid, startDateString, endDateString); return this.getWeatherRange(centroid, startDateString, endDateString);
} }
public getDailyHistoricalObservations(centroid: number[], startDate: string, endDate: string): Observable<HourlyWeatherData[]> {
const endpoint = this.appConfig.getConfig('weatherApiEndPoint');
const apiKey = this.appConfig.getConfig('weatherApiKey');
// weather does not support UTC format, also remove Z
const sd = encodeURIComponent(startDate);
const edHistoricalDate = new Date();
edHistoricalDate.setHours(edHistoricalDate.getHours(), 0, 0, 0);
const edHistorical = moment(edHistoricalDate).local().format('YYYY-MM-DD[T]HH:mm:ss');
const historical = `${endpoint}${this.apiObservation}/?c=${centroid[0]},${centroid[1]}&sd=${sd}&ed=${edHistorical}&t=cleanedobservation&interval=daily&key=${apiKey}`;
return this.httpClient.get<any[]>(historical);
}
public getWeatherRange(centroid: number[], startDate: string, endDate: string): Observable<HourlyWeatherData[]> { public getWeatherRange(centroid: number[], startDate: string, endDate: string): Observable<HourlyWeatherData[]> {
const endpoint = this.appConfig.getConfig('weatherApiEndPoint'); const endpoint = this.appConfig.getConfig('weatherApiEndPoint');
const apiKey = this.appConfig.getConfig('weatherApiKey'); const apiKey = this.appConfig.getConfig('weatherApiKey');

4
projects/common/src/test.ts
View File

@ -1,8 +1,8 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files // This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'core-js/es7/reflect'; import 'core-js/es7/reflect';
import 'zone.js/dist/zone'; import 'zone.js';
import 'zone.js/dist/zone-testing'; import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing'; import { getTestBed } from '@angular/core/testing';
import { import {
BrowserDynamicTestingModule, BrowserDynamicTestingModule,

3
projects/common/tsconfig.lib.json
View File

@ -30,8 +30,7 @@
"strictMetadataEmit": true, "strictMetadataEmit": true,
"fullTemplateTypeCheck": true, "fullTemplateTypeCheck": true,
"strictInjectionParameters": true, "strictInjectionParameters": true,
"enableResourceInlining": true, "enableResourceInlining": true
"enableIvy": false
}, },
"exclude": [ "exclude": [
"src/test.ts", "src/test.ts",

2
projects/common/tsconfig.lib.prod.json
View File

@ -31,7 +31,7 @@
"fullTemplateTypeCheck": true, "fullTemplateTypeCheck": true,
"strictInjectionParameters": true, "strictInjectionParameters": true,
"enableResourceInlining": true, "enableResourceInlining": true,
"enableIvy": false "compilationMode": "partial"
}, },
"exclude": [ "exclude": [
"src/test.ts", "src/test.ts",

2
src/configuration.json
View File

@ -1,7 +1,7 @@
{ {
"issuer": "http://localhost:8094", "issuer": "http://localhost:8094",
"clientId": "farmmapsdev", "clientId": "farmmapsdev",
"audience": "http://localhost:8082/", "audience": "http://localhost:8082",
"requireHttps": false, "requireHttps": false,
"apiEndPoint": "http://localhost:8082", "apiEndPoint": "http://localhost:8082",
"grantType":"code" "grantType":"code"

32
src/environments/environment.ts
View File

@ -1,16 +1,16 @@
// This file can be replaced during build by using the `fileReplacements` array. // This file can be replaced during build by using the `fileReplacements` array.
// `ng build --prod` replaces `environment.ts` with `environment.prod.ts`. // `ng build --prod` replaces `environment.ts` with `environment.prod.ts`.
// The list of file replacements can be found in `angular.json`. // The list of file replacements can be found in `angular.json`.
export const environment = { export const environment = {
production: false production: false
}; };
/* /*
* For easier debugging in development mode, you can import the following file * For easier debugging in development mode, you can import the following file
* to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`. * to ignore zone related error stack frames such as `zone.run`, `zoneDelegate.invokeTask`.
* *
* This import should be commented out in production mode because it will have a negative impact * This import should be commented out in production mode because it will have a negative impact
* on performance if an error is thrown. * on performance if an error is thrown.
*/ */
// import 'zone.js/dist/zone-error'; // Included with Angular CLI. // import 'zone.js/plugins/zone-error'; // Included with Angular CLI.

3
src/polyfills.ts
View File

@ -55,7 +55,8 @@
/*************************************************************************************************** /***************************************************************************************************
* Zone JS is required by default for Angular itself. * Zone JS is required by default for Angular itself.
*/ */
import 'zone.js/dist/zone'; // Included with Angular CLI. import 'zone.js'; // Included with Angular CLI.
import '@angular/localize/init';
/*************************************************************************************************** /***************************************************************************************************

40
src/test.ts
View File

@ -1,20 +1,20 @@
// This file is required by karma.conf.js and loads recursively all the .spec and framework files // This file is required by karma.conf.js and loads recursively all the .spec and framework files
import 'zone.js/dist/zone-testing'; import 'zone.js/testing';
import { getTestBed } from '@angular/core/testing'; import { getTestBed } from '@angular/core/testing';
import { import {
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting platformBrowserDynamicTesting
} from '@angular/platform-browser-dynamic/testing'; } from '@angular/platform-browser-dynamic/testing';
declare const require: any; declare const require: any;
// First, initialize the Angular testing environment. // First, initialize the Angular testing environment.
getTestBed().initTestEnvironment( getTestBed().initTestEnvironment(
BrowserDynamicTestingModule, BrowserDynamicTestingModule,
platformBrowserDynamicTesting() platformBrowserDynamicTesting()
); );
// Then we find all the tests. // Then we find all the tests.
const context = require.context('./', true, /\.spec\.ts$/); const context = require.context('./', true, /\.spec\.ts$/);
// And load the modules. // And load the modules.
context.keys().map(context); context.keys().map(context);

5
src/tsconfig.app.json
View File

@ -10,8 +10,5 @@
], ],
"include": [ "include": [
"src/**/*.d.ts" "src/**/*.d.ts"
], ]
"angularCompilerOptions": {
"enableIvy": false
}
} }

1
tsconfig.json
View File

@ -12,6 +12,7 @@
"experimentalDecorators": true, "experimentalDecorators": true,
"allowSyntheticDefaultImports": true, "allowSyntheticDefaultImports": true,
"importHelpers": true, "importHelpers": true,
"skipLibCheck": true,
"target": "es2015", "target": "es2015",
"typeRoots": [ "typeRoots": [
"node_modules/@types" "node_modules/@types"