Browse Source

improved polygon tooltip auto close

pull/1544/head
Maksym Dudnik 7 years ago
parent
commit
8247bfb1d7
  1. 10
      ui/src/app/widget/lib/google-map.js
  2. 7
      ui/src/app/widget/lib/tencent-map.js

10
ui/src/app/widget/lib/google-map.js

@ -338,15 +338,21 @@ export default class TbGoogleMap {
locationSettings: settings, locationSettings: settings,
dsIndex: location.dsIndex dsIndex: location.dsIndex
}); });
let map = this;
if (onClickListener) { if (onClickListener) {
google.maps.event.addListener(polygon, 'click', function (event) { google.maps.event.addListener(polygon, 'click', function (event) {
if (settings.displayTooltip) { if (settings.displayTooltip ) {
if (settings.autocloseTooltip) {
map.tooltips.forEach((tooltip) => {
tooltip.popup.close();
});
}
if (!polygon.anchor) { if (!polygon.anchor) {
polygon.anchor = new google.maps.MVCObject(); polygon.anchor = new google.maps.MVCObject();
} }
polygon.anchor.set("position", event.latLng); polygon.anchor.set("position", event.latLng);
popup.open(this.map, polygon.anchor); popup.open(this.map, polygon.anchor);
} }
onClickListener(); onClickListener();
}); });

7
ui/src/app/widget/lib/tencent-map.js

@ -287,7 +287,7 @@ export default class TbTencentMap {
popup.open(); popup.open();
popup.setPosition(marker); popup.setPosition(marker);
}); });
this.tooltips.push({ map.tooltips.push({
markerArgs: markerArgs, markerArgs: markerArgs,
popup: popup, popup: popup,
locationSettings: settings, locationSettings: settings,
@ -353,6 +353,11 @@ export default class TbTencentMap {
if (onClickListener) { if (onClickListener) {
qq.maps.event.addListener(polygon, 'click', function (event) { qq.maps.event.addListener(polygon, 'click', function (event) {
if (settings.autocloseTooltip) {
map.tooltips.forEach((tooltip) => {
tooltip.popup.close();
});
}
if (settings.displayTooltip) { if (settings.displayTooltip) {
popup.setMap(this.map); popup.setMap(this.map);
popup.setPosition(event.latLng); popup.setPosition(event.latLng);

Loading…
Cancel
Save