Commit 29d04ef79295680c20f0db5182d4eabeb6239fbc
Committed by
Andrew Shvayka
Andrew Shvayka
1 parent
3fc45654
UI: Fixed didn't tooltip show in Map widget at Safari browser
Showing
5 changed files
with
11 additions
and
6 deletions
| @@ -38,7 +38,8 @@ export class GoogleMap extends LeafletMap { | @@ -38,7 +38,8 @@ export class GoogleMap extends LeafletMap { | ||
| 38 | this.loadGoogle(() => { | 38 | this.loadGoogle(() => { |
| 39 | const map = L.map($container, { | 39 | const map = L.map($container, { |
| 40 | attributionControl: false, | 40 | attributionControl: false, |
| 41 | - editable: !!options.editablePolygon | 41 | + editable: !!options.editablePolygon, |
| 42 | + tap: L.Browser.safari && L.Browser.mobile | ||
| 42 | }).setView(options?.defaultCenterPosition, options?.defaultZoomLevel || DEFAULT_ZOOM_LEVEL); | 43 | }).setView(options?.defaultCenterPosition, options?.defaultZoomLevel || DEFAULT_ZOOM_LEVEL); |
| 43 | (L.gridLayer as any).googleMutant({ | 44 | (L.gridLayer as any).googleMutant({ |
| 44 | type: options?.gmDefaultMapType || 'roadmap' | 45 | type: options?.gmDefaultMapType || 'roadmap' |
| @@ -23,7 +23,8 @@ export class HEREMap extends LeafletMap { | @@ -23,7 +23,8 @@ export class HEREMap extends LeafletMap { | ||
| 23 | constructor(ctx: WidgetContext, $container, options: UnitedMapSettings) { | 23 | constructor(ctx: WidgetContext, $container, options: UnitedMapSettings) { |
| 24 | super(ctx, $container, options); | 24 | super(ctx, $container, options); |
| 25 | const map = L.map($container, { | 25 | const map = L.map($container, { |
| 26 | - editable: !!options.editablePolygon | 26 | + editable: !!options.editablePolygon, |
| 27 | + tap: L.Browser.safari && L.Browser.mobile | ||
| 27 | }).setView(options?.defaultCenterPosition, options?.defaultZoomLevel || DEFAULT_ZOOM_LEVEL); | 28 | }).setView(options?.defaultCenterPosition, options?.defaultZoomLevel || DEFAULT_ZOOM_LEVEL); |
| 28 | const tileLayer = (L.tileLayer as any).provider(options.mapProviderHere || 'HERE.normalDay', options.credentials); | 29 | const tileLayer = (L.tileLayer as any).provider(options.mapProviderHere || 'HERE.normalDay', options.credentials); |
| 29 | tileLayer.addTo(map); | 30 | tileLayer.addTo(map); |
| @@ -221,7 +221,8 @@ export class ImageMap extends LeafletMap { | @@ -221,7 +221,8 @@ export class ImageMap extends LeafletMap { | ||
| 221 | zoom: 1, | 221 | zoom: 1, |
| 222 | crs: L.CRS.Simple, | 222 | crs: L.CRS.Simple, |
| 223 | attributionControl: false, | 223 | attributionControl: false, |
| 224 | - editable: !!this.options.editablePolygon | 224 | + editable: !!this.options.editablePolygon, |
| 225 | + tap: L.Browser.safari && L.Browser.mobile | ||
| 225 | }); | 226 | }); |
| 226 | this.updateBounds(updateImage); | 227 | this.updateBounds(updateImage); |
| 227 | } | 228 | } |
| @@ -23,7 +23,8 @@ export class OpenStreetMap extends LeafletMap { | @@ -23,7 +23,8 @@ export class OpenStreetMap extends LeafletMap { | ||
| 23 | constructor(ctx: WidgetContext, $container, options: UnitedMapSettings) { | 23 | constructor(ctx: WidgetContext, $container, options: UnitedMapSettings) { |
| 24 | super(ctx, $container, options); | 24 | super(ctx, $container, options); |
| 25 | const map = L.map($container, { | 25 | const map = L.map($container, { |
| 26 | - editable: !!options.editablePolygon | 26 | + editable: !!options.editablePolygon, |
| 27 | + tap: L.Browser.safari && L.Browser.mobile | ||
| 27 | }).setView(options?.defaultCenterPosition, options?.defaultZoomLevel || DEFAULT_ZOOM_LEVEL); | 28 | }).setView(options?.defaultCenterPosition, options?.defaultZoomLevel || DEFAULT_ZOOM_LEVEL); |
| 28 | let tileLayer; | 29 | let tileLayer; |
| 29 | if (options.useCustomProvider) { | 30 | if (options.useCustomProvider) { |
| @@ -25,12 +25,13 @@ export class TencentMap extends LeafletMap { | @@ -25,12 +25,13 @@ export class TencentMap extends LeafletMap { | ||
| 25 | super(ctx, $container, options); | 25 | super(ctx, $container, options); |
| 26 | const txUrl = 'http://rt{s}.map.gtimg.com/realtimerender?z={z}&x={x}&y={y}&type=vector&style=0'; | 26 | const txUrl = 'http://rt{s}.map.gtimg.com/realtimerender?z={z}&x={x}&y={y}&type=vector&style=0'; |
| 27 | const map = L.map($container, { | 27 | const map = L.map($container, { |
| 28 | - editable: !!options.editablePolygon | 28 | + editable: !!options.editablePolygon, |
| 29 | + tap: L.Browser.safari && L.Browser.mobile | ||
| 29 | }).setView(options?.defaultCenterPosition, options?.defaultZoomLevel || DEFAULT_ZOOM_LEVEL); | 30 | }).setView(options?.defaultCenterPosition, options?.defaultZoomLevel || DEFAULT_ZOOM_LEVEL); |
| 30 | const txLayer = L.tileLayer(txUrl, { | 31 | const txLayer = L.tileLayer(txUrl, { |
| 31 | subdomains: '0123', | 32 | subdomains: '0123', |
| 32 | tms: true, | 33 | tms: true, |
| 33 | - attribution: '©2020 Tencent - GS(2018)2236号- Data© NavInfo' | 34 | + attribution: '©2021 Tencent - GS(2020)2236号- Data© NavInfo' |
| 34 | }).addTo(map); | 35 | }).addTo(map); |
| 35 | txLayer.addTo(map); | 36 | txLayer.addTo(map); |
| 36 | super.initSettings(options); | 37 | super.initSettings(options); |