add LineLayer

update SymbolLayer replace Properties with Map<String, dynamic> add tiles to VectorSource
andrea689 · Jan 30, 2020 · c121958 · c121958
1 parent 1484eee
commit c121958
Show file tree

Hide file tree

Showing 10 changed files with 440 additions and 116 deletions.
diff --git a/.gitignore b/.gitignore
@@ -11,3 +11,9 @@ build/
 
 # Directory created by dartdoc
 doc/api/
+
+# Visual Studio Code related
+.classpath
+.project
+.settings/
+.vscode/
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -1,4 +1,7 @@
 {
+    "dart.flutterSdkPaths": [
+        "fvm"
+    ],
     "editor.formatOnSave": true,
     "editor.formatOnType": true
 }
diff --git a/example/popup_on_click/index.dart b/example/popup_on_click/index.dart
@@ -22,99 +22,99 @@ void main() {
         data: FeatureCollection(
           features: [
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'theatre',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.038659, 38.931567],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'theatre',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.003168, 38.894651],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'bar',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.090372, 38.881189],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'art-gallery',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.111561, 38.882342],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'bicycle',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.052477, 38.943951],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'rocket',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.043444, 38.909664],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'music',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.031706, 38.914581],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'music',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.020945, 38.878241],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'music',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.007481, 38.876516],
@@ -123,7 +123,7 @@ void main() {
           ],
         ),
       ),
-      layout: Layout(
+      layout: SymbolLayout(
         iconImage: '{icon}-15',
         iconAllowOverlap: true,
       ),

diff --git a/example/popup_on_hover/index.dart b/example/popup_on_hover/index.dart
@@ -20,104 +20,103 @@ void main() {
     // Add a layer showing the places.
     var layer = SymbolLayer(
       id: 'places',
-      //type: 'symbol',
       source: GeoJsonSource(
         data: FeatureCollection(
           features: [
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'theatre',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.038659, 38.931567],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'theatre',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.003168, 38.894651],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'bar',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.090372, 38.881189],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'art-gallery',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.111561, 38.882342],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'bicycle',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.052477, 38.943951],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'rocket',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.043444, 38.909664],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'music',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.031706, 38.914581],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'music',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.020945, 38.878241],
               ),
             ),
             Feature(
-              properties: Properties(
-                description:
+              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',
-              ),
+                'icon': 'music',
+              },
               geometry: Geometry(
                 type: 'Point',
                 coordinates: [-77.007481, 38.876516],
@@ -126,7 +125,7 @@ void main() {
           ],
         ),
       ),
-      layout: Layout(
+      layout: SymbolLayout(
         iconImage: '{icon}-15',
         iconAllowOverlap: true,
       ),

diff --git a/lib/mapbox_gl_dart.dart b/lib/mapbox_gl_dart.dart
@@ -10,6 +10,7 @@ export 'src/interop/geojson_interop.dart';
 export 'src/style/evaluation_parameters.dart';
 export 'src/style/layers/circle_layer.dart';
 export 'src/style/layers/layout.dart';
+export 'src/style/layers/line_layer.dart';
 export 'src/style/layers/symbol_layer.dart';
 export 'src/style/sources/geojson_source.dart';
 export 'src/style/sources/source.dart';