Techincal fixes

Author: mastervanleeuwen

components/com_jtg/assets/js/jtg.js

@@ -9,7 +9,6 @@ var allpoints = [];
 function jtgMapInit(mapLayersTitle='Map layers', targetid='jtg_map') {
 	jtgView = new ol.View( {
 		center: [0, 0],
-		units: "m",  // TODO: use units from config
 		maxZoom: 20
 	} );
 

components/com_jtg/models/track.php

@@ -731,6 +731,7 @@ function updateFile ($id)
 
 		$default_map = $input->get('default_map');
 		$distance = $input->getFloat('distance', 0);
+		$cfg = JtgHelper::getConfig();
 		if (strtoupper($cfg->unit)=='MILES') $distance /= 0.621;
 		$ascent = $input->getInt('ascent', 0);
 		$descent = $input->getInt('descent', 0);

components/com_jtg/views/track/tmpl/form.php

@@ -302,32 +302,35 @@
 		</p>
 <?php 
 		echo $editor->display('description', $description, '100%', '200px', null, null, false, null);
-		echo HTMLHelper::_('bootstrap.startAccordion', 'calcVals');
-		echo HTMLHelper::_('bootstrap.addSlide', 'calcVals', '<div class="jtg-header">'.JText::_('COM_JTG_CALCULATED_VALUES').'</div>', 'collapse1');
+		if (isset($this->id) && isset($this->gpsTrack))
+		{
+			echo HTMLHelper::_('bootstrap.startAccordion', 'calcVals');
+			echo HTMLHelper::_('bootstrap.addSlide', 'calcVals', '<div class="jtg-header">'.JText::_('COM_JTG_CALCULATED_VALUES').'</div>', 'collapse1');
 ?>
 		<table class="table">
 			<tbody>
 			<tr>
 				<td><?php echo JText::_('COM_JTG_DISTANCE'); ?></td>
 				<td><input id="distance" type="text" name="distance" class="form-control" value="<?php echo $this->track->distance; ?>" /> <?php echo JText::_('COM_JTG_DISTANCE_UNIT_'.strtoupper($this->cfg->unit));
-					if (isset($this->gpsTrack)) echo ' <font color="grey">( '.JtgHelper::getFormattedDistance($this->gpsTrack->distance, '',$this->cfg->unit).' )</font>'; ?> </td>
+					echo ' <font color="grey">( '.JtgHelper::getFormattedDistance($this->gpsTrack->distance, '',$this->cfg->unit).' )</font>'; ?> </td>
 			</tr>
 			<tr>
 				<td><?php echo JText::_('COM_JTG_ELEVATION_UP') ?></td>
 				<td><input id="ascent" type="text" name="ascent" class="form-control" value="<?php echo $this->track->ele_asc; ?>" /> <?php echo JText::_('COM_JTG_ELEVATION_UNIT');
-					if (isset($this->gpsTrack)) echo ' <font color="grey">( '.$this->gpsTrack->totalAscent.' ) </font>'; ?> </td>
+					echo ' <font color="grey">( '.$this->gpsTrack->totalAscent.' ) </font>'; ?> </td>
 			</tr>
 			<tr>
 				<td><?php echo JText::_('COM_JTG_ELEVATION_DOWN') ?></td>
 				<td><input id="descent" type="text" name="descent" class="form-control" value="<?php echo $this->track->ele_desc; ?>" /> <?php echo JText::_('COM_JTG_ELEVATION_UNIT');
-					if (isset($this->gpsTrack)) echo ' <font color="grey">( '.$this->gpsTrack->totalDescent.' )</font>'; ?> </td>
+					echo ' <font color="grey">( '.$this->gpsTrack->totalDescent.' )</font>'; ?> </td>
 			</tr>
 			</tbody>
 		</table>
 		</div>
 <?php 
 			echo HTMLHelper::_('bootstrap.endSlide');
 			echo HTMLHelper::_('bootstrap.endAccordion');
+		}
 			$max_images = $this->cfg->max_images;
 
 			if (!empty($this->imageList))