diff --git a/test/integration/geojson/anchors.json b/test/integration/geojson/anchors.json new file mode 100644 index 00000000000..8a8840cb78f --- /dev/null +++ b/test/integration/geojson/anchors.json @@ -0,0 +1,85 @@ +{ + "type": "FeatureCollection", + "features": [{ + "type": "Feature", + "properties": { + "anchor": "center" + }, + "geometry": { + "type": "Point", + "coordinates": [ 0, 0 ] + } + }, { + "type": "Feature", + "properties": { + "anchor": "left" + }, + "geometry": { + "type": "Point", + "coordinates": [ 30, 0 ] + } + }, { + "type": "Feature", + "properties": { + "anchor": "top-left" + }, + "geometry": { + "type": "Point", + "coordinates": [ 20, -15 ] + } + }, { + "type": "Feature", + "properties": { + "anchor": "top" + }, + "geometry": { + "type": "Point", + "coordinates": [ 0, -25 ] + } + }, { + "type": "Feature", + "properties": { + "anchor": "top-right" + }, + "geometry": { + "type": "Point", + "coordinates": [ -20, -15 ] + } + }, { + "type": "Feature", + "properties": { + "anchor": "right" + }, + "geometry": { + "type": "Point", + "coordinates": [ -30, 0 ] + } + }, { + "type": "Feature", + "properties": { + "anchor": "bottom-left" + }, + "geometry": { + "type": "Point", + "coordinates": [ 20, 15 ] + } + }, { + "type": "Feature", + "properties": { + "anchor": "bottom" + }, + "geometry": { + "type": "Point", + "coordinates": [ 0, 25 ] + } + }, { + "type": "Feature", + "properties": { + "anchor": "bottom-right" + }, + "geometry": { + "type": "Point", + "coordinates": [ -20, 15 ] + } + }] +} \ No newline at end of file diff --git a/test/integration/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/style.json b/test/integration/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/style.json index 4820d207ee6..087a99dd604 100644 --- a/test/integration/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/style.json +++ b/test/integration/render-tests/icon-text-fit/both-text-anchor-1x-image-2x-screen/style.json @@ -10,46 +10,7 @@ "sources": { "geojson": { "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "properties": { "anchor": "center" }, - "geometry": { "type": "Point", "coordinates": [ 0, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "left" }, - "geometry": { "type": "Point", "coordinates": [ 30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top" }, - "geometry": { "type": "Point", "coordinates": [ 0, -25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "right" }, - "geometry": { "type": "Point", "coordinates": [ -30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, 15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom" }, - "geometry": { "type": "Point", "coordinates": [ 0, 25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, 15 ] } - }] - } + "data": "local://geojson/anchors.json" } }, "sprite": "local://sprites/icon-text-fit-1x", diff --git a/test/integration/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/style.json b/test/integration/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/style.json index 27f314f387a..d21af0963b4 100644 --- a/test/integration/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/style.json +++ b/test/integration/render-tests/icon-text-fit/both-text-anchor-2x-image-1x-screen/style.json @@ -9,46 +9,7 @@ "sources": { "geojson": { "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "properties": { "anchor": "center" }, - "geometry": { "type": "Point", "coordinates": [ 0, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "left" }, - "geometry": { "type": "Point", "coordinates": [ 30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top" }, - "geometry": { "type": "Point", "coordinates": [ 0, -25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "right" }, - "geometry": { "type": "Point", "coordinates": [ -30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, 15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom" }, - "geometry": { "type": "Point", "coordinates": [ 0, 25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, 15 ] } - }] - } + "data": "local://geojson/anchors.json" } }, "sprite": "local://sprites/icon-text-fit-2x", diff --git a/test/integration/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/style.json b/test/integration/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/style.json index 67e6d86be2b..1e75952eb13 100644 --- a/test/integration/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/style.json +++ b/test/integration/render-tests/icon-text-fit/both-text-anchor-2x-image-2x-screen/style.json @@ -11,46 +11,7 @@ "sources": { "geojson": { "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "properties": { "anchor": "center" }, - "geometry": { "type": "Point", "coordinates": [ 0, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "left" }, - "geometry": { "type": "Point", "coordinates": [ 30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top" }, - "geometry": { "type": "Point", "coordinates": [ 0, -25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "right" }, - "geometry": { "type": "Point", "coordinates": [ -30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, 15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom" }, - "geometry": { "type": "Point", "coordinates": [ 0, 25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, 15 ] } - }] - } + "data": "local://geojson/anchors.json" } }, "sprite": "local://sprites/icon-text-fit", diff --git a/test/integration/render-tests/icon-text-fit/both-text-anchor-icon-anchor/style.json b/test/integration/render-tests/icon-text-fit/both-text-anchor-icon-anchor/style.json index 6fd3cc75f2d..354b691aa72 100644 --- a/test/integration/render-tests/icon-text-fit/both-text-anchor-icon-anchor/style.json +++ b/test/integration/render-tests/icon-text-fit/both-text-anchor-icon-anchor/style.json @@ -9,46 +9,7 @@ "sources": { "geojson": { "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "properties": { "anchor": "center" }, - "geometry": { "type": "Point", "coordinates": [ 0, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "left" }, - "geometry": { "type": "Point", "coordinates": [ 30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top" }, - "geometry": { "type": "Point", "coordinates": [ 0, -25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "right" }, - "geometry": { "type": "Point", "coordinates": [ -30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, 15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom" }, - "geometry": { "type": "Point", "coordinates": [ 0, 25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, 15 ] } - }] - } + "data": "local://geojson/anchors.json" } }, "sprite": "local://sprites/icon-text-fit", diff --git a/test/integration/render-tests/icon-text-fit/both-text-anchor-icon-offset/style.json b/test/integration/render-tests/icon-text-fit/both-text-anchor-icon-offset/style.json index ea225dd5051..9218b731040 100644 --- a/test/integration/render-tests/icon-text-fit/both-text-anchor-icon-offset/style.json +++ b/test/integration/render-tests/icon-text-fit/both-text-anchor-icon-offset/style.json @@ -9,46 +9,7 @@ "sources": { "geojson": { "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "properties": { "anchor": "center" }, - "geometry": { "type": "Point", "coordinates": [ 0, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "left" }, - "geometry": { "type": "Point", "coordinates": [ 30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top" }, - "geometry": { "type": "Point", "coordinates": [ 0, -25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "right" }, - "geometry": { "type": "Point", "coordinates": [ -30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, 15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom" }, - "geometry": { "type": "Point", "coordinates": [ 0, 25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, 15 ] } - }] - } + "data": "local://geojson/anchors.json" } }, "sprite": "local://sprites/icon-text-fit", diff --git a/test/integration/render-tests/icon-text-fit/both-text-anchor-padding/style.json b/test/integration/render-tests/icon-text-fit/both-text-anchor-padding/style.json index 08a5158bf79..3be058e38f8 100644 --- a/test/integration/render-tests/icon-text-fit/both-text-anchor-padding/style.json +++ b/test/integration/render-tests/icon-text-fit/both-text-anchor-padding/style.json @@ -9,46 +9,7 @@ "sources": { "geojson": { "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "properties": { "anchor": "center" }, - "geometry": { "type": "Point", "coordinates": [ 0, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "left" }, - "geometry": { "type": "Point", "coordinates": [ 30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top" }, - "geometry": { "type": "Point", "coordinates": [ 0, -25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "right" }, - "geometry": { "type": "Point", "coordinates": [ -30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, 15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom" }, - "geometry": { "type": "Point", "coordinates": [ 0, 25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, 15 ] } - }] - } + "data": "local://geojson/anchors.json" } }, "sprite": "local://sprites/icon-text-fit", diff --git a/test/integration/render-tests/icon-text-fit/both-text-anchor/style.json b/test/integration/render-tests/icon-text-fit/both-text-anchor/style.json index d2dce60a352..b3a3e0b7772 100644 --- a/test/integration/render-tests/icon-text-fit/both-text-anchor/style.json +++ b/test/integration/render-tests/icon-text-fit/both-text-anchor/style.json @@ -9,46 +9,7 @@ "sources": { "geojson": { "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "properties": { "anchor": "center" }, - "geometry": { "type": "Point", "coordinates": [ 0, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "left" }, - "geometry": { "type": "Point", "coordinates": [ 30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top" }, - "geometry": { "type": "Point", "coordinates": [ 0, -25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "right" }, - "geometry": { "type": "Point", "coordinates": [ -30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, 15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom" }, - "geometry": { "type": "Point", "coordinates": [ 0, 25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, 15 ] } - }] - } + "data": "local://geojson/anchors.json" } }, "sprite": "local://sprites/icon-text-fit", diff --git a/test/integration/render-tests/icon-text-fit/height-text-anchor-padding/style.json b/test/integration/render-tests/icon-text-fit/height-text-anchor-padding/style.json index 1113f3d98c4..253b546ff42 100644 --- a/test/integration/render-tests/icon-text-fit/height-text-anchor-padding/style.json +++ b/test/integration/render-tests/icon-text-fit/height-text-anchor-padding/style.json @@ -9,46 +9,7 @@ "sources": { "geojson": { "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "properties": { "anchor": "center" }, - "geometry": { "type": "Point", "coordinates": [ 0, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "left" }, - "geometry": { "type": "Point", "coordinates": [ 30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top" }, - "geometry": { "type": "Point", "coordinates": [ 0, -25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "right" }, - "geometry": { "type": "Point", "coordinates": [ -30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, 15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom" }, - "geometry": { "type": "Point", "coordinates": [ 0, 25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, 15 ] } - }] - } + "data": "local://geojson/anchors.json" } }, "sprite": "local://sprites/icon-text-fit", diff --git a/test/integration/render-tests/icon-text-fit/height-text-anchor/style.json b/test/integration/render-tests/icon-text-fit/height-text-anchor/style.json index f0e56ed812d..582d02aab07 100644 --- a/test/integration/render-tests/icon-text-fit/height-text-anchor/style.json +++ b/test/integration/render-tests/icon-text-fit/height-text-anchor/style.json @@ -9,46 +9,7 @@ "sources": { "geojson": { "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "properties": { "anchor": "center" }, - "geometry": { "type": "Point", "coordinates": [ 0, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "left" }, - "geometry": { "type": "Point", "coordinates": [ 30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top" }, - "geometry": { "type": "Point", "coordinates": [ 0, -25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "right" }, - "geometry": { "type": "Point", "coordinates": [ -30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, 15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom" }, - "geometry": { "type": "Point", "coordinates": [ 0, 25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, 15 ] } - }] - } + "data": "local://geojson/anchors.json" } }, "sprite": "local://sprites/icon-text-fit", diff --git a/test/integration/render-tests/icon-text-fit/width-text-anchor-padding/style.json b/test/integration/render-tests/icon-text-fit/width-text-anchor-padding/style.json index 23390c7676a..0bfc7214cdb 100644 --- a/test/integration/render-tests/icon-text-fit/width-text-anchor-padding/style.json +++ b/test/integration/render-tests/icon-text-fit/width-text-anchor-padding/style.json @@ -9,46 +9,7 @@ "sources": { "geojson": { "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "properties": { "anchor": "center" }, - "geometry": { "type": "Point", "coordinates": [ 0, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "left" }, - "geometry": { "type": "Point", "coordinates": [ 30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top" }, - "geometry": { "type": "Point", "coordinates": [ 0, -25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "right" }, - "geometry": { "type": "Point", "coordinates": [ -30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, 15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom" }, - "geometry": { "type": "Point", "coordinates": [ 0, 25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, 15 ] } - }] - } + "data": "local://geojson/anchors.json" } }, "sprite": "local://sprites/icon-text-fit", diff --git a/test/integration/render-tests/icon-text-fit/width-text-anchor/style.json b/test/integration/render-tests/icon-text-fit/width-text-anchor/style.json index 5fb7f388955..783b19cdd0d 100644 --- a/test/integration/render-tests/icon-text-fit/width-text-anchor/style.json +++ b/test/integration/render-tests/icon-text-fit/width-text-anchor/style.json @@ -9,46 +9,7 @@ "sources": { "geojson": { "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [{ - "type": "Feature", - "properties": { "anchor": "center" }, - "geometry": { "type": "Point", "coordinates": [ 0, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "left" }, - "geometry": { "type": "Point", "coordinates": [ 30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top" }, - "geometry": { "type": "Point", "coordinates": [ 0, -25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "top-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, -15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "right" }, - "geometry": { "type": "Point", "coordinates": [ -30, 0 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-left" }, - "geometry": { "type": "Point", "coordinates": [ 20, 15 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom" }, - "geometry": { "type": "Point", "coordinates": [ 0, 25 ] } - }, { - "type": "Feature", - "properties": { "anchor": "bottom-right" }, - "geometry": { "type": "Point", "coordinates": [ -20, 15 ] } - }] - } + "data": "local://geojson/anchors.json" } }, "sprite": "local://sprites/icon-text-fit",