summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChristopher Baines <cb15g11@soton.ac.uk>2014-05-28 17:42:23 +0100
committerChristopher Baines <cb15g11@soton.ac.uk>2014-05-28 17:42:23 +0100
commite4598474147b7250e798056a3bede51f30517c60 (patch)
tree8f1fa7dcbee0b19a22616fb445f7531d1256640f /src
parent46a9b15c8a24d6186c85b61c0239c1b99a15d070 (diff)
downloadleaflet-soton-e4598474147b7250e798056a3bede51f30517c60.tar
leaflet-soton-e4598474147b7250e798056a3bede51f30517c60.tar.gz
Bus routes are back
Diffstat (limited to 'src')
-rw-r--r--src/leaflet-soton.js11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/leaflet-soton.js b/src/leaflet-soton.js
index 5f97e43..77f0d02 100644
--- a/src/leaflet-soton.js
+++ b/src/leaflet-soton.js
@@ -315,7 +315,7 @@ SELECT * WHERE {\
var emptyFeatureCollection = { type: "FeatureCollection", features: [] };
var transparaentStyle = function(feature) {return {weight: 0, opacity: 0, fillOpacity: 0};};
- var layerNames = ['sites', 'parking', 'bicycleParking', 'buildings', 'busStops' /*'busRoutes',*/];
+ var layerNames = ['sites', 'parking', 'bicycleParking', 'buildings', 'busStops', 'busRoutes'];
var busRouteStyle = function(feature) {
return {weight: 5, opacity: 0.5, color: feature.properties.colour};
@@ -354,10 +354,6 @@ SELECT * WHERE {\
options.highlight = {};
}
- var overlayMaps = {
- //"Bus Routes": self.layers.busRoutes,
- };
-
if ("Hash" in L) {
var hash;
if (this.options.indoor) {
@@ -384,7 +380,7 @@ SELECT * WHERE {\
return {weight: 5, opacity: 0.5, color: 'blue'};
} else if (layerName === "busRoutes") {
- return busRouteStyle();
+ return busRouteStyle(feature);
} else {
return blankStyle();
}
@@ -897,7 +893,8 @@ SELECT * WHERE {\
buildings: buildingTemplate,
bicycleParking: bicycleParkingTemplate,
parking: parkingTemplate,
- busStops: busStopTemplate
+ busStops: busStopTemplate,
+ busRoutes: busRouteTemplate
};
function roomPopupTemplate(properties) {