Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Implement property functions for line-cap, line-join" #5018

Merged
merged 1 commit into from
Jul 21, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/data/bucket/line_bucket.js
Original file line number Diff line number Diff line change
Expand Up @@ -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'];

Expand Down
2 changes: 0 additions & 2 deletions src/style-spec/reference/v8.json
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down Expand Up @@ -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."
Expand Down
Binary file not shown.
106 changes: 0 additions & 106 deletions test/integration/render-tests/line-cap/property-function/style.json

This file was deleted.

Binary file not shown.
143 changes: 0 additions & 143 deletions test/integration/render-tests/line-join/property-function/style.json

This file was deleted.