Skip to content

Commit

Permalink
add dart2js release compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
@andrea689
andrea689 committed Jan 7, 2020
1 parent 037992e commit 1484eee
Show file tree
Hide file tree
Showing 14 changed files with 445 additions and 357 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/webdev_build_publish_gh_pages.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- uses: actions/checkout@v1
- run: pub global activate webdev
- run: pub get
- run: pub global run webdev build --no-release --output example:build
- run: pub global run webdev build --output example:build
- run: |
cd build
git init
Expand Down
17 changes: 10 additions & 7 deletions example/data_driven_circle_colors/index.dart
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
import 'dart:js';

import 'package:js/js.dart';
import 'package:mapbox_gl_dart/mapbox_gl_dart.dart';

void main() {
Expand All @@ -13,7 +16,7 @@ void main() {
),
);

map.on('load', () {
map.on('load', allowInterop((_) {
/* Sample feature from the `examples.8fgz4egr` tileset:
{
"type": "Feature",
Expand All @@ -34,13 +37,13 @@ void main() {
sourceLayer: 'sf2010',
paint: CirclePaint(
// make circles larger as the user zooms from z12 to z22
circleRadius: StyleFunction(
base: 1.75,
stops: [
circleRadius: {
'base': 1.75,
'stops': [
[12, 2],
[22, 180]
],
),
},
// color circles by ethnicity, using a match expression
// https://docs.mapbox.com/mapbox-gl-js/style-spec/#expressions-match
circleColor: [
Expand All @@ -59,6 +62,6 @@ void main() {
),
);

map.addLayer(layer);
});
map.addLayer(layer.toJs());
}));
}
5 changes: 3 additions & 2 deletions example/drag_a_marker/index.dart
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import 'dart:html';

import 'package:js/js.dart';
import 'package:mapbox_gl_dart/mapbox_gl_dart.dart';

Marker marker;
Expand All @@ -25,10 +26,10 @@ void main() {
),
).setLngLat(LngLat(0, 0)).addTo(map);

marker.on('dragend', onDragEnd);
marker.on('dragend', allowInterop(onDragEnd));
}

void onDragEnd() {
void onDragEnd(_) {
var lngLat = marker.getLngLat();
coordinates.style.display = 'block';
coordinates.innerHtml =
Expand Down
234 changes: 113 additions & 121 deletions example/popup_on_click/index.dart
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import 'package:js/js.dart';
import 'package:mapbox_gl_dart/mapbox_gl_dart.dart';

void main() {
Expand All @@ -13,150 +14,141 @@ void main() {
),
);

map.on('load', () {
map.on('load', allowInterop((_) {
// Add a layer showing the places.
var layer = SymbolLayer(
id: 'places',
//type: 'symbol',
source: GeoJsonSource(
type: 'geojson',
data: FeatureCollection(type: 'FeatureCollection', features: [
Feature(
type: 'Feature',
properties: Properties(
description:
'<strong>Make it Mount Pleasant</strong><p><a href="http://www.mtpleasantdc.com/makeitmtpleasant" target="_blank" title="Opens in a new window">Make it Mount Pleasant</a> is a handmade and vintage market and afternoon of live entertainment and kids activities. 12:00-6:00 p.m.</p>',
icon: 'theatre',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.038659, 38.931567],
),
),
Feature(
type: 'Feature',
properties: Properties(
description:
'<strong>Mad Men Season Five Finale Watch Party</strong><p>Head to Lounge 201 (201 Massachusetts Avenue NE) Sunday for a <a href="http://madmens5finale.eventbrite.com/" target="_blank" title="Opens in a new window">Mad Men Season Five Finale Watch Party</a>, complete with 60s costume contest, Mad Men trivia, and retro food and drink. 8:00-11:00 p.m. \$10 general admission, \$20 admission and two hour open bar.</p>',
icon: 'theatre',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.003168, 38.894651],
),
),
Feature(
type: 'Feature',
properties: Properties(
description:
'<strong>Big Backyard Beach Bash and Wine Fest</strong><p>EatBar (2761 Washington Boulevard Arlington VA) is throwing a <a href="http://tallulaeatbar.ticketleap.com/2012beachblanket/" target="_blank" title="Opens in a new window">Big Backyard Beach Bash and Wine Fest</a> on Saturday, serving up conch fritters, fish tacos and crab sliders, and Red Apron hot dogs. 12:00-3:00 p.m. \$25.grill hot dogs.</p>',
icon: 'bar',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.090372, 38.881189],
),
),
Feature(
type: 'Feature',
properties: Properties(
description:
'<strong>Ballston Arts & Crafts Market</strong><p>The <a href="http://ballstonarts-craftsmarket.blogspot.com/" target="_blank" title="Opens in a new window">Ballston Arts & Crafts Market</a> sets up shop next to the Ballston metro this Saturday for the first of five dates this summer. Nearly 35 artists and crafters will be on hand selling their wares. 10:00-4:00 p.m.</p>',
icon: 'art-gallery',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.111561, 38.882342],
),
),
Feature(
type: 'Feature',
properties: Properties(
description:
'<strong>Seersucker Bike Ride and Social</strong><p>Feeling dandy? Get fancy, grab your bike, and take part in this year\'s <a href="http://dandiesandquaintrelles.com/2012/04/the-seersucker-social-is-set-for-june-9th-save-the-date-and-start-planning-your-look/" target="_blank" title="Opens in a new window">Seersucker Social</a> bike ride from Dandies and Quaintrelles. After the ride enjoy a lawn party at Hillwood with jazz, cocktails, paper hat-making, and more. 11:00-7:00 p.m.</p>',
icon: 'bicycle',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.052477, 38.943951],
),
),
Feature(
type: 'Feature',
properties: Properties(
description:
'<strong>Capital Pride Parade</strong><p>The annual <a href="http://www.capitalpride.org/parade" target="_blank" title="Opens in a new window">Capital Pride Parade</a> makes its way through Dupont this Saturday. 4:30 p.m. Free.</p>',
icon: 'rocket',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.043444, 38.909664],
),
),
Feature(
type: 'Feature',
properties: Properties(
description:
'<strong>Muhsinah</strong><p>Jazz-influenced hip hop artist <a href="http://www.muhsinah.com" target="_blank" title="Opens in a new window">Muhsinah</a> plays the <a href="http://www.blackcatdc.com">Black Cat</a> (1811 14th Street NW) tonight with <a href="http://www.exitclov.com" target="_blank" title="Opens in a new window">Exit Clov</a> and <a href="http://godsilla.bandcamp.com" target="_blank" title="Opens in a new window">Gods’illa</a>. 9:00 p.m. \$12.</p>',
icon: 'music',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.031706, 38.914581],
),
),
Feature(
type: 'Feature',
properties: Properties(
description:
'<strong>A Little Night Music</strong><p>The Arlington Players\' production of Stephen Sondheim\'s <a href="http://www.thearlingtonplayers.org/drupal-6.20/node/4661/show" target="_blank" title="Opens in a new window"><em>A Little Night Music</em></a> comes to the Kogod Cradle at The Mead Center for American Theater (1101 6th Street SW) this weekend and next. 8:00 p.m.</p>',
icon: 'music',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.020945, 38.878241],
),
),
Feature(
type: 'Feature',
properties: Properties(
description:
'<strong>Truckeroo</strong><p><a href="http://www.truckeroodc.com/www/" target="_blank">Truckeroo</a> brings dozens of food trucks, live music, and games to half and M Street SE (across from Navy Yard Metro Station) today from 11:00 a.m. to 11:00 p.m.</p>',
icon: 'music',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.007481, 38.876516],
),
)
]),
data: FeatureCollection(
features: [
Feature(
properties: Properties(
description:
'<strong>Make it Mount Pleasant</strong><p><a href="http://www.mtpleasantdc.com/makeitmtpleasant" target="_blank" title="Opens in a new window">Make it Mount Pleasant</a> is a handmade and vintage market and afternoon of live entertainment and kids activities. 12:00-6:00 p.m.</p>',
icon: 'theatre',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.038659, 38.931567],
),
),
Feature(
properties: Properties(
description:
'<strong>Mad Men Season Five Finale Watch Party</strong><p>Head to Lounge 201 (201 Massachusetts Avenue NE) Sunday for a <a href="http://madmens5finale.eventbrite.com/" target="_blank" title="Opens in a new window">Mad Men Season Five Finale Watch Party</a>, complete with 60s costume contest, Mad Men trivia, and retro food and drink. 8:00-11:00 p.m. \$10 general admission, \$20 admission and two hour open bar.</p>',
icon: 'theatre',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.003168, 38.894651],
),
),
Feature(
properties: Properties(
description:
'<strong>Big Backyard Beach Bash and Wine Fest</strong><p>EatBar (2761 Washington Boulevard Arlington VA) is throwing a <a href="http://tallulaeatbar.ticketleap.com/2012beachblanket/" target="_blank" title="Opens in a new window">Big Backyard Beach Bash and Wine Fest</a> on Saturday, serving up conch fritters, fish tacos and crab sliders, and Red Apron hot dogs. 12:00-3:00 p.m. \$25.grill hot dogs.</p>',
icon: 'bar',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.090372, 38.881189],
),
),
Feature(
properties: Properties(
description:
'<strong>Ballston Arts & Crafts Market</strong><p>The <a href="http://ballstonarts-craftsmarket.blogspot.com/" target="_blank" title="Opens in a new window">Ballston Arts & Crafts Market</a> sets up shop next to the Ballston metro this Saturday for the first of five dates this summer. Nearly 35 artists and crafters will be on hand selling their wares. 10:00-4:00 p.m.</p>',
icon: 'art-gallery',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.111561, 38.882342],
),
),
Feature(
properties: Properties(
description:
'<strong>Seersucker Bike Ride and Social</strong><p>Feeling dandy? Get fancy, grab your bike, and take part in this year\'s <a href="http://dandiesandquaintrelles.com/2012/04/the-seersucker-social-is-set-for-june-9th-save-the-date-and-start-planning-your-look/" target="_blank" title="Opens in a new window">Seersucker Social</a> bike ride from Dandies and Quaintrelles. After the ride enjoy a lawn party at Hillwood with jazz, cocktails, paper hat-making, and more. 11:00-7:00 p.m.</p>',
icon: 'bicycle',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.052477, 38.943951],
),
),
Feature(
properties: Properties(
description:
'<strong>Capital Pride Parade</strong><p>The annual <a href="http://www.capitalpride.org/parade" target="_blank" title="Opens in a new window">Capital Pride Parade</a> makes its way through Dupont this Saturday. 4:30 p.m. Free.</p>',
icon: 'rocket',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.043444, 38.909664],
),
),
Feature(
properties: Properties(
description:
'<strong>Muhsinah</strong><p>Jazz-influenced hip hop artist <a href="http://www.muhsinah.com" target="_blank" title="Opens in a new window">Muhsinah</a> plays the <a href="http://www.blackcatdc.com">Black Cat</a> (1811 14th Street NW) tonight with <a href="http://www.exitclov.com" target="_blank" title="Opens in a new window">Exit Clov</a> and <a href="http://godsilla.bandcamp.com" target="_blank" title="Opens in a new window">Gods’illa</a>. 9:00 p.m. \$12.</p>',
icon: 'music',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.031706, 38.914581],
),
),
Feature(
properties: Properties(
description:
'<strong>A Little Night Music</strong><p>The Arlington Players\' production of Stephen Sondheim\'s <a href="http://www.thearlingtonplayers.org/drupal-6.20/node/4661/show" target="_blank" title="Opens in a new window"><em>A Little Night Music</em></a> comes to the Kogod Cradle at The Mead Center for American Theater (1101 6th Street SW) this weekend and next. 8:00 p.m.</p>',
icon: 'music',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.020945, 38.878241],
),
),
Feature(
properties: Properties(
description:
'<strong>Truckeroo</strong><p><a href="http://www.truckeroodc.com/www/" target="_blank">Truckeroo</a> brings dozens of food trucks, live music, and games to half and M Street SE (across from Navy Yard Metro Station) today from 11:00 a.m. to 11:00 p.m.</p>',
icon: 'music',
),
geometry: Geometry(
type: 'Point',
coordinates: [-77.007481, 38.876516],
),
)
],
),
),
layout: Layout(
iconImage: '{icon}-15',
iconAllowOverlap: true,
),
);
map.addLayer(layer);
map.addLayer(layer.toJs());

// When a click event occurs on a feature in the places layer, open a popup at the
// location of the feature, with description HTML from its properties.
map.on('click', 'places', (e) {
map.on('click', 'places', allowInterop((e) {
var coordinates = e.features[0].geometry.coordinates;
var description = e.features[0].properties.description;
Popup()
.setLngLat(LngLat(coordinates[0], coordinates[1]))
.setHTML(description)
.addTo(map);
});
}));

// Change the cursor to a pointer when the mouse is over the places layer.
map.on('mouseenter', 'places', (_) {
map.on('mouseenter', 'places', allowInterop((_) {
map.getCanvas().style.cursor = 'pointer';
});
}));

// Change it back to a pointer when it leaves.
map.on('mouseleave', 'places', (_) {
map.on('mouseleave', 'places', allowInterop((_) {
map.getCanvas().style.cursor = '';
});
});
}));
}));
}
Loading

0 comments on commit 1484eee

Please sign in to comment.