Merge pull request mapbox#191 from mapbox/mapbox-gl-js-0.13.1

Upgrade mapbox-gl-js to 0.13.1
bensleveritt · Jan 28, 2016 · 18c8ddd · 18c8ddd
2 parents 3238708 + a658eab
commit 18c8ddd
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 25 deletions.
diff --git a/debug/index.html b/debug/index.html
@@ -4,7 +4,7 @@
   <meta name='viewport' content='initial-scale=1,maximum-scale=1,user-scalable=no' />
   <meta charset=utf-8 />
   <title>Mapbox GL Draw | Mapbox</title>
-  <link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.4/mapbox-gl.css' rel='stylesheet' />
+  <link href='https://api.tiles.mapbox.com/mapbox-gl-js/v0.13.1/mapbox-gl.css' rel='stylesheet' />
   <link href='../dist/mapbox-gl-draw.css' rel='stylesheet' />
   <style>
     body { margin:0; padding:0; }
@@ -13,12 +13,12 @@
 </head>
 <body>
 <div id='map'></div>
-<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.11.4/mapbox-gl.js'></script>
+<script src='https://api.tiles.mapbox.com/mapbox-gl-js/v0.13.1/mapbox-gl.js'></script>
 <script src='../dist/mapbox-gl-draw.js'></script>
 <script type='text/javascript'>
   mapboxgl.accessToken = localStorage.accessToken;
 
-  var map = window.themap = new mapboxgl.Map({
+  var map = new mapboxgl.Map({
     container: 'map',
     zoom: 1,
     center: [0, 0],

diff --git a/src/theme/draw-selected.js b/src/theme/draw-selected.js
@@ -46,16 +46,7 @@ export default [
     'filter': ['all',
       ['==', '$type', 'Point'],
       ['!=', 'meta', 'midpoint']],
-    'layout': {
-      'text-anchor': 'top',
-      'icon-allow-overlap': true
-    },
-    'paint': {
-      'icon-color': '#ffffff',
-      'icon-halo-color': '#000000',
-      'icon-halo-width': 2,
-      'icon-size': 1.1
-    },
+    'layout': {},
     'interactive': true
   }, {
     'id': 'gl-draw-selected-point-mid',
@@ -64,13 +55,9 @@ export default [
     'filter': ['all',
       ['==', '$type', 'Point'],
       ['==', 'meta', 'midpoint']],
-    'layout': {
-      'text-anchor': 'top',
-      'icon-allow-overlap': true
-    },
     'paint': {
-      'icon-color': '#000000',
-      'icon-size': 1
+      'circle-radius': 5,
+      'circle-color': '#000000'
     },
     'interactive': true
   }

diff --git a/src/theme/draw.js b/src/theme/draw.js
@@ -43,13 +43,9 @@ export default [
     'type': 'circle',
     'source': 'draw',
     'filter': ['all', ['==', '$type', 'Point']],
-    'layout': {
-      'text-anchor': 'top',
-      'icon-allow-overlap': true
-    },
     'paint': {
-      'icon-color': '#ff00ff',
-      'icon-size': 1
+      'circle-radius': 5,
+      'circle-color': '#ff00ff'
     },
     'interactive': true
   }