From cee2ffc9291e594ac57df921d0455791639fd765 Mon Sep 17 00:00:00 2001
From: Étienne Loks <etienne.loks@iggdrasil.net>
Date: Tue, 20 Sep 2016 22:38:46 +0200
Subject: JS: manage route display

---
 chimere/static/chimere/js/jquery.chimere.js           | 15 ++++++++++++---
 chimere_example_project/templates/chimere/detail.html |  2 +-
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/chimere/static/chimere/js/jquery.chimere.js b/chimere/static/chimere/js/jquery.chimere.js
index 8ab08ef..5787d10 100644
--- a/chimere/static/chimere/js/jquery.chimere.js
+++ b/chimere/static/chimere/js/jquery.chimere.js
@@ -519,7 +519,7 @@ function transform(obj) {
                             settings.popup.setPosition(geom.getInteriorPoint().getCoordinates());
                             settings.popup.setOffset([0, 0]);
                         } else if (geom.getType() == 'LineString'){
-                            settings.popup.setPosition(geom.getCoordinatesAt(0.5));
+                            settings.popup.setPosition(geom.getCoordinateAt(0.5));
                             settings.popup.setOffset([0, 0]);
                         } else if (geom.getType() == 'MultipleLineString'){
                             settings.popup.setPosition(geom.getLineString(0).getCoordinatesAt(0.5));
@@ -1089,7 +1089,7 @@ function transform(obj) {
                             } else if (feature.geometry.type == 'MultiPolygon') {
                                 methods.addPolygon(feature);
                             } else if (feature.geometry.type == 'LineString') {
-                                //OL3 methods.addRoute(feature);
+                                methods.addRoute(feature);
                             } else if (feature.geometry.type == 'MultiLineString') {
                                 //OL3 methods.addMultiLine(feature);
                             }
@@ -1592,7 +1592,16 @@ function transform(obj) {
             settings.layerJson.setOpacity(0.4);
         },
         // Put a route on the map
-        addRoute: function(route) {
+        addRoute: function(feature) {
+            var feat = new ol.format.GeoJSON().readFeatures(feature)[0];
+            feat.setGeometry(transform(feat.getGeometry()));
+            feat.setStyle(new ol.style.Style({
+                stroke: new ol.style.Stroke({
+                    color: feature.properties.color, width: 2
+                })
+            }));
+            settings.dbFeatures.push(feat);
+            return;
             var polyline = route.geometry;
             var point_array = new Array();
             for (i=0; i<polyline.coordinates.length; i++){
diff --git a/chimere_example_project/templates/chimere/detail.html b/chimere_example_project/templates/chimere/detail.html
index 91b8e49..93388b5 100644
--- a/chimere_example_project/templates/chimere/detail.html
+++ b/chimere_example_project/templates/chimere/detail.html
@@ -31,7 +31,7 @@
     </p>{% endif %}
     </div>
     {% share_bar marker.name %}
-    <p class='detail_amendment'><a href='{% if marker.polygon %}{% url chimere:editpolygon-item area_name_slash|default_if_none:"" marker.pk "" %}{% else %}{% if marker.route %}{% url chimere:editroute-item area_name_slash|default_if_none:"" marker.route.pk "" %}{% else %}{% url chimere:editmarker-item area_name_slash|default_if_none:"" marker.pk "" %}{% endif %}{% endif %}'>
+    <p class='detail_amendment'><a href='{% if marker.polygon %}{% url chimere:editpolygon-item area_name_slash|default_if_none:"" marker.pk "" %}{% else %}{% if marker.route %}{% url chimere:editroute-item area_name_slash|default_if_none:"" marker.pk "" %}{% else %}{% url chimere:editmarker-item area_name_slash|default_if_none:"" marker.pk "" %}{% endif %}{% endif %}'>
         {% trans "Submit an amendment" %}
     </a>
     {% if moderator_emails %}
-- 
cgit v1.2.3