diff --git a/render-tests/extrude-fill-color/default/expected.png b/render-tests/extrude-fill-color/default/expected.png deleted file mode 100644 index 47375506..00000000 Binary files a/render-tests/extrude-fill-color/default/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-color/function/expected.png b/render-tests/extrude-fill-color/function/expected.png deleted file mode 100644 index ac1592ed..00000000 Binary files a/render-tests/extrude-fill-color/function/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-color/literal/expected.png b/render-tests/extrude-fill-color/literal/expected.png deleted file mode 100644 index 4081b1b4..00000000 Binary files a/render-tests/extrude-fill-color/literal/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-color/no-alpha-no-multiply/expected.png b/render-tests/extrude-fill-color/no-alpha-no-multiply/expected.png deleted file mode 100644 index a0e7e24c..00000000 Binary files a/render-tests/extrude-fill-color/no-alpha-no-multiply/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-color/property-function/expected.png b/render-tests/extrude-fill-color/property-function/expected.png deleted file mode 100644 index 249413f2..00000000 Binary files a/render-tests/extrude-fill-color/property-function/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-color/zoom-and-property-function/expected.png b/render-tests/extrude-fill-color/zoom-and-property-function/expected.png deleted file mode 100644 index 31411a6a..00000000 Binary files a/render-tests/extrude-fill-color/zoom-and-property-function/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-opacity/default/expected.png b/render-tests/extrude-fill-opacity/default/expected.png deleted file mode 100644 index 7ba16e39..00000000 Binary files a/render-tests/extrude-fill-opacity/default/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-opacity/function/expected.png b/render-tests/extrude-fill-opacity/function/expected.png deleted file mode 100644 index 1da5639f..00000000 Binary files a/render-tests/extrude-fill-opacity/function/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-opacity/literal/expected.png b/render-tests/extrude-fill-opacity/literal/expected.png deleted file mode 100644 index d7b7b949..00000000 Binary files a/render-tests/extrude-fill-opacity/literal/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-pattern/@2x/expected.png b/render-tests/extrude-fill-pattern/@2x/expected.png deleted file mode 100644 index ccc73eaf..00000000 Binary files a/render-tests/extrude-fill-pattern/@2x/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-pattern/function-2/expected.png b/render-tests/extrude-fill-pattern/function-2/expected.png deleted file mode 100644 index aa73498a..00000000 Binary files a/render-tests/extrude-fill-pattern/function-2/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-pattern/function/expected.png b/render-tests/extrude-fill-pattern/function/expected.png deleted file mode 100644 index 2cc43875..00000000 Binary files a/render-tests/extrude-fill-pattern/function/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-pattern/literal/expected.png b/render-tests/extrude-fill-pattern/literal/expected.png deleted file mode 100644 index 879d1cd8..00000000 Binary files a/render-tests/extrude-fill-pattern/literal/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-pattern/opacity/expected.png b/render-tests/extrude-fill-pattern/opacity/expected.png deleted file mode 100644 index 073101f0..00000000 Binary files a/render-tests/extrude-fill-pattern/opacity/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-translate-anchor/map/expected.png b/render-tests/extrude-fill-translate-anchor/map/expected.png deleted file mode 100644 index d5cb330f..00000000 Binary files a/render-tests/extrude-fill-translate-anchor/map/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-translate-anchor/map/style.json b/render-tests/extrude-fill-translate-anchor/map/style.json deleted file mode 100644 index fa95181d..00000000 --- a/render-tests/extrude-fill-translate-anchor/map/style.json +++ /dev/null @@ -1,92 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "height": 256, - "ignored": { - "native": "https://github.com/mapbox/mapbox-gl-native/issues/4860" - } - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "FeatureCollection", - "features": [ - { - "type": "Feature", - "properties": { - "property": 10 - }, - "geometry": { - "type": "Polygon", - "coordinates": [ - [ [ -0.0003, -0.00047 ], - [ -0.0003, -0.00017 ], - [ 0, -0.00017 ], - [ 0, -0.00047 ], - [ -0.0003, -0.00047 ] ] - ] - } - }, - { - "type": "Feature", - "properties": { - "property": 20 - }, - "geometry": { - "type": "Polygon", - "coordinates": [ - [ [ -0.00015, -0.00015 ], - [ -0.00015, 0.00015 ], - [ 0.00015, 0.00015 ], - [ 0.00015, -0.00015 ], - [ -0.00015, -0.00015 ] ] - ] - } - }, - { - "type": "Feature", - "properties": { - "property": 30 - }, - "geometry": { - "type": "Polygon", - "coordinates": [ - [ [ 0, 0.00017 ], - [ 0, 0.00047 ], - [ 0.0003, 0.00047 ], - [ 0.0003, 0.00017 ], - [ 0, 0.00017 ] ] - ] - } - } - ] - } - } - }, - "pitch": 60, - "bearing": 90, - "zoom": 18, - "layers": [ - { - "id": "fill", - "type": "fill", - "source": "geojson", - "paint": { - "fill-color": "rgba(0,255,255,1)" - } - }, - { - "id": "extrusion", - "type": "fill", - "source": "geojson", - "paint": { - "fill-extrude-height": 10, - "fill-translate": [-30, -30], - "fill-translate-anchor": "map" - } - } - ] -} diff --git a/render-tests/extrude-fill-translate-anchor/viewport/expected.png b/render-tests/extrude-fill-translate-anchor/viewport/expected.png deleted file mode 100644 index 061b184f..00000000 Binary files a/render-tests/extrude-fill-translate-anchor/viewport/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-translate/default/expected.png b/render-tests/extrude-fill-translate/default/expected.png deleted file mode 100644 index d1286235..00000000 Binary files a/render-tests/extrude-fill-translate/default/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-translate/function/expected.png b/render-tests/extrude-fill-translate/function/expected.png deleted file mode 100644 index ce8b3a5e..00000000 Binary files a/render-tests/extrude-fill-translate/function/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-translate/literal-opacity/expected.png b/render-tests/extrude-fill-translate/literal-opacity/expected.png deleted file mode 100644 index c35efc90..00000000 Binary files a/render-tests/extrude-fill-translate/literal-opacity/expected.png and /dev/null differ diff --git a/render-tests/extrude-fill-translate/literal/expected.png b/render-tests/extrude-fill-translate/literal/expected.png deleted file mode 100644 index 9fe451b6..00000000 Binary files a/render-tests/extrude-fill-translate/literal/expected.png and /dev/null differ diff --git a/render-tests/fill-extrude-base/default/expected.png b/render-tests/fill-extrude-base/default/expected.png deleted file mode 100644 index 3ec42e3d..00000000 Binary files a/render-tests/fill-extrude-base/default/expected.png and /dev/null differ diff --git a/render-tests/fill-extrude-base/function/expected.png b/render-tests/fill-extrude-base/function/expected.png deleted file mode 100644 index c143bc78..00000000 Binary files a/render-tests/fill-extrude-base/function/expected.png and /dev/null differ diff --git a/render-tests/fill-extrude-base/literal/expected.png b/render-tests/fill-extrude-base/literal/expected.png deleted file mode 100644 index 1e1ad5d1..00000000 Binary files a/render-tests/fill-extrude-base/literal/expected.png and /dev/null differ diff --git a/render-tests/fill-extrude-base/negative/expected.png b/render-tests/fill-extrude-base/negative/expected.png deleted file mode 100644 index 81fdaaa3..00000000 Binary files a/render-tests/fill-extrude-base/negative/expected.png and /dev/null differ diff --git a/render-tests/fill-extrude-base/property-function/expected.png b/render-tests/fill-extrude-base/property-function/expected.png deleted file mode 100644 index f242d120..00000000 Binary files a/render-tests/fill-extrude-base/property-function/expected.png and /dev/null differ diff --git a/render-tests/fill-extrude-base/zoom-and-property-function/expected.png b/render-tests/fill-extrude-base/zoom-and-property-function/expected.png deleted file mode 100644 index 4a02ee6f..00000000 Binary files a/render-tests/fill-extrude-base/zoom-and-property-function/expected.png and /dev/null differ diff --git a/render-tests/fill-extrude-height/default/expected.png b/render-tests/fill-extrude-height/default/expected.png deleted file mode 100644 index 13b3f344..00000000 Binary files a/render-tests/fill-extrude-height/default/expected.png and /dev/null differ diff --git a/render-tests/fill-extrude-height/negative/expected.png b/render-tests/fill-extrude-height/negative/expected.png deleted file mode 100644 index 2ab04eaf..00000000 Binary files a/render-tests/fill-extrude-height/negative/expected.png and /dev/null differ diff --git a/render-tests/fill-extrude-height/property-function/expected.png b/render-tests/fill-extrude-height/property-function/expected.png deleted file mode 100644 index 8474a9fd..00000000 Binary files a/render-tests/fill-extrude-height/property-function/expected.png and /dev/null differ diff --git a/render-tests/fill-extrude-height/zoom-and-property-function/expected.png b/render-tests/fill-extrude-height/zoom-and-property-function/expected.png deleted file mode 100644 index 31e352ca..00000000 Binary files a/render-tests/fill-extrude-height/zoom-and-property-function/expected.png and /dev/null differ diff --git a/render-tests/fill-extrusion-base/default/expected.png b/render-tests/fill-extrusion-base/default/expected.png new file mode 100644 index 00000000..8570f5b1 Binary files /dev/null and b/render-tests/fill-extrusion-base/default/expected.png differ diff --git a/render-tests/fill-extrude-base/default/style.json b/render-tests/fill-extrusion-base/default/style.json similarity index 98% rename from render-tests/fill-extrude-base/default/style.json rename to render-tests/fill-extrusion-base/default/style.json index 28d0e81b..3d99795e 100644 --- a/render-tests/fill-extrude-base/default/style.json +++ b/render-tests/fill-extrusion-base/default/style.json @@ -152,10 +152,10 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 30 + "fill-extrusion-height": 30 } } ] diff --git a/render-tests/fill-extrusion-base/function/expected.png b/render-tests/fill-extrusion-base/function/expected.png new file mode 100644 index 00000000..058c72d9 Binary files /dev/null and b/render-tests/fill-extrusion-base/function/expected.png differ diff --git a/render-tests/fill-extrude-base/function/style.json b/render-tests/fill-extrusion-base/function/style.json similarity index 97% rename from render-tests/fill-extrude-base/function/style.json rename to render-tests/fill-extrusion-base/function/style.json index 44edd32a..3c38a87f 100644 --- a/render-tests/fill-extrude-base/function/style.json +++ b/render-tests/fill-extrusion-base/function/style.json @@ -152,11 +152,11 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 40, - "fill-extrude-base": { + "fill-extrusion-height": 40, + "fill-extrusion-base": { "stops": [[17,0],[19,30]], "type": "exponential" } diff --git a/render-tests/fill-extrusion-base/literal/expected.png b/render-tests/fill-extrusion-base/literal/expected.png new file mode 100644 index 00000000..d1417418 Binary files /dev/null and b/render-tests/fill-extrusion-base/literal/expected.png differ diff --git a/render-tests/fill-extrude-base/literal/style.json b/render-tests/fill-extrusion-base/literal/style.json similarity index 97% rename from render-tests/fill-extrude-base/literal/style.json rename to render-tests/fill-extrusion-base/literal/style.json index 099e76bb..ea58666b 100644 --- a/render-tests/fill-extrude-base/literal/style.json +++ b/render-tests/fill-extrusion-base/literal/style.json @@ -152,11 +152,11 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 40, - "fill-extrude-base": 10 + "fill-extrusion-height": 40, + "fill-extrusion-base": 10 } } ] diff --git a/render-tests/fill-extrusion-base/negative/expected.png b/render-tests/fill-extrusion-base/negative/expected.png new file mode 100644 index 00000000..ea8b8299 Binary files /dev/null and b/render-tests/fill-extrusion-base/negative/expected.png differ diff --git a/render-tests/fill-extrude-base/negative/style.json b/render-tests/fill-extrusion-base/negative/style.json similarity index 97% rename from render-tests/fill-extrude-base/negative/style.json rename to render-tests/fill-extrusion-base/negative/style.json index 636b7979..228273df 100644 --- a/render-tests/fill-extrude-base/negative/style.json +++ b/render-tests/fill-extrusion-base/negative/style.json @@ -152,11 +152,11 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 40, - "fill-extrude-base": { + "fill-extrusion-height": 40, + "fill-extrusion-base": { "type": "identity", "property": "property" } diff --git a/render-tests/fill-extrusion-base/property-function/expected.png b/render-tests/fill-extrusion-base/property-function/expected.png new file mode 100644 index 00000000..164fc188 Binary files /dev/null and b/render-tests/fill-extrusion-base/property-function/expected.png differ diff --git a/render-tests/fill-extrude-base/property-function/style.json b/render-tests/fill-extrusion-base/property-function/style.json similarity index 97% rename from render-tests/fill-extrude-base/property-function/style.json rename to render-tests/fill-extrusion-base/property-function/style.json index 8ae1fb68..9df98b76 100644 --- a/render-tests/fill-extrude-base/property-function/style.json +++ b/render-tests/fill-extrusion-base/property-function/style.json @@ -152,11 +152,11 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 40, - "fill-extrude-base": { + "fill-extrusion-height": 40, + "fill-extrusion-base": { "stops": [[0,0],[100,100]], "type": "exponential", "property": "property" diff --git a/render-tests/fill-extrusion-base/zoom-and-property-function/expected.png b/render-tests/fill-extrusion-base/zoom-and-property-function/expected.png new file mode 100644 index 00000000..0339ee60 Binary files /dev/null and b/render-tests/fill-extrusion-base/zoom-and-property-function/expected.png differ diff --git a/render-tests/fill-extrude-base/zoom-and-property-function/style.json b/render-tests/fill-extrusion-base/zoom-and-property-function/style.json similarity index 97% rename from render-tests/fill-extrude-base/zoom-and-property-function/style.json rename to render-tests/fill-extrusion-base/zoom-and-property-function/style.json index e5ec1532..6a6a9277 100644 --- a/render-tests/fill-extrude-base/zoom-and-property-function/style.json +++ b/render-tests/fill-extrusion-base/zoom-and-property-function/style.json @@ -152,11 +152,11 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 100, - "fill-extrude-base": { + "fill-extrusion-height": 100, + "fill-extrusion-base": { "stops": [ [{ "zoom": 17, diff --git a/render-tests/fill-extrusion-color/default/expected.png b/render-tests/fill-extrusion-color/default/expected.png new file mode 100644 index 00000000..4cfadacb Binary files /dev/null and b/render-tests/fill-extrusion-color/default/expected.png differ diff --git a/render-tests/extrude-fill-color/default/style.json b/render-tests/fill-extrusion-color/default/style.json similarity index 97% rename from render-tests/extrude-fill-color/default/style.json rename to render-tests/fill-extrusion-color/default/style.json index 1bde6a08..c7b66fdc 100644 --- a/render-tests/extrude-fill-color/default/style.json +++ b/render-tests/fill-extrusion-color/default/style.json @@ -122,10 +122,10 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10 + "fill-extrusion-height": 10 } } ] diff --git a/render-tests/fill-extrusion-color/function/expected.png b/render-tests/fill-extrusion-color/function/expected.png new file mode 100644 index 00000000..891fef5a Binary files /dev/null and b/render-tests/fill-extrusion-color/function/expected.png differ diff --git a/render-tests/extrude-fill-color/function/style.json b/render-tests/fill-extrusion-color/function/style.json similarity index 96% rename from render-tests/extrude-fill-color/function/style.json rename to render-tests/fill-extrusion-color/function/style.json index 995ae0b4..3389ccb1 100644 --- a/render-tests/extrude-fill-color/function/style.json +++ b/render-tests/fill-extrusion-color/function/style.json @@ -122,11 +122,11 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10, - "fill-color": { + "fill-extrusion-height": 10, + "fill-extrusion-color": { "stops": [ [17, "blue"], [19, "red"] diff --git a/render-tests/fill-extrusion-color/literal/expected.png b/render-tests/fill-extrusion-color/literal/expected.png new file mode 100644 index 00000000..9f85ba77 Binary files /dev/null and b/render-tests/fill-extrusion-color/literal/expected.png differ diff --git a/render-tests/extrude-fill-color/literal/style.json b/render-tests/fill-extrusion-color/literal/style.json similarity index 96% rename from render-tests/extrude-fill-color/literal/style.json rename to render-tests/fill-extrusion-color/literal/style.json index 2b462eb4..3d347976 100644 --- a/render-tests/extrude-fill-color/literal/style.json +++ b/render-tests/fill-extrusion-color/literal/style.json @@ -122,11 +122,11 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10, - "fill-color": "blue" + "fill-extrusion-height": 10, + "fill-extrusion-color": "blue" } } ] diff --git a/render-tests/fill-extrusion-color/no-alpha-no-multiply/expected.png b/render-tests/fill-extrusion-color/no-alpha-no-multiply/expected.png new file mode 100644 index 00000000..e1662d5d Binary files /dev/null and b/render-tests/fill-extrusion-color/no-alpha-no-multiply/expected.png differ diff --git a/render-tests/extrude-fill-color/no-alpha-no-multiply/style.json b/render-tests/fill-extrusion-color/no-alpha-no-multiply/style.json similarity index 95% rename from render-tests/extrude-fill-color/no-alpha-no-multiply/style.json rename to render-tests/fill-extrusion-color/no-alpha-no-multiply/style.json index 4c6b4145..9b1e31d3 100644 --- a/render-tests/extrude-fill-color/no-alpha-no-multiply/style.json +++ b/render-tests/fill-extrusion-color/no-alpha-no-multiply/style.json @@ -122,11 +122,11 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10, - "fill-color": "rgba(100,100,100,0.2)" + "fill-extrusion-height": 10, + "fill-extrusion-color": "rgba(100,100,100,0.2)" } } ] diff --git a/render-tests/fill-extrusion-color/property-function/expected.png b/render-tests/fill-extrusion-color/property-function/expected.png new file mode 100644 index 00000000..9976c294 Binary files /dev/null and b/render-tests/fill-extrusion-color/property-function/expected.png differ diff --git a/render-tests/extrude-fill-color/property-function/style.json b/render-tests/fill-extrusion-color/property-function/style.json similarity index 95% rename from render-tests/extrude-fill-color/property-function/style.json rename to render-tests/fill-extrusion-color/property-function/style.json index 2344729c..ddf6e18d 100644 --- a/render-tests/extrude-fill-color/property-function/style.json +++ b/render-tests/fill-extrusion-color/property-function/style.json @@ -71,11 +71,11 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10, - "fill-color": { + "fill-extrusion-height": 10, + "fill-extrusion-color": { "property": "property", "stops": [ [ diff --git a/render-tests/fill-extrusion-color/zoom-and-property-function/expected.png b/render-tests/fill-extrusion-color/zoom-and-property-function/expected.png new file mode 100644 index 00000000..5f28a5cd Binary files /dev/null and b/render-tests/fill-extrusion-color/zoom-and-property-function/expected.png differ diff --git a/render-tests/extrude-fill-color/zoom-and-property-function/style.json b/render-tests/fill-extrusion-color/zoom-and-property-function/style.json similarity index 95% rename from render-tests/extrude-fill-color/zoom-and-property-function/style.json rename to render-tests/fill-extrusion-color/zoom-and-property-function/style.json index 23e648a3..5309c3d4 100644 --- a/render-tests/extrude-fill-color/zoom-and-property-function/style.json +++ b/render-tests/fill-extrusion-color/zoom-and-property-function/style.json @@ -71,11 +71,11 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10, - "fill-color": { + "fill-extrusion-height": 10, + "fill-extrusion-color": { "property": "property", "stops": [ [{ diff --git a/render-tests/fill-extrusion-height/default/expected.png b/render-tests/fill-extrusion-height/default/expected.png new file mode 100644 index 00000000..088d733c Binary files /dev/null and b/render-tests/fill-extrusion-height/default/expected.png differ diff --git a/render-tests/fill-extrude-height/default/style.json b/render-tests/fill-extrusion-height/default/style.json similarity index 98% rename from render-tests/fill-extrude-height/default/style.json rename to render-tests/fill-extrusion-height/default/style.json index 56078f3a..2da1600d 100644 --- a/render-tests/fill-extrude-height/default/style.json +++ b/render-tests/fill-extrusion-height/default/style.json @@ -122,7 +122,7 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": {} } diff --git a/render-tests/fill-extrude-height/function/expected.png b/render-tests/fill-extrusion-height/function/expected.png similarity index 52% rename from render-tests/fill-extrude-height/function/expected.png rename to render-tests/fill-extrusion-height/function/expected.png index 77980222..a87b2e50 100644 Binary files a/render-tests/fill-extrude-height/function/expected.png and b/render-tests/fill-extrusion-height/function/expected.png differ diff --git a/render-tests/fill-extrude-height/function/style.json b/render-tests/fill-extrusion-height/function/style.json similarity index 97% rename from render-tests/fill-extrude-height/function/style.json rename to render-tests/fill-extrusion-height/function/style.json index 156b98a2..b63d6ffe 100644 --- a/render-tests/fill-extrude-height/function/style.json +++ b/render-tests/fill-extrusion-height/function/style.json @@ -122,10 +122,10 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": { + "fill-extrusion-height": { "stops": [ [17, 10], [19, 100] diff --git a/render-tests/fill-extrusion-height/negative/expected.png b/render-tests/fill-extrusion-height/negative/expected.png new file mode 100644 index 00000000..c69b771d Binary files /dev/null and b/render-tests/fill-extrusion-height/negative/expected.png differ diff --git a/render-tests/fill-extrude-height/negative/style.json b/render-tests/fill-extrusion-height/negative/style.json similarity index 97% rename from render-tests/fill-extrude-height/negative/style.json rename to render-tests/fill-extrusion-height/negative/style.json index 00f4033c..b9b35ba4 100644 --- a/render-tests/fill-extrude-height/negative/style.json +++ b/render-tests/fill-extrusion-height/negative/style.json @@ -122,10 +122,10 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": { + "fill-extrusion-height": { "type": "identity", "property": "property" } diff --git a/render-tests/fill-extrusion-height/property-function/expected.png b/render-tests/fill-extrusion-height/property-function/expected.png new file mode 100644 index 00000000..73f6d044 Binary files /dev/null and b/render-tests/fill-extrusion-height/property-function/expected.png differ diff --git a/render-tests/fill-extrude-height/property-function/style.json b/render-tests/fill-extrusion-height/property-function/style.json similarity index 97% rename from render-tests/fill-extrude-height/property-function/style.json rename to render-tests/fill-extrusion-height/property-function/style.json index 97e50dc5..47d0d40a 100644 --- a/render-tests/fill-extrude-height/property-function/style.json +++ b/render-tests/fill-extrusion-height/property-function/style.json @@ -122,10 +122,10 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": { + "fill-extrusion-height": { "stops": [ [0, 0], [100, 100] diff --git a/render-tests/fill-extrusion-height/zoom-and-property-function/expected.png b/render-tests/fill-extrusion-height/zoom-and-property-function/expected.png new file mode 100644 index 00000000..19925915 Binary files /dev/null and b/render-tests/fill-extrusion-height/zoom-and-property-function/expected.png differ diff --git a/render-tests/fill-extrude-height/zoom-and-property-function/style.json b/render-tests/fill-extrusion-height/zoom-and-property-function/style.json similarity index 97% rename from render-tests/fill-extrude-height/zoom-and-property-function/style.json rename to render-tests/fill-extrusion-height/zoom-and-property-function/style.json index bf7cdc3b..2d59f695 100644 --- a/render-tests/fill-extrude-height/zoom-and-property-function/style.json +++ b/render-tests/fill-extrusion-height/zoom-and-property-function/style.json @@ -122,10 +122,10 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": { + "fill-extrusion-height": { "stops": [ [{ "zoom": 17.99, diff --git a/render-tests/fill-extrusion-opacity/default/expected.png b/render-tests/fill-extrusion-opacity/default/expected.png new file mode 100644 index 00000000..900187fb Binary files /dev/null and b/render-tests/fill-extrusion-opacity/default/expected.png differ diff --git a/render-tests/extrude-fill-opacity/default/style.json b/render-tests/fill-extrusion-opacity/default/style.json similarity index 97% rename from render-tests/extrude-fill-opacity/default/style.json rename to render-tests/fill-extrusion-opacity/default/style.json index 14e76eaa..f3d6e604 100644 --- a/render-tests/extrude-fill-opacity/default/style.json +++ b/render-tests/fill-extrusion-opacity/default/style.json @@ -102,10 +102,10 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10 + "fill-extrusion-height": 10 } } ] diff --git a/render-tests/fill-extrusion-opacity/function/expected.png b/render-tests/fill-extrusion-opacity/function/expected.png new file mode 100644 index 00000000..5bf4301f Binary files /dev/null and b/render-tests/fill-extrusion-opacity/function/expected.png differ diff --git a/render-tests/extrude-fill-opacity/function/style.json b/render-tests/fill-extrusion-opacity/function/style.json similarity index 96% rename from render-tests/extrude-fill-opacity/function/style.json rename to render-tests/fill-extrusion-opacity/function/style.json index 97c84c80..6d700022 100644 --- a/render-tests/extrude-fill-opacity/function/style.json +++ b/render-tests/fill-extrusion-opacity/function/style.json @@ -102,11 +102,11 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10, - "fill-opacity": { + "fill-extrusion-height": 10, + "fill-extrusion-opacity": { "stops": [[18.9, 0.1],[19.1, 1]], "type": "exponential" } diff --git a/render-tests/fill-extrusion-opacity/literal/expected.png b/render-tests/fill-extrusion-opacity/literal/expected.png new file mode 100644 index 00000000..0cfd4316 Binary files /dev/null and b/render-tests/fill-extrusion-opacity/literal/expected.png differ diff --git a/render-tests/extrude-fill-opacity/literal/style.json b/render-tests/fill-extrusion-opacity/literal/style.json similarity index 95% rename from render-tests/extrude-fill-opacity/literal/style.json rename to render-tests/fill-extrusion-opacity/literal/style.json index a2ca1f45..b32233bb 100644 --- a/render-tests/extrude-fill-opacity/literal/style.json +++ b/render-tests/fill-extrusion-opacity/literal/style.json @@ -102,11 +102,11 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10, - "fill-opacity": 0.75 + "fill-extrusion-height": 10, + "fill-extrusion-opacity": 0.75 } } ] diff --git a/render-tests/fill-extrusion-pattern/@2x/expected.png b/render-tests/fill-extrusion-pattern/@2x/expected.png new file mode 100644 index 00000000..9a080e68 Binary files /dev/null and b/render-tests/fill-extrusion-pattern/@2x/expected.png differ diff --git a/render-tests/extrude-fill-pattern/@2x/style.json b/render-tests/fill-extrusion-pattern/@2x/style.json similarity index 92% rename from render-tests/extrude-fill-pattern/@2x/style.json rename to render-tests/fill-extrusion-pattern/@2x/style.json index c4aa20c6..5c60a5eb 100644 --- a/render-tests/extrude-fill-pattern/@2x/style.json +++ b/render-tests/fill-extrusion-pattern/@2x/style.json @@ -58,11 +58,11 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-pattern": "generic_icon", - "fill-extrude-height": 10 + "fill-extrusion-pattern": "generic_icon", + "fill-extrusion-height": 10 } } ] diff --git a/render-tests/fill-extrusion-pattern/function-2/expected.png b/render-tests/fill-extrusion-pattern/function-2/expected.png new file mode 100644 index 00000000..d99ec165 Binary files /dev/null and b/render-tests/fill-extrusion-pattern/function-2/expected.png differ diff --git a/render-tests/extrude-fill-pattern/function-2/style.json b/render-tests/fill-extrusion-pattern/function-2/style.json similarity index 93% rename from render-tests/extrude-fill-pattern/function-2/style.json rename to render-tests/fill-extrusion-pattern/function-2/style.json index 7522032d..b4d4aa62 100644 --- a/render-tests/extrude-fill-pattern/function-2/style.json +++ b/render-tests/fill-extrusion-pattern/function-2/style.json @@ -57,14 +57,14 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-pattern": { + "fill-extrusion-pattern": { "stops": [[18, "generic_icon"], [19, "generic_metro"]], "type": "interval" }, - "fill-extrude-height": 10 + "fill-extrusion-height": 10 } } ] diff --git a/render-tests/fill-extrusion-pattern/function/expected.png b/render-tests/fill-extrusion-pattern/function/expected.png new file mode 100644 index 00000000..95887794 Binary files /dev/null and b/render-tests/fill-extrusion-pattern/function/expected.png differ diff --git a/render-tests/extrude-fill-pattern/function/style.json b/render-tests/fill-extrusion-pattern/function/style.json similarity index 93% rename from render-tests/extrude-fill-pattern/function/style.json rename to render-tests/fill-extrusion-pattern/function/style.json index b2fe1d23..2a500f3c 100644 --- a/render-tests/extrude-fill-pattern/function/style.json +++ b/render-tests/fill-extrusion-pattern/function/style.json @@ -57,14 +57,14 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-pattern": { + "fill-extrusion-pattern": { "stops": [[18, "generic_icon"], [19, "generic_metro"]], "type": "interval" }, - "fill-extrude-height": 10 + "fill-extrusion-height": 10 } } ] diff --git a/render-tests/fill-extrusion-pattern/literal/expected.png b/render-tests/fill-extrusion-pattern/literal/expected.png new file mode 100644 index 00000000..33446d2b Binary files /dev/null and b/render-tests/fill-extrusion-pattern/literal/expected.png differ diff --git a/render-tests/extrude-fill-pattern/literal/style.json b/render-tests/fill-extrusion-pattern/literal/style.json similarity index 92% rename from render-tests/extrude-fill-pattern/literal/style.json rename to render-tests/fill-extrusion-pattern/literal/style.json index db488551..06af41f7 100644 --- a/render-tests/extrude-fill-pattern/literal/style.json +++ b/render-tests/fill-extrusion-pattern/literal/style.json @@ -57,11 +57,11 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-pattern": "generic_icon", - "fill-extrude-height": 10 + "fill-extrusion-pattern": "generic_icon", + "fill-extrusion-height": 10 } } ] diff --git a/render-tests/fill-extrusion-pattern/opacity/expected.png b/render-tests/fill-extrusion-pattern/opacity/expected.png new file mode 100644 index 00000000..7adbab0e Binary files /dev/null and b/render-tests/fill-extrusion-pattern/opacity/expected.png differ diff --git a/render-tests/extrude-fill-pattern/opacity/style.json b/render-tests/fill-extrusion-pattern/opacity/style.json similarity index 90% rename from render-tests/extrude-fill-pattern/opacity/style.json rename to render-tests/fill-extrusion-pattern/opacity/style.json index 22428f30..2238890a 100644 --- a/render-tests/extrude-fill-pattern/opacity/style.json +++ b/render-tests/fill-extrusion-pattern/opacity/style.json @@ -57,12 +57,12 @@ "layers": [ { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-pattern": "generic_icon", - "fill-opacity": 0.5, - "fill-extrude-height": 10 + "fill-extrusion-pattern": "generic_icon", + "fill-extrusion-opacity": 0.5, + "fill-extrusion-height": 10 } } ] diff --git a/render-tests/fill-extrusion-translate-anchor/map/expected.png b/render-tests/fill-extrusion-translate-anchor/map/expected.png new file mode 100644 index 00000000..27a23bf1 Binary files /dev/null and b/render-tests/fill-extrusion-translate-anchor/map/expected.png differ diff --git a/render-tests/extrude-fill-translate-anchor/viewport/style.json b/render-tests/fill-extrusion-translate-anchor/map/style.json similarity index 81% rename from render-tests/extrude-fill-translate-anchor/viewport/style.json rename to render-tests/fill-extrusion-translate-anchor/map/style.json index 1ecc28d7..bc06e020 100644 --- a/render-tests/extrude-fill-translate-anchor/viewport/style.json +++ b/render-tests/fill-extrusion-translate-anchor/map/style.json @@ -24,8 +24,8 @@ "coordinates": [ [ [ -0.0003, -0.0004 ], [ -0.0003, -0.0001 ], - [ 0, -0.00017 ], - [ 0, -0.00047 ], + [ 0, -0.0001 ], + [ 0, -0.0004 ], [ -0.0003, -0.0004 ] ] ] } @@ -48,12 +48,12 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10, - "fill-translate": [-30, -30], - "fill-translate-anchor": "viewport" + "fill-extrusion-height": 10, + "fill-extrusion-translate": [-30, -30], + "fill-extrusion-translate-anchor": "map" } } ] diff --git a/render-tests/fill-extrusion-translate-anchor/viewport/expected.png b/render-tests/fill-extrusion-translate-anchor/viewport/expected.png new file mode 100644 index 00000000..9fd925c5 Binary files /dev/null and b/render-tests/fill-extrusion-translate-anchor/viewport/expected.png differ diff --git a/render-tests/fill-extrusion-translate-anchor/viewport/style.json b/render-tests/fill-extrusion-translate-anchor/viewport/style.json new file mode 100644 index 00000000..dc9ed94b --- /dev/null +++ b/render-tests/fill-extrusion-translate-anchor/viewport/style.json @@ -0,0 +1,60 @@ +{ + "version": 8, + "metadata": { + "test": { + "height": 256, + "ignored": { + "native": "https://github.com/mapbox/mapbox-gl-native/issues/4860" + } + } + }, + "sources": { + "geojson": { + "type": "geojson", + "data": { + "type": "FeatureCollection", + "features": [ + { + "type": "Feature", + "properties": { + "property": 10 + }, + "geometry": { + "type": "Polygon", + "coordinates": [ + [ [ -0.0003, -0.0004 ], + [ -0.0003, -0.0001 ], + [ 0, -0.0001 ], + [ 0, -0.0004 ], + [ -0.0003, -0.0004 ] ] + ] + } + } + ] + } + } + }, + "pitch": 60, + "bearing": 90, + "zoom": 18, + "layers": [ + { + "id": "fill", + "type": "fill", + "source": "geojson", + "paint": { + "fill-color": "rgba(0,255,255,1)" + } + }, + { + "id": "extrusion", + "type": "fill-extrusion", + "source": "geojson", + "paint": { + "fill-extrusion-height": 10, + "fill-extrusion-translate": [-30, -30], + "fill-extrusion-translate-anchor": "viewport" + } + } + ] +} diff --git a/render-tests/fill-extrusion-translate/default/expected.png b/render-tests/fill-extrusion-translate/default/expected.png new file mode 100644 index 00000000..53df2188 Binary files /dev/null and b/render-tests/fill-extrusion-translate/default/expected.png differ diff --git a/render-tests/extrude-fill-translate/default/style.json b/render-tests/fill-extrusion-translate/default/style.json similarity index 96% rename from render-tests/extrude-fill-translate/default/style.json rename to render-tests/fill-extrusion-translate/default/style.json index 5eef023a..67b907fc 100644 --- a/render-tests/extrude-fill-translate/default/style.json +++ b/render-tests/fill-extrusion-translate/default/style.json @@ -79,10 +79,10 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10 + "fill-extrusion-height": 10 } } ] diff --git a/render-tests/fill-extrusion-translate/function/expected.png b/render-tests/fill-extrusion-translate/function/expected.png new file mode 100644 index 00000000..385c3823 Binary files /dev/null and b/render-tests/fill-extrusion-translate/function/expected.png differ diff --git a/render-tests/extrude-fill-translate/function/style.json b/render-tests/fill-extrusion-translate/function/style.json similarity index 95% rename from render-tests/extrude-fill-translate/function/style.json rename to render-tests/fill-extrusion-translate/function/style.json index 7f602904..a0368d94 100644 --- a/render-tests/extrude-fill-translate/function/style.json +++ b/render-tests/fill-extrusion-translate/function/style.json @@ -79,11 +79,11 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10, - "fill-translate": { + "fill-extrusion-height": 10, + "fill-extrusion-translate": { "stops": [[18, [0, -220]], [20, [100, -20]]], "type": "exponential" } diff --git a/render-tests/fill-extrusion-translate/literal-opacity/expected.png b/render-tests/fill-extrusion-translate/literal-opacity/expected.png new file mode 100644 index 00000000..52ed70a5 Binary files /dev/null and b/render-tests/fill-extrusion-translate/literal-opacity/expected.png differ diff --git a/render-tests/extrude-fill-translate/literal-opacity/style.json b/render-tests/fill-extrusion-translate/literal-opacity/style.json similarity index 92% rename from render-tests/extrude-fill-translate/literal-opacity/style.json rename to render-tests/fill-extrusion-translate/literal-opacity/style.json index dc01d3f6..e946f072 100644 --- a/render-tests/extrude-fill-translate/literal-opacity/style.json +++ b/render-tests/fill-extrusion-translate/literal-opacity/style.json @@ -79,12 +79,12 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10, - "fill-translate": [-30, -30], - "fill-opacity": 0.5 + "fill-extrusion-height": 10, + "fill-extrusion-translate": [-30, -30], + "fill-extrusion-opacity": 0.5 } } ] diff --git a/render-tests/fill-extrusion-translate/literal/expected.png b/render-tests/fill-extrusion-translate/literal/expected.png new file mode 100644 index 00000000..cc1e2049 Binary files /dev/null and b/render-tests/fill-extrusion-translate/literal/expected.png differ diff --git a/render-tests/extrude-fill-translate/literal/style.json b/render-tests/fill-extrusion-translate/literal/style.json similarity index 94% rename from render-tests/extrude-fill-translate/literal/style.json rename to render-tests/fill-extrusion-translate/literal/style.json index e6d4d192..482cc4ca 100644 --- a/render-tests/extrude-fill-translate/literal/style.json +++ b/render-tests/fill-extrusion-translate/literal/style.json @@ -79,11 +79,11 @@ }, { "id": "extrusion", - "type": "fill", + "type": "fill-extrusion", "source": "geojson", "paint": { - "fill-extrude-height": 10, - "fill-translate": [-30, -30] + "fill-extrusion-height": 10, + "fill-extrusion-translate": [-30, -30] } } ] diff --git a/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/style.json b/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/style.json index 9011bc77..95c43dd4 100644 --- a/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/style.json +++ b/render-tests/runtime-styling/paint-property-fill-flat-to-extrude/style.json @@ -14,8 +14,8 @@ ], [ "setPaintProperty", - "fill", - "fill-extrude-height", + "fill-extrusion", + "fill-extrusion-height", 10 ] ] @@ -58,8 +58,8 @@ }, "layers": [ { - "id": "fill", - "type": "fill", + "id": "fill-extrusion", + "type": "fill-extrusion", "source": "geojson" } ]