diff options
| author | Luc Donnet | 2018-02-01 14:07:04 +0100 |
|---|---|---|
| committer | GitHub | 2018-02-01 14:07:04 +0100 |
| commit | d896ba8753f9877dfd29a97cf1310d54d0b25874 (patch) | |
| tree | 19afac1ab9f2a978a5a3685492e35c92762e745c /app/javascript/helpers/routes_map.coffee | |
| parent | b7680876c8f13486dbc58b4a6ce7ffe519bfb897 (diff) | |
| parent | 3279d4bcee982c13f260aa589ab190133f930af0 (diff) | |
| download | chouette-core-d896ba8753f9877dfd29a97cf1310d54d0b25874.tar.bz2 | |
Merge pull request #266 from af83/5762-stoparea-coordinates-are-optional
5761 Make coordinates optional on stop areas
Diffstat (limited to 'app/javascript/helpers/routes_map.coffee')
| -rw-r--r-- | app/javascript/helpers/routes_map.coffee | 28 |
1 files changed, 16 insertions, 12 deletions
diff --git a/app/javascript/helpers/routes_map.coffee b/app/javascript/helpers/routes_map.coffee index 85def1390..6834406fc 100644 --- a/app/javascript/helpers/routes_map.coffee +++ b/app/javascript/helpers/routes_map.coffee @@ -30,20 +30,24 @@ class RoutesMap geometry: new ol.geom.Point(ol.proj.fromLonLat([parseFloat(stops[stops.length - 1].longitude), parseFloat(stops[stops.length - 1].latitude)])) }) ] + + prevStop = null stops.forEach (stop, i) => - if i < stops.length - 1 - geoColLns.push new ol.Feature - geometry: new ol.geom.LineString([ - ol.proj.fromLonLat([parseFloat(stops[i].longitude), parseFloat(stops[i].latitude)]), - ol.proj.fromLonLat([parseFloat(stops[i + 1].longitude), parseFloat(stops[i + 1].latitude)]) - ]) + if stop.longitude && stop.latitude + if prevStop + geoColLns.push new ol.Feature + geometry: new ol.geom.LineString([ + ol.proj.fromLonLat([parseFloat(prevStop.longitude), parseFloat(prevStop.latitude)]), + ol.proj.fromLonLat([parseFloat(stop.longitude), parseFloat(stop.latitude)]) + ]) + prevStop = stop - geoColPts.push(new ol.Feature({ - geometry: new ol.geom.Point(ol.proj.fromLonLat([parseFloat(stop.longitude), parseFloat(stop.latitude)])) - })) - unless @seenStopIds.indexOf(stop.stoparea_id) > 0 - @area.push [parseFloat(stop.longitude), parseFloat(stop.latitude)] - @seenStopIds.push stop.stoparea_id + geoColPts.push(new ol.Feature({ + geometry: new ol.geom.Point(ol.proj.fromLonLat([parseFloat(stop.longitude), parseFloat(stop.latitude)])) + })) + unless @seenStopIds.indexOf(stop.stoparea_id) > 0 + @area.push [parseFloat(stop.longitude), parseFloat(stop.latitude)] + @seenStopIds.push stop.stoparea_id vectorPtsLayer = new ol.layer.Vector({ source: new ol.source.Vector({ |