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

View File

@ -460,9 +460,17 @@ 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 = {
chart: { chart: {
@ -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
{ {

View File

@ -1,78 +1,78 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: wp-gpx-maps\n" "Project-Id-Version: wp-gpx-maps\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-25 11:54+0100\n" "POT-Creation-Date: 2012-06-25 11:54+0100\n"
"PO-Revision-Date: 2012-06-25 20:34+0100\n" "PO-Revision-Date: 2012-06-25 20:34+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: __;_e\n" "X-Poedit-KeywordsList: __;_e\n"
"X-Poedit-Basepath: .\n" "X-Poedit-Basepath: .\n"
"X-Poedit-SearchPath-0: ..\n" "X-Poedit-SearchPath-0: ..\n"
#: ../wp-gpx-maps.php:420 #: ../wp-gpx-maps.php:420
msgid "Altitude" msgid "Altitude"
msgstr "Altura" msgstr "Altura"
#: ../wp-gpx-maps.php:421 #: ../wp-gpx-maps.php:421
msgid "Current Position" msgid "Current Position"
msgstr "Posición actual" msgstr "Posición actual"
#: ../wp-gpx-maps.php:422 #: ../wp-gpx-maps.php:422
msgid "Speed" msgid "Speed"
msgstr "Velocidad" msgstr "Velocidad"
#: ../wp-gpx-maps.php:423 #: ../wp-gpx-maps.php:423
msgid "Heart rate" msgid "Heart rate"
msgstr "Ritmo cardíaco" msgstr "Ritmo cardíaco"
#: ../wp-gpx-maps.php:424 #: ../wp-gpx-maps.php:424
msgid "Cadence" msgid "Cadence"
msgstr "Cadencia" msgstr "Cadencia"
#: ../wp-gpx-maps.php:425 #: ../wp-gpx-maps.php:425
msgid "Go Full Screen" msgid "Go Full Screen"
msgstr "Ir a pantalla completa" msgstr "Ir a pantalla completa"
#: ../wp-gpx-maps.php:426 #: ../wp-gpx-maps.php:426
msgid "Exit Full Screen" msgid "Exit Full Screen"
msgstr "Salir de pantalla completa" msgstr "Salir de pantalla completa"
#: ../wp-gpx-maps.php:439 #: ../wp-gpx-maps.php:439
msgid "Total distance" msgid "Total distance"
msgstr "Distancia total" msgstr "Distancia total"
#: ../wp-gpx-maps.php:443 #: ../wp-gpx-maps.php:443
msgid "Max elevation" msgid "Max elevation"
msgstr "Elevación máxima" msgstr "Elevación máxima"
#: ../wp-gpx-maps.php:444 #: ../wp-gpx-maps.php:444
msgid "Min elevation" msgid "Min elevation"
msgstr "Elevación mínima" msgstr "Elevación mínima"
#: ../wp-gpx-maps.php:445 #: ../wp-gpx-maps.php:445
msgid "Total climbing" msgid "Total climbing"
msgstr "Total ascendido" msgstr "Total ascendido"
#: ../wp-gpx-maps.php:446 #: ../wp-gpx-maps.php:446
msgid "Total descent" msgid "Total descent"
msgstr "Total descendido" msgstr "Total descendido"
#: ../wp-gpx-maps.php:450 #: ../wp-gpx-maps.php:450
msgid "Average speed" msgid "Average speed"
msgstr "Velocidad media" msgstr "Velocidad media"
#: ../wp-gpx-maps.php:466 #: ../wp-gpx-maps.php:466
msgid "Download" msgid "Download"
msgstr "Descargar" msgstr "Descargar"
#: ../wp-gpx-maps_admin_settings.php:75 #: ../wp-gpx-maps_admin_settings.php:75
#: ../wp-gpx-maps_admin_settings.php:151 #: ../wp-gpx-maps_admin_settings.php:151
#: ../wp-gpx-maps_admin_settings.php:255 #: ../wp-gpx-maps_admin_settings.php:255
#: ../wp-gpx-maps_admin_settings.php:286 #: ../wp-gpx-maps_admin_settings.php:286
msgid "Save Changes" msgid "Save Changes"
msgstr "Salvar cambios" msgstr "Salvar cambios"

View File

@ -1,80 +1,80 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: wp-gpx-maps\n" "Project-Id-Version: wp-gpx-maps\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-25 11:55+0100\n" "POT-Creation-Date: 2012-06-25 11:55+0100\n"
"PO-Revision-Date: 2012-06-25 11:56+0100\n" "PO-Revision-Date: 2012-06-25 11:56+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: __;_e\n" "X-Poedit-KeywordsList: __;_e\n"
"X-Poedit-Basepath: .\n" "X-Poedit-Basepath: .\n"
"X-Poedit-Language: Italian\n" "X-Poedit-Language: Italian\n"
"X-Poedit-Country: ITALY\n" "X-Poedit-Country: ITALY\n"
"X-Poedit-SearchPath-0: ..\n" "X-Poedit-SearchPath-0: ..\n"
#: ../wp-gpx-maps.php:420 #: ../wp-gpx-maps.php:420
msgid "Altitude" msgid "Altitude"
msgstr "Altitudine" msgstr "Altitudine"
#: ../wp-gpx-maps.php:421 #: ../wp-gpx-maps.php:421
msgid "Current Position" msgid "Current Position"
msgstr "Posizione Corrente" msgstr "Posizione Corrente"
#: ../wp-gpx-maps.php:422 #: ../wp-gpx-maps.php:422
msgid "Speed" msgid "Speed"
msgstr "Velocità" msgstr "Velocità"
#: ../wp-gpx-maps.php:423 #: ../wp-gpx-maps.php:423
msgid "Heart rate" msgid "Heart rate"
msgstr "Battito Cardiaco" msgstr "Battito Cardiaco"
#: ../wp-gpx-maps.php:424 #: ../wp-gpx-maps.php:424
msgid "Cadence" msgid "Cadence"
msgstr "Cadenza" msgstr "Cadenza"
#: ../wp-gpx-maps.php:425 #: ../wp-gpx-maps.php:425
msgid "Go Full Screen" msgid "Go Full Screen"
msgstr "Schermo intero" msgstr "Schermo intero"
#: ../wp-gpx-maps.php:426 #: ../wp-gpx-maps.php:426
msgid "Exit Full Screen" msgid "Exit Full Screen"
msgstr "Torna a dimensioni originali" msgstr "Torna a dimensioni originali"
#: ../wp-gpx-maps.php:439 #: ../wp-gpx-maps.php:439
msgid "Total distance" msgid "Total distance"
msgstr "Distanza totale" msgstr "Distanza totale"
#: ../wp-gpx-maps.php:443 #: ../wp-gpx-maps.php:443
msgid "Max elevation" msgid "Max elevation"
msgstr "Altitudine massima" msgstr "Altitudine massima"
#: ../wp-gpx-maps.php:444 #: ../wp-gpx-maps.php:444
msgid "Min elevation" msgid "Min elevation"
msgstr "Altitudine minima" msgstr "Altitudine minima"
#: ../wp-gpx-maps.php:445 #: ../wp-gpx-maps.php:445
msgid "Total climbing" msgid "Total climbing"
msgstr "Totale salita" msgstr "Totale salita"
#: ../wp-gpx-maps.php:446 #: ../wp-gpx-maps.php:446
msgid "Total descent" msgid "Total descent"
msgstr "Totale discesa" msgstr "Totale discesa"
#: ../wp-gpx-maps.php:450 #: ../wp-gpx-maps.php:450
msgid "Average speed" msgid "Average speed"
msgstr "Velocità media" msgstr "Velocità media"
#: ../wp-gpx-maps.php:466 #: ../wp-gpx-maps.php:466
msgid "Download" msgid "Download"
msgstr "Scarica" msgstr "Scarica"
#: ../wp-gpx-maps_admin_settings.php:75 #: ../wp-gpx-maps_admin_settings.php:75
#: ../wp-gpx-maps_admin_settings.php:151 #: ../wp-gpx-maps_admin_settings.php:151
#: ../wp-gpx-maps_admin_settings.php:255 #: ../wp-gpx-maps_admin_settings.php:255
#: ../wp-gpx-maps_admin_settings.php:286 #: ../wp-gpx-maps_admin_settings.php:286
msgid "Save Changes" msgid "Save Changes"
msgstr "Salva" msgstr "Salva"

View File

@ -1,56 +1,56 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: wp-gpx-maps\n" "Project-Id-Version: wp-gpx-maps\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-21 14:24+0100\n" "POT-Creation-Date: 2012-06-21 14:24+0100\n"
"PO-Revision-Date: 2012-06-25 12:03+0100\n" "PO-Revision-Date: 2012-06-25 12:03+0100\n"
"Last-Translator: Simon Koelewijn\n" "Last-Translator: Simon Koelewijn\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: __;_e\n" "X-Poedit-KeywordsList: __;_e\n"
"X-Poedit-Basepath: .\n" "X-Poedit-Basepath: .\n"
"X-Poedit-Language: Dutch\n" "X-Poedit-Language: Dutch\n"
"X-Poedit-Country: NETHERLANDS\n" "X-Poedit-Country: NETHERLANDS\n"
"X-Poedit-SearchPath-0: ..\n" "X-Poedit-SearchPath-0: ..\n"
#: ../wp-gpx-maps.php:348 #: ../wp-gpx-maps.php:348
msgid "Altitude" msgid "Altitude"
msgstr "Hoogte" msgstr "Hoogte"
#: ../wp-gpx-maps.php:349 #: ../wp-gpx-maps.php:349
msgid "Current Position" msgid "Current Position"
msgstr "Huidige Positie" msgstr "Huidige Positie"
#: ../wp-gpx-maps.php:350 #: ../wp-gpx-maps.php:350
msgid "Speed" msgid "Speed"
msgstr "Snelheid" msgstr "Snelheid"
#: ../wp-gpx-maps.php:351 #: ../wp-gpx-maps.php:351
msgid "Heart rate" msgid "Heart rate"
msgstr "Hartslag" msgstr "Hartslag"
#: ../wp-gpx-maps.php:352 #: ../wp-gpx-maps.php:352
msgid "Cadence" msgid "Cadence"
msgstr "Cadans" msgstr "Cadans"
#: ../wp-gpx-maps.php:353 #: ../wp-gpx-maps.php:353
msgid "Go Full Screen" msgid "Go Full Screen"
msgstr "Volledige Scherm" msgstr "Volledige Scherm"
#: ../wp-gpx-maps.php:354 #: ../wp-gpx-maps.php:354
msgid "Exit Full Screen" msgid "Exit Full Screen"
msgstr "Verlaat Volledige Scherm" msgstr "Verlaat Volledige Scherm"
#: ../wp-gpx-maps.php:370 #: ../wp-gpx-maps.php:370
msgid "Download" msgid "Download"
msgstr "Download" msgstr "Download"
#: ../wp-gpx-maps_admin_settings.php:67 #: ../wp-gpx-maps_admin_settings.php:67
#: ../wp-gpx-maps_admin_settings.php:143 #: ../wp-gpx-maps_admin_settings.php:143
#: ../wp-gpx-maps_admin_settings.php:245 #: ../wp-gpx-maps_admin_settings.php:245
#: ../wp-gpx-maps_admin_settings.php:276 #: ../wp-gpx-maps_admin_settings.php:276
msgid "Save Changes" msgid "Save Changes"
msgstr "Wijzigingen Opslaan" msgstr "Wijzigingen Opslaan"

View File

@ -1,78 +1,78 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: wp-gpx-maps\n" "Project-Id-Version: wp-gpx-maps\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-25 11:54+0100\n" "POT-Creation-Date: 2012-06-25 11:54+0100\n"
"PO-Revision-Date: 2012-06-26 10:20+0100\n" "PO-Revision-Date: 2012-06-26 10:20+0100\n"
"Last-Translator: Per Bjälevik <per.bjalevik@tauzero.se>\n" "Last-Translator: Per Bjälevik <per.bjalevik@tauzero.se>\n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: __;_e\n" "X-Poedit-KeywordsList: __;_e\n"
"X-Poedit-Basepath: .\n" "X-Poedit-Basepath: .\n"
"X-Poedit-SearchPath-0: ..\n" "X-Poedit-SearchPath-0: ..\n"
#: ../wp-gpx-maps.php:420 #: ../wp-gpx-maps.php:420
msgid "Altitude" msgid "Altitude"
msgstr "Höjd" msgstr "Höjd"
#: ../wp-gpx-maps.php:421 #: ../wp-gpx-maps.php:421
msgid "Current Position" msgid "Current Position"
msgstr "Aktuell position" msgstr "Aktuell position"
#: ../wp-gpx-maps.php:422 #: ../wp-gpx-maps.php:422
msgid "Speed" msgid "Speed"
msgstr "Hastighet" msgstr "Hastighet"
#: ../wp-gpx-maps.php:423 #: ../wp-gpx-maps.php:423
msgid "Heart rate" msgid "Heart rate"
msgstr "Hjärtfrekvens" msgstr "Hjärtfrekvens"
#: ../wp-gpx-maps.php:424 #: ../wp-gpx-maps.php:424
msgid "Cadence" msgid "Cadence"
msgstr "Kadens" msgstr "Kadens"
#: ../wp-gpx-maps.php:425 #: ../wp-gpx-maps.php:425
msgid "Go Full Screen" msgid "Go Full Screen"
msgstr "Gå till fullskärm" msgstr "Gå till fullskärm"
#: ../wp-gpx-maps.php:426 #: ../wp-gpx-maps.php:426
msgid "Exit Full Screen" msgid "Exit Full Screen"
msgstr "Avsluta fullskärm" msgstr "Avsluta fullskärm"
#: ../wp-gpx-maps.php:439 #: ../wp-gpx-maps.php:439
msgid "Total distance" msgid "Total distance"
msgstr "Total distans" msgstr "Total distans"
#: ../wp-gpx-maps.php:443 #: ../wp-gpx-maps.php:443
msgid "Max elevation" msgid "Max elevation"
msgstr "Max höjd" msgstr "Max höjd"
#: ../wp-gpx-maps.php:444 #: ../wp-gpx-maps.php:444
msgid "Min elevation" msgid "Min elevation"
msgstr "Min höjd" msgstr "Min höjd"
#: ../wp-gpx-maps.php:445 #: ../wp-gpx-maps.php:445
msgid "Total climbing" msgid "Total climbing"
msgstr "Höjdstigning" msgstr "Höjdstigning"
#: ../wp-gpx-maps.php:446 #: ../wp-gpx-maps.php:446
msgid "Total descent" msgid "Total descent"
msgstr "Höjdförlust" msgstr "Höjdförlust"
#: ../wp-gpx-maps.php:450 #: ../wp-gpx-maps.php:450
msgid "Average speed" msgid "Average speed"
msgstr "Medelhastighet" msgstr "Medelhastighet"
#: ../wp-gpx-maps.php:466 #: ../wp-gpx-maps.php:466
msgid "Download" msgid "Download"
msgstr "Ladda ner" msgstr "Ladda ner"
#: ../wp-gpx-maps_admin_settings.php:75 #: ../wp-gpx-maps_admin_settings.php:75
#: ../wp-gpx-maps_admin_settings.php:151 #: ../wp-gpx-maps_admin_settings.php:151
#: ../wp-gpx-maps_admin_settings.php:255 #: ../wp-gpx-maps_admin_settings.php:255
#: ../wp-gpx-maps_admin_settings.php:286 #: ../wp-gpx-maps_admin_settings.php:286
msgid "Save Changes" msgid "Save Changes"
msgstr "Spara ändringar" msgstr "Spara ändringar"

View File

@ -1,56 +1,56 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: wp-gpx-maps\n" "Project-Id-Version: wp-gpx-maps\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-20 19:00+0100\n" "POT-Creation-Date: 2012-06-20 19:00+0100\n"
"PO-Revision-Date: 2012-06-22 10:05+0100\n" "PO-Revision-Date: 2012-06-22 10:05+0100\n"
"Last-Translator: \n" "Last-Translator: \n"
"Language-Team: \n" "Language-Team: \n"
"MIME-Version: 1.0\n" "MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n" "Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: __;_e\n" "X-Poedit-KeywordsList: __;_e\n"
"X-Poedit-Basepath: .\n" "X-Poedit-Basepath: .\n"
"X-Poedit-Language: Turkish\n" "X-Poedit-Language: Turkish\n"
"X-Poedit-Country: TURKEY\n" "X-Poedit-Country: TURKEY\n"
"X-Poedit-SearchPath-0: ..\n" "X-Poedit-SearchPath-0: ..\n"
#: ../wp-gpx-maps.php:348 #: ../wp-gpx-maps.php:348
msgid "Altitude" msgid "Altitude"
msgstr "Rakım" msgstr "Rakım"
#: ../wp-gpx-maps.php:349 #: ../wp-gpx-maps.php:349
msgid "Current Position" msgid "Current Position"
msgstr "Güncel Pozisyon" msgstr "Güncel Pozisyon"
#: ../wp-gpx-maps.php:350 #: ../wp-gpx-maps.php:350
msgid "Speed" msgid "Speed"
msgstr "Hız" msgstr "Hız"
#: ../wp-gpx-maps.php:351 #: ../wp-gpx-maps.php:351
msgid "Heart rate" msgid "Heart rate"
msgstr "Nabız" msgstr "Nabız"
#: ../wp-gpx-maps.php:352 #: ../wp-gpx-maps.php:352
msgid "Cadence" msgid "Cadence"
msgstr "Kadans" msgstr "Kadans"
#: ../wp-gpx-maps.php:353 #: ../wp-gpx-maps.php:353
msgid "Go Full Screen" msgid "Go Full Screen"
msgstr "Tam Ekran Gör" msgstr "Tam Ekran Gör"
#: ../wp-gpx-maps.php:354 #: ../wp-gpx-maps.php:354
msgid "Exit Full Screen" msgid "Exit Full Screen"
msgstr "Tam Ekrandan Çık" msgstr "Tam Ekrandan Çık"
#: ../wp-gpx-maps.php:370 #: ../wp-gpx-maps.php:370
msgid "Download" msgid "Download"
msgstr "İndir" msgstr "İndir"
#: ../wp-gpx-maps_admin_settings.php:67 #: ../wp-gpx-maps_admin_settings.php:67
#: ../wp-gpx-maps_admin_settings.php:143 #: ../wp-gpx-maps_admin_settings.php:143
#: ../wp-gpx-maps_admin_settings.php:245 #: ../wp-gpx-maps_admin_settings.php:245
#: ../wp-gpx-maps_admin_settings.php:276 #: ../wp-gpx-maps_admin_settings.php:276
msgid "Save Changes" msgid "Save Changes"
msgstr "" msgstr ""

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

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