Remove custom source work

mapbox · Mar 8, 2018 · a3be215 · a3be215
1 parent 1ae9400
commit a3be215
Show file tree

Hide file tree

Showing 8 changed files with 40 additions and 219 deletions.
diff --git a/debug/routeline.html → debug/gradient.html b/debug/routeline.html → debug/gradient.html
@@ -15,7 +15,6 @@
     <div id='map'></div>
 
     <script src='/dist/mapbox-gl-dev.js'></script>
-    <script src='/dist/mapbox-gl-linestring.js'></script>
     <script src='/debug/access_token_generated.js'></script>
     <script>
 
@@ -42,38 +41,35 @@
     map.on('load', () => {
         map.showTileBoundaries = true;
 
-        map.addSourceType('linestring', mapboxgl.LineStringSource, (e) => {
-
-            map.addSource('line', {
-                type: 'linestring',
-                buffer: 0,
-                data: gj
-            });
+        map.addSource('line', {
+            type: 'geojson',
+            lineMetrics: true,
+            data: gj
+        });
 
-            map.addLayer({
-                type: 'line',
-                source: 'line',
-                id: 'line',
-                paint: {
-                    'line-color': 'red',
-                    'line-width': 14,
-                    'line-gradient': [
-                        'interpolate',
-                        ['linear'],
-                        ['line-progress'],
-                        0, "rgba(0, 0, 255, 0)",
-                        0.1, "royalblue",
-                        0.3, "cyan",
-                        0.5, "lime",
-                        0.7, "yellow",
-                        1, "red"
-                    ]
-                },
-                layout: {
-                    'line-cap': 'round',
-                    'line-join': 'round'
-                }
-            });
+        map.addLayer({
+            type: 'line',
+            source: 'line',
+            id: 'line',
+            paint: {
+                'line-color': 'red',
+                'line-width': 14,
+                'line-gradient': [
+                    'interpolate',
+                    ['linear'],
+                    ['line-progress'],
+                    0, "rgba(0, 0, 255, 0)",
+                    0.1, "royalblue",
+                    0.3, "cyan",
+                    0.5, "lime",
+                    0.7, "yellow",
+                    1, "red"
+                ]
+            },
+            layout: {
+                'line-cap': 'round',
+                'line-join': 'round'
+            }
         });
     });
 

diff --git a/flow-typed/style-spec.js b/flow-typed/style-spec.js
@@ -195,7 +195,8 @@ declare type LineLayerSpecification = {|
         "line-offset"?: DataDrivenPropertyValueSpecification<number>,
         "line-blur"?: DataDrivenPropertyValueSpecification<number>,
         "line-dasharray"?: PropertyValueSpecification<Array<number>>,
-        "line-pattern"?: PropertyValueSpecification<string>
+        "line-pattern"?: PropertyValueSpecification<string>,
+        "line-gradient"?: ExpressionSpecification
     |}
 |}
 

diff --git a/linestring/linestring_source.js b/linestring/linestring_source.js
diff --git a/linestring/linestring_worker.js b/linestring/linestring_worker.js
diff --git a/package.json b/package.json
@@ -156,9 +156,7 @@
     "test-flow-cov": "flow-coverage-report -i 'src/**/*.js' -t html",
     "test-cov": "nyc --require=flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render",
     "prepublish": "in-publish && run-s build-dev build-min || not-in-publish",
-    "codegen": "node build/generate-style-code.js && flow-node build/generate-struct-arrays.js",
-    "linestring": "browserify -s mapboxgl.LineStringSource linestring/linestring_source.js > dist/mapbox-gl-linestring.js",
-    "linestring-watch": "watchify -s mapboxgl.LineStringSource linestring/linestring_source.js --outfile dist/mapbox-gl-linestring.js"
+    "codegen": "node build/generate-style-code.js && flow-node build/generate-struct-arrays.js"
   },
   "files": [
     "build/",

diff --git a/src/source/geojson_source.js b/src/source/geojson_source.js
@@ -124,7 +124,7 @@ class GeoJSONSource extends Evented implements Source {
                 tolerance: (options.tolerance !== undefined ? options.tolerance : 0.375) * scale,
                 extent: EXTENT,
                 maxZoom: this.maxzoom,
-                lineMetrics: options.lineMetrics
+                lineMetrics: options.lineMetrics || false
             },
             superclusterOptions: {
                 maxZoom: options.clusterMaxZoom !== undefined ?

diff --git a/test/unit/source/geojson_source.test.js b/test/unit/source/geojson_source.test.js
@@ -146,7 +146,8 @@ test('GeoJSONSource#update', (t) => {
                     extent: 8192,
                     maxZoom: 10,
                     tolerance: 4,
-                    buffer: 256
+                    buffer: 256,
+                    lineMetrics: false
                 });
                 t.end();
             }

diff --git a/test/unit/style-spec/fixture/layers.output.json b/test/unit/style-spec/fixture/layers.output.json
@@ -64,7 +64,11 @@
     "line": 95
   },
   {
-    "message": "layers[15]: layer \"line-gradient-bad\" specifies a line-gradient, which requires a GeoJSON source",
+    "message": "layers[15]: layer \"line-gradient-bad\" specifies a line-gradient, which requires a GeoJSON source with `lineMetrics` enabled.",
     "line": 107
+  },
+  {
+    "message": "layers[16]: layer \"line-gradient-good\" specifies a line-gradient, which requires a GeoJSON source with `lineMetrics` enabled.",
+    "line": 121
   }
-]
+]