diff --git a/agosms-update.xml b/agosms-update.xml index 6a82a3d7..f65dad33 100644 --- a/agosms-update.xml +++ b/agosms-update.xml @@ -180,4 +180,22 @@ https://astrid-guenther.de + + pkg_agosms + pkg_agosms + pkg_agosms + package + site + 1.0.36 + https://github.com/astridx/pkg_agosms/blob/v1.0.36/README.md + + https://github.com/astridx/pkg_agosms/releases/download/v1.0.36/pkg-agosms.zip + + + stable + + Astrid Günther + https://astrid-guenther.de + + \ No newline at end of file diff --git a/dist/current b/dist/current index 101434dd..5638fc0a 120000 --- a/dist/current +++ b/dist/current @@ -1 +1 @@ -/home/astrid/git/joomla-development/pkg_agosms/dist/agosms-1.0.35 \ No newline at end of file +/home/astrid/git/joomla-development/pkg_agosms/dist/agosms-1.0.36 \ No newline at end of file diff --git a/dist/tmp/cbuild/administrator/components/com_agosms/agosms.xml b/dist/tmp/cbuild/administrator/components/com_agosms/agosms.xml index fdad8947..8bacb8fd 100644 --- a/dist/tmp/cbuild/administrator/components/com_agosms/agosms.xml +++ b/dist/tmp/cbuild/administrator/components/com_agosms/agosms.xml @@ -2,12 +2,12 @@ com_agosms Astrid Günther - 2019-06-08 + 2019-06-12 (C) 2019 Open Source Matters. All rights reserved. GNU General Public License version 2 or later; info@astrid-guenther.de www.astrid-guenther.de - 1.0.35 + 1.0.36 COM_AGOSMS_XML_DESCRIPTION script.php diff --git a/dist/zips/com_agosms.zip b/dist/zips/com_agosms.zip index e8fc9088..6b9c7fc3 100644 Binary files a/dist/zips/com_agosms.zip and b/dist/zips/com_agosms.zip differ diff --git a/dist/zips/mod_agosm.zip b/dist/zips/mod_agosm.zip index f918d920..80164716 100644 Binary files a/dist/zips/mod_agosm.zip and b/dist/zips/mod_agosm.zip differ diff --git a/jorobo.ini b/jorobo.ini index 79549071..749f0562 100644 --- a/jorobo.ini +++ b/jorobo.ini @@ -1,5 +1,5 @@ extension = agosms -version = 1.0.35 +version = 1.0.36 source = src target = package diff --git a/src/media/mod_agosm/js/aggpxtrack.js b/src/media/mod_agosm/js/aggpxtrack.js index 90d62000..59e10f31 100644 --- a/src/media/mod_agosm/js/aggpxtrack.js +++ b/src/media/mod_agosm/js/aggpxtrack.js @@ -12,20 +12,21 @@ document.addEventListener('DOMContentLoaded', function () { var wptIconUrls = element.getAttribute('data-wptIconUrls'); var gpxfilenames = gpx_file_name.split(';;'); - + var group = L.featureGroup([]); window['mymap' + moduleId].fitBounds([[0, 0],[0, 0]]); for (var i = 0; i < gpxfilenames.length; i++) { + console.log(gpxfilenames[i]); new L.GPX(gpxfilenames[i], { marker_options: { startIconUrl: startIconUrl, endIconUrl: endIconUrl, - shadowUrl: shadowIconUrl - }, - wptIconUrls: { - '': wptIconUrls + shadowUrl: shadowIconUrl, + wptIconUrls: { + '': wptIconUrls + } }, async: true }).on('loaded', function (e) { diff --git a/src/modules/mod_agosm/tmpl/upload.php b/src/modules/mod_agosm/tmpl/upload.php index e46734eb..b69dd895 100644 --- a/src/modules/mod_agosm/tmpl/upload.php +++ b/src/modules/mod_agosm/tmpl/upload.php @@ -39,7 +39,7 @@ { for ($i = 0; $i < $total; $i++) { - $gpxfile .= $result[$i]['rpath'] . DIRECTORY_SEPARATOR . $_FILES[$params->get('ag_variable')]["name"][$i] . ';;'; + $gpxfile .= JURI::base() . $result[$i]['rpath'] . DIRECTORY_SEPARATOR . $_FILES[$params->get('ag_variable')]["name"][$i] . ';;'; } } $startIconUrl = JURI::base() . 'media/mod_agosm/leaflet-gpx/pin-icon-start.png';