From e87d1217482531dd56565ebcdb157b0223e52482 Mon Sep 17 00:00:00 2001
From: Anders Nickelsen <anders.nickelsen@gmail.com>
Date: Wed, 20 Apr 2016 13:44:07 +0200
Subject: [PATCH] Fix engagements on stat charts.

---
 app/assets/javascripts/angular/directives/chart.js        | 8 ++++++--
 app/assets/javascripts/angular/directives/macrochart.js   | 8 ++++++--
 app/assets/javascripts/angular/directives/protosschart.js | 8 ++++++--
 app/assets/javascripts/angular/directives/terranchart.js  | 8 ++++++--
 app/assets/javascripts/angular/resources/match.js         | 6 +++++-
 5 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/angular/directives/chart.js b/app/assets/javascripts/angular/directives/chart.js
index 2fdcec4..c644839 100644
--- a/app/assets/javascripts/angular/directives/chart.js
+++ b/app/assets/javascripts/angular/directives/chart.js
@@ -125,11 +125,15 @@ gg.directive('chart', ['$compile', function($compile) {
 
       if (scope.$parent.match.engagements) {
           options.xAxis.plotBands = [];
+          speed_multiplier = 1;
+          if (scope.$parent.match.expansion_tag == 'LotV') {
+            speed_multiplier = 1.4;
+          }
           _.each(scope.$parent.match.engagements, function(engagement) {
             options.xAxis.plotBands.push({
               color: 'rgba(150, 50, 50, 0.10)',
-              from: engagement[0] / 960.0,
-              to: engagement[1] / 960.0,
+              from: engagement[0] / 960.0 / speed_multiplier,
+              to: engagement[1] / 960.0 / speed_multiplier,
               zIndex: 10
             });
           });
diff --git a/app/assets/javascripts/angular/directives/macrochart.js b/app/assets/javascripts/angular/directives/macrochart.js
index a4168f8..c11141f 100644
--- a/app/assets/javascripts/angular/directives/macrochart.js
+++ b/app/assets/javascripts/angular/directives/macrochart.js
@@ -75,11 +75,15 @@ gg.directive('macrochart', [function() {
 
       if (scope.$parent.match.engagements) {
           options.yAxis.plotBands = [];
+          speed_multiplier = 1;
+          if (scope.$parent.match.expansion_tag == 'LotV') {
+            speed_multiplier = 1.4;
+          }
           _.each(scope.$parent.match.engagements, function(engagement) {
             options.yAxis.plotBands.push({
               color: 'rgba(150, 50, 50, 0.1)',
-              from: engagement[0] / 960.0,
-              to: engagement[1] / 960.0,
+              from: engagement[0] / 960.0 / speed_multiplier,
+              to: engagement[1] / 960.0 / speed_multiplier,
               zIndex: 10
             });
           });
diff --git a/app/assets/javascripts/angular/directives/protosschart.js b/app/assets/javascripts/angular/directives/protosschart.js
index b9bc950..b6158a5 100644
--- a/app/assets/javascripts/angular/directives/protosschart.js
+++ b/app/assets/javascripts/angular/directives/protosschart.js
@@ -98,11 +98,15 @@ gg.directive('protosschart', [function() {
 
       if (scope.$parent.match.engagements) {
           options.yAxis.plotBands = [];
+          speed_multiplier = 1;
+          if (scope.$parent.match.expansion_tag == 'LotV') {
+            speed_multiplier = 1.4;
+          }
           _.each(scope.$parent.match.engagements, function(engagement) {
             options.yAxis.plotBands.push({
               color: 'rgba(150, 50, 50, 0.1)',
-              from: engagement[0] / 960.0,
-              to: engagement[1] / 960.0,
+              from: engagement[0] / 960.0 / speed_multiplier,
+              to: engagement[1] / 960.0 / speed_multiplier,
               zIndex: 10
             });
           });
diff --git a/app/assets/javascripts/angular/directives/terranchart.js b/app/assets/javascripts/angular/directives/terranchart.js
index bed8047..fddd7c7 100644
--- a/app/assets/javascripts/angular/directives/terranchart.js
+++ b/app/assets/javascripts/angular/directives/terranchart.js
@@ -130,11 +130,15 @@ gg.directive('terranchart', [function() {
 
       if (scope.$parent.match.engagements) {
           options.yAxis.plotBands = [];
+          speed_multiplier = 1;
+          if (scope.$parent.match.expansion_tag == 'LotV') {
+            speed_multiplier = 1.4;
+          }
           _.each(scope.$parent.match.engagements, function(engagement) {
             options.yAxis.plotBands.push({
               color: 'rgba(150, 50, 50, 0.1)',
-              from: engagement[0] / 960.0,
-              to: engagement[1] / 960.0,
+              from: engagement[0] / 960.0 / speed_multiplier,
+              to: engagement[1] / 960.0 / speed_multiplier,
               zIndex: 10
             });
           });
diff --git a/app/assets/javascripts/angular/resources/match.js b/app/assets/javascripts/angular/resources/match.js
index 3826be5..c9b8ba2 100644
--- a/app/assets/javascripts/angular/resources/match.js
+++ b/app/assets/javascripts/angular/resources/match.js
@@ -554,7 +554,11 @@ gg.factory('Match', ['$ggResource', '$compile', 'Matchnote', function($ggResourc
         // don't graph the last base-time; its y-value is zero by definition
         _bases_x.pop();
 
-        _bases_x_minutes = _.map(_bases_x, function(_frame_x) { return _frame_x / 960.0 });
+        speed_multiplier = 1.0;
+        if (this.expansion_tag == 'LotV') {
+            speed_multiplier = Sc2.LOTV_SPEEDUP;
+        }
+        _bases_x_minutes = _.map(_bases_x, function(_frame_x) { return _frame_x / 960.0 / speed_multiplier });
 
         _series_y = [];
         _.each(_bases_x, function(_x) {