Dyomedea
/
wp-gpx-maps
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

This commit is contained in:
bastianonm 2012-06-27 13:48:34 +00:00
parent c1f9521d52
commit 9dce1e2583
8 changed files with 397 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
WP-GPX-Maps.js
View File

@ -460,8 +460,16 @@ function _wpgpxmaps(params)
} }
var nn = 1111.1; var nn = 1111.1;
var decPoint = nn.toLocaleString().substring(5, 6); var _nn = nn.toLocaleString();
var thousandsSep = nn.toLocaleString().substring(1, 2); var _nnLen = _nn.length;
var decPoint = _nn.substring(_nnLen - 2, _nnLen - 1);
var thousandsSep = _nn.substring(1, 2);
if (decPoint == "1")
decPoint = ".";
if (thousandsSep == "1")
thousandsSep = "";
// define the options // define the options
var hoptions = { var hoptions = {
@ -597,11 +605,11 @@ function _wpgpxmaps(params)
if (unitspeed == '4') // min/miles if (unitspeed == '4') // min/miles
{ {
l_s = { suf : "min/mi", dec : 3 }; l_s = { suf : "min/mi", dec : 2 };
} }
else if (unitspeed == '3') // min/km else if (unitspeed == '3') // min/km
{ {
l_s = { suf : "min/km", dec : 3 }; l_s = { suf : "min/km", dec : 2 };
} }
else if (unitspeed == '2') // miles/h else if (unitspeed == '2') // miles/h
{ {

5
readme.txt
View File

@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
Tags: maps, gpx, gps, graph, chart, google maps, highcharts, track, garmin, image, nextgen-gallery, nextgen, exif, OpenStreetMap, OpenCycleMap, Hike&Bike, heart rate, heartrate, cadence Tags: maps, gpx, gps, graph, chart, google maps, highcharts, track, garmin, image, nextgen-gallery, nextgen, exif, OpenStreetMap, OpenCycleMap, Hike&Bike, heart rate, heartrate, cadence
Requires at least: 2.0.0 Requires at least: 2.0.0
Tested up to: 3.4 Tested up to: 3.4
Stable tag: 1.1.28 Stable tag: 1.1.29
License: GPLv2 or later License: GPLv2 or later
Draws a gpx track with altitude graph. You can also display your nextgen gallery images in the map. Draws a gpx track with altitude graph. You can also display your nextgen gallery images in the map.
@ -133,6 +133,9 @@ Yes!
1. Altitude & Speed & Hearth rate 1. Altitude & Speed & Hearth rate
== Changelog == == Changelog ==
= 1.1.29 =
* Decimal separator is working with all the browsers
* minutes per mile and minutes per kilometer was wrong
= 1.1.28 = = 1.1.28 =
* Decimal and thousand separator derived from browser language * Decimal and thousand separator derived from browser language
* Added summary table (see settings): Total distance, Max elevation, Min elevation, Total climbing, Total descent, Average speed * Added summary table (see settings): Total distance, Max elevation, Min elevation, Total climbing, Total descent, Average speed

53
wp-gpx-maps.php
View File

@ -3,7 +3,7 @@
Plugin Name: WP-GPX-Maps Plugin Name: WP-GPX-Maps
Plugin URI: http://www.darwinner.it/ Plugin URI: http://www.darwinner.it/
Description: Draws a gpx track with altitude graph Description: Draws a gpx track with altitude graph
Version: 1.1.28 Version: 1.1.29
Author: Bastianon Massimo Author: Bastianon Massimo
Author URI: http://www.pedemontanadelgrappa.it/ Author URI: http://www.pedemontanadelgrappa.it/
License: GPL License: GPL
@ -51,7 +51,7 @@ function enqueue_WP_GPX_Maps_scripts()
wp_enqueue_script( 'googleapis' ); wp_enqueue_script( 'googleapis' );
wp_deregister_script( 'WP-GPX-Maps' ); wp_deregister_script( 'WP-GPX-Maps' );
wp_register_script( 'WP-GPX-Maps', plugins_url('/WP-GPX-Maps.js', __FILE__), array('jquery'), "1.1.28"); wp_register_script( 'WP-GPX-Maps', plugins_url('/WP-GPX-Maps.js', __FILE__), array('jquery'), "1.1.29");
wp_enqueue_script( 'WP-GPX-Maps' ); wp_enqueue_script( 'WP-GPX-Maps' );
wp_deregister_script( 'highcharts' ); wp_deregister_script( 'highcharts' );
@ -67,7 +67,7 @@ function print_WP_GPX_Maps_scripts()
.wpgpxmaps { clear:both; } .wpgpxmaps { clear:both; }
#content .wpgpxmaps img, #content .wpgpxmaps img,
.entry-content .wpgpxmaps img, .entry-content .wpgpxmaps img,
.wpgpxmaps img { max-width: none; width: none; padding:0; background:none; } .wpgpxmaps img { max-width: none; width: none; padding:0; background:none; margin:0; border:none; }
.wpgpxmaps .ngimages { display:none; } .wpgpxmaps .ngimages { display:none; }
.wpgpxmaps .myngimages { border:1px solid #fff;position:absolute;cursor:pointer;margin:0;z-index:1; } .wpgpxmaps .myngimages { border:1px solid #fff;position:absolute;cursor:pointer;margin:0;z-index:1; }
.wpgpxmaps_summary .summarylabel { } .wpgpxmaps_summary .summarylabel { }
@ -139,7 +139,7 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
$gpxurl = $gpx; $gpxurl = $gpx;
$cacheFileName = "$gpx,$w,$mh,$mt,$gh,$showW,$showHr,$showCad,$donotreducegpx,$pointsoffset,$showSpeed,$uomspeed,$uom,v1.1.28"; $cacheFileName = "$gpx,$w,$mh,$mt,$gh,$showW,$showHr,$showCad,$donotreducegpx,$pointsoffset,$showSpeed,$uomspeed,$uom,v1.1.29";
$cacheFileName = md5($cacheFileName); $cacheFileName = md5($cacheFileName);
@ -273,28 +273,28 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
if ($uom == '1') if ($uom == '1')
{ {
// Miles and feet // Miles and feet
$tot_len = round($tot_len * 0.000621371192,2)." mi"; $tot_len = round($tot_len * 0.000621371192, 2)." mi";
$max_ele = ($max_ele * 3.2808399)." ft"; $max_ele = round($max_ele * 3.2808399, 0)." ft";
$min_ele = ($min_ele * 3.2808399)." ft"; $min_ele = round($min_ele * 3.2808399, 0)." ft";
$total_ele_up = ($total_ele_up * 3.2808399)." ft"; $total_ele_up = round($total_ele_up * 3.2808399, 0)." ft";
$total_ele_down = ($total_ele_down * 3.2808399)." ft"; $total_ele_down = round($total_ele_down * 3.2808399, 0)." ft";
} else if ($uom == '2') } else if ($uom == '2')
{ {
// meters / kilometers // meters / kilometers
$tot_len = round($tot_len / 1000,2)." km"; $tot_len = round($tot_len / 1000, 2)." km";
$max_ele = $max_ele ." m"; $max_ele = round($max_ele, 0) ." m";
$min_ele = $min_ele ." m"; $min_ele = round($min_ele, 0) ." m";
$total_ele_up = $total_ele_up ." m"; $total_ele_up = round($total_ele_up, 0) ." m";
$total_ele_down = $total_ele_down ." m"; $total_ele_down = round($total_ele_down, 0) ." m";
} }
else else
{ {
// meters / meters // meters / meters
$tot_len = $tot_len ." m"; $tot_len = round($tot_len, 0) ." m";
$max_ele = $max_ele ." m"; $max_ele = round($max_ele, 0) ." m";
$min_ele = $min_ele ." m"; $min_ele = round($min_ele, 0) ." m";
$total_ele_up = $total_ele_up ." m"; $total_ele_up = round($total_ele_up, 0) ." m";
$total_ele_down = $total_ele_down ." m"; $total_ele_down = round($total_ele_down, 0) ." m";
} }
$avg_speed = convertSpeed($avg_speed,$uomspeed,true); $avg_speed = convertSpeed($avg_speed,$uomspeed,true);
@ -454,16 +454,27 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
return $output; return $output;
} }
function convertSeconds($s)
{
if ($s ==0)
return 0;
$s = 1.0 / $s;
$_sSecT = $s * 60; //sec/km
$_sMin = floor ( $_sSecT / 60 );
$_sSec = $_sSecT - $_sMin * 60;
return $_sMin + $_sSec / 100;
}
function convertSpeed($speed,$uomspeed, $addUom = false) function convertSpeed($speed,$uomspeed, $addUom = false)
{ {
if ($uomspeed == '4') // min/mi if ($uomspeed == '4') // min/mi
{ {
$speed *= 0.037282272; $speed = convertSeconds($speed * 0.037282272);
if ($addUom == true) $speed = round($speed,2) . " min/mi"; if ($addUom == true) $speed = round($speed,2) . " min/mi";
} }
else if ($uomspeed == '3') // min/km else if ($uomspeed == '3') // min/km
{ {
$speed *= 0.06; $speed = convertSeconds($speed * 0.06);
if ($addUom == true) $speed = round($speed,2) . " min/km"; if ($addUom == true) $speed = round($speed,2) . " min/km";
} }
else if ($uomspeed == '2') // miles/h else if ($uomspeed == '2') // miles/h