Changeset d33326a in OpenWorkouts-current

Timestamp:

Jan 19, 2019, 5:47:10 PM (5 years ago)

Author:

borja <borja@…>

Branches:

current, feature/docs, master

Children:

b22a9d2

Parents:

b030195

Message:

Accept two new parameters to the js leaflet map builder:

• map_id: the id of the html element that is the container for the map

• elevation: true if we want to show the Leaflet.Elevation chart, false otherwise.

Added a fit_bounds() call suggested in Leaflet.Elevation docs

Location:

ow

Files:

• static/js/ow.js (modified) (5 diffs)
• templates/workout.pt (modified) (2 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;
 
     // OpenStreetMap urls and references
@@ -36 +38 @@
     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, {preferCanvas: true});
         map.setView([latitude, longitude], zoom);
         var tile_layer = L.tileLayer(openstreetmap_url, {
@@ -90 +92 @@
             },
         });
-        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 +110 @@
         // 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);

ow/templates/workout.pt

@@ -152 +152 @@
     <script type="text/javascript" tal:condition="context.has_gpx">
      var workout_map = owjs.map({
+         map_id: 'map',
          latitude: ${start_point['latitude']},
          longitude: ${start_point['longitude']},
@@ -159 +160 @@
          end_icon: '${request.static_url('ow:static/components/leaflet-gpx/pin-icon-end.png')}',
          shadow: '${request.static_url('ow:static/components/leaflet-gpx/pin-shadow.png')}',
+         elevation: true
      });
      workout_map.render();