reorganized qmCSV service
added heraldry markers
This commit is contained in:
Ryan Carpenter
+271
-60
@@ -49,17 +49,277 @@ angular.module('quartermaester')
|
||||
|
||||
})
|
||||
|
||||
.factory('qmCsv', function($http, $filter, fCsv) {
|
||||
.factory('qmCsv', function($q, $http, $filter, fCsv) {
|
||||
|
||||
var csvLocation = "http://www.rslc.us/quartermaester/data/";
|
||||
return {
|
||||
get: getFile,
|
||||
setHomes: setHomes,
|
||||
getCurrentOccupant: getCurrentOccupant
|
||||
// get: getFile,
|
||||
loadData: loadData,
|
||||
// setHomes: setHomes,
|
||||
// setHeraldry: setHeraldry,
|
||||
// getCurrentOccupant: getCurrentOccupant
|
||||
};
|
||||
|
||||
///////////////////////////////
|
||||
|
||||
function loadData() {
|
||||
return $q.all([
|
||||
getFile('books.csv'),
|
||||
getFile('chapters.csv'),
|
||||
getFile('seasons.csv'),
|
||||
getFile('episodes.csv'),
|
||||
getFile('houses.csv'),
|
||||
getFile('characters.csv'),
|
||||
getFile('regions.csv'),
|
||||
getFile('towns.csv'),
|
||||
getFile('borders.csv'),
|
||||
// getFile('stops.csv'),
|
||||
// getFile('waypoints.csv'),
|
||||
// getFile('paths.csv')
|
||||
]).spread(parseData);
|
||||
}
|
||||
|
||||
function parseData(books, chapters, seasons, episodes, houses, characters, regions, towns, borders, stops, waypoints, paths) {
|
||||
var qmData = {
|
||||
borderArrays: {}
|
||||
};
|
||||
|
||||
|
||||
for (var i=0; i<borders.length; i++) {
|
||||
if (!(borders[i].name in qmData.borderArrays))
|
||||
qmData.borderArrays[borders[i].name] = [];
|
||||
qmData.borderArrays[borders[i].name].push(borders[i]);
|
||||
}
|
||||
|
||||
qmData.episodes = episodes.map(episodeModel);
|
||||
qmData.chapters = chapters.map(chapterModel);
|
||||
qmData.books = books;
|
||||
qmData.regions = regions.map(regionModel);
|
||||
qmData.characters = characters.map(characterModel);
|
||||
qmData.towns = getTownMarkers(towns, houses);
|
||||
qmData.heraldry = houses.map(heraldryMarkerModel);
|
||||
|
||||
|
||||
qmData.searchResults = [].concat(
|
||||
towns.map(townSearchModel),
|
||||
characters.map(characterSearchModel),
|
||||
houses.map(houseSearchModel),
|
||||
episodes.map(episodeSearchModel),
|
||||
chapters.map(chapterSearchModel)
|
||||
);
|
||||
|
||||
|
||||
return qmData;
|
||||
|
||||
|
||||
function episodeModel(episode) {
|
||||
var epNumber = (episode.episode.length==2) ? episode.episode : "0"+episode.episode;
|
||||
return {
|
||||
name: "S" + episode.season + "E" + epNumber + ": " + episode.title,
|
||||
url: (episode.awoiaf=="") ? "https://en.wikipedia.org/wiki/"+episode.wikipedia : "http://awoiaf.westeros.org/index.php/"+episode.awoiaf
|
||||
};
|
||||
}
|
||||
|
||||
function episodeSearchModel(episode) {
|
||||
var epNumber = (episode.episode.length==2) ? episode.episode : "0"+episode.episode;
|
||||
return {
|
||||
icon: "glyphicon-facetime-video",
|
||||
title: episode.title,
|
||||
subtitle: "HBO episode",
|
||||
abbr: "S" + episode.season + "E" + epNumber + ": " + episode.title,
|
||||
click: function(){slideTo(this.abbr)}
|
||||
};
|
||||
}
|
||||
|
||||
function chapterModel(chapter) {
|
||||
return {
|
||||
name: books[chapter.book].abbreviation + "-" + chapter.chapter + ": " + chapter.title,
|
||||
url: "http://awoiaf.westeros.org/index.php/"+chapter.awoiaf
|
||||
};
|
||||
}
|
||||
|
||||
function chapterSearchModel(chapter) {
|
||||
return {
|
||||
icon: "glyphicon-book",
|
||||
title: chapter.title,
|
||||
subtitle: books[chapter.book].title,
|
||||
abbr: books[chapter.book].abbreviation + "-" + chapter.chapter,
|
||||
click: function(){slideTo(this.abbr)}
|
||||
};
|
||||
}
|
||||
|
||||
function getTownMarkers(towns, houses) {
|
||||
var output = [];
|
||||
var matchingHouses = [];
|
||||
for (var townId=0; townId<towns.length; townId++) {
|
||||
var town = towns[townId];
|
||||
var matchingHouses = $filter('filter')(houses, {seatKey: town.key});
|
||||
|
||||
// Towns without nobility or other locations
|
||||
if (matchingHouses.length==0) output.push({
|
||||
key: town.key,
|
||||
name: decodeURI(town.key).replace(/_/g," "),
|
||||
url: "http://awoiaf.westeros.org/index.php/" + town.key,
|
||||
house: "No known lord",
|
||||
houseUrl: null,
|
||||
timing: {
|
||||
episodes: [0,999],
|
||||
chapters: [0,999]
|
||||
},
|
||||
direct: "#@" + town.key,
|
||||
coords: {
|
||||
latitude: parseFloat(town.latitude),
|
||||
longitude: parseFloat(town.longitude)
|
||||
},
|
||||
options: {
|
||||
icon: {path: 0, strokeOpacity: 0, scale: 3}
|
||||
}
|
||||
});
|
||||
|
||||
for (var houseId=0; houseId<matchingHouses.length; houseId++) {
|
||||
var house = matchingHouses[houseId];
|
||||
output.push({
|
||||
key: town.key,
|
||||
name: decodeURI(town.key).replace(/_/g," "),
|
||||
url: "http://awoiaf.westeros.org/index.php/" + town.key,
|
||||
house: decodeURI(house.wikiKey).replace(/_/g," "),
|
||||
houseUrl: "http://awoiaf.westeros.org/index.php/" + house.wikiKey,
|
||||
houseImg: house.img,
|
||||
timing: {
|
||||
episodes: [
|
||||
parseInt(house.firstEpisode, 10) || 0,
|
||||
parseInt(house.lastEpisode , 10) || 999
|
||||
],
|
||||
chapters: [
|
||||
parseInt(house.firstChapter, 10) || 0,
|
||||
parseInt(house.lastChapter , 10) || 999
|
||||
]
|
||||
},
|
||||
direct: "#@" + town.key,
|
||||
coords: {
|
||||
latitude: parseFloat(town.latitude),
|
||||
longitude: parseFloat(town.longitude)
|
||||
},
|
||||
options: {
|
||||
icon: {path: 0, strokeOpacity: 0, scale: 3}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
return output;
|
||||
}
|
||||
|
||||
function townSearchModel(town) {
|
||||
return {
|
||||
icon: "glyphicon-map-marker",
|
||||
key: town.key,
|
||||
title: town.name,
|
||||
subtitle: town.region.replace(/_/g," "),
|
||||
click: function(){panTo(this.key)}
|
||||
};
|
||||
}
|
||||
|
||||
function characterModel(character) {
|
||||
var output = {
|
||||
name: character.name,
|
||||
url: "http://awoiaf.westeros.org/index.php/" + character.awoiaf,
|
||||
house: ""
|
||||
}
|
||||
if (character.house!="") {
|
||||
matchingHouse = $filter('filter')(houses, {wikiKey: character.house})[0];
|
||||
output.house = {
|
||||
name: decodeURI(matchingHouse.wikiKey).replace(/_/g," "),
|
||||
url: "http://awoiaf.westeros.org/index.php/" + matchingHouse.wikiKey,
|
||||
img: matchingHouse.img
|
||||
}
|
||||
}
|
||||
return output;
|
||||
}
|
||||
|
||||
function characterSearchModel(character) {
|
||||
return {
|
||||
icon: "glyphicon-user",
|
||||
key: character.key,
|
||||
title: character.name,
|
||||
subtitle: decodeURI(character.house).replace(/_/g," "),
|
||||
click: function(){showCharacter(this.key)}
|
||||
};
|
||||
}
|
||||
|
||||
function heraldryMarkerModel(house, index) {
|
||||
if (house.seatKey=="") {
|
||||
var coords = {
|
||||
latitude: parseFloat(house.lat),
|
||||
longitude: parseFloat(house.lng)
|
||||
};
|
||||
} else {
|
||||
var matchingTown = $filter('filter')(qmData.towns, {key: house.seatKey})[0];
|
||||
var coords = matchingTown.coords;
|
||||
}
|
||||
house.isGreat = (house.isGreat=="TRUE");
|
||||
|
||||
return {
|
||||
key: "house-" + index,
|
||||
name: decodeURI(house.wikiKey).replace(/_/g," "),
|
||||
url: "http://awoiaf.westeros.org/index.php/" + house.wikiKey,
|
||||
seat: decodeURI(house.seatKey).replace(/_/g," ") || house.clue || "unknown",
|
||||
seatUrl: "http://awoiaf.westeros.org/index.php/" + house.seatKey,
|
||||
houseImg: house.img,
|
||||
timing: {
|
||||
episodes: [
|
||||
parseInt(house.firstEpisode, 10) || 0,
|
||||
parseInt(house.lastEpisode , 10) || 999
|
||||
],
|
||||
chapters: [
|
||||
parseInt(house.firstChapter, 10) || 0,
|
||||
parseInt(house.lastChapter , 10) || 999
|
||||
]
|
||||
},
|
||||
direct: "#@" + house.seatKey,
|
||||
coords: coords,
|
||||
options: {
|
||||
icon: {
|
||||
url: house.img,
|
||||
scaledSize: house.isGreat ? {height:60, width:50} : {height:30, width:25},
|
||||
anchor: house.isGreat ? {x:30, y:25} : {x:15, y:12}
|
||||
}
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
function houseSearchModel(house) {
|
||||
return {
|
||||
icon: "glyphicon-home",
|
||||
title: decodeURI(house.wikiKey).replace(/_/g," "),
|
||||
subtitle: (house.seatKey=="") ? house.clue : decodeURI(house.seatKey).replace(/_/g," "),
|
||||
click: function(){showCharacter(character.key)}
|
||||
};
|
||||
}
|
||||
|
||||
function regionModel(region) {
|
||||
return {
|
||||
key: region.key,
|
||||
fill: {
|
||||
color: region.color,
|
||||
opacity: 0.5
|
||||
},
|
||||
stroke: {weight: 0},
|
||||
path: qmData.borderArrays[region.key]
|
||||
};
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
function getFile(filename) {
|
||||
return $http
|
||||
.get(csvLocation + filename)
|
||||
@@ -72,52 +332,6 @@ angular.module('quartermaester')
|
||||
return resp.data;
|
||||
}
|
||||
|
||||
function setHomes(locations, houses) {
|
||||
//console.log(locations, houses);
|
||||
|
||||
var markers = locations.map(locationModel);
|
||||
|
||||
for (var i=0; i<markers.length; i++) {
|
||||
var matchingHouses = $filter('filter')(houses, {seatKey: locations[i].key});
|
||||
markers[i].occupants = matchingHouses.map(function(house) {
|
||||
return {
|
||||
name: decodeURI(house.wikiKey).replace(/_/g," "),
|
||||
url: "http://awoiaf.westeros.org/index.php/" + house.wikiKey,
|
||||
img: house.img,
|
||||
firstChapter: parseInt(house.firstChapter, 10) || null,
|
||||
lastChapter: parseInt(house.lastChapter, 10) || null,
|
||||
firstEpisode: parseInt(house.firstEpisode, 10) || null,
|
||||
lastEpisode: parseInt(house.lastEpisode, 10) || null
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
return markers;
|
||||
}
|
||||
|
||||
function locationModel(json) {
|
||||
return {
|
||||
key: json.key,
|
||||
name: decodeURI(json.key).replace(/_/g," "),
|
||||
url: "http://awoiaf.westeros.org/index.php/" + json.key,
|
||||
direct: "#@" + json.key,
|
||||
coords: {
|
||||
latitude: parseFloat(json.latitude),
|
||||
longitude: parseFloat(json.longitude)
|
||||
},
|
||||
options: {
|
||||
icon: {path: 0, strokeOpacity: 0, scale: 3}
|
||||
},
|
||||
occupants: []
|
||||
};
|
||||
}
|
||||
|
||||
function getCurrentOccupant(marker) {
|
||||
if (marker.occupants.length==0) return null;
|
||||
if (marker.occupants.length==1) return marker.occupants[0];
|
||||
return $filter('qmSlider')(marker.occupants, "episodes", 0)[0];
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
@@ -125,18 +339,15 @@ angular.module('quartermaester')
|
||||
|
||||
// In the return function, we must pass in a single parameter which will be the data we will work on.
|
||||
// We have the ability to support multiple other parameters that can be passed into the filter optionally
|
||||
return function(inputArray, slider, value) {
|
||||
return function(inputArray, slider) {
|
||||
|
||||
var outputArray = [];
|
||||
var currentValue = (slider.show=="episodes") ? slider.currentEpisode : slider.currentChapter;
|
||||
|
||||
outputArray = [];
|
||||
for (var i=0; i<inputArray.length; i++) {
|
||||
switch (slider) {
|
||||
case "episodes":
|
||||
if (inputArray[i].firstEpisode==null || (value>=inputArray[i].firstEpisode && value<=inputArray[i].lastEpisode)) outputArray.push(inputArray[i]);
|
||||
break;
|
||||
case "chapters":
|
||||
if (inputArray[i].firstChapter==null || (value>=inputArray[i].firstChapter && value<=inputArray[i].lastChapter)) outputArray.push(inputArray[i]);
|
||||
break;
|
||||
}
|
||||
if (currentValue < inputArray[i].timing[slider.show][0]) continue;
|
||||
if (currentValue > inputArray[i].timing[slider.show][1]) continue;
|
||||
outputArray.push(inputArray[i]);
|
||||
}
|
||||
|
||||
return outputArray;
|
||||
|
||||
Reference in New Issue
Block a user