fix maxItems

DeltaGraphs · Jun 29, 2015 · 0202d1d · 0202d1d
1 parent 769fdb2
commit 0202d1d
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 9 deletions.
diff --git a/lib/dataTier/flow/mapChartFlowModel.js b/lib/dataTier/flow/mapChartFlowModel.js
@@ -91,7 +91,7 @@ MapChartFlowModel.prototype.updateProperties = function(params){
 
 MapChartFlowModel.prototype.addRecord = function(record){
 	if(record!==undefined && record!==null && typeof record === 'object'){
-		if (this._records.length===this._maxItemsSaved){
+		if (this._records.length>=this._maxItemsSaved){
 			//delete first element
 			this._records.splice(0, 1);
 		}
@@ -144,6 +144,10 @@ MapChartFlowModel.prototype.updateMovie = function(par){
 	var recordsID=[];
 	var i=0;
 	for (var keyParam in params) {
+		if (this._records.length>=this._maxItemsSaved){
+			//too many records		
+			break;
+		}
 		if(params[keyParam][this._latitudeKey] === undefined ||
 			params[keyParam][this._longitudeKey] === undefined ||
 			params[keyParam][this._objectKey] === undefined){

diff --git a/lib/dataTier/flow/tableFlowModel.js b/lib/dataTier/flow/tableFlowModel.js
@@ -98,7 +98,7 @@ TableFlowModel.prototype.addRecord = function(rec){
 				record.appearance=undefined;
 			}
 		}
-		if (this._records.length===this._maxItemsSaved){
+		if (this._records.length>=this._maxItemsSaved){
 			//delete first element
 			this._records.splice(0, 1);
 		}

diff --git a/systemTest/TS3.js b/systemTest/TS3.js
@@ -72,7 +72,7 @@ var TS=function(page){
         flowColor: '#B9D3EE',
         marker: 'triangle',
         xFormat: 'toFloat',
-        maxItems: 50,
+        maxItemsSaved: 50,
         filters: 'temperatura>2'
     });
     lineChartFlow.addRecord({'tempo': 1, 'temperatura': 15});

diff --git a/systemTest/TS4.js b/systemTest/TS4.js
@@ -80,7 +80,7 @@ var TS=function(page){
 	    latitudeFormat: 'toFloat',
 	    objectKey: '0',
 	    filters:'IdMezzo>806',
-	    maxItems: 50
+	    maxItemsSaved: 50
 	});
 	mapChartFlow.updateMovie(
 		[{'0':875,'IdMezzo':875,'1':45.42533493042,'WGS84Fi':45.42533493042,'2':11.902134895325,'WGS84La':11.902134895325,'3':14,'Girometro':14,'4':0,'StatoPorte':0,'capolinea':'Capolinea Torre'},

diff --git a/systemTest/TS7.js b/systemTest/TS7.js
@@ -27,7 +27,7 @@ var TS=function(lineChart){
 	    name: 'grafico tempo-temperatura',
 	    xKey: 'tempo',
 	    yKey: 'temperatura',
-	    maxItems: 5,
+	    maxItemsSaved: 5,
 	    //filters: 'temperatura>3'
 	});
 	var IDs=[];
@@ -42,7 +42,7 @@ var TS=function(lineChart){
 	    name: 'grafico tempo-temperatura',
 	    xKey: 'tempo',
 	    yKey: 'temperatura',
-	    maxItems: 4,
+	    maxItemsSaved: 4,
 	    //filters: 'temperatura>3'
 	});
 	lineChart.addRecord('flow2',{'tempo': 1, 'temperatura': 15});

diff --git a/systemTest/TS8.js b/systemTest/TS8.js
@@ -34,7 +34,7 @@ var TS=function(mapChart){
 	    longitudeKey: '2',
 	    objectKey: '0',
 	    //filters:'IdMezzo>806',
-	    maxItems: 5
+	    maxItemsSaved: 5
 	});
 	mapChart.createMapChartFlow({
 	    ID:'flow2',
@@ -47,7 +47,7 @@ var TS=function(mapChart){
 	    longitudeKey: '2',
 	    objectKey: '0',
 	    //filters:'IdMezzo>806',
-	    maxItems: 5
+	    maxItemsSaved: 5
 	});
 	mapChart.createMapChartFlow({
 	    ID:'flow3',
@@ -60,7 +60,7 @@ var TS=function(mapChart){
 	    longitudeKey: '2',
 	    objectKey: '0',
 	    //filters:'IdMezzo>806',
-	    maxItems: 5
+	    maxItemsSaved: 5
 	});
 	var IDs=mapChartFlow1.updateMovie([
 		{'0':875,'1':45.42533493042,'2':11.902134895325},