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

Fix: WP Tabs 

Fix: Garmin cadence
This commit is contained in:
bastianonm 2014-07-14 07:48:30 +00:00
parent 2af057702a
commit 59fe169525
4 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
WP-GPX-Maps.js
View File

@ -11,7 +11,6 @@ Author URI: http://www.pedemontanadelgrappa.it/
var infowindow; var infowindow;
var CustomMarker; var CustomMarker;
var map;
CustomMarker = function( map, latlng, src, img_w, img_h) { CustomMarker = function( map, latlng, src, img_w, img_h) {
this.latlng_ = latlng; this.latlng_ = latlng;
@ -175,7 +174,7 @@ Author URI: http://www.pedemontanadelgrappa.it/
$(el_osm_credits).show(); $(el_osm_credits).show();
} }
map = new google.maps.Map(el_map, { var map = new google.maps.Map(el_map, {
mapTypeId: mapType, mapTypeId: mapType,
scrollwheel: (zoomOnScrollWheel == 'true'), scrollwheel: (zoomOnScrollWheel == 'true'),
mapTypeControlOptions: { mapTypeControlOptions: {
@ -645,8 +644,10 @@ Author URI: http://www.pedemontanadelgrappa.it/
{ {
$("div > ul > li > a", $_tab).click(function(e){ $("div > ul > li > a", $_tab).click(function(e){
setTimeout(function(e){ setTimeout(function(e){
map.fitBounds(bounds);
google.maps.event.trigger(map, 'resize'); google.maps.event.trigger(map, 'resize');
//map.setCenter(bounds.getCenter());
map.fitBounds(bounds);
tabResized = true;
},10); },10);
}); });
} }

5
readme.txt
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 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 Requires at least: 2.0.0
Tested up to: 3.9 Tested up to: 3.9
Stable tag: 1.3.4 Stable tag: 1.3.5
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.
@ -187,6 +187,9 @@ Yes!
1. Altitude & Speed & Hearth rate 1. Altitude & Speed & Hearth rate
== Changelog == == Changelog ==
= 1.3.5 =
* Fix: Garmin cadence again
* Fix: WP Tabs
= 1.3.4 = = 1.3.4 =
* Fix: Garmin cadence * Fix: Garmin cadence
* Infowindows closing on mouseout * Infowindows closing on mouseout

6
wp-gpx-maps.php
View File

@ -3,7 +3,7 @@
Plugin Name: WP-GPX-Maps Plugin Name: WP-GPX-Maps
Plugin URI: http://www.devfarm.it/ Plugin URI: http://www.devfarm.it/
Description: Draws a GPX track with altitude chart Description: Draws a GPX track with altitude chart
Version: 1.3.4 Version: 1.3.5
Author: Bastianon Massimo Author: Bastianon Massimo
Author URI: http://www.pedemontanadelgrappa.it/ Author URI: http://www.pedemontanadelgrappa.it/
*/ */
@ -51,7 +51,7 @@ function enqueue_WP_GPX_Maps_scripts()
wp_enqueue_script( 'jquery' ); wp_enqueue_script( 'jquery' );
wp_enqueue_script( 'googlemaps', '//maps.googleapis.com/maps/api/js?sensor=false', null, null); wp_enqueue_script( 'googlemaps', '//maps.googleapis.com/maps/api/js?sensor=false', null, null);
wp_enqueue_script( 'highcharts', "//code.highcharts.com/3.0.10/highcharts.js", array('jquery'), "3.0.10", true); wp_enqueue_script( 'highcharts', "//code.highcharts.com/3.0.10/highcharts.js", array('jquery'), "3.0.10", true);
wp_enqueue_script( 'WP-GPX-Maps', plugins_url('/WP-GPX-Maps.js', __FILE__), array('jquery','googlemaps','highcharts'), "1.3.3"); wp_enqueue_script( 'WP-GPX-Maps', plugins_url('/WP-GPX-Maps.js', __FILE__), array('jquery','googlemaps','highcharts'), "1.3.5");
} }
function print_WP_GPX_Maps_styles() function print_WP_GPX_Maps_styles()
@ -249,7 +249,7 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
$gpxurl = $gpx; $gpxurl = $gpx;
$cacheFileName = "$gpx,$w,$mh,$mt,$gh,$showEle,$showW,$showHr,$showAtemp,$showCad,$donotreducegpx,$pointsoffset,$showSpeed,$showGrade,$uomspeed,$uom,$distanceType,v1.3.4"; $cacheFileName = "$gpx,$w,$mh,$mt,$gh,$showEle,$showW,$showHr,$showAtemp,$showCad,$donotreducegpx,$pointsoffset,$showSpeed,$showGrade,$uomspeed,$uom,$distanceType,v1.3.5";
$cacheFileName = md5($cacheFileName); $cacheFileName = md5($cacheFileName);

21
wp-gpx-maps_utils.php
View File

@ -202,18 +202,21 @@
if (isset($trkpt->extensions)) if (isset($trkpt->extensions))
{ {
$trkpt->registerXPathNamespace('gpxtpx', 'http://www.garmin.com/xmlschemas/TrackPointExtension/v1'); $arr = json_decode( json_encode($trkpt->extensions) , 1);
$_ext = @$trkpt->xpath('extensions/gpxtpx:TrackPointExtension | extensions/TrackPointExtension'); if (isset($arr['gpxtpx:TrackPointExtension']))
if ($_ext)
{ {
if ($_ext[0]) $tpe = $arr['gpxtpx:TrackPointExtension'];
{ $hr = @$tpe["gpxtpx:hr"];
$hr = @$_ext[0]->hr; $atemp = @$tpe["gpxtpx:atemp"];
$atemp = @$_ext[0]->atemp; $cad = @$tpe["gpxtpx:cad"];
$cad = @$_ext[0]->cad;
} }
else if (isset($arr['TrackPointExtension']))
{
$tpe = $arr['TrackPointExtension'];
$hr = @$tpe["hr"];
$atemp = @$tpe["atemp"];
$cad = @$tpe["cad"];
} }
} }