LGMap: map.js comparison

comparison map.js @ 15:f17f43f0a63f

bug fixed: download error for data from LGDataverse

author	Zoe Hong <zhong@mpiwg-berlin.mpg.de>
date	Fri, 30 Oct 2015 16:47:15 +0100
parents	389cf726303e
children	bb63a70b8542

comparison

equal deleted inserted replaced

-:4151de159dbe
+:f17f43f0a63f
 	// zoe added for incoming json object from LGDataverse
 	if (urlParameter['name']!=undefined && urlParameter['file']==undefined && urlParameter['fileId']!=undefined) {
 		var file=undefined;
 		var name=decodeURI(urlParameter['name']);
 		var obj={name:name,file:file,preload:true};
 		datasetArray.splice(0,0,obj);
 	};
 	// end
 	initWindowWidget();
 	$(".windowWidget").hide();
 	$(".windowWidget .windowWidgetBar .visibilityButton").click();
 	// debug by yao
 	$("#aboutIcon").click();
 });
 function getUrlParameter(){
 	//examine the parameter "mode" in the url
 	var url=window.location.href;
 	var pos=url.indexOf("?");
 					}
 				}
 			];
 			*/
 	    	var dataCSVformat = fileData.file.dataString;
+	    	dataCSVformat = dataCSVformat.substring(0, dataCSVformat.length-2);	// remove the last two characters which are "\n"
+	    																		// it will cause download error since the last element in table is null
 	    	//console.log(dataCSVformat);
 	    	var json = GeoTemConfig.convertCsv(dataCSVformat);
 			GeoTemConfig.addDataset(new Dataset(GeoTemConfig.loadJson(json),name));
 		}
 	} else {
 	// zoe end
 		//display in all widgets
 		map.display(GeoTemConfig.datasets);
 			timeline.display(GeoTemConfig.datasets);
 			table.display(GeoTemConfig.datasets);
 			pieChart.display(GeoTemConfig.datasets); */
 }
 );
 	}
 }
 function closeDataset(name,fileName){
 	var idx;