From 209857f8acc73d7950a1c8ec58f4ec7622287e55 Mon Sep 17 00:00:00 2001 From: Gali Nelle Date: Wed, 8 Apr 2020 16:28:35 +0300 Subject: 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. --- .../tests/location_indicator/dateline/expected.png | Bin 9307 -> 10498 bytes .../tests/location_indicator/dateline/style.json | 28 +++--- .../tests/location_indicator/default/expected.png | Bin 13669 -> 12436 bytes .../tests/location_indicator/default/style.json | 22 ++--- .../image_pixel_ratio/expected.png | Bin 0 -> 12536 bytes .../image_pixel_ratio/style.json | 98 +++++++++++++++++++++ .../no_radius_border/expected.png | Bin 9301 -> 8866 bytes .../location_indicator/no_radius_border/style.json | 22 ++--- .../location_indicator/no_radius_fill/expected.png | Bin 7625 -> 7349 bytes .../location_indicator/no_radius_fill/style.json | 23 ++--- .../location_indicator/no_textures/style.json | 20 ++--- .../location_indicator/one_texture/expected.png | Bin 3500 -> 3768 bytes .../location_indicator/one_texture/style.json | 22 ++--- .../tests/location_indicator/rotated/expected.png | Bin 9452 -> 8799 bytes .../tests/location_indicator/rotated/style.json | 22 ++--- .../tests/location_indicator/tilted/expected.png | Bin 5958 -> 5603 bytes metrics/tests/location_indicator/tilted/style.json | 22 ++--- .../tilted_texture_shift/expected.png | Bin 6502 -> 6104 bytes .../tilted_texture_shift/style.json | 22 ++--- .../tilted_texture_shift_bottom_left/expected.png | Bin 6396 -> 6323 bytes .../tilted_texture_shift_bottom_left/style.json | 22 ++--- .../tilted_texture_shift_bottom_right/expected.png | Bin 5996 -> 6052 bytes .../tilted_texture_shift_bottom_right/style.json | 22 ++--- .../tilted_texture_shift_top_left/expected.png | Bin 3327 -> 3340 bytes .../tilted_texture_shift_top_left/style.json | 22 ++--- .../tilted_texture_shift_top_right/expected.png | Bin 3238 -> 3225 bytes .../tilted_texture_shift_top_right/style.json | 22 ++--- .../location_indicator/two_textures/expected.png | Bin 8945 -> 8226 bytes .../location_indicator/two_textures/style.json | 22 ++--- 29 files changed, 212 insertions(+), 199 deletions(-) create mode 100644 metrics/tests/location_indicator/image_pixel_ratio/expected.png create mode 100644 metrics/tests/location_indicator/image_pixel_ratio/style.json (limited to 'metrics/tests') diff --git a/metrics/tests/location_indicator/dateline/expected.png b/metrics/tests/location_indicator/dateline/expected.png index 8e1e2e95e9..a188b219f4 100644 Binary files a/metrics/tests/location_indicator/dateline/expected.png and b/metrics/tests/location_indicator/dateline/expected.png differ 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 index 5823cce89e..f27cb64d98 100644 Binary files a/metrics/tests/location_indicator/default/expected.png and b/metrics/tests/location_indicator/default/expected.png differ 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 new file mode 100644 index 0000000000..b48b9e1340 Binary files /dev/null and b/metrics/tests/location_indicator/image_pixel_ratio/expected.png differ 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 index 436a27ed08..c457e027dc 100644 Binary files a/metrics/tests/location_indicator/no_radius_border/expected.png and b/metrics/tests/location_indicator/no_radius_border/expected.png differ 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 index 447546c880..5563f33f25 100644 Binary files a/metrics/tests/location_indicator/no_radius_fill/expected.png and b/metrics/tests/location_indicator/no_radius_fill/expected.png differ 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 index c0fb9ce580..b955f63993 100644 Binary files a/metrics/tests/location_indicator/one_texture/expected.png and b/metrics/tests/location_indicator/one_texture/expected.png differ 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 index 4b481b12d5..b3fcfc8201 100644 Binary files a/metrics/tests/location_indicator/rotated/expected.png and b/metrics/tests/location_indicator/rotated/expected.png differ 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 index 624be49df3..4408e2a4b4 100644 Binary files a/metrics/tests/location_indicator/tilted/expected.png and b/metrics/tests/location_indicator/tilted/expected.png differ 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 index 0a4baa1b58..8b533f7da7 100644 Binary files a/metrics/tests/location_indicator/tilted_texture_shift/expected.png and b/metrics/tests/location_indicator/tilted_texture_shift/expected.png differ 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 index a651914b09..e1de70ede8 100644 Binary files a/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/expected.png and b/metrics/tests/location_indicator/tilted_texture_shift_bottom_left/expected.png differ 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 index d0839ea66f..d6b3c330a6 100644 Binary files a/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/expected.png and b/metrics/tests/location_indicator/tilted_texture_shift_bottom_right/expected.png differ 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 index 48747eb194..9d31ed9a48 100644 Binary files a/metrics/tests/location_indicator/tilted_texture_shift_top_left/expected.png and b/metrics/tests/location_indicator/tilted_texture_shift_top_left/expected.png differ 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 index 3b39556295..e0e59d4edc 100644 Binary files a/metrics/tests/location_indicator/tilted_texture_shift_top_right/expected.png and b/metrics/tests/location_indicator/tilted_texture_shift_top_right/expected.png differ 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 index f876aaddb7..28d6ec95b9 100644 Binary files a/metrics/tests/location_indicator/two_textures/expected.png and b/metrics/tests/location_indicator/two_textures/expected.png differ 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)" -- cgit v1.2.1