Browse Source
Merge pull request #1544 from MrKartoshka/improved_polygon_coordinates_parser
improved polygon tool-tip auto close
pull/1558/head
Igor Kulikov
8 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with
14 additions and
3 deletions
-
ui/src/app/widget/lib/google-map.js
-
ui/src/app/widget/lib/tencent-map.js
|
|
|
@ -338,15 +338,21 @@ export default class TbGoogleMap { |
|
|
|
locationSettings: settings, |
|
|
|
dsIndex: location.dsIndex |
|
|
|
}); |
|
|
|
|
|
|
|
let map = this; |
|
|
|
if (onClickListener) { |
|
|
|
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) { |
|
|
|
polygon.anchor = new google.maps.MVCObject(); |
|
|
|
} |
|
|
|
polygon.anchor.set("position", event.latLng); |
|
|
|
popup.open(this.map, polygon.anchor); |
|
|
|
|
|
|
|
} |
|
|
|
onClickListener(); |
|
|
|
}); |
|
|
|
|
|
|
|
@ -287,7 +287,7 @@ export default class TbTencentMap { |
|
|
|
popup.open(); |
|
|
|
popup.setPosition(marker); |
|
|
|
}); |
|
|
|
this.tooltips.push({ |
|
|
|
map.tooltips.push({ |
|
|
|
markerArgs: markerArgs, |
|
|
|
popup: popup, |
|
|
|
locationSettings: settings, |
|
|
|
@ -353,6 +353,11 @@ export default class TbTencentMap { |
|
|
|
|
|
|
|
if (onClickListener) { |
|
|
|
qq.maps.event.addListener(polygon, 'click', function (event) { |
|
|
|
if (settings.autocloseTooltip) { |
|
|
|
map.tooltips.forEach((tooltip) => { |
|
|
|
tooltip.popup.close(); |
|
|
|
}); |
|
|
|
} |
|
|
|
if (settings.displayTooltip) { |
|
|
|
popup.setMap(this.map); |
|
|
|
popup.setPosition(event.latLng); |
|
|
|
|