New Language and wp3.5 compatibility

WP-GPX-Maps.js

@@ -756,7 +756,11 @@ function _wpgpxmaps(params)
 			
 			var l_s;
 			
-			if (unitspeed == '4') // min/miles
+			if (unitspeed == '5') // knos
+			{
+				l_s = { suf : "knos", dec : 2 };
+			} 
+			else if (unitspeed == '4') // min/miles
 			{
 				l_s = { suf : "min/mi", dec : 2 };
 			} 

languages/wp-gpx-maps-fr_FR.po

@@ -0,0 +1,81 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: wp-gpx-maps\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-08-01 13:41+0100\n"
+"PO-Revision-Date: 2012-11-01 22:02+0100\n"
+"Last-Translator: Hervé <herve.rieu@free.fr>\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.4\n"
+"X-Poedit-SearchPath-0: ..\n"
+
+#: ../wp-gpx-maps.php:473
+msgid "Altitude"
+msgstr "Altitude"
+
+#: ../wp-gpx-maps.php:474
+msgid "Current Position"
+msgstr "Position actuelle"
+
+#: ../wp-gpx-maps.php:475
+msgid "Speed"
+msgstr "Vitesse"
+
+#: ../wp-gpx-maps.php:476
+msgid "Heart rate"
+msgstr "Fréquence cardiaque"
+
+#: ../wp-gpx-maps.php:477
+msgid "Cadence"
+msgstr "Cadence"
+
+#: ../wp-gpx-maps.php:478
+msgid "Go Full Screen"
+msgstr "Plein écran"
+
+#: ../wp-gpx-maps.php:479
+msgid "Exit Full Screen"
+msgstr "Sortir du plein écran"
+
+#: ../wp-gpx-maps.php:492
+msgid "Total distance"
+msgstr "Distance totale"
+
+#: ../wp-gpx-maps.php:497
+msgid "Max elevation"
+msgstr "Altitude maximum"
+
+#: ../wp-gpx-maps.php:499
+msgid "Min elevation"
+msgstr "Altitude minimum"
+
+#: ../wp-gpx-maps.php:501
+msgid "Total climbing"
+msgstr "Denivelé total positif "
+
+#: ../wp-gpx-maps.php:503
+msgid "Total descent"
+msgstr "Denivelé total négatif"
+
+#: ../wp-gpx-maps.php:507
+msgid "Average speed"
+msgstr "Vitesse moyenne"
+
+#: ../wp-gpx-maps.php:512
+msgid "Total Time"
+msgstr "Durée totale"
+
+#: ../wp-gpx-maps.php:528
+msgid "Download"
+msgstr "Télécharger"
+
+#: ../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 "Enregistrer"

readme.txt

@@ -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.4
-Stable tag: 1.1.38
+Stable tag: 1.1.39
 
 Draws a gpx track with altitude graph. You can also display your nextgen gallery images in the map.
 
@@ -42,6 +42,7 @@ Translated into 7 languages:
 - Swedish sv_SE
 - Turkish tr_TR
 - Hungarian hu_HU
+- French fr_FR
 
 (many thanks to all the guys who helped me with the translations)
 
@@ -174,6 +175,9 @@ Yes!
 1. Altitude & Speed & Hearth rate
 
 == Changelog ==
+= 1.1.39 =
+* Added French translation, thanks to Hervé
+* Added Nautical Miles per Hour (Knots) unit of measure
 = 1.1.38 =
 * Fix: garmin gpx cadence and heart rate
 * Updated Turkish translation, thanks to Edip

wp-gpx-maps.php

@@ -3,7 +3,7 @@
 Plugin Name: WP-GPX-Maps
 Plugin URI: http://www.darwinner.it/
 Description: Draws a gpx track with altitude graph
-Version: 1.1.38
+Version: 1.1.39
 Author: Bastianon Massimo
 Author URI: http://www.pedemontanadelgrappa.it/
 */
@@ -54,7 +54,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.34");
+    wp_register_script( 'WP-GPX-Maps', plugins_url('/WP-GPX-Maps.js', __FILE__), array('jquery','googlemaps','highcharts'), "1.1.39");
     wp_enqueue_script( 'WP-GPX-Maps' );
 		
 }
@@ -278,7 +278,7 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
 			}
 			else
 			{
-				$points_maps .= '['.(float)$points_x_lat[$i].','.(float)$points_x_lon[$i].'],';	
+				$points_maps .= '['.number_format((float)$points_x_lat[$i], 7 , '.' , '' ).','.number_format((float)$points_x_lon[$i], 7 , '.' , '' ).'],';	
 
 				$_ele = (float)$points->ele[$i];	
 				$_dist = (float)$points->dist[$i];	
@@ -294,8 +294,8 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
 					$_dist = (float)($_dist / 1000);
 				}
 				
-				$points_graph_dist .= $_dist.',';
+				$points_graph_dist .= number_format ( $_dist , 2 , '.' , '' ).',';
-				$points_graph_ele .= $_ele.',';
+				$points_graph_ele .= number_format ( $_ele , 2 , '.' , '' ).',';
 					
 				if ($showSpeed == true) {
 				
@@ -306,12 +306,12 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
 				
 				if ($showHr == true)
 				{
-					$points_graph_hr .= $points->hr[$i].',';
+					$points_graph_hr .= number_format ( $points->hr[$i] , 2 , '.' , '' ).',';
 				}
 				
 				if ($showCad == true)
 				{
-					$points_graph_cad .= $points->cad[$i].',';
+					$points_graph_cad .= number_format ( $points->cad[$i] , 2 , '.' , '' ).',';
 				}
 			}
 		}	
@@ -347,9 +347,13 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
 			
 		if ($showW == true)
 		{
+		
+		
+		
+		
 			$wpoints = getWayPoints($gpx);
 			foreach ($wpoints as $p) {
-				$waypoints .= '['.(float)$p[0].','.(float)$p[1].',\''.unescape($p[4]).'\',\''.unescape($p[5]).'\',\''.unescape($p[7]).'\'],';
+				$waypoints .= '['.number_format ( (float)$p[0] , 7 , '.' , '' ).','.number_format ( (float)$p[1] , 7 , '.' , '' ).',\''.unescape($p[4]).'\',\''.unescape($p[5]).'\',\''.unescape($p[7]).'\'],';
 			}
 		}
 
@@ -541,6 +545,11 @@ function convertSeconds($s)
 
 function convertSpeed($speed,$uomspeed, $addUom = false)
 {
+	if ($uomspeed == '5') // knos
+	{
+		$speed *= 1.94384449;
+		if ($addUom == true) $speed = round($speed,2) . " knos";
+	} 
 	if ($uomspeed == '4') // min/mi
 	{
 		$speed = convertSeconds($speed * 0.037282272);	
@@ -565,7 +574,7 @@ function convertSpeed($speed,$uomspeed, $addUom = false)
 	{
 		if ($addUom == true) $speed = round($speed,2) . " m/s";
 	}
-	return $speed;
+	return number_format ( $speed , 2 , '.' , '' );
 }
 
 function downloadRemoteFile($remoteFile)

wp-gpx-maps_admin_settings.php

@@ -285,6 +285,7 @@
 					<option value="2" <?php if ($uomSpeed == '2') echo 'selected'; ?>>miles/h</option>
 					<option value="3" <?php if ($uomSpeed == '3') echo 'selected'; ?>>min/km</option>
 					<option value="4" <?php if ($uomSpeed == '4') echo 'selected'; ?>>min/miles</option>
+					<option value="5" <?php if ($uomSpeed == '5') echo 'selected'; ?>>Nautical Miles/Hour (Knots)</option>
 				</select>
 			</td>
 		</tr>