mapbox · tmcw · Mar 16, 2015 · Mar 17, 2015 · Mar 30, 2015 · Mar 30, 2015
diff --git a/.zuul.yml b/.zuul.yml
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -34,8 +34,9 @@ An in-progress version being developed in the `master` branch.
 
 * `mapboxgl.Source` is no longer exported. Use `map.addSource()` instead.
 * `mapboxgl.util.supported()` moved to `mapboxgl.supported()
-* map#setView(latlng, zoom, bearing) changed to map#setView(latlng, zoom, bearing, pitch)
-* map#easeTo(latlng, zoom, bearing, options) changed to map#easeTo(latlng, zoom, bearing, pitch, options)
+* map#setView(latlng, zoom, bearing) changed to map#jumpTo(options)
+* map#easeTo(latlng, zoom, bearing, options) changed to map#easeTo(options)
+* map#flyTo(latlng, zoom, bearing, options) changed to map#flyTo(options)
 
 
 

diff --git a/README.md b/README.md
@@ -54,8 +54,8 @@ Mapbox API token from https://www.mapbox.com/account/apps/.
 This command uses [mattdesl/budo](https://github.com/mattdesl/budo) to watch
 source files, rebuild the browserify bundle, and trigger LiveReload updates.
 
-Tests are written in `tape`. Most tests run within nodejs, but a few
-require a browser environment.
+Tests are written and run with [prova](https://github.com/azer/prova). Most
+tests run within nodejs, but a few require a browser environment.
 
 * `npm test`: local tests run in nodejs - excludes browser tests
 * `npm run cov`: generate test coverage report - excludes browser tests

diff --git a/debug/blank_v8.json b/debug/blank_v8.json
@@ -0,0 +1,7 @@
+{
+  "version": 8,
+  "name": "rivers",
+  "constants": { },
+  "sources": { },
+  "layers": [ ]
+}
diff --git a/debug/index.html b/debug/index.html
@@ -18,3 +18,4 @@
 <script src='site.js'></script>
 </body>
 </html>
+
diff --git a/debug/index_circle.html b/debug/index_circle.html
@@ -0,0 +1,24 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <title>Mapbox GL JS debug page</title>
+    <meta charset='utf-8'>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+
+    <link rel='stylesheet' href='../dist/mapbox-gl.css' />
+    <style>
+        body { margin: 0; padding: 0; }
+        html, body, #map { height: 100%; }
+        #size { position:absolute;top:20px;left:20px; }
+        #blur { position:absolute;top:40px;left:20px; }
+    </style>
+</head>
+
+<body>
+<div id='map'></div>
+<input type=range id=size min=0 max=200 />
+<input type=range id=blur min=0 max=1 step=0.01 />
+<script src='mapbox-gl.js'></script>
+<script src='site.js'></script>
+</body>
+</html>
diff --git a/debug/site.js b/debug/site.js
@@ -56,3 +56,4 @@ function getAccessToken() {
 
     return accessToken;
 }
+
diff --git a/debug/site_circle.js b/debug/site_circle.js
@@ -0,0 +1,70 @@
+
+mapboxgl.accessToken = getAccessToken();
+
+var map = new mapboxgl.Map({
+    container: 'map',
+    zoom: 12.5,
+    center: [-77.066104, 38.910203].reverse(),
+    style: "blank_v8.json",
+    hash: true
+});
+
+map.addControl(new mapboxgl.Navigation());
+
+map.on('style.load', function() {
+    map.addSource('geojson-point', {
+        "type": "geojson",
+        "data": {
+            type: 'Point',
+            coordinates: [-77.066104, 38.910203]
+        }
+    });
+    map.addLayer({
+        "id": "point-example",
+        "type": "circle",
+        "source": "geojson-point",
+        "paint": {
+            "circle-radius": 100,
+            "circle-color": '#f00',
+            "circle-blur": 0
+        }
+    }, 'point_circle');
+});
+
+map.on('click', function(e) {
+    (new mapboxgl.Popup())
+        .setLatLng(map.unproject(e.point))
+        .setHTML("<h1>Hello World!</h1>")
+        .addTo(map);
+});
+
+document.getElementById('size').onchange = function() {
+    map.setPaintProperty('point-example', 'circle-radius', this.value);
+};
+
+document.getElementById('blur').onchange = function() {
+    map.setPaintProperty('point-example', 'circle-blur', this.value);
+};
+
+// keyboard shortcut for comparing rendering with Mapbox GL native
+document.onkeypress = function(e) {
+    if (e.charCode === 111 && !e.shiftKey && !e.metaKey && !e.altKey) {
+        var center = map.getCenter();
+        location.href = "mapboxgl://?center=" + center.lat + "," + center.lng + "&zoom=" + map.getZoom() + "&bearing=" + map.getBearing();
+        return false;
+    }
+};
+
+function getAccessToken() {
+    var match = location.search.match(/access_token=([^&\/]*)/);
+    var accessToken = match && match[1];
+
+    if (accessToken) {
+        localStorage.accessToken = accessToken;
+    } else {
+        accessToken = localStorage.accessToken;
+    }
+
+    return accessToken;
+}
+
diff --git a/dist/mapbox-gl.css b/dist/mapbox-gl.css
@@ -13,13 +13,13 @@
     position: relative;
 }
 
-.mapboxgl-canvas.mapboxgl-interactive,
+.mapboxgl-canvas-container.mapboxgl-interactive,
 .mapboxgl-ctrl-nav-compass {
     cursor: -webkit-grab;
     cursor: -moz-grab;
     cursor: grab;
 }
-.mapboxgl-canvas.mapboxgl-interactive:active,
+.mapboxgl-canvas-container.mapboxgl-interactive:active,
 .mapboxgl-ctrl-nav-compass:active {
     cursor: -webkit-grabbing;
     cursor: -moz-grabbing;

diff --git a/docs/_layouts/default.html b/docs/_layouts/default.html
@@ -39,8 +39,10 @@
       path: /map-feedback
     - title: Contact us
       path: /contact
-    - title: Education 
+    - title: Education
       path: /education
+    - title: Security
+      path: /security
   mapdesign:
     - title: Mapbox Studio
       path: /mapbox-studio
@@ -84,20 +86,26 @@
   {% if page.description %}<meta name='description' content='{{page.description | strip_html}}'/>{% endif %}
   <title>{% if page.title == 'Mapbox' %}{{page.title}} | Design and publish beautiful maps{% else %}{{page.title}} | Mapbox{% endif %}</title>
 
-  <meta name='st:title' content='{{page.title | replace:"'","&lsquo;" | replace:"'","&lsquo;" | replace:"| Mapbox",""}}' />
-  <meta name='st:type' content='{% if page.section %}{{page.section}}{% elsif page.category %}{{page.category}}{% else %}site{% endif %}' />
-  <meta name='st:info' content='{% if page.version %}{{page.version}}{% else %}site{% endif %}' />
+  <meta class='swiftype' name='title' data-type='string' content='{{page.title | replace:"'","&lsquo;" | replace:"'","&lsquo;" | replace:"| Mapbox",""}}' />
+  <meta class='swiftype' name='type' data-type='enum' content='{% if page.section %}{{page.section}}{% elsif page.category %}{{page.category}}{% else %}site{% endif %}' />
+  <meta class='swiftype' name='info' data-type='string' content='{% if page.version %}{{page.version}}{% else %}site{% endif %}' />{% if page.date and site.baseurl == '/blog' %}
+  <meta class='swiftype' name='published_at' data-type='date' content='{{ page.date | date_to_xmlschema }}' />{% endif %}{% if page.tags %}
+  {% for tags in page.tags %}<meta class='swiftype' name='tags' data-type='string' content='{{tags}}' />
+  {% endfor %}{% endif %}{% if page.category and page.category !='none' %}
+  <meta class='swiftype' name='category' data-type='string' content='{{page.category}}' />{% endif %}{% if page.author %}
+  <meta class='swiftype' name='author' data-type='string' content='{{page.author}}' />{% endif %}{% if page.excerpt %}
+  <meta class='swiftype' name='excerpt' data-type='string' content='{{ page.excerpt | strip_html | strip_newlines | replace:"'","&lsquo;" | replace:"'","&lsquo;" | truncatewords: 30 }}' />{% endif %}
   {% if site.baseurl == '/mapbox.js' %}{% if site.mapboxjs != page.version and page.version != 'latest' %}<meta name='robots' content='noindex'>{% endif %}{% endif %}
 
   {% if page.card %}
   <meta name='twitter:site' content='@Mapbox' />
   <meta property='og:site_name' content='Mapbox' />
   <meta name='twitter:url' content='{{page.permalink}}' />
   <meta property='og:url' content='{{page.permalink}}' />
-  <meta name='twitter:title' content='{{page.title | replace:"'","&lsquo;"}}' />
-  <meta property='og:title' content='{{page.title | replace:"'","&lsquo;"}}' />
-  <meta name='twitter:description' content='{{page.content | markdownify | strip_html | trim_spaces | truncatewords: 30 | escape | replace:"'","&lsquo;" }}' />
-  <meta property='og:description' content='{{page.content | markdownify | strip_html | trim_spaces | truncatewords: 30 | escape | replace:"'","&lsquo;" }}' />
+  <meta name='twitter:title' content='{{page.title | replace:"'","&rsquo;"}}' />
+  <meta property='og:title' content='{{page.title | replace:"'","&rsquo;"}}' />
+  <meta name='twitter:description' content='{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | replace:"'","&lsquo;" | replace:"'","&lsquo;" | truncatewords: 30 }}{% else %}{{content | markdownify | strip_html | trim_spaces | truncatewords: 30 | escape | replace:"'","&rsquo;" | replace: '&#39;',"&rsquo;" }}{% endif %}' />
+  <meta property='og:description' content='{% if page.excerpt %}{{ page.excerpt | strip_html | strip_newlines | replace:"'","&lsquo;" | replace:"'","&lsquo;" | truncatewords: 30 }}{% else %}{{content | markdownify | strip_html | trim_spaces | truncatewords: 30 | escape | replace:"'","&rsquo;" | replace: '&#39;',"&rsquo;" }}{% endif %}' />
   {% if page.video %}
   <meta name='twitter:card' content='player' />
   <meta name='twitter:player' content='{{page.video | replace: "http:" , "https:" }}' />
@@ -116,12 +124,12 @@
   {% endif %}
   {% endif %}
 
-  <link href='{% if site.baseApi %}{{site.baseApi}}{% else %}https://mapbox.com{% endif %}/base/latest/base.css?v1.0' rel='stylesheet' />
+  <link href='{% if site.baseApi %}{{site.baseApi}}{% else %}https://www.mapbox.com{% endif %}/base/latest/base.css?v1.0' rel='stylesheet' />
   <link href='{{site.url}}/css/site.css' rel='stylesheet' />
   <!--[if IE 9]><link href='{{site.url}}/css/site-ie9.css' rel='stylesheet' /><![endif]-->
   <link rel='shortcut icon' href='{{site.url}}/img/favicon.ico' type='image/x-icon' />
   <link rel='alternate' type='application/rss+xml' title='RSS' href='{{site.url}}/blog/blog.rss' />
-  <link href='{% if site.mapboxjsbase %}{{site.mapboxjsbase}}{% else %}https://api.tiles.mapbox.com/mapbox.js/{% if site.mapboxjs %}{{site.mapboxjs}}{% else %}v1.6.1{% endif %}{% endif %}/mapbox.css' rel='stylesheet' />
+  <link href='{% if site.mapboxjsbase %}{{site.mapboxjsbase}}{% else %}https://api.tiles.mapbox.com/mapbox.js/{% if site.mapboxjs %}{{site.mapboxjs}}{% else %}v1.6.5{% endif %}{% endif %}/mapbox.css' rel='stylesheet' />
 
   <!--[if lt IE 9 ]><script src='{{site.url}}/js/redirect-ie.js'></script><![endif]-->
   <script src='https://js.stripe.com/v2/'></script>
@@ -133,7 +141,7 @@
   Stripe.setPublishableKey(window.location.hostname.indexOf('mapbox.com') !== -1 ?
     'pk_live_hI6mmOTIg7KkywK6vo3vJvpk' : 'pk_test_gmIyREg3sKzAiyMkAEeCsxUG');
   </script>
-  <script src='{% if site.mapboxjsbase %}{{site.mapboxjsbase}}{% else %}https://api.tiles.mapbox.com/mapbox.js/{% if site.mapboxjs %}{{site.mapboxjs}}{% else %}v1.6.1{% endif %}{% endif %}/mapbox.js'></script>
+  <script src='{% if site.mapboxjsbase %}{{site.mapboxjsbase}}{% else %}https://api.tiles.mapbox.com/mapbox.js/{% if site.mapboxjs %}{{site.mapboxjs}}{% else %}v1.6.5{% endif %}{% endif %}/mapbox.js'></script>
 
   <script>
   window.mapbox_api = '{{site.api}}';
@@ -145,16 +153,16 @@
       L.mapbox.config.HTTPS_URL = window.mapbox_tileApi + '/v4';
   }
   </script>
-  <script src='{% if site.baseApi %}{{site.baseApi}}{% else %}https://mapbox.com{% endif %}/base.js/dist/base.js'></script>
+  <script src='{% if site.baseApi %}{{site.baseApi}}{% else %}https://www.mapbox.com{% endif %}/base.js/dist/base.js'></script>
   {% if site.test %}<script src='{{site.url}}/test/tape.js'></script>{% endif %}
   {% if page.head %}{{page.head}}{% endif %}
 </head>
-<body class='{{page.class}} {{page.options}}'>
+<body class='{{page.class}} {{page.options}}{% if page.blog_featured == true %} bleed{% endif %}'>
 <div class='page-content'>
 {% if page.app %}
 {{content}}
 {% else %}
-<div class='masthead show-in-loaded col12 clearfix {% unless page.options contains 'bleed' %}fill-blue{% endunless %} {% unless page.options contains 'light' %}dark{% endunless %}'>
+<div class='masthead show-in-loaded col12 clearfix {% unless page.options contains 'bleed' %}fill-blue{% endunless %} {% unless page.options contains 'light' %}dark{% endunless %}' data-swiftype-index='false'>
   <div class='limiter clearfix'>
     <nav class='col12 text-right pad2y contain animate clearfix noprint'>
       <a class='fl mb-logo' href='/'></a>
@@ -167,7 +175,7 @@ <h4 class='logo-enterpriseaddon pin-topleft text-aqua block-in-enterprise'>Enter
 
 <div class='{% unless page.options contains 'full' %} limiter clearfix{% endunless %}'>{{content}}</div>
 
-<div class='footer footer-in-docs clearfix contain hide-mobile fill-light'>
+<div class='footer footer-in-docs clearfix contain hide-mobile fill-light' data-swiftype-index='false'>
 
   <div class='limiter clearfix'>
     <div class='footer-in-docs footer-cols-in-docs clearfix col12 pad8y small'>
@@ -227,15 +235,15 @@ <h3 class='space-bottom1'>Sign up for our newsletter</h3>
         <fieldset class='clearfix newsletter-in-docs input-pill col12 pill with-icon'>
           <span class='icon mail quiet'></span>
           <input type='text' value='' placeholder='Email address' name='email' class='col9 required email'>
-          <input type='submit' value='Subscribe' class='col3'>
+          <input type='submit' value='Subscribe' class='button col3'>
         </fieldset>
       </form>
     </div>
   </div>
 
 </div>
 
-<div class='footer-in-docs terms-in-docs col12 center footer-copyright small pad4 noprint fill-light contain'>
+<div class='footer-in-docs terms-in-docs col12 center footer-copyright small pad4 noprint fill-light contain' data-swiftype-index='false'>
     <a href='{{site.url}}/tos'>Terms</a> +
     <a href='{{site.url}}/privacy'>Privacy</a>
     &copy; Mapbox

diff --git a/docs/_posts/examples/3400-01-03-flyto-options.html b/docs/_posts/examples/3400-01-03-flyto-options.html
@@ -0,0 +1,67 @@
+---
+layout: example
+category: example
+title: Slowly fly to location
+description: Using .flyTo with flyOptions
+---
+
+<style>
+#fly {
+  display: block;
+  position: relative;
+  margin: 0px auto;
+  width: 50%;
+  height: 40px;
+  padding: 10px;
+  border: none;
+  border-radius: 3px;
+  font-size: 12px;
+  text-align: center;
+  color: #fff;
+  background: #ee8a65;
+}
+</style>
+<div id='map'></div>
+<br />
+<button onclick='fly();' id='fly'>Fly</button>
+<script>
+var start = [40, -74.50];
+var end = [40, 74.50];
+var map = new mapboxgl.Map({
+  container: 'map',
+  style: 'https://www.mapbox.com/mapbox-gl-styles/styles/outdoors-v7.json',
+  center: start,
+  zoom: 9
+});
+
+var isAtStart = true;
+
+function fly() {
+  // depending on whether we're currently at point a or b, aim for
+  // point a or b
+  var target = isAtStart ? end : start;
+
+  // and now we're at the opposite point
+  isAtStart = !isAtStart;
+
+  map.flyTo({
+    // These options control the ending camera position: centered at
+    // the target, at zoom level 9, and north up.
+    center: target,
+    zoom: 9,
+    bearing: 0,
+
+    // These options control the flight curve, making it move
+    // slowly and zoom out almost completely before starting
+    // to pan.
+    speed: 0.2, // make the flying slow
+    curve: 1, // change the speed at which it zooms out
+
+    // This can be any easing function: it takes a number between
+    // 0 and 1 and returns another number between 0 and 1.
+    easing: function (t) {
+      return t;
+    }
+  });
+}
+</script>
diff --git a/docs/_posts/examples/3400-01-03-flyto.html b/docs/_posts/examples/3400-01-03-flyto.html
@@ -35,8 +35,8 @@
 function fly() {
     // Fly to a random location by offsetting the point 40, -74.50
     // by up to 5 degrees.
-    map.flyTo([
+    map.flyTo({ center: [
         40 + (Math.random() - 0.5) * 10,
-        -74.50 + (Math.random() - 0.5) * 10]);
+        -74.50 + (Math.random() - 0.5) * 10] });
 }
 </script>
diff --git a/docs/_posts/examples/3400-01-03-mouse-latlng.html b/docs/_posts/examples/3400-01-03-mouse-latlng.html
Original file line number	Diff line number	Diff line change
Expand Up		@@ -18,3 +18,4 @@
		<script src='site.js'></script>
		</body>
		</html>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -56,3 +56,4 @@ function getAccessToken() {

		return accessToken;
		}