Fixed string template in icon-image

mapbox · Jul 11, 2016 · 471f003 · 471f003
1 parent baf963b
commit 471f003
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git 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
@@ -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++) {