[core, test] Bump GL JS pin to bring gl-native back in sync with gl-js.

Requires changing `generate-style-code` to treat 'formatted' as being the same as 'string' until gl-native gets 'formatted' support with https://github.com/mapbox/mapbox-gl-native/pull/12624.
To make nitpick happy, PropertyFunction.java uses the latest "text-field" description from v8.json. It's technically correct, just kind of pointless since the "If a plain `string` is provided" clause will always be true.
This commit is contained in:
Chris Loer
2018-08-21 16:19:43 -07:00
committed by Chris Loer
parent 33cd094d85
commit fd1767efba
6 changed files with 34 additions and 4 deletions

View File

@@ -55,6 +55,7 @@ global.propertyType = function propertyType(property) {
return 'Boolean';
case 'number':
return 'Float';
case 'formatted':
case 'string':
return 'String';
case 'enum':
@@ -74,6 +75,7 @@ global.propertyJavaType = function propertyType(property) {
return 'boolean';
case 'number':
return 'float';
case 'formatted':
case 'string':
return 'String';
case 'enum':
@@ -121,6 +123,7 @@ global.propertyNativeType = function (property) {
return 'bool';
case 'number':
return 'float';
case 'formatted':
case 'string':
return 'std::string';
case 'enum':
@@ -155,6 +158,7 @@ global.defaultExpressionJava = function(property) {
return 'boolean';
case 'number':
return 'number';
case 'formatted':
case 'string':
return "string";
case 'enum':
@@ -179,6 +183,7 @@ global.defaultValueJava = function(property) {
return 'true';
case 'number':
return '0.3f';
case 'formatted':
case 'string':
return '"' + property['default'] + '"';
case 'enum':
@@ -187,6 +192,7 @@ global.defaultValueJava = function(property) {
return '"rgba(0, 0, 0, 1)"';
case 'array':
switch (property.value) {
case 'formatted':
case 'string':
return '[' + property['default'] + "]";
case 'number':
@@ -301,6 +307,7 @@ global.evaluatedType = function (property) {
return 'bool';
case 'number':
return 'float';
case 'formatted':
case 'string':
return 'std::string';
case 'enum':