Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[web] Fix Mapbox GL JS CSS embedding #551

Merged
merged 2 commits into from
Mar 14, 2021
Merged

[web] Fix Mapbox GL JS CSS embedding #551

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a483b2
[web] Fix Mapbox GL JS CSS embedding
shroff Feb 19, 2021
f609b1b
Merge branch 'master' into webcss
shroff Feb 26, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 18 additions & 16 deletions mapbox_gl_web/lib/src/mapbox_map_controller.dart
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
part of mapbox_gl_web;

const _mapboxGlCssUrl =
'https://api.tiles.mapbox.com/mapbox-gl-js/v1.6.1/mapbox-gl.css';

class MapboxMapController extends MapboxGlPlatform
implements MapboxMapOptionsSink {
DivElement _mapElement;
Expand Down Expand Up @@ -42,7 +45,7 @@ class MapboxMapController extends MapboxGlPlatform

@override
Future<void> initPlatform(int id) async {
await _addStylesheetToShadowRoot();
await _addStylesheetToShadowRoot(_mapElement);
if (_creationParams.containsKey('initialCameraPosition')) {
var camera = _creationParams['initialCameraPosition'];
if (_creationParams.containsKey('accessToken')) {
Expand All @@ -63,20 +66,11 @@ class MapboxMapController extends MapboxGlPlatform
Convert.interpretMapboxMapOptions(_creationParams['options'], this);
}

Future<void> _addStylesheetToShadowRoot() async {
int index = -1;
while (index == -1) {
index = document.getElementsByTagName('flt-platform-view').length - 1;
await Future.delayed(Duration(milliseconds: 10));
}
HtmlElement e = document.getElementsByTagName('flt-platform-view')[index]
as HtmlElement;

LinkElement link = LinkElement();
link.href =
'https://api.tiles.mapbox.com/mapbox-gl-js/v1.6.1/mapbox-gl.css';
link.rel = 'stylesheet';
e.shadowRoot.append(link);
Future<void> _addStylesheetToShadowRoot(HtmlElement e) async {
LinkElement link = LinkElement()
..href = _mapboxGlCssUrl
..rel = 'stylesheet';
e.append(link);

await link.onLoad.first;
}
Expand Down Expand Up @@ -439,7 +433,15 @@ class MapboxMapController extends MapboxGlPlatform
);
_geolocateControl.on('geolocate', (e) {
_myLastLocation = LatLng(e.coords.latitude, e.coords.longitude);
onUserLocationUpdatedPlatform(UserLocation(position: LatLng(e.coords.latitude, e.coords.longitude), altitude: e.coords.altitude, bearing: e.coords.heading, speed: e.coords.speed, horizontalAccuracy: e.coords.accuracy, verticalAccuracy: e.coords.altitudeAccuracy, heading: null, timestamp: DateTime.fromMillisecondsSinceEpoch(e.timestamp)));
onUserLocationUpdatedPlatform(UserLocation(
position: LatLng(e.coords.latitude, e.coords.longitude),
altitude: e.coords.altitude,
bearing: e.coords.heading,
speed: e.coords.speed,
horizontalAccuracy: e.coords.accuracy,
verticalAccuracy: e.coords.altitudeAccuracy,
heading: null,
timestamp: DateTime.fromMillisecondsSinceEpoch(e.timestamp)));
});
_geolocateControl.on('trackuserlocationstart', (_) {
_onCameraTrackingChanged(true);
Expand Down