Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

Port line-sort-key and fill-sort-key #15839

Merged
merged 4 commits into from
Dec 17, 2019
Merged

Port line-sort-key and fill-sort-key #15839

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
13aa2e5
[core] Enable 'line-sort-key' and 'fill-sort-key' layout properties (…
ahk Sep 18, 2019
b36c03a
[core] Unskip render tests
alexshalamov Dec 17, 2019
b2d080a
[metrics] Add new baselines
alexshalamov Dec 10, 2019
1f266b4
[core] Update changelog
alexshalamov Dec 17, 2019
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: 4 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,10 @@
## Master

### New features
- [core] Port line-sort-key and fill-sort-key ([#15839](https://github.com/mapbox/mapbox-gl-native/pull/15839))

The new feature allows to sort line and fill layer features. Similar to `symbol-sort-key`.

- [core] Add image sections to format expression ([#15937](https://github.com/mapbox/mapbox-gl-native/pull/15937))

The new feature allows to embed images into labels.
Expand Down
6 changes: 6 additions & 0 deletions include/mbgl/style/layers/fill_layer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,12 @@ class FillLayer : public Layer {

StyleProperty getProperty(const std::string& name) const final;

// Layout properties

static PropertyValue<float> getDefaultFillSortKey();
const PropertyValue<float>& getFillSortKey() const;
void setFillSortKey(const PropertyValue<float>&);

// Paint properties

static PropertyValue<bool> getDefaultFillAntialias();
Expand Down
4 changes: 4 additions & 0 deletions include/mbgl/style/layers/line_layer.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ class LineLayer : public Layer {
const PropertyValue<float>& getLineRoundLimit() const;
void setLineRoundLimit(const PropertyValue<float>&);

static PropertyValue<float> getDefaultLineSortKey();
const PropertyValue<float>& getLineSortKey() const;
void setLineSortKey(const PropertyValue<float>&);

// Paint properties

static PropertyValue<float> getDefaultLineBlur();
Expand Down
2 changes: 0 additions & 2 deletions metrics/ignores/platform-all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@
"render-tests/fill-extrusion-pattern/opacity": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
"render-tests/fill-extrusion-pattern/tile-buffer": "https://github.com/mapbox/mapbox-gl-js/issues/3327",
"render-tests/fill-pattern/update-feature-state": "https://github.com/mapbox/mapbox-gl-native/issues/15895",
"render-tests/fill-sort-key/literal": "https://github.com/mapbox/mapbox-gl-native/issues/15008",
"render-tests/geojson/inline-linestring-fill": "current behavior is arbitrary",
"render-tests/icon-text-fit/stretch-fifteen-part": "https://github.com/mapbox/mapbox-gl-native/issues/16017",
"render-tests/icon-text-fit/stretch-nine-part": "https://github.com/mapbox/mapbox-gl-native/issues/16017",
Expand All @@ -94,7 +93,6 @@
"render-tests/icon-text-fit/stretch-two-part": "https://github.com/mapbox/mapbox-gl-native/issues/16017",
"render-tests/icon-text-fit/stretch-underscale": "https://github.com/mapbox/mapbox-gl-native/issues/16017",
"render-tests/icon-text-fit/text-variable-anchor-overlap": "https://github.com/mapbox/mapbox-gl-native/issues/15809",
"render-tests/line-sort-key/literal": "https://github.com/mapbox/mapbox-gl-native/issues/15008",
"render-tests/mixed-zoom/z10-z11": "https://github.com/mapbox/mapbox-gl-native/issues/10397",
"render-tests/raster-masking/overlapping-zoom": "https://github.com/mapbox/mapbox-gl-native/issues/10195",
"render-tests/real-world/bangkok": "https://github.com/mapbox/mapbox-gl-native/issues/10412",
Expand Down
35 changes: 35 additions & 0 deletions metrics/next-android-render-test-runner/render-tests/fill-sort-key/literal/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"network": [
[
"probeNetwork - default - end",
0,
0
],
[
"probeNetwork - default - start",
0,
0
]
],
"gfx": [
[
"probeGFX - default - end",
8,
9,
25,
1,
[
131072,
131072
],
[
406,
406
],
[
1264,
1264
]
]
]
}
35 changes: 35 additions & 0 deletions metrics/next-android-render-test-runner/render-tests/line-sort-key/literal/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"network": [
[
"probeNetwork - default - end",
0,
0
],
[
"probeNetwork - default - start",
0,
0
]
],
"gfx": [
[
"probeGFX - default - end",
8,
9,
17,
1,
[
131072,
131072
],
[
166,
166
],
[
832,
832
]
]
]
}
4 changes: 2 additions & 2 deletions metrics/next-binary-size/android-arm64-v8a/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[
"android-arm64-v8a",
"/tmp/attach/install/next-android-arm64-v8a-release/lib/libmapbox-gl.so",
1907875
1930061
]
]
}
}
4 changes: 2 additions & 2 deletions metrics/next-binary-size/android-armeabi-v7a/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[
"android-armeabi-v7a",
"/tmp/attach/install/next-android-armeabi-v7a-release/lib/libmapbox-gl.so",
1607847
1624848
]
]
}
}
4 changes: 2 additions & 2 deletions metrics/next-binary-size/android-x86/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[
"android-x86",
"/tmp/attach/install/next-android-x86-release/lib/libmapbox-gl.so",
1934186
1953751
]
]
}
}
4 changes: 2 additions & 2 deletions metrics/next-binary-size/android-x86_64/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
[
"android-x86_64",
"/tmp/attach/install/next-android-x86_64-release/lib/libmapbox-gl.so",
1946541
1966850
]
]
}
}
8 changes: 4 additions & 4 deletions metrics/next-binary-size/linux-clang8/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
[
"mbgl-glfw",
"/tmp/attach/install/next-linux-clang8-release/bin/mbgl-glfw",
6290568
6380744
],
[
"mbgl-offline",
"/tmp/attach/install/next-linux-clang8-release/bin/mbgl-offline",
5597912
5651144
],
[
"mbgl-render",
"/tmp/attach/install/next-linux-clang8-release/bin/mbgl-render",
6220728
6282152
]
]
}
}
8 changes: 4 additions & 4 deletions metrics/next-binary-size/linux-gcc8/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,17 @@
[
"mbgl-glfw",
"/tmp/attach/install/next-linux-gcc8-release/bin/mbgl-glfw",
7323976
7369032
],
[
"mbgl-offline",
"/tmp/attach/install/next-linux-gcc8-release/bin/mbgl-offline",
6422760
6463720
],
[
"mbgl-render",
"/tmp/attach/install/next-linux-gcc8-release/bin/mbgl-render",
7143752
7254344
]
]
}
}
35 changes: 35 additions & 0 deletions metrics/next-linux-clang8-release/render-tests/fill-sort-key/literal/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"network": [
[
"probeNetwork - default - end",
0,
0
],
[
"probeNetwork - default - start",
0,
0
]
],
"gfx": [
[
"probeGFX - default - end",
8,
9,
25,
1,
[
131072,
131072
],
[
406,
406
],
[
1264,
1264
]
]
]
}
35 changes: 35 additions & 0 deletions metrics/next-linux-clang8-release/render-tests/line-sort-key/literal/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"network": [
[
"probeNetwork - default - end",
0,
0
],
[
"probeNetwork - default - start",
0,
0
]
],
"gfx": [
[
"probeGFX - default - end",
8,
9,
17,
1,
[
131072,
131072
],
[
166,
166
],
[
832,
832
]
]
]
}
35 changes: 35 additions & 0 deletions metrics/next-linux-gcc8-release/render-tests/fill-sort-key/literal/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"network": [
[
"probeNetwork - default - end",
0,
0
],
[
"probeNetwork - default - start",
0,
0
]
],
"gfx": [
[
"probeGFX - default - end",
8,
9,
25,
1,
[
131072,
131072
],
[
406,
406
],
[
1264,
1264
]
]
]
}
35 changes: 35 additions & 0 deletions metrics/next-linux-gcc8-release/render-tests/line-sort-key/literal/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"network": [
[
"probeNetwork - default - end",
0,
0
],
[
"probeNetwork - default - start",
0,
0
]
],
"gfx": [
[
"probeGFX - default - end",
8,
9,
17,
1,
[
131072,
131072
],
[
166,
166
],
[
832,
832
]
]
]
}
35 changes: 35 additions & 0 deletions metrics/next-macos-xcode11-release/render-tests/fill-sort-key/literal/metrics.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"network": [
[
"probeNetwork - default - end",
0,
0
],
[
"probeNetwork - default - start",
0,
0
]
],
"gfx": [
[
"probeGFX - default - end",
8,
9,
25,
1,
[
131072,
131072
],
[
406,
406
],
[
1264,
1264
]
]
]
}
Loading