diff --git a/test/integration/render-tests/circle-blur/blending/expected.png b/test/integration/render-tests/circle-blur/blending/expected.png new file mode 100644 index 00000000000..b27eac77247 Binary files /dev/null and b/test/integration/render-tests/circle-blur/blending/expected.png differ diff --git a/test/integration/render-tests/circle-blur/blending/style.json b/test/integration/render-tests/circle-blur/blending/style.json new file mode 100644 index 00000000000..0d5f9ff4a57 --- /dev/null +++ b/test/integration/render-tests/circle-blur/blending/style.json @@ -0,0 +1,65 @@ +{ + "version": 8, + "metadata": { + "test": { + "width": 64, + "height": 64 + } + }, + "sources": { + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "color": "red", + "blur": 1 + }, + "geometry": { + "type": "Point", + "coordinates": [ + -5, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + "color": "blue", + "blur": 1.5 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 5, + 0 + ] + } + } + ] + } + } + }, + "layers": [ + { + "id": "circle", + "type": "circle", + "source": "geojson", + "paint": { + "circle-radius": 20, + "circle-color": [ + "get", + "color" + ], + "circle-blur": [ + "get", + "blur" + ] + } + } + ] +} diff --git a/test/integration/render-tests/circle-blur/default/expected.png b/test/integration/render-tests/circle-blur/default/expected.png index d51d572887d..3abac7f9279 100644 Binary files a/test/integration/render-tests/circle-blur/default/expected.png and b/test/integration/render-tests/circle-blur/default/expected.png differ diff --git a/test/integration/render-tests/circle-blur/default/style.json b/test/integration/render-tests/circle-blur/default/style.json index 90431f11bd4..e5407053ad6 100644 --- a/test/integration/render-tests/circle-blur/default/style.json +++ b/test/integration/render-tests/circle-blur/default/style.json @@ -2,40 +2,52 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-radius": 5, - "circle-color": "#000" + "circle-radius": 10 } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-blur/function/expected.png b/test/integration/render-tests/circle-blur/function/expected.png index 2936e2202e2..3abac7f9279 100644 Binary files a/test/integration/render-tests/circle-blur/function/expected.png and b/test/integration/render-tests/circle-blur/function/expected.png differ diff --git a/test/integration/render-tests/circle-blur/function/style.json b/test/integration/render-tests/circle-blur/function/style.json index b2539c9e83e..ff859f839bb 100644 --- a/test/integration/render-tests/circle-blur/function/style.json +++ b/test/integration/render-tests/circle-blur/function/style.json @@ -2,52 +2,64 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-radius": 5, - "circle-color": "#000", + "circle-radius": 10, "circle-blur": { "stops": [ [ - 16, - 15 + 0, + 0.1 ], [ - 17, - 20 + 1, + 0.4 ] ] } } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-blur/literal/expected.png b/test/integration/render-tests/circle-blur/literal/expected.png index c5d1992d28d..7b61e95ca2f 100644 Binary files a/test/integration/render-tests/circle-blur/literal/expected.png and b/test/integration/render-tests/circle-blur/literal/expected.png differ diff --git a/test/integration/render-tests/circle-blur/literal/style.json b/test/integration/render-tests/circle-blur/literal/style.json index 0a48a6292ba..3c240eb4459 100644 --- a/test/integration/render-tests/circle-blur/literal/style.json +++ b/test/integration/render-tests/circle-blur/literal/style.json @@ -2,40 +2,52 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-radius": 5, - "circle-color": "#000", - "circle-blur": 5 + "circle-radius": 10, + "circle-blur": 0.5 } } ] diff --git a/test/integration/render-tests/circle-blur/property-function/expected.png b/test/integration/render-tests/circle-blur/property-function/expected.png index 8cb784e4a4a..3aa8320e110 100644 Binary files a/test/integration/render-tests/circle-blur/property-function/expected.png and b/test/integration/render-tests/circle-blur/property-function/expected.png differ diff --git a/test/integration/render-tests/circle-blur/property-function/style.json b/test/integration/render-tests/circle-blur/property-function/style.json index 9bfc2e2d428..a6826430504 100644 --- a/test/integration/render-tests/circle-blur/property-function/style.json +++ b/test/integration/render-tests/circle-blur/property-function/style.json @@ -2,49 +2,56 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "blur": 0.1 + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + "blur": 0.9 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { + "circle-radius": 10, "circle-blur": { - "stops": [ - [ - 0, - 0 - ], - [ - 50, - 10 - ] - ], - "property": "localrank" + "type": "identity", + "property": "blur" } } } diff --git a/test/integration/render-tests/circle-blur/zoom-and-property-function/expected.png b/test/integration/render-tests/circle-blur/zoom-and-property-function/expected.png index ca7f6319a6e..fcac2c6ccc8 100644 Binary files a/test/integration/render-tests/circle-blur/zoom-and-property-function/expected.png and b/test/integration/render-tests/circle-blur/zoom-and-property-function/expected.png differ diff --git a/test/integration/render-tests/circle-blur/zoom-and-property-function/style.json b/test/integration/render-tests/circle-blur/zoom-and-property-function/style.json index 5275309429b..29c339a4d4a 100644 --- a/test/integration/render-tests/circle-blur/zoom-and-property-function/style.json +++ b/test/integration/render-tests/circle-blur/zoom-and-property-function/style.json @@ -2,69 +2,85 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "blur": 0 + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + "blur": 1 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { + "circle-radius": 10, "circle-blur": { + "property": "blur", "stops": [ [ { - "zoom": 13.9, + "zoom": 0, "value": 0 }, 0 ], [ { - "zoom": 13.9, - "value": 50 + "zoom": 0, + "value": 1 }, - 10 + 0.2 ], [ { - "zoom": 14.2, + "zoom": 1, "value": 0 }, - 5 + 0.4 ], [ { - "zoom": 14.2, - "value": 50 + "zoom": 1, + "value": 1 }, - 15 + 0.6 ] - ], - "property": "localrank" + ] } } } diff --git a/test/integration/render-tests/circle-color/default/expected.png b/test/integration/render-tests/circle-color/default/expected.png index d51d572887d..3abac7f9279 100644 Binary files a/test/integration/render-tests/circle-color/default/expected.png and b/test/integration/render-tests/circle-color/default/expected.png differ diff --git a/test/integration/render-tests/circle-color/default/style.json b/test/integration/render-tests/circle-color/default/style.json index f370aa2393a..e5407053ad6 100644 --- a/test/integration/render-tests/circle-color/default/style.json +++ b/test/integration/render-tests/circle-color/default/style.json @@ -2,39 +2,52 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-radius": 5 + "circle-radius": 10 } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-color/function/expected.png b/test/integration/render-tests/circle-color/function/expected.png index 0d06afec6cf..c01cb17ffa0 100644 Binary files a/test/integration/render-tests/circle-color/function/expected.png and b/test/integration/render-tests/circle-color/function/expected.png differ diff --git a/test/integration/render-tests/circle-color/function/style.json b/test/integration/render-tests/circle-color/function/style.json index 7d6dad247e9..b8c61ef95f8 100644 --- a/test/integration/render-tests/circle-color/function/style.json +++ b/test/integration/render-tests/circle-color/function/style.json @@ -2,46 +2,59 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-radius": 5, + "circle-radius": 10, "circle-color": { "stops": [ [ - 16, + 0, "green" ], [ - 17, + 1, "blue" ] ] @@ -49,4 +62,4 @@ } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-color/identity-property-function/expected.png b/test/integration/render-tests/circle-color/identity-property-function/expected.png deleted file mode 100644 index 253d5bf782a..00000000000 Binary files a/test/integration/render-tests/circle-color/identity-property-function/expected.png and /dev/null differ diff --git a/test/integration/render-tests/circle-color/identity-property-function/style.json b/test/integration/render-tests/circle-color/identity-property-function/style.json deleted file mode 100644 index 3334d3454e0..00000000000 --- a/test/integration/render-tests/circle-color/identity-property-function/style.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 64, - "height": 64 - } - }, - "sources": { - "mapbox": { - "type": "geojson", - "data": { - "type": "Feature", - "properties": { - "color": "red" - }, - "geometry": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - } - }, - "sprite": "local://sprites/sprite", - "layers": [ - { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "circle", - "type": "circle", - "source": "mapbox", - "paint": { - "circle-radius": 20, - "circle-color": { - "type": "identity", - "property": "color" - } - } - } - ] -} diff --git a/test/integration/render-tests/circle-color/literal/expected.png b/test/integration/render-tests/circle-color/literal/expected.png index c2d45caf7ad..32a10663f9c 100644 Binary files a/test/integration/render-tests/circle-color/literal/expected.png and b/test/integration/render-tests/circle-color/literal/expected.png differ diff --git a/test/integration/render-tests/circle-color/literal/style.json b/test/integration/render-tests/circle-color/literal/style.json index 8dd356c65dd..7f6293f9fa8 100644 --- a/test/integration/render-tests/circle-color/literal/style.json +++ b/test/integration/render-tests/circle-color/literal/style.json @@ -2,40 +2,53 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-radius": 5, + "circle-radius": 10, "circle-color": "blue" } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-color/property-function/expected.png b/test/integration/render-tests/circle-color/property-function/expected.png index c303f183176..41422e2f139 100644 Binary files a/test/integration/render-tests/circle-color/property-function/expected.png and b/test/integration/render-tests/circle-color/property-function/expected.png differ diff --git a/test/integration/render-tests/circle-color/property-function/style.json b/test/integration/render-tests/circle-color/property-function/style.json index 02efeefa4d2..2c0abc2ef17 100644 --- a/test/integration/render-tests/circle-color/property-function/style.json +++ b/test/integration/render-tests/circle-color/property-function/style.json @@ -2,52 +2,58 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "color": "red" + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + "color": "green" + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-radius": 5, + "circle-radius": 10, "circle-color": { - "stops": [ - [ - 0, - "red" - ], - [ - 50, - "green" - ] - ], - "property": "localrank" + "type": "identity", + "property": "color" } } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-color/zoom-and-property-function/expected.png b/test/integration/render-tests/circle-color/zoom-and-property-function/expected.png index c6598ba566c..7bc2a718b21 100644 Binary files a/test/integration/render-tests/circle-color/zoom-and-property-function/expected.png and b/test/integration/render-tests/circle-color/zoom-and-property-function/expected.png differ diff --git a/test/integration/render-tests/circle-color/zoom-and-property-function/style.json b/test/integration/render-tests/circle-color/zoom-and-property-function/style.json index fb750f40151..c3bf8a68226 100644 --- a/test/integration/render-tests/circle-color/zoom-and-property-function/style.json +++ b/test/integration/render-tests/circle-color/zoom-and-property-function/style.json @@ -2,73 +2,87 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "color": 0 + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + "color": 10 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-radius": 5, + "circle-radius": 10, "circle-color": { - "base": 1, + "property": "color", "stops": [ [ { - "zoom": 13.9, + "zoom": 0, "value": 0 }, "red" ], [ { - "zoom": 13.9, - "value": 50 + "zoom": 0, + "value": 10 }, "yellow" ], [ { - "zoom": 14.2, + "zoom": 1, "value": 0 }, "blue" ], [ { - "zoom": 14.2, - "value": 50 + "zoom": 1, + "value": 10 }, "green" ] - ], - "property": "localrank" + ] } } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-geometry/linestring/expected.png b/test/integration/render-tests/circle-geometry/linestring/expected.png index b87ddbe5f48..95d84f0c87c 100644 Binary files a/test/integration/render-tests/circle-geometry/linestring/expected.png and b/test/integration/render-tests/circle-geometry/linestring/expected.png differ diff --git a/test/integration/render-tests/circle-geometry/linestring/style.json b/test/integration/render-tests/circle-geometry/linestring/style.json index c4a74b6e990..e825c98b10f 100644 --- a/test/integration/render-tests/circle-geometry/linestring/style.json +++ b/test/integration/render-tests/circle-geometry/linestring/style.json @@ -2,7 +2,8 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 256, + "height": 128 } }, "center": [0, 0], diff --git a/test/integration/render-tests/circle-geometry/multilinestring/expected.png b/test/integration/render-tests/circle-geometry/multilinestring/expected.png index 707106ed8c6..256c2b1d605 100644 Binary files a/test/integration/render-tests/circle-geometry/multilinestring/expected.png and b/test/integration/render-tests/circle-geometry/multilinestring/expected.png differ diff --git a/test/integration/render-tests/circle-geometry/multilinestring/style.json b/test/integration/render-tests/circle-geometry/multilinestring/style.json index 4daa6e48d90..06b2af535af 100644 --- a/test/integration/render-tests/circle-geometry/multilinestring/style.json +++ b/test/integration/render-tests/circle-geometry/multilinestring/style.json @@ -2,7 +2,8 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 256, + "height": 128 } }, "center": [0, 0], diff --git a/test/integration/render-tests/circle-geometry/multipoint/expected.png b/test/integration/render-tests/circle-geometry/multipoint/expected.png index e85997174c2..2e3663ea1a5 100644 Binary files a/test/integration/render-tests/circle-geometry/multipoint/expected.png and b/test/integration/render-tests/circle-geometry/multipoint/expected.png differ diff --git a/test/integration/render-tests/circle-geometry/multipoint/style.json b/test/integration/render-tests/circle-geometry/multipoint/style.json index 832e48a0c8c..3ec0923e4da 100644 --- a/test/integration/render-tests/circle-geometry/multipoint/style.json +++ b/test/integration/render-tests/circle-geometry/multipoint/style.json @@ -2,7 +2,8 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 256, + "height": 128 } }, "center": [0, 0], diff --git a/test/integration/render-tests/circle-geometry/multipolygon/expected.png b/test/integration/render-tests/circle-geometry/multipolygon/expected.png index 028a2fef739..c18b6f2d06b 100644 Binary files a/test/integration/render-tests/circle-geometry/multipolygon/expected.png and b/test/integration/render-tests/circle-geometry/multipolygon/expected.png differ diff --git a/test/integration/render-tests/circle-geometry/multipolygon/style.json b/test/integration/render-tests/circle-geometry/multipolygon/style.json index 2e0b56cbd81..ee1c6900c17 100644 --- a/test/integration/render-tests/circle-geometry/multipolygon/style.json +++ b/test/integration/render-tests/circle-geometry/multipolygon/style.json @@ -2,7 +2,8 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 256, + "height": 128 } }, "center": [0, 0], diff --git a/test/integration/render-tests/circle-geometry/point/expected.png b/test/integration/render-tests/circle-geometry/point/expected.png index 5cf63e0e5e7..44fcd58bc80 100644 Binary files a/test/integration/render-tests/circle-geometry/point/expected.png and b/test/integration/render-tests/circle-geometry/point/expected.png differ diff --git a/test/integration/render-tests/circle-geometry/point/style.json b/test/integration/render-tests/circle-geometry/point/style.json index ed2c63009be..f9ef0e009fc 100644 --- a/test/integration/render-tests/circle-geometry/point/style.json +++ b/test/integration/render-tests/circle-geometry/point/style.json @@ -2,7 +2,8 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 256, + "height": 128 } }, "center": [0, 0], diff --git a/test/integration/render-tests/circle-geometry/polygon/expected.png b/test/integration/render-tests/circle-geometry/polygon/expected.png index 37b266e9a09..39111ef9abe 100644 Binary files a/test/integration/render-tests/circle-geometry/polygon/expected.png and b/test/integration/render-tests/circle-geometry/polygon/expected.png differ diff --git a/test/integration/render-tests/circle-geometry/polygon/style.json b/test/integration/render-tests/circle-geometry/polygon/style.json index 5189b0d6de6..5794e646ef4 100644 --- a/test/integration/render-tests/circle-geometry/polygon/style.json +++ b/test/integration/render-tests/circle-geometry/polygon/style.json @@ -2,7 +2,8 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 256, + "height": 128 } }, "center": [0, 0], diff --git a/test/integration/render-tests/circle-opacity/blending/expected.png b/test/integration/render-tests/circle-opacity/blending/expected.png new file mode 100644 index 00000000000..6c16bbe37b2 Binary files /dev/null and b/test/integration/render-tests/circle-opacity/blending/expected.png differ diff --git a/test/integration/render-tests/circle-opacity/blending/style.json b/test/integration/render-tests/circle-opacity/blending/style.json new file mode 100644 index 00000000000..4a49f3e89d3 --- /dev/null +++ b/test/integration/render-tests/circle-opacity/blending/style.json @@ -0,0 +1,59 @@ +{ + "version": 8, + "metadata": { + "test": { + "width": 64, + "height": 64 + } + }, + "sources": { + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "opacity": 0.3 + }, + "geometry": { + "type": "Point", + "coordinates": [ + -2, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + "opacity": 0.6 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 2, + 0 + ] + } + } + ] + } + } + }, + "layers": [ + { + "id": "circle", + "type": "circle", + "source": "geojson", + "paint": { + "circle-radius": 10, + "circle-opacity": [ + "get", + "opacity" + ] + } + } + ] +} diff --git a/test/integration/render-tests/circle-opacity/default/expected.png b/test/integration/render-tests/circle-opacity/default/expected.png index eab59b46d8a..3abac7f9279 100644 Binary files a/test/integration/render-tests/circle-opacity/default/expected.png and b/test/integration/render-tests/circle-opacity/default/expected.png differ diff --git a/test/integration/render-tests/circle-opacity/default/style.json b/test/integration/render-tests/circle-opacity/default/style.json index fcfc4ca0827..e5407053ad6 100644 --- a/test/integration/render-tests/circle-opacity/default/style.json +++ b/test/integration/render-tests/circle-opacity/default/style.json @@ -2,40 +2,52 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-radius": 10, - "circle-color": "#000" + "circle-radius": 10 } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-opacity/function/expected.png b/test/integration/render-tests/circle-opacity/function/expected.png index 106cd4b1fa5..a70cf979217 100644 Binary files a/test/integration/render-tests/circle-opacity/function/expected.png and b/test/integration/render-tests/circle-opacity/function/expected.png differ diff --git a/test/integration/render-tests/circle-opacity/function/style.json b/test/integration/render-tests/circle-opacity/function/style.json index 44e72b2d698..14ed4712750 100644 --- a/test/integration/render-tests/circle-opacity/function/style.json +++ b/test/integration/render-tests/circle-opacity/function/style.json @@ -2,52 +2,64 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { "circle-radius": 10, - "circle-color": "#000", "circle-opacity": { "stops": [ [ - 16, - 0.5 + 0, + 0.3 ], [ - 17, - 0.6 + 1, + 0.5 ] ] } } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-opacity/literal/expected.png b/test/integration/render-tests/circle-opacity/literal/expected.png index 3c0e7995c91..a70cf979217 100644 Binary files a/test/integration/render-tests/circle-opacity/literal/expected.png and b/test/integration/render-tests/circle-opacity/literal/expected.png differ diff --git a/test/integration/render-tests/circle-opacity/literal/style.json b/test/integration/render-tests/circle-opacity/literal/style.json index 10cfdcd1730..4dd5dca33bd 100644 --- a/test/integration/render-tests/circle-opacity/literal/style.json +++ b/test/integration/render-tests/circle-opacity/literal/style.json @@ -2,41 +2,53 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { "circle-radius": 10, - "circle-color": "#000", "circle-opacity": 0.3 } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-opacity/property-function/expected.png b/test/integration/render-tests/circle-opacity/property-function/expected.png index c2ea5f08a5d..5f631c26af2 100644 Binary files a/test/integration/render-tests/circle-opacity/property-function/expected.png and b/test/integration/render-tests/circle-opacity/property-function/expected.png differ diff --git a/test/integration/render-tests/circle-opacity/property-function/style.json b/test/integration/render-tests/circle-opacity/property-function/style.json index 8ccfbd21f42..e2fe0acfdfb 100644 --- a/test/integration/render-tests/circle-opacity/property-function/style.json +++ b/test/integration/render-tests/circle-opacity/property-function/style.json @@ -2,49 +2,56 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "opacity": 0.3 + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + "opacity": 0.6 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { + "circle-radius": 10, "circle-opacity": { - "stops": [ - [ - 0, - 0 - ], - [ - 50, - 1 - ] - ], - "property": "localrank" + "type": "identity", + "property": "opacity" } } } diff --git a/test/integration/render-tests/circle-opacity/zoom-and-property-function/expected.png b/test/integration/render-tests/circle-opacity/zoom-and-property-function/expected.png index 50045a8ab53..865b929db75 100644 Binary files a/test/integration/render-tests/circle-opacity/zoom-and-property-function/expected.png and b/test/integration/render-tests/circle-opacity/zoom-and-property-function/expected.png differ diff --git a/test/integration/render-tests/circle-opacity/zoom-and-property-function/style.json b/test/integration/render-tests/circle-opacity/zoom-and-property-function/style.json index 438311797f5..dad0c76a346 100644 --- a/test/integration/render-tests/circle-opacity/zoom-and-property-function/style.json +++ b/test/integration/render-tests/circle-opacity/zoom-and-property-function/style.json @@ -2,70 +2,85 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "property": 0 + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + "property": 10 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { + "circle-radius": 10, "circle-opacity": { - "base": 1, + "property": "property", "stops": [ [ { - "zoom": 13.9, + "zoom": 0, "value": 0 }, - 0 + 0.2 ], [ { - "zoom": 13.9, - "value": 50 + "zoom": 0, + "value": 10 }, - 0.75 + 0.4 ], [ { - "zoom": 14.2, + "zoom": 1, "value": 0 }, - 0.25 + 0.6 ], [ { - "zoom": 14.2, - "value": 50 + "zoom": 1, + "value": 10 }, - 1 + 0.8 ] - ], - "property": "localrank" + ] } } } diff --git a/test/integration/render-tests/circle-pitch-alignment/map-scale-map/expected.png b/test/integration/render-tests/circle-pitch-alignment/map-scale-map/expected.png index 7c13df2b3cb..30619b2af93 100644 Binary files a/test/integration/render-tests/circle-pitch-alignment/map-scale-map/expected.png and b/test/integration/render-tests/circle-pitch-alignment/map-scale-map/expected.png differ diff --git a/test/integration/render-tests/circle-pitch-alignment/map-scale-map/style.json b/test/integration/render-tests/circle-pitch-alignment/map-scale-map/style.json index 193dc6c9211..1bae5063605 100644 --- a/test/integration/render-tests/circle-pitch-alignment/map-scale-map/style.json +++ b/test/integration/render-tests/circle-pitch-alignment/map-scale-map/style.json @@ -2,8 +2,8 @@ "version": 8, "metadata": { "test": { - "width": 512, - "height": 512 + "width": 128, + "height": 256 } }, "center": [ @@ -47,4 +47,4 @@ } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-pitch-alignment/map-scale-viewport/expected.png b/test/integration/render-tests/circle-pitch-alignment/map-scale-viewport/expected.png index 7bb92b47bb7..3b1a27152d8 100644 Binary files a/test/integration/render-tests/circle-pitch-alignment/map-scale-viewport/expected.png and b/test/integration/render-tests/circle-pitch-alignment/map-scale-viewport/expected.png differ diff --git a/test/integration/render-tests/circle-pitch-alignment/map-scale-viewport/style.json b/test/integration/render-tests/circle-pitch-alignment/map-scale-viewport/style.json index 114c78d7f31..1e1d96649a7 100644 --- a/test/integration/render-tests/circle-pitch-alignment/map-scale-viewport/style.json +++ b/test/integration/render-tests/circle-pitch-alignment/map-scale-viewport/style.json @@ -2,8 +2,8 @@ "version": 8, "metadata": { "test": { - "width": 512, - "height": 512 + "width": 128, + "height": 256 } }, "center": [ @@ -47,4 +47,4 @@ } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-pitch-alignment/viewport-scale-map/expected.png b/test/integration/render-tests/circle-pitch-alignment/viewport-scale-map/expected.png index 1b059f80ed2..dd380e76669 100644 Binary files a/test/integration/render-tests/circle-pitch-alignment/viewport-scale-map/expected.png and b/test/integration/render-tests/circle-pitch-alignment/viewport-scale-map/expected.png differ diff --git a/test/integration/render-tests/circle-pitch-alignment/viewport-scale-map/style.json b/test/integration/render-tests/circle-pitch-alignment/viewport-scale-map/style.json index a1af4f089d3..e2b8c4e2e66 100644 --- a/test/integration/render-tests/circle-pitch-alignment/viewport-scale-map/style.json +++ b/test/integration/render-tests/circle-pitch-alignment/viewport-scale-map/style.json @@ -2,8 +2,8 @@ "version": 8, "metadata": { "test": { - "width": 512, - "height": 512 + "width": 128, + "height": 256 } }, "center": [ @@ -47,4 +47,4 @@ } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-pitch-alignment/viewport-scale-viewport/expected.png b/test/integration/render-tests/circle-pitch-alignment/viewport-scale-viewport/expected.png index fb5c8ef2a14..ebc5c18fc64 100644 Binary files a/test/integration/render-tests/circle-pitch-alignment/viewport-scale-viewport/expected.png and b/test/integration/render-tests/circle-pitch-alignment/viewport-scale-viewport/expected.png differ diff --git a/test/integration/render-tests/circle-pitch-alignment/viewport-scale-viewport/style.json b/test/integration/render-tests/circle-pitch-alignment/viewport-scale-viewport/style.json index ca154f6db62..aa7a1576e3c 100644 --- a/test/integration/render-tests/circle-pitch-alignment/viewport-scale-viewport/style.json +++ b/test/integration/render-tests/circle-pitch-alignment/viewport-scale-viewport/style.json @@ -2,8 +2,8 @@ "version": 8, "metadata": { "test": { - "width": 512, - "height": 512 + "width": 128, + "height": 256 } }, "center": [ @@ -47,4 +47,4 @@ } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-pitch-scale/default/expected.png b/test/integration/render-tests/circle-pitch-scale/default/expected.png index 1b059f80ed2..dd380e76669 100644 Binary files a/test/integration/render-tests/circle-pitch-scale/default/expected.png and b/test/integration/render-tests/circle-pitch-scale/default/expected.png differ diff --git a/test/integration/render-tests/circle-pitch-scale/default/style.json b/test/integration/render-tests/circle-pitch-scale/default/style.json index 38187a8ead9..66c8c3c3214 100644 --- a/test/integration/render-tests/circle-pitch-scale/default/style.json +++ b/test/integration/render-tests/circle-pitch-scale/default/style.json @@ -2,8 +2,8 @@ "version": 8, "metadata": { "test": { - "width": 512, - "height": 512 + "width": 128, + "height": 256 } }, "center": [ @@ -45,4 +45,4 @@ } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-pitch-scale/map/expected.png b/test/integration/render-tests/circle-pitch-scale/map/expected.png index 1b059f80ed2..dd380e76669 100644 Binary files a/test/integration/render-tests/circle-pitch-scale/map/expected.png and b/test/integration/render-tests/circle-pitch-scale/map/expected.png differ diff --git a/test/integration/render-tests/circle-pitch-scale/map/style.json b/test/integration/render-tests/circle-pitch-scale/map/style.json index cf62662ac15..fc9922640e6 100644 --- a/test/integration/render-tests/circle-pitch-scale/map/style.json +++ b/test/integration/render-tests/circle-pitch-scale/map/style.json @@ -2,8 +2,8 @@ "version": 8, "metadata": { "test": { - "width": 512, - "height": 512 + "width": 128, + "height": 256 } }, "center": [ @@ -46,4 +46,4 @@ } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-pitch-scale/viewport/expected.png b/test/integration/render-tests/circle-pitch-scale/viewport/expected.png index fb5c8ef2a14..ebc5c18fc64 100644 Binary files a/test/integration/render-tests/circle-pitch-scale/viewport/expected.png and b/test/integration/render-tests/circle-pitch-scale/viewport/expected.png differ diff --git a/test/integration/render-tests/circle-pitch-scale/viewport/style.json b/test/integration/render-tests/circle-pitch-scale/viewport/style.json index 14c71fe0b86..764c55ecc34 100644 --- a/test/integration/render-tests/circle-pitch-scale/viewport/style.json +++ b/test/integration/render-tests/circle-pitch-scale/viewport/style.json @@ -2,8 +2,8 @@ "version": 8, "metadata": { "test": { - "width": 512, - "height": 512 + "width": 128, + "height": 256 } }, "center": [ @@ -46,4 +46,4 @@ } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-radius/default/expected.png b/test/integration/render-tests/circle-radius/default/expected.png index d51d572887d..62c8dbcada2 100644 Binary files a/test/integration/render-tests/circle-radius/default/expected.png and b/test/integration/render-tests/circle-radius/default/expected.png differ diff --git a/test/integration/render-tests/circle-radius/default/style.json b/test/integration/render-tests/circle-radius/default/style.json index fc66367e846..4f6176ed7a4 100644 --- a/test/integration/render-tests/circle-radius/default/style.json +++ b/test/integration/render-tests/circle-radius/default/style.json @@ -2,39 +2,50 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", - "paint": { - "circle-color": "#000" - } + "source": "geojson", + "paint": {} } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-radius/function/expected.png b/test/integration/render-tests/circle-radius/function/expected.png index c2f86a48a37..3abac7f9279 100644 Binary files a/test/integration/render-tests/circle-radius/function/expected.png and b/test/integration/render-tests/circle-radius/function/expected.png differ diff --git a/test/integration/render-tests/circle-radius/function/style.json b/test/integration/render-tests/circle-radius/function/style.json index ce2301b4712..743b82a1810 100644 --- a/test/integration/render-tests/circle-radius/function/style.json +++ b/test/integration/render-tests/circle-radius/function/style.json @@ -2,51 +2,63 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-color": "#000", "circle-radius": { "stops": [ [ - 16, - 20 + 0, + 10 ], [ - 17, - 30 + 1, + 15 ] ] } } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-radius/identity-property-function/expected.png b/test/integration/render-tests/circle-radius/identity-property-function/expected.png deleted file mode 100644 index 17c96bb26cc..00000000000 Binary files a/test/integration/render-tests/circle-radius/identity-property-function/expected.png and /dev/null differ diff --git a/test/integration/render-tests/circle-radius/identity-property-function/style.json b/test/integration/render-tests/circle-radius/identity-property-function/style.json deleted file mode 100644 index 55bc729fce0..00000000000 --- a/test/integration/render-tests/circle-radius/identity-property-function/style.json +++ /dev/null @@ -1,49 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "width": 64, - "height": 64 - } - }, - "sources": { - "mapbox": { - "type": "geojson", - "data": { - "type": "Feature", - "properties": { - "radius": 20 - }, - "geometry": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - } - }, - "sprite": "local://sprites/sprite", - "layers": [ - { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "circle", - "type": "circle", - "source": "mapbox", - "paint": { - "circle-radius": { - "type": "identity", - "property": "radius" - }, - "circle-color": "black" - } - } - ] -} diff --git a/test/integration/render-tests/circle-radius/literal/expected.png b/test/integration/render-tests/circle-radius/literal/expected.png index eab59b46d8a..42dd701b60a 100644 Binary files a/test/integration/render-tests/circle-radius/literal/expected.png and b/test/integration/render-tests/circle-radius/literal/expected.png differ diff --git a/test/integration/render-tests/circle-radius/literal/style.json b/test/integration/render-tests/circle-radius/literal/style.json index d531357ee33..a71aba4db2a 100644 --- a/test/integration/render-tests/circle-radius/literal/style.json +++ b/test/integration/render-tests/circle-radius/literal/style.json @@ -2,40 +2,52 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-color": "#000", - "circle-radius": 10 + "circle-radius": 8 } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-radius/property-function/expected.png b/test/integration/render-tests/circle-radius/property-function/expected.png new file mode 100644 index 00000000000..1531f87862f Binary files /dev/null and b/test/integration/render-tests/circle-radius/property-function/expected.png differ diff --git a/test/integration/render-tests/circle-radius/property-function/style.json b/test/integration/render-tests/circle-radius/property-function/style.json new file mode 100644 index 00000000000..2c3c810c7b7 --- /dev/null +++ b/test/integration/render-tests/circle-radius/property-function/style.json @@ -0,0 +1,58 @@ +{ + "version": 8, + "metadata": { + "test": { + "width": 64, + "height": 64 + } + }, + "sources": { + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "width": 4 + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + "width": 7 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } + } + }, + "layers": [ + { + "id": "circle", + "type": "circle", + "source": "geojson", + "paint": { + "circle-radius": { + "type": "identity", + "property": "width" + } + } + } + ] +} diff --git a/test/integration/render-tests/circle-radius/zoom-and-property-function/expected.png b/test/integration/render-tests/circle-radius/zoom-and-property-function/expected.png index a31b52606a4..75fa17e7de8 100644 Binary files a/test/integration/render-tests/circle-radius/zoom-and-property-function/expected.png and b/test/integration/render-tests/circle-radius/zoom-and-property-function/expected.png differ diff --git a/test/integration/render-tests/circle-radius/zoom-and-property-function/style.json b/test/integration/render-tests/circle-radius/zoom-and-property-function/style.json index dcd520431e8..e75f6279e2c 100644 --- a/test/integration/render-tests/circle-radius/zoom-and-property-function/style.json +++ b/test/integration/render-tests/circle-radius/zoom-and-property-function/style.json @@ -2,72 +2,86 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "width": 5 + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + "width": 10 + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { "circle-radius": { - "base": 1, + "property": "width", "stops": [ [ { - "zoom": 13.9, + "zoom": 0, "value": 0 }, 2 ], [ { - "zoom": 13.9, + "zoom": 0, "value": 50 }, 8 ], [ { - "zoom": 14.2, + "zoom": 1, "value": 0 }, 6 ], [ { - "zoom": 14.2, + "zoom": 1, "value": 50 }, 24 ] - ], - "property": "localrank" + ] } } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-translate-anchor/map/expected.png b/test/integration/render-tests/circle-translate-anchor/map/expected.png index 50baa83e242..2fef39cf334 100644 Binary files a/test/integration/render-tests/circle-translate-anchor/map/expected.png and b/test/integration/render-tests/circle-translate-anchor/map/expected.png differ diff --git a/test/integration/render-tests/circle-translate-anchor/map/style.json b/test/integration/render-tests/circle-translate-anchor/map/style.json index 8b131c62b8f..f5d0c1af1b1 100644 --- a/test/integration/render-tests/circle-translate-anchor/map/style.json +++ b/test/integration/render-tests/circle-translate-anchor/map/style.json @@ -2,45 +2,57 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, - "bearing": 90, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, + "bearing": 90, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-color": "black", "circle-translate": [ - 10, - 10 + 20, + 0 ], "circle-translate-anchor": "map" } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-translate-anchor/viewport/expected.png b/test/integration/render-tests/circle-translate-anchor/viewport/expected.png index c8a7162ea69..7621b5e29f1 100644 Binary files a/test/integration/render-tests/circle-translate-anchor/viewport/expected.png and b/test/integration/render-tests/circle-translate-anchor/viewport/expected.png differ diff --git a/test/integration/render-tests/circle-translate-anchor/viewport/style.json b/test/integration/render-tests/circle-translate-anchor/viewport/style.json index 7de2c29b2b3..09330f61d34 100644 --- a/test/integration/render-tests/circle-translate-anchor/viewport/style.json +++ b/test/integration/render-tests/circle-translate-anchor/viewport/style.json @@ -2,45 +2,57 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, - "bearing": 90, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, + "bearing": 90, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-color": "black", "circle-translate": [ - 10, - 10 + 20, + 0 ], "circle-translate-anchor": "viewport" } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-translate/default/expected.png b/test/integration/render-tests/circle-translate/default/expected.png index d51d572887d..3abac7f9279 100644 Binary files a/test/integration/render-tests/circle-translate/default/expected.png and b/test/integration/render-tests/circle-translate/default/expected.png differ diff --git a/test/integration/render-tests/circle-translate/default/style.json b/test/integration/render-tests/circle-translate/default/style.json index 90431f11bd4..e5407053ad6 100644 --- a/test/integration/render-tests/circle-translate/default/style.json +++ b/test/integration/render-tests/circle-translate/default/style.json @@ -2,40 +2,52 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-radius": 5, - "circle-color": "#000" + "circle-radius": 10 } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-translate/function/expected.png b/test/integration/render-tests/circle-translate/function/expected.png index 1dfb9254f83..a49dbf15bdd 100644 Binary files a/test/integration/render-tests/circle-translate/function/expected.png and b/test/integration/render-tests/circle-translate/function/expected.png differ diff --git a/test/integration/render-tests/circle-translate/function/style.json b/test/integration/render-tests/circle-translate/function/style.json index ef04b24070b..9b24ac09a91 100644 --- a/test/integration/render-tests/circle-translate/function/style.json +++ b/test/integration/render-tests/circle-translate/function/style.json @@ -2,52 +2,64 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-radius": 5, - "circle-color": "#000", + "circle-radius": 10, "circle-translate": { "stops": [ [ - 16, + 0, [ - 15, - 15 + 10, + 5 ] ], [ - 17, + 1, [ - 20, + 15, 20 ] ] @@ -56,4 +68,4 @@ } } ] -} \ No newline at end of file +} diff --git a/test/integration/render-tests/circle-translate/literal/expected.png b/test/integration/render-tests/circle-translate/literal/expected.png index e58ef3690fe..4b2fefa36e2 100644 Binary files a/test/integration/render-tests/circle-translate/literal/expected.png and b/test/integration/render-tests/circle-translate/literal/expected.png differ diff --git a/test/integration/render-tests/circle-translate/literal/style.json b/test/integration/render-tests/circle-translate/literal/style.json index 46ff12b6a35..a4fb742a2a3 100644 --- a/test/integration/render-tests/circle-translate/literal/style.json +++ b/test/integration/render-tests/circle-translate/literal/style.json @@ -2,39 +2,51 @@ "version": 8, "metadata": { "test": { - "height": 256 + "width": 64, + "height": 64 } }, - "center": [ - 13.418056, - 52.499167 - ], - "zoom": 14, "sources": { - "mapbox": { - "type": "vector", - "maxzoom": 14, - "tiles": [ - "local://tiles/{z}-{x}-{y}.mvt" - ] + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + -10, + 0 + ] + } + }, + { + "type": "Feature", + "properties": { + }, + "geometry": { + "type": "Point", + "coordinates": [ + 10, + 0 + ] + } + } + ] + } } }, "layers": [ { - "id": "background", - "type": "background", - "paint": { - "background-color": "white" - } - }, - { - "id": "poi_label", + "id": "circle", "type": "circle", - "source": "mapbox", - "source-layer": "poi_label", + "source": "geojson", "paint": { - "circle-radius": 5, - "circle-color": "#000", + "circle-radius": 10, "circle-translate": [ 5, 5 @@ -42,4 +54,4 @@ } } ] -} \ No newline at end of file +}