Merge pull request #764 from devgateway/bug/AMP-24640/212610

Bug/amp 24640/212610
devgateway · Mar 1, 2017 · 8ee9d29 · 8ee9d29
2 parents 0e5a371 + db7eff4
commit 8ee9d29
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/amp/TEMPLATE/ampTemplate/gisModule/dev/app/js/amp/colours/colour-palette.js b/amp/TEMPLATE/ampTemplate/gisModule/dev/app/js/amp/colours/colour-palette.js
@@ -110,7 +110,7 @@ var Palette = Backbone.Model.extend({
 
     function makeTest(bucket) {
       return function(value) {
-        return value >= bucket[0] && value <= bucket[1];
+    	  return bucket && value >= bucket[0] && value <= bucket[1];
       };
     }
 

diff --git a/amp/TEMPLATE/ampTemplate/gisModule/dev/app/js/amp/map/views/indicator-layers-view.js b/amp/TEMPLATE/ampTemplate/gisModule/dev/app/js/amp/map/views/indicator-layers-view.js
@@ -181,7 +181,7 @@ module.exports = Backbone.View.extend({
         	value = ampFormatter.format(feature.properties.value)
         }        
 
-        var fundingPopupTemplate = value ? ['<strong>', feature.properties.name, '</strong>',
+        var fundingPopupTemplate = feature.properties.value ? ['<strong>', feature.properties.name, '</strong>',
                         '<br/>', formattedTitleString, '',
                         value, ' ', unit].join('') : ['<strong>', feature.properties.name, '</strong>',
                                                       '<br/>', self.app.translator.translateSync("amp.gis:popup-no-data","No Data")].join('');