[core] map image type to string until we have a dedicated implementation

mapbox · Oct 14, 2019 · 5093a01 · 5093a01
1 parent e4e2a78
commit 5093a01
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 0 deletions.
diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js
@@ -72,6 +72,7 @@ global.propertyType = function propertyType(property) {
       case 'formatted':
         return 'Formatted';
       case 'string':
+      case 'image': // TODO: replace once we implement image expressions
         return 'String';
       case 'enum':
         return 'String';
@@ -93,6 +94,7 @@ global.propertyJavaType = function propertyType(property) {
        case 'formatted':
          return 'Formatted';
        case 'string':
+       case 'image': // TODO: replace once we implement image expressions
          return 'String';
        case 'enum':
          return 'String';
@@ -141,6 +143,7 @@ global.propertyNativeType = function (property) {
     return 'float';
   case 'formatted':
   case 'string':
+  case 'image': // TODO: replace once we implement image expressions
     return 'std::string';
   case 'enum':
     if(property['light-property']){
@@ -177,6 +180,7 @@ global.defaultExpressionJava = function(property) {
       case 'formatted':
         return 'format';
       case 'string':
+      case 'image': // TODO: replace once we implement image expressions
         return "string";
       case 'enum':
         return "string";
@@ -203,6 +207,7 @@ global.defaultValueJava = function(property) {
       case 'formatted':
         return 'new Formatted(new FormattedSection("default"))'
       case 'string':
+      case 'image': // TODO: replace once we implement image expressions
         return '"' + property['default'] + '"';
       case 'enum':
         return snakeCaseUpper(property.name) + "_" + snakeCaseUpper(Object.keys(property.values)[0]);
@@ -335,6 +340,7 @@ global.evaluatedType = function (property) {
     return 'float';
   case 'formatted':
   case 'string':
+  case 'image': // TODO: replace once we implement image expressions
     return 'std::string';
   case 'enum':
     return (isLightProperty(property) ? 'Light' : '') + `${camelize(property.name)}Type`;

diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js
@@ -159,6 +159,7 @@ global.objCTestValue = function (property, layerType, arraysAsStructs, indent) {
                 `@"'${_.startCase(propertyName)}'"` :
                 `@"${_.startCase(propertyName)}"`;
         case 'string':
+        case 'image': // TODO: replace once we implement image expressions
             return `@"'${_.startCase(propertyName)}'"`;
         case 'enum':
             return `@"'${_.last(_.keys(property.values))}'"`;
@@ -208,6 +209,7 @@ global.mbglTestValue = function (property, layerType) {
             return '1.0';
         case 'formatted':
         case 'string':
+        case 'image': // TODO: replace once we implement image expressions
             return `"${_.startCase(propertyName)}"`;
         case 'enum': {
             let type = camelize(originalPropertyName(property));
@@ -294,6 +296,7 @@ global.testHelperMessage = function (property, layerType, isFunction) {
             return 'testNumber' + fnSuffix;
         case 'formatted':
         case 'string':
+        case 'image': // TODO: replace once we implement image expressions
             return 'testString' + fnSuffix;
         case 'enum':
             let objCType = global.objCType(layerType, property.name);
@@ -474,6 +477,7 @@ global.describeType = function (property) {
             return 'numeric';
         case 'formatted':
         case 'string':
+        case 'image': // TODO: replace once we implement image expressions
             return 'string';
         case 'enum':
             return '`MGL' + camelize(property.name) + '`';
@@ -522,6 +526,7 @@ global.describeValue = function (value, property, layerType) {
             return 'the float ' + '`' + formatNumber(value) + '`';
         case 'formatted':
         case 'string':
+        case 'image': // TODO: replace once we implement image expressions
             if (value === '') {
                 return 'the empty string';
             }
@@ -608,6 +613,7 @@ global.propertyType = function (property) {
             return 'NSNumber *';
         case 'formatted':
         case 'string':
+        case 'image': // TODO: replace once we implement image expressions
             return 'NSString *';
         case 'enum':
             return 'NSValue *';
@@ -640,6 +646,7 @@ global.isInterpolatable = function (property) {
     return type !== 'boolean' &&
         type !== 'enum' &&
         type !== 'string' &&
+        type !== 'image' &&
         type !== 'formatted';
 };
 
@@ -653,6 +660,7 @@ global.valueTransformerArguments = function (property) {
         case 'formatted':
             return ['mbgl::style::expression::Formatted', objCType];
         case 'string':
+        case 'image': // TODO: replace once we implement image expressions
             return ['std::string', objCType];
         case 'enum':
             return [mbglType(property), 'NSValue *', mbglType(property), `MGL${camelize(property.name)}`];
@@ -692,6 +700,7 @@ global.mbglType = function(property) {
         case 'formatted':
             return 'mbgl::style::expression::Formatted';
         case 'string':
+        case 'image': // TODO: replace once we implement image expressions
             return 'std::string';
         case 'enum': {
             let type = camelize(originalPropertyName(property));

diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js
@@ -36,6 +36,7 @@ global.expressionType = function (property) {
         case 'enum':
             return 'NumberType';
         case 'string':
+        case 'image': // TODO: replace once we implement image expressions
             return 'StringType';
         case 'color':
             return `ColorType`;
@@ -68,6 +69,7 @@ global.evaluatedType = function (property) {
   case 'formatted':
     return 'expression::Formatted';
   case 'string':
+  case 'image': // TODO: replace once we implement image expressions
     return 'std::string';
   case 'enum':
     return (isLightProperty(property) ? 'Light' : '') + `${camelize(property.name)}Type`;
@@ -166,6 +168,7 @@ global.defaultValue = function (property) {
   }
   case 'formatted':
   case 'string':
+  case 'image': // TODO: replace once we implement image expressions
     return JSON.stringify(property.default || "");
   case 'enum':
     if (property.default === undefined) {