From 471f003f3fc68a37f3fe0c5a11dae38fc2893a2f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Mon, 11 Jul 2016 14:13:12 -0700
Subject: [PATCH] Fixed string template in icon-image

---
 js/data/bucket/symbol_bucket.js | 5 ++---
 js/util/token.js                | 4 ++--
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/js/data/bucket/symbol_bucket.js b/js/data/bucket/symbol_bucket.js
index e5e77a3a66d..5bc5062f5bf 100644
--- a/js/data/bucket/symbol_bucket.js
+++ b/js/data/bucket/symbol_bucket.js
@@ -224,14 +224,13 @@ SymbolBucket.prototype.populateBuffers = function(collisionTile, stacks, icons)
 
         if (layout['icon-image']) {
             var iconNames = resolveStringValue(features[k].properties, layout['icon-image'], true);
-            var iconName = '';
+            var image;
             for (var i = 0; i < iconNames.length; i++) {
                 if (iconNames[i] in icons) {
-                    iconName = iconNames[i];
+                    image = icons[iconNames[i]];
                     break;
                 }
             }
-            var image = icons[iconName];
             shapedIcon = shapeIcon(image, layout);
 
             if (image) {
diff --git a/js/util/token.js b/js/util/token.js
index a4e01f76829..945567dc711 100644
--- a/js/util/token.js
+++ b/js/util/token.js
@@ -14,9 +14,9 @@ module.exports = resolveStringValue;
 function resolveStringValue(properties, value, all) {
     var results = [];
     if (typeof value === 'string') {
-        return value.replace(/{([^{}]+)}/g, function(match, ref) {
+        results.push(value.replace(/{([^{}]+)}/g, function(match, ref) {
             return ref in properties ? properties[ref] : '';
-        });
+        }));
     } else if (typeof value === 'object' && value.type === 'selection') {
         var cases = value.cases;
         for (var i = 0; i < cases.length; i++) {