dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactoring

Browse Source
This commit is contained in:
Vladyslav_Prykhodko 2020-11-11 18:03:33 +02:00 committed by Kalutka Zhenya
parent 60de89015a
commit 724b6c5247
3 changed files with 12 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -413,11 +413,11 @@ export default abstract class LeafletMap {
} }
convertToCustomFormat(position: L.LatLng): object { convertToCustomFormat(position: L.LatLng): object {
if(position.lng > 180){ if (position.lng > 180) {
position.lng = 180; position.lng = 180;
}else if(position.lng < -180){ } else if (position.lng < -180) {
position.lng = -180; position.lng = -180;
}; }
return { return {
[this.options.latKeyName]: position.lat, [this.options.latKeyName]: position.lat,
[this.options.lngKeyName]: position.lng [this.options.lngKeyName]: position.lng

2
ui-ngx/src/app/modules/home/components/widget/lib/maps/markers.ts
View File

@ -94,7 +94,7 @@ export class Marker {
} }
updateMarkerPosition(position: L.LatLng) { updateMarkerPosition(position: L.LatLng) {
if (!this.location.equals(position)) { if (!this.leafletMarker.getLatLng().equals(position)) {
this.location = position; this.location = position;
this.leafletMarker.setLatLng(position); this.leafletMarker.setLatLng(position);
} }

17
ui-ngx/src/app/modules/home/components/widget/lib/maps/providers/image-map.ts
View File

@ -258,29 +258,28 @@ export class ImageMap extends LeafletMap {
} }
convertToCustomFormat(position: L.LatLng, width = this.width, height = this.height): object { convertToCustomFormat(position: L.LatLng, width = this.width, height = this.height): object {
let point = this.latLngToPoint(position); const point = this.latLngToPoint(position);
const customX = calculateNewPointCoordinate(point.x, width); const customX = calculateNewPointCoordinate(point.x, width);
const customY = calculateNewPointCoordinate(point.y, height); const customY = calculateNewPointCoordinate(point.y, height);
if(customX === 0){ if (customX === 0) {
point.x = 0; point.x = 0;
} else if(customX === 1){ } else if (customX === 1) {
point.x = width; point.x = width;
} }
if(customY === 0){ if (customY === 0) {
point.y = 0; point.y = 0;
} else if(customY === 1){ } else if (customY === 1) {
point.y = height; point.y = height;
} }
const customLatLng = this.pointToLatLng(point.x, point.y);
const customLatLng = this.pointToLatLng(point.x,point.y)
return { return {
[this.options.xPosKeyName]: customX, [this.options.xPosKeyName]: customX,
[this.options.yPosKeyName]: customY, [this.options.yPosKeyName]: customY,
[this.options.latKeyName]:customLatLng.lat, [this.options.latKeyName]: customLatLng.lat,
[this.options.lngKeyName]:customLatLng.lng [this.options.lngKeyName]: customLatLng.lng
}; };
} }