From d547ba407a46fccc5408546b86e3343d8408e441 Mon Sep 17 00:00:00 2001 From: Vladyslav_Prykhodko Date: Tue, 18 Aug 2020 12:01:06 +0300 Subject: [PATCH] Fixed error tslint for map widget --- .../components/widget/lib/maps/leaflet-map.ts | 67 ++++++++++--------- .../components/widget/lib/maps/map-models.ts | 17 ++--- .../widget/lib/maps/map-widget.interface.ts | 8 +-- .../components/widget/lib/maps/map-widget2.ts | 40 ++++++----- .../components/widget/lib/maps/maps-utils.ts | 36 +++++----- .../components/widget/lib/maps/markers.ts | 4 +- .../components/widget/lib/maps/polygon.ts | 19 +++--- .../components/widget/lib/maps/polyline.ts | 7 +- .../widget/lib/maps/providers/google-map.ts | 2 +- .../widget/lib/maps/providers/index.ts | 8 +-- .../lib/maps/providers/openstreet-map.ts | 9 +-- .../components/widget/lib/maps/schemes.ts | 56 ++++++++-------- 12 files changed, 145 insertions(+), 128 deletions(-) diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts index 2da560b8cb..a85fa0aa08 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts @@ -150,7 +150,7 @@ export default abstract class LeafletMap { this.deleteMarker(ds.entityName); this.createMarker(ds.entityName, updatedEnttity, this.datasources, this.options); }); - } + }; datasourcesList.append(dsItem); }); datasourcesList.append(document.createElement('br')); @@ -158,14 +158,14 @@ export default abstract class LeafletMap { deleteBtn.appendChild(document.createTextNode('Discard changes')); deleteBtn.onclick = () => { this.map.removeLayer(newMarker); - } + }; datasourcesList.append(deleteBtn); const popup = L.popup(); popup.setContent(datasourcesList); newMarker.bindPopup(popup).openPopup(); } - addMarker.setPosition('topright') - } + addMarker.setPosition('topright'); + }; L.Control.AddMarker = L.Control.extend({ onAdd() { const img = L.DomUtil.create('img') as any; @@ -177,7 +177,7 @@ export default abstract class LeafletMap { img.draggable = true; const draggableImg = new L.Draggable(img); draggableImg.enable(); - draggableImg.on('dragend', dragListener) + draggableImg.on('dragend', dragListener); return img; }, onRemove() { @@ -186,7 +186,7 @@ export default abstract class LeafletMap { } as any); L.control.addMarker = (opts) => { return new L.Control.AddMarker(opts); - } + }; addMarker = L.control.addMarker({ position: 'topright' }).addTo(this.map); } } @@ -198,8 +198,8 @@ export default abstract class LeafletMap { this.map.on('mousemove', (e: L.LeafletMouseEvent) => { const latlng1 = e.latlng; const latlng2 = L.latLng(e.latlng.lat, e.latlng.lng + 10); - const latlng3 = L.latLng(e.latlng.lat-10, e.latlng.lng); - mousePositionOnMap = [latlng1,latlng2, latlng3 ]; + const latlng3 = L.latLng(e.latlng.lat - 10, e.latlng.lng); + mousePositionOnMap = [latlng1, latlng2, latlng3]; }); const dragListener = (e: L.DragEndEvent) => { if (e.type === 'dragend' && mousePositionOnMap) { @@ -220,7 +220,7 @@ export default abstract class LeafletMap { this.map.removeLayer(newPolygon); this.deletePolygon(ds.entityName); }); - } + }; datasourcesList.append(dsItem); }); datasourcesList.append(document.createElement('br')); @@ -228,14 +228,14 @@ export default abstract class LeafletMap { deleteBtn.appendChild(document.createTextNode('Discard changes')); deleteBtn.onclick = () => { this.map.removeLayer(newPolygon); - } + }; datasourcesList.append(deleteBtn); const popup = L.popup(); popup.setContent(datasourcesList); newPolygon.bindPopup(popup).openPopup(); } - addPolygon.setPosition('topright') - } + addPolygon.setPosition('topright'); + }; L.Control.AddPolygon = L.Control.extend({ onAdd() { const img = L.DomUtil.create('img') as any; @@ -247,7 +247,7 @@ export default abstract class LeafletMap { img.draggable = true; const draggableImg = new L.Draggable(img); draggableImg.enable(); - draggableImg.on('dragend', dragListener) + draggableImg.on('dragend', dragListener); return img; }, onRemove() { @@ -256,7 +256,7 @@ export default abstract class LeafletMap { } as any); L.control.addPolygon = (opts) => { return new L.Control.AddPolygon(opts); - } + }; addPolygon = L.control.addPolygon({ position: 'topright' }).addTo(this.map); } } @@ -280,10 +280,11 @@ export default abstract class LeafletMap { public setMap(map: L.Map) { this.map = map; if (this.options.useDefaultCenterPosition) { - this.map.panTo(this.options.defaultCenterPosition); - this.bounds = map.getBounds(); + this.map.panTo(this.options.defaultCenterPosition); + this.bounds = map.getBounds(); + } else { + this.bounds = new L.LatLngBounds(null, null); } - else this.bounds = new L.LatLngBounds(null, null); if (this.options.draggableMarker) { this.addMarkerControl(); } @@ -299,11 +300,11 @@ export default abstract class LeafletMap { } } - public saveMarkerLocation(_e: FormattedData, lat?: number, lng?: number): Observable { + public saveMarkerLocation(datasource: FormattedData, lat?: number, lng?: number): Observable { return of(null); } - public savePolygonLocation(_e: FormattedData, coordinates?: Array<[number, number]>): Observable { + public savePolygonLocation(datasource: FormattedData, coordinates?: Array<[number, number]>): Observable { return of(null); } @@ -364,7 +365,9 @@ export default abstract class LeafletMap { } convertPosition(expression: object): L.LatLng { - if (!expression) return null; + if (!expression) { + return null; + } const lat = expression[this.options.latKeyName]; const lng = expression[this.options.lngKeyName]; if (!isDefinedAndNotNull(lat) || isString(lat) || isNaN(lat) || !isDefinedAndNotNull(lng) || isString(lng) || isNaN(lng)) { @@ -382,34 +385,34 @@ export default abstract class LeafletMap { } else { return null; } - }).filter(el => !!el) + }).filter(el => !!el); } convertToCustomFormat(position: L.LatLng): object { return { [this.options.latKeyName]: position.lat % 90, [this.options.lngKeyName]: position.lng % 180 - } + }; } convertToPolygonFormat(points: Array): Array { if (points.length) { - return points.map(point=> { + return points.map(point => { if (point.length) { return this.convertToPolygonFormat(point); } else { return [point.lat, point.lng]; } - }) + }); } else { - return [] + return []; } } convertPolygonToCustomFormat(expression: any[][]): object { return { [this.options.polygonKeyName] : this.convertToPolygonFormat(expression) - } + }; } updateData(drawRoutes: boolean, showPolygon: boolean) { @@ -509,7 +512,7 @@ export default abstract class LeafletMap { this.markersCluster.addLayers(createdMarkers.map(marker => marker.leafletMarker)); } if (updatedMarkers.length) { - this.markersCluster.refreshClusters(updatedMarkers.map(marker => marker.leafletMarker)) + this.markersCluster.refreshClusters(updatedMarkers.map(marker => marker.leafletMarker)); } if (deletedMarkers.length) { this.markersCluster.removeLayers(deletedMarkers.map(marker => marker.leafletMarker)); @@ -518,7 +521,9 @@ export default abstract class LeafletMap { } dragMarker = (e, data = {} as FormattedData) => { - if (e.type !== 'dragend') return; + if (e.type !== 'dragend') { + return; + } this.saveMarkerLocation({ ...data, ...this.convertToCustomFormat(e.target._latlng) }).subscribe(); } @@ -527,7 +532,7 @@ export default abstract class LeafletMap { const newMarker = new Marker(this, this.convertPosition(data), settings, data, dataSources, this.dragMarker); if (callback) { newMarker.leafletMarker.on('click', () => { - callback(data, true) + callback(data, true); }); } if (this.bounds && updateBounds && !(this.options as MarkerSettings).useClusterMarkers) { @@ -684,7 +689,9 @@ export default abstract class LeafletMap { } dragPolygonVertex = (e?, data = {} as FormattedData) => { - if (e === undefined || (e.type !== 'editable:vertex:dragend' && e.type !== 'editable:vertex:deleted')) return; + if (e === undefined || (e.type !== 'editable:vertex:dragend' && e.type !== 'editable:vertex:deleted')) { + return; + } this.savePolygonLocation({ ...data, ...this.convertPolygonToCustomFormat(e.layer._latlngs) }).subscribe(); } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-models.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-models.ts index 5341c48389..63fe097b98 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-models.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-models.ts @@ -62,7 +62,7 @@ export type MapSettings = { useCustomProvider: boolean, customProviderTileUrl: string; mapPageSize: number; -} +}; export enum MapProviders { google = 'google-map', @@ -103,7 +103,7 @@ export type MarkerSettings = { markerImageFunction?: MarkerImageFunction; markerOffsetX: number; markerOffsetY: number; -} +}; export interface FormattedData { $datasource: Datasource; @@ -112,19 +112,19 @@ export interface FormattedData { entityType: EntityType; dsIndex: number; deviceType: string; - [key: string]: any + [key: string]: any; } export interface ReplaceInfo { variable: string; valDec?: number; - dataKeyName: string + dataKeyName: string; } export type PolygonSettings = { showPolygon: boolean; polygonKeyName: string; - polKeyName: string;// deprecated + polKeyName: string; // deprecated polygonStrokeOpacity: number; polygonOpacity: number; polygonStrokeWeight: number; @@ -141,7 +141,7 @@ export type PolygonSettings = { polygonTooltipFunction: GenericFunction; polygonColorFunction?: GenericFunction; editablePolygon: boolean; -} +}; export type PolylineSettings = { usePolylineDecorator: any; @@ -166,7 +166,7 @@ export type PolylineSettings = { colorFunction: GenericFunction; strokeOpacityFunction: GenericFunction; strokeWeightFunction: GenericFunction; -} +}; export interface HistorySelectSettings { buttonColor: string; @@ -244,4 +244,5 @@ export const hereProviders = [ 'HERE.normalDay', 'HERE.normalNight', 'HERE.hybridDay', - 'HERE.terrainDay'] + 'HERE.terrainDay' +]; diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.interface.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.interface.ts index be618128dd..d321e04953 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.interface.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget.interface.ts @@ -18,15 +18,15 @@ import { JsonSettingsSchema } from '@shared/models/widget.models'; import { MapProviders } from './map-models'; export interface MapWidgetInterface { - resize(), - update(), - onInit(), + resize(); + update(); + onInit(); onDestroy(); } export interface MapWidgetStaticInterface { settingsSchema(mapProvider?: MapProviders, drawRoutes?: boolean): JsonSettingsSchema; - getProvidersSchema(mapProvider?: MapProviders, ignoreImageMap?: boolean): JsonSettingsSchema + getProvidersSchema(mapProvider?: MapProviders, ignoreImageMap?: boolean): JsonSettingsSchema; dataKeySettingsSchema(): object; actionSources(): object; } diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts index f6bd983bb5..950e73e96d 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts @@ -33,7 +33,7 @@ import { import { MapWidgetInterface, MapWidgetStaticInterface } from './map-widget.interface'; import { addCondition, addGroupInfo, addToSchema, initSchema, mergeSchemes } from '@core/schema-utils'; import { WidgetContext } from '@app/modules/home/models/widget-component.models'; -import { getDefCenterPosition, parseData, parseFunction, parseWithTranslation } from './maps-utils'; +import { getDefCenterPosition, parseFunction, parseWithTranslation } from './maps-utils'; import { Datasource, DatasourceData, JsonSettingsSchema, WidgetActionDescriptor } from '@shared/models/widget.models'; import { EntityId } from '@shared/models/id/entity-id'; import { AttributeScope, DataKeyType, LatestTelemetry } from '@shared/models/telemetry/telemetry.models'; @@ -102,8 +102,9 @@ export class MapWidgetController implements MapWidgetInterface { public static getProvidersSchema(mapProvider: MapProviders, ignoreImageMap = false) { const providerSchema = _.cloneDeep(mapProviderSchema); - if (mapProvider) - providerSchema.schema.properties.provider.default = mapProvider; + if (mapProvider) { + providerSchema.schema.properties.provider.default = mapProvider; + } if (ignoreImageMap) { providerSchema.form[0].items = providerSchema.form[0]?.items.filter(item => item.value !== 'image-map'); } @@ -129,7 +130,7 @@ export class MapWidgetController implements MapWidgetInterface { } else { const clusteringSchema = mergeSchemes([markerClusteringSettingsSchema, addCondition(markerClusteringSettingsSchemaLeaflet, - `model.useClusterMarkers === true && model.provider !== "image-map"`)]) + `model.useClusterMarkers === true && model.provider !== "image-map"`)]); addToSchema(schema, clusteringSchema); addGroupInfo(schema, 'Markers Clustering Settings'); } @@ -154,10 +155,11 @@ export class MapWidgetController implements MapWidgetInterface { } translate = (key: string, defaultTranslation?: string): string => { - if (key) - return (this.ctx.$injector.get(UtilsService).customTranslation(key, defaultTranslation || key) - || this.ctx.$injector.get(TranslateService).instant(key)); - else return ''; + if (key) { + return (this.ctx.$injector.get(UtilsService).customTranslation(key, defaultTranslation || key) + || this.ctx.$injector.get(TranslateService).instant(key)); + } + return ''; } getDescriptors(name: string): { [name: string]: ($event: Event, datasource: Datasource) => void } { @@ -211,10 +213,10 @@ export class MapWidgetController implements MapWidgetInterface { } if (value) { if (key.type === DataKeyType.attribute) { - attributes.push(value) + attributes.push(value); } if (key.type === DataKeyType.timeseries) { - timeseries.push(value) + timeseries.push(value); } } }); @@ -253,7 +255,7 @@ export class MapWidgetController implements MapWidgetInterface { const coordinatesProperties = this.settings.polygonKeyName; e.$datasource.dataKeys.forEach(key => { let value; - if (coordinatesProperties == key.name) { + if (coordinatesProperties === key.name) { value = { key: key.name, value: isDefined(coordinates) ? coordinates : e[key.name] @@ -261,10 +263,10 @@ export class MapWidgetController implements MapWidgetInterface { } if (value) { if (key.type === DataKeyType.attribute) { - attributes.push(value) + attributes.push(value); } if (key.type === DataKeyType.timeseries) { - timeseries.push(value) + timeseries.push(value); } } }); @@ -294,9 +296,11 @@ export class MapWidgetController implements MapWidgetInterface { const functionParams = ['data', 'dsData', 'dsIndex']; this.provider = settings.provider || this.mapProvider; if (this.provider === MapProviders.here && !settings.mapProviderHere) { - if (settings.mapProvider && hereProviders.includes(settings.mapProvider)) - settings.mapProviderHere = settings.mapProvider - else settings.mapProviderHere = hereProviders[0]; + if (settings.mapProvider && hereProviders.includes(settings.mapProvider)) { + settings.mapProviderHere = settings.mapProvider; + } else { + settings.mapProviderHere = hereProviders[0]; + } } const customOptions = { provider: this.provider, @@ -317,14 +321,14 @@ export class MapWidgetController implements MapWidgetInterface { url: settings.markerImage, size: settings.markerImageSize || 34 } : null - } + }; if (isEditMap && !settings.hasOwnProperty('draggableMarker')) { settings.draggableMarker = true; } if (isEditMap && !settings.hasOwnProperty('editablePolygon')) { settings.editablePolygon = true; } - return { ...defaultSettings, ...settings, ...customOptions, } + return { ...defaultSettings, ...settings, ...customOptions, }; } update() { diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts index 813437a439..e9f1f5dadd 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/maps-utils.ts @@ -31,9 +31,9 @@ import { } from '@core/utils'; export function createTooltip(target: L.Layer, - settings: MarkerSettings | PolylineSettings | PolygonSettings, - datasource: Datasource, - content?: string | HTMLElement + settings: MarkerSettings | PolylineSettings | PolygonSettings, + datasource: Datasource, + content?: string | HTMLElement ): L.Popup { const popup = L.popup(); popup.setContent(content); @@ -87,7 +87,7 @@ export function interpolateOnLineSegment( } export function findAngle(startPoint: FormattedData, endPoint: FormattedData, latKeyName: string, lngKeyName: string): number { - if(isUndefined(startPoint) || isUndefined(endPoint)){ + if (isUndefined(startPoint) || isUndefined(endPoint)) { return 0; } let angle = -Math.atan2(endPoint[latKeyName] - startPoint[latKeyName], endPoint[lngKeyName] - startPoint[lngKeyName]); @@ -97,11 +97,13 @@ export function findAngle(startPoint: FormattedData, endPoint: FormattedData, la export function getDefCenterPosition(position) { - if (typeof (position) === 'string') - return position.split(','); - if (typeof (position) === 'object') - return position; - return [0, 0]; + if (typeof (position) === 'string') { + return position.split(','); + } + if (typeof (position) === 'object') { + return position; + } + return [0, 0]; } @@ -123,7 +125,7 @@ function imageLoader(imageUrl: string): Observable { document.body.removeChild(image); observer.complete(); }; - document.body.appendChild(image) + document.body.appendChild(image); image.src = imageUrl; }); } @@ -135,11 +137,11 @@ export function aspectCache(imageUrl: string): Observable { if (aspect) { return of(aspect); } - else return imageLoader(imageUrl).pipe(map(image => { + return imageLoader(imageUrl).pipe(map(image => { aspect = image.width / image.height; imageAspectMap[hash] = aspect; return aspect; - })) + })); } } @@ -221,7 +223,7 @@ function parseTemplate(template: string, data: { $datasource?: Datasource, [key: // res = compiled(data); res = template; } catch (ex) { - console.log(ex, template) + console.log(ex, template); } return res; } @@ -263,7 +265,7 @@ export function processPattern(template: string, data: { $datasource?: Datasourc match = reg.exec(template); } } catch (ex) { - console.log(ex, template) + console.log(ex, template); } return replaceInfo; } @@ -271,7 +273,7 @@ export function processPattern(template: string, data: { $datasource?: Datasourc export function fillPattern(markerLabelText: string, replaceInfoLabelMarker: Array, data: FormattedData) { let text = createLabelFromDatasource(data.$datasource, markerLabelText); if (replaceInfoLabelMarker) { - for(const variableInfo of replaceInfoLabelMarker) { + for (const variableInfo of replaceInfoLabelMarker) { let txtVal = ''; if (variableInfo.dataKeyName && isDefinedAndNotNull(data[variableInfo.dataKeyName])) { const varData = data[variableInfo.dataKeyName]; @@ -334,7 +336,7 @@ export const parseWithTranslation = { setTranslate(translateFn: TranslateFunc) { this.translateFn = translateFn; } -} +}; export function parseData(input: DatasourceData[]): FormattedData[] { return _(input).groupBy(el => el?.datasource?.entityName) @@ -361,7 +363,7 @@ export function parseData(input: DatasourceData[]): FormattedData[] { export function parseArray(input: DatasourceData[]): FormattedData[][] { return _(input).groupBy(el => el?.datasource?.entityName) - .values().value().map((entityArray, dsIndex) => + .values().value().map((entityArray) => entityArray[0].data.map((el, i) => { const obj: FormattedData = { entityName: entityArray[0]?.datasource?.entityName, diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts index f5f7663c39..4796956fa6 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts @@ -81,7 +81,7 @@ export class Marker { } updateMarkerTooltip(data: FormattedData) { - if(!this.map.markerTooltipText || this.settings.useTooltipFunction) { + if (!this.map.markerTooltipText || this.settings.useTooltipFunction) { const pattern = this.settings.useTooltipFunction ? safeExecute(this.settings.tooltipFunction, [this.data, this.dataSources, this.data.dsIndex]) : this.settings.tooltipPattern; this.map.markerTooltipText = parseWithTranslation.prepareProcessPattern(pattern, true); @@ -103,7 +103,7 @@ export class Marker { updateMarkerLabel(settings: MarkerSettings) { this.leafletMarker.unbindTooltip(); if (settings.showLabel) { - if(!this.map.markerLabelText || settings.useLabelFunction) { + if (!this.map.markerLabelText || settings.useLabelFunction) { const pattern = settings.useLabelFunction ? safeExecute(settings.labelFunction, [this.data, this.dataSources, this.data.dsIndex]) : settings.label; this.map.markerLabelText = parseWithTranslation.prepareProcessPattern(pattern, true); diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts index 94a9b30d22..409debda88 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/polygon.ts @@ -70,18 +70,19 @@ export class Polygon { } updatePolygon(data: FormattedData, dataSources: FormattedData[], settings: PolygonSettings) { - this.data = data; - this.dataSources = dataSources; - if (settings.editablePolygon) { - this.leafletPoly.disableEdit(); - } - this.leafletPoly.setLatLngs(data[this.settings.polygonKeyName]); + this.data = data; + this.dataSources = dataSources; + if (settings.editablePolygon) { + this.leafletPoly.disableEdit(); + } + this.leafletPoly.setLatLngs(data[this.settings.polygonKeyName]); if (settings.editablePolygon) { this.leafletPoly.enableEdit(this.map); } - if (settings.showPolygonTooltip) - this.updateTooltip(this.data); - this.updatePolygonColor(settings); + if (settings.showPolygonTooltip) { + this.updateTooltip(this.data); + } + this.updatePolygonColor(settings); } removePolygon() { diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/polyline.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/polyline.ts index 6521257be5..8c4997933c 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/polyline.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/polyline.ts @@ -57,7 +57,7 @@ export class Polyline { }) } ] - } + }; } updatePolyline(locations: L.LatLng[], data: FormattedData, dataSources: FormattedData[], settings: PolylineSettings) { @@ -65,8 +65,9 @@ export class Polyline { this.dataSources = dataSources; this.leafletPoly.setLatLngs(locations); this.leafletPoly.setStyle(this.getPolyStyle(settings)); - if (this.polylineDecorator) + if (this.polylineDecorator) { this.polylineDecorator.setPaths(this.leafletPoly); + } } getPolyStyle(settings: PolylineSettings): L.PolylineOptions { @@ -78,7 +79,7 @@ export class Polyline { [this.data, this.dataSources, this.data.dsIndex], settings.strokeOpacity), weight: functionValueCalculator(settings.useStrokeWeightFunction, settings.strokeWeightFunction, [this.data, this.dataSources, this.data.dsIndex], settings.strokeWeight) - } + }; } removePolyline() { diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/google-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/google-map.ts index 81313bc4ec..94fa1a09ac 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/google-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/google-map.ts @@ -49,7 +49,7 @@ export class GoogleMap extends LeafletMap { private loadGoogle(callback, apiKey = 'AIzaSyDoEx2kaGz3PxwbI9T7ccTSg5xjdw8Nw8Q') { if (gmGlobals[apiKey]) { - callback() + callback(); } else { this.resource.loadResource(`https://maps.googleapis.com/maps/api/js?key=${apiKey}`).subscribe( () => { diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/index.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/index.ts index c9e7bbe8f9..9c6bb63ddf 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/index.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/index.ts @@ -29,16 +29,16 @@ import LeafletMap from '@home/components/widget/lib/maps/leaflet-map'; import { JsonSettingsSchema } from '@shared/models/widget.models'; interface IProvider { - MapClass: Type, - schema: JsonSettingsSchema, - name: string + MapClass: Type; + schema: JsonSettingsSchema; + name: string; } export const providerSets: { [key: string]: IProvider } = { 'openstreet-map': { MapClass: OpenStreetMap, schema: openstreetMapSettingsSchema, - name: 'openstreet-map', + name: 'openstreet-map' }, 'tencent-map': { MapClass: TencentMap, diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/openstreet-map.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/openstreet-map.ts index 21814c19ad..f4f10a0dac 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/openstreet-map.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/openstreet-map.ts @@ -26,10 +26,11 @@ export class OpenStreetMap extends LeafletMap { editable: !!options.editablePolygon }).setView(options?.defaultCenterPosition, options?.defaultZoomLevel); let tileLayer; - if (options.useCustomProvider) - tileLayer = L.tileLayer(options.customProviderTileUrl); - else - tileLayer = (L.tileLayer as any).provider(options.mapProvider || 'OpenStreetMap.Mapnik'); + if (options.useCustomProvider) { + tileLayer = L.tileLayer(options.customProviderTileUrl); + } else { + tileLayer = (L.tileLayer as any).provider(options.mapProvider || 'OpenStreetMap.Mapnik'); + } tileLayer.addTo(map); super.initSettings(options); super.setMap(map); diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/maps/schemes.ts b/ui-ngx/src/app/modules/home/components/widget/lib/maps/schemes.ts index 66841fb5b6..3506978c4a 100644 --- a/ui-ngx/src/app/modules/home/components/widget/lib/maps/schemes.ts +++ b/ui-ngx/src/app/modules/home/components/widget/lib/maps/schemes.ts @@ -1068,31 +1068,31 @@ export const tripAnimationSchema = { key: 'labelFunction', type: 'javascript' }, 'showTooltip', { - key: 'tooltipColor', - type: 'color' - }, { - key: 'tooltipFontColor', - type: 'color' - }, 'tooltipOpacity', { - key: 'tooltipPattern', - type: 'textarea' - }, 'useTooltipFunction', { - key: 'tooltipFunction', - type: 'javascript' - }, 'autocloseTooltip', { - key: 'markerImage', - type: 'image' - }, 'markerImageSize', 'rotationAngle', 'useMarkerImageFunction', - { - key: 'markerImageFunction', - type: 'javascript' - }, { - key: 'markerImages', - items: [ - { - key: 'markerImages[]', - type: 'image' - } - ] - }] -} + key: 'tooltipColor', + type: 'color' + }, { + key: 'tooltipFontColor', + type: 'color' + }, 'tooltipOpacity', { + key: 'tooltipPattern', + type: 'textarea' + }, 'useTooltipFunction', { + key: 'tooltipFunction', + type: 'javascript' + }, 'autocloseTooltip', { + key: 'markerImage', + type: 'image' + }, 'markerImageSize', 'rotationAngle', 'useMarkerImageFunction', + { + key: 'markerImageFunction', + type: 'javascript' + }, { + key: 'markerImages', + items: [ + { + key: 'markerImages[]', + type: 'image' + } + ] + }] +};