tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #5627 from vvlladd28/revert/map-after-updated/edit 

[3.3.3] UI: Revert code for backward-compatible after having updated editors …
pull/5659/head
Igor Kulikov 5 years ago
committed by GitHub
parent
eda4e0f761 79251adb3a
commit
1761876354
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 97 additions and 55 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 57
      ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
  2. 93
      ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
  3. 2
      ui-ngx/yarn.lock

57
ui-ngx/src/app/modules/home/components/widget/lib/maps/leaflet-map.ts
View File

@ -31,7 +31,7 @@ import {
UnitedMapSettings
} from './map-models';
import { Marker } from './markers';
import { forkJoin, Observable, of } from 'rxjs';
import { Observable, of } from 'rxjs';
import { Polyline } from './polyline';
import { Polygon } from './polygon';
import { createTooltip } from '@home/components/widget/lib/maps/maps-utils';
@ -50,9 +50,6 @@ import {
SelectEntityDialogData
} from '@home/components/widget/lib/maps/dialogs/select-entity-dialog.component';
import { MatDialog } from '@angular/material/dialog';
import { AttributeService } from '@core/http/attribute.service';
import { EntityId } from '@shared/models/id/entity-id';
import { AttributeScope, DataKeyType, LatestTelemetry } from '@shared/models/telemetry/telemetry.models';
export default abstract class LeafletMap {
@ -85,6 +82,9 @@ export default abstract class LeafletMap {
southWest = new L.LatLng(-Projection.SphericalMercator['MAX_LATITUDE'], -180);
// tslint:disable-next-line:no-string-literal
northEast = new L.LatLng(Projection.SphericalMercator['MAX_LATITUDE'], 180);
saveLocation: (e: FormattedData, values: {[key: string]: any}) => Observable<any>;
saveMarkerLocation: (e: FormattedData, lat?: number, lng?: number) => Observable<any>;
savePolygonLocation: (e: FormattedData, coordinates?: Array<any>) => Observable<any>;
protected constructor(public ctx: WidgetContext,
public $container: HTMLElement,
@ -344,55 +344,6 @@ export default abstract class LeafletMap {
}
}
private saveLocation(e: FormattedData, values: {[key: string]: any}): Observable<any> {
const attributeService = this.ctx.$injector.get(AttributeService);
const attributes = [];
const timeseries = [];
const entityId: EntityId = {
entityType: e.$datasource.entityType,
id: e.$datasource.entityId
};
for (const dataKeyName of Object.keys(values)) {
for (const key of e.$datasource.dataKeys) {
if (dataKeyName === key.name) {
const value = {
key: key.name,
value: values[dataKeyName]
};
if (key.type === DataKeyType.attribute) {
attributes.push(value);
} else if (key.type === DataKeyType.timeseries) {
timeseries.push(value);
}
break;
}
}
}
const observables: Observable<any>[] = [];
if (timeseries.length) {
observables.push(attributeService.saveEntityTimeseries(
entityId,
LatestTelemetry.LATEST_TELEMETRY,
timeseries
));
}
if (attributes.length) {
observables.push(attributeService.saveEntityAttributes(
entityId,
AttributeScope.SERVER_SCOPE,
attributes
));
}
if (observables.length) {
return forkJoin(observables);
} else {
return of(null);
}
}
createLatLng(lat: number, lng: number): L.LatLng {
return L.latLng(lat, lng);
}

93
ui-ngx/src/app/modules/home/components/widget/lib/maps/map-widget2.ts
View File

@ -14,7 +14,7 @@
/// limitations under the License.
///
import { defaultSettings, hereProviders, MapProviders, UnitedMapSettings } from './map-models';
import { defaultSettings, FormattedData, hereProviders, MapProviders, UnitedMapSettings } from './map-models';
import LeafletMap from './leaflet-map';
import {
commonMapSettingsSchema,
@ -32,6 +32,12 @@ import { TranslateService } from '@ngx-translate/core';
import { UtilsService } from '@core/services/utils.service';
import { EntityDataPageLink } from '@shared/models/query/query.models';
import { providerClass } from '@home/components/widget/lib/maps/providers';
import { isDefined } from '@core/utils';
import L from 'leaflet';
import { forkJoin, Observable, of } from 'rxjs';
import { AttributeService } from '@core/http/attribute.service';
import { EntityId } from '@shared/models/id/entity-id';
import { AttributeScope, DataKeyType, LatestTelemetry } from '@shared/models/telemetry/telemetry.models';
// @dynamic
export class MapWidgetController implements MapWidgetInterface {
@ -63,6 +69,10 @@ export class MapWidgetController implements MapWidgetInterface {
}
parseWithTranslation.setTranslate(this.translate);
this.map = new MapClass(this.ctx, $element, this.settings);
(this.ctx as any).mapInstance = this.map;
this.map.saveMarkerLocation = this.setMarkerLocation;
this.map.savePolygonLocation = this.savePolygonLocation;
this.map.saveLocation = this.saveLocation;
this.pageLink = {
page: 0,
pageSize: this.settings.mapPageSize,
@ -158,6 +168,86 @@ export class MapWidgetController implements MapWidgetInterface {
}, entityName, null, entityLabel);
}
setMarkerLocation(e: FormattedData, lat?: number, lng?: number) {
let markerValue;
if (isDefined(lat) && isDefined(lng)) {
const point = lat != null && lng !== null ? L.latLng(lat, lng) : null;
markerValue = this.map.convertToCustomFormat(point);
} else if (this.settings.mapProvider !== MapProviders.image) {
markerValue = {
[this.settings.latKeyName]: e[this.settings.latKeyName],
[this.settings.lngKeyName]: e[this.settings.lngKeyName],
};
} else {
markerValue = {
[this.settings.xPosKeyName]: e[this.settings.xPosKeyName],
[this.settings.yPosKeyName]: e[this.settings.yPosKeyName],
};
}
return this.saveLocation(e, markerValue);
}
savePolygonLocation(e: FormattedData, coordinates?: Array<any>) {
let polygonValue;
if (isDefined(coordinates)) {
polygonValue = this.map.convertToPolygonFormat(coordinates);
} else {
polygonValue = {
[this.settings.polygonKeyName]: e[this.settings.polygonKeyName]
};
}
return this.saveLocation(e, polygonValue);
}
saveLocation(e: FormattedData, values: {[key: string]: any}): Observable<any> {
const attributeService = this.ctx.$injector.get(AttributeService);
const attributes = [];
const timeseries = [];
const entityId: EntityId = {
entityType: e.$datasource.entityType,
id: e.$datasource.entityId
};
for (const dataKeyName of Object.keys(values)) {
for (const key of e.$datasource.dataKeys) {
if (dataKeyName === key.name) {
const value = {
key: key.name,
value: values[dataKeyName]
};
if (key.type === DataKeyType.attribute) {
attributes.push(value);
} else if (key.type === DataKeyType.timeseries) {
timeseries.push(value);
}
break;
}
}
}
const observables: Observable<any>[] = [];
if (timeseries.length) {
observables.push(attributeService.saveEntityTimeseries(
entityId,
LatestTelemetry.LATEST_TELEMETRY,
timeseries
));
}
if (attributes.length) {
observables.push(attributeService.saveEntityAttributes(
entityId,
AttributeScope.SERVER_SCOPE,
attributes
));
}
if (observables.length) {
return forkJoin(observables);
} else {
return of(null);
}
}
initSettings(settings: UnitedMapSettings, isEditMap?: boolean): UnitedMapSettings {
const functionParams = ['data', 'dsData', 'dsIndex'];
this.provider = settings.provider || this.mapProvider;
@ -209,6 +299,7 @@ export class MapWidgetController implements MapWidgetInterface {
}
destroy() {
(this.ctx as any).mapInstance = null;
if (this.map) {
this.map.remove();
}

2
ui-ngx/yarn.lock
View File

@ -6444,7 +6444,7 @@ leaflet-rotatedmarker@^0.2.0:
resolved "https://registry.yarnpkg.com/leaflet-rotatedmarker/-/leaflet-rotatedmarker-0.2.0.tgz#4467f49f98d1bfd56959bd9c6705203dd2601277"
integrity sha1-RGf0n5jRv9VpWb2cZwUgPdJgEnc=
leaflet.gridlayer.googlemutant@0.13.4:
leaflet.gridlayer.googlemutant@^0.13.4:
version "0.13.4"
resolved "https://registry.yarnpkg.com/leaflet.gridlayer.googlemutant/-/leaflet.gridlayer.googlemutant-0.13.4.tgz#0add37d240c70c999e1f1d341208e6fea2372c40"
integrity sha512-oC6xUSFJ9HP4WIupXakgiYckdBHuHQeSaxTXsVlcvcpfsuYoJ/HFIrz1bmK4Qr/qKO4fY1MDM6AoewU7Bph8ZQ==

Write Preview
Loading…
Cancel
Save