Changeset c6219ed in OpenWorkouts-current for ow/static/js/ow.js

Timestamp:

Jan 22, 2019, 12:21:51 AM (5 years ago)

Author:

Borja Lopez <borja@…>

Branches:

current, feature/docs, master

Children:

26220ba, 2d2eb0d

Parents:

02048a6 (diff), be40b02 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merged patches from darcs

File:

• ow/static/js/ow.js (modified) (5 diffs)

ow/static/js/ow.js

@@ -16 +16 @@
 
     // parameters provided when creating an "instance" of a map
+    var map_id = spec.map_id;
     var latitude = spec.latitude;
     var longitude = spec.longitude;
@@ -23 +24 @@
     var end_icon = spec.end_icon;
     var shadow = spec.shadow;
+    var elevation = spec.elevation;
+    var zoom_control = spec.zoom_control;
 
     // OpenStreetMap urls and references
-    var openstreetmap_url = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png'
-    var openstreetmap_attr = 'Map data &copy; <a href="http://www.osm.org">OpenStreetMap</a>'
+    var openstreetmap_url = 'http://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png';
+    var openstreetmap_attr = 'Map data &copy; <a href="http://www.osm.org">OpenStreetMap</a>';
 
     // Some constants reused through the code
@@ -36 +39 @@
     var create_map = function create_map(latitude, longitude, zoom) {
         /* Create a Leaflet map, set center point and add tiles */
-        map = L.map('map');
+        map = L.map(map_id, {zoomControl: zoom_control});
         map.setView([latitude, longitude], zoom);
         var tile_layer = L.tileLayer(openstreetmap_url, {
@@ -90 +93 @@
             },
         });
-        gpx.on("addline",function(e){
-            elevation.addData(e.line);
-            // ow_charts.addData(e.line);
-        });
+
+        gpx.on('loaded', function(e) {
+            map.fitBounds(e.target.getBounds());
+        });
+
+        if (elevation) {
+            gpx.on("addline",function(e){
+                elevation.addData(e.line);
+                // ow_charts.addData(e.line);
+            });
+        };
+
         gpx.addTo(map);
     };
@@ -100 +111 @@
         // create the map, add elevation, load gpx
         create_map(latitude, longitude, zoom);
-        add_elevation_chart();
+        if (elevation) {
+            add_elevation_chart();
+        }
         // add_ow_charts();
         load_gpx(gpx_url);