Eliminate fill-extrude-* properties in favor of fill-extrusion type (#…

…155) * 🙅 fill-extrude-*; 👉 fill-extrusion type * Update fill-extrusion tests after changing units to meters * Make fill-extrusion-translate-anchor tests consistent + use more normalized numbers
mapbox · Nov 2, 2016 · 232b9e4 · 232b9e4
1 parent 91def21
commit 232b9e4
Show file tree

Hide file tree

Showing 94 changed files with 149 additions and 181 deletions.
diff --git a/render-tests/extrude-fill-color/default/expected.png b/render-tests/extrude-fill-color/default/expected.png
diff --git a/render-tests/extrude-fill-color/function/expected.png b/render-tests/extrude-fill-color/function/expected.png
diff --git a/render-tests/extrude-fill-color/literal/expected.png b/render-tests/extrude-fill-color/literal/expected.png
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
diff --git a/render-tests/extrude-fill-color/property-function/expected.png b/render-tests/extrude-fill-color/property-function/expected.png
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
diff --git a/render-tests/extrude-fill-opacity/default/expected.png b/render-tests/extrude-fill-opacity/default/expected.png
diff --git a/render-tests/extrude-fill-opacity/function/expected.png b/render-tests/extrude-fill-opacity/function/expected.png
diff --git a/render-tests/extrude-fill-opacity/literal/expected.png b/render-tests/extrude-fill-opacity/literal/expected.png
diff --git a/render-tests/extrude-fill-pattern/@2x/expected.png b/render-tests/extrude-fill-pattern/@2x/expected.png
diff --git a/render-tests/extrude-fill-pattern/function-2/expected.png b/render-tests/extrude-fill-pattern/function-2/expected.png
diff --git a/render-tests/extrude-fill-pattern/function/expected.png b/render-tests/extrude-fill-pattern/function/expected.png
diff --git a/render-tests/extrude-fill-pattern/literal/expected.png b/render-tests/extrude-fill-pattern/literal/expected.png
diff --git a/render-tests/extrude-fill-pattern/opacity/expected.png b/render-tests/extrude-fill-pattern/opacity/expected.png
diff --git a/render-tests/extrude-fill-translate-anchor/map/expected.png b/render-tests/extrude-fill-translate-anchor/map/expected.png
diff --git a/render-tests/extrude-fill-translate-anchor/map/style.json b/render-tests/extrude-fill-translate-anchor/map/style.json
diff --git a/render-tests/extrude-fill-translate-anchor/viewport/expected.png b/render-tests/extrude-fill-translate-anchor/viewport/expected.png
diff --git a/render-tests/extrude-fill-translate/default/expected.png b/render-tests/extrude-fill-translate/default/expected.png
diff --git a/render-tests/extrude-fill-translate/function/expected.png b/render-tests/extrude-fill-translate/function/expected.png
diff --git a/render-tests/extrude-fill-translate/literal-opacity/expected.png b/render-tests/extrude-fill-translate/literal-opacity/expected.png
diff --git a/render-tests/extrude-fill-translate/literal/expected.png b/render-tests/extrude-fill-translate/literal/expected.png
diff --git a/render-tests/fill-extrude-base/default/expected.png b/render-tests/fill-extrude-base/default/expected.png
diff --git a/render-tests/fill-extrude-base/function/expected.png b/render-tests/fill-extrude-base/function/expected.png
diff --git a/render-tests/fill-extrude-base/literal/expected.png b/render-tests/fill-extrude-base/literal/expected.png
diff --git a/render-tests/fill-extrude-base/negative/expected.png b/render-tests/fill-extrude-base/negative/expected.png
diff --git a/render-tests/fill-extrude-base/property-function/expected.png b/render-tests/fill-extrude-base/property-function/expected.png
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
diff --git a/render-tests/fill-extrude-height/default/expected.png b/render-tests/fill-extrude-height/default/expected.png
diff --git a/render-tests/fill-extrude-height/negative/expected.png b/render-tests/fill-extrude-height/negative/expected.png
diff --git a/render-tests/fill-extrude-height/property-function/expected.png b/render-tests/fill-extrude-height/property-function/expected.png
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
diff --git a/render-tests/fill-extrusion-base/default/expected.png b/render-tests/fill-extrusion-base/default/expected.png
diff --git a/...ests/fill-extrude-base/default/style.json → ...ts/fill-extrusion-base/default/style.json b/...ests/fill-extrude-base/default/style.json → ...ts/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
diff --git a/...sts/fill-extrude-base/function/style.json → ...s/fill-extrusion-base/function/style.json b/...sts/fill-extrude-base/function/style.json → ...s/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
diff --git a/...ests/fill-extrude-base/literal/style.json → ...ts/fill-extrusion-base/literal/style.json b/...ests/fill-extrude-base/literal/style.json → ...ts/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
diff --git a/...sts/fill-extrude-base/negative/style.json → ...s/fill-extrusion-base/negative/style.json b/...sts/fill-extrude-base/negative/style.json → ...s/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
diff --git a/...extrude-base/property-function/style.json → ...trusion-base/property-function/style.json b/...extrude-base/property-function/style.json → ...trusion-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
diff --git a/...ase/zoom-and-property-function/style.json → ...ase/zoom-and-property-function/style.json b/...ase/zoom-and-property-function/style.json → ...ase/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
diff --git a/...sts/extrude-fill-color/default/style.json → ...s/fill-extrusion-color/default/style.json b/...sts/extrude-fill-color/default/style.json → ...s/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
diff --git a/...ts/extrude-fill-color/function/style.json → .../fill-extrusion-color/function/style.json b/...ts/extrude-fill-color/function/style.json → .../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
diff --git a/...sts/extrude-fill-color/literal/style.json → ...s/fill-extrusion-color/literal/style.json b/...sts/extrude-fill-color/literal/style.json → ...s/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
diff --git a/...ill-color/no-alpha-no-multiply/style.json → ...ion-color/no-alpha-no-multiply/style.json b/...ill-color/no-alpha-no-multiply/style.json → ...ion-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
diff --git a/...e-fill-color/property-function/style.json → ...rusion-color/property-function/style.json b/...e-fill-color/property-function/style.json → ...rusion-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
diff --git a/...lor/zoom-and-property-function/style.json → ...lor/zoom-and-property-function/style.json b/...lor/zoom-and-property-function/style.json → ...lor/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
diff --git a/...ts/fill-extrude-height/default/style.json → .../fill-extrusion-height/default/style.json b/...ts/fill-extrude-height/default/style.json → .../fill-extrusion-height/default/style.json
@@ -122,7 +122,7 @@
   "layers": [
     {
       "id": "extrusion",
-      "type": "fill",
+      "type": "fill-extrusion",
       "source": "geojson",
       "paint": {}
     }

diff --git a/...fill-extrude-height/function/expected.png → ...ll-extrusion-height/function/expected.png b/...fill-extrude-height/function/expected.png → ...ll-extrusion-height/function/expected.png
diff --git a/...s/fill-extrude-height/function/style.json → ...fill-extrusion-height/function/style.json b/...s/fill-extrude-height/function/style.json → ...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
diff --git a/...s/fill-extrude-height/negative/style.json → ...fill-extrusion-height/negative/style.json b/...s/fill-extrude-height/negative/style.json → ...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
diff --git a/...trude-height/property-function/style.json → ...usion-height/property-function/style.json b/...trude-height/property-function/style.json → ...usion-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
diff --git a/...ght/zoom-and-property-function/style.json → ...ght/zoom-and-property-function/style.json b/...ght/zoom-and-property-function/style.json → ...ght/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
diff --git a/...s/extrude-fill-opacity/default/style.json → ...fill-extrusion-opacity/default/style.json b/...s/extrude-fill-opacity/default/style.json → ...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
diff --git a/.../extrude-fill-opacity/function/style.json → ...ill-extrusion-opacity/function/style.json b/.../extrude-fill-opacity/function/style.json → ...ill-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
diff --git a/...s/extrude-fill-opacity/literal/style.json → ...fill-extrusion-opacity/literal/style.json b/...s/extrude-fill-opacity/literal/style.json → ...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
diff --git a/...tests/extrude-fill-pattern/@2x/style.json → ...sts/fill-extrusion-pattern/@2x/style.json b/...tests/extrude-fill-pattern/@2x/style.json → ...sts/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