[core] Add `line-gradient` property #12575

pozdnyakov · 2018-08-08T12:11:11Z

Porting of mapbox/mapbox-gl-js#6303
See the link above for the description of the feature and
its limitations).

Based on patch from @lbud (Lauren Budorick).

pozdnyakov · 2018-08-09T13:23:19Z

@kkaefer please review, tagging @tmpsantos @brunoabinader

pozdnyakov · 2018-08-09T14:44:00Z

This PR fixes #11718

1ec5

In addition to the following, please update the iOS and macOS changelogs to note the addition of these new properties. Thanks!

1ec5 · 2018-08-09T22:42:44Z

platform/darwin/src/MGLLineStyleLayer.h

+#if TARGET_OS_IPHONE
+/**
+ Defines a gradient with which to color a line feature. Can only be used with
+ GeoJSON sources that specify `"lineMetrics": true`.


This documentation comment uses JSON notation, so we’ll need to override it in an entry in platform/darwin/scripts/style-spec-overrides-v8.json:

Defines a gradient with which to color a line feature. This property only has an effect on lines defined by an MGLShapeSource whose MGLShapeSource.calculatesLineDistanceMetrics property is set to YES.

Speaking of which, we’ll need to add that calculatesLineDistanceMetrics property to MGLShapeSource before developers will be able to use this property on iOS/macOS.

1ec5 · 2018-08-09T22:43:56Z

platform/darwin/src/MGLLineStyleLayer.h

+ Defines a gradient with which to color a line feature. Can only be used with
+ GeoJSON sources that specify `"lineMetrics": true`.
+
+ This property is only applied to the style if `lineDasharray` is set to `nil`,


This should say lineDashPattern. The codegen script isn’t aliasing lineDasharray for some reason.

pozdnyakov · 2018-08-10T12:14:51Z

@1ec5 Thanks for your comments! I've made a #12604 introducing a new property to MGLShapeSource, please take a look! After #12604 lands I'll include the updated style-spec-overrides-v8.json to this PR.

kkaefer · 2018-08-10T12:54:03Z

src/mbgl/renderer/buckets/line_bucket.cpp

+                result += util::dist<double>(coordinates[i], coordinates[i + 1]);
+            }
+            return result;
+        }();


Why is this a self-invoking lambda?

kkaefer · 2018-08-10T12:55:11Z

src/mbgl/renderer/buckets/line_bucket.cpp

    Point<double> extrude = normal;
+    if (lineDistances)
+        distance = lineDistances->scaleToMaxLineDistance(distance);


Let's add braces here even if there is just one statement.

kkaefer · 2018-08-10T12:55:34Z

src/mbgl/renderer/buckets/line_bucket.cpp

@@ -392,14 +427,18 @@ void LineBucket::addGeometry(const GeometryCoordinates& coordinates, const Geome
 }

 void LineBucket::addCurrentVertex(const GeometryCoordinate& currentCoordinate,
-                                  double &distance,
+                                  double distance,


Why do we no longer need the distance as a reference? We still seem to be modifying it.

Thanks for the catch! I missed that we need to set it to 0.0 under some conditions

kkaefer · 2018-08-10T12:56:15Z

src/mbgl/renderer/buckets/line_bucket.cpp

    Point<double> flippedExtrude = extrude * (lineTurnsLeft ? -1.0 : 1.0);
+    if (lineDistances)
+        distance = lineDistances->scaleToMaxLineDistance(distance);


Braces please :)

kkaefer · 2018-08-10T12:57:22Z

src/mbgl/style/expression/parsing_context.cpp

@@ -68,7 +68,8 @@ bool isConstant(const Expression& expression) {
    }

    return isFeatureConstant(expression) &&
-        isGlobalPropertyConstant(expression, std::array<std::string, 2>{{"zoom", "heatmap-density"}});
+        isGlobalPropertyConstant(expression, std::array<std::string, 2>{{"zoom", "heatmap-density"}}) &&
+        isGlobalPropertyConstant(expression, std::array<std::string, 2>{{"zoom", "line-progress"}});;


Nit: double semicoli

kkaefer · 2018-08-10T12:57:33Z

src/mbgl/style/layers/line_layer.cpp

+
+void LineLayer::setLineGradient(ColorRampPropertyValue value) {
+    if (value == getLineGradient())
+        return;


This is a generated file, I could introduce braces generation to scripts/generate-style-code.js in a follow-up PR

pozdnyakov · 2018-08-10T14:22:22Z

@kkaefer Thanks for the review! The latest patch is modified accordingly.

pozdnyakov · 2018-08-22T17:53:48Z

@kkaefer could you take a look?

@lbud

Porting of mapbox/mapbox-gl-js#6303 See the link above for the description of the feature and its limitations). Based on patch from @lbud (Lauren Budorick).

friedbunny · 2018-11-13T21:46:27Z

For future spelunkers: this was included in release-frappé (which was ios-v4.4.0 and android-v6.5.0).

pozdnyakov force-pushed the line_gradient branch 2 times, most recently from 63208a2 to 1f50d02 Compare August 8, 2018 12:18

friedbunny added feature GL JS parity For feature parity with Mapbox GL JS Android Mapbox Maps SDK for Android Core The cross-platform C++ core, aka mbgl labels Aug 8, 2018

pozdnyakov requested a review from kkaefer August 8, 2018 17:19

pozdnyakov force-pushed the line_gradient branch from 1f50d02 to cb59411 Compare August 9, 2018 13:21

pozdnyakov force-pushed the line_gradient branch 2 times, most recently from 4573d8d to fb3060f Compare August 9, 2018 13:59

pozdnyakov force-pushed the line_gradient branch from fb3060f to e388aaa Compare August 9, 2018 16:07

1ec5 mentioned this pull request Aug 9, 2018

Deemphasize portions of the route line that the user has passed mapbox/mapbox-navigation-ios#1307

Closed

1ec5 reviewed Aug 9, 2018

View reviewed changes

kkaefer reviewed Aug 10, 2018

View reviewed changes

pozdnyakov force-pushed the line_gradient branch 2 times, most recently from d304e75 to 19e5c4d Compare August 10, 2018 14:20

riastrad mentioned this pull request Aug 10, 2018

Using Line-Gradient Property mapbox/ios-sdk-examples#203

Closed

tobrun added iOS Mapbox Maps SDK for iOS macOS Mapbox Maps SDK for macOS labels Aug 13, 2018

tobrun mentioned this pull request Aug 13, 2018

line-progress expression + line-gradient example #12615

Merged

2 tasks

pozdnyakov force-pushed the line_gradient branch 2 times, most recently from d7fefa8 to 7f5d5c8 Compare August 20, 2018 16:40

kkaefer approved these changes Aug 23, 2018

View reviewed changes

pozdnyakov and others added 2 commits August 23, 2018 17:34

[core] Add line-gradient property

1cc99af

Porting of mapbox/mapbox-gl-js#6303 See the link above for the description of the feature and its limitations). Based on patch from @lbud (Lauren Budorick).

[android] - add line-gradient example, integrate lineProgress expression

96094ce

pozdnyakov force-pushed the line_gradient branch from 9e47037 to 96094ce Compare August 23, 2018 14:34

pozdnyakov merged commit fc26f2a into master Aug 23, 2018

pozdnyakov deleted the line_gradient branch August 23, 2018 16:02

captainbarbosa mentioned this pull request Sep 14, 2018

[docs] Update SDK compatibility versions for line-gradient mapbox/mapbox-gl-js#7281

Merged

pozdnyakov mentioned this pull request Sep 14, 2018

Document SDK support for line metrics mapbox/mapbox-gl-js#7282

Merged

brunoabinader mentioned this pull request Oct 1, 2018

Implement line-gradient property #11718

Closed

1ec5 added the needs changelog Indicates PR needs a changelog entry prior to merging. label Oct 1, 2018

1ec5 mentioned this pull request Oct 2, 2018

Refine MGLLineStyleLayer.lineGradient documentation #13000

Closed

friedbunny removed needs changelog Indicates PR needs a changelog entry prior to merging. labels Oct 31, 2018

This was referenced Nov 13, 2018

Add $lineProgress expression variable #13192

Merged

Update style spec for gl-native's release-horchata mapbox/mapbox-gl-js#7590

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[core] Add `line-gradient` property #12575

[core] Add `line-gradient` property #12575

pozdnyakov commented Aug 8, 2018

pozdnyakov commented Aug 9, 2018

pozdnyakov commented Aug 9, 2018

1ec5 left a comment

1ec5 Aug 9, 2018 •

edited

Loading

1ec5 Oct 2, 2018

1ec5 Aug 9, 2018

1ec5 Oct 2, 2018

pozdnyakov commented Aug 10, 2018

kkaefer Aug 10, 2018

kkaefer Aug 10, 2018

kkaefer Aug 10, 2018

pozdnyakov Aug 10, 2018

kkaefer Aug 10, 2018

kkaefer Aug 10, 2018

kkaefer Aug 10, 2018

pozdnyakov Aug 10, 2018

pozdnyakov commented Aug 10, 2018

pozdnyakov commented Aug 22, 2018

friedbunny commented Nov 13, 2018

[core] Add line-gradient property #12575

[core] Add line-gradient property #12575

Conversation

pozdnyakov commented Aug 8, 2018

pozdnyakov commented Aug 9, 2018

pozdnyakov commented Aug 9, 2018

1ec5 left a comment

Choose a reason for hiding this comment

1ec5 Aug 9, 2018 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pozdnyakov commented Aug 10, 2018

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pozdnyakov commented Aug 10, 2018

pozdnyakov commented Aug 22, 2018

friedbunny commented Nov 13, 2018

[core] Add `line-gradient` property #12575

[core] Add `line-gradient` property #12575

1ec5 Aug 9, 2018 •

edited

Loading