WIP: indexes do not get mangled

Author: contactashish13

js/render-google.js

@@ -55,6 +55,29 @@ var __visualizer_chart_images   = [];
             settings['animation']['duration'] = parseInt(settings['animation']['duration']);
         }
 
+        // mark roles for series that have specified a role
+        // and then remove them from future processing
+        // and also adjust the indices of the series array so that
+        // the ones with a role are deleted
+        // e.g. if there are 6 columns (0-5) out of which 1, 3 and 5 are annotations
+        // the final series will only include 0, 1, 2
+        if (settings.series) {
+            var adjusted_series = [];
+            for (i = 0; i < settings.series.length; i++) {
+                if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
+                    continue;
+                }
+                if(typeof settings.series[i].role !== 'undefined'){
+                    table.setColumnProperty(i + 1, 'role', settings.series[i].role);
+                    if(settings.series[i].role === '') {
+                        adjusted_series.push(settings.series[i]);
+                    }
+                }
+            }
+            settings.series = adjusted_series;
+        }
+        if(id.indexOf('1568') !== -1) console.log(series.length);
+
 		switch (chart.type) {
 			case 'pie':
 				if (settings.slices) {
@@ -204,12 +227,9 @@ var __visualizer_chart_images   = [];
                     break;
                 default:
                     for (i = 0; i < settings.series.length; i++) {
-                        if (!series[i + 1]) {
+                        if (!series[i + 1] || typeof settings.series[i] === 'undefined') {
                             continue;
                         }
-                        if(typeof settings.series[i].role !== 'undefined'){
-                            table.setColumnProperty(i + 1, 'role', settings.series[i].role);
-                        }
                         format_data(id, table, series[i + 1].type, settings.series[i].format, i + 1);
                     }
                     break;
@@ -218,7 +238,6 @@ var __visualizer_chart_images   = [];
             format_data(id, table, 'number', settings.format, 1);
         }
 
-
         if(settings.hAxis) {
        	    format_data(id, table, series[0].type, settings.hAxis.format, 0);
         }