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

realize fitBounds add new property useDefaultZoom

Browse Source
This commit is contained in:
Vladyslav Prykhodko 2019-11-29 01:37:55 +02:00 committed by Andrew Shvayka
parent 51bec36d0d
commit eafbc427d8
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ui/src/app/widget/lib/google-map.js
View File

@ -421,8 +421,8 @@ export default class TbGoogleMap {
/* eslint-disable no-undef */ /* eslint-disable no-undef */
fitBounds(bounds) { fitBounds(bounds, useDefaultZoom) {
if (this.dontFitMapBounds && this.defaultZoomLevel) { if ((this.dontFitMapBounds || useDefaultZoom) && this.defaultZoomLevel) {
this.map.setZoom(this.defaultZoomLevel); this.map.setZoom(this.defaultZoomLevel);
this.map.setCenter(bounds.getCenter()); this.map.setCenter(bounds.getCenter());
} else { } else {

6
ui/src/app/widget/lib/map-widget2.js
View File

@ -732,7 +732,7 @@ export default class TbMapWidgetV2 {
} }
}); });
tbMap.map.fitBounds(bounds); tbMap.map.fitBounds(bounds, tbMap.isEdit && tbMap.markers.length === 1);
} }
function mapPolygonArray (rawArray) { function mapPolygonArray (rawArray) {
@ -781,7 +781,7 @@ export default class TbMapWidgetV2 {
return !(!ds[tbMap.locationSettings.latKeyName] && !ds[tbMap.locationSettings.lngKeyName]); return !(!ds[tbMap.locationSettings.latKeyName] && !ds[tbMap.locationSettings.lngKeyName]);
}); });
tbMap.initBounds = !dataValid; tbMap.initBounds = !dataValid;
tbMap.map.fitBounds(bounds); tbMap.map.fitBounds(bounds, tbMap.isEdit && tbMap.markers.length === 1);
} }
} }
@ -845,7 +845,7 @@ export default class TbMapWidgetV2 {
}) })
} }
} }
map.fitBounds(bounds); map.fitBounds(bounds, map.isEdit && map.markers.length === 1);
} }
} }
} }

4
ui/src/app/widget/lib/openstreet-map.js
View File

@ -273,9 +273,9 @@ export default class TbOpenStreetMap {
polygon.redraw(); polygon.redraw();
} }
fitBounds(bounds) { fitBounds(bounds, useDefaultZoom) {
if (bounds.isValid()) { if (bounds.isValid()) {
if (this.dontFitMapBounds && this.defaultZoomLevel) { if ((this.dontFitMapBounds || useDefaultZoom) && this.defaultZoomLevel) {
this.map.setZoom(this.defaultZoomLevel, {animate: false}); this.map.setZoom(this.defaultZoomLevel, {animate: false});
this.map.panTo(bounds.getCenter(), {animate: false}); this.map.panTo(bounds.getCenter(), {animate: false});
} else { } else {

6
ui/src/app/widget/lib/tencent-map.js
View File

@ -58,7 +58,7 @@ export default class TbTencentMap {
if (initCallback) { if (initCallback) {
initCallback(); setTimeout(initCallback, 0);// eslint-disable-line
} }
} }
@ -427,8 +427,8 @@ export default class TbTencentMap {
} }
/* eslint-disable no-undef ,no-unused-vars*/ /* eslint-disable no-undef ,no-unused-vars*/
fitBounds(bounds) { fitBounds(bounds, useDefaultZoom) {
if (this.dontFitMapBounds && this.defaultZoomLevel) { if ((this.dontFitMapBounds || useDefaultZoom) && this.defaultZoomLevel) {
this.map.setZoom(this.defaultZoomLevel); this.map.setZoom(this.defaultZoomLevel);
this.map.setCenter(bounds.getCenter()); this.map.setCenter(bounds.getCenter());
} else { } else {