diff --git a/src/data/bucket/line_bucket.js b/src/data/bucket/line_bucket.js index 7fbfd96dd3f..a7b2ddd2e87 100644 --- a/src/data/bucket/line_bucket.js +++ b/src/data/bucket/line_bucket.js @@ -96,8 +96,8 @@ class LineBucket extends Bucket { addFeature(feature: VectorTileFeature) { const layout = this.layers[0].layout; - const join = this.layers[0].getLayoutValue('line-join', {zoom: this.zoom}, feature.properties); - const cap = this.layers[0].getLayoutValue('line-cap', {zoom: this.zoom}, feature.properties); + const join = layout['line-join']; + const cap = layout['line-cap']; const miterLimit = layout['line-miter-limit']; const roundLimit = layout['line-round-limit']; diff --git a/src/style-spec/reference/v8.json b/src/style-spec/reference/v8.json index dc2f78d7798..7041f3323d4 100644 --- a/src/style-spec/reference/v8.json +++ b/src/style-spec/reference/v8.json @@ -535,7 +535,6 @@ "type": "enum", "function": "piecewise-constant", "zoom-function": true, - "property-function": true, "values": { "butt": { "doc": "A cap with a squared-off end which is drawn to the exact endpoint of the line." @@ -563,7 +562,6 @@ "type": "enum", "function": "piecewise-constant", "zoom-function": true, - "property-function": true, "values": { "bevel": { "doc": "A join with a squared-off end which is drawn beyond the endpoint of the line at a distance of one-half of the line's width." diff --git a/test/integration/render-tests/line-cap/property-function/expected.png b/test/integration/render-tests/line-cap/property-function/expected.png deleted file mode 100644 index a0ba3182ae2..00000000000 Binary files a/test/integration/render-tests/line-cap/property-function/expected.png and /dev/null differ diff --git a/test/integration/render-tests/line-cap/property-function/style.json b/test/integration/render-tests/line-cap/property-function/style.json deleted file mode 100644 index fa548dfcf47..00000000000 --- a/test/integration/render-tests/line-cap/property-function/style.json +++ /dev/null @@ -1,106 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 64, - "height": 64 - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [ - { - "type": "Feature", - "properties": { - "cap": "butt" - }, - "geometry": { - "type": "LineString", - "coordinates": [ - [ - -16, - -16 - ], - [ - -16, - 16 - ] - ] - } - }, - { - "type": "Feature", - "properties": { - "cap": "round" - }, - "geometry": { - "type": "LineString", - "coordinates": [ - [ - 0, - -16 - ], - [ - 0, - 16 - ] - ] - } - }, - { - "type": "Feature", - "properties": { - "cap": "square" - }, - "geometry": { - "type": "LineString", - "coordinates": [ - [ - 16, - -16 - ], - [ - 16, - 16 - ] - ] - } - } - ] - } - } - }, - "layers": [ - { - "id": "line", - "type": "line", - "source": "geojson", - "layout": { - "line-cap": { - "type": "categorical", - "property": "cap", - "stops": [ - [ - "butt", - "butt" - ], - [ - "round", - "round" - ], - [ - "square", - "square" - ] - ] - } - }, - "paint": { - "line-width": 8 - } - } - ] -} diff --git a/test/integration/render-tests/line-join/property-function/expected.png b/test/integration/render-tests/line-join/property-function/expected.png deleted file mode 100644 index b4be40940a8..00000000000 Binary files a/test/integration/render-tests/line-join/property-function/expected.png and /dev/null differ diff --git a/test/integration/render-tests/line-join/property-function/style.json b/test/integration/render-tests/line-join/property-function/style.json deleted file mode 100644 index ceda727e423..00000000000 --- a/test/integration/render-tests/line-join/property-function/style.json +++ /dev/null @@ -1,143 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 128, - "height": 64 - } - }, - "zoom": 0, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [ - { - "type": "Feature", - "properties": { - "join": "miter" - }, - "geometry": { - "type": "LineString", - "coordinates": [ - [ - -36, - 16 - ], - [ - -36, - 0 - ], - [ - -20, - -16 - ], - [ - -20, - 16 - ], - [ - -28, - 16 - ] - ] - } - }, - { - "type": "Feature", - "properties": { - "join": "round" - }, - "geometry": { - "type": "LineString", - "coordinates": [ - [ - -8, - 16 - ], - [ - -8, - 0 - ], - [ - 8, - -16 - ], - [ - 8, - 16 - ], - [ - 0, - 16 - ] - ] - } - }, - { - "type": "Feature", - "properties": { - "join": "bevel" - }, - "geometry": { - "type": "LineString", - "coordinates": [ - [ - 20, - 16 - ], - [ - 20, - 0 - ], - [ - 36, - -16 - ], - [ - 36, - 16 - ], - [ - 28, - 16 - ] - ] - } - } - ] - } - } - }, - "layers": [ - { - "id": "line", - "type": "line", - "source": "geojson", - "layout": { - "line-join": { - "type": "categorical", - "property": "join", - "stops": [ - [ - "miter", - "miter" - ], - [ - "round", - "round" - ], - [ - "bevel", - "bevel" - ] - ] - } - }, - "paint": { - "line-width": 8 - } - } - ] -}