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

View File

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

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.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.
@ -187,6 +187,9 @@ Yes!
1. Altitude & Speed & Hearth rate
== Changelog ==
= 1.3.5 =
* Fix: Garmin cadence again
* Fix: WP Tabs
= 1.3.4 =
* Fix: Garmin cadence
* Infowindows closing on mouseout

View File

@ -3,7 +3,7 @@
Plugin Name: WP-GPX-Maps
Plugin URI: http://www.devfarm.it/
Description: Draws a GPX track with altitude chart
Version: 1.3.4
Version: 1.3.5
Author: Bastianon Massimo
Author URI: http://www.pedemontanadelgrappa.it/
*/
@ -51,7 +51,7 @@ function enqueue_WP_GPX_Maps_scripts()
wp_enqueue_script( 'jquery' );
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( '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()
@ -249,7 +249,7 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
$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);

View File

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