From fdabd2ef21b45abf1f14a5f614a94960a92915b9 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Mon, 03 Jun 2019 09:17:51 +0000
Subject: [PATCH] Update stops list (i.e. Brzeźnica, Rzeszotary, Skawina, Świątniki)
---
map.js | 40 +++++++++++++++++++++++-----------------
1 files changed, 23 insertions(+), 17 deletions(-)
diff --git a/map.js b/map.js
index aefb371..4ce669a 100644
--- a/map.js
+++ b/map.js
@@ -1,4 +1,4 @@
-"use strict";
+'use strict';
var ttss_refresh = 10000; // 10 seconds
var ttss_position_type = 'RAW';
@@ -20,7 +20,7 @@
var vehicles_info = {};
var stops_xhr = null;
-var stops_ignored = ['131'];
+var stops_ignored = ['131', '744', '1263'];
var stops_style = {
'sb': new ol.style.Style({
image: new ol.style.Circle({
@@ -228,7 +228,6 @@
var feature, prefix;
for(var i = 0; i < stops.length; i++) {
- feature = null;
if(stops[i].getId) {
feature = stops[i];
} else {
@@ -278,7 +277,7 @@
var vehicle_name_space = vehicle.name.indexOf(' ');
vehicle.line = vehicle.name.substr(0, vehicle_name_space);
- vehicle.direction = vehicle.name.substr(vehicle_name_space+1);
+ vehicle.direction = normalizeName(vehicle.name.substr(vehicle_name_space+1));
if(special_directions[vehicle.direction]) {
vehicle.line = special_directions[vehicle.direction];
}
@@ -310,8 +309,9 @@
function updateStopSource(stops, prefix) {
var source = stops_source[prefix];
var mapping = stops_mapping[prefix];
+ var stop;
for(var i = 0; i < stops.length; i++) {
- var stop = stops[i];
+ stop = stops[i];
if(stop.category == 'other') continue;
if(stops_ignored.includes(stop.shortName)) continue;
@@ -347,7 +347,7 @@
}).fail(fail_ajax);
}
-function vehiclePath(feature, tripId) {
+function vehiclePath(feature) {
if(path_xhr) path_xhr.abort();
var featureId = feature.getId();
@@ -389,7 +389,7 @@
+ '?tripId=' + encodeURIComponent(feature.get('tripId'))
+ '&mode=departure'
).done(function(data) {
- if(!data.routeName || !data.directionText) {
+ if(typeof data.old === "undefined" || typeof data.actual === "undefined") {
return;
}
@@ -401,7 +401,7 @@
for(var i = 0, il = all_departures.length; i < il; i++) {
tr = document.createElement('tr');
addCellWithText(tr, all_departures[i].actualTime || all_departures[i].plannedTime);
- addCellWithText(tr, all_departures[i].stop_seq_num + '. ' + all_departures[i].stop.name);
+ addCellWithText(tr, all_departures[i].stop_seq_num + '. ' + normalizeName(all_departures[i].stop.name));
if(i >= data.old.length) {
stopsToMark.push('s' + ttss_type + all_departures[i].stop.id);
@@ -413,6 +413,14 @@
tr.className = 'success';
}
table.appendChild(tr);
+ }
+
+ if(all_departures.length === 0) {
+ tr = document.createElement('tr');
+ table.appendChild(tr);
+ tr = addCellWithText(tr, lang.no_data);
+ tr.colSpan = '2';
+ tr.className = 'active';
}
markStops(stopsToMark, ttss_type, true);
@@ -438,7 +446,7 @@
for(var i = 0, il = all_departures.length; i < il; i++) {
tr = document.createElement('tr');
addCellWithText(tr, all_departures[i].patternText);
- dir_cell = addCellWithText(tr, all_departures[i].direction);
+ dir_cell = addCellWithText(tr, normalizeName(all_departures[i].direction));
vehicle = parseVehicle(all_departures[i].vehicleId);
dir_cell.appendChild(displayVehicle(vehicle));
status = parseStatus(all_departures[i]);
@@ -476,12 +484,9 @@
return;
}
- var coordinates = feature.getGeometry().getCoordinates();
-
var div = document.createElement('div');
- var typeName;
- var name = feature.get('name');
+ var name = normalizeName(feature.get('name'));
var additional;
var table = document.createElement('table');
var thead = document.createElement('thead');
@@ -620,6 +625,8 @@
if(feature.getId()) features.push(feature);
});
+ var feature = features[0];
+
if(features.length > 1) {
featureClicked();
@@ -627,7 +634,7 @@
addParaWithText(div, lang.select_feature);
- var feature, p, a, full_type, typeName;
+ var p, a, full_type, typeName;
for(var i = 0; i < features.length; i++) {
feature = features[i];
@@ -646,7 +653,7 @@
addElementWithText(a, 'span', typeName).className = 'small';
a.appendChild(document.createTextNode(' '));
- addElementWithText(a, 'span', feature.get('name'));
+ addElementWithText(a, 'span', normalizeName(feature.get('name')));
div.appendChild(p);
}
@@ -656,7 +663,6 @@
return;
}
- var feature = features[0];
if(!feature) {
stops_type.forEach(function(type) {
if(stops_layer[type].getVisible()) {
@@ -906,7 +912,7 @@
});
// Change layer visibility on zoom
- var change_resolution = function(e) {
+ var change_resolution = function() {
stops_type.forEach(function(type) {
if(type.startsWith('p')) {
stops_layer[type].setVisible(map.getView().getZoom() >= 16);
--
Gitblit v1.9.1