From 0d396a34ec1813f2410db3ff17ed8ce0f0d3d88f Mon Sep 17 00:00:00 2001
From: Bartek Fabiszewski <github@fabiszewski.net>
Date: Mon, 30 Jan 2017 23:46:25 +0100
Subject: [PATCH] Rename 'angle' as 'bearing'

---
 README           | 2 ++
 getpositions.php | 8 ++++----
 main.js          | 6 +++---
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/README b/README
index 3643883..888f14e 100755
--- a/README
+++ b/README
@@ -24,6 +24,8 @@ Features:
 Todo
 - install script
 - custom icons
+- admin page (users management)
+- track editing
 
 License
 - GPL
diff --git a/getpositions.php b/getpositions.php
index 854d444..fcfd5df 100755
--- a/getpositions.php
+++ b/getpositions.php
@@ -29,8 +29,8 @@ function haversine_distance($lat1, $lon1, $lat2, $lon2) {
   $lon2 = deg2rad($lon2);
   $latD = $lat2 - $lat1;
   $lonD = $lon2 - $lon1;
-  $angle = 2*asin(sqrt(pow(sin($latD/2),2)+cos($lat1)*cos($lat2)*pow(sin($lonD/2),2)));
-  return $angle * 6371000;
+  $bearing = 2*asin(sqrt(pow(sin($latD/2),2)+cos($lat1)*cos($lat2)*pow(sin($lonD/2),2)));
+  return $bearing * 6371000;
 }
 
 if ($userid) {
@@ -54,7 +54,7 @@ if ($userid) {
     $query->bind_param('i', $userid);
   }
   $query->execute();
-  $query->bind_result($positionid,$latitude,$longitude,$altitude,$speed,$angle,$dateoccured,$accuracy,$comments,$username,$trackname,$trackid);
+  $query->bind_result($positionid,$latitude,$longitude,$altitude,$speed,$bearing,$dateoccured,$accuracy,$comments,$username,$trackname,$trackid);
 
   header("Content-type: text/xml");
   $xml = new XMLWriter();
@@ -70,7 +70,7 @@ if ($userid) {
       $xml->writeElement("longitude", $longitude);
       $xml->writeElement("altitude", ($altitude)?round($altitude):$altitude);
       $xml->writeElement("speed", $speed);
-      $xml->writeElement("angle", $angle);
+      $xml->writeElement("bearing", $bearing);
       $xml->writeElement("dateoccured", $dateoccured);
       $xml->writeElement("accuracy", $accuracy);
       $xml->writeElement("comments", $comments);
diff --git a/main.js b/main.js
index 75d2419..2338001 100755
--- a/main.js
+++ b/main.js
@@ -139,8 +139,8 @@ function parsePosition(p) {
   if (altitude != null) { altitude = parseInt(altitude); }
   var speed = getNode(p,'speed'); // may be null
   if (speed != null) { speed = parseInt(speed); }
-  var angle = getNode(p,'angle'); // may be null
-  if (angle != null) { angle = parseInt(angle); }
+  var bearing = getNode(p,'bearing'); // may be null
+  if (bearing != null) { bearing = parseInt(bearing); }
   var accuracy = getNode(p,'accuracy'); // may be null
   if (accuracy != null) { accuracy = parseInt(accuracy); }
   var comments = getNode(p,'comments'); // may be null
@@ -155,7 +155,7 @@ function parsePosition(p) {
     'longitude': longitude,
     'altitude': altitude,
     'speed': speed,
-    'angle': angle,
+    'bearing': bearing,
     'accuracy': accuracy,
     'comments': comments,
     'username': username,