From b2c98580dada8f430c65f751d27c968dc809af2a Mon Sep 17 00:00:00 2001
From: Erik Perrone <erico.perrone@isti.cnr.it>
Date: Thu, 15 Mar 2018 16:21:09 +0000
Subject: [PATCH] merge more fast

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/data-analysis/nlphub@165145 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 src/main/webapp/js/merge.js | 26 ++++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/js/merge.js b/src/main/webapp/js/merge.js
index 15df0fd..67576db 100644
--- a/src/main/webapp/js/merge.js
+++ b/src/main/webapp/js/merge.js
@@ -98,7 +98,7 @@ mergeAll = function(indices) {
 	 		}
 	 	}
 	}
-	
+/*	
 	var end = false;
 	var counter = 1;
 	while(!end) {
@@ -110,5 +110,27 @@ mergeAll = function(indices) {
 		if(counter == 100)
 			end = true;
 	}
-	return m.sort(compareSegments);
+	return m.sort(compareSegments);*/
+	
+	m = m.sort(compareSegments);
+	var m2 = [];
+	var current = m[0];
+	for(var i=0; i<m.length; i++) {
+		var cfr = compareSegment(current, m[i]);
+		switch(cfr) {
+		case 0:
+		case -1:
+			current = mergeSegment(current, m[i])[0];
+			break;
+		default:
+			var s = mergeSegment(current, m[i]);
+			m2[m2.length] = s[0];
+			current = s[1];
+			break;
+		}
+	}
+	
+	if((current[0] != m2[m2.length-1][0]) || (current[1] != m2[m2.length-1][1]))
+		m2[m2.length] = current;	
+	return m2;
 }