Changes in / [0b6c6fc:cf12619] in OpenWorkouts-current


Ignore:
Files:
1 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • bin/js_deps

    • Property mode changed from 100755 to 100644
    r0b6c6fc rcf12619  
    179179
    180180leaflet_elevation() {
    181     NAME="leaflet-elevation"
    182     VERSION="0.0.8"
    183     URL=https://github.com/Raruto/${NAME}/archive/${VERSION}.tar.gz
     181    NAME="Leaflet.Elevation"
     182    VERSION="master"
     183    URL=https://github.com/MrMufflon/${NAME}/archive/${VERSION}.tar.gz
    184184    check_cache ${NAME} ${VERSION}
    185185    in_cache=$?

  • bin/screenshot_map

    • Property mode changed from 100755 to 100644

  • ow/static/js/ow.js

    r0b6c6fc rcf12619  
    3535    var gpx;
    3636    var elevation;
     37    var ow_charts;
    3738
    3839    var create_map = function create_map(latitude, longitude, zoom) {
    … …  
    5152           This has to be called *after* create_map and *before* load_gpx.
    5253        */
    53 
    5454        elevation = L.control.elevation({
    5555            position: "bottomright",
    56             theme: "openworkouts-theme",
     56            theme: "steelblue-theme", //default: lime-theme
     57            width: 600,
     58            height: 125,
     59            margins: {
     60                top: 10,
     61                right: 20,
     62                bottom: 30,
     63                left: 50
     64            },
    5765            useHeightIndicator: true, //if false a marker is drawn at map position
    58             interpolation: d3.curveLinear,
    59             elevationDiv: "#elevation",
    60             detachedView: true,
    61             responsiveView: true,
    62             gpxOptions: {
    63                 async: true,
    64                 marker_options: {
    65                     startIconUrl: null,
    66                     endIconUrl: null,
    67                     shadowUrl: null,
    68                 },
    69                 polyline_options: {
    70                     color: '#EE4056',
    71                     opacity: 0.75,
    72                     weight: 5,
    73                     lineCap: 'round'
    74                 },
    75             },
    76         });
    77         elevation.loadGPX(map, gpx_url);
    78         // var ele_container = elevation.addTo(map);
     66            interpolation: "linear", //see https://github.com/mbostock/d3/wiki/SVG-Shapes#wiki-area_interpolate
     67            hoverNumber: {
     68                decimalsX: 3, //decimals on distance (always in km)
     69                decimalsY: 0, //deciamls on height (always in m)
     70                formatter: undefined //custom formatter function may be injected
     71            },
     72            xTicks: undefined, //number of ticks in x axis, calculated by default according to width
     73            yTicks: undefined, //number of ticks on y axis, calculated by default according to height
     74            collapsed: false    //collapsed mode, show chart on click or mouseover
     75        });
     76
     77        var ele_container = elevation.addTo(map);
     78        /* document.getElementById('ow-analysis').appendChild(
     79            ele_container._container); */
    7980    };
    8081
    … …  
    9192                shadowUrl: shadow,
    9293            },
    93             polyline_options: {
    94                 color: '#EE4056',
    95                 opacity: 0.75,
    96                 weight: 5,
    97                 lineCap: 'round'
    98             },
    9994        });
    10095
    … …  
    106101            gpx.on("addline",function(e){
    107102                elevation.addData(e.line);
     103                // ow_charts.addData(e.line);
    108104            });
    109105        };
    … …  
    113109
    114110    var render = function render() {
    115         // create the map, add elevation, load gpx (only if needed, as the
    116         // elevation plugin already loads the gpx data)
     111        // create the map, add elevation, load gpx
    117112        create_map(latitude, longitude, zoom);
    118113        if (elevation) {
    119114            add_elevation_chart();
    120115        }
    121         else {
    122             load_gpx(gpx_url);
    123         }
     116        // add_ow_charts();
     117        load_gpx(gpx_url);
    124118    };
    125119

  • ow/templates/workout.pt

    r0b6c6fc rcf12619  
    1717          href="${request.static_url('ow:static/components/Leaflet/leaflet.css')}" />
    1818    <link rel="stylesheet" tal:condition="context.has_gpx"
    19           href="${request.static_url('ow:static/components/leaflet-elevation/leaflet-elevation.css')}" />
    20     <link rel="stylesheet"
    21           href="${request.static_url('ow:static/css/leaflet-elevation.css')}" />
     19          href="${request.static_url('ow:static/components/Leaflet.Elevation/dist/leaflet.elevation-0.0.4.css')}" />
    2220  </metal:css>
    2321
    … …  
    3230      <div class="workout-detail-resume">
    3331        <h3 tal:content="context.title"></h3>
    34         <div id="" tal:attributes="id 'workout-' + context.workout_id + '-notes'">
    35           <p tal:repeat="paragraph context.notes.split('\n')"
    36              tal:content="paragraph"></p>
     32        <div id="" tal:content="context.notes"
     33             tal:attributes="id 'workout-' + context.workout_id + '-notes'">
    3734        </div>
    3835        <ul class="workout-options">
    3936          <li>
    4037            <a href="" i18n:translate=""
    41                tal:attributes="href request.resource_url(context, 'edit')">
    42               edit workout
     38             tal:attributes="href request.resource_url(context, 'edit')">
     39            edit workout
    4340            </a>
    4441          </li>
    4542          <li>
    4643            <a href="" i18n:translate=""
    47                tal:attributes="href request.resource_url(context, 'update-from-file')">
    48               update with tracking file
     44             tal:attributes="href request.resource_url(context, 'update-from-file')">
     45            update with tracking file
    4946            </a>
    5047          </li>
    5148          <li class="owo-del"><a href="" i18n:translate=""
    52                                  tal:attributes="href request.resource_url(context, 'delete')">
     49             tal:attributes="href request.resource_url(context, 'delete')">
    5350            delete
    54           </a>
     51            </a>
    5552          </li>
    5653        </ul>
    … …  
    7572            <span><tal:t i18n:translate="">Speed</tal:t></span>
    7673            <span class="avg"><tal:t i18n:translate="">Avg.</tal:t>
    77               <tal:c tal:content="round(context.speed['avg'], 1)"></tal:c>km/h</span>
     74            <tal:c tal:content="round(context.speed['avg'], 1)"></tal:c>km/h</span>
    7875            <span class="max"><tal:t i18n:translate="">Max.</tal:t>
    79               <tal:c tal:content="round(context.speed['max'], 1)"></tal:c>km/h</span>
     76            <tal:c tal:content="round(context.speed['max'], 1)"></tal:c>km/h</span>
    8077          </li>
    8178          <li tal:condition="hr">
    8279            <span><tal:t i18n:translate="">Heart Rate</tal:t></span>
    8380            <span class="avg"><tal:t i18n:translate="">Avg.</tal:t>
    84               <tal:c tal:content="hr['avg']"></tal:c>bpm</span>
     81            <tal:c tal:content="hr['avg']"></tal:c>bpm</span>
    8582            <span class="max"><tal:t i18n:translate="">Max.</tal:t>
    86               <tal:c tal:content="hr['max']"></tal:c> bpm</span>
     83            <tal:c tal:content="hr['max']"></tal:c> bpm</span>
    8784          </li>
    8885          <li tal:condition="cad">
    8986            <span><tal:t i18n:translate="">Cadence</tal:t></span>
    9087            <span class="avg"><tal:t i18n:translate="">Avg.</tal:t>
    91               <tal:c tal:content="cad['avg']"></tal:c></span>
     88            <tal:c tal:content="cad['avg']"></tal:c></span>
    9289            <span class="max"><tal:t i18n:translate="">Max.</tal:t>
    93               <tal:c tal:content="cad['max']"></tal:c></span>
     90            <tal:c tal:content="cad['max']"></tal:c></span>
    9491          </li>
    9592          <li tal:condition="atemp">
    9693            <span><tal:t i18n:translate="">Temperature</tal:t></span>
    9794            <span class="min"><tal:t i18n:translate="">Min.</tal:t>
    98               <tal:c tal:content="atemp['min']"></tal:c>℃</span>
     95            <tal:c tal:content="atemp['min']"></tal:c>℃</span>
    9996            <span class="avg"><tal:t i18n:translate="">Avg.</tal:t>
    100               <tal:c tal:content="atemp['avg']"></tal:c>℃</span>
     97            <tal:c tal:content="atemp['avg']"></tal:c>℃</span>
    10198            <span class="max"><tal:t i18n:translate="">Max.</tal:t>
    102               <tal:c tal:content="atemp['max']"></tal:c>℃</span>
     99            <tal:c tal:content="atemp['max']"></tal:c>℃</span>
    103100          </li>
    104101        </ul>
    105         <div id="elevation"></div>
    106102      </div>
    107103    </div>
    108 
    109104    <!--! Track map -->
    110105    <div id="map" tal:condition="context.has_gpx"></div>
     106
     107    <!--! Additional map controls -->
     108
     109    <div id="ow-analysis">
     110
     111      <!--!
     112          FIXME: the list of available charts should come from the workout
     113          details, based on which data this workout has
     114        -->
     115      <!--! All those ids are needed for the leaflet openworkouts plugin -->
     116      <tal:r tal:repeat="chart ['elevation', 'heartrate', 'cadence', 'temperature']">
     117        <div id="ow-" tal:attributes="id 'ow-' + chart">
     118          <div class="ow-average" id=""
     119               tal:attributes="id 'ow-' + chart + '-average'"></div>
     120          <div class="ow-chart" id=""
     121               tal:attributes="id 'ow-' + chart + '-chart'"></div>
     122          <div class="ow-current" id=""
     123               tal:attributes="id 'ow-' + chart + '-current'"></div>
     124        </div>
     125      </tal:r>
     126
     127    </div>
    111128  </metal:content>
    112129
    113130  <metal:body-js metal:fill-slot="body-js">
    114131
    115     <script src="${request.static_url('ow:static/components/d3/d3.min.js')}"
     132
     133    <script src="//d3js.org/d3.v3.min.js" charset="utf-8"></script>
     134    <!--
     135    <script src="${request.static_url('ow:static/d3/d3.min.js')}"
    116136            tal:condition="context.has_gpx"></script>
     137    -->
    117138
    118139    <script src="${request.static_url('ow:static/components/Leaflet/leaflet.js')}"
    … …  
    122143            tal:condition="context.has_gpx"></script>
    123144
    124     <script src="${request.static_url('ow:static/components/leaflet-elevation/leaflet-elevation.js')}"
     145    <script src="${request.static_url('ow:static/components/Leaflet.Elevation/dist/leaflet.elevation-0.0.4.min.js')}"
    125146            tal:condition="context.has_gpx"></script>
    126147
Note: See TracChangeset for help on using the changeset viewer.