* Added meters/miles chart unit of measure

* Added Russian translation, thanks to G.A.P
Old versions cleanup
This commit is contained in:
bastianonm 2013-07-22 06:55:54 +00:00
parent ae5a93669d
commit 8e8933658b
7 changed files with 123 additions and 8 deletions

View File

@ -626,6 +626,11 @@ function _wpgpxmaps(params)
l_x = { suf : "NM", dec : 1 };
l_y = { suf : "m", dec : 0 };
}
else if (unit=="4")
{
l_x = { suf : "mi", dec : 1 };
l_y = { suf : "m", dec : 0 };
}
else
{
l_x = { suf : "m", dec : 0 };

Binary file not shown.

View File

@ -0,0 +1,93 @@
msgid ""
msgstr ""
"Project-Id-Version: wp-gpx-maps\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-10-30 14:41+0100\n"
"PO-Revision-Date: 2013-07-17 20:50+0400\n"
"Last-Translator: G.A.P <g.a.p@mail.ru>\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Poedit-KeywordsList: __;_e\n"
"X-Poedit-Basepath: .\n"
"X-Generator: Poedit 1.5.7\n"
"X-Poedit-SearchPath-0: ..\n"
#: ../wp-gpx-maps.php:467
msgid "Altitude"
msgstr "Высота"
#: ../wp-gpx-maps.php:468
msgid "Current Position"
msgstr "Текущая позиция"
#: ../wp-gpx-maps.php:469
msgid "Speed"
msgstr "Скорость"
#: ../wp-gpx-maps.php:470
msgid "Heart rate"
msgstr "Пульс"
#: ../wp-gpx-maps.php:471
msgid "Cadence"
msgstr "Каденс"
#: ../wp-gpx-maps.php:472
msgid "Go Full Screen"
msgstr "На весь экран"
#: ../wp-gpx-maps.php:473
msgid "Exit Full Screen"
msgstr "Свернуть в окно"
#: ../wp-gpx-maps.php:474
msgid "Hide Images"
msgstr "Скрыть картинки"
#: ../wp-gpx-maps.php:475
msgid "Show Images"
msgstr "Показать картинки"
#: ../wp-gpx-maps.php:476
msgid "Back to center"
msgstr "По центру"
#: ../wp-gpx-maps.php:489
msgid "Total distance"
msgstr "Дистанция"
#: ../wp-gpx-maps.php:494
msgid "Max elevation"
msgstr "Максимальная высота"
#: ../wp-gpx-maps.php:496
msgid "Min elevation"
msgstr "Минимальная высота"
#: ../wp-gpx-maps.php:498
msgid "Total climbing"
msgstr "Подъём"
#: ../wp-gpx-maps.php:500
msgid "Total descent"
msgstr "Спуск"
#: ../wp-gpx-maps.php:504
msgid "Average speed"
msgstr "Средняя скорость"
#: ../wp-gpx-maps.php:509
msgid "Total Time"
msgstr "Время"
#: ../wp-gpx-maps.php:525
msgid "Download"
msgstr "Скачать"
#: ../wp-gpx-maps_admin_settings.php:83 ../wp-gpx-maps_admin_settings.php:151
#: ../wp-gpx-maps_admin_settings.php:229 ../wp-gpx-maps_admin_settings.php:333
#: ../wp-gpx-maps_admin_settings.php:364
msgid "Save Changes"
msgstr "Сохранить изменения"

View File

@ -5,7 +5,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
Tags: maps, gpx, gps, graph, chart, google maps, track, garmin, image, nextgen-gallery, nextgen, exif, OpenStreetMap, OpenCycleMap, Hike&Bike, heart rate, heartrate, cadence
Requires at least: 2.0.0
Tested up to: 3.5
Stable tag: 1.1.45
Stable tag: 1.1.46
Draws a gpx track with altitude graph. You can also display your nextgen gallery images in the map.
@ -26,7 +26,7 @@ Even if you don't have a gps camera, this plugin can retrive the image position
Old NGGallery Images (without gps data) and gpx: <a href="http://www.pedemontanadelgrappa.it/mappe/itinerario-3-alta-via-degli-eroi/">http://www.pedemontanadelgrappa.it/mappe/itinerario-3-alta-via-degli-eroi/</a>
Translated into 11 languages:
Translated into 12 languages:
- Dutch nl_NL
- English (default)
@ -36,6 +36,7 @@ Translated into 11 languages:
- Italian it_IT
- Polish pl_PL
- Portuguese (Brazilian) pt_BR
- Russian ru_RU
- Spanish es_ES
- Swedish sv_SE
- Turkish tr_TR
@ -92,7 +93,7 @@ The attributes are:
1. pointsoffset: skip points closer than XX meters(default is 10)
1. uom: the unit of measure of distance/altitude are values are: 0, 1, 2 (0 = meters, 1 = feet/miles, 2 = meters/kilometers, 3 = meters/nautical miles)
1. uom: distance/altitude possible unit of measure are: 0, 1, 2, 3, 4 (0 = meters, 1 = feet/miles, 2 = meters/kilometers, 3 = meters/nautical miles, 4 = meters/miles)
1. mlinecolor: map line color (default is #3366cc)
@ -114,7 +115,7 @@ The attributes are:
1. glinecolorgrade: grade line color (default is #beecff)
1. uomspeed: the unit of measure of speed are: 0, 1, 2, 3, 4 (0 = m/s, 1 = km/h, 2 = miles/h, 3 = min/km, 4 = min/miles, 5 = Nautical Miles/Hour (Knots))
1. uomspeed: unit of measure for speed are: 0, 1, 2, 3, 4, 5 (0 = m/s, 1 = km/h, 2 = miles/h, 3 = min/km, 4 = min/miles, 5 = Nautical Miles/Hour (Knots))
1. chartFrom1: minimun value for altitude chart
@ -175,6 +176,9 @@ Yes!
1. Altitude & Speed & Hearth rate
== Changelog ==
= 1.1.46 =
* Added meters/miles chart unit of measure
* Added Russian translation, thanks to G.A.P
= 1.1.45 =
* Added nautical miles as distance (Many thanks to Anders)
= 1.1.44 =

View File

@ -3,7 +3,7 @@
Plugin Name: WP-GPX-Maps
Plugin URI: http://www.devfarm.it/
Description: Draws a gpx track with altitude graph
Version: 1.1.45
Version: 1.1.46
Author: Bastianon Massimo
Author URI: http://www.pedemontanadelgrappa.it/
*/
@ -59,7 +59,7 @@ function enqueue_WP_GPX_Maps_scripts()
wp_enqueue_script( 'highcharts' );
wp_deregister_script( 'WP-GPX-Maps' );
wp_register_script( 'WP-GPX-Maps', plugins_url('/WP-GPX-Maps.js', __FILE__), array('jquery','googlemaps','highcharts'), "1.1.45");
wp_register_script( 'WP-GPX-Maps', plugins_url('/WP-GPX-Maps.js', __FILE__), array('jquery','googlemaps','highcharts'), "1.1.46");
wp_enqueue_script( 'WP-GPX-Maps' );
}
@ -301,6 +301,10 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
{
// meters / kilometers / nautical miles
$_dist = (float)($_dist / 1000 / 1.852);
} else if ($uom == '4')
{
// meters / miles
$_dist *= 0.000621371192;
}
$points_graph_dist .= number_format ( $_dist , 2 , '.' , '' ).',';
@ -352,6 +356,14 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
$total_ele_up = round($total_ele_up, 0) ." m";
$total_ele_down = round($total_ele_down, 0) ." m";
}
else if ($uom == '4') {
// meters / kilometers / nautical miles
$tot_len = round($tot_len * 0.000621371192, 2)." mi";
$max_ele = round($max_ele, 0) ." m";
$min_ele = round($min_ele, 0) ." m";
$total_ele_up = round($total_ele_up, 0) ." m";
$total_ele_down = round($total_ele_down, 0) ." m";
}
else {
// meters / meters
$tot_len = round($tot_len, 0) ." m";

View File

@ -108,7 +108,7 @@ function WP_GPX_Maps_html_page() {
<li><b>waypoints</b>: print the gpx waypoints inside the map (default is FALSE)</li>
<li><b>donotreducegpx</b>: print all the point without reduce it (default is FALSE)</li>
<li><b>pointsoffset</b>: skip points closer than XX meters(default is 10)</li>
<li><b>uom</b>: the unit of measure values are: 0, 1, 2 (0 = meters, 1 = miles/feet, 2 = meters/kilometers)</li>
<li><b>uom</b>: distance/altitude possible unit of measure are: 0, 1, 2, 3, 4 (0 = meters, 1 = feet/miles, 2 = meters/kilometers, 3 = meters/nautical miles, 4 = meters/miles)</li>
<li><b>mlinecolor</b>: map line color (default is #3366cc)</li>
<li><b>glinecolor</b>: graph line color (default is #3366cc)</li>
<li><b>glinecolorspeed</b>: speed line color (default is #ff0000)</li>
@ -119,7 +119,7 @@ function WP_GPX_Maps_html_page() {
<li><b>showhr</b>: show heart rate inside the chart (default is FALSE)</li>
<li><b>showcad</b>: show cadence inside the chart (default is FALSE)</li>
<li><b>showgrade</b>: show grade inside the chart (default is FALSE)</li>
<li><b>uomspeed</b>: the unit of measure of speed are: 0, 1, 2 (0 = m/s, 1 = km/h, 2 = miles/h, 3 = min/km, 4 = min/miles)</li>
<li><b>uomspeed</b>: unit of measure for speed are: 0, 1, 2, 3, 4 (0 = m/s, 1 = km/h, 2 = miles/h, 3 = min/km, 4 = min/miles, 5 = Nautical Miles/Hour (Knots))</li>
<li><b>chartFrom1</b>: minimun value for altitude chart</li>
<li><b>chartTo1</b>: maxumin value for altitude chart</li>
<li><b>chartFrom2</b>: minimun value for speed chart</li>

View File

@ -255,6 +255,7 @@
<option value="1" <?php if ($uom == '1') echo 'selected'; ?>>feet/miles</option>
<option value="2" <?php if ($uom == '2') echo 'selected'; ?>>meters/kilometers</option>
<option value="3" <?php if ($uom == '3') echo 'selected'; ?>>meters/nautical miles</option>
<option value="4" <?php if ($uom == '4') echo 'selected'; ?>>meters/miles</option>
</select>
</td>
</tr>