From 67168e2681597e8225a1fccce91623f7378caa3f Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Mon, 29 Jul 2019 20:32:28 +0000 Subject: [PATCH] Disable Chrome tests due to Nightwatch.js issues: --- map.js | 23 ++++++++++++----------- 1 files changed, 12 insertions(+), 11 deletions(-) diff --git a/map.js b/map.js index df297da..6f628c9 100644 --- a/map.js +++ b/map.js @@ -82,19 +82,19 @@ this._element = element; this._element.classList.add('panel'); - this._hide = addParaWithText(this._element, '▶'); + this._hide = addElementWithText(this._element, 'a', '▶'); this._hide.title = lang.action_collapse; this._hide.className = 'hide'; this._hide.addEventListener('click', this.toggleExpanded.bind(this)); - this._close = addParaWithText(this._element, '×'); + this._close = addElementWithText(this._element, 'a', '×'); this._close.title = lang.action_close; this._close.className = 'close'; this._close.addEventListener('click', this.close.bind(this)); this._content = document.createElement('div'); this._element.appendChild(this._content); -}; +} Panel.prototype = { _element: null, _hide: null, @@ -276,11 +276,12 @@ fill = '#922'; } - var image = '<svg xmlns="http://www.w3.org/2000/svg" height="30" width="20"><polygon points="10,0 20,23 0,23" style="fill:'+fill+';stroke:'+color_type+';stroke-width:3" /></svg>'; + var image = '<svg xmlns="http://www.w3.org/2000/svg" width="20" height="30"><polygon points="10,0 20,23 0,23" style="fill:'+fill+';stroke:'+color_type+';stroke-width:3"/></svg>'; vehicle.setStyle(new ol.style.Style({ image: new ol.style.Icon({ src: 'data:image/svg+xml;base64,' + btoa(image), + imgSize: [20,30], rotation: Math.PI * parseFloat(vehicle.get('heading') ? vehicle.get('heading') : 0) / 180.0, }), text: new ol.style.Text({ @@ -591,6 +592,8 @@ } // Vehicle else if(ttss_types.includes(type)) { + styleVehicle(feature, true); + var span = displayVehicle(feature.get('vehicle_type')); additional = document.createElement('p'); @@ -606,8 +609,6 @@ vehicleTable(feature, tbody); vehiclePath(feature); - - styleVehicle(feature, true); } // Stop or stop point else if(['s', 'p'].includes(type)) { @@ -674,7 +675,7 @@ })}, 10); }; showOnMapElement.addEventListener('click', showOnMapFunction); - showOnMapElement.className = 'icon-pin addon-icon'; + showOnMapElement.className = 'icon icon-pin'; showOnMapElement.title = lang.show_on_map; if(additional) { @@ -709,7 +710,7 @@ function listFeatures(features) { var div = document.createElement('div'); - if(features.length == 0) { + if(features.length === 0) { addParaWithText(div, lang.no_results); return div; } @@ -910,8 +911,6 @@ vehicles_last_update[type] = 0; }); - ol.style.IconImageCache.shared.setSize(512); - geolocation_feature = new ol.Feature({ name: '', style: new ol.style.Style({ @@ -965,7 +964,9 @@ var layers = [ new ol.layer.Tile({ - source: new ol.source.OSM(), + source: new ol.source.OSM({ + url: 'https://tiles.ttss.pl/{z}/{x}/{y}.png', + }), }), route_layer, geolocation_layer, -- Gitblit v1.9.1