From 82d62d7c4e7901f0a2218f3d933f84b5437f9121 Mon Sep 17 00:00:00 2001
From: Ryan Carpenter <carpiediem@gmail.com>
Date: Tue, 2 Aug 2016 23:15:13 +0800
Subject: [PATCH] Modified Cat's stops & paths Filtered out book-only paths in
 TV mode made path arrows optional

---
 data/paths.csv   |  4 ++--
 data/stops.csv   |  6 ++++--
 js/controller.js |  2 +-
 js/services.js   | 22 +++++++++++++++-------
 4 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/data/paths.csv b/data/paths.csv
index b00b12c..fd296fa 100644
--- a/data/paths.csv
+++ b/data/paths.csv
@@ -9,8 +9,8 @@ Catelyn_Stark-3,AGOT-28,S1E04,TRUE
 Catelyn_Stark-4,AGOT-31,S1E05,
 Catelyn_Stark-5,AGOT-34,S1E05,
 Catelyn_Stark-6,AGOT-55,,
-Catelyn_Stark-7,AGOT-55,,
-Catelyn_Stark-8,AGOT-59,,
+Catelyn_Stark-7,AGOT-55,,TRUE
+Catelyn_Stark-8,AGOT-59,,TRUE
 Catelyn_Stark-8a,,S1E09,TRUE
 Catelyn_Stark-9,AGOT-63,S1E09,TRUE
 Catelyn_Stark-10,AGOT-71,S1E09,
diff --git a/data/stops.csv b/data/stops.csv
index 9369d6d..06d9fc6 100644
--- a/data/stops.csv
+++ b/data/stops.csv
@@ -21,9 +21,11 @@ Catelyn_Stark,,,,,,,,
 Catelyn_Stark,Storm%27s_End,,,,ACOK-31,S2E04,,
 Catelyn_Stark,Oxcross,,,,,S2E06,,
 Catelyn_Stark,,The Westerlands,22.106,-134.6484,,S2E08,,
+Catelyn_Stark,Harrenhal,,,,,S3E01,,
+Catelyn_Stark,,travelling to Riverrun,21.6166,-122.0801,,S3E02,,
 Catelyn_Stark,Riverrun,,,,ACOK-39,S3E03,,
-Catelyn_Stark,,Hag's Mire,32.6578,-127.4121,ASOS-45,S3E05,,
+Catelyn_Stark,,Hag's Mire,32.6578,-127.4121,ASOS-45,S3E07,,
 Catelyn_Stark,Twins,,,,ASOS-49,,,
-Catelyn_Stark,Twins,,,,ASOS-51,S3E07,,TRUE
+Catelyn_Stark,Twins,,,,ASOS-51,S3E09,,TRUE
 Catelyn_Stark,Oldstones,,,,ASOS-81,,,TRUE
 Catelyn_Stark,BWB_Hideout,,,,AFFC-42,,,TRUE
\ No newline at end of file
diff --git a/js/controller.js b/js/controller.js
index d28ce97..da61747 100644
--- a/js/controller.js
+++ b/js/controller.js
@@ -88,7 +88,7 @@ angular.module('quartermaester')
       $scope.mapModels.heraldry = $scope.options.houseHeraldry ? $filter('qmSlider')(qmData.heraldry, $scope.slider) : [];
       $scope.mapModels.characters = $filter('qmSlider')(qmData.characterMarkers, $scope.slider, $scope.options);
       $scope.mapModels.paths = $filter('qmSlider')(qmData.characterPaths, $scope.slider, $scope.options);
-      // console.log("qmData.characterPaths", qmData.characterPaths);
+      //console.log("mapModels.paths", $scope.mapModels.paths);
 
 
     }
diff --git a/js/services.js b/js/services.js
index 3f46f27..a1ca8d9 100644
--- a/js/services.js
+++ b/js/services.js
@@ -372,6 +372,12 @@ angular.module('quartermaester')
       var firstChapter = getChapterId(path.firstChapter);
       var firstEpisode = getEpisodeId(path.firstEpisode);
       var waypoints = qmData.waypointArrays[path.key].map(waypointModel);
+      var icons = [];
+      if (path.arrows=="TRUE") icons.push({
+          icon: { path: 2 }, //google.maps.SymbolPath.BACKWARD_OPEN_ARROW
+          offset: '25px',
+          repeat: '100px'
+      });
 
       return {
           key: "path-" + index,
@@ -382,14 +388,16 @@ angular.module('quartermaester')
               weight: 3
           },
           static: true,
-          icons: [{
-              icon: { path: 2 }, //google.maps.SymbolPath.BACKWARD_OPEN_ARROW
-              offset: '25px',
-              repeat: '100px'
-          }],
+          icons: icons,
           timing: {
-            episodes: [firstEpisode, 999],
-            chapters: [firstChapter, 999]
+            episodes: [
+              firstEpisode,
+              (firstEpisode==-1) ? -1 : 999
+            ],
+            chapters: [
+              firstChapter,
+              (firstChapter==-1) ? -1 : 999
+            ]
           }
       };
     }