changes

Config.ipynb

@@ -63,24 +63,24 @@
  },
  {
  "cell_type": "code",
- "execution_count": 63,
+ "execution_count": 68,
  "metadata": {},
  "outputs": [
  {
  "data": {
  "text/plain": [
- "<paho.mqtt.client.MQTTMessageInfo at 0x7f8d01047810>"
+ "<paho.mqtt.client.MQTTMessageInfo at 0x7f8d0104a9f0>"
  ]
  },
- "execution_count": 63,
+ "execution_count": 68,
  "metadata": {},
  "output_type": "execute_result"
  }
  ],
  "source": [
  "client.connect(broker)\n",
  "data = {}\n",
- "data['cameraZoom'] = 5000 # Update this Value\n",
+ "data['cameraZoom'] = 0 # Update this Value\n",
  "json_data = json.dumps(data)\n",
  "client.publish(\"skyscan/config/json\",json_data)"
  ]
@@ -198,16 +198,16 @@
  },
  {
  "cell_type": "code",
- "execution_count": 64,
+ "execution_count": 65,
  "metadata": {},
  "outputs": [
  {
  "data": {
  "text/plain": [
- "<paho.mqtt.client.MQTTMessageInfo at 0x7f8d0104a540>"
+ "<paho.mqtt.client.MQTTMessageInfo at 0x7f8d01048a90>"
  ]
  },
- "execution_count": 64,
+ "execution_count": 65,
  "metadata": {},
  "output_type": "execute_result"
  }

tracker/flighttracker.py

@@ -229,7 +229,8 @@ def getElevation(self) -> int:
 
  def getLoggedDate(self) -> datetime:
  return self.__loggedDate
-
+ def getLatLonTime(self) -> datetime:
+ return self.__latLonTime
  def getGroundSpeed(self) -> float:
  return self.__groundSpeed
 
@@ -409,7 +410,7 @@ def __publish_thread(self):
  if cur is None:
  continue
 
- (lat, lon) = utils.calc_travel(cur.getLat(), cur.getLon(), cur.getLoggedDate(), cur.getGroundSpeed(), cur.getTrack(), camera_lead)
+ (lat, lon) = utils.calc_travel(cur.getLat(), cur.getLon(), cur.getLatLonTime(), cur.getGroundSpeed(), cur.getTrack(), camera_lead)
  distance = utils.coordinate_distance(camera_latitude, camera_longitude, lat, lon)
  # Round off to nearest 100 meters
  #distance = round(distance/100) * 100