diff --git a/application/controllers/Qrbcalc.php b/application/controllers/Qrbcalc.php index f7ad22c7..ed5d3e4b 100644 --- a/application/controllers/Qrbcalc.php +++ b/application/controllers/Qrbcalc.php @@ -49,7 +49,7 @@ class Qrbcalc extends CI_Controller { $data['result'] = $this->qra->bearing($locator1, $locator2, $measurement_base); $data['distance'] = $this->qra->distance($locator1, $locator2, $measurement_base) . $var_dist; - $data['bearing'] = $this->qra->get_bearing($locator1, $locator2) . "º "; + $data['bearing'] = $this->qra->get_bearing($locator1, $locator2) . "º"; $latlng1 = $this->qra->qra2latlong($locator1); $latlng2 = $this->qra->qra2latlong($locator2); $latlng1[0] = number_format((float)$latlng1[0], 3, '.', '');; @@ -62,4 +62,4 @@ class Qrbcalc extends CI_Controller { header('Content-Type: application/json'); echo json_encode($data); } -} \ No newline at end of file +} diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 90839706..3900e753 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -470,8 +470,8 @@ function calculateQrb(form) { var result = "
Negative latitudes are south of the equator, negative longitudes are west of Greenwich.
"; result += ' ' + locator1.toUpperCase() + ' Latitude = ' + html['latlng1'][0] + ' Longitude = ' + html['latlng1'][1] + '
'; result += ' ' + locator2.toUpperCase() + ' Latitude = ' + html['latlng2'][0] + ' Longitude = ' + html['latlng2'][1] + '
'; - result += 'Distance between ' + locator1.toUpperCase() + ' and ' + locator2.toUpperCase() + ' is ' + html['distance'] + '. and '; - result += 'the bearing is ' + html['bearing'] + '.
'; + result += 'Distance between ' + locator1.toUpperCase() + ' and ' + locator2.toUpperCase() + ' is ' + html['distance'] + '.
'; + result += 'The bearing is ' + html['bearing'] + '.'; $(".qrbResult").html(result); newpath(html['latlng1'], html['latlng2'], locator1, locator2);