fix rebase errors, update package.json

mapbox · Nov 11, 2016 · fc974e2 · fc974e2
1 parent 5c1a195
commit fc974e2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/js/data/array_group.js b/js/data/array_group.js
@@ -33,7 +33,6 @@ class Segment {
 class ArrayGroup {
     constructor(programInterface, layers, zoom) {
         this.globalProperties = {zoom};
-
         const LayoutVertexArrayType = programInterface.layoutVertexArrayType;
         this.layoutVertexArray = new LayoutVertexArrayType();
 

diff --git a/js/data/bucket/line_bucket.js b/js/data/bucket/line_bucket.js
@@ -5,7 +5,6 @@ const createVertexArrayType = require('../vertex_array_type');
 const createElementArrayType = require('../element_array_type');
 const loadGeometry = require('../load_geometry');
 const EXTENT = require('../extent');
-
 // NOTE ON EXTRUDE SCALE:
 // scale the extrusion vector so that the normal length is this value.
 // contains the "texture" normals (-1..1). this is distinct from the extrude
@@ -111,7 +110,6 @@ class LineBucket extends Bucket {
         const firstVertex = vertices[0],
             lastVertex = vertices[len - 1],
             closed = firstVertex.equals(lastVertex);
-
         const arrays = this.arrays;
 
         // we could be more precise, but it would only save a negligible amount of space
@@ -121,7 +119,6 @@ class LineBucket extends Bucket {
         if (len === 2 && closed) return;
 
         this.distance = 0;
-
         const beginCap = cap,
             endCap = closed ? 'butt' : cap;
         let startOfLine = true;
@@ -256,13 +253,12 @@ class LineBucket extends Bucket {
                 }
 
                 if (currentJoin === 'fakeround') {
-                    // The join angle is sharp enough that a round join would be visible.
-                    // Bevel joins fill the gap between segments with a single pie slice triangle.
-                    // Create a round join by adding multiple pie slices. The join isn't actually round, but
-                    // it looks like it is at the sizes we render lines at.
-
-                    // Add more triangles for sharper angles.
-                    // This math is just a good enough approximation. It isn't "correct".
+                        // The join angle is sharp enough that a round join would be visible.
+                        // Bevel joins fill the gap between segments with a single pie slice triangle.
+                        // Create a round join by adding multiple pie slices. The join isn't actually round, but
+                        // it looks like it is at the sizes we render lines at.
+                        // Add more triangles for sharper angles.
+                        // This math is just a good enough approximation. It isn't "correct".
                     const n = Math.floor((0.5 - (cosHalfAngle - 0.5)) * 8);
                     let approxFractionalJoinNormal;
 

diff --git a/package.json b/package.json
@@ -22,8 +22,8 @@
     "gl-matrix": "^2.3.1",
     "grid-index": "^1.0.0",
     "mapbox-gl-function": "mapbox/mapbox-gl-function#41c6724e2bbd7bd1eb5991451bbf118b7d02b525",
-    "mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#749859b165cd0d96cf52d200e20e3ef7a66e0001",
-    "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#512126c802dbb8f282e9826b181f0d53da00daf2",
+    "mapbox-gl-shaders": "mapbox/mapbox-gl-shaders#b13fc6818b647ac0b6a2255045291544ef324ade",
+    "mapbox-gl-style-spec": "mapbox/mapbox-gl-style-spec#7fd0b3107e747745f14162a5b07202a8b74b3a43",
     "mapbox-gl-supported": "^1.2.0",
     "package-json-versionify": "^1.0.2",
     "pbf": "^1.3.2",
@@ -62,7 +62,7 @@
     "in-publish": "^2.0.0",
     "jsdom": "^9.4.2",
     "lodash.template": "^4.4.0",
-    "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#a0b0e3be927dff9a01b0869a4d0b41c830370388",
+    "mapbox-gl-test-suite": "mapbox/mapbox-gl-test-suite#cdcc8aa90b15372eba61c3ca58e82b0a0ca8f8cd",
     "minifyify": "^7.0.1",
     "npm-run-all": "^3.0.0",
     "nyc": "^8.3.0",