From 6555e68145379cf72e38878238bf78f0edb11665 Mon Sep 17 00:00:00 2001 From: Peter Bastiani Date: Mon, 6 Mar 2023 14:04:14 +0100 Subject: [PATCH] Aw4751 eslint fixes --- .../src/fm-map/common-map.module.ts | 6 +- .../file-drop-target.component.ts | 16 +- .../gps-location/gps-location.component.ts | 34 ++-- .../aol/item-layers/item-layers.component.ts | 150 ++++++++-------- .../item-vector-source.component.ts | 32 ++-- .../aol/layer-list/layer-list.component.ts | 4 +- .../layer-values/layer-values.component.ts | 10 +- .../pan-to-location.component.ts | 34 ++-- .../rotation-reset.component.ts | 2 +- .../zoom-to-extent.component.ts | 28 +-- .../feature-list-container.component.ts | 2 +- .../feature-list-croppingscheme.component.ts | 2 +- ...eature-list-feature-container.component.ts | 2 +- ...eature-list-feature-cropfield.component.ts | 2 +- .../feature-list/feature-list.component.ts | 4 +- .../feature-thumbnail.component.ts | 14 +- .../if-zoom-to-show.directive.ts | 6 +- .../item-list-item-container.component.ts | 4 +- .../item-list-item.component.ts | 4 +- .../item-list/item-list.component.ts | 2 +- .../item-widget-list.component.ts | 6 +- .../layer-switcher.component.ts | 2 +- .../components/legend/legend.component.ts | 14 +- .../map-search/map-search.component.ts | 8 +- .../fm-map/components/map/map.component.ts | 98 +++++------ .../meta-data-modal.component.ts | 4 +- .../select-period-modal.component.ts | 8 +- .../selected-item-container.component.ts | 2 +- .../selected-item-cropfield.component.ts | 18 +- .../selected-item-shape.component.ts | 2 +- .../selected-item-temporal.component.ts | 2 +- .../selected-item/selected-item.component.ts | 20 +-- .../src/fm-map/effects/map.effects.ts | 66 +++---- .../src/fm-map/models/item.layer.ts | 12 +- .../src/fm-map/models/style.cache.ts | 2 +- .../src/fm-map/reducers/map.reducer.ts | 148 ++++++++-------- .../services/device-orientation.service.ts | 28 +-- .../fm-map/services/feature-icon.service.ts | 16 +- .../src/fm-map/services/temporal.service.ts | 28 +-- .../olcs/switch2d3d/switch2d3d.component.ts | 4 +- .../components/app-menu/app-menu.component.ts | 2 +- .../src/fm/components/app/app.component.ts | 20 +-- .../fm/components/avatar/avatar.component.ts | 4 +- .../edit-image-modal.component.ts | 14 +- .../gradient-select.component.ts | 10 +- .../components/gradient/gradient.component.ts | 4 +- .../components/has-role/has-role.directive.ts | 2 +- .../help-menu/help-menu.component.ts | 2 +- .../menu-background.component.ts | 2 +- .../notification-menu.component.ts | 2 +- .../resumable-file-upload.service.ts | 26 +-- .../side-panel/side-panel.component.ts | 22 +-- .../thumbnail/thumbnail.component.ts | 6 +- .../components/timespan/timespan.component.ts | 162 +++++++++--------- .../src/fm/effects/app-common.effects.ts | 24 +-- projects/common/src/fm/models/item.types.ts | 2 +- .../src/fm/reducers/app-common.reducer.ts | 28 +-- .../common/src/fm/services/admin.service.ts | 2 +- .../src/fm/services/auth-guard.service.ts | 4 +- .../common/src/fm/services/device.service.ts | 4 +- .../common/src/fm/services/event.service.ts | 4 +- .../src/fm/services/gradient.service.ts | 6 +- .../src/fm/services/healthcheck.service.ts | 2 +- .../common/src/fm/services/image.service.ts | 6 +- .../common/src/fm/services/item.service.ts | 36 ++-- .../src/fm/services/itemtype.service.ts | 16 +- .../common/src/fm/services/senml-service.ts | 6 +- .../fm/services/state-serializer.service.ts | 6 +- .../src/fm/services/timespan.service.ts | 14 +- .../src/fm/services/typeahead.service.ts | 6 +- .../src/fm/shared/accesstoken.interceptor.ts | 4 +- projects/common/src/fm/shared/app.config.ts | 4 +- .../common/src/fm/shared/authconfigFactory.ts | 2 +- .../src/fm/shared/secureOAuthStorage.ts | 2 +- src/app/id4AuthconfigFactory.ts | 2 +- src/app/localAuthconfigFactory.ts | 2 +- src/app/menu/menu.component.ts | 2 +- src/app/test/test.component.ts | 2 +- 78 files changed, 655 insertions(+), 655 deletions(-) diff --git a/projects/common-map/src/fm-map/common-map.module.ts b/projects/common-map/src/fm-map/common-map.module.ts index 7302693..d3b0dee 100644 --- a/projects/common-map/src/fm-map/common-map.module.ts +++ b/projects/common-map/src/fm-map/common-map.module.ts @@ -79,13 +79,13 @@ export function LocalStorageSync(reducer: ActionReducer): ActionReducer { this.stopEvent(event); - let geojsonFormat = new GeoJSON(); - var parentCode = this.parentCode; - var coordinate = this.map.instance.getEventCoordinate(event); + const geojsonFormat = new GeoJSON(); + let parentCode = this.parentCode; + const coordinate = this.map.instance.getEventCoordinate(event); //coordinate = proj.transform(coordinate, this.map.instance.getView().getProjection(), 'EPSG:4326'); - var geometry:Geometry = new Point(coordinate); - var hitFeatures = this.map.instance.getFeaturesAtPixel([event.pageX, event.pageY]); - var hitFeature = hitFeatures && hitFeatures.length > 0 ? hitFeatures[0] : null; + let geometry:Geometry = new Point(coordinate); + const hitFeatures = this.map.instance.getFeaturesAtPixel([event.pageX, event.pageY]); + const hitFeature = hitFeatures && hitFeatures.length > 0 ? hitFeatures[0] : null; if (hitFeature) { if (hitFeature.get("code")) { parentCode = hitFeature.get("code"); } geometry = geojsonFormat.readGeometry(geojsonFormat.writeGeometry(geometry)); // create copy instead of reference } - var projectedGeometry = geometry.transform(this.map.instance.getView().getProjection(), 'EPSG:4326'); + const projectedGeometry = geometry.transform(this.map.instance.getView().getProjection(), 'EPSG:4326'); if (event.dataTransfer && event.dataTransfer.files) { this.onFileDropped.emit({ files: event.dataTransfer.files, event: event, geometry: JSON.parse(geojsonFormat.writeGeometry(projectedGeometry)),parentCode:parentCode}) diff --git a/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts b/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts index 4230817..cd74db8 100644 --- a/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts +++ b/projects/common-map/src/fm-map/components/aol/gps-location/gps-location.component.ts @@ -15,16 +15,16 @@ export class GpsLocation implements OnInit,OnChanges{ public instance: Overlay; @Input() position: GeolocationPosition; @Input() location: number[]=[0,0]; - @Input() locationTolerance: number = 0; - @Input() showHeading: boolean = false; - @Input() showTolerance: boolean = false; - @Input() heading: number = 0; - @Input() headingTolerance: number = 0; - public locTolerancePixels: number = 0; - public path: string = ""; - public rotate: string = ""; - private resolution: number = 0; - initialized:boolean = false; + @Input() locationTolerance = 0; + @Input() showHeading = false; + @Input() showTolerance = false; + @Input() heading = 0; + @Input() headingTolerance = 0; + public locTolerancePixels = 0; + public path = ""; + public rotate = ""; + private resolution = 0; + initialized = false; @ViewChild('location', { static: true }) locationElement: ElementRef; constructor(private map: MapComponent) { @@ -42,12 +42,12 @@ export class GpsLocation implements OnInit,OnChanges{ position: fromLonLat( this.location), element: this.locationElement.nativeElement }); - var x = Math.tan(this.headingTolerance * Math.PI / 180)*40; - var y = Math.cos(this.headingTolerance * Math.PI / 180) * 40; - var y1 = Math.round(500 - y); - var x1 = Math.round(500 - x); - var y2 = Math.round(y1); - var x2 = Math.round(500 + x); + const x = Math.tan(this.headingTolerance * Math.PI / 180)*40; + const y = Math.cos(this.headingTolerance * Math.PI / 180) * 40; + const y1 = Math.round(500 - y); + const x1 = Math.round(500 - x); + const y2 = Math.round(y1); + const x2 = Math.round(500 + x); this.path = "M " + x2 + " " + y2 + " A 45 45,0,0,0, " + x1 + " " + y1 + " L 493 500 L 507 500 Z"; this.rotate = "rotate(" + Math.round(this.heading) + " 500 500)"; this.locTolerancePixels = this.locationTolerance; @@ -61,7 +61,7 @@ export class GpsLocation implements OnInit,OnChanges{ ngOnChanges(changes: SimpleChanges) { if (changes.position && this.instance) { - var p = changes.position.currentValue as GeolocationPosition; + const p = changes.position.currentValue as GeolocationPosition; if(p && this.initialized) { this.instance.setPosition(fromLonLat([p.coords.longitude, p.coords.latitude])); this.locationTolerance = p.coords.accuracy; diff --git a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts b/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts index 0e2e1e7..efe5eb3 100644 --- a/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts +++ b/projects/common-map/src/fm-map/components/aol/item-layers/item-layers.component.ts @@ -35,7 +35,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange @Output() onFeatureHover: EventEmitter = new EventEmitter(); @Output() onPrerender: EventEmitter = new EventEmitter(); private _apiEndPoint: string; - private initialized:boolean = false; + private initialized = false; private mapEventHandlerInstalled = false; private topLayerPrerenderEventhandlerInstalled = false; private selectedFeatures = {}; @@ -49,7 +49,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange private styleCache = {} componentToHex(c) { - var hex = c.toString(16); + const hex = c.toString(16); return hex.length == 1 ? "0" + hex : hex; } @@ -58,28 +58,28 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange } getColorFromGradient(layer: ILayer, value: number): IColor { - var gradient: IGradientstop[] = layer.renderer.colorMap.gradient; - var histogram: IHistogram = layer.renderer.band.histogram; - var index = (value - histogram.min) / histogram.max; - var min = gradient[0]; - var max = gradient[gradient.length - 1]; - for (var n = 0; n < gradient.length; n++) { - var s = gradient[n]; + const gradient: IGradientstop[] = layer.renderer.colorMap.gradient; + const histogram: IHistogram = layer.renderer.band.histogram; + const index = (value - histogram.min) / histogram.max; + let min = gradient[0]; + let max = gradient[gradient.length - 1]; + for (let n = 0; n < gradient.length; n++) { + const s = gradient[n]; if (s.relativestop <= index && min.relativestop < s.relativestop && n < gradient.length - 1) min = s; if (s.relativestop >= index && max.relativestop > s.relativestop && n > 0) max = s; } - var i = index - min.relativestop; - var size = max.relativestop - min.relativestop; - var alpha = Math.round(min.color.alpha + ((max.color.alpha - min.color.alpha) * i / size)); - var red = Math.round(min.color.red + ((max.color.red - min.color.red) * i / size)); - var green = Math.round(min.color.green + ((max.color.green - min.color.green) * i / size)); - var blue = Math.round(min.color.blue + ((max.color.blue - min.color.blue) * i / size)); + const i = index - min.relativestop; + const size = max.relativestop - min.relativestop; + const alpha = Math.round(min.color.alpha + ((max.color.alpha - min.color.alpha) * i / size)); + const red = Math.round(min.color.red + ((max.color.red - min.color.red) * i / size)); + const green = Math.round(min.color.green + ((max.color.green - min.color.green) * i / size)); + const blue = Math.round(min.color.blue + ((max.color.blue - min.color.blue) * i / size)); return { alpha: alpha, red: red, green: green, blue: blue }; } getColorForValue(layer: ILayer, value: number): IColor { - var color: IColor = { alpha:0,red:0,green:0,blue:0}; + let color: IColor = { alpha:0,red:0,green:0,blue:0}; if(layer.renderer.colorMap.entries.length>0) { color=layer.renderer.colorMap.noValue; } @@ -94,10 +94,10 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange } getColor(item: IItem, layer: ILayer, feature): style.Style { - var value = layer.indexKey ? feature.get(layer.indexKey) : feature.get(layer.name); - var key = item.code + "_" + value; + const value = layer.indexKey ? feature.get(layer.indexKey) : feature.get(layer.name); + const key = item.code + "_" + value; if (!this.styleCache[key]) { - var color: IColor; + let color: IColor; if(layer.renderer.colorMap.colormapType == "manual") { color = this.getColorForValue(layer, value); } else { @@ -125,32 +125,32 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange } createGeotiffLayer(item:IItem,itemLayer:IItemLayer):Layer { - var layerIndex = -1; - var layer: Layer = null; + let layerIndex = -1; + let layer: Layer = null; 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)}` }); + const 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 }); - var data = item.data; - var l = (data && data.layers && data.layers.length > 0) ? data.layers[0] : null; + const data = item.data; + const l = (data && data.layers && data.layers.length > 0) ? data.layers[0] : null; if (l && l.rendering && l.rendering.renderoutputType == "Tiles") { - var rt = l.rendering as IRenderoutputTiles; - let source = new XYZ({crossOrigin: 'use-credentials', maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` }); + const rt = l.rendering as IRenderoutputTiles; + const source = new XYZ({crossOrigin: 'use-credentials', maxZoom: rt.maxzoom, minZoom: rt.minzoom, url: `${this._apiEndPoint}/api/v1/items/${item.code}/tiles/${layerIndex}/{z}/{x}/{y}.png?v=${Date.parse(item.updated)}` }); layer = new Tile({ source: source }); } if (l && l.rendering && l.rendering.renderoutputType == "Image") { - var ri = l.rendering as IRenderoutputImage; - let source = new ImageStatic({ imageExtent:ri.extent,projection:'EPSG:3857', crossOrigin: 'use-credentials', url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${Date.parse(item.updated)}` }); + const ri = l.rendering as IRenderoutputImage; + const source = new ImageStatic({ imageExtent:ri.extent,projection:'EPSG:3857', crossOrigin: 'use-credentials', url: `${this._apiEndPoint}/api/v1/items/${item.code}/mapimage/${layerIndex}?v=${Date.parse(item.updated)}` }); layer = new Image({ source: source }); } return layer; } createShapeLayer(item:IItem,itemLayer:IItemLayer):Layer { - var layerIndex = -1; - var layer: Layer = null; + let layerIndex = -1; + let layer: Layer = null; layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : item.data.layers[0].index; - var data = item.data; - var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null; + const data = item.data; + const l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null; if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") { var rt = l.rendering as IRenderoutputTiles; layer = new VectorTileLayer({ @@ -175,15 +175,15 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange }) }); } else { - let __this = this; - let format = new GeoJSON(); - let source = new VectorSource({ + const __this = this; + const format = new GeoJSON(); + const source = new VectorSource({ strategy: loadingstrategy.bbox, loader: function (extent: Extent, resolution: number, projection: Projection) { - var source = this as VectorSource; + const source = this as VectorSource; __this.itemService.getItemFeatures(item.code, extent, projection.getCode(), layerIndex).subscribe(function (data) { - var features = format.readFeatures(data); - for (let f of features) { + const features = format.readFeatures(data); + for (const f of features) { if (f.get("code")) { f.setId(f.get("code")); } @@ -196,9 +196,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange declutter: true, source: source, style: (feature) => { - var key =feature.get("code") + "_" + feature.get("color"); + const key =feature.get("code") + "_" + feature.get("color"); if (!this.styleCache[key]) { - var color = feature.get("color"); + const color = feature.get("color"); this.styleCache[key] = new style.Style( { fill: new style.Fill({ @@ -235,11 +235,11 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange } createSelectionLayer(itemLayer:IItemLayer):Layer { - var layerIndex = -1; - var layer: Layer = null; + let layerIndex = -1; + const layer: Layer = null; layerIndex = itemLayer.layerIndex != -1 ? itemLayer.layerIndex : itemLayer.item.data.layers[0].index; - var data = itemLayer.item.data; - var l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null; + const data = itemLayer.item.data; + const l:ILayer = (data && data.layers && data.layers.length > 0) ? data.layers[layerIndex] : null; if (l && l.rendering && l.rendering.renderoutputType == "VectorTiles") { return new VectorTileLayer({ renderMode: 'vector', @@ -265,36 +265,36 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange } createExternalLayer(item:IItem,itemLayer:IItemLayer):Layer { - let data = item.data as ILayerData; - var layer: Layer = null; + const data = item.data as ILayerData; + let layer: Layer = null; switch (data.interfaceType) { case 'OSM': { - let source = new OSM(); + const source = new OSM(); layer = new Tile({ source: source }); break; } case 'BingMaps': { - let source = new BingMaps(data.options); + const source = new BingMaps(data.options); layer = new Tile({ source: source }); break; } case 'TileWMS': { - let source = new TileWMS(data.options); + const source = new TileWMS(data.options); layer = new Tile({ source: source }); break; } case 'TileJSON': { - let source = new TileJSON(data.options); + const source = new TileJSON(data.options); layer = new Tile({ source: source }); break; } case 'TileArcGISRest': { - let source = new TileArcGISRest(data.options); + const source = new TileArcGISRest(data.options); layer = new Tile({ source: source }); break; } case 'VectorWFSJson': { - let source = new VectorSource({ + const source = new VectorSource({ format: new GeoJSON(), url: function (extent) { return ( @@ -317,8 +317,8 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange } createLayer(itemLayer: IItemLayer): Layer { - var layer: Layer = null; - var layerIndex = -1; + let layer: Layer = null; + const layerIndex = -1; if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.geotiff.processed') { layer = this.createGeotiffLayer(itemLayer.item,itemLayer); } else if (itemLayer.item.itemType == 'vnd.farmmaps.itemtype.shape.processed') { @@ -327,8 +327,8 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange layer = this.createExternalLayer(itemLayer.item,itemLayer); } if (layer) { - let geometry = new GeoJSON().readGeometry(itemLayer.item.geometry); - let extent = geometry ? proj.transformExtent(geometry.getExtent(), 'EPSG:4326', 'EPSG:3857') : null; + const geometry = new GeoJSON().readGeometry(itemLayer.item.geometry); + const extent = geometry ? proj.transformExtent(geometry.getExtent(), 'EPSG:4326', 'EPSG:3857') : null; if (extent) layer.setExtent(extent); } @@ -378,7 +378,7 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange if(this.topLayerPrerenderEventhandlerInstalled && this.onPrerender.observers.length > 0 ) { if(this.instance.getVisible()) { - var olLayers = this.instance.getLayers().getArray().forEach((l:any) => { + const olLayers = this.instance.getLayers().getArray().forEach((l:any) => { l.un('prerender',this.topLayerPrerenderEventhandler); l.un('postrender',this.topLayerPostrenderEventhandler); }); @@ -390,9 +390,9 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange addOrUpdateOlLayer(itemLayer:IItemLayer,index:number):Layer { if(!itemLayer) return null; - var olLayers = this.instance.getLayers(); - var layer = itemLayer.layer; - let olIndex = olLayers.getArray().indexOf(layer); + const olLayers = this.instance.getLayers(); + let layer = itemLayer.layer; + const olIndex = olLayers.getArray().indexOf(layer); if (olIndex < 0) { // New layer: we add it to the map layer = this.createLayer(itemLayer); @@ -415,33 +415,33 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange updateLayers(itemLayers: IItemLayer[] | IItemLayer) { this.unInstallTopLayerPrerenderEventhandler(); let dataLayer = false; - var ils:IItemLayer[] = []; + let ils:IItemLayer[] = []; if(Array.isArray(itemLayers)) { ils = itemLayers; } else { dataLayer=true; ils=[itemLayers]; } - let newLayers: Layer[] = []; + const newLayers: Layer[] = []; if (ils) { ils.forEach((itemLayer, index) => { if(itemLayer.item.itemType == 'vnd.farmmaps.itemtype.temporal') { - let il = itemLayer as ITemporalItemLayer; - let previousLayer = this.addOrUpdateOlLayer(il.previousItemLayer,newLayers.length); + const il = itemLayer as ITemporalItemLayer; + const previousLayer = this.addOrUpdateOlLayer(il.previousItemLayer,newLayers.length); if(previousLayer) newLayers.push(previousLayer); - let selectedLayer = this.addOrUpdateOlLayer(il.selectedItemLayer,newLayers.length); + const selectedLayer = this.addOrUpdateOlLayer(il.selectedItemLayer,newLayers.length); if(selectedLayer) newLayers.push(selectedLayer); - let nextLayer = this.addOrUpdateOlLayer(il.nextItemLayer,newLayers.length); + const nextLayer = this.addOrUpdateOlLayer(il.nextItemLayer,newLayers.length); if(nextLayer) newLayers.push(nextLayer); this.installTopLayerPrerenderEventhandler(selectedLayer); } else { - let layer = this.addOrUpdateOlLayer(itemLayer,newLayers.length); + const layer = this.addOrUpdateOlLayer(itemLayer,newLayers.length); if(layer) newLayers.push(layer); this.installTopLayerPrerenderEventhandler(layer); } }); // Remove the layers that have disapeared from childrenLayers - var olLayers = this.instance.getLayers(); + const olLayers = this.instance.getLayers(); while(olLayers.getLength() > newLayers.length) { olLayers.removeAt(newLayers.length); } @@ -467,20 +467,20 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange // select only when having observers if(event.type === 'click' && !this.onFeatureSelected.observers.length) return; if(event.type === 'pointermove' && !this.onFeatureHover.observers.length) return; - let itemLayer= this.getItemlayer(this.itemLayer); + const itemLayer= this.getItemlayer(this.itemLayer); if(itemLayer && itemLayer.layer) { this.selectedFeatures = {}; if(itemLayer.layer ) { - let minZoom = itemLayer.layer.getMinZoom(); - let currentZoom = this.map.instance.getView().getZoom(); + const minZoom = itemLayer.layer.getMinZoom(); + const currentZoom = this.map.instance.getView().getZoom(); if(currentZoom>minZoom) { itemLayer.layer.getFeatures(event.pixel).then((features) => { if(!features.length) { this.onFeatureHover.emit(null); return; } - let fid = features[0].getId(); - let feature = features[0]; + const fid = features[0].getId(); + const feature = features[0]; if(event.type === 'pointermove') { this.selectedFeatures[fid] = features[0]; this.onFeatureHover.emit({ "feature": feature,"itemCode":itemLayer.item.code }); @@ -502,11 +502,11 @@ export class ItemLayersComponent extends LayerGroupComponent implements OnChange ngOnChanges(changes: SimpleChanges) { if (this.instance && this.initialized) { if (changes['itemLayers']) { - var itemLayers = changes['itemLayers'].currentValue as IItemLayer[]; + const itemLayers = changes['itemLayers'].currentValue as IItemLayer[]; this.updateLayers(itemLayers); } if (changes['itemLayer']) { - var itemLayer = changes['itemLayer'].currentValue as IItemLayer; + const itemLayer = changes['itemLayer'].currentValue as IItemLayer; this.itemLayer = itemLayer if(itemLayer) { if(this.getItemlayer(this.itemLayer).item.itemType == 'vnd.farmmaps.itemtype.shape.processed') { diff --git a/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts b/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts index f23c652..02d60f9 100644 --- a/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts +++ b/projects/common-map/src/fm-map/components/aol/item-vector-source/item-vector-source.component.ts @@ -30,7 +30,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements private _format: GeoJSON; private _select: Select; private _hoverSelect: Select; - private _iconScale: number = 0.05; + private _iconScale = 0.05; @Input() features: Array>; @Input() selectedFeature: Feature; @Input() selectedItem: IItem; @@ -45,10 +45,10 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements } geometry(feature: Feature) { - let view = this.map.instance.getView(); - let resolution = view.getResolution(); - var geometry = feature.getGeometry(); - let e = geometry.getExtent(); + const view = this.map.instance.getView(); + const resolution = view.getResolution(); + let geometry = feature.getGeometry(); + const e = geometry.getExtent(); //var size = Math.max((e[2] - e[0]) / resolution, (e[3] - e[1]) / resolution); if (resolution > 12) { geometry = new Point(extent.getCenter(e)); @@ -57,9 +57,9 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements } getSelectedStyle(feature: Feature): style.Style { - let key = feature.get('itemType') + "_selected"; + const key = feature.get('itemType') + "_selected"; let evaluatedStyle: style.Style = undefined; - var styleEntry = this.stylesCache[key]; + const styleEntry = this.stylesCache[key]; if (styleEntry) { if (typeof styleEntry === 'function') { evaluatedStyle = styleEntry(feature); @@ -113,12 +113,12 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements this.host.instance.setSource(this.instance); this.host.instance.setStyle((feature) => { - var itemType = feature.get('itemType'); - var key = itemType + (this.selectedItem ? "_I" : ""); + const itemType = feature.get('itemType'); + let key = itemType + (this.selectedItem ? "_I" : ""); if (!this.stylesCache[key]) { if (this.itemTypeService.itemTypes[itemType]) { - let itemTypeEntry = this.itemTypeService.itemTypes[itemType]; - let fillColor = color.asArray(itemTypeEntry.iconColor); + const itemTypeEntry = this.itemTypeService.itemTypes[itemType]; + const fillColor = color.asArray(itemTypeEntry.iconColor); fillColor[3] = 0; this.stylesCache[key] = new style.Style({ image: itemTypeEntry.icon ? new style.Icon({ @@ -140,7 +140,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements } } let evaluatedStyle = null; - var styleEntry = this.stylesCache[key]; + const styleEntry = this.stylesCache[key]; if (typeof styleEntry === 'function') { evaluatedStyle = styleEntry(feature); } else { @@ -161,8 +161,8 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements } if (changes["selectedFeature"] && this.instance) { - var features = this._hoverSelect.getFeatures(); - var feature = changes["selectedFeature"].currentValue + const features = this._hoverSelect.getFeatures(); + const feature = changes["selectedFeature"].currentValue //this.instance.clear(false); //this.instance.addFeatures(features.getArray()); features.clear(); @@ -172,7 +172,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements } } if (changes["selectedItem"] && this.instance) { - var item = changes["selectedItem"].currentValue + const item = changes["selectedItem"].currentValue if (item) { this.map.instance.removeInteraction(this._hoverSelect); } else { @@ -180,7 +180,7 @@ export class ItemVectorSourceComponent extends SourceVectorComponent implements } } if (changes["styles"]) { - let styles = changes["styles"].currentValue; + const styles = changes["styles"].currentValue; for (const key in styles) { if (styles.hasOwnProperty(key)) { this.stylesCache[key] = styles[key]; diff --git a/projects/common-map/src/fm-map/components/aol/layer-list/layer-list.component.ts b/projects/common-map/src/fm-map/components/aol/layer-list/layer-list.component.ts index 2da9cb9..cf93c48 100644 --- a/projects/common-map/src/fm-map/components/aol/layer-list/layer-list.component.ts +++ b/projects/common-map/src/fm-map/components/aol/layer-list/layer-list.component.ts @@ -9,8 +9,8 @@ import { IItemLayer } from '../../../models/item.layer'; export class LayerListComponent { @Input() itemLayers: IItemLayer[] = []; - @Input() baseLayers: boolean = false; - @Input() dataLayers: boolean = false; + @Input() baseLayers = false; + @Input() dataLayers = false; @Output() onToggleVisibility = new EventEmitter(); @Output() onSetOpacity = new EventEmitter<{layer: IItemLayer,opacity:number }>(); @Output() onDelete = new EventEmitter(); diff --git a/projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.ts b/projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.ts index 81c0406..59331d3 100644 --- a/projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.ts +++ b/projects/common-map/src/fm-map/components/aol/layer-values/layer-values.component.ts @@ -21,9 +21,9 @@ import { Point } from 'ol/geom'; export class LayerValuesComponent implements OnInit,AfterViewInit { @ViewChild('layerValues') containerRef:ElementRef; - offsetX$:number =0; - offsetY$:number =0; - lonlat$: string=""; + offsetX$ =0; + offsetY$ =0; + lonlat$=""; wkt$= ""; layerValues$:Observable> = this.store.select(mapReducers.selectGetLayerValues); enabled$:Observable = this.store.select(mapReducers.selectGetLayerValuesEnabled); @@ -49,8 +49,8 @@ export class LayerValuesComponent implements OnInit,AfterViewInit { } updateValuesLocation() { - var xy = this.map.instance.getCoordinateFromPixel([this.offsetX$,this.offsetY$]) - var lonlat = toLonLat(xy); + const xy = this.map.instance.getCoordinateFromPixel([this.offsetX$,this.offsetY$]) + const lonlat = toLonLat(xy); this.wkt$ = this.wktFormat$.writeGeometry(new Point(lonlat)) this.lonlat$ = toStringHDMS(lonlat); this.store.dispatch(new mapActions.SetLayerValuesLocation(xy[0],xy[1])); diff --git a/projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.ts b/projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.ts index f9a983e..302516c 100644 --- a/projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.ts +++ b/projects/common-map/src/fm-map/components/aol/pan-to-location/pan-to-location.component.ts @@ -43,12 +43,12 @@ export class PanToLocation implements OnInit,OnChanges{ public centered():boolean { if(this.position && this.mapState) { - let center = this.view.getCenter(); - let newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]); - let x1 = newCenter[0].toFixed(0); - let x2 = center[0].toFixed(0); - let y1 = newCenter[1].toFixed(0); - let y2 = center[1].toFixed(0); + const center = this.view.getCenter(); + const newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]); + const x1 = newCenter[0].toFixed(0); + const x2 = center[0].toFixed(0); + const y1 = newCenter[1].toFixed(0); + const y2 = center[1].toFixed(0); return x1==x2 && y1==y2; } return false; @@ -60,17 +60,17 @@ export class PanToLocation implements OnInit,OnChanges{ handleClick(event:Event) { if(this.position) { - let view = this.map.instance.getView(); - let newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]); - let extent = [newCenter[0]-500,newCenter[1]-500,newCenter[0]+500,newCenter[1]+500]; - var options = { padding: [0, 0, 0, 0],minResolution:1 }; - let size = this.map.instance.getSize(); - let rem = parseFloat(getComputedStyle(document.documentElement).fontSize); - let threshold = 44 * rem; - var left = 1 * rem; - var right = 1 * rem; - var bottom = Math.round(size[1] / 2); - var top = 1 * rem; + const view = this.map.instance.getView(); + const newCenter = fromLonLat([this.position.coords.longitude,this.position.coords.latitude]); + const extent = [newCenter[0]-500,newCenter[1]-500,newCenter[0]+500,newCenter[1]+500]; + const options = { padding: [0, 0, 0, 0],minResolution:1 }; + const size = this.map.instance.getSize(); + const rem = parseFloat(getComputedStyle(document.documentElement).fontSize); + const threshold = 44 * rem; + let left = 1 * rem; + const right = 1 * rem; + let bottom = Math.round(size[1] / 2); + const top = 1 * rem; if (size[0] > threshold) { bottom = 1 * rem; left = 23 * rem; diff --git a/projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.ts b/projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.ts index 4d112fb..b20150e 100644 --- a/projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.ts +++ b/projects/common-map/src/fm-map/components/aol/rotation-reset/rotation-reset.component.ts @@ -14,7 +14,7 @@ export class RotationResetComponent implements OnInit { view: View; public Rotation() { - let rotation = this.view ? this.view.getRotation() : 0; + const rotation = this.view ? this.view.getRotation() : 0; return `rotate(${rotation}rad)`; } diff --git a/projects/common-map/src/fm-map/components/aol/zoom-to-extent/zoom-to-extent.component.ts b/projects/common-map/src/fm-map/components/aol/zoom-to-extent/zoom-to-extent.component.ts index 714d2bd..5c6461f 100644 --- a/projects/common-map/src/fm-map/components/aol/zoom-to-extent/zoom-to-extent.component.ts +++ b/projects/common-map/src/fm-map/components/aol/zoom-to-extent/zoom-to-extent.component.ts @@ -10,19 +10,19 @@ import { ViewComponent, MapComponent } from 'ngx-openlayers'; export class ZoomToExtentComponent implements OnChanges { view: ViewComponent; map: MapComponent; - paddingTop: number = 0; - paddingLeft: number = 0; - paddingBottom: number = 0; - paddingRight: number = 0; + paddingTop = 0; + paddingLeft = 0; + paddingBottom = 0; + paddingRight = 0; @Input() extent: number[]; - @Input() animate: boolean = false; + @Input() animate = false; constructor(@Host() view: ViewComponent, @Host() map: MapComponent,route: ActivatedRoute ) { this.view = view; this.map = map; if(route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-zoom-to-extent"]) { - let params = route.snapshot.data["fm-map-zoom-to-extent"]; + const params = route.snapshot.data["fm-map-zoom-to-extent"]; this.paddingTop = params["padding-top"] ? params["padding-top"] : 0; this.paddingBottom = params["padding-bottom"] ? params["padding-bottom"] : 0; this.paddingLeft = params["padding-left"] ? params["padding-left"] : 0; @@ -32,14 +32,14 @@ export class ZoomToExtentComponent implements OnChanges { ngOnChanges(changes: SimpleChanges) { if (this.extent) { - var options = { padding: [0, 0, 0, 0],minResolution:1 }; - let size = this.map.instance.getSize(); - let rem = parseFloat(getComputedStyle(document.documentElement).fontSize); - let threshold = 40 * rem; - var left = 1 * rem; - var right = 1 * rem; - var bottom = Math.round((size[1] / 2) + (4*rem)); - var top = 1 * rem; + const options = { padding: [0, 0, 0, 0],minResolution:1 }; + const size = this.map.instance.getSize(); + const rem = parseFloat(getComputedStyle(document.documentElement).fontSize); + const threshold = 40 * rem; + let left = 1 * rem; + const right = 1 * rem; + let bottom = Math.round((size[1] / 2) + (4*rem)); + const top = 1 * rem; if (size[0] > threshold) { bottom = 5 * rem; left = 23 * rem; diff --git a/projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.ts b/projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.ts index ca21152..da05c3f 100644 --- a/projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.ts +++ b/projects/common-map/src/fm-map/components/feature-list-container/feature-list-container.component.ts @@ -33,7 +33,7 @@ export class FeatureListContainerComponent { let componentFactory: ComponentFactory = this.componentFactoryResolver.resolveComponentFactory(FeatureListComponent); // default let selected = -1; let maxMatches =0; - let showItem = true; + const showItem = true; for (let i = 0; i < this.featureLists.length; i++) { let matches=0; let criteria=0; diff --git a/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.ts b/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.ts index dd9d4d5..8b91fd3 100644 --- a/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.ts +++ b/projects/common-map/src/fm-map/components/feature-list-croppingscheme/feature-list-croppingscheme.component.ts @@ -25,7 +25,7 @@ export class FeatureListCroppingschemeComponent extends AbstractFeatureListCompo } getAction(feature:Feature):Action { - var queryState = tassign(mapReducers.initialState.queryState, { parentCode: feature.get('code'), itemType: "vnd.farmmaps.itemtype.cropfield" }); + const queryState = tassign(mapReducers.initialState.queryState, { parentCode: feature.get('code'), itemType: "vnd.farmmaps.itemtype.cropfield" }); return new mapActions.DoQuery(queryState); } } diff --git a/projects/common-map/src/fm-map/components/feature-list-feature-container/feature-list-feature-container.component.ts b/projects/common-map/src/fm-map/components/feature-list-feature-container/feature-list-feature-container.component.ts index 2831457..0c048c5 100644 --- a/projects/common-map/src/fm-map/components/feature-list-feature-container/feature-list-feature-container.component.ts +++ b/projects/common-map/src/fm-map/components/feature-list-feature-container/feature-list-feature-container.component.ts @@ -24,7 +24,7 @@ export class FeatureListFeatureContainerComponent { @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; loadComponent() { - var componentFactory: ComponentFactory = this.componentFactoryResolver.resolveComponentFactory(FeatureListFeatureComponent); // default + let componentFactory: ComponentFactory = this.componentFactoryResolver.resolveComponentFactory(FeatureListFeatureComponent); // default let selected = -1; let maxMatches =0; diff --git a/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts b/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts index 45b6077..2e649e8 100644 --- a/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts +++ b/projects/common-map/src/fm-map/components/feature-list-feature-cropfield/feature-list-feature-cropfield.component.ts @@ -27,7 +27,7 @@ export class FeatureListFeatureCropfieldComponent extends AbstractFeatureListFea areaInHa(feature:Feature):number { if(!feature) return 0; // get area from faeture if 0 calculate from polygon - let a = feature.get('area'); + const a = feature.get('area'); if(a) return a; return getArea(feature.getGeometry(),{projection:"EPSG:3857"}) / 10000; } diff --git a/projects/common-map/src/fm-map/components/feature-list/feature-list.component.ts b/projects/common-map/src/fm-map/components/feature-list/feature-list.component.ts index 097e0d0..d81bdcf 100644 --- a/projects/common-map/src/fm-map/components/feature-list/feature-list.component.ts +++ b/projects/common-map/src/fm-map/components/feature-list/feature-list.component.ts @@ -23,13 +23,13 @@ export abstract class AbstractFeatureListComponent { handleFeatureClick(feature:Feature) { if(feature) { - let action = this.getAction(feature); + const action = this.getAction(feature); this.store.dispatch(action); } } getAction(feature:Feature):Action { - var newQuery: any = tassign(mapReducers.initialState.queryState); + const newQuery: any = tassign(mapReducers.initialState.queryState); newQuery.parentCode = feature.get('parentCode'); newQuery.itemCode = feature.get('code'); newQuery.itemType = feature.get('itemType'); diff --git a/projects/common-map/src/fm-map/components/feature-thumbnail/feature-thumbnail.component.ts b/projects/common-map/src/fm-map/components/feature-thumbnail/feature-thumbnail.component.ts index 2a2ab15..842040c 100644 --- a/projects/common-map/src/fm-map/components/feature-thumbnail/feature-thumbnail.component.ts +++ b/projects/common-map/src/fm-map/components/feature-thumbnail/feature-thumbnail.component.ts @@ -30,7 +30,7 @@ export class GeometryThumbnailComponent implements AfterViewInit { this.geometry, this.width, this.height); - }; + } private defaultStyle:style.Style = new style.Style({ stroke: new style.Stroke({ color: 'black',width:1.5 }) @@ -52,24 +52,24 @@ export class GeometryThumbnailComponent implements AfterViewInit { this.height); } - private width:number = 0; - private height:number = 0; + private width = 0; + private height = 0; render(canvas,style:style.Style,geometry:Geometry,width:number,height:number) { if(canvas && canvas.nativeElement && geometry && style) { - let renderContext = render.toContext(canvas.nativeElement.getContext( '2d'),{ size: [width, height] }); + const renderContext = render.toContext(canvas.nativeElement.getContext( '2d'),{ size: [width, height] }); - let geom = geometry.clone() as Polygon, + const geom = geometry.clone() as Polygon, line = geom.getCoordinates()[0], e = extent.boundingExtent( line ); - let dxy = extent.getCenter(e), + const dxy = extent.getCenter(e), sxy = [ (width - 2 ) / extent.getWidth(e), (height - 2 ) / extent.getHeight(e) ]; - let dx = dxy[0], + const dx = dxy[0], dy = dxy[1], sx = sxy[0], sy = sxy[1]; diff --git a/projects/common-map/src/fm-map/components/if-zoom-to-show/if-zoom-to-show.directive.ts b/projects/common-map/src/fm-map/components/if-zoom-to-show/if-zoom-to-show.directive.ts index 15172c6..62924bb 100644 --- a/projects/common-map/src/fm-map/components/if-zoom-to-show/if-zoom-to-show.directive.ts +++ b/projects/common-map/src/fm-map/components/if-zoom-to-show/if-zoom-to-show.directive.ts @@ -43,9 +43,9 @@ export class ifZoomToShowDirective implements OnInit { checkZoom() { if(this.layer$ && this.map$.instance) { - let minZoom = this.layer$.getMinZoom(); - let currentZoom = this.map$.instance.getView().getZoom(); - let view = currentZoom < minZoom; + const minZoom = this.layer$.getMinZoom(); + const currentZoom = this.map$.instance.getView().getZoom(); + const view = currentZoom < minZoom; if(view!= this.showView) { this.viewContainerRef$.clear(); this.showView=view; diff --git a/projects/common-map/src/fm-map/components/item-list-item-container/item-list-item-container.component.ts b/projects/common-map/src/fm-map/components/item-list-item-container/item-list-item-container.component.ts index 12fe02f..25a1a4b 100644 --- a/projects/common-map/src/fm-map/components/item-list-item-container/item-list-item-container.component.ts +++ b/projects/common-map/src/fm-map/components/item-list-item-container/item-list-item-container.component.ts @@ -23,11 +23,11 @@ export class ItemListItemContainerComponent { @ViewChild(WidgetHostDirective, { static: true }) widgetHost: WidgetHostDirective; loadComponent() { - var componentFactory: ComponentFactory = this.componentFactoryResolver.resolveComponentFactory(ItemListItemComponent); // default + let componentFactory: ComponentFactory = this.componentFactoryResolver.resolveComponentFactory(ItemListItemComponent); // default let selected = -1; let maxMatches =0; - let showItem = true; + const showItem = true; for (let i = 0; i < this.itemComponentList.length; i++) { let matches=0; let criteria=0; diff --git a/projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.ts b/projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.ts index 84ea054..f5f1949 100644 --- a/projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.ts +++ b/projects/common-map/src/fm-map/components/item-list-item/item-list-item.component.ts @@ -13,7 +13,7 @@ export abstract class AbstractItemListItemComponent { constructor(public store: Store, public itemTypeService: ItemTypeService) { } - getScaledValue(value:number,scale:number = 0):number { + getScaledValue(value:number,scale = 0):number { let v = value; if(scale && scale != 0) { v=scale*value; @@ -30,7 +30,7 @@ export abstract class AbstractItemWidgetComponent { constructor(public store: Store, public itemTypeService: ItemTypeService) { } - getScaledValue(value:number,scale:number = 0):number { + getScaledValue(value:number,scale = 0):number { let v = value; if(scale && scale != 0) { v=scale*value; diff --git a/projects/common-map/src/fm-map/components/item-list/item-list.component.ts b/projects/common-map/src/fm-map/components/item-list/item-list.component.ts index d154a21..9a0a8da 100644 --- a/projects/common-map/src/fm-map/components/item-list/item-list.component.ts +++ b/projects/common-map/src/fm-map/components/item-list/item-list.component.ts @@ -15,7 +15,7 @@ export abstract class AbstractItemListComponent { } handleItemClick(item:IListItem) { - var newQuery: any = tassign(mapReducers.initialState.query); + const newQuery: any = tassign(mapReducers.initialState.query); newQuery.itemCode = item.code; this.store.dispatch(new mapActions.DoQuery(newQuery)); } diff --git a/projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.ts b/projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.ts index bdda476..29b23df 100644 --- a/projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.ts +++ b/projects/common-map/src/fm-map/components/item-widget-list/item-widget-list.component.ts @@ -23,10 +23,10 @@ export class ItemWidgetListComponent implements AfterViewInit { } ngAfterViewInit() { - let targets = this.widgetTargets.toArray(); + const targets = this.widgetTargets.toArray(); if(this.widgets) { - for (var i = 0; i < this.widgets.length; i++) { - var componentFactory: ComponentFactory = this.componentFactoryResolver.resolveComponentFactory(this.widgets[i]['constructor'] as any); + for (let i = 0; i < this.widgets.length; i++) { + const componentFactory: ComponentFactory = this.componentFactoryResolver.resolveComponentFactory(this.widgets[i]['constructor'] as any); const viewContainerRef = targets[i]; viewContainerRef.clear(); diff --git a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.ts b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.ts index 7c87df3..e85bbe1 100644 --- a/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.ts +++ b/projects/common-map/src/fm-map/components/layer-switcher/layer-switcher.component.ts @@ -62,7 +62,7 @@ export class LayerSwitcher implements OnInit,OnChanges{ } handleZoomToExtent(itemLayer: IItemLayer) { - var extent = createEmpty(); + const extent = createEmpty(); extend(extent, itemLayer.layer.getExtent()); if (extent) { this.store.dispatch(new mapActions.SetExtent(extent)); diff --git a/projects/common-map/src/fm-map/components/legend/legend.component.ts b/projects/common-map/src/fm-map/components/legend/legend.component.ts index 3c3b0f1..680a848 100644 --- a/projects/common-map/src/fm-map/components/legend/legend.component.ts +++ b/projects/common-map/src/fm-map/components/legend/legend.component.ts @@ -29,7 +29,7 @@ export class LegendComponent implements OnInit,AfterViewInit { histogram: string; @Input() - showTitle: boolean = true; + showTitle = true; @Input() histogramenabled: boolean; @@ -40,7 +40,7 @@ export class LegendComponent implements OnInit,AfterViewInit { @Input() histogramunit: string; - public hideHistogramDetails:boolean = true; + public hideHistogramDetails = true; onClickHistoGram(): void { this.histogramenabled = !this.histogramenabled; @@ -63,9 +63,9 @@ export class LegendComponent implements OnInit,AfterViewInit { } public getPart(renderer: IRenderer, index: number): string { - let max = renderer.band.histogram.entries.reduce((max, entry) => entry.freqency > max ? entry.freqency : max, 0); - let scale = 65 / max; - let part = (renderer.band.histogram.entries[index].freqency * scale) + "%"; + const max = renderer.band.histogram.entries.reduce((max, entry) => entry.freqency > max ? entry.freqency : max, 0); + const scale = 65 / max; + const part = (renderer.band.histogram.entries[index].freqency * scale) + "%"; return part; } @@ -79,8 +79,8 @@ export class LegendComponent implements OnInit,AfterViewInit { } public getPercentage(renderer: IRenderer, index: number): number { - let scale = 100 / renderer.band.histogram.entries.reduce((sum, entry) => sum + entry.freqency, 0); - let percent = renderer.band.histogram.entries[index].freqency * scale; + const scale = 100 / renderer.band.histogram.entries.reduce((sum, entry) => sum + entry.freqency, 0); + const percent = renderer.band.histogram.entries[index].freqency * scale; return percent < 0.1 ? null : percent; } diff --git a/projects/common-map/src/fm-map/components/map-search/map-search.component.ts b/projects/common-map/src/fm-map/components/map-search/map-search.component.ts index 4222aff..271f7ec 100644 --- a/projects/common-map/src/fm-map/components/map-search/map-search.component.ts +++ b/projects/common-map/src/fm-map/components/map-search/map-search.component.ts @@ -50,21 +50,21 @@ export class MapSearchComponent { } } - public collapsedLocal: boolean = true; - public searchMinifiedLocal: boolean = false; + public collapsedLocal = true; + public searchMinifiedLocal = false; public periodLocal: IPeriodState = { startDate:new Date(new Date(Date.now()).getFullYear(), new Date(Date.now()).getMonth() - 3, 1), endDate:new Date(Date.now())}; public filterOptionsLocal: IQueryState; private extent: number[]; public searchTextLocal: any; public searchTextLocalOutput: string; - public dateFilter: boolean = true; + public dateFilter = true; public startEndCaption: string = this.timespanService.getCaption(this.periodLocal.startDate, this.periodLocal.endDate, 4); searching = false; searchFailed = false; hideSearchingWhenUnsubscribed = new Observable(() => () => this.searching = false); - public disabled: boolean = true; + public disabled = true; constructor(private typeaheadService: TypeaheadService, private timespanService: TimespanService) { this.filterOptionsLocal = { query: "", tags: "", startDate: null, endDate: null, bboxFilter: false, itemType: null, itemCode:null,level:0,parentCode:null,bbox:[] }; diff --git a/projects/common-map/src/fm-map/components/map/map.component.ts b/projects/common-map/src/fm-map/components/map/map.component.ts index f8a8246..c550ec9 100644 --- a/projects/common-map/src/fm-map/components/map/map.component.ts +++ b/projects/common-map/src/fm-map/components/map/map.component.ts @@ -45,7 +45,7 @@ import * as style from 'ol/style'; }) export class MapComponent implements OnInit, OnDestroy,AfterViewInit { - title: string = 'Map'; + title = 'Map'; public openedModalName$: Observable = this.store.select(commonReducers.selectOpenedModalName); public itemTypes$: Observable<{ [id: string]: IItemType }>; public mapState$: Observable = this.store.select(mapReducers.selectGetMapState); @@ -81,20 +81,20 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { public query$: Observable = this.store.select(mapReducers.selectGetQuery); public position$: Observable = this.geolocationService.getCurrentPosition(); public compassHeading$: Observable = this.deviceorientationService.getCurrentCompassHeading(); - public baseLayersCollapsed:boolean = true; - public overlayLayersCollapsed: boolean = true; + public baseLayersCollapsed = true; + public overlayLayersCollapsed = true; public extent$: Observable = this.store.select(mapReducers.selectGetExtent); public styles$:Observable = this.store.select(mapReducers.selectGetStyles); public fullscreen$: Observable = this.store.select(commonReducers.selectGetFullScreen); private lastUrl = ""; - private initialized: boolean = false; - public noContent: boolean = false; - public overrideSelectedItemLayer: boolean = false; - public overrideOverlayLayers: boolean = false; - public dataLayerSlideValue:number = 50; + private initialized = false; + public noContent = false; + public overrideSelectedItemLayer = false; + public overrideOverlayLayers = false; + public dataLayerSlideValue = 50; public dataLayerSlideEnabled = false; private visibleAreaBottom = 0; - private viewEnabled: boolean = true; + private viewEnabled = true; @ViewChild('map') map; @ViewChild('contentDiv') contentDiv: ElementRef; @@ -112,7 +112,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { private deviceorientationService:DeviceOrientationService, public devicesService:DeviceService) { if(route && route.snapshot && route.snapshot.data && route.snapshot.data["fm-map-map"]) { - let params = route.snapshot.data["fm-map-map"]; + const params = route.snapshot.data["fm-map-map"]; this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false; this.overrideOverlayLayers = params["overrideOverlayLayers"] ? params["overrideOverlayLayers"] : false; } @@ -120,10 +120,10 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { if(query && query.querystate) { let newQueryState = tassign(mapReducers.initialQueryState); console.debug(`Do Query`); - let urlparts=[]; + const urlparts=[]; if (query.querystate.itemCode && query.querystate.itemCode != "") { if(query.querystate.itemType && query.querystate.itemType!= "") { - let itemType = this.itemTypeService.itemTypes[query.querystate.itemType]; + const itemType = this.itemTypeService.itemTypes[query.querystate.itemType]; if (itemType && itemType.viewer && itemType.viewer == "edit_in_editor" && itemType.editor) { urlparts.push('/editor'); urlparts.push(itemType.editor); @@ -154,7 +154,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { @HostListener('document:keyup', ['$event']) escapeClose(event: KeyboardEvent) { - let x = event.keyCode; + const x = event.keyCode; if (x === 27) { this.handleCloseModal() } @@ -268,19 +268,19 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { } round(value:number,decimals:number):number { - let d = Math.pow(10, decimals); + const d = Math.pow(10, decimals); return Math.round((value + Number.EPSILON)*d)/d; } getMapStateFromUrl(params:ParamMap):IMapState { - var hasUrlmapState = params.has("xCenter") && params.has("yCenter"); + const hasUrlmapState = params.has("xCenter") && params.has("yCenter"); if (hasUrlmapState) { - let xCenter = parseFloat(params.get("xCenter")); - let yCenter = parseFloat(params.get("yCenter")); - let zoom = parseFloat(params.get("zoom")); - let rotation = parseFloat(params.get("rotation")); - let baseLayer = params.get("baseLayer")?params.get("baseLayer"):""; - var newMapState = {zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer }; + const xCenter = parseFloat(params.get("xCenter")); + const yCenter = parseFloat(params.get("yCenter")); + const zoom = parseFloat(params.get("zoom")); + const rotation = parseFloat(params.get("rotation")); + const baseLayer = params.get("baseLayer")?params.get("baseLayer"):""; + const newMapState = {zoom: zoom, rotation: rotation, xCenter: xCenter, yCenter: yCenter, baseLayerCode: baseLayer }; return newMapState; } else { return null; @@ -302,8 +302,8 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { getQueryStateFromUrl(params:ParamMap):IQueryState { if (params.has("queryState")) { - let queryState = params.get("queryState"); - var newQueryState = tassign(mapReducers.initialQueryState); + const queryState = params.get("queryState"); + let newQueryState = tassign(mapReducers.initialQueryState); if (queryState != "") { newQueryState = this.serializeService.deserialize(queryState); } @@ -326,8 +326,8 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { // url to state - let urlMapState = this.getMapStateFromUrl(this.route.snapshot.paramMap); - let urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap); + const urlMapState = this.getMapStateFromUrl(this.route.snapshot.paramMap); + const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap); if(urlQueryState && urlMapState && this.noContent) { this.store.dispatch(new mapActions.SetState(urlMapState,urlQueryState)); window.localStorage.setItem("FarmMapsCommonMap_mapState",this.serializeMapState(urlMapState)); @@ -339,7 +339,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { this.paramSub = this.route.paramMap.pipe(withLatestFrom(this.state$),switchMap(([params,state]) => { if(this.initialized && this.noContent) { - let urlQueryState = this.getQueryStateFromUrl(params); + const urlQueryState = this.getQueryStateFromUrl(params); if( this.serializeService.serialize(state.queryState) != this.serializeService.serialize(urlQueryState)) { return of(new mapActions.SetState(state.mapState,urlQueryState)); } @@ -357,7 +357,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { // state to url this.stateSub = this.state$.pipe(switchMap((state) => { - let newUrl = this.serializeMapState(state.mapState) + "_" + this.serializeService.serialize(state.queryState); + const newUrl = this.serializeMapState(state.mapState) + "_" + this.serializeService.serialize(state.queryState); if(this.lastUrl!=newUrl) { this.lastUrl=newUrl; return of(state); @@ -405,19 +405,19 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { handlePredefinedQuery(event: MouseEvent, query: any) { event.preventDefault(); - var queryState = tassign(mapReducers.initialQueryState, query); + const queryState = tassign(mapReducers.initialQueryState, query); this.store.dispatch(new mapActions.DoQuery(queryState)); } - replaceUrl(mapState: IMapState, queryState: IQueryState, replace: boolean = true) { + replaceUrl(mapState: IMapState, queryState: IQueryState, replace = true) { if(this.noContent) { - let newMapState = this.serializeMapState(mapState); - let newQueryState = this.serializeService.serialize(queryState); - let currentMapState = this.serializeMapState(this.getMapStateFromUrl(this.route.snapshot.paramMap)); - let urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap); - let currentQueryState = urlQueryState==null?"":this.serializeService.serialize(urlQueryState); + const newMapState = this.serializeMapState(mapState); + const newQueryState = this.serializeService.serialize(queryState); + const currentMapState = this.serializeMapState(this.getMapStateFromUrl(this.route.snapshot.paramMap)); + const urlQueryState = this.getQueryStateFromUrl(this.route.snapshot.paramMap); + const currentQueryState = urlQueryState==null?"":this.serializeService.serialize(urlQueryState); if(mapState.baseLayerCode!="" && ((newMapState!= currentMapState) || (newQueryState!=currentQueryState))) { - let parts =["."]; + const parts =["."]; parts.push(mapState.xCenter.toFixed(5)); parts.push(mapState.yCenter.toFixed(5)); parts.push( mapState.zoom.toFixed(0)); @@ -435,19 +435,19 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { if(this.initialized && this.viewEnabled) { this.zone.run(() =>{ console.debug("Move end"); - var map = event.map; - var view = map.getView(); - var rotation = view.getRotation(); - var zoom = view.getZoom(); - var center = transform(view.getCenter(), view.getProjection(), "EPSG:4326"); - var viewExtent = view.calculateExtent(this.map.instance.getSize()); - let mapState: IMapState = { xCenter: center[0], yCenter: center[1], zoom: zoom, rotation: rotation, baseLayerCode: null }; - let state = { mapState: mapState, viewExtent: viewExtent }; + const map = event.map; + const view = map.getView(); + const rotation = view.getRotation(); + const zoom = view.getZoom(); + const center = transform(view.getCenter(), view.getProjection(), "EPSG:4326"); + const viewExtent = view.calculateExtent(this.map.instance.getSize()); + const mapState: IMapState = { xCenter: center[0], yCenter: center[1], zoom: zoom, rotation: rotation, baseLayerCode: null }; + const state = { mapState: mapState, viewExtent: viewExtent }; console.debug("Center: ",center[0],center[1] ); - let source = from([state]); + const source = from([state]); source.pipe(withLatestFrom(this.selectedBaseLayer$)).subscribe(([state, baselayer]) => { if (mapState && baselayer) { // do not react on first move - let newMapState = tassign(state.mapState, { baseLayerCode: baselayer.item.code }); + const newMapState = tassign(state.mapState, { baseLayerCode: baselayer.item.code }); this.store.dispatch(new mapActions.SetMapState(newMapState)); this.store.dispatch(new mapActions.SetViewExtent(state.viewExtent)); } @@ -491,7 +491,7 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { } handleZoomToExtent(itemLayer: IItemLayer) { - var extent = createEmpty(); + const extent = createEmpty(); extend(extent, itemLayer.layer.getExtent()); if (extent) { this.store.dispatch(new mapActions.SetExtent(extent)); @@ -513,10 +513,10 @@ export class MapComponent implements OnInit, OnDestroy,AfterViewInit { handleCitySearch(location:string) { this.geolocaterService.geocode(location).subscribe(locations => { if( locations.length > 0) { - let point = new Point([locations[0].coordinates.lon,locations[0].coordinates.lat]); + const point = new Point([locations[0].coordinates.lon,locations[0].coordinates.lat]); point.transform('EPSG:4326', 'EPSG:3857'); - let circle = new Circle(point.getCoordinates(),5000);// - let extent = createEmpty(); + const circle = new Circle(point.getCoordinates(),5000);// + const extent = createEmpty(); extend(extent, circle.getExtent()); this.store.dispatch(new mapActions.SetExtent(extent)) } diff --git a/projects/common-map/src/fm-map/components/meta-data-modal/meta-data-modal.component.ts b/projects/common-map/src/fm-map/components/meta-data-modal/meta-data-modal.component.ts index 0a88fc7..bec8874 100644 --- a/projects/common-map/src/fm-map/components/meta-data-modal/meta-data-modal.component.ts +++ b/projects/common-map/src/fm-map/components/meta-data-modal/meta-data-modal.component.ts @@ -15,12 +15,12 @@ export interface IMetaData { }) export class MetaDataModalComponent { - private modalName: string = 'metaDataModal'; + private modalName = 'metaDataModal'; private modalRef: NgbModalRef; @ViewChild('content', { static: true }) _templateModal:ElementRef; @Input() droppedFile: IDroppedFile; - @Input() set modalState(_modalState:any) {; + @Input() set modalState(_modalState:any) { if(_modalState == this.modalName) { this.openModal() } else if(this.modalRef) { diff --git a/projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.ts b/projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.ts index 05a471b..092ac35 100644 --- a/projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.ts +++ b/projects/common-map/src/fm-map/components/select-period-modal/select-period-modal.component.ts @@ -22,7 +22,7 @@ const after = (one: NgbDateStruct, two: NgbDateStruct) => }) export class SelectPeriodModalComponent { - private modalName: string = 'selectPeriodModal'; + private modalName = 'selectPeriodModal'; private modalRef: NgbModalRef; private dateAdapter = new NgbDateNativeAdapter(); hoveredDate: NgbDateStruct; @@ -31,7 +31,7 @@ export class SelectPeriodModalComponent { @ViewChild('content', { static: true }) _templateModal:ElementRef; - @Input() set modalState(_modalState:any) {; + @Input() set modalState(_modalState:any) { if(_modalState == this.modalName) { this.openModal() } else if(this.modalRef) { @@ -44,7 +44,7 @@ export class SelectPeriodModalComponent { } @Input() set endDate(_modalState: Date) { - var d = new Date(_modalState); + const d = new Date(_modalState); d.setDate(d.getDate() - 1); this.toDate = this.dateAdapter.fromModel(d); } @@ -80,7 +80,7 @@ export class SelectPeriodModalComponent { handleSelect(event:MouseEvent) { event.preventDefault(); if (this.fromDate && this.toDate && before(this.fromDate, this.toDate)) { - var endDate = new Date(this.dateAdapter.toModel(this.toDate)); + const endDate = new Date(this.dateAdapter.toModel(this.toDate)); endDate.setDate(endDate.getDate() + 1); this.onSelect.emit({startDate:this.dateAdapter.toModel(this.fromDate),endDate:endDate}) } diff --git a/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts b/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts index 5787be2..2c48d1c 100644 --- a/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-container/selected-item-container.component.ts @@ -28,7 +28,7 @@ export class SelectedItemContainerComponent { let selected = -1; let maxMatches =0; - let showItem = true; + const showItem = true; for (let i = 0; i < this.selectedItemComponents.length; i++) { let matches=0; let criteria=0; diff --git a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts index c6da727..9f15b39 100644 --- a/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-cropfield/selected-item-cropfield.component.ts @@ -31,28 +31,28 @@ export class SelectedItemCropfieldComponent extends AbstractSelectedItemComponen areaInHa(item:IItem):number { if(!item) return 0; // get area from faeture if 0 calculate from polygon - let a = item.data.area; + const a = item.data.area; if(a) return a; - let format = new GeoJSON(); - let polygon = format.readGeometry(item.geometry); + const format = new GeoJSON(); + const polygon = format.readGeometry(item.geometry); return getArea(polygon,{projection:"EPSG:4326"}) / 10000; } ngOnInit() { - var childItems = this.folderService$.getItems(this.item.code, 0, 1000); - var atLocationItems = this.itemService$.getItemList(null,null,null,this.item.code,true); + const childItems = this.folderService$.getItems(this.item.code, 0, 1000); + const atLocationItems = this.itemService$.getItemList(null,null,null,this.item.code,true); this.items = childItems.pipe( combineLatest(atLocationItems), switchMap(([ci,ali]) => { - let retVal:IListItem[] = []; - let codes = {}; + const retVal:IListItem[] = []; + const codes = {}; ci.forEach((listItem) => { retVal.push(listItem); codes[listItem.code]=listItem; }); ali.forEach((atlocationitem) => { - let listItem = atlocationitem as IListItem; - let allowedItemTypes = "vnd.farmmaps.itemtype.device.senml"; // this is a hack + const listItem = atlocationitem as IListItem; + const allowedItemTypes = "vnd.farmmaps.itemtype.device.senml"; // this is a hack if(!codes[listItem.code] && allowedItemTypes.indexOf(listItem.itemType) >= 0) { retVal.push(listItem); } diff --git a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts index fefa1c9..bed1cf7 100644 --- a/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-shape/selected-item-shape.component.ts @@ -23,7 +23,7 @@ export class SelectedItemShapeComponent extends AbstractSelectedItemComponent { constructor(store: Store, itemTypeService: ItemTypeService, location: Location, router: Router, private itemService$: ItemService,private folderService$: FolderService) { super(store, itemTypeService,location,router); } - public selectedLayer: number = 0; + public selectedLayer = 0; onLayerChanged(layerIndex: number) { this.store.dispatch(new mapActions.SetLayerIndex(layerIndex)); diff --git a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts index 36e85d9..5814910 100644 --- a/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item-temporal/selected-item-temporal.component.ts @@ -46,7 +46,7 @@ export class SelectedItemTemporalComponent extends AbstractSelectedItemComponent } selectedItem():IItem { - let temporalItemLayer = this.itemLayer as ITemporalItemLayer; + const temporalItemLayer = this.itemLayer as ITemporalItemLayer; if(temporalItemLayer && temporalItemLayer.selectedItemLayer) { return temporalItemLayer.selectedItemLayer.item; } diff --git a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts index 9258ab7..0fd6b69 100644 --- a/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts +++ b/projects/common-map/src/fm-map/components/selected-item/selected-item.component.ts @@ -20,39 +20,39 @@ export abstract class AbstractSelectedItemComponent { handleOnView(item: IItem) { if (this.itemTypeService.hasViewer(item)) { - let viewer = this.itemTypeService.itemTypes[item.itemType].viewer; - let url = `/viewer/${viewer}/item/${item.code}`; + const viewer = this.itemTypeService.itemTypes[item.itemType].viewer; + const url = `/viewer/${viewer}/item/${item.code}`; this.router.navigate([url]); } return false; } handleOnEdit(item: IItem) { - var editor = "property"; + let editor = "property"; if(this.itemTypeService.hasEditor(item)) { editor = this.itemTypeService.itemTypes[item.itemType].editor; } - let url = `/editor/${editor}/item/${item.code}` + const url = `/editor/${editor}/item/${item.code}` this.router.navigate([url]); return false; } - handleAddAsLayer(item: IItem,layerIndex:number = -1) { + handleAddAsLayer(item: IItem,layerIndex = -1) { this.store.dispatch(new mapActions.AddLayer(item,layerIndex)); return false; } - handleRemoveLayer(item: IItem,layerIndex:number = -1) { - let itemLayer = this.getItemLayer(item,layerIndex); + handleRemoveLayer(item: IItem,layerIndex = -1) { + const itemLayer = this.getItemLayer(item,layerIndex); if(itemLayer) { this.store.dispatch(new mapActions.RemoveLayer(itemLayer)); } return false; } - getItemLayer(item:IItem,layerIndex:number = -1):IItemLayer { - let li = layerIndex==-1?0:layerIndex; - let selected = this.overlayLayers.filter(ol => ol.item.code == item.code && ol.layerIndex == li); + getItemLayer(item:IItem,layerIndex = -1):IItemLayer { + const li = layerIndex==-1?0:layerIndex; + const selected = this.overlayLayers.filter(ol => ol.item.code == item.code && ol.layerIndex == li); if(selected.length==0) return null; return selected[0]; } diff --git a/projects/common-map/src/fm-map/effects/map.effects.ts b/projects/common-map/src/fm-map/effects/map.effects.ts index ebd77ec..9ed05a8 100644 --- a/projects/common-map/src/fm-map/effects/map.effects.ts +++ b/projects/common-map/src/fm-map/effects/map.effects.ts @@ -48,15 +48,15 @@ export const { export class MapEffects { private _geojsonFormat: GeoJSON; private _wktFormat: WKT; - private overrideSelectedItemLayer: boolean = false; + private overrideSelectedItemLayer = false; private updateFeatureGeometry(feature:Feature, updateEvent:commonActions.DeviceUpdateEvent): Feature { - let newFeature = feature.clone(); - var f = this._wktFormat.readFeature(updateEvent.attributes["geometry"],{ + const newFeature = feature.clone(); + const f = this._wktFormat.readFeature(updateEvent.attributes["geometry"],{ dataProjection: 'EPSG:4326', featureProjection: 'EPSG:3857' }); - var centroid = getCenter(f.getGeometry().getExtent()); + const centroid = getCenter(f.getGeometry().getExtent()); newFeature.setId(feature.getId()); newFeature.setGeometry(new Point(centroid)); return newFeature; @@ -66,8 +66,8 @@ export class MapEffects { ofType(mapActions.INIT), withLatestFrom(this.store$.select(commonReducers.selectGetRootItems)), switchMap(([action, rootItems]) => { - let actions=[]; - for (let rootItem of rootItems) { + const actions=[]; + for (const rootItem of rootItems) { if (rootItem.itemType == "UPLOADS_FOLDER") actions.push(new mapActions.SetParent(rootItem.code)); } // initialize default feature styles @@ -121,14 +121,14 @@ export class MapEffects { startSearch$ = createEffect(() => this.actions$.pipe( ofType(mapActions.STARTSEARCH), switchMap((action) => { - let a = action as mapActions.StartSearch; - var startDate = a.queryState.startDate; - var endDate = a.queryState.endDate; - var newAction:Observable; + const a = action as mapActions.StartSearch; + const startDate = a.queryState.startDate; + const endDate = a.queryState.endDate; + let newAction:Observable; if (a.queryState.itemCode || a.queryState.parentCode || a.queryState.itemType || a.queryState.query || a.queryState.tags) { newAction= this.itemService$.getFeatures(a.queryState.bbox, "EPSG:3857", a.queryState.query, a.queryState.tags, startDate, endDate, a.queryState.itemType, a.queryState.parentCode, a.queryState.dataFilter, a.queryState.level).pipe( switchMap((features: any) => { - for (let f of features.features) { + for (const f of features.features) { if (f.properties && f.properties["code"]) { f.id = f.properties["code"]; } @@ -147,12 +147,12 @@ export class MapEffects { zoomToExtent$ = createEffect(() => this.actions$.pipe( ofType(mapActions.STARTSEARCHSUCCESS), mergeMap((action: mapActions.StartSearchSuccess) => { - let actions =[]; + const actions =[]; actions.push(new commonActions.SetMenuVisible(false)); - let extent = createEmpty(); + const extent = createEmpty(); if (!action.query.bboxFilter) { if (extent) { - for (let f of action.features) { + for (const f of action.features) { extend(extent, (f as Feature).getGeometry().getExtent()); } if(action.features && action.features.length >0) { @@ -166,9 +166,9 @@ export class MapEffects { zoomToExtent2$ = createEffect(() => this.actions$.pipe( ofType(mapActions.SETFEATURES), switchMap((action: mapActions.SetFeatures) => { - let extent = createEmpty(); + const extent = createEmpty(); if (extent) { - for (let f of action.features) { + for (const f of action.features) { extend(extent, (f as Feature).getGeometry().getExtent()); } if(action.features.length>0) return of(new mapActions.SetExtent(extent)); @@ -186,15 +186,15 @@ export class MapEffects { ofType(mapActions.SELECTITEM), withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)), switchMap(([action, selectedItem]) => { - let a = action as mapActions.SelectItem; - let itemCode = selectedItem ? selectedItem.code : ""; + const a = action as mapActions.SelectItem; + const itemCode = selectedItem ? selectedItem.code : ""; if (a.itemCode != itemCode) { return this.itemService$.getItem(a.itemCode).pipe( switchMap(child => { return this.itemService$.getItem(child.parentCode) .pipe(map(parent => { return {child, parent}; - }),catchError(() => { let parent:IItem = null;return of({child,parent})}) + }),catchError(() => { const parent:IItem = null;return of({child,parent})}) ); }), map(data => new mapActions.SelectItemSuccess(data.child, data.parent)), @@ -218,7 +218,7 @@ export class MapEffects { if(!this.overrideSelectedItemLayer) { return this.itemService$.getFeature(action.item.code, "EPSG:3857").pipe( map((feature: any) => { - let f = this._geojsonFormat.readFeature(feature); + const f = this._geojsonFormat.readFeature(feature); f.setId(action.item.code); return new mapActions.AddFeatureSuccess(f ); }), @@ -255,9 +255,9 @@ export class MapEffects { ofType(commonActions.DEVICEUPDATEEVENT), withLatestFrom(this.store$.select(mapReducers.selectGetFeatures)), mergeMap(([action, features]) => { - let deviceUpdateEventAction = action as commonActions.DeviceUpdateEvent; - var feature: Feature = null; - for (let f of features) { + const deviceUpdateEventAction = action as commonActions.DeviceUpdateEvent; + let feature: Feature = null; + for (const f of features) { if (f.getId() == deviceUpdateEventAction.itemCode) { feature = f; break; @@ -274,7 +274,7 @@ export class MapEffects { ofType(commonActions.ITEMCHANGEDEVENT), withLatestFrom(this.store$.select(mapReducers.selectGetSelectedItem)), mergeMap(([action, selectedItem]) => { - let itemChangedAction = action as commonActions.ItemChangedEvent; + const itemChangedAction = action as commonActions.ItemChangedEvent; if (selectedItem && selectedItem.code == itemChangedAction.itemCode) { return this.itemService$.getItem(itemChangedAction.itemCode).pipe( switchMap(child => { @@ -309,11 +309,11 @@ export class MapEffects { getLayerValue$ = createEffect(() => this.actions$.pipe( ofType(mapActions.GETLAYERVALUE), mergeMap((action:mapActions.GetLayerValue) => { - var l = action.itemLayer.item.data["layers"][action.itemLayer.layerIndex]; - var scale = l.scale?l.scale:1; + const l = action.itemLayer.item.data["layers"][action.itemLayer.layerIndex]; + const scale = l.scale?l.scale:1; return this.itemService$.getLayerValue(action.itemLayer.item.code,action.itemLayer.layerIndex,action.x,action.y).pipe( mergeMap((v: number) => { - let a=[]; + const a=[]; if(v !== null) { if(l.renderer && l.renderer.colorMap && l.renderer.colorMap.colormapType == "manual") { l.renderer.colorMap.entries.forEach((e) => { @@ -346,7 +346,7 @@ export class MapEffects { withLatestFrom(this.store$.select(mapReducers.selectGetLayerValuesEnabled)), withLatestFrom(this.store$.select(mapReducers.selectGetOverlayLayers)), mergeMap(([[[action, selected], enabled],overlayLayers]) => { - let layers = []; + const layers = []; if(selected) { if(selected && (selected as TemporalItemLayer).selectedItemLayer ) { selected=(selected as TemporalItemLayer).selectedItemLayer; @@ -356,8 +356,8 @@ export class MapEffects { overlayLayers.forEach((ol) => { if(ol!=selected) layers.push(ol); }); - let a = action as mapActions.SetLayerValuesLocation; - let actions = []; + const a = action as mapActions.SetLayerValuesLocation; + const actions = []; if(enabled) { layers.forEach((ol) => { if("vnd.farmmaps.itemtype.shape.processed,vnd.farmmaps.itemtype.geotiff.processed".indexOf(ol.item.itemType)>=0) { @@ -373,14 +373,14 @@ export class MapEffects { ofType(mapActions.SETSTATE), withLatestFrom(this.store$.select(mapReducers.selectGetInSearch)), switchMap(([action,inSearch]) => { - let a = action as mapActions.SetState; + const a = action as mapActions.SetState; return this.getActionFromQueryState(a.queryState,inSearch); }))); escape$ = createEffect(() => this.actions$.pipe( ofType(commonActions.ESCAPE), switchMap((action) => { - let a = action as commonActions.Escape; + const a = action as commonActions.Escape; if(a.escapeKey) { return of(new mapActions.Clear()); } else { @@ -393,7 +393,7 @@ export class MapEffects { switchMap(() => this.store$.select(selectRouteData as any)), switchMap((data: any) => { if(data && data["fm-map-map"]) { - let params = data["fm-map-map"]; + const params = data["fm-map-map"]; this.overrideSelectedItemLayer = params["overrideSelectedItemlayer"] ? params["overrideSelectedItemlayer"] : false; } else { this.overrideSelectedItemLayer = false; diff --git a/projects/common-map/src/fm-map/models/item.layer.ts b/projects/common-map/src/fm-map/models/item.layer.ts index 3840ff9..f486ef2 100644 --- a/projects/common-map/src/fm-map/models/item.layer.ts +++ b/projects/common-map/src/fm-map/models/item.layer.ts @@ -15,13 +15,13 @@ export interface IItemLayer { export class ItemLayer implements IItemLayer { public item: IItem; public layer: Layer = null; - public visible: boolean = true; - public legendVisible: boolean = false; + public visible = true; + public legendVisible = false; public projection: string; - public opacity: number = 1; - public layerIndex: number = -1; + public opacity = 1; + public layerIndex = -1; - constructor(item:IItem,opacity:number = 1, visible:boolean = true,layerIndex:number=-1) { + constructor(item:IItem,opacity = 1, visible = true,layerIndex=-1) { this.item = item; this.opacity = opacity; this.visible = visible; @@ -42,7 +42,7 @@ export class TemporalItemLayer extends ItemLayer implements ITemporalItemLayer { public nextItemLayer:IItemLayer = null; public temporalItems:IItem[] = []; - constructor(item:IItem,opacity:number = 1, visible:boolean = true) { + constructor(item:IItem,opacity = 1, visible = true) { super(item,opacity,visible) } } diff --git a/projects/common-map/src/fm-map/models/style.cache.ts b/projects/common-map/src/fm-map/models/style.cache.ts index 9611d6e..8c681e3 100644 --- a/projects/common-map/src/fm-map/models/style.cache.ts +++ b/projects/common-map/src/fm-map/models/style.cache.ts @@ -4,4 +4,4 @@ import {Geometry } from 'ol/geom'; export interface IStyles{ [id: string]: Style | ((featue:Feature) => Style); -}; \ No newline at end of file +} \ No newline at end of file diff --git a/projects/common-map/src/fm-map/reducers/map.reducer.ts b/projects/common-map/src/fm-map/reducers/map.reducer.ts index 29f0070..e1d24b4 100644 --- a/projects/common-map/src/fm-map/reducers/map.reducer.ts +++ b/projects/common-map/src/fm-map/reducers/map.reducer.ts @@ -123,56 +123,56 @@ export const initialState: State = { export function reducer(state = initialState, action: mapActions.Actions | commonActions.Actions | RouterNavigationAction): State { switch (action.type) { case ROUTER_NAVIGATION: { - let a = action as RouterNavigationAction; + const a = action as RouterNavigationAction; return tassign(state); } case mapActions.SETMAPSTATE: { - let a = action as mapActions.SetMapState; + const a = action as mapActions.SetMapState; return tassign(state, { mapState: a.mapState }); } case mapActions.SETQUERYSTATE: { - let a = action as mapActions.SetQueryState; + const a = action as mapActions.SetQueryState; return tassign(state, { queryState: tassign(a.queryState ),replaceUrl:a.replaceUrl}); } case mapActions.SETSTATE: { - let a = action as mapActions.SetState; + const a = action as mapActions.SetState; return tassign(state, { mapState: tassign(a.mapState), queryState: tassign(a.queryState)}); } case mapActions.SETVIEWEXTENT: { - let a = action as mapActions.SetViewExtent; + const a = action as mapActions.SetViewExtent; return tassign(state, { viewExtent: a.extent }); } case mapActions.SETPARENT: { - let a = action as mapActions.SetParent; + const a = action as mapActions.SetParent; return tassign(state, { parentCode : a.parentCode }); } case mapActions.STARTSEARCHSUCCESS: { - let a = action as mapActions.StartSearchSuccess; + const a = action as mapActions.StartSearchSuccess; return tassign(state, { features: a.features, inSearch:false }); } case mapActions.SETFEATURES: { - let a = action as mapActions.SetFeatures; + const a = action as mapActions.SetFeatures; return tassign(state, { features: a.features }); } case mapActions.SELECTFEATURE: { - let a = action as mapActions.SelectFeature; + const a = action as mapActions.SelectFeature; return tassign(state, { selectedFeature: state.selectedItem?state.selectedFeature: a.feature }); } case mapActions.SELECTITEM: { - let a = action as mapActions.SelectItem; - let itemCode = state.selectedItem ? state.selectedItem.code : ""; - let inSearch = a.itemCode != itemCode; + const a = action as mapActions.SelectItem; + const itemCode = state.selectedItem ? state.selectedItem.code : ""; + const inSearch = a.itemCode != itemCode; return tassign(state, { selectedItem: null, selectedItemLayer: null, @@ -182,7 +182,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo }); } case mapActions.SELECTITEMSUCCESS: { - let a = action as mapActions.SelectItemSuccess; + const a = action as mapActions.SelectItemSuccess; return tassign(state, { inSearch:false, selectedItem: a.item, @@ -195,8 +195,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo }); } case mapActions.SETSELECTEDITEMLAYER: { - let a = action as mapActions.SetSelectedItemLayer; - var itemLayer = null; + const a = action as mapActions.SetSelectedItemLayer; + let itemLayer = null; if (a.item && "vnd.farmmaps.itemtype.layer,vnd.farmmaps.itemtype.shape.processed,vnd.farmmaps.itemtype.geotiff.processed".indexOf(a.item.itemType) >=0 ) { itemLayer = new ItemLayer(a.item); itemLayer.layerIndex = a.layerIndex>=0?a.layerIndex:a.item.data.layers?a.item.data.layers[0].index:-1; @@ -209,12 +209,12 @@ export function reducer(state = initialState, action: mapActions.Actions | commo }); } case mapActions.SELECTTEMPORALITEMSSUCCESS:{ - let a = action as mapActions.SelectTemporalItemsSuccess; - let selectedItemLayer=tassign(state.selectedItemLayer) as TemporalItemLayer; + const a = action as mapActions.SelectTemporalItemsSuccess; + const selectedItemLayer=tassign(state.selectedItemLayer) as TemporalItemLayer; let layerIndex=-1; selectedItemLayer.temporalItems = a.temporalItems; if(a.temporalItems.length>0) { - let item = a.temporalItems[a.temporalItems.length-1]; + const item = a.temporalItems[a.temporalItems.length-1]; layerIndex = item.data.layers[0].index; selectedItemLayer.selectedItemLayer = new ItemLayer(item,1,true,layerIndex); } else { @@ -223,16 +223,16 @@ export function reducer(state = initialState, action: mapActions.Actions | commo selectedItemLayer.previousItemLayer = a.temporalItems.length>1?new ItemLayer(a.temporalItems[a.temporalItems.length-2],0,true,layerIndex):null; selectedItemLayer.nextItemLayer = null; if(selectedItemLayer.selectedItemLayer) { - let layerIndex = selectedItemLayer.selectedItemLayer.item.data.layers[0].index; + const layerIndex = selectedItemLayer.selectedItemLayer.item.data.layers[0].index; selectedItemLayer.layerIndex = layerIndex; } return tassign(state,{selectedItemLayer:tassign(state.selectedItemLayer,selectedItemLayer as ItemLayer)}); } case mapActions.NEXTTEMPORAL: { - let temporalLayer = state.selectedItemLayer as ITemporalItemLayer; + const temporalLayer = state.selectedItemLayer as ITemporalItemLayer; if(temporalLayer.temporalItems && temporalLayer.temporalItems.length>0) { - let index = temporalLayer.temporalItems.indexOf(temporalLayer.selectedItemLayer.item); + const index = temporalLayer.temporalItems.indexOf(temporalLayer.selectedItemLayer.item); if(index == (temporalLayer.temporalItems.length-1)) { return state; } else { @@ -258,9 +258,9 @@ export function reducer(state = initialState, action: mapActions.Actions | commo } } case mapActions.PREVIOUSTEMPORAL: { - let temporalLayer = state.selectedItemLayer as ITemporalItemLayer; + const temporalLayer = state.selectedItemLayer as ITemporalItemLayer; if(temporalLayer.temporalItems && temporalLayer.temporalItems.length>0) { - let index = temporalLayer.temporalItems.indexOf(temporalLayer.selectedItemLayer.item); + const index = temporalLayer.temporalItems.indexOf(temporalLayer.selectedItemLayer.item); if(index == 0) { return state; } else { @@ -289,8 +289,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo //todo implement } case mapActions.STARTSEARCH: { - let a = action as mapActions.StartSearch; - let panelVisible = a.queryState.itemCode!=null ||a.queryState.itemType!=null||a.queryState.parentCode!=null || a.queryState.query != null || a.queryState.tags != null; + const a = action as mapActions.StartSearch; + const panelVisible = a.queryState.itemCode!=null ||a.queryState.itemType!=null||a.queryState.parentCode!=null || a.queryState.query != null || a.queryState.tags != null; return tassign(state, { selectedItem: null, features:[], @@ -306,7 +306,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo return tassign(state,{inSearch:false}); } case mapActions.DOQUERY: { - let a = action as mapActions.DoQuery; + const a = action as mapActions.DoQuery; return tassign(state, { query: tassign(state.query, { @@ -321,8 +321,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo } case mapActions.ADDFEATURESUCCESS: { - let a = action as mapActions.AddFeatureSuccess; - let features = state.features.slice(); + const a = action as mapActions.AddFeatureSuccess; + const features = state.features.slice(); features.push(a.feature); return tassign(state, { panelVisible: true, @@ -334,8 +334,8 @@ export function reducer(state = initialState, action: mapActions.Actions | commo }); } case mapActions.UPDATEFEATURESUCCESS: { - let a = action as mapActions.UpdateFeatureSuccess; - let features: any[] = []; + const a = action as mapActions.UpdateFeatureSuccess; + const features: any[] = []; var index = -1; for (var i = 0; i < state.features.length; i++) { if (state.features[i].getId() == a.feature.getId()) { @@ -356,15 +356,15 @@ export function reducer(state = initialState, action: mapActions.Actions | commo return tassign(state, { searchCollapsed: state.panelVisible ? false: true,showLayerSwitcher:false}); } case mapActions.SETEXTENT: { - let a = action as mapActions.SetExtent; + const a = action as mapActions.SetExtent; return tassign(state, { extent: a.extent }); } case mapActions.ADDLAYER: { - let a = action as mapActions.AddLayer; - let itemLayers = state.overlayLayers.slice(0); - let itemLayer = new ItemLayer(a.item); + const a = action as mapActions.AddLayer; + const itemLayers = state.overlayLayers.slice(0); + const itemLayer = new ItemLayer(a.item); itemLayer.layerIndex = a.layerIndex == -1 ? 0 : a.layerIndex; - let existing = itemLayers.filter(il => il.item.code == itemLayer.item.code && il.layerIndex == itemLayer.layerIndex); + const existing = itemLayers.filter(il => il.item.code == itemLayer.item.code && il.layerIndex == itemLayer.layerIndex); if(existing.length==0) { itemLayers.push(itemLayer); return tassign(state, { overlayLayers: itemLayers, selectedOverlayLayer: itemLayer }); @@ -374,10 +374,10 @@ export function reducer(state = initialState, action: mapActions.Actions | commo } case mapActions.REMOVELAYER: { - let a = action as mapActions.RemoveLayer; - let newLayers = state.overlayLayers.slice(0); - let i = state.overlayLayers.indexOf(a.itemLayer); - var selectedOverlayLayer: IItemLayer = null; + const a = action as mapActions.RemoveLayer; + const newLayers = state.overlayLayers.slice(0); + const i = state.overlayLayers.indexOf(a.itemLayer); + let selectedOverlayLayer: IItemLayer = null; if (i>0 && state.overlayLayers.length > 1) selectedOverlayLayer = state.overlayLayers[i - 1]; else if (i == 0 && state.overlayLayers.length > 1) @@ -389,49 +389,49 @@ export function reducer(state = initialState, action: mapActions.Actions | commo return tassign(state, {overlayLayers: [], selectedOverlayLayer: null}); } case mapActions.SETVISIBILITY: { - let a = action as mapActions.SetVisibility; + const a = action as mapActions.SetVisibility; if(state.selectedItemLayer == a.itemLayer) { return tassign(state,{selectedItemLayer: tassign(state.selectedItemLayer,{visible:a.visibility})}); } else { - let newLayers = state.overlayLayers.slice(0); - let i = state.overlayLayers.indexOf(a.itemLayer); + const newLayers = state.overlayLayers.slice(0); + const i = state.overlayLayers.indexOf(a.itemLayer); newLayers[i].visible = a.visibility; return tassign(state, { overlayLayers: newLayers }); } } case mapActions.SETOPACITY: { - let a = action as mapActions.SetOpacity; + const a = action as mapActions.SetOpacity; if(state.selectedItemLayer == a.itemLayer) { return tassign(state,{selectedItemLayer: tassign(state.selectedItemLayer,{opacity:a.opacity})}); } else { - let newLayers = state.overlayLayers.slice(0); - let i = state.overlayLayers.indexOf(a.itemLayer); + const newLayers = state.overlayLayers.slice(0); + const i = state.overlayLayers.indexOf(a.itemLayer); newLayers[i].opacity = a.opacity; return tassign(state, { overlayLayers: newLayers }); } } case mapActions.SETLAYERINDEX: { - let a = action as mapActions.SetLayerIndex; + const a = action as mapActions.SetLayerIndex; if (a.itemLayer == null) { if(state.selectedItemLayer.item.itemType == "vnd.farmmaps.itemtype.temporal") { var newItemlayer = tassign(state.selectedItemLayer,{layerIndex:a.layerIndex}); - let tl = newItemlayer as ITemporalItemLayer; + const tl = newItemlayer as ITemporalItemLayer; if(tl.previousItemLayer) { - let nl = new ItemLayer(tl.previousItemLayer.item); + const nl = new ItemLayer(tl.previousItemLayer.item); nl.opacity = tl.previousItemLayer.opacity; nl.visible = tl.previousItemLayer.visible; nl.layerIndex = a.layerIndex; tl.previousItemLayer = nl; } if(tl.selectedItemLayer) { - let nl = new ItemLayer(tl.selectedItemLayer.item); + const nl = new ItemLayer(tl.selectedItemLayer.item); nl.opacity = tl.selectedItemLayer.opacity; nl.visible = tl.selectedItemLayer.visible; nl.layerIndex = a.layerIndex; tl.selectedItemLayer = nl; } if(tl.nextItemLayer) { - let nl = new ItemLayer(tl.nextItemLayer.item); + const nl = new ItemLayer(tl.nextItemLayer.item); nl.opacity = tl.nextItemLayer.opacity; nl.visible = tl.nextItemLayer.visible; nl.layerIndex = a.layerIndex; @@ -444,24 +444,24 @@ export function reducer(state = initialState, action: mapActions.Actions | commo } return tassign(state, { selectedItemLayer: newItemlayer}) } else { - let newLayers = state.overlayLayers.slice(0); - let i = state.overlayLayers.indexOf(a.itemLayer); + const newLayers = state.overlayLayers.slice(0); + const i = state.overlayLayers.indexOf(a.itemLayer); newLayers[i].layerIndex = a.layerIndex; return tassign(state, { overlayLayers: newLayers }); } } case mapActions.LOADBASELAYERSSUCCESS: { - let a =action as mapActions.LoadBaseLayersSuccess; - let baseLayers:ItemLayer[] = []; - for (let item of a.items) { - var l = new ItemLayer(item); + const a =action as mapActions.LoadBaseLayersSuccess; + const baseLayers:ItemLayer[] = []; + for (const item of a.items) { + const l = new ItemLayer(item); l.visible = false; baseLayers.push(l); } - var selectedBaseLayer: IItemLayer = null; + let selectedBaseLayer: IItemLayer = null; var mapState = tassign(state.mapState); - let sb = baseLayers.filter(layer => layer.item.code === mapState.baseLayerCode); - let db = baseLayers.filter(layer => layer.item.data && layer.item.data.default === true); + const sb = baseLayers.filter(layer => layer.item.code === mapState.baseLayerCode); + const db = baseLayers.filter(layer => layer.item.data && layer.item.data.default === true); if (baseLayers.length > 0 && mapState.baseLayerCode != "" && sb.length>0) { selectedBaseLayer = sb[0]; selectedBaseLayer.visible = true; @@ -476,22 +476,22 @@ export function reducer(state = initialState, action: mapActions.Actions | commo return tassign(state, { mapState:mapState, baseLayers: baseLayers, selectedBaseLayer: selectedBaseLayer }); } case mapActions.SELECTBASELAYER: { - let a = action as mapActions.SelectBaseLayer; - let baseLayers = state.baseLayers.slice(0); + const a = action as mapActions.SelectBaseLayer; + const baseLayers = state.baseLayers.slice(0); baseLayers.forEach((l) => l.visible = false); - let i = state.baseLayers.indexOf(a.itemLayer); + const i = state.baseLayers.indexOf(a.itemLayer); baseLayers[i].visible = true; var mapState = tassign(state.mapState); mapState.baseLayerCode = a.itemLayer.item.code; return tassign(state, {mapState:mapState, baseLayers:baseLayers,selectedBaseLayer:a.itemLayer }); } case mapActions.SELECTOVERLAYLAYER: { - let a = action as mapActions.SelectOverlayLayer; + const a = action as mapActions.SelectOverlayLayer; return tassign(state, { selectedOverlayLayer: a.itemLayer }); } case mapActions.CLEAR: { - let newQueryState = tassign(state.queryState, { query: null, tags: null, itemCode: null, parentCode: null, itemType: null }); + const newQueryState = tassign(state.queryState, { query: null, tags: null, itemCode: null, parentCode: null, itemType: null }); return tassign(state, { panelVisible: false, panelCollapsed:false, @@ -511,41 +511,41 @@ export function reducer(state = initialState, action: mapActions.Actions | commo }); } case mapActions.SETSTYLE:{ - let a = action as mapActions.SetStyle; - let styles = tassign(state.styles); + const a = action as mapActions.SetStyle; + const styles = tassign(state.styles); styles[a.itemType] = a.style; return tassign(state,{styles:styles}); } case mapActions.SHOWLAYERSWITCHER:{ - let a = action as mapActions.ShowLayerSwitcher; + const a = action as mapActions.ShowLayerSwitcher; return tassign(state,{showLayerSwitcher:a.show}); } case mapActions.TOGGLESHOWDATALAYERSLIDE:{ return tassign(state,{showDataLayerSlide:!state.showDataLayerSlide}); } case mapActions.SETREPLACEURL: { - let a= action as mapActions.SetReplaceUrl; + const a= action as mapActions.SetReplaceUrl; return tassign(state,{replaceUrl:a.replaceUrl}); } case mapActions.TOGGLELAYERVALUESENABLED: { return tassign(state,{layerValuesEnabled:!state.layerValuesEnabled}); } case mapActions.SETLAYERVALUESLOCATION: { - let a= action as mapActions.SetLayerValuesLocation; + const a= action as mapActions.SetLayerValuesLocation; return tassign(state,{layerValuesX: a.x, layerValuesY:a.y,layerValues:[]}); } case mapActions.GETLAYERVALUESUCCESS:{ - let a= action as mapActions.GetLayerValueSuccess; - let v = state.layerValues.slice(0); + const a= action as mapActions.GetLayerValueSuccess; + const v = state.layerValues.slice(0); v.push(a.layervalue); return tassign(state,{layerValues:v}); } case mapActions.SETVIEWSTATE:{ - let a= action as mapActions.SetViewState; + const a= action as mapActions.SetViewState; return tassign(state,{viewEnabled:a.enabled}); } case commonActions.ITEMDELETEDEVENT:{ - let a= action as commonActions.ItemDeletedEvent; + const a= action as commonActions.ItemDeletedEvent; if(state.selectedItem && state.selectedItem.code == a.itemCode) { return tassign(state,{ selectedItem: null, @@ -562,7 +562,7 @@ export function reducer(state = initialState, action: mapActions.Actions | commo } } if(index>=0) { - let newFeatures = state.features.slice(0); + const newFeatures = state.features.slice(0); newFeatures.splice(index,1); return tassign(state,{features:newFeatures}); } diff --git a/projects/common-map/src/fm-map/services/device-orientation.service.ts b/projects/common-map/src/fm-map/services/device-orientation.service.ts index c7978f2..1043447 100644 --- a/projects/common-map/src/fm-map/services/device-orientation.service.ts +++ b/projects/common-map/src/fm-map/services/device-orientation.service.ts @@ -8,25 +8,25 @@ export class DeviceOrientationService { compassHeading(alpha, beta, gamma):number { // Convert degrees to radians - var alphaRad = alpha * (Math.PI / 180); - var betaRad = beta * (Math.PI / 180); - var gammaRad = gamma * (Math.PI / 180); + const alphaRad = alpha * (Math.PI / 180); + const betaRad = beta * (Math.PI / 180); + const gammaRad = gamma * (Math.PI / 180); // Calculate equation components - var cA = Math.cos(alphaRad); - var sA = Math.sin(alphaRad); - var cB = Math.cos(betaRad); - var sB = Math.sin(betaRad); - var cG = Math.cos(gammaRad); - var sG = Math.sin(gammaRad); + const cA = Math.cos(alphaRad); + const sA = Math.sin(alphaRad); + const cB = Math.cos(betaRad); + const sB = Math.sin(betaRad); + const cG = Math.cos(gammaRad); + const sG = Math.sin(gammaRad); // Calculate A, B, C rotation components - var rA = - cA * sG - sA * sB * cG; - var rB = - sA * sG + cA * sB * cG; - var rC = - cB * cG; + const rA = - cA * sG - sA * sB * cG; + const rB = - sA * sG + cA * sB * cG; + const rC = - cB * cG; // Calculate compass heading - var compassHeading = Math.atan(rA / rB); + let compassHeading = Math.atan(rA / rB); // Convert from half unit circle to whole unit circle if(rB < 0) { @@ -40,7 +40,7 @@ export class DeviceOrientationService { getCurrentCompassHeading(): Observable { return Observable.create((observer: Observer) => { window.addEventListener("deviceorientation", (event:DeviceOrientationEvent)=>{ - let heading = this.compassHeading(event.alpha,event.beta,event.gamma); + const heading = this.compassHeading(event.alpha,event.beta,event.gamma); if(!Number.isNaN(heading)) { observer.next(heading); } diff --git a/projects/common-map/src/fm-map/services/feature-icon.service.ts b/projects/common-map/src/fm-map/services/feature-icon.service.ts index 70a5a17..af85ba3 100644 --- a/projects/common-map/src/fm-map/services/feature-icon.service.ts +++ b/projects/common-map/src/fm-map/services/feature-icon.service.ts @@ -7,31 +7,31 @@ import * as extent from 'ol/extent'; @Injectable() export class FeatureIconService { - getIconImageDataUrl(iconClass:string, backgroundColor: string = "#c80a6e",color:string = "#ffffff"): string { - var canvas = document.createElement('canvas'); + getIconImageDataUrl(iconClass:string, backgroundColor = "#c80a6e",color = "#ffffff"): string { + const canvas = document.createElement('canvas'); canvas.width = 365; canvas.height = 560; - var ctx = canvas.getContext('2d'); + const ctx = canvas.getContext('2d'); ctx.lineWidth = 6; ctx.fillStyle = backgroundColor; ctx.strokeStyle = "#000000"; - var path = new Path2D("m182.9 551.7c0 0.1 0.2 0.3 0.2 0.3s175.2-269 175.2-357.4c0-130.1-88.8-186.7-175.4-186.9-86.6 0.2-175.4 56.8-175.4 186.9 0 88.4 175.3 357.4 175.3 357.4z"); + const path = new Path2D("m182.9 551.7c0 0.1 0.2 0.3 0.2 0.3s175.2-269 175.2-357.4c0-130.1-88.8-186.7-175.4-186.9-86.6 0.2-175.4 56.8-175.4 186.9 0 88.4 175.3 357.4 175.3 357.4z"); ctx.fill(path) - var iconCharacter = ""; + let iconCharacter = ""; if (iconClass != null) { - var element = document.createElement("i"); + const element = document.createElement("i"); element.style.display = "none"; element.className = iconClass; document.body.appendChild(element); iconCharacter = getComputedStyle(element, "::before").content.replace(/"/g, ''); - let iconFont = "200px " +getComputedStyle(element, "::before").fontFamily + const iconFont = "200px " +getComputedStyle(element, "::before").fontFamily document.body.removeChild(element); ctx.strokeStyle = color; ctx.fillStyle = color; ctx.lineWidth = 15; ctx.font = iconFont; - var ts = ctx.measureText(iconCharacter); + const ts = ctx.measureText(iconCharacter); ctx.fillText(iconCharacter, 182.9 - (ts.width / 2), 250); ctx.strokeText(iconCharacter, 182.9 - (ts.width / 2), 250); } diff --git a/projects/common-map/src/fm-map/services/temporal.service.ts b/projects/common-map/src/fm-map/services/temporal.service.ts index 6d5a58a..537cab4 100644 --- a/projects/common-map/src/fm-map/services/temporal.service.ts +++ b/projects/common-map/src/fm-map/services/temporal.service.ts @@ -9,19 +9,19 @@ export class TemporalService { constructor(private timespanService$:TimespanService,private datePipe$: DatePipe) {} hasNext(itemLayer:IItemLayer):boolean { - let temporalItemLayer = itemLayer as ITemporalItemLayer; + const temporalItemLayer = itemLayer as ITemporalItemLayer; return temporalItemLayer && temporalItemLayer.nextItemLayer != null; } selectedDate(itemLayer:IItemLayer):string { - let temporalItemLayer = itemLayer as ITemporalItemLayer; + const temporalItemLayer = itemLayer as ITemporalItemLayer; if(temporalItemLayer && temporalItemLayer.selectedItemLayer) { if(temporalItemLayer && temporalItemLayer.selectedItemLayer.item.dataDate && temporalItemLayer.selectedItemLayer.item.dataEndDate) { - let sd = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataDate)); - let ed = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataEndDate)); + const sd = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataDate)); + const ed = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataEndDate)); return this.timespanService$.getCaption(sd,ed); } else { - let d = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataDate)); + const d = new Date(Date.parse(temporalItemLayer.selectedItemLayer.item.dataDate)); return this.datePipe$.transform(d, "shortDate"); } } @@ -29,14 +29,14 @@ export class TemporalService { } nextDate(itemLayer:IItemLayer):string { - let temporalItemLayer = itemLayer as ITemporalItemLayer; + const temporalItemLayer = itemLayer as ITemporalItemLayer; if(temporalItemLayer && temporalItemLayer.nextItemLayer && temporalItemLayer.nextItemLayer.item) { if(temporalItemLayer.nextItemLayer.item.dataDate && temporalItemLayer.nextItemLayer.item.dataEndDate) { - let sd = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate)); - let ed = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataEndDate)); + const sd = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate)); + const ed = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataEndDate)); return this.timespanService$.getCaption(sd,ed); } else { - let d = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate)); + const d = new Date(Date.parse(temporalItemLayer.nextItemLayer.item.dataDate)); return this.datePipe$.transform(d, "shortDate"); } } @@ -44,19 +44,19 @@ export class TemporalService { } hasPrevious(itemLayer:IItemLayer):boolean { - let temporalItemLayer = itemLayer as ITemporalItemLayer; + const temporalItemLayer = itemLayer as ITemporalItemLayer; return temporalItemLayer && temporalItemLayer.previousItemLayer != null; } previousDate(itemLayer:IItemLayer):string { - let temporalItemLayer = itemLayer as ITemporalItemLayer; + const temporalItemLayer = itemLayer as ITemporalItemLayer; if(temporalItemLayer && temporalItemLayer.previousItemLayer && temporalItemLayer.previousItemLayer.item) { if(temporalItemLayer.previousItemLayer.item.dataDate && temporalItemLayer.previousItemLayer.item.dataEndDate) { - let sd = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate)); - let ed = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataEndDate)); + const sd = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate)); + const ed = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataEndDate)); return this.timespanService$.getCaption(sd,ed); } else { - let d = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate)); + const d = new Date(Date.parse(temporalItemLayer.previousItemLayer.item.dataDate)); return this.datePipe$.transform(d, "shortDate"); } } diff --git a/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts index 43443ae..c7da446 100644 --- a/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts +++ b/projects/common-map3d/src/fm-map3d/components/olcs/switch2d3d/switch2d3d.component.ts @@ -15,10 +15,10 @@ import { Store } from '@ngrx/store'; export class Switch2D3DComponent { @Input() enable:boolean; - public label: string = "3D"; + public label = "3D"; private ol3d: OLCesium; private synchronizers:any[]; - public loading:boolean = true; + public loading = true; private interactions:Interaction[] = []; diff --git a/projects/common/src/fm/components/app-menu/app-menu.component.ts b/projects/common/src/fm/components/app-menu/app-menu.component.ts index 9c9a93a..a479c89 100644 --- a/projects/common/src/fm/components/app-menu/app-menu.component.ts +++ b/projects/common/src/fm/components/app-menu/app-menu.component.ts @@ -14,7 +14,7 @@ export class AppMenuComponent implements OnInit { @Input() user:IUser; @Input() showMenu:boolean; - public noContent: boolean = true; + public noContent = true; constructor(private store: Store) { } diff --git a/projects/common/src/fm/components/app/app.component.ts b/projects/common/src/fm/components/app/app.component.ts index 4b2f9b9..8dd79a5 100644 --- a/projects/common/src/fm/components/app/app.component.ts +++ b/projects/common/src/fm/components/app/app.component.ts @@ -29,9 +29,9 @@ import * as appReducers from '../../reducers/app-common.reducer'; export class AppComponent implements OnInit, OnDestroy { // This will go at the END of your title for example "Home - Angular Universal..." <-- after the dash (-) - private endPageTitle: string = 'Farmmaps'; + private endPageTitle = 'Farmmaps'; // If no Title is provided, we'll use a default one before the dash(-) - private defaultPageTitle: string = 'Farmmaps'; + private defaultPageTitle = 'Farmmaps'; private routerSub$: Subscription; private eventSub$: Subscription; @@ -49,7 +49,7 @@ export class AppComponent implements OnInit, OnDestroy { public unreadNotifications: Observable = this.store$.select(appReducers.SelectgetUnreadNotifications); public user: Observable = this.store$.select(appReducers.SelectGetUser); public isPageMode: Observable = this.store$.select(appReducers.SelectGetIsPageMode); - @Input() showUploadProgress: boolean = true; + @Input() showUploadProgress = true; constructor( @Optional() @Inject(FM_COMMON_STARTPAGE) public startPage: string, @@ -68,7 +68,7 @@ export class AppComponent implements OnInit, OnDestroy { getActionFromEvent(event: IEventMessage): Action { - var action: Action = null; + let action: Action = null; console.debug(`${event.eventType} Event received`); switch (event.eventType) { case "ItemChanged": { @@ -131,7 +131,7 @@ export class AppComponent implements OnInit, OnDestroy { @HostListener('document:keyup', ['$event']) onKeyUp(event: KeyboardEvent) { - let x = event.keyCode; + const x = event.keyCode; if (x === 27) { this.store$.dispatch(new commonActions.Escape(true, false)); } @@ -148,8 +148,8 @@ export class AppComponent implements OnInit, OnDestroy { this.oauthService$.events.subscribe((event) => { console.debug(event.type); if (event.type == 'token_error' || event.type == 'silent_refresh_timeout' || event.type == 'logout') { - let e = event as OAuthErrorEvent; - let p = e.params as any; + const e = event as OAuthErrorEvent; + const p = e.params as any; if (event.type == 'silent_refresh_timeout' || event.type == 'logout' || (p.error && p.error == 'login_required')) { console.debug("Session expired"); this.router.navigate(['loggedout'], { queryParams: { redirectTo: this.router.url } }); @@ -169,7 +169,7 @@ export class AppComponent implements OnInit, OnDestroy { } private InstallRouteEventHandler() { - var other = this; + const other = this; this.routerSub$ = this.router.events.subscribe(event => { if (event instanceof RouteConfigLoadStart) { other.store$.dispatch(new commonActions.StartRouteLoading()); @@ -189,9 +189,9 @@ export class AppComponent implements OnInit, OnDestroy { } private InstallEventServiceEventHandler() { - var other = this; + const other = this; this.eventSub$ = this.eventService$.event.subscribe(event => { - var action = other.getActionFromEvent(event); + const action = other.getActionFromEvent(event); if (action) other.store$.dispatch(action); }); } diff --git a/projects/common/src/fm/components/avatar/avatar.component.ts b/projects/common/src/fm/components/avatar/avatar.component.ts index 5672e66..da13e45 100644 --- a/projects/common/src/fm/components/avatar/avatar.component.ts +++ b/projects/common/src/fm/components/avatar/avatar.component.ts @@ -12,8 +12,8 @@ export class AvatarComponent implements OnInit { @Input() user: IUser; @Input() bgColor: string; @Input() fgColor: string; - @Input() size: number = 75; - @Input() round: boolean = true; + @Input() size = 75; + @Input() round = true; @Output() click = new EventEmitter(); diff --git a/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.ts b/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.ts index 22b35f1..e1282f9 100644 --- a/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.ts +++ b/projects/common/src/fm/components/edit-image-modal/edit-image-modal.component.ts @@ -16,16 +16,16 @@ export class EditImageModalComponent implements OnInit { constructor(private modalService: NgbModal,public imageService:ImageService) { } - isImageLoaded:boolean = false; + isImageLoaded = false; aspectRatio:number = 4/3; imageChangedEvent: any = ''; - croppedImage: string = ''; + croppedImage = ''; endpointUrl:string = null; imageUrl:string = null; - maxWidth:number = 200; - roundImage:boolean = false; - imageType:string = "jpeg"; - saveImage:boolean = true; + maxWidth = 200; + roundImage = false; + imageType = "jpeg"; + saveImage = true; ngOnInit(): void { } @@ -59,7 +59,7 @@ export class EditImageModalComponent implements OnInit { save() { if(this.croppedImage) { - var blob = this.imageService.dataUrltoBlob(this.croppedImage); + const blob = this.imageService.dataUrltoBlob(this.croppedImage); if(this.saveImage) { this.imageService.putImage(this.endpointUrl,blob).subscribe(() => { this.changed.emit({}); diff --git a/projects/common/src/fm/components/gradient-select/gradient-select.component.ts b/projects/common/src/fm/components/gradient-select/gradient-select.component.ts index 239b232..a7ac5ad 100644 --- a/projects/common/src/fm/components/gradient-select/gradient-select.component.ts +++ b/projects/common/src/fm/components/gradient-select/gradient-select.component.ts @@ -8,10 +8,10 @@ import { IItem } from '../../models/item'; }) export class GradientSelectComponent implements OnChanges { - public listVisible:boolean = false; - @Input() showLabel:boolean = true; + public listVisible = false; + @Input() showLabel = true; @Input() gradientItems:IItem[]; - @Input() showAdd:boolean = false; + @Input() showAdd = false; @Input() selectedItem:IItem; @Output() onSelect:EventEmitter = new EventEmitter(); @Output() onAdd:EventEmitter = new EventEmitter(); @@ -44,8 +44,8 @@ export class GradientSelectComponent implements OnChanges { isSelected(item:IItem):boolean { if(this.selectedItem && this.selectedItem.data && this.selectedItem.data.gradient && item && item.data && item.data.gradient) { - let sid = JSON.stringify(this.selectedItem.data.gradient)+this.selectedItem.name; - let id = JSON.stringify( item.data.gradient) + item.name; + const sid = JSON.stringify(this.selectedItem.data.gradient)+this.selectedItem.name; + const id = JSON.stringify( item.data.gradient) + item.name; return sid == id; } return false; diff --git a/projects/common/src/fm/components/gradient/gradient.component.ts b/projects/common/src/fm/components/gradient/gradient.component.ts index 314cbb5..7c49d14 100644 --- a/projects/common/src/fm/components/gradient/gradient.component.ts +++ b/projects/common/src/fm/components/gradient/gradient.component.ts @@ -19,7 +19,7 @@ export class GradientComponent implements OnInit,OnChanges { getGradientStyle(item:IItem):any { if(item.data && item.data.gradient) { - let gradient = item.data.gradient as IGradientstop[]; + const gradient = item.data.gradient as IGradientstop[]; return this.gradientService.getGradientStyle(gradient); } } @@ -32,7 +32,7 @@ export class GradientComponent implements OnInit,OnChanges { ngOnChanges(changes: SimpleChanges) { if(changes['gradientItem']) { - let gradientItem = changes['gradientItem'].currentValue; + const gradientItem = changes['gradientItem'].currentValue; if(gradientItem && gradientItem.itemType == "vnd.farmmaps.itemtype.gradient") { this.gradientStyle = this.getGradientStyle(changes['gradientItem'].currentValue); this.ref.markForCheck(); diff --git a/projects/common/src/fm/components/has-role/has-role.directive.ts b/projects/common/src/fm/components/has-role/has-role.directive.ts index 1eddac5..3aea40d 100644 --- a/projects/common/src/fm/components/has-role/has-role.directive.ts +++ b/projects/common/src/fm/components/has-role/has-role.directive.ts @@ -27,6 +27,6 @@ export class HasRoleDirective implements OnInit, OnDestroy{ }); } ngOnDestroy() { - if (this.sub) {this.sub.unsubscribe() }; + if (this.sub) {this.sub.unsubscribe() } } } \ No newline at end of file diff --git a/projects/common/src/fm/components/help-menu/help-menu.component.ts b/projects/common/src/fm/components/help-menu/help-menu.component.ts index aababd0..5b28719 100644 --- a/projects/common/src/fm/components/help-menu/help-menu.component.ts +++ b/projects/common/src/fm/components/help-menu/help-menu.component.ts @@ -15,7 +15,7 @@ export class HelpMenuComponent implements OnInit { @Input() user:IUser; @Input() showMenu:boolean; - public noContent: boolean = true; + public noContent = true; constructor(private store: Store) { } diff --git a/projects/common/src/fm/components/menu-background/menu-background.component.ts b/projects/common/src/fm/components/menu-background/menu-background.component.ts index b790d94..534fad0 100644 --- a/projects/common/src/fm/components/menu-background/menu-background.component.ts +++ b/projects/common/src/fm/components/menu-background/menu-background.component.ts @@ -9,7 +9,7 @@ import * as commonActions from '../../actions/app-common.actions'; styleUrls: ['./menu-background.component.scss'], }) export class MenuBackgroundComponent implements OnInit { - @Input() visible:boolean = false; + @Input() visible = false; constructor(private store: Store) { } ngOnInit() { } diff --git a/projects/common/src/fm/components/notification-menu/notification-menu.component.ts b/projects/common/src/fm/components/notification-menu/notification-menu.component.ts index aa9a518..af1f407 100644 --- a/projects/common/src/fm/components/notification-menu/notification-menu.component.ts +++ b/projects/common/src/fm/components/notification-menu/notification-menu.component.ts @@ -15,7 +15,7 @@ export class NotificationMenuComponent implements OnInit { @Input() unread:number; @Input() user:IUser; @Input() showMenu:boolean; - public noContent: boolean = true; + public noContent = true; constructor(private store: Store) { } diff --git a/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.service.ts b/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.service.ts index 2fc70f5..d110a89 100644 --- a/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.service.ts +++ b/projects/common/src/fm/components/resumable-file-upload/resumable-file-upload.service.ts @@ -40,9 +40,9 @@ export class ResumableFileUploadService implements OnDestroy{ } updatetotalprogress() { - var totalProgress =0; - var n=0; - for(var i =0;i f.identifier == state.uploadId ) + const file =this.files.find((f) => f.identifier == state.uploadId ) if(state.status != "cancelled" && !file) { - let file = new File(state); + const file = new File(state); this.files.push(file); this.isClosed=false; this.addedFiles.next(file) @@ -66,29 +66,29 @@ export class ResumableFileUploadService implements OnDestroy{ this.isUploading = true; file.progress = (state.progress?state.progress:0); } - };break; + }break; case "complete": { if(file) { - var parts = state.url.split("/"); + const parts = state.url.split("/"); file.itemCode = parts[parts.length-1]; file.progress = (state.progress?state.progress:0); file.success=true; } - };break; + }break; case "error": { if(file) { file.error=true; file.errorMessage = state.response as string; } - };break; + }break; } this.updatetotalprogress(); this.refresh.next({}); } addFiles = (files: any[], event: any, metadata:any) => { - for (let f of files) { - var options:UploadxOptions = {metadata:metadata}; + for (const f of files) { + const options:UploadxOptions = {metadata:metadata}; this.uploadService.handleFiles(f,options); } } @@ -99,7 +99,7 @@ export class ResumableFileUploadService implements OnDestroy{ cancelFile = function (file) { this.uploadService.control({action:'cancel',uploadId:file.identifier}); - var index = this.files.indexOf(file, 0); + const index = this.files.indexOf(file, 0); if (index > -1) { this.files.splice(index, 1); } @@ -109,7 +109,7 @@ export class ResumableFileUploadService implements OnDestroy{ }; doClose = function () { - var toCancel = this.files.filter((f) => !f.success); + const toCancel = this.files.filter((f) => !f.success); toCancel.forEach(f => { this.uploadService.control({action:'cancel',uploadId:f.identifier}); }); diff --git a/projects/common/src/fm/components/side-panel/side-panel.component.ts b/projects/common/src/fm/components/side-panel/side-panel.component.ts index 6927f50..bb87a18 100644 --- a/projects/common/src/fm/components/side-panel/side-panel.component.ts +++ b/projects/common/src/fm/components/side-panel/side-panel.component.ts @@ -11,15 +11,15 @@ export class SidePanelComponent implements OnChanges { @Input() public visible: boolean; @Input() public collapsed: boolean; @Input() public collapsable: boolean; - @Input() public resizeable: boolean = false; - @Input() public left: boolean = false; + @Input() public resizeable = false; + @Input() public left = false; @Output() onResize: EventEmitter = new EventEmitter(); @ViewChild("resizeGrip") elementView: ElementRef; - public mobile:boolean = true; - private parentHeight:number = 0; + public mobile = true; + private parentHeight = 0; public top = "100%"; - private resizeTop:number=50; - public resizing:boolean=false; + private resizeTop=50; + public resizing=false; constructor(private element: ElementRef,private ref: ChangeDetectorRef) { this.collapsable = false; @@ -27,9 +27,9 @@ export class SidePanelComponent implements OnChanges { } checkMobile():boolean { - let size = parseFloat(getComputedStyle(document.documentElement).width); - let rem = parseFloat(getComputedStyle(document.documentElement).fontSize); - let threshold = 40 * rem; + const size = parseFloat(getComputedStyle(document.documentElement).width); + const rem = parseFloat(getComputedStyle(document.documentElement).fontSize); + const threshold = 40 * rem; return !(size>threshold); } @@ -54,7 +54,7 @@ export class SidePanelComponent implements OnChanges { handleStartGripDrag(event:DragEvent|TouchEvent) { this.resizing=true; if(event instanceof DragEvent) { - var crt = new Image(); + const crt = new Image(); crt.style.display = "none"; document.body.appendChild(crt); event.dataTransfer.setDragImage(crt,0,0); @@ -66,7 +66,7 @@ export class SidePanelComponent implements OnChanges { } handleGripDrag(event:DragEvent|TouchEvent) { - var clientY = 0; + let clientY = 0; if((event instanceof TouchEvent)) { clientY = (event as TouchEvent).changedTouches[0].clientY; } else { diff --git a/projects/common/src/fm/components/thumbnail/thumbnail.component.ts b/projects/common/src/fm/components/thumbnail/thumbnail.component.ts index cece25a..f235da6 100644 --- a/projects/common/src/fm/components/thumbnail/thumbnail.component.ts +++ b/projects/common/src/fm/components/thumbnail/thumbnail.component.ts @@ -16,8 +16,8 @@ import { AppConfig } from "../../shared/app.config"; export class ThumbnailComponent { @Input() public item: IListItem; - @Input() public edit: boolean = false; - @Input() public save: boolean = true; + @Input() public edit = false; + @Input() public save = true; @Output() changed = new EventEmitter(); @ViewChild('thumbnail') el:ElementRef; @ViewChild('modal') modal:EditImageModalComponent; @@ -40,7 +40,7 @@ import { AppConfig } from "../../shared/app.config"; getFontSize():string { if(this.el) { - var h = this.el.nativeElement.offsetHeight - (this.el.nativeElement.offsetHeight / 5 ) + const h = this.el.nativeElement.offsetHeight - (this.el.nativeElement.offsetHeight / 5 ) return h + "px"; } else { return "1em"; diff --git a/projects/common/src/fm/components/timespan/timespan.component.ts b/projects/common/src/fm/components/timespan/timespan.component.ts index 8e523b7..933f02a 100644 --- a/projects/common/src/fm/components/timespan/timespan.component.ts +++ b/projects/common/src/fm/components/timespan/timespan.component.ts @@ -18,55 +18,55 @@ export class TimespanComponent implements OnInit, OnChanges { unitScales:number[] = [1,1000,1000*60,1000*60*60,1000*60*60*24,1000*60*60*24*7,1000*60*60*24*31,1000*60*60*24*31*3,1000*60*60*24*365.25]; units:string[] = [ 'millisecond','second','minute','hour','day','week','month','quarter','year']; quarters:string[] = ['KW1','KW2','KW3','KW4']; - unitScale:number = 3; + unitScale = 3; viewMinDate:Date; viewMaxDate:Date; extentMinDate:Date; extentMaxDate:Date; cursorDate:Date; - leftGripMove:boolean = false; - rightGripMove:boolean = false; - rangeGripMove:boolean = false; - viewPan:boolean = false; - downX:number = -1; - mouseX: number = -1; - mouseY: number = -1; + leftGripMove = false; + rightGripMove = false; + rangeGripMove = false; + viewPan = false; + downX = -1; + mouseX = -1; + mouseY = -1; elementWidth:number; elementHeight:number; - lastOffsetInPixels:number=0; + lastOffsetInPixels=0; @ViewChild('timeLine', { static: true }) canvasRef; @ViewChild('popoverStart', { static: true }) public popoverStart:NgbPopover; @ViewChild('popoverEnd', { static: true }) public popoverEnd:NgbPopover; - @Input() collapsed: boolean = true; + @Input() collapsed = true; @Input() startDate: Date = new Date(2018,1,3); @Input() endDate: Date = new Date(2018,1,5); @Input() unit:string; - @Input() color:string = '#000000'; - @Input() background:string = '#ffffff'; - @Input() hoverColor:string ='#ffffff'; - @Input() hoverBackground:string ='#0000ff'; - @Input() lineColor:string='#000000'; - @Input() lineWidth:number=1; - @Input() padding:number = 4; + @Input() color = '#000000'; + @Input() background = '#ffffff'; + @Input() hoverColor ='#ffffff'; + @Input() hoverBackground ='#0000ff'; + @Input() lineColor='#000000'; + @Input() lineWidth=1; + @Input() padding = 4; @Output() change:EventEmitter = new EventEmitter(); - public caption:string = "2016/2017"; - public marginLeft:number = 100; - public startPopoverLeft:number=110; - public endPopoverLeft:number=120; - public rangeWidth:number =75; + public caption = "2016/2017"; + public marginLeft = 100; + public startPopoverLeft=110; + public endPopoverLeft=120; + public rangeWidth =75; public startCaption={}; public endCaption={}; - private ratio:number=1; - private initialized:boolean=false; + private ratio=1; + private initialized=false; private ctx:CanvasRenderingContext2D; public posibleUnits:number[] = []; - public height:number = 0; - public lineHeight:number = 0; + public height = 0; + public lineHeight = 0; constructor(private changeDetectorRef: ChangeDetectorRef,private datePipe: DatePipe) { } setCanvasSize() { - let canvas = this.canvasRef.nativeElement; + const canvas = this.canvasRef.nativeElement; this.elementWidth = canvas.offsetWidth; this.elementHeight = canvas.offsetHeight; canvas.height = this.elementHeight * this.ratio; @@ -74,8 +74,8 @@ export class TimespanComponent implements OnInit, OnChanges { } getPosibleUnits(scale:number):number[] { - let posibleUnits = []; - for(let u of [3,4,6,8]) { + const posibleUnits = []; + for(const u of [3,4,6,8]) { if((this.unitScale <=u) ) posibleUnits.push(u); } @@ -94,7 +94,7 @@ export class TimespanComponent implements OnInit, OnChanges { ngOnInit() { this.ratio = 2; this.unitScale = this.getUnitScale(this.unit); - let canvas:HTMLCanvasElement = this.canvasRef.nativeElement; + const canvas:HTMLCanvasElement = this.canvasRef.nativeElement; this.ctx = canvas.getContext('2d'); this.elementWidth = canvas.offsetWidth; this.elementHeight = canvas.offsetHeight; @@ -102,13 +102,13 @@ export class TimespanComponent implements OnInit, OnChanges { this.startDate = new Date(this.startDate.getTime() + this.getUnitDateOffset(this.startDate,this.unitScale,0)); this.endDate = new Date(this.endDate.getTime() + this.getUnitDateOffset(this.endDate,this.unitScale,1)); this.change.emit({startDate:this.startDate,endDate:this.endDate}); - let rangeInMilliseconds = this.endDate.getTime() - this.startDate.getTime(); + const rangeInMilliseconds = this.endDate.getTime() - this.startDate.getTime(); this.scale = this.getFitScale(rangeInMilliseconds,this.elementWidth); this.posibleUnits=this.getPosibleUnits(this.scale); this.height=this.getHeight(); this.lineHeight= this.getLineHeight(); this.setCanvasSize(); - let center = (this.startDate.getTime()+this.endDate.getTime())/2; + const center = (this.startDate.getTime()+this.endDate.getTime())/2; this.viewMinDate = new Date(center - (this.elementWidth/2* this.scale)); this.viewMaxDate = new Date(center + (this.elementWidth/2* this.scale)); this.updateStyle(this.startDate,this.endDate); @@ -118,8 +118,8 @@ export class TimespanComponent implements OnInit, OnChanges { this.initialized=true; } - getStartEndCaption(date:Date,otherDate:Date,unitScale:number,suffix:boolean = false,extended:boolean=true):string { - let showSuffix = false; + getStartEndCaption(date:Date,otherDate:Date,unitScale:number,suffix = false,extended=true):string { + const showSuffix = false; otherDate=new Date(otherDate.getTime()-1); // fix year edge case if(unitScale == 3) { let format="HH:00"; @@ -152,7 +152,7 @@ export class TimespanComponent implements OnInit, OnChanges { return this.datePipe.transform(date,format); } if(unitScale == 7) { - let q = Math.trunc(date.getMonth() /3 ); + const q = Math.trunc(date.getMonth() /3 ); return this.quarters[q]; } if(unitScale == 8) { @@ -161,17 +161,17 @@ export class TimespanComponent implements OnInit, OnChanges { return ""; } - getStartCaption(startDate:Date,unitScale:number,suffix:boolean=false,extended:boolean=true):string { + getStartCaption(startDate:Date,unitScale:number,suffix=false,extended=true):string { return this.getStartEndCaption(new Date(startDate.getTime() + (this.unitScales[unitScale]/2)), this.endDate,unitScale,suffix,extended); } - getEndCaption(endDate:Date,unitScale:number,suffix:boolean=true):string { + getEndCaption(endDate:Date,unitScale:number,suffix=true):string { return this.getStartEndCaption(new Date(endDate.getTime() - (this.unitScales[unitScale]/2)),this.startDate, unitScale,suffix); } getCaption(startDate:Date,endDate:Date,unitScale:number):string { - let startCaption=this.getStartCaption(startDate,unitScale); - let endCaption=this.getEndCaption(endDate,unitScale); + const startCaption=this.getStartCaption(startDate,unitScale); + const endCaption=this.getEndCaption(endDate,unitScale); if((endDate.getTime() - startDate.getTime()) < (1.5*this.unitScales[this.unitScale])) return endCaption; return `${startCaption}-${endCaption}`; @@ -186,20 +186,20 @@ export class TimespanComponent implements OnInit, OnChanges { } getFitScale(rangeInMilliSeconds:number,elementWidth:number):number { - let width = elementWidth*0.33; + const width = elementWidth*0.33; return rangeInMilliSeconds/width; } getUnitScale(unit:string):number { if(!unit) return 3; // hour - for(var _i=0;_i this.endDate.getTime() - oneUnit) { return this.snapToUnit(new Date(this.startDate.getTime() + offsetInMilliseconds + oneUnit),this.unitScale); @@ -367,8 +367,8 @@ export class TimespanComponent implements OnInit, OnChanges { } getStartDate(offsetInPixels:number):Date { - let oneUnit = this.unitScales[this.unitScale]; - let offsetInMilliseconds = offsetInPixels * this.scale; + const oneUnit = this.unitScales[this.unitScale]; + const offsetInMilliseconds = offsetInPixels * this.scale; if(this.leftGripMove || this.rangeGripMove) { return this.snapToUnit(new Date(this.startDate.getTime() + offsetInMilliseconds),this.unitScale); } else if(this.rightGripMove) { @@ -380,14 +380,14 @@ export class TimespanComponent implements OnInit, OnChanges { } updateControl(event:MouseEvent|TouchEvent) { - let offsetInPixels = this.getClientX(event) - this.downX; + const offsetInPixels = this.getClientX(event) - this.downX; if(this.leftGripMove || this.rightGripMove || this.rangeGripMove) { - let startDate = this.getStartDate(offsetInPixels); - let endDate = this.getEndDate(offsetInPixels); + const startDate = this.getStartDate(offsetInPixels); + const endDate = this.getEndDate(offsetInPixels); this.updateStyle(startDate,endDate) this.changeDetectorRef.detectChanges(); } else if(this.viewPan) { - let offsetInMilliseconds = offsetInPixels*this.scale; + const offsetInMilliseconds = offsetInPixels*this.scale; this.viewMinDate = new Date(this.viewMinDate.getTime()-offsetInMilliseconds); this.viewMaxDate = new Date(this.viewMaxDate.getTime()-offsetInMilliseconds); this.updateStyle(this.startDate,this.endDate); @@ -510,10 +510,10 @@ export class TimespanComponent implements OnInit, OnChanges { return true; } else { nextScale*=1.1; - let canZoom=false; - let oneUnit = (this.getUnitDateOffset(this.viewMinDate,8,1)- this.getUnitDateOffset(this.viewMinDate,8,0)) / nextScale; - let unitTextWidth=this.getUnitTextWidth(8); - let steps=this.getSteps(8); + const canZoom=false; + const oneUnit = (this.getUnitDateOffset(this.viewMinDate,8,1)- this.getUnitDateOffset(this.viewMinDate,8,0)) / nextScale; + const unitTextWidth=this.getUnitTextWidth(8); + const steps=this.getSteps(8); let s=0; let step=steps[s]; let steppedOneUnit=oneUnit*step; @@ -527,7 +527,7 @@ export class TimespanComponent implements OnInit, OnChanges { handleMouseWheel(event:WheelEvent) { if(!this.canZoom(this.scale,event.deltaY)) return; - let oldOffsetInMilliseconds = event.clientX * this.scale; + const oldOffsetInMilliseconds = event.clientX * this.scale; if(event.deltaY>=0) this.scale*=1.1; else @@ -536,8 +536,8 @@ export class TimespanComponent implements OnInit, OnChanges { this.height=this.getHeight(); this.changeDetectorRef.detectChanges(); this.setCanvasSize(); - let newOffsetInMilliseconds = event.clientX * this.scale; - let offsetInMilliseconds = newOffsetInMilliseconds-oldOffsetInMilliseconds; + const newOffsetInMilliseconds = event.clientX * this.scale; + const offsetInMilliseconds = newOffsetInMilliseconds-oldOffsetInMilliseconds; this.viewMinDate = new Date(this.viewMinDate.getTime()-offsetInMilliseconds); this.viewMaxDate = new Date(this.viewMaxDate.getTime()-offsetInMilliseconds); this.updateStyle(this.startDate,this.endDate); diff --git a/projects/common/src/fm/effects/app-common.effects.ts b/projects/common/src/fm/effects/app-common.effects.ts index a64333a..5a56289 100644 --- a/projects/common/src/fm/effects/app-common.effects.ts +++ b/projects/common/src/fm/effects/app-common.effects.ts @@ -21,7 +21,7 @@ export class AppCommonEffects { ofType(appCommonActions.LOGIN), withLatestFrom(this.store$.select(appCommonReducers.selectGetInitialized)), mergeMap(([action, initialized]) => { - var a = (action as appCommonActions.Login); + const a = (action as appCommonActions.Login); this.oauthService$.initCodeFlow(a.url,{"prompt":"login"}); return []; })),{dispatch:false}); @@ -75,7 +75,7 @@ export class AppCommonEffects { userPackagesChanged$ = createEffect(() => this.actions$.pipe( ofType(appCommonActions.ITEMCHANGEDEVENT), switchMap((action) => { - let a = action as appCommonActions.ItemChangedEvent; + const a = action as appCommonActions.ItemChangedEvent; if(a.itemCode.endsWith(":USER_PACKAGES")) return of(new appCommonActions.InitUserPackages()); else @@ -97,7 +97,7 @@ export class AppCommonEffects { initUserSettingsRootChanged$ = createEffect(() => this.actions$.pipe( ofType(appCommonActions.ITEMCHANGEDEVENT), switchMap((action) => { - let a = action as appCommonActions.ItemChangedEvent; + const a = action as appCommonActions.ItemChangedEvent; if(a.itemCode.endsWith(":USER_SETTINGS")) return of(new appCommonActions.InitUserSettingsRoot()); else @@ -134,10 +134,10 @@ export class AppCommonEffects { ofType(appCommonActions.EDITITEM), withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)), switchMap(([action, itemtypes]) => { - var a = action as appCommonActions.EditItem; + const a = action as appCommonActions.EditItem; var editor = "property"; if(a.item.itemType) { - var itemType = itemtypes[a.item.itemType]; + const itemType = itemtypes[a.item.itemType]; var editor = itemType && itemType.editor ? itemType.editor : editor; } this.router$.navigate(['/editor',editor,'item', a.item.code]) @@ -149,12 +149,12 @@ export class AppCommonEffects { ofType(appCommonActions.VIEWITEM), withLatestFrom(this.store$.select(appCommonReducers.selectGetItemTypes)), switchMap(([action, itemtypes]) => { - var a = action as appCommonActions.EditItem; - var itemType = itemtypes[a.item.itemType]; - var viewer = itemType.viewer; - var editor = itemType.editor; + const a = action as appCommonActions.EditItem; + const itemType = itemtypes[a.item.itemType]; + const viewer = itemType.viewer; + const editor = itemType.editor; if(viewer == 'select_as_mapitem') { - let queryState = { + const queryState = { itemCode: a.item.code, parentCode: null, level: 1, @@ -166,7 +166,7 @@ export class AppCommonEffects { startDate: null, bbox: [] }; - let query = this.stateSerializerService$.serialize(queryState); + const query = this.stateSerializerService$.serialize(queryState); this.router$.navigate(['/map', query ]) }else if(viewer == 'edit_in_editor') { this.router$.navigate(['/editor', editor, 'item', a.item.code]) @@ -181,7 +181,7 @@ export class AppCommonEffects { fail$ = createEffect(() => this.actions$.pipe( ofType(appCommonActions.FAIL), map((action) => { - let failAction = action as appCommonActions.Fail; + const failAction = action as appCommonActions.Fail; console.debug(failAction.payload) return null; })),{dispatch:false}); diff --git a/projects/common/src/fm/models/item.types.ts b/projects/common/src/fm/models/item.types.ts index 594a985..d74ab05 100644 --- a/projects/common/src/fm/models/item.types.ts +++ b/projects/common/src/fm/models/item.types.ts @@ -2,4 +2,4 @@ import { IItemType } from './item.type'; export interface IItemTypes{ [id: string]: IItemType; -}; +} diff --git a/projects/common/src/fm/reducers/app-common.reducer.ts b/projects/common/src/fm/reducers/app-common.reducer.ts index 2b0641f..b34fda6 100644 --- a/projects/common/src/fm/reducers/app-common.reducer.ts +++ b/projects/common/src/fm/reducers/app-common.reducer.ts @@ -58,9 +58,9 @@ export function reducer(state = initialState, action: appCommonActions.Actions ) return tassign(state,{initialized: true}); } case appCommonActions.INITUSERSUCCESS: { - let a = action as appCommonActions.InitUserSuccess; - let claims = { ...a.userinfo.info }; - var user:IUser = { + const a = action as appCommonActions.InitUserSuccess; + const claims = { ...a.userinfo.info }; + const user:IUser = { code:a.user.code, email:claims["email"]!== undefined ? claims["email"] : a.user.name, name:claims["name"]!== undefined?claims["name"] : a.user.email, @@ -70,7 +70,7 @@ export function reducer(state = initialState, action: appCommonActions.Actions ) return tassign(state, { user: user }); } case appCommonActions.INITROOTSUCCESS: { - let a = action as appCommonActions.InitRootSuccess; + const a = action as appCommonActions.InitRootSuccess; return tassign(state, { rootItems:a.items}); } case appCommonActions.OPENMODAL: { @@ -80,7 +80,7 @@ export function reducer(state = initialState, action: appCommonActions.Actions ) return tassign(state, { openedModalName: null }); } case appCommonActions.LOADITEMTYPESSUCCESS: { - let a = action as appCommonActions.LoadItemTypesSuccess; + const a = action as appCommonActions.LoadItemTypesSuccess; return tassign(state, { itemTypes: a.itemTypes }); } case appCommonActions.FULLSCREEN: { @@ -122,12 +122,12 @@ export function reducer(state = initialState, action: appCommonActions.Actions ) return tassign(state, { menuVisible: false,accountMenuVisible:false,appMenuVisible: false,notificationMenuVisible:false,helpMenuVisible:false }); } case appCommonActions.SETMENUVISIBLE: { - let a = action as appCommonActions.SetMenuVisible; + const a = action as appCommonActions.SetMenuVisible; return tassign(state, { menuVisible: a.visible,accountMenuVisible:a.visible?false:state.accountMenuVisible,appMenuVisible:a.visible?false:state.appMenuVisible,notificationMenuVisible:a.visible?false:state.notificationMenuVisible,helpMenuVisible:a.visible?false:state.helpMenuVisible }); } case appCommonActions.INITUSERPACKAGESSUCCESS:{ - let a = action as appCommonActions.InitUserPackagesSuccess; - let packages = {} + const a = action as appCommonActions.InitUserPackagesSuccess; + const packages = {} a.items.forEach((item) => { item.data.dataDate = item.dataDate; item.data.dataEndDate = item.dataEndDate; @@ -140,8 +140,8 @@ export function reducer(state = initialState, action: appCommonActions.Actions ) return tassign(state,{userPackages:packages}); } case appCommonActions.INITPACKAGESSUCCESS:{ - let a = action as appCommonActions.InitPackagesSuccess; - let packages = {} + const a = action as appCommonActions.InitPackagesSuccess; + const packages = {} a.items.forEach((item) => { packages[item.data.id] = item.data; }); @@ -149,7 +149,7 @@ export function reducer(state = initialState, action: appCommonActions.Actions ) return tassign(state,{packages:packages}); } case appCommonActions.INITUSERSETTINGSROOTSUCCESS:{ - let a = action as appCommonActions.InitUserSettingsRootSuccess; + const a = action as appCommonActions.InitUserSettingsRootSuccess; return tassign(state, { userSettingsRoot : a.item }); } case appCommonActions.LOGOUT:{ @@ -165,11 +165,11 @@ export function reducer(state = initialState, action: appCommonActions.Actions ) return tassign(state,{isOnline:false}); } case appCommonActions.SETPAGEMODE: { - let a = action as appCommonActions.SetPageMode; + const a = action as appCommonActions.SetPageMode; return tassign(state,{isPageMode:a.pageMode}); } case appCommonActions.NOTIFICATIONEVENT: { - let a = action as appCommonActions.NotificationEvent; + const a = action as appCommonActions.NotificationEvent; let unread = 0; if(a.attributes["unread"]) { unread = parseInt(a.attributes["unread"]); @@ -177,7 +177,7 @@ export function reducer(state = initialState, action: appCommonActions.Actions ) return tassign(state,{unreadNotifications:unread}); } case appCommonActions.SETUNREADNOTIFICATIONS: { - let a = action as appCommonActions.SetUnreadNotifications; + const a = action as appCommonActions.SetUnreadNotifications; return tassign(state,{unreadNotifications:a.unread}); } default: { diff --git a/projects/common/src/fm/services/admin.service.ts b/projects/common/src/fm/services/admin.service.ts index 1e8b60f..15d956f 100644 --- a/projects/common/src/fm/services/admin.service.ts +++ b/projects/common/src/fm/services/admin.service.ts @@ -21,7 +21,7 @@ export class AdminService { } getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string, indexed?: boolean, validToday?: boolean): Observable { - var params = new HttpParams(); + let params = new HttpParams(); if(itemType) params = params.append("it", itemType); if(dataFilter) params = params.append("df", JSON.stringify(dataFilter)); if(atItemLocationItemCode) params = params.append("ail",atItemLocationItemCode); diff --git a/projects/common/src/fm/services/auth-guard.service.ts b/projects/common/src/fm/services/auth-guard.service.ts index cec97c7..b287f02 100644 --- a/projects/common/src/fm/services/auth-guard.service.ts +++ b/projects/common/src/fm/services/auth-guard.service.ts @@ -23,14 +23,14 @@ export class AuthGuard implements CanActivate, CanLoad, CanActivateChild { canActivate(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise { console.debug("AuthGuard->canActivate", route, state); - let url: string = state.url; + const url: string = state.url; return this.checkLogin(url, route); } canActivateChild(childRoute: ActivatedRouteSnapshot, state: RouterStateSnapshot): Promise { console.debug("AuthGuard->canActivateChild", childRoute, state); - let url: string = state.url; + const url: string = state.url; return this.checkLogin(url, childRoute); } diff --git a/projects/common/src/fm/services/device.service.ts b/projects/common/src/fm/services/device.service.ts index 73b8078..5df6676 100644 --- a/projects/common/src/fm/services/device.service.ts +++ b/projects/common/src/fm/services/device.service.ts @@ -5,9 +5,9 @@ import { Injectable } from '@angular/core'; }) export class DeviceService { public IsMobile() { - let w = window as any; + const w = window as any; let check = false; (function(a){if(/(android|bb\d+|meego).+mobile|avantgo|bada\/|blackberry|blazer|compal|elaine|fennec|hiptop|iemobile|ip(hone|od)|iris|kindle|lge |maemo|midp|mmp|mobile.+firefox|netfront|opera m(ob|in)i|palm( os)?|phone|p(ixi|re)\/|plucker|pocket|psp|series(4|6)0|symbian|treo|up\.(browser|link)|vodafone|wap|windows ce|xda|xiino/i.test(a)||/1207|6310|6590|3gso|4thp|50[1-6]i|770s|802s|a wa|abac|ac(er|oo|s\-)|ai(ko|rn)|al(av|ca|co)|amoi|an(ex|ny|yw)|aptu|ar(ch|go)|as(te|us)|attw|au(di|\-m|r |s )|avan|be(ck|ll|nq)|bi(lb|rd)|bl(ac|az)|br(e|v)w|bumb|bw\-(n|u)|c55\/|capi|ccwa|cdm\-|cell|chtm|cldc|cmd\-|co(mp|nd)|craw|da(it|ll|ng)|dbte|dc\-s|devi|dica|dmob|do(c|p)o|ds(12|\-d)|el(49|ai)|em(l2|ul)|er(ic|k0)|esl8|ez([4-7]0|os|wa|ze)|fetc|fly(\-|_)|g1 u|g560|gene|gf\-5|g\-mo|go(\.w|od)|gr(ad|un)|haie|hcit|hd\-(m|p|t)|hei\-|hi(pt|ta)|hp( i|ip)|hs\-c|ht(c(\-| |_|a|g|p|s|t)|tp)|hu(aw|tc)|i\-(20|go|ma)|i230|iac( |\-|\/)|ibro|idea|ig01|ikom|im1k|inno|ipaq|iris|ja(t|v)a|jbro|jemu|jigs|kddi|keji|kgt( |\/)|klon|kpt |kwc\-|kyo(c|k)|le(no|xi)|lg( g|\/(k|l|u)|50|54|\-[a-w])|libw|lynx|m1\-w|m3ga|m50\/|ma(te|ui|xo)|mc(01|21|ca)|m\-cr|me(rc|ri)|mi(o8|oa|ts)|mmef|mo(01|02|bi|de|do|t(\-| |o|v)|zz)|mt(50|p1|v )|mwbp|mywa|n10[0-2]|n20[2-3]|n30(0|2)|n50(0|2|5)|n7(0(0|1)|10)|ne((c|m)\-|on|tf|wf|wg|wt)|nok(6|i)|nzph|o2im|op(ti|wv)|oran|owg1|p800|pan(a|d|t)|pdxg|pg(13|\-([1-8]|c))|phil|pire|pl(ay|uc)|pn\-2|po(ck|rt|se)|prox|psio|pt\-g|qa\-a|qc(07|12|21|32|60|\-[2-7]|i\-)|qtek|r380|r600|raks|rim9|ro(ve|zo)|s55\/|sa(ge|ma|mm|ms|ny|va)|sc(01|h\-|oo|p\-)|sdk\/|se(c(\-|0|1)|47|mc|nd|ri)|sgh\-|shar|sie(\-|m)|sk\-0|sl(45|id)|sm(al|ar|b3|it|t5)|so(ft|ny)|sp(01|h\-|v\-|v )|sy(01|mb)|t2(18|50)|t6(00|10|18)|ta(gt|lk)|tcl\-|tdg\-|tel(i|m)|tim\-|t\-mo|to(pl|sh)|ts(70|m\-|m3|m5)|tx\-9|up(\.b|g1|si)|utst|v400|v750|veri|vi(rg|te)|vk(40|5[0-3]|\-v)|vm40|voda|vulc|vx(52|53|60|61|70|80|81|83|85|98)|w3c(\-| )|webc|whit|wi(g |nc|nw)|wmlb|wonu|x700|yas\-|your|zeto|zte\-/i.test(a.substr(0,4))) check = true;})(navigator.userAgent||navigator.vendor||w.opera); return check; - }; + } } diff --git a/projects/common/src/fm/services/event.service.ts b/projects/common/src/fm/services/event.service.ts index a0eb406..652dd5a 100644 --- a/projects/common/src/fm/services/event.service.ts +++ b/projects/common/src/fm/services/event.service.ts @@ -14,7 +14,7 @@ export class EventService { public event:Subject = new Subject(); private _connection: HubConnection = null; private _apiEndPoint: string; - public authenticated:boolean = false; + public authenticated = false; constructor(private oauthService: OAuthService, private appConfig: AppConfig) { this._apiEndPoint = appConfig.getConfig("apiEndPoint"); @@ -42,7 +42,7 @@ export class EventService { } private Authenticate() { - var accessToken = this.oauthService.getAccessToken(); + const accessToken = this.oauthService.getAccessToken(); if (this.oauthService.hasValidAccessToken()) { this._connection.send('authenticate', this.oauthService.getAccessToken()); this.authenticated=true; diff --git a/projects/common/src/fm/services/gradient.service.ts b/projects/common/src/fm/services/gradient.service.ts index f283b4f..83a73e4 100644 --- a/projects/common/src/fm/services/gradient.service.ts +++ b/projects/common/src/fm/services/gradient.service.ts @@ -8,10 +8,10 @@ export class GradientService { constructor() { } - getGradientStyle(gradient:IGradientstop[],portrait:boolean = false ):any { + getGradientStyle(gradient:IGradientstop[],portrait = false ):any { let gd = '{ "background": "linear-gradient(to ' + (portrait?'bottom':'right') +','; - for(var i=0;i0) gd+=","; gd += `rgba(${gs.color.red},${gs.color.green},${gs.color.blue},${gs.color.alpha/255})`; gd +=` ${gs.relativestop*100}%` diff --git a/projects/common/src/fm/services/healthcheck.service.ts b/projects/common/src/fm/services/healthcheck.service.ts index 8633cc9..b62723d 100644 --- a/projects/common/src/fm/services/healthcheck.service.ts +++ b/projects/common/src/fm/services/healthcheck.service.ts @@ -19,7 +19,7 @@ import { AppConfig } from "../shared/app.config"; } check(interval:number): Observable { - let retval = new BehaviorSubject(true); + const retval = new BehaviorSubject(true); setInterval(() => { this.httpClient.get(`${this.ApiEndpoint()}/api/v1/healthcheck`).pipe(map(() => true),catchError((error) => of(false))).toPromise().then((status) => { retval.next(status); diff --git a/projects/common/src/fm/services/image.service.ts b/projects/common/src/fm/services/image.service.ts index e16f7df..fa7c601 100644 --- a/projects/common/src/fm/services/image.service.ts +++ b/projects/common/src/fm/services/image.service.ts @@ -22,8 +22,8 @@ export class ImageService { } dataUrltoBlob(dataURI:string):Blob { - var mime = dataURI.split( ';base64,')[0].split(':')[1]; - var byteCharacters = atob(dataURI.split( ';base64,')[1]); + const mime = dataURI.split( ';base64,')[0].split(':')[1]; + const byteCharacters = atob(dataURI.split( ';base64,')[1]); const sliceSize = 512; @@ -52,7 +52,7 @@ export class ImageService { blobToDataUrl(blob:File):Promise { return new Promise((resolve) => { - let reader = new FileReader(); + const reader = new FileReader(); reader.addEventListener('error', () => { resolve(""); }); diff --git a/projects/common/src/fm/services/item.service.ts b/projects/common/src/fm/services/item.service.ts index 64bb8d5..552b650 100644 --- a/projects/common/src/fm/services/item.service.ts +++ b/projects/common/src/fm/services/item.service.ts @@ -25,7 +25,7 @@ export class ItemService { } getFeatures(extent: number[], crs: string, searchText?: string, searchTags?:string,startDate?:Date,endDate?:Date,itemType?:string,parentCode?:string,dataFilter?:string,level?:number,indexed?:boolean): Observable { - var params = new HttpParams(); + let params = new HttpParams(); params = params.append("crs", crs); if (extent) params =params.append("bbox", extent.join(",")); if (searchText) params = params.append("q", searchText); @@ -34,7 +34,7 @@ export class ItemService { if (endDate) params = params.append("ed", endDate.toISOString()); if (itemType) { params = params.append("it", itemType); - let extraAttributes = this.itemTypeService.getExtraAttributes(itemType); + const extraAttributes = this.itemTypeService.getExtraAttributes(itemType); if(extraAttributes) { params = params.append("da", extraAttributes); } @@ -47,13 +47,13 @@ export class ItemService { } getFeature(code:string, crs: string): Observable { - var params = new HttpParams(); + let params = new HttpParams(); params = params.append("crs", crs); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${code}/feature/`, { params: params }); } getItemFeature(code:string, fid:number, crs: string): Observable { - var params = new HttpParams(); + let params = new HttpParams(); params = params.append("crs", crs); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${code}/feature/${fid}`, { params: params }); } @@ -63,7 +63,7 @@ export class ItemService { } getItemData(code: string,start?:number,size?:number): Observable { - var headers = new HttpHeaders(); + let headers = new HttpHeaders(); if(start !== undefined && size !== undefined) headers=headers.set("Range",`bytes=${start}-${size-1}`); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${code}/data`,{ headers: headers,responseType: 'arraybuffer' }); } @@ -73,7 +73,7 @@ export class ItemService { } getItemList(itemType?: string, dataFilter?: any, level?: number, atItemLocationItemCode?: string, indexed?: boolean, validToday?: boolean): Observable { - var params = new HttpParams(); + let params = new HttpParams(); if(itemType) params = params.append("it", itemType); if(dataFilter) params = params.append("df", JSON.stringify(dataFilter)); if(atItemLocationItemCode) params = params.append("ail",atItemLocationItemCode); @@ -83,9 +83,9 @@ export class ItemService { return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/`, { params: params }); } - getChildItemList(parentcode: string, itemType: string, dataFilter?: any, level: number = 1, deep: boolean = true, + getChildItemList(parentcode: string, itemType: string, dataFilter?: any, level = 1, deep = true, startDate?: Date, endDate?: Date): Observable { - var params = new HttpParams(); + let params = new HttpParams(); if(itemType != null) { params = params.append("it", itemType); } @@ -99,17 +99,17 @@ export class ItemService { return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children`, { params: params }); } - getChildItemListCount(parentcode: string, itemType: string,dataFilter?: any): Observable { - var params = new HttpParams(); + getChildItemListCount(parentcode: string, itemType: string,dataFilter?: any): Observable { + let params = new HttpParams(); params = params.append("it", itemType); if (dataFilter != null) { params = params.append("df", JSON.stringify(dataFilter)); } - return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params }); + return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${parentcode}/children/count`, { params: params }); } - getChildItemListByExtent(parentcode: string, itemType: string, extent: number[], crs: string, dataFilter?: any, level: number = 1): Observable { - var params = new HttpParams(); + getChildItemListByExtent(parentcode: string, itemType: string, extent: number[], crs: string, dataFilter?: any, level = 1): Observable { + let params = new HttpParams(); params = params.append("it", itemType); params = params.append("bbox", extent.join(",")); params = params.append("crs", crs); @@ -121,7 +121,7 @@ export class ItemService { } getItemFeatures(code: string, extent: number[], crs: string, layerIndex?:number): Observable { - var params = new HttpParams(); + let params = new HttpParams(); params = params.append("crs", crs); if(extent != null) { params = params.append("bbox", extent.join(",")); @@ -153,7 +153,7 @@ export class ItemService { } getTemporal(code: string, startDate?: Date, endDate?: Date): Observable { - var params = new HttpParams(); + let params = new HttpParams(); if (startDate) params = params.append("sd", startDate.toISOString()); if (endDate) params = params.append("ed", endDate.toISOString()); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${code}/temporal/`, { params: params }); @@ -164,20 +164,20 @@ export class ItemService { } getItemTaskList(itemcode: string, unfinishedOnly?: boolean): Observable { - var params = new HttpParams(); + let params = new HttpParams(); if (unfinishedOnly) params = params.append("unfinishedOnly", unfinishedOnly.toString()); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${itemcode}/tasks`, { params: params }); } getItemListUsingRelationship(itemType: string, relationshipItemType: string, relationshipDataFilter: any): Observable { - var params = new HttpParams(); + let params = new HttpParams(); params = params.append("it", itemType); params = params.append("rsit", relationshipItemType); params = params.append("rsdf", JSON.stringify(relationshipDataFilter)); return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/userelationship`, { params: params }); } - getLayerValue(itemCode: string, layerIndex:number,x:number,y:number,crs:string = "EPSG:3857"): Observable { + getLayerValue(itemCode: string, layerIndex:number,x:number,y:number,crs = "EPSG:3857"): Observable { return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/items/${itemCode}/value/layer/${layerIndex}?c=${x},${y}&crs=${crs}`); } diff --git a/projects/common/src/fm/services/itemtype.service.ts b/projects/common/src/fm/services/itemtype.service.ts index f896b85..cc06612 100644 --- a/projects/common/src/fm/services/itemtype.service.ts +++ b/projects/common/src/fm/services/itemtype.service.ts @@ -14,19 +14,19 @@ export class ItemTypeService { } getIcon(itemType: string) { - var icon = "fal fa-file"; + let icon = "fal fa-file"; if (this.itemTypes[itemType]) icon = this.itemTypes[itemType].icon; return icon; } getColor(itemType: string) { - var color = "#000000"; + let color = "#000000"; if (this.itemTypes[itemType]) color = this.itemTypes[itemType].iconColor; return color; } getExtraAttributes(itemType: string) { - var extraAttributes = null; + let extraAttributes = null; if (this.itemTypes[itemType]) extraAttributes = this.itemTypes[itemType].extraAttributes; return extraAttributes; } @@ -38,25 +38,25 @@ export class ItemTypeService { } hasViewer(item: IItem) { - let itemType: string = item.itemType; + const itemType: string = item.itemType; if (this.itemTypes[itemType]) return this.itemTypes[itemType].viewer !== undefined; return false; } hasEditor(item: IItem) { - let itemType: string = item.itemType; + const itemType: string = item.itemType; if (this.itemTypes[itemType]) return this.itemTypes[itemType].editor !== undefined; return false; } isLayer(item: IItem) { - let itemType: string = item.itemType; + const itemType: string = item.itemType; return itemType == "vnd.farmmaps.itemtype.geotiff.processed" || itemType == "vnd.farmmaps.itemtype.layer" || itemType == "vnd.farmmaps.itemtype.shape.processed"; } public load(config:AppConfig): Promise { if(this.itemTypes==null) { - var url = `${ config.getConfig("apiEndPoint")}/api/v1/itemtypes/` + const url = `${ config.getConfig("apiEndPoint")}/api/v1/itemtypes/` return this.httpClient.get(url) .toPromise() .then((itemTypes:IItemTypes) => { @@ -67,5 +67,5 @@ export class ItemTypeService { } else { return new Promise((resolve) => {resolve()}); } - }; + } } diff --git a/projects/common/src/fm/services/senml-service.ts b/projects/common/src/fm/services/senml-service.ts index 9cf16da..b1e6fcc 100644 --- a/projects/common/src/fm/services/senml-service.ts +++ b/projects/common/src/fm/services/senml-service.ts @@ -13,8 +13,8 @@ export class SenmlService { getSenMLItem(layer:IDataLayer,jsonLine:IJsonline): ISenMLItem { if (jsonLine) { - var senmlPack = jsonLine.data as ISenMLItem[]; - var temp = senmlPack.filter((i) => i.u == layer.indexKey); + const senmlPack = jsonLine.data as ISenMLItem[]; + const temp = senmlPack.filter((i) => i.u == layer.indexKey); if (temp.length == 1) return temp[0]; return null; } @@ -24,7 +24,7 @@ export class SenmlService { if(item && item.data && item.data["layers"] && item.data["layers"].length > 0 ) { return item.data["layers"][0] as IDataLayer; } else { - let retVal:IDataLayer = { name:"Soil moisture",index:0,scale:1,unit:"%",indexKey:"%vol" }; + const retVal:IDataLayer = { name:"Soil moisture",index:0,scale:1,unit:"%",indexKey:"%vol" }; return retVal; } } diff --git a/projects/common/src/fm/services/state-serializer.service.ts b/projects/common/src/fm/services/state-serializer.service.ts index f4d8195..3df3caa 100644 --- a/projects/common/src/fm/services/state-serializer.service.ts +++ b/projects/common/src/fm/services/state-serializer.service.ts @@ -8,7 +8,7 @@ export class StateSerializerService { serialize(queryState: IQueryState): string { - var state = ""; + let state = ""; state += (queryState.itemCode) ? queryState.itemCode : ""; state += ";"; state += (queryState.parentCode) ? queryState.parentCode + ";" + queryState.level.toString() : ";"; @@ -31,8 +31,8 @@ export class StateSerializerService { } deserialize(queryState: string): IQueryState { - var state: IQueryState = { itemCode: null, parentCode: null, level: 1, itemType: null, query: null, tags: null, bboxFilter: false, startDate: null, endDate: null,bbox:[] }; - var stateParts = atob(queryState).split(";"); + const state: IQueryState = { itemCode: null, parentCode: null, level: 1, itemType: null, query: null, tags: null, bboxFilter: false, startDate: null, endDate: null,bbox:[] }; + const stateParts = atob(queryState).split(";"); if (stateParts.length == 10) { if (stateParts[0] != "") state.itemCode = stateParts[0]; if (stateParts[1] != "") { diff --git a/projects/common/src/fm/services/timespan.service.ts b/projects/common/src/fm/services/timespan.service.ts index e728c2c..3a91816 100644 --- a/projects/common/src/fm/services/timespan.service.ts +++ b/projects/common/src/fm/services/timespan.service.ts @@ -13,8 +13,8 @@ export class TimespanService { units: string[] = ['millisecond', 'second', 'minute', 'hour', 'day', 'week', 'month', 'quarter', 'year']; quarters: string[] = ['KW1', 'KW2', 'KW3', 'KW4']; - getStartEndCaption(date: Date, otherDate: Date, unitScale: number, suffix: boolean = false, extended: boolean = true): string { - let showSuffix = false; + getStartEndCaption(date: Date, otherDate: Date, unitScale: number, suffix = false, extended = true): string { + const showSuffix = false; otherDate = new Date(otherDate.getTime() - 1); // fix year edge case if (unitScale == 3) { let format = "HH:00"; @@ -47,7 +47,7 @@ export class TimespanService { return this.datePipe.transform(date, format); } if (unitScale == 7) { - let q = Math.trunc(date.getMonth() / 3); + const q = Math.trunc(date.getMonth() / 3); return this.quarters[q]; } if (unitScale == 8) { @@ -56,11 +56,11 @@ export class TimespanService { return ""; } - getStartCaption(startDate: Date, endDate: Date, unitScale: number, suffix: boolean = false, extended: boolean = true): string { + getStartCaption(startDate: Date, endDate: Date, unitScale: number, suffix = false, extended = true): string { return this.getStartEndCaption(new Date(startDate.getTime() + (this.unitScales[unitScale] / 2)), endDate, unitScale, suffix, extended); } - getEndCaption(startDate: Date,endDate: Date, unitScale: number, suffix: boolean = true): string { + getEndCaption(startDate: Date,endDate: Date, unitScale: number, suffix = true): string { return this.getStartEndCaption(new Date(endDate.getTime() - (this.unitScales[unitScale] / 2)), startDate, unitScale, suffix); } @@ -75,8 +75,8 @@ export class TimespanService { scale =3 } } - let startCaption = this.getStartCaption(startDate, endDate, scale); - let endCaption = this.getEndCaption(startDate,endDate, scale); + const startCaption = this.getStartCaption(startDate, endDate, scale); + const endCaption = this.getEndCaption(startDate,endDate, scale); if ((endDate.getTime() - startDate.getTime()) < (1.5 * this.unitScales[scale])) return endCaption; return `${startCaption}-${endCaption}`; diff --git a/projects/common/src/fm/services/typeahead.service.ts b/projects/common/src/fm/services/typeahead.service.ts index 3829aec..c68ee2b 100644 --- a/projects/common/src/fm/services/typeahead.service.ts +++ b/projects/common/src/fm/services/typeahead.service.ts @@ -15,15 +15,15 @@ export class TypeaheadService { return this.appConfig.getConfig("apiEndPoint"); } - getSearchTypeaheadItems(searchText:string,skip:number = 0,take:number = 10): Observable { + getSearchTypeaheadItems(searchText:string,skip = 0,take = 10): Observable { return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/typeahead/search/?q=${searchText}&skip=${skip}&take=${take}`); } - getTagTypeaheadItems(searchText: string, skip: number = 0, take: number = 10): Observable { + getTagTypeaheadItems(searchText: string, skip = 0, take = 10): Observable { return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/typeahead/tag/?q=${searchText}&skip=${skip}&take=${take}`); } - getCityTypeaheadItems(searchText: string, skip: number = 0, take: number = 10): Observable { + getCityTypeaheadItems(searchText: string, skip = 0, take = 10): Observable { return this.httpClient.get(`${this.ApiEndpoint()}/api/v1/typeahead/city/?q=${searchText}&skip=${skip}&take=${take}`); } } diff --git a/projects/common/src/fm/shared/accesstoken.interceptor.ts b/projects/common/src/fm/shared/accesstoken.interceptor.ts index 94a1908..9c8e32c 100644 --- a/projects/common/src/fm/shared/accesstoken.interceptor.ts +++ b/projects/common/src/fm/shared/accesstoken.interceptor.ts @@ -21,8 +21,8 @@ export class AccessTokenInterceptor implements HttpInterceptor { } hasAudience(url: string): boolean { - let u = new URL(url,this.base); - for (let audience of this.audience) { + const u = new URL(url,this.base); + for (const audience of this.audience) { if (u.href.startsWith(audience)) return true; } return false; diff --git a/projects/common/src/fm/shared/app.config.ts b/projects/common/src/fm/shared/app.config.ts index 309f955..f1d5865 100644 --- a/projects/common/src/fm/shared/app.config.ts +++ b/projects/common/src/fm/shared/app.config.ts @@ -22,7 +22,7 @@ export class AppConfig { } public load(): Promise { - var url = this.location.prepareExternalUrl('/configuration.json'); + const url = this.location.prepareExternalUrl('/configuration.json'); return this.httpClient.get(url) .toPromise() .then(data => { @@ -30,5 +30,5 @@ export class AppConfig { //return data; }) .catch(error => this.config = null); - }; + } } diff --git a/projects/common/src/fm/shared/authconfigFactory.ts b/projects/common/src/fm/shared/authconfigFactory.ts index 1ae1689..3013271 100644 --- a/projects/common/src/fm/shared/authconfigFactory.ts +++ b/projects/common/src/fm/shared/authconfigFactory.ts @@ -7,7 +7,7 @@ export interface IAuthconfigFactory { export class AuthConfigFactory implements IAuthconfigFactory { getAuthConfig(appConfig: AppConfig): AuthConfig { - let authConfig: AuthConfig = new AuthConfig(); + const authConfig: AuthConfig = new AuthConfig(); authConfig.issuer = appConfig.getConfig("issuer"); authConfig.redirectUri = window.location.origin + "/cb"; authConfig.silentRefreshRedirectUri = window.location.origin + "/silent-refresh.html"; diff --git a/projects/common/src/fm/shared/secureOAuthStorage.ts b/projects/common/src/fm/shared/secureOAuthStorage.ts index dc7d336..ae2761f 100644 --- a/projects/common/src/fm/shared/secureOAuthStorage.ts +++ b/projects/common/src/fm/shared/secureOAuthStorage.ts @@ -18,7 +18,7 @@ export class SecureOAuthStorage extends OAuthStorage { return window.sessionStorage.getItem(key); } - }; + } removeItem(key: string): void { if(this.secureKey(key)) { delete this.storage[key]; diff --git a/src/app/id4AuthconfigFactory.ts b/src/app/id4AuthconfigFactory.ts index 64f54a1..ee735c6 100644 --- a/src/app/id4AuthconfigFactory.ts +++ b/src/app/id4AuthconfigFactory.ts @@ -9,7 +9,7 @@ export class Id4AuthconfigFactory implements IAuthconfigFactory { } getAuthConfig(appConfig: AppConfig): AuthConfig { - let authConfig: AuthConfig = new AuthConfig(); + const authConfig: AuthConfig = new AuthConfig(); authConfig.issuer = appConfig.getConfig("issuer"); authConfig.redirectUri = window.location.origin + "/cb"; authConfig.clientId = appConfig.getConfig("clientId"); diff --git a/src/app/localAuthconfigFactory.ts b/src/app/localAuthconfigFactory.ts index d1b568f..23a8f89 100644 --- a/src/app/localAuthconfigFactory.ts +++ b/src/app/localAuthconfigFactory.ts @@ -3,7 +3,7 @@ import {AuthConfig} from 'angular-oauth2-oidc'; export class LocalAuthconfigFactory implements IAuthconfigFactory { getAuthConfig(appConfig:AppConfig): AuthConfig { - let authConfig: AuthConfig = new AuthConfig(); + const authConfig: AuthConfig = new AuthConfig(); authConfig.issuer = appConfig.getConfig("issuer"); authConfig.redirectUri = window.location.origin + "/cb"; authConfig.silentRefreshRedirectUri = window.location.origin + "/silent-refresh.html"; diff --git a/src/app/menu/menu.component.ts b/src/app/menu/menu.component.ts index 79c0800..9dfc7d2 100644 --- a/src/app/menu/menu.component.ts +++ b/src/app/menu/menu.component.ts @@ -16,7 +16,7 @@ export class MenuComponent { handlePredefinedQuery(event: MouseEvent, query: any) { event.preventDefault(); - var queryState = this.stateSerializerService.serialize(tassign(mapReducers.initialQueryState, query)); + const queryState = this.stateSerializerService.serialize(tassign(mapReducers.initialQueryState, query)); this.router.navigate(['map',queryState]) } } diff --git a/src/app/test/test.component.ts b/src/app/test/test.component.ts index bf1f84a..0b34cb9 100644 --- a/src/app/test/test.component.ts +++ b/src/app/test/test.component.ts @@ -21,7 +21,7 @@ export class TestComponent implements OnInit { } onTest(Event) { - let a = {"unread":"1"} + const a = {"unread":"1"} this.store$.dispatch(new commonActions.NotificationEvent(a)); } }