@@ -107,7 +105,6 @@ function handle_WP_GPX_Maps_Shortcodes($attr, $content='')
var c_'.$r.' = ['.$points_graph.'];
wpgpxmaps("'.$r.'",\''.$mt.'\',m_'.$r.',c_'.$r.');
});
-
';
}
diff --git a/wp-gpx-maps_Utils.php b/wp-gpx-maps_Utils.php
index 9d78dd8..d34f6d4 100644
--- a/wp-gpx-maps_Utils.php
+++ b/wp-gpx-maps_Utils.php
@@ -16,15 +16,44 @@
}
$realGpxPath = substr (__FILE__, 0, strrpos(__FILE__,'/wp-content/')).$gpxPath;
-
+
if (file_exists($realGpxPath))
{
-
- $gpx = simplexml_load_file($realGpxPath);
- $gpx->registerXPathNamespace('10', 'http://www.topografix.com/GPX/1/0');
- $gpx->registerXPathNamespace('11', 'http://www.topografix.com/GPX/1/1');
-
- foreach($gpx->xpath('//trkpt | //10:trkpt | //11:trkpt') as $trkpt){
+ $points = parseXml($realGpxPath, $gpxOffset);
+ }
+ else
+ {
+ array_push($points, array((float)0,(float)0,(float)0,(float)0));
+ }
+ // riduco l'array a circa 200 punti per non appensantire la pagina(mappa e grafico)!
+ $count=sizeof($points);
+ if ($count>200)
+ {
+ $f = round($count/200);
+ if ($f>1)
+ for($i=$count;$i>0;$i--)
+ if ($i % $f != 0)
+ unset($points[$i]);
+ }
+ return $points;
+ }
+
+ function parseXml($filePath, $gpxOffset)
+ {
+
+ $points = array();
+ $gpx = simplexml_load_file($filePath);
+ $gpx->registerXPathNamespace('10', 'http://www.topografix.com/GPX/1/0');
+ $gpx->registerXPathNamespace('11', 'http://www.topografix.com/GPX/1/1');
+ $gpx->registerXPathNamespace('gpxx', 'http://www.garmin.com/xmlschemas/GpxExtensions/v3');
+
+ $nodes = $gpx->xpath('//trkpt | //10:trkpt | //11:trkpt');
+
+ if ( count($nodes) > 0 )
+ {
+ // normal case
+ foreach($nodes as $trkpt)
+ {
$lat = $trkpt['lat'];
$lon = $trkpt['lon'];
$ele = $trkpt->ele;
@@ -57,28 +86,63 @@
$lastLon=$lon;
$lastEle=$ele;
}
+
}
else
{
- array_push($points, array((float)0,(float)0,(float)0,(float)0));
- }
- // riduco l'array a circa 200 punti per non appensantire la pagina(mappa e grafico)!
- $count=sizeof($points);
- if ($count>200)
- {
- $f = round($count/200);
- if ($f>1)
- for($i=$count;$i>0;$i--)
- if ($i % $f != 0)
- unset($points[$i]);
+
+ $nodes = $gpx->xpath('//gpxx:rpt');
+
+ if ( count($nodes) > 0 )
+ {
+
+ // Garmin case
+ foreach($nodes as $rpt)
+ {
+
+ $lat = $rpt['lat'];
+ $lon = $rpt['lon'];
+ if ($lastLat == 0 && $lastLon == 0)
+ {
+ //Base Case
+ array_push($points, array((float)$lat,(float)$lon,null,null));
+ $lastLat=$lat;
+ $lastLon=$lon;
+ }
+ else
+ {
+ //Normal Case
+ $offset = calculateDistance($lat, $lon, 0,$lastLat, $lastLon, 0);
+ $dist = $dist + $offset;
+ if (((float) $offset + (float) $lastOffset) > $gpxOffset)
+ {
+ //Bigger Offset -> write coordinate
+ $lastOffset=0;
+ array_push($points, array((float)$lat,(float)$lon,null,null));
+ }
+ else
+ {
+ //Smoller Offset -> continue..
+ $lastOffset= (float) $lastOffset + (float) $offset;
+ }
+ }
+ $lastLat=$lat;
+ $lastLon=$lon;
+ }
+
+ }
+ else
+ {
+ echo "Gpx Empty or not supported!";
+ }
}
+
return $points;
- }
-
+ }
function toRadians($degrees)
{
return $degrees * 3.1415926535897932385 / 180;
- }
+ }
function calculateDistance($lat1,$lon1,$ele1,$lat2,$lon2,$ele2)
{
@@ -89,4 +153,6 @@
$dist = 2 * 3958.75 * atan2(sqrt($a), sqrt(1 - (float) $a));
return sqrt(pow($dist * 1609.00, 2) + pow((float) $lat1 - (float)$lat2, 2));
}
+
+
?>
\ No newline at end of file
diff --git a/wp-gpx-maps_admin.php b/wp-gpx-maps_admin.php
index 12b4a9c..750b28d 100644
--- a/wp-gpx-maps_admin.php
+++ b/wp-gpx-maps_admin.php
@@ -99,14 +99,10 @@ function WP_GPX_Maps_html_page() {