Merge pull request #2 from iRail/upgrade-1.1

V1.1-2

Author: DylanVanAssche

qml/pages/js/liveboard.js

@@ -56,20 +56,23 @@ function load(station) {
 
                 if(liveboard.departures.departure[i].hasOwnProperty("alerts")) { // Detect if we have alerts in this data
                     for(var j=0; j < Object.keys(liveboard.departures.departure[i].alerts.alert).length; j++) {
-                        alertsModel.append({
-                                               "header": liveboard.departures.departure[i].alerts.alert[j].header,
-                                               "description": liveboard.departures.departure[i].alerts.alert[j].description
-                                           });
-                    }
-                }
-            }
+                        var newEntry = true;
+                        for(var k=0; k < alertsModel.count; k++) {
+                            if(alertsModel.count == 0) { // Only when we have an entry we should check for duplicates
+                                break;
+                            }
+
+                            if(alertsModel.get(k).header == alertsModel.get(j).header) {
+                                newEntry = false;
+                                break;
+                            }
+                        }
 
-            // Remove duplicates from AlertsModel if the model is > 1
-            if(alertsModel.count > 1) {
-                for(var i=0; i < alertsModel.count; i++) {
-                    for(var j=i; j < alertsModel.count; j++) { // Only check for the same elements after the current one
-                        if(alertsModel.get(i).header == alertsModel.get(j).header) {
-                            alertsModel.remove(j);
+                        if(newEntry) {
+                            alertsModel.append({
+                                                   "header": liveboard.departures.departure[i].alerts.alert[j].header,
+                                                   "description": liveboard.departures.departure[i].alerts.alert[j].description
+                                               });
                         }
                     }
                 }

rpm/harbour-berail.changes

@@ -8,6 +8,9 @@
 # * date Author's Name <author's email> version-release
 # - Summary of changes
 
+* Mon Jun 06 2017 Dylan Van Assche <dylan.van.assche@protonmail.com.com> 1.1-2
+- [MINOR BUGFIX] Remove disturbances duplicates in Liveboard
+
 * Mon Jun 06 2017 Dylan Van Assche <dylan.van.assche@protonmail.com.com> 1.1-1
 - [MINOR BUGFIX] Recovering after a wrong connection in the routeplanner fixed
 - [MINOR BUGFIX] Liveboard shows information twice fixed

rpm/harbour-berail.spec

@@ -14,7 +14,7 @@ Name:       harbour-berail
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    BeRail
 Version:    1.1
-Release:    1
+Release:    2
 Group:      Qt/Qt
 License:    LICENSE
 URL:        http://example.org/

rpm/harbour-berail.yaml

@@ -1,7 +1,7 @@
 Name: harbour-berail
 Summary: BeRail
 Version: 1.1
-Release: 1
+Release: 2
 # The contents of the Group field should be one of the groups listed here:
 # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS
 Group: Qt/Qt