Impaczus/game-of-thrones-map
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Modified Cat's stops & paths

Browse Source 
Filtered out book-only paths in TV mode
made path arrows optional
This commit is contained in:
Ryan Carpenter
2016-08-02 23:15:13 +08:00
parent 3d7b5824b6
commit 82d62d7c4e
4 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
data/paths.csv
+2 -2
View File
@@ -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,
1 key firstChapter firstEpisode arrows
9 Catelyn_Stark-4 AGOT-31 S1E05
10 Catelyn_Stark-5 AGOT-34 S1E05
11 Catelyn_Stark-6 AGOT-55
12 Catelyn_Stark-7 AGOT-55 TRUE
13 Catelyn_Stark-8 AGOT-59 TRUE
14 Catelyn_Stark-8a S1E09 TRUE
15 Catelyn_Stark-9 AGOT-63 S1E09 TRUE
16 Catelyn_Stark-10 AGOT-71 S1E09
data/stops.csv
+4 -2
View File
@@ -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
1 character town clue latitude longitude firstChapter firstEpisode isLost isDead
21 Catelyn_Stark Storm%27s_End ACOK-31 S2E04
22 Catelyn_Stark Oxcross S2E06
23 Catelyn_Stark The Westerlands 22.106 -134.6484 S2E08
24 Catelyn_Stark Harrenhal S3E01
25 Catelyn_Stark travelling to Riverrun 21.6166 -122.0801 S3E02
26 Catelyn_Stark Riverrun ACOK-39 S3E03
27 Catelyn_Stark Hag's Mire 32.6578 -127.4121 ASOS-45 S3E05 S3E07
28 Catelyn_Stark Twins ASOS-49
29 Catelyn_Stark Twins ASOS-51 S3E07 S3E09 TRUE
30 Catelyn_Stark Oldstones ASOS-81 TRUE
31 Catelyn_Stark BWB_Hideout AFFC-42 TRUE
js/controller.js
+1 -1
View File
@@ -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);
}
js/services.js
+15 -7
View File
@@ -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
]
}
};
}