From a86857cb36b270ff29c9203f3fe1516137ebe1ca Mon Sep 17 00:00:00 2001
From: Alexander Shalamov <alexander.shalamov@mapbox.com>
Date: Fri, 1 Nov 2019 17:36:31 +0200
Subject: [PATCH] [android] Update image expression evaluated type name

---
 platform/android/scripts/generate-style-code.js | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/platform/android/scripts/generate-style-code.js b/platform/android/scripts/generate-style-code.js
index 83fb5c116..9e07b3644 100755
--- a/platform/android/scripts/generate-style-code.js
+++ b/platform/android/scripts/generate-style-code.js
@@ -72,7 +72,7 @@ global.propertyType = function propertyType(property) {
       case 'formatted':
         return 'Formatted';
       case 'string':
-      case 'image': // TODO: replace once we implement image expressions
+      case 'resolvedImage':
         return 'String';
       case 'enum':
         return 'String';
@@ -94,7 +94,7 @@ global.propertyJavaType = function propertyType(property) {
        case 'formatted':
          return 'Formatted';
        case 'string':
-       case 'image': // TODO: replace once we implement image expressions
+       case 'resolvedImage':
          return 'String';
        case 'enum':
          return 'String';
@@ -143,7 +143,7 @@ global.propertyNativeType = function (property) {
     return 'float';
   case 'formatted':
   case 'string':
-  case 'image': // TODO: replace once we implement image expressions
+  case 'resolvedImage': // TODO: replace once we implement image expressions
     return 'std::string';
   case 'enum':
     if(property['light-property']){
@@ -180,7 +180,7 @@ global.defaultExpressionJava = function(property) {
       case 'formatted':
         return 'format';
       case 'string':
-      case 'image': // TODO: replace once we implement image expressions
+      case 'image':
         return "string";
       case 'enum':
         return "string";
@@ -207,7 +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
+      case 'resolvedImage':
         return '"' + property['default'] + '"';
       case 'enum':
         return snakeCaseUpper(property.name) + "_" + snakeCaseUpper(Object.keys(property.values)[0]);
@@ -340,7 +340,7 @@ global.evaluatedType = function (property) {
     return 'float';
   case 'formatted':
   case 'string':
-  case 'image': // TODO: replace once we implement image expressions
+  case 'image':
     return 'std::string';
   case 'enum':
     return (isLightProperty(property) ? 'Light' : '') + `${camelize(property.name)}Type`;