Merge branch 'release-ios-v3.4.0' into 1ec5-release-ios-v3.4.0-beta.5-master

Also reran make style-code and manually discarded anything related to fill extrusion layers.

1 files changed, 24 insertions, 2 deletions

diff --git a/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json b/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json
index e37598406b..49cf515e3e 100644
--- a/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json
+++ b/platform/darwin/scripts/style-spec-cocoa-conventions-v8.json
@@ -1,9 +1,31 @@
 {
   "layout_symbol": {
-    "icon-image": "icon-image-name"
+    "icon-allow-overlap": "icon-allows-overlap",
+    "icon-image": "icon-image-name",
+    "icon-ignore-placement": "icon-ignores-placement",
+    "icon-keep-upright": "keeps-icon-upright",
+    "icon-optional": "is-icon-optional",
+    "icon-rotate": "icon-rotation",
+    "icon-size": "icon-scale",
+    "symbol-avoid-edges": "symbol-avoids-edges",
+    "text-allow-overlap": "text-allows-overlap",
+    "text-ignore-placement": "text-ignores-placement",
+    "text-justify": "text-justification",
+    "text-keep-upright": "keeps-text-upright",
+    "text-max-angle": "maximum-text-angle",
+    "text-max-width": "maximum-text-width",
+    "text-optional": "is-text-optional",
+    "text-rotate": "text-rotation"
   },
   "paint_raster": {
     "raster-brightness-min": "minimum-raster-brightness",
-    "raster-brightness-max": "maximum-raster-brightness"
+    "raster-brightness-max": "maximum-raster-brightness",
+    "raster-hue-rotate": "raster-hue-rotation"
+  },
+  "paint_line": {
+    "line-dasharray": "line-dash-pattern"
+  },
+  "paint_fill": {
+    "fill-antialias": "is-fill-antialiased"
   }
 }
\ No newline at end of file