diff options
author | Gali Nelle <galinelle.mapbox@gmail.com> | 2020-04-08 16:28:35 +0300 |
---|---|---|
committer | galinelle <paolo.angelelli@mapbox.com> | 2020-04-10 00:15:43 +0300 |
commit | 209857f8acc73d7950a1c8ec58f4ec7622287e55 (patch) | |
tree | a6cb095fffae224aae84e7d93dc38fbc7037d361 /metrics | |
parent | e6c156420d2d287bd6d3449af3338f550dbf84f4 (diff) | |
download | qtlocation-mapboxgl-209857f8acc73d7950a1c8ec58f4ec7622287e55.tar.gz |
Fix LocationIndicator Layer
This changes image size properties to be scales instead of pixel sizes.
The commit also adds fixes for handling image updates with the same ID,
adds tests for expressions in paint properties, as well as tests for using images
with pixel ratio greater than 1.
Finally it moves image-tilt-displacement and perspective-compensation properties
from layout to paint properties, and includes other minor cleanups.
Diffstat (limited to 'metrics')
47 files changed, 306 insertions, 230 deletions
diff --git a/metrics/cache-metrics.db b/metrics/cache-metrics.db Binary files differindex 53ddff9bf6..317bc0d22a 100644 --- a/metrics/cache-metrics.db +++ b/metrics/cache-metrics.db diff --git a/metrics/ignores/platform-ios.json b/metrics/ignores/platform-ios.json index 1dce0e9f79..45179e02c8 100644 --- a/metrics/ignores/platform-ios.json +++ b/metrics/ignores/platform-ios.json @@ -8,5 +8,6 @@ "render-tests/regressions/mapbox-gl-js#2305": "Needs to be investigated and fixed.", "render-tests/regressions/mapbox-gl-js#5911a": "Needs to be investigated and fixed.", "render-tests/text-field/formatted-images": "Needs to be investigated and fixed.", - "render-tests/symbol-visibility/visible": "Needs to be investigated and fixed." -}
\ No newline at end of file + "render-tests/symbol-visibility/visible": "Needs to be investigated and fixed.", + "location_indicator/image_pixel_ratio": "Renders a black square when loading from spritesheet. Needs to be investigated and fixed." +} diff --git a/metrics/ignores/platform-linux.json b/metrics/ignores/platform-linux.json index 0988aff5a2..29d06bfc3d 100644 --- a/metrics/ignores/platform-linux.json +++ b/metrics/ignores/platform-linux.json @@ -6,5 +6,20 @@ "render-tests/line-pattern/opacity": "Flaky on Linux: https://github.com/mapbox/mapbox-gl-native/issues/15320", "render-tests/line-translate/literal": "Flaky on Linux: https://github.com/mapbox/mapbox-gl-native/issues/14859", "render-tests/regressions/mapbox-gl-js#5642": "Failing with mbgl-render-test", - "render-tests/regressions/mapbox-gl-js#7066": "Failing with mbgl-render-test" + "render-tests/regressions/mapbox-gl-js#7066": "Failing with mbgl-render-test", + "location_indicator/dateline": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/default": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/no_radius_border": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/no_radius_fill": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/no_textures": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/one_texture": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/rotated": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/tilted": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/tilted_texture_shift": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/tilted_texture_shift_bottom_left": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/tilted_texture_shift_bottom_right": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/tilted_texture_shift_top_left": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/tilted_texture_shift_top_right": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/two_textures": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering", + "location_indicator/image_pixel_ratio": "Would need a different baseline when ran on llvmpipe not supporting anisotropic filtering" } diff --git a/metrics/linux-gcc8-release/location_indicator/dateline/metrics.json b/metrics/linux-gcc8-release/location_indicator/dateline/metrics.json index 4a2be5e044..2f6c9155e9 100644 --- a/metrics/linux-gcc8-release/location_indicator/dateline/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/dateline/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2672223, - 83215 + 2027402, + 3196 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/default/metrics.json b/metrics/linux-gcc8-release/location_indicator/default/metrics.json index 4e7c613e57..ac69157f10 100644 --- a/metrics/linux-gcc8-release/location_indicator/default/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/default/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2796203, - 107023 + 2234412, + 3784 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/image_pixel_ratio/metrics.json b/metrics/linux-gcc8-release/location_indicator/image_pixel_ratio/metrics.json new file mode 100644 index 0000000000..4e2534707d --- /dev/null +++ b/metrics/linux-gcc8-release/location_indicator/image_pixel_ratio/metrics.json @@ -0,0 +1,47 @@ +{ + "memory": [ + [ + "probeMemory - default - end", + 3103973, + 6137 + ], + [ + "probeMemory - default - start", + 0, + 0 + ] + ], + "network": [ + [ + "probeNetwork - default - end", + 5, + 117617 + ], + [ + "probeNetwork - default - start", + 0, + 0 + ] + ], + "gfx": [ + [ + "probeGFX - default - end", + 4, + 9, + 13, + 1, + [ + 131072, + 131072 + ], + [ + 70, + 70 + ], + [ + 128, + 128 + ] + ] + ] +}
\ No newline at end of file diff --git a/metrics/linux-gcc8-release/location_indicator/no_radius_border/metrics.json b/metrics/linux-gcc8-release/location_indicator/no_radius_border/metrics.json index f5a86bed69..089757dbd2 100644 --- a/metrics/linux-gcc8-release/location_indicator/no_radius_border/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/no_radius_border/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2656163, - 83134 + 2005701, + 3122 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/no_radius_fill/metrics.json b/metrics/linux-gcc8-release/location_indicator/no_radius_fill/metrics.json index 59f8c69068..98e4fcf8c8 100644 --- a/metrics/linux-gcc8-release/location_indicator/no_radius_fill/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/no_radius_fill/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2673019, - 83236 + 2022418, + 3216 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/no_textures/metrics.json b/metrics/linux-gcc8-release/location_indicator/no_textures/metrics.json index 65004f1ea1..88ff6a5cec 100644 --- a/metrics/linux-gcc8-release/location_indicator/no_textures/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/no_textures/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2377735, - 21656 + 2034636, + 2864 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/one_texture/metrics.json b/metrics/linux-gcc8-release/location_indicator/one_texture/metrics.json index a17b453ed1..67060da88c 100644 --- a/metrics/linux-gcc8-release/location_indicator/one_texture/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/one_texture/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2665727, - 83226 + 2020507, + 3166 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/rotated/metrics.json b/metrics/linux-gcc8-release/location_indicator/rotated/metrics.json index 63f9083f54..75a417e01c 100644 --- a/metrics/linux-gcc8-release/location_indicator/rotated/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/rotated/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2660636, - 83197 + 2023574, + 3274 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/tilted/metrics.json b/metrics/linux-gcc8-release/location_indicator/tilted/metrics.json index f8f7bbfeb7..0e0a349c67 100644 --- a/metrics/linux-gcc8-release/location_indicator/tilted/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/tilted/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2703062, - 83350 + 2057114, + 3257 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift/metrics.json b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift/metrics.json index e09448751f..5cb3be895c 100644 --- a/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2677760, - 83330 + 2046282, + 3307 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_left/metrics.json b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_left/metrics.json index 83ba4134d8..56203676a3 100644 --- a/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_left/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_left/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2735091, - 83429 + 2041058, + 3281 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_right/metrics.json b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_right/metrics.json index 72b8c8e81a..73727dc0b9 100644 --- a/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_right/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_bottom_right/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2714461, - 83383 + 2059723, + 3308 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_left/metrics.json b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_left/metrics.json index e315cad556..4d8c02fdf9 100644 --- a/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_left/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_left/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2717377, - 83399 + 2064963, + 3344 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_right/metrics.json b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_right/metrics.json index c6cdf715c2..1f8d87e778 100644 --- a/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_right/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/tilted_texture_shift_top_right/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2692872, - 83405 + 2055996, + 3285 ], [ "probeMemory - default - start", diff --git a/metrics/linux-gcc8-release/location_indicator/two_textures/metrics.json b/metrics/linux-gcc8-release/location_indicator/two_textures/metrics.json index 30d331e1c6..3399194e5a 100644 --- a/metrics/linux-gcc8-release/location_indicator/two_textures/metrics.json +++ b/metrics/linux-gcc8-release/location_indicator/two_textures/metrics.json @@ -2,8 +2,8 @@ "memory": [ [ "probeMemory - default - end", - 2680943, - 83221 + 2019370, + 3117 ], [ "probeMemory - default - start", diff --git a/metrics/tests/location_indicator/dateline/expected.png b/metrics/tests/location_indicator/dateline/expected.png Binary files differindex 8e1e2e95e9..a188b219f4 100644 --- a/metrics/tests/location_indicator/dateline/expected.png +++ b/metrics/tests/location_indicator/dateline/expected.png diff --git a/metrics/tests/location_indicator/dateline/style.json b/metrics/tests/location_indicator/dateline/style.json index 410fc5c531..ff9bd5ea17 100644 --- a/metrics/tests/location_indicator/dateline/style.json +++ b/metrics/tests/location_indicator/dateline/style.json @@ -39,29 +39,23 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 45, + "layout" : { "bearing-image" : "puck", "top-image" : "puck_hat", - "shadow-image" : "puck_shadow", - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "shadow-image" : "puck_shadow" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "bearing" : ["interpolate", ["linear"], ["zoom"], 8, 0, 24, 90], + "perspective-compensation" : ["interpolate", ["linear"], ["zoom"], 8, 0, 16, 1], + "image-tilt-displacement" : ["interpolate", ["linear"], ["zoom"], 8, 0, 16, 6.5], "location" : [ 35.693055, 139.766707, 0], - "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "accuracy-radius": ["interpolate", ["linear"], ["zoom"], 8, 0, 24, 180], + "bearing-image-size" : ["interpolate", ["linear"], ["zoom"], 8, 0, 24, 0.52], + "top-image-size" : ["interpolate", ["linear"], ["zoom"], 8, 0, 24, 0.36], + "shadow-image-size" : ["interpolate", ["linear"], ["zoom"], 8, 0, 24, 0.4], - "accuracy-radius-color": "rgba(255,0,0,0.2)", - "accuracy-radius-border-color": "rgba(255,0,255,0.6)" + "accuracy-radius-color": ["interpolate", ["linear"], ["zoom"], 8, "rgba(255,0,0,0.2)", 24, "rgba(255,255,0,0.4)"], + "accuracy-radius-border-color": ["interpolate", ["linear"], ["zoom"], 8, "rgba(255,0,255,0.2)", 24, "rgba(255,0,255,1)"] } } ] diff --git a/metrics/tests/location_indicator/default/expected.png b/metrics/tests/location_indicator/default/expected.png Binary files differindex 5823cce89e..f27cb64d98 100644 --- a/metrics/tests/location_indicator/default/expected.png +++ b/metrics/tests/location_indicator/default/expected.png diff --git a/metrics/tests/location_indicator/default/style.json b/metrics/tests/location_indicator/default/style.json index b0f58b4055..409b980c53 100644 --- a/metrics/tests/location_indicator/default/style.json +++ b/metrics/tests/location_indicator/default/style.json @@ -71,26 +71,20 @@ { "id": "puck124", "type": "location-indicator", - "layout" : { "bearing" : 45, + "layout" : { "bearing-image" : "puck", "top-image" : "puck_hat", - "shadow-image" : "puck_shadow", - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "shadow-image" : "puck_shadow" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "bearing" : 45, + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-color": "rgba(255,0,0,0.2)", "accuracy-radius-border-color": "rgba(255,0,255,0.6)" diff --git a/metrics/tests/location_indicator/image_pixel_ratio/expected.png b/metrics/tests/location_indicator/image_pixel_ratio/expected.png Binary files differnew file mode 100644 index 0000000000..b48b9e1340 --- /dev/null +++ b/metrics/tests/location_indicator/image_pixel_ratio/expected.png diff --git a/metrics/tests/location_indicator/image_pixel_ratio/style.json b/metrics/tests/location_indicator/image_pixel_ratio/style.json new file mode 100644 index 0000000000..4c52ef1ee0 --- /dev/null +++ b/metrics/tests/location_indicator/image_pixel_ratio/style.json @@ -0,0 +1,98 @@ +{ + "version": 8, + "metadata": { + "test": { + "width": 512, + "height": 256, + "operations": [ + [ + "addImage", + "puck_hat@2x", + "puck_hat.png", + {"pixelRatio": 2.0} + ], + [ + "addImage", + "puck@2x", + "puck.png", + {"pixelRatio": 2.0} + + ], + [ + "addImage", + "puck_shadow@2x", + "puck_shadow.png", + {"pixelRatio": 2.0} + ] + ] + } + }, + "sources": { + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 139.766707, + 35.693055 + + ] + } + } + ] + } + } + }, + "center": [ 139.766707, 35.693055 ], + "zoom": 16, + "pitch" : 0, + "bearing" : 42, + "sprite" : "local://sprites/emerald@2x", + "layers": [ + { + "id": "background", + "type": "background", + "paint": { + "background-color": "lightseagreen" + } + }, + { + "id": "puck123", + "type": "circle", + "source": "geojson", + "paint": { + "circle-radius": 40, + "circle-color" : "rgba(255,0,0,0.1)" + } + }, + { + "id": "puck124", + "type": "location-indicator", + "layout" : { + "bearing-image" : "puck@2x", + "top-image" : "marker_icon", + "shadow-image" : "puck_shadow@2x" + }, + "paint" : { + "bearing" : 45, + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, + "location" : [ 35.693055, 139.766707, 0], + "accuracy-radius": 90.0, + "bearing-image-size" : 0.52, + "top-image-size" : 1, + "shadow-image-size" : 0.4, + + "accuracy-radius-color": "rgba(255,0,0,0.2)", + "accuracy-radius-border-color": "rgba(255,0,255,0.6)" + } + } + ] +} diff --git a/metrics/tests/location_indicator/no_radius_border/expected.png b/metrics/tests/location_indicator/no_radius_border/expected.png Binary files differindex 436a27ed08..c457e027dc 100644 --- a/metrics/tests/location_indicator/no_radius_border/expected.png +++ b/metrics/tests/location_indicator/no_radius_border/expected.png diff --git a/metrics/tests/location_indicator/no_radius_border/style.json b/metrics/tests/location_indicator/no_radius_border/style.json index 922cd0c0f0..0037b35ac8 100644 --- a/metrics/tests/location_indicator/no_radius_border/style.json +++ b/metrics/tests/location_indicator/no_radius_border/style.json @@ -40,26 +40,20 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 45, + "layout" : { "bearing-image" : "puck", "top-image" : "puck_hat", - "shadow-image" : "puck_shadow", - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "shadow-image" : "puck_shadow" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "bearing" : 45, + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-color": "rgba(255,0,0,0.2)" } diff --git a/metrics/tests/location_indicator/no_radius_fill/expected.png b/metrics/tests/location_indicator/no_radius_fill/expected.png Binary files differindex 447546c880..5563f33f25 100644 --- a/metrics/tests/location_indicator/no_radius_fill/expected.png +++ b/metrics/tests/location_indicator/no_radius_fill/expected.png diff --git a/metrics/tests/location_indicator/no_radius_fill/style.json b/metrics/tests/location_indicator/no_radius_fill/style.json index a01ee0c576..1848b28693 100644 --- a/metrics/tests/location_indicator/no_radius_fill/style.json +++ b/metrics/tests/location_indicator/no_radius_fill/style.json @@ -39,27 +39,20 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 45, + "layout" : { "bearing-image" : "puck", "top-image" : "puck_hat", - "shadow-image" : "puck_shadow", - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "shadow-image" : "puck_shadow" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "bearing" : 45, + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-border-color": "rgba(255,0,255,0.6)" } diff --git a/metrics/tests/location_indicator/no_textures/style.json b/metrics/tests/location_indicator/no_textures/style.json index 1cae891f77..3864f748af 100644 --- a/metrics/tests/location_indicator/no_textures/style.json +++ b/metrics/tests/location_indicator/no_textures/style.json @@ -39,23 +39,17 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 45, - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "layout" : { }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "bearing" : 45, + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-color": "rgba(255,0,0,0.2)", "accuracy-radius-border-color": "rgba(255,0,255,0.6)" diff --git a/metrics/tests/location_indicator/one_texture/expected.png b/metrics/tests/location_indicator/one_texture/expected.png Binary files differindex c0fb9ce580..b955f63993 100644 --- a/metrics/tests/location_indicator/one_texture/expected.png +++ b/metrics/tests/location_indicator/one_texture/expected.png diff --git a/metrics/tests/location_indicator/one_texture/style.json b/metrics/tests/location_indicator/one_texture/style.json index f44b698c05..f6a976f0f2 100644 --- a/metrics/tests/location_indicator/one_texture/style.json +++ b/metrics/tests/location_indicator/one_texture/style.json @@ -39,24 +39,18 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 45, - "bearing-image" : "puck", - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "layout" : { + "bearing-image" : "puck" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "bearing" : 45, + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-color": "rgba(255,0,0,0.2)", "accuracy-radius-border-color": "rgba(255,0,255,0.6)" diff --git a/metrics/tests/location_indicator/rotated/expected.png b/metrics/tests/location_indicator/rotated/expected.png Binary files differindex 4b481b12d5..b3fcfc8201 100644 --- a/metrics/tests/location_indicator/rotated/expected.png +++ b/metrics/tests/location_indicator/rotated/expected.png diff --git a/metrics/tests/location_indicator/rotated/style.json b/metrics/tests/location_indicator/rotated/style.json index 5a75f56e22..e7e9d90cd4 100644 --- a/metrics/tests/location_indicator/rotated/style.json +++ b/metrics/tests/location_indicator/rotated/style.json @@ -39,26 +39,20 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 0, + "layout" : { "bearing-image" : "puck", "top-image" : "puck_hat", - "shadow-image" : "puck_shadow", - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "shadow-image" : "puck_shadow" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "bearing" : 0, + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-color": "rgba(255,0,0,0.2)", "accuracy-radius-border-color": "rgba(255,0,255,0.6)" diff --git a/metrics/tests/location_indicator/tilted/expected.png b/metrics/tests/location_indicator/tilted/expected.png Binary files differindex 624be49df3..4408e2a4b4 100644 --- a/metrics/tests/location_indicator/tilted/expected.png +++ b/metrics/tests/location_indicator/tilted/expected.png diff --git a/metrics/tests/location_indicator/tilted/style.json b/metrics/tests/location_indicator/tilted/style.json index 9dfe1033ff..fb6b31be4d 100644 --- a/metrics/tests/location_indicator/tilted/style.json +++ b/metrics/tests/location_indicator/tilted/style.json @@ -39,26 +39,20 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 45, + "layout" : { "bearing-image" : "puck", "top-image" : "puck_hat", - "shadow-image" : "puck_shadow", - "perspective-compensation" : 1, - "image-tilt-displacement" : 0 + "shadow-image" : "puck_shadow" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "bearing" : 45, + "perspective-compensation" : 1, + "image-tilt-displacement" : 0, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-color": "rgba(255,0,0,0.2)", "accuracy-radius-border-color": "rgba(255,0,255,0.6)" diff --git a/metrics/tests/location_indicator/tilted_texture_shift/expected.png b/metrics/tests/location_indicator/tilted_texture_shift/expected.png Binary files differindex 0a4baa1b58..8b533f7da7 100644 --- a/metrics/tests/location_indicator/tilted_texture_shift/expected.png +++ b/metrics/tests/location_indicator/tilted_texture_shift/expected.png diff --git a/metrics/tests/location_indicator/tilted_texture_shift/style.json b/metrics/tests/location_indicator/tilted_texture_shift/style.json index 6b6372ae1d..1ee6e3ab25 100644 --- a/metrics/tests/location_indicator/tilted_texture_shift/style.json +++ b/metrics/tests/location_indicator/tilted_texture_shift/style.json @@ -39,26 +39,20 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 45, + "layout" : { "bearing-image" : "puck", "top-image" : "puck_hat", - "shadow-image" : "puck_shadow", - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "shadow-image" : "puck_shadow" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, + "bearing" : 45, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-color": "rgba(255,0,0,0.2)", "accuracy-radius-border-color": "rgba(255,0,255,0.6)" diff --git a/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/expected.png b/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/expected.png Binary files differindex a651914b09..e1de70ede8 100644 --- a/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/expected.png +++ b/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/expected.png diff --git a/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/style.json b/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/style.json index 1d5bb8ae6f..dd7667bf23 100644 --- a/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/style.json +++ b/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/style.json @@ -40,26 +40,20 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 45, + "layout" : { "bearing-image" : "puck", "top-image" : "puck_hat", - "shadow-image" : "puck_shadow", - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "shadow-image" : "puck_shadow" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, + "bearing" : 45, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-color": "rgba(255,0,0,0.2)", "accuracy-radius-border-color": "rgba(255,0,255,0.6)" diff --git a/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/expected.png b/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/expected.png Binary files differindex d0839ea66f..d6b3c330a6 100644 --- a/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/expected.png +++ b/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/expected.png diff --git a/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/style.json b/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/style.json index 611bea2a98..53b80572b0 100644 --- a/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/style.json +++ b/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/style.json @@ -39,26 +39,20 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 45, + "layout" : { "bearing-image" : "puck", "top-image" : "puck_hat", - "shadow-image" : "puck_shadow", - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "shadow-image" : "puck_shadow" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, + "bearing" : 45, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-color": "rgba(255,0,0,0.2)", "accuracy-radius-border-color": "rgba(255,0,255,0.6)" diff --git a/metrics/tests/location_indicator/tilted_texture_shift_top_left/expected.png b/metrics/tests/location_indicator/tilted_texture_shift_top_left/expected.png Binary files differindex 48747eb194..9d31ed9a48 100644 --- a/metrics/tests/location_indicator/tilted_texture_shift_top_left/expected.png +++ b/metrics/tests/location_indicator/tilted_texture_shift_top_left/expected.png diff --git a/metrics/tests/location_indicator/tilted_texture_shift_top_left/style.json b/metrics/tests/location_indicator/tilted_texture_shift_top_left/style.json index 00899046d6..0becd051f5 100644 --- a/metrics/tests/location_indicator/tilted_texture_shift_top_left/style.json +++ b/metrics/tests/location_indicator/tilted_texture_shift_top_left/style.json @@ -39,26 +39,20 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 45, + "layout" : { "bearing-image" : "puck", "top-image" : "puck_hat", - "shadow-image" : "puck_shadow", - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "shadow-image" : "puck_shadow" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "bearing" : 45, + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-color": "rgba(255,0,0,0.2)", "accuracy-radius-border-color": "rgba(255,0,255,0.6)" diff --git a/metrics/tests/location_indicator/tilted_texture_shift_top_right/expected.png b/metrics/tests/location_indicator/tilted_texture_shift_top_right/expected.png Binary files differindex 3b39556295..e0e59d4edc 100644 --- a/metrics/tests/location_indicator/tilted_texture_shift_top_right/expected.png +++ b/metrics/tests/location_indicator/tilted_texture_shift_top_right/expected.png diff --git a/metrics/tests/location_indicator/tilted_texture_shift_top_right/style.json b/metrics/tests/location_indicator/tilted_texture_shift_top_right/style.json index 71412339e6..dd9e17a493 100644 --- a/metrics/tests/location_indicator/tilted_texture_shift_top_right/style.json +++ b/metrics/tests/location_indicator/tilted_texture_shift_top_right/style.json @@ -39,26 +39,20 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 0, + "layout" : { "bearing-image" : "puck", "top-image" : "puck_hat", - "shadow-image" : "puck_shadow", - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "shadow-image" : "puck_shadow" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, + "bearing" : 0, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-color": "rgba(255,0,0,0.2)", "accuracy-radius-border-color": "rgba(255,0,255,0.6)" diff --git a/metrics/tests/location_indicator/two_textures/expected.png b/metrics/tests/location_indicator/two_textures/expected.png Binary files differindex f876aaddb7..28d6ec95b9 100644 --- a/metrics/tests/location_indicator/two_textures/expected.png +++ b/metrics/tests/location_indicator/two_textures/expected.png diff --git a/metrics/tests/location_indicator/two_textures/style.json b/metrics/tests/location_indicator/two_textures/style.json index 01c5405265..2d470d79d7 100644 --- a/metrics/tests/location_indicator/two_textures/style.json +++ b/metrics/tests/location_indicator/two_textures/style.json @@ -39,25 +39,19 @@ { "id": "puck123", "type": "location-indicator", - "layout" : { "bearing" : 45, + "layout" : { "bearing-image" : "puck", - "shadow-image" : "puck_shadow", - "perspective-compensation" : 1, - "image-tilt-displacement" : 5 + "shadow-image" : "puck_shadow" }, "paint" : { - "accuracy-radius-transition": { "duration": 0, "delay": 0 }, - "bearing-image-size-transition": { "duration": 0, "delay": 0 }, - "top-image-size-transition": { "duration": 0, "delay": 0 }, - "shadow-image-size-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-color-transition": { "duration": 0, "delay": 0 }, - "accuracy-radius-border-color-transition": { "duration": 0, "delay": 0 }, - + "bearing" : 45, + "perspective-compensation" : 1, + "image-tilt-displacement" : 6.5, "location" : [ 35.693055, 139.766707, 0], "accuracy-radius": 90.0, - "bearing-image-size" : 48, - "top-image-size" : 16, - "shadow-image-size" : 112, + "bearing-image-size" : 0.26, + "top-image-size" : 0.18, + "shadow-image-size" : 0.2, "accuracy-radius-color": "rgba(255,0,0,0.2)", "accuracy-radius-border-color": "rgba(255,0,255,0.6)" |