From 8b6250cb5db8d1bb17902d45f08a2e929e8e0afd Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Sun, 23 Apr 2017 22:40:51 +0000 Subject: [PATCH] Add stop departures and vehicle route to pane --- map.js | 244 +++++++++++++++++++++++++++++++++++++++--------- 1 files changed, 198 insertions(+), 46 deletions(-) diff --git a/map.js b/map.js index e7b821d..7547af4 100644 --- a/map.js +++ b/map.js @@ -1,5 +1,5 @@ //var ttss_base = 'http://www.ttss.krakow.pl/internetservice'; -var ttss_base = '/proxy.php'; +var ttss_base = 'proxy.php'; var ttss_refresh = 10000; // 10 seconds var vehicles_xhr = null; @@ -14,10 +14,12 @@ var stop_points_source = null; var stop_points_layer = null; +var feature_id = null; +var feature_xhr = null; +var feature_timer = null; + var map = null; -var popup_feature_id = null; var popup_element = document.getElementById('popup'); -var popup = null; var fail_element = document.getElementById('fail'); var ignore_hashchange = false; @@ -29,33 +31,33 @@ fail_element.style.top = '0.5em'; } -function fail_ajax(data) { +function fail_popup(msg) { + addElementWithText(popup_element, 'p', msg).className = 'error'; +} + +function fail_ajax_generic(data, fnc) { // abort() is not a failure if(data.readyState == 0 && data.statusText == 'abort') return; if(data.status == 0) { - fail(lang.error_request_failed_connectivity, data); + fnc(lang.error_request_failed_connectivity, data); } else if (data.statusText) { - fail(lang.error_request_failed_status.replace('$status', data.statusText), data); + fnc(lang.error_request_failed_status.replace('$status', data.statusText), data); } else { - fail(lang.error_request_failed, data); + fnc(lang.error_request_failed, data); } } -function popupHide() { - popup.setPosition(undefined); - popup_feature_id = null; +function fail_ajax(data) { + fail_ajax_generic(data, fail); } -function popupShow(coordinates, id) { - popup.setPosition(coordinates); - if(id) { - popup_feature_id = id; - } +function fail_ajax_popup(data) { + fail_ajax_generic(data, fail_popup); } function getGeometry(object) { - return new ol.geom.Point(ol.proj.fromLonLat([object.longitude / 3600000.0, object.latitude / 3600000.0])) + return new ol.geom.Point(ol.proj.fromLonLat([object.longitude / 3600000.0, object.latitude / 3600000.0])); } function updateVehicles() { @@ -77,8 +79,8 @@ if(vehicle.isDeleted) { if(vehicle_feature) { vehicles_source.removeFeature(vehicle_feature); - if(popup_feature_id == vehicle_feature.getId()) { - popupHide(); + if(feature_id == vehicle_feature.getId()) { + featureClicked(); } } continue; @@ -114,14 +116,9 @@ } vehicle_feature.setStyle(new ol.style.Style({ - image: new ol.style.RegularShape({ - fill: new ol.style.Fill({color: '#3399ff'}), - stroke: new ol.style.Stroke({color: color_type, width: 2}), - points: 3, - radius: 12, + image: new ol.style.Icon({ + src: 'data:image/svg+xml;base64,' + btoa('<svg xmlns="http://www.w3.org/2000/svg" height="30" width="20"><polygon points="10,0 20,23 0,23" style="fill:#3399ff;stroke:'+color_type+';stroke-width:2" /></svg>'), rotation: Math.PI * parseFloat(vehicle.heading) / 180.0, - rotateWithView: true, - angle: 0 }), text: new ol.style.Text({ font: 'bold 10px sans-serif', @@ -133,10 +130,6 @@ } else { vehicle_feature.setProperties(vehicle); vehicle_feature.getStyle().getImage().setRotation(Math.PI * parseFloat(vehicle.heading) / 180.0); - - if(popup_feature_id == vehicle_feature.getId()) { - popupShow(vehicle_feature.getGeometry().getCoordinates()); - } } } @@ -196,9 +189,103 @@ }).fail(fail_ajax); } +function vehicleTable(tripId, table) { + if(feature_xhr) feature_xhr.abort(); + if(feature_timer) clearTimeout(feature_timer); + + feature_xhr = $.get( + ttss_base + '/services/tripInfo/tripPassages' + + '?tripId=' + encodeURIComponent(tripId) + + '&mode=departure' + ).done(function(data) { + if(!data.routeName || !data.directionText || data.old.length + data.actual.length == 0) { + return; + } + + deleteChildren(table); + + for(var i = 0, il = data.old.length; i < il; i++) { + var tr = document.createElement('tr'); + addCellWithText(tr, data.old[i].actualTime || data.old[i].plannedTime); + addCellWithText(tr, data.old[i].stop_seq_num + '. ' + data.old[i].stop.name); + + tr.className = 'active'; + table.appendChild(tr); + } + + for(var i = 0, il = data.actual.length; i < il; i++) { + var tr = document.createElement('tr'); + addCellWithText(tr, data.actual[i].actualTime || data.actual[i].plannedTime); + addCellWithText(tr, data.actual[i].stop_seq_num + '. ' + data.actual[i].stop.name); + + if(data.actual[i].status == 'STOPPING') { + tr.className = 'success'; + } + table.appendChild(tr); + } + + feature_timer = setTimeout(function() { vehicleTable(tripId, table); }, ttss_refresh); + }).fail(fail_ajax_popup); +} + +function stopTable(stopType, stopId, table) { + if(feature_xhr) feature_xhr.abort(); + if(feature_timer) clearTimeout(feature_timer); + + feature_xhr = $.get( + ttss_base + '/services/passageInfo/stopPassages/' + stopType + + '?' + stopType + '=' + encodeURIComponent(stopId) + + '&mode=departure' + ).done(function(data) { + deleteChildren(table); + + for(var i = 0, il = data.old.length; i < il; i++) { + var tr = document.createElement('tr'); + addCellWithText(tr, data.old[i].patternText); + var dir_cell = addCellWithText(tr, data.old[i].direction); + var vehicle = parseVehicle(data.old[i].vehicleId); + dir_cell.appendChild(displayVehicle(vehicle)); + var status = parseStatus(data.old[i]); + addCellWithText(tr, status); + addCellWithText(tr, ''); + + tr.className = 'active'; + table.appendChild(tr); + } + + for(var i = 0, il = data.actual.length; i < il; i++) { + var tr = document.createElement('tr'); + addCellWithText(tr, data.actual[i].patternText); + var dir_cell = addCellWithText(tr, data.actual[i].direction); + var vehicle = parseVehicle(data.actual[i].vehicleId); + dir_cell.appendChild(displayVehicle(vehicle)); + var status = parseStatus(data.actual[i]); + var status_cell = addCellWithText(tr, status); + var delay = parseDelay(data.actual[i]); + var delay_cell = addCellWithText(tr, delay); + + if(status == lang.boarding_sign) { + tr.className = 'success'; + status_cell.className = 'status-boarding'; + } else if(parseInt(delay) > 9) { + tr.className = 'danger'; + delay_cell.className = 'status-delayed'; + } else if(parseInt(delay) > 3) { + tr.className = 'warning'; + } + + table.appendChild(tr); + } + + feature_timer = setTimeout(function() { stopTable(stopType, stopId, table); }, ttss_refresh); + }).fail(fail_ajax_popup); +} + function featureClicked(feature) { if(!feature) { - popupHide(); + feature_id = null; + + $(popup_element).removeClass('show'); ignore_hashchange = true; window.location.hash = ''; @@ -210,20 +297,96 @@ deleteChildren(popup_element); - addParaWithText(popup_element, feature.get('name')).className = 'bold'; + var close = addParaWithText(popup_element, '×'); + close.className = 'close'; + close.addEventListener('click', function() { featureClicked(); }); + + var type; + var name = feature.get('name'); + var additional; + var table = document.createElement('table'); + var thead = document.createElement('thead'); + var tbody = document.createElement('tbody'); + table.appendChild(thead); + table.appendChild(tbody); + switch(feature.getId().substr(0, 1)) { case 'v': - var vehicle_type = parseVehicle(feature.get('id')); - if(vehicle_type) { - addParaWithText(popup_element, vehicle_type.num + ' ' + vehicle_type.type); + type = lang.type_vehicle; + + if(!feature.get('vehicle_type')) { + break; } + + var span = displayVehicle(feature.get('vehicle_type')); + + additional = document.createElement('p'); + setText(additional, span.title); + additional.insertBefore(span, additional.firstChild); + + addElementWithText(thead, 'th', lang.header_time); + addElementWithText(thead, 'th', lang.header_stop); + + vehicleTable(feature.get('tripId'), tbody); + break; + case 's': + type = lang.type_stop; + + addElementWithText(thead, 'th', lang.header_line); + addElementWithText(thead, 'th', lang.header_direction); + addElementWithText(thead, 'th', lang.header_time); + addElementWithText(thead, 'th', lang.header_delay); + + stopTable('stop', feature.get('shortName'), tbody); + break; + case 'p': + type = lang.type_stoppoint; + + additional = document.createElement('p'); + additional.className = 'small'; + addElementWithText(additional, 'a', lang.departures_for_stop).addEventListener( + 'click', + function() { + featureClicked(stops_source.forEachFeature(function(stop_feature) { + if(stop_feature.get('shortName') == feature.get('shortName')) { + return stop_feature; + } + })); + } + ); + + addElementWithText(thead, 'th', lang.header_line); + addElementWithText(thead, 'th', lang.header_direction); + addElementWithText(thead, 'th', lang.header_time); + addElementWithText(thead, 'th', lang.header_delay); + + stopTable('stopPoint', feature.get('stopPoint'), tbody); break; } + + var loader = addElementWithText(tbody, 'td', lang.loading); + loader.className = 'active'; + loader.colspan = thead.childNodes.length; + + addParaWithText(popup_element, type).className = 'type'; + addParaWithText(popup_element, name).className = 'name'; + + if(additional) { + popup_element.appendChild(additional); + } + + popup_element.appendChild(table); ignore_hashchange = true; window.location.hash = '#!' + feature.getId(); - popupShow(coordinates, feature.getId()); + map.getView().animate({ + center: feature.getGeometry().getCoordinates(), + }); + + $(popup_element).addClass('show'); + + feature_id = feature.getId(); } function hash() { @@ -265,9 +428,6 @@ } featureClicked(feature); - if(feature) { - map.getView().setCenter(feature.getGeometry().getCoordinates()); - } } function init() { @@ -303,13 +463,6 @@ source: vehicles_source, }); - popup = new ol.Overlay({ - element: popup_element, - positioning: 'bottom-center', - stopEvent: false, - offset: [0, -12] - }); - map = new ol.Map({ target: 'map', layers: [ @@ -320,7 +473,6 @@ stop_points_layer, vehicles_layer, ], - overlays: [popup], view: new ol.View({ center: ol.proj.fromLonLat([19.94, 50.06]), zoom: 13 -- Gitblit v1.9.1