[core] fix icon-size for small data-driven values

port of mapbox/mapbox-gl-js#7125
mapbox · Aug 15, 2018 · 0a6c4f9 · 0a6c4f9
1 parent 20f880e
commit 0a6c4f9
Show file tree

Hide file tree

Showing 6 changed files with 200 additions and 194 deletions.
diff --git a/mapbox-gl-js b/mapbox-gl-js
diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json
@@ -88,5 +88,11 @@
   "render-tests/combinations/symbol-translucent--fill-extrusion-translucent": "needs investigation",
   "render-tests/feature-state/composite-expression": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue",
   "render-tests/feature-state/data-expression": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue",
-  "render-tests/feature-state/vector-source": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue"
+  "render-tests/feature-state/vector-source": "skip - port https://github.com/mapbox/mapbox-gl-js/pull/6263 - needs issue",
+  "render-tests/text-field/formatted-arabic": "https://github.com/mapbox/mapbox-gl-native/issues/12612",
+  "render-tests/text-field/formatted-line": "https://github.com/mapbox/mapbox-gl-native/issues/12612",
+  "render-tests/text-field/formatted": "https://github.com/mapbox/mapbox-gl-native/issues/12612",
+  "render-tests/basic-v9/z0-wide": "https://github.com/mapbox/mapbox-gl-native/pull/12611",
+  "render-tests/bright-v9/z0-wide": "https://github.com/mapbox/mapbox-gl-native/pull/12611",
+  "render-tests/satellite-v9/z0-wide": "https://github.com/mapbox/mapbox-gl-native/pull/12611"
 }
diff --git a/src/mbgl/programs/symbol_program.hpp b/src/mbgl/programs/symbol_program.hpp
@@ -66,8 +66,8 @@ struct SymbolLayoutAttributes : gl::Attributes<
             {{
                 tx,
                 ty,
-                static_cast<uint16_t>(sizeData.min * 10),
-                static_cast<uint16_t>(sizeData.max * 10)
+                static_cast<uint16_t>(sizeData.min * 256),
+                static_cast<uint16_t>(sizeData.max * 256)
             }}
         };
     }