From adaa1f628f04a6af247e142edbea679578b90fef Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Sat, 15 Apr 2017 11:43:18 +0000
Subject: [PATCH] Add layers with stops and stop points
---
map.html | 220 ++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 193 insertions(+), 27 deletions(-)
diff --git a/map.html b/map.html
index 0edfc98..4a97865 100644
--- a/map.html
+++ b/map.html
@@ -1,18 +1,34 @@
<!DOCTYPE HTML>
<html>
<head>
-<title>OpenLayers Demo</title>
+<title>MPK Kraków Map</title>
<style type="text/css">
html, body, #map {
width: 100%;
height: 100%;
margin: 0;
}
+#popup {
+ color: black;
+ background: white;
+ padding: 5px;
+ border: 1px solid black;
+ border-radius: 10px;
+ font: 12px sans-serif;
+}
+#popup p {
+ margin: 0;
+ padding: 5px;
+}
+#popup .line-direction {
+ font-weight: bold;
+}
</style>
-<script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha384-3ceskX3iaEnIogmQchP8opvBy3Mi7Ce34nWjpBIwVTHfGYWQS9jwHDVRnpKKHJg7" crossorigin="anonymous"></script>
+<script src="https://code.jquery.com/jquery-3.1.1.min.js" integrity="sha384-3ceskX3iaEnIogmQchP8opvBy3Mi7Ce34nWjpBIwVTHfGYWQS9jwHDVRnpKKHJg7" crossorigin="anonymous"></script>
<script src="https://cdn.polyfill.io/v2/polyfill.min.js?features=requestAnimationFrame,Element.prototype.classList"></script>
-<script src="https://openlayers.org/en/v4.0.1/build/ol.js" type="text/javascript"></script>
+<script src="https://openlayers.org/en/v4.0.1/build/ol.js" integrity="sha384-DjqoiOTAYD0bxdY6K1Ep7Xd4QQc46AKzKmkgC4+rnKX47PniPHIjRt02uhT8C04h" crossorigin="anonymous"></script>
<script tyle="text/javascript" src="lang_en.js" id="lang_script"></script>
+<script tyle="text/javascript" src="common.js"></script>
</head>
<body>
<div id="map"><div id="popup"></div></div>
@@ -22,11 +38,20 @@
var ttss_base = '/proxy.php';
var ttss_refresh = 5000; // 5 seconds
-var vehicles_source = null;
var vehicles_xhr = null;
var vehicles_timer = null;
+var vehicles_last_update = 0;
+var vehicles_source = null;
+var vehicles_layer = null;
+
+var stops_xhr = null;
+var stops_source = null;
+var stops_layer = null;
+var stop_points_source = null;
+var stop_points_layer = null;
var map = null;
+var popup_feature_id = null;
var popup_element = document.getElementById('popup');
var popup = null;
@@ -48,6 +73,22 @@
}
}
+function popupHide() {
+ popup.setPosition(undefined);
+ popup_feature_id = null;
+}
+
+function popupShow(coordinates, id) {
+ popup.setPosition(coordinates);
+ if(id) {
+ popup_feature_id = id;
+ }
+}
+
+function getGeometry(object) {
+ return new ol.geom.Point(ol.proj.fromLonLat([object.longitude / 3600000.0, object.latitude / 3600000.0]))
+}
+
function init() {
if(!window.jQuery) {
fail(lang.jquery_not_loaded);
@@ -60,15 +101,34 @@
});
+
+ stops_source = new ol.source.Vector({
+ features: [],
+ });
+ stops_layer = new ol.layer.Vector({
+ source: stops_source,
+ });
+
+ stop_points_source = new ol.source.Vector({
+ features: [],
+ });
+ stop_points_layer = new ol.layer.Vector({
+ source: stop_points_source,
+ visible: false,
+ });
+
vehicles_source = new ol.source.Vector({
- features: []
+ features: [],
+ });
+ vehicles_layer = new ol.layer.Vector({
+ source: vehicles_source,
});
popup = new ol.Overlay({
element: popup_element,
positioning: 'bottom-center',
stopEvent: false,
- offset: [0, -50]
+ offset: [0, -12]
});
map = new ol.Map({
@@ -77,9 +137,9 @@
new ol.layer.Tile({
source: new ol.source.OSM()
}),
- new ol.layer.Vector({
- source: vehicles_source,
- }),
+ stops_layer,
+ stop_points_layer,
+ vehicles_layer,
],
overlays: [popup],
view: new ol.View({
@@ -88,25 +148,51 @@
})
});
- // display popup on click
- map.on('singleclick', function(evt) {
- var feature = map.forEachFeatureAtPixel(evt.pixel, function(feature) { return feature; });
- if (feature) {
+ // Display popup on click
+ map.on('singleclick', function(e) {
+ var feature = map.forEachFeatureAtPixel(e.pixel, function(feature) { return feature; });
+ if(feature) {
var coordinates = feature.getGeometry().getCoordinates();
- popup_element.innerHtml = feature.name;
- popup.setPosition(coordinates);
+
+ deleteChildren(popup_element);
+ switch(feature.getId().substr(0, 1)) {
+ case 'v':
+ addParaWithText(popup_element, feature.get('name')).className = 'line-direction';
+
+ var vehicle_type = parseVehicle(feature.get('id'));
+ if(vehicle_type) {
+ addParaWithText(popup_element, vehicle_type.num + ' ' + vehicle_type.type);
+ }
+ break;
+ case 's':
+ case 'p':
+ addParaWithText(popup_element, feature.get('name')).className = 'line-direction';
+ break;
+
+ }
+
+ popupShow(coordinates, feature.getId());
} else {
- popup.setPosition(undefined);
+ popupHide();
}
});
- // change mouse cursor when over marker
+ // Change mouse cursor when over marker
map.on('pointermove', function(e) {
- var pixel = map.getEventPixel(e.originalEvent);
- var hit = map.hasFeatureAtPixel(pixel);
- var target = map.getTarget();
- if(target.style)
- target.style.cursor = hit ? 'pointer' : '';
+ var hit = map.hasFeatureAtPixel(e.pixel);
+ var target = map.getTargetElement();
+ target.style.cursor = hit ? 'pointer' : '';
+ });
+
+ // Change layer visibility on zoom
+ map.getView().on('change:resolution', function(e) {
+ if(map.getView().getZoom() >= 16) {
+ stops_layer.setVisible(false);
+ stop_points_layer.setVisible(true);
+ } else {
+ stops_layer.setVisible(true);
+ stop_points_layer.setVisible(false);
+ }
});
}
@@ -118,14 +204,20 @@
ttss_base + '/geoserviceDispatcher/services/vehicleinfo/vehicles'
+ '?positionType=CORRECTED'
+ '&colorType=ROUTE_BASED'
+ + '&lastUpdate=' + encodeURIComponent(vehicles_last_update)
).done(function(data) {
+ vehicles_last_update = data.lastUpdate;
+
for(var i = 0; i < data.vehicles.length; i++) {
var vehicle = data.vehicles[i];
- var vehicle_feature = vehicles_source.getFeatureById(vehicle.id);
+ var vehicle_feature = vehicles_source.getFeatureById('v' + vehicle.id);
if(vehicle.isDeleted) {
if(vehicle_feature) {
vehicles_source.removeFeature(vehicle_feature);
+ if(popup_feature_id == vehicle_feature.getId()) {
+ popupHide();
+ }
}
continue;
}
@@ -133,21 +225,44 @@
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.geometry = new ol.geom.Point(ol.proj.fromLonLat([vehicle.longitude / 3600000.0, vehicle.latitude / 3600000.0]));
+ if(special_directions[vehicle.direction]) {
+ vehicle.line = special_directions[vehicle.direction];
+ }
+
+ vehicle.geometry = getGeometry(vehicle);
+ vehicle.vehicle_type = parseVehicle(vehicle.id);
if(!vehicle_feature) {
vehicle_feature = new ol.Feature(vehicle);
- vehicle_feature.setId(vehicle.id);
+ vehicle_feature.setId('v' + vehicle.id);
+
+ var color_type = 'black';
+ if(vehicle.vehicle_type) {
+ switch(vehicle.vehicle_type.low) {
+ case 0:
+ color_type = 'orange';
+ break;
+ case 1:
+ color_type = 'blue';
+ break;
+ case 2:
+ color_type = 'green';
+ break;
+ }
+ }
+
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: 'black', width: 1}),
+ stroke: new ol.style.Stroke({color: color_type, width: 2}),
points: 3,
radius: 12,
- rotation: Math.PI * 2.0 * vehicle.heading / 360.0,
+ rotation: Math.PI * parseFloat(vehicle.heading) / 180.0,
+ rotateWithView: true,
angle: 0
}),
text: new ol.style.Text({
+ font: 'bold 10px sans-serif',
text: vehicle.line,
fill: new ol.style.Fill({color: 'white'}),
}),
@@ -155,6 +270,11 @@
vehicles_source.addFeature(vehicle_feature);
} 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());
+ }
}
}
@@ -164,8 +284,54 @@
}).fail(fail_ajax);
}
+function updateStopSource(stops, prefix, source) {
+ source.clear();
+
+ for(var i = 0; i < stops.length; i++) {
+ var stop = stops[i];
+ stop.geometry = getGeometry(stop);
+ var stop_feature = new ol.Feature(stop);
+
+ stop_feature.setId(prefix + stop.id);
+ stop_feature.setStyle(new ol.style.Style({
+ image: new ol.style.Circle({
+ fill: new ol.style.Fill({color: 'orange'}),
+ stroke: new ol.style.Stroke({color: 'red', width: 1}),
+ radius: 3,
+ }),
+ }));
+
+ source.addFeature(stop_feature);
+ }
+}
+
+function updateStops() {
+ $.get(
+ ttss_base + '/geoserviceDispatcher/services/stopinfo/stops'
+ + '?left=-648000000'
+ + '&bottom=-324000000'
+ + '&right=648000000'
+ + '&top=324000000'
+ ).done(function(data) {
+ updateStopSource(data.stops, 's', stops_source);
+ }).fail(fail_ajax);
+}
+function updateStopPoints() {
+ $.get(
+ ttss_base + '/geoserviceDispatcher/services/stopinfo/stopPoints'
+ + '?left=-648000000'
+ + '&bottom=-324000000'
+ + '&right=648000000'
+ + '&top=324000000'
+ ).done(function(data) {
+ updateStopSource(data.stopPoints, 'p', stop_points_source);
+ }).fail(fail_ajax);
+}
+
init();
updateVehicles();
+updateStops();
+updateStopPoints();
</script>
</body>
</html>
--
Gitblit v1.9.1