Merge branch 'master' of github.com:F1Vis/f1vis

js/processor.js

@@ -8,7 +8,8 @@ var processor = {
       lapTimes: null,
       pitStops: null,
       qualifying: null,
-      results: null
+      results: null,
+      raceInfo: null
     };
     
     race.drivers = queries.getDriversByRaceId(raceId);
@@ -16,7 +17,13 @@ var processor = {
     race.qualifying = queries.getQualifingDataByRaceId(raceId);
     race.pitStops = queries.getPitStopsByRaceId(raceId);
     race.results = queries.getResultsByRaceId(raceId);
+    race.raceInfo = queries.getRaceById(raceId);
 
     return race;
   },
+
+  getRacesByYear: function(year) {
+    var races = queries.getRacesByYear(year);
+    return races.map(race => processor.getRace(race.raceId));
+  }
 };

js/queries.js

@@ -109,6 +109,26 @@ var queries = {
     return myMap;
   },
 
+  getRaceById: function(raceId){
+    var rawData = preprocessor.getResults();
+    return rawData.races[raceId];    
+  },
+
+  getRacesByYear: function(year){
+    var rawData = preprocessor.getResults();
+
+    var races = [];
+    for(var key in rawData.races){
+      if(rawData.races[key].year == year){
+        races.push(rawData.races[key]);
+      }
+    }
+    races.sort((o1,o2) => o1["round"] - o2["round"]);
+
+    return races;
+    
+  },
+
   getQualifingDataByRaceId: function(raceId) {
     var rawData = preprocessor.getResults();