dronecot 2.2.0__tar.gz → 2.2.2__tar.gz

{dronecot-2.2.0 → dronecot-2.2.2}/CHANGELOG.md

@@ -1,3 +1,13 @@
+## DroneCOT 2.2.2
+
+- Fix UTC timestamp handling on Python 3.9 and 3.10.
+
+## DroneCOT 2.2.1
+
+- Use PyTAK shared CoT event, point, detail, remarks, and serialization helpers.
+- Replace `pytz` timestamp handling with standard-library timezone handling.
+- Require `pytak >= 7.3.12`.
+
 ## DroneCOT 2.2.0
 
 - Add `SensorWorker`: periodic `a-f-G-E-S-E` sensor CoT heartbeat, emitted every `SENSOR_KEEPALIVE_PERIOD` seconds (default 30).

{dronecot-2.2.0/dronecot.egg-info → dronecot-2.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dronecot
-Version: 2.2.0
+Version: 2.2.2
 Summary: Display Drones in Team Awareness Kit (TAK).
 Home-page: https://github.com/snstac/dronecot
 Maintainer: Greg Albrecht <oss@undef.net>
@@ -22,14 +22,13 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pytak>=7.3.0
+Requires-Dist: pytak>=7.3.12
 Requires-Dist: paho-mqtt<2.0.0
 Requires-Dist: bitstruct
 Requires-Dist: pymavlink
 Requires-Dist: pyserial
 Requires-Dist: cryptography
 Requires-Dist: aiohttp
-Requires-Dist: pytz
 Requires-Dist: aiomqtt
 Provides-Extra: with-takproto
 Requires-Dist: takproto>=2.0.0; extra == "with-takproto"
@@ -244,6 +243,29 @@ Contact: [info@snstac.com](mailto:info@snstac.com) · [snstac.com](https://www.s
 
 ---
 
+## The snstac TAK sensor ecosystem
+
+Different sensor, same workflow — pick the gateway for your application; most have a
+matching Cockpit plugin for browser-based management:
+
+| Application | Gateway | Cockpit plugin |
+|---|---|---|
+| Aircraft via ADS-B (1090 MHz / 978 MHz UAT) | [adsbcot](https://github.com/snstac/adsbcot) | [cockpit-adsbcot](https://github.com/snstac/cockpit-adsbcot) |
+| Ships & vessels via AIS | [aiscot](https://github.com/snstac/aiscot) | [cockpit-aiscot](https://github.com/snstac/cockpit-aiscot), [cockpit-aiscatcher](https://github.com/snstac/cockpit-aiscatcher) |
+| Drone / UAS Remote ID (counter-UAS) | [dronecot](https://github.com/snstac/dronecot) | [cockpit-dronecot](https://github.com/snstac/cockpit-dronecot) |
+| Own position via GPS/GNSS | [lincot](https://github.com/snstac/lincot) | [cockpit-lincot](https://github.com/snstac/cockpit-lincot), [cockpit-gps](https://github.com/snstac/cockpit-gps) |
+| Radio direction finding (KrakenSDR) | [kraktak](https://github.com/snstac/kraktak) | — |
+| APRS amateur radio | [aprscot](https://github.com/snstac/aprscot) | — |
+| Weather stations | [windtak](https://github.com/snstac/windtak) | — |
+| CoT routing / TAK Server bridging | [charontak](https://github.com/snstac/charontak) | — |
+
+All gateways are built on [PyTAK](https://github.com/snstac/pytak), speak
+**Cursor on Target (CoT)** to **ATAK, WinTAK, iTAK, TAK Server, and Mesh SA**, ship as
+signed Debian/RPM packages at [snstac.github.io/packages](https://snstac.github.io/packages),
+and come pre-installed on [AryaOS](https://github.com/snstac/aryaos), the
+situational-awareness OS for Raspberry Pi.
+
+
 ## License
 
 ### DroneCOT

{dronecot-2.2.0 → dronecot-2.2.2}/README.md

@@ -196,6 +196,29 @@ Contact: [info@snstac.com](mailto:info@snstac.com) · [snstac.com](https://www.s
 
 ---
 
+## The snstac TAK sensor ecosystem
+
+Different sensor, same workflow — pick the gateway for your application; most have a
+matching Cockpit plugin for browser-based management:
+
+| Application | Gateway | Cockpit plugin |
+|---|---|---|
+| Aircraft via ADS-B (1090 MHz / 978 MHz UAT) | [adsbcot](https://github.com/snstac/adsbcot) | [cockpit-adsbcot](https://github.com/snstac/cockpit-adsbcot) |
+| Ships & vessels via AIS | [aiscot](https://github.com/snstac/aiscot) | [cockpit-aiscot](https://github.com/snstac/cockpit-aiscot), [cockpit-aiscatcher](https://github.com/snstac/cockpit-aiscatcher) |
+| Drone / UAS Remote ID (counter-UAS) | [dronecot](https://github.com/snstac/dronecot) | [cockpit-dronecot](https://github.com/snstac/cockpit-dronecot) |
+| Own position via GPS/GNSS | [lincot](https://github.com/snstac/lincot) | [cockpit-lincot](https://github.com/snstac/cockpit-lincot), [cockpit-gps](https://github.com/snstac/cockpit-gps) |
+| Radio direction finding (KrakenSDR) | [kraktak](https://github.com/snstac/kraktak) | — |
+| APRS amateur radio | [aprscot](https://github.com/snstac/aprscot) | — |
+| Weather stations | [windtak](https://github.com/snstac/windtak) | — |
+| CoT routing / TAK Server bridging | [charontak](https://github.com/snstac/charontak) | — |
+
+All gateways are built on [PyTAK](https://github.com/snstac/pytak), speak
+**Cursor on Target (CoT)** to **ATAK, WinTAK, iTAK, TAK Server, and Mesh SA**, ship as
+signed Debian/RPM packages at [snstac.github.io/packages](https://snstac.github.io/packages),
+and come pre-installed on [AryaOS](https://github.com/snstac/aryaos), the
+situational-awareness OS for Raspberry Pi.
+
+
 ## License
 
 ### DroneCOT

{dronecot-2.2.0 → dronecot-2.2.2/dronecot.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dronecot
-Version: 2.2.0
+Version: 2.2.2
 Summary: Display Drones in Team Awareness Kit (TAK).
 Home-page: https://github.com/snstac/dronecot
 Maintainer: Greg Albrecht <oss@undef.net>
@@ -22,14 +22,13 @@ Classifier: Operating System :: OS Independent
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pytak>=7.3.0
+Requires-Dist: pytak>=7.3.12
 Requires-Dist: paho-mqtt<2.0.0
 Requires-Dist: bitstruct
 Requires-Dist: pymavlink
 Requires-Dist: pyserial
 Requires-Dist: cryptography
 Requires-Dist: aiohttp
-Requires-Dist: pytz
 Requires-Dist: aiomqtt
 Provides-Extra: with-takproto
 Requires-Dist: takproto>=2.0.0; extra == "with-takproto"
@@ -244,6 +243,29 @@ Contact: [info@snstac.com](mailto:info@snstac.com) · [snstac.com](https://www.s
 
 ---
 
+## The snstac TAK sensor ecosystem
+
+Different sensor, same workflow — pick the gateway for your application; most have a
+matching Cockpit plugin for browser-based management:
+
+| Application | Gateway | Cockpit plugin |
+|---|---|---|
+| Aircraft via ADS-B (1090 MHz / 978 MHz UAT) | [adsbcot](https://github.com/snstac/adsbcot) | [cockpit-adsbcot](https://github.com/snstac/cockpit-adsbcot) |
+| Ships & vessels via AIS | [aiscot](https://github.com/snstac/aiscot) | [cockpit-aiscot](https://github.com/snstac/cockpit-aiscot), [cockpit-aiscatcher](https://github.com/snstac/cockpit-aiscatcher) |
+| Drone / UAS Remote ID (counter-UAS) | [dronecot](https://github.com/snstac/dronecot) | [cockpit-dronecot](https://github.com/snstac/cockpit-dronecot) |
+| Own position via GPS/GNSS | [lincot](https://github.com/snstac/lincot) | [cockpit-lincot](https://github.com/snstac/cockpit-lincot), [cockpit-gps](https://github.com/snstac/cockpit-gps) |
+| Radio direction finding (KrakenSDR) | [kraktak](https://github.com/snstac/kraktak) | — |
+| APRS amateur radio | [aprscot](https://github.com/snstac/aprscot) | — |
+| Weather stations | [windtak](https://github.com/snstac/windtak) | — |
+| CoT routing / TAK Server bridging | [charontak](https://github.com/snstac/charontak) | — |
+
+All gateways are built on [PyTAK](https://github.com/snstac/pytak), speak
+**Cursor on Target (CoT)** to **ATAK, WinTAK, iTAK, TAK Server, and Mesh SA**, ship as
+signed Debian/RPM packages at [snstac.github.io/packages](https://snstac.github.io/packages),
+and come pre-installed on [AryaOS](https://github.com/snstac/aryaos), the
+situational-awareness OS for Raspberry Pi.
+
+
 ## License
 
 ### DroneCOT

{dronecot-2.2.0 → dronecot-2.2.2}/dronecot.egg-info/requires.txt

@@ -1,11 +1,10 @@
-pytak>=7.3.0
+pytak>=7.3.12
 paho-mqtt<2.0.0
 bitstruct
 pymavlink
 pyserial
 cryptography
 aiohttp
-pytz
 aiomqtt
 
 [ble]

{dronecot-2.2.0 → dronecot-2.2.2}/setup.cfg

@@ -48,14 +48,13 @@ package_dir =
 	dronecot = src/dronecot
 python_requires = >=3.9, <4
 install_requires = 
-	pytak >= 7.3.0
+	pytak >= 7.3.12
 	paho-mqtt < 2.0.0
 	bitstruct
 	pymavlink
 	pyserial
 	cryptography
 	aiohttp
-	pytz
 	aiomqtt
 
 [options.packages.find]

dronecot-2.2.2/src/dronecot/VERSION

@@ -0,0 +1 @@
+2.2.2

{dronecot-2.2.0 → dronecot-2.2.2}/src/dronecot/functions.py

@@ -29,11 +29,11 @@ import xml.etree.ElementTree as ET
 from configparser import SectionProxy
 from typing import Optional, Set, Union
 from urllib.parse import urlparse
+from zoneinfo import ZoneInfo, ZoneInfoNotFoundError
 
 import pytak
 import dronecot
 from datetime import datetime
-import pytz
 
 from .dji_functions import parse_frame, parse_data
 from .dji_text_parser import dji_parse_text_line
@@ -65,6 +65,15 @@ _DJI_Logger = logging.getLogger(__name__)
 APP_NAME = "dronecot"
 
 
+def _pacific_timestamp() -> str:
+    """Return a human-readable last-seen timestamp, falling back if tzdata is absent."""
+    try:
+        tzinfo = ZoneInfo("US/Pacific")
+    except ZoneInfoNotFoundError:
+        tzinfo = datetime.now().astimezone().tzinfo
+    return datetime.now(tzinfo).strftime("%Y-%m-%d %H:%M:%S %Z")
+
+
 def _dji_feed_uses_text(config, feed_url: str, parsed) -> bool:
     """Return True if the configured DJI feed uses AntSDR text CSV format."""
     feed_format = str(config.get("FEED_FORMAT", "")).lower()
@@ -138,6 +147,31 @@ def create_tasks(config: SectionProxy, clitool: pytak.CLITool) -> Set[pytak.Work
     return tasks
 
 
+def _cot_event_with_detail(
+    *,
+    uid: str,
+    cot_type: str,
+    stale,
+    lat,
+    lon,
+    hae,
+    ce,
+    le,
+    detail: ET.Element,
+    config: Union[SectionProxy, dict],
+    cot_host_id: str,
+) -> ET.Element:
+    """Build a standard CoT event around DroneCOT-specific detail children."""
+    return pytak.cot_event(
+        uid=uid,
+        cot_type=cot_type,
+        stale=stale,
+        point=pytak.cot_point(lat=lat, lon=lon, ce=ce, hae=hae, le=le),
+        detail=pytak.cot_detail(*list(detail), flow_tag_host_id=cot_host_id),
+        access=config.get("COT_ACCESS", pytak.DEFAULT_COT_ACCESS),
+    )
+
+
 def rid_op_to_cot_xml(  # NOQA pylint: disable=too-many-locals,too-many-branches,too-many-statements
     data: dict,
     config: Union[SectionProxy, dict, None] = None,
@@ -218,26 +252,19 @@ def rid_op_to_cot_xml(  # NOQA pylint: disable=too-many-locals,too-many-branches
     remarks.text = _remarks
     detail.append(remarks)
 
-    cot_d = {
-        "lat": str(lat),
-        "lon": str(lon),
-        "ce": str(data.get("HorizAccuracy", "9999999.0")),
-        "le": str(data.get("VertAccuracy", "9999999.0")),
-        "hae": str(data.get("OperatorAltitudeGeo", "9999999.0")),
-        "uid": cot_uid,
-        "cot_type": cot_type,
-        "stale": cot_stale,
-    }
-    cot = pytak.gen_cot_xml(**cot_d)
-    cot.set("access", config.get("COT_ACCESS", pytak.DEFAULT_COT_ACCESS))
-
-    _detail = cot.findall("detail")[0]
-    flowtags = _detail.findall("_flow-tags_")
-    detail.extend(flowtags)
-    cot.remove(_detail)
-    cot.append(detail)
-
-    return cot
+    return _cot_event_with_detail(
+        uid=cot_uid,
+        cot_type=cot_type,
+        stale=cot_stale,
+        lat=lat,
+        lon=lon,
+        ce=str(data.get("HorizAccuracy", "9999999.0")),
+        le=str(data.get("VertAccuracy", "9999999.0")),
+        hae=str(data.get("OperatorAltitudeGeo", "9999999.0")),
+        detail=detail,
+        config=config,
+        cot_host_id=cot_host_id,
+    )
 
 
 def rid_uas_to_cot_xml(  # NOQA pylint: disable=too-many-locals,too-many-branches,too-many-statements
@@ -287,8 +314,7 @@ def rid_uas_to_cot_xml(  # NOQA pylint: disable=too-many-locals,too-many-branche
     cot_host_id: str = config.get("COT_HOST_ID", pytak.DEFAULT_HOST_ID)
 
     # Show last-seen time in Pacific Time Zone in remarks
-    pacific = pytz.timezone('US/Pacific')
-    pacific_time = datetime.now(pacific).strftime('%Y-%m-%d %H:%M:%S %Z')
+    pacific_time = _pacific_timestamp()
     remarks_fields.append(f"Last Seen (Pacific): {pacific_time}")
 
     remarks_fields.append(f"Remote ID: {uasid}")
@@ -405,26 +431,19 @@ def rid_uas_to_cot_xml(  # NOQA pylint: disable=too-many-locals,too-many-branche
     remarks.text = _remarks
     detail.append(remarks)
 
-    cot_d = {
-        "lat": str(lat),
-        "lon": str(lon),
-        "ce": str(data.get("HorizAccuracy", "9999999.0")),
-        "le": str(data.get("VertAccuracy", "9999999.0")),
-        "hae": str(data.get("AltitudeGeo", "9999999.0")),
-        "uid": cot_uid,
-        "cot_type": cot_type,
-        "stale": cot_stale,
-    }
-    cot = pytak.gen_cot_xml(**cot_d)
-    cot.set("access", config.get("COT_ACCESS", pytak.DEFAULT_COT_ACCESS))
-
-    _detail = cot.findall("detail")[0]
-    flowtags = _detail.findall("_flow-tags_")
-    detail.extend(flowtags)
-    cot.remove(_detail)
-    cot.append(detail)
-
-    return cot
+    return _cot_event_with_detail(
+        uid=cot_uid,
+        cot_type=cot_type,
+        stale=cot_stale,
+        lat=lat,
+        lon=lon,
+        ce=str(data.get("HorizAccuracy", "9999999.0")),
+        le=str(data.get("VertAccuracy", "9999999.0")),
+        hae=str(data.get("AltitudeGeo", "9999999.0")),
+        detail=detail,
+        config=config,
+        cot_host_id=cot_host_id,
+    )
 
 
 def sensor_status_to_cot(  # NOQA pylint: disable=too-many-locals,too-many-branches,too-many-statements
@@ -494,26 +513,19 @@ def sensor_status_to_cot(  # NOQA pylint: disable=too-many-locals,too-many-branc
     remarks.text = _remarks
     detail.append(remarks)
 
-    cot_d = {
-        "lat": str(lat),
-        "lon": str(lon),
-        "ce": str(data.get("HorizAccuracy", "9999999.0")),
-        "le": str(data.get("VertAccuracy", "9999999.0")),
-        "hae": hae,
-        "uid": cot_uid,
-        "cot_type": cot_type,
-        "stale": cot_stale,
-    }
-    cot = pytak.gen_cot_xml(**cot_d)
-    cot.set("access", config.get("COT_ACCESS", pytak.DEFAULT_COT_ACCESS))
-
-    _detail = cot.findall("detail")[0]
-    flowtags = _detail.findall("_flow-tags_")
-    detail.extend(flowtags)
-    cot.remove(_detail)
-    cot.append(detail)
-
-    return cot
+    return _cot_event_with_detail(
+        uid=cot_uid,
+        cot_type=cot_type,
+        stale=cot_stale,
+        lat=lat,
+        lon=lon,
+        ce=str(data.get("HorizAccuracy", "9999999.0")),
+        le=str(data.get("VertAccuracy", "9999999.0")),
+        hae=hae,
+        detail=detail,
+        config=config,
+        cot_host_id=cot_host_id,
+    )
 
 
 def xml_to_cot(
@@ -521,9 +533,7 @@ def xml_to_cot(
 ) -> Optional[bytes]:
     """Return a CoT XML object as an XML string, using the given func."""
     cot: Optional[ET.Element] = getattr(dronecot.functions, func)(data, config)
-    return (
-        b"\n".join([pytak.DEFAULT_XML_DECLARATION, ET.tostring(cot)]) if cot else None
-    )
+    return pytak.serialize_cot(cot) if cot is not None else None
 
 
 def cot_to_xml(
@@ -703,27 +713,19 @@ def gen_dji_cot(  # NOQA pylint: disable=too-many-locals,too-many-branches,too-m
     detail.append(cuas)
     detail.append(crumbs)
 
-    cot_d = {
-        "lat": str(lat),
-        "lon": str(lon),
-        "ce": ce,
-        "le": str(data.get("nac_v", "9999999.0")),
-        "hae": str(data.get("alt_geom", "9999999.0")),
-        "uid": cot_uid,
-        "cot_type": cot_type,
-        "stale": cot_stale,
-    }
-    cot = pytak.gen_cot_xml(**cot_d)
-    cot.set("access", config.get("COT_ACCESS", pytak.DEFAULT_COT_ACCESS))
-
-    _detail = cot.find("detail")
-    if _detail is not None:
-        flowtags = _detail.findall("_flow-tags_")
-        detail.extend(flowtags)
-        cot.remove(_detail)
-    cot.append(detail)
-
-    return cot
+    return _cot_event_with_detail(
+        uid=cot_uid,
+        cot_type=cot_type,
+        stale=cot_stale,
+        lat=lat,
+        lon=lon,
+        ce=ce,
+        le=str(data.get("nac_v", "9999999.0")),
+        hae=str(data.get("alt_geom", "9999999.0")),
+        detail=detail,
+        config=config,
+        cot_host_id=cot_host_id,
+    )
 
 
 def dji_sensor_to_cot(
@@ -762,27 +764,19 @@ def dji_sensor_to_cot(
     detail.append(contact)
     detail.append(cuas)
 
-    cot_d = {
-        "lat": str(lat),
-        "lon": str(lon),
-        "ce": str(config.get("SENSOR_CE", DEFAULT_DJI_SENSOR_CE)),
-        "le": str(config.get("SENSOR_LE", DEFAULT_DJI_SENSOR_LE)),
-        "hae": str(config.get("SENSOR_HAE", DEFAULT_DJI_SENSOR_HAE)),
-        "uid": cot_uid,
-        "cot_type": cot_type,
-        "stale": cot_stale,
-    }
-    cot = pytak.gen_cot_xml(**cot_d)
-    cot.set("access", config.get("COT_ACCESS", pytak.DEFAULT_COT_ACCESS))
-
-    _detail = cot.find("detail")
-    if _detail is not None:
-        flowtags = _detail.findall("_flow-tags_")
-        detail.extend(flowtags)
-        cot.remove(_detail)
-    cot.append(detail)
-
-    return cot
+    return _cot_event_with_detail(
+        uid=cot_uid,
+        cot_type=cot_type,
+        stale=cot_stale,
+        lat=lat,
+        lon=lon,
+        ce=str(config.get("SENSOR_CE", DEFAULT_DJI_SENSOR_CE)),
+        le=str(config.get("SENSOR_LE", DEFAULT_DJI_SENSOR_LE)),
+        hae=str(config.get("SENSOR_HAE", DEFAULT_DJI_SENSOR_HAE)),
+        detail=detail,
+        config=config,
+        cot_host_id=cot_host_id,
+    )
 
 
 def dji_uas_to_cot(data, config: Union[SectionProxy, dict, None] = None) -> Optional[ET.Element]:
@@ -874,26 +868,12 @@ def gen_sensor_cot(
     cuas.set("sensor_id", sensor_id)
     cuas.set("type", payload_type)
 
-    detail = ET.Element("detail")
-    detail.append(contact)
-    detail.append(cuas)
-
-    cot = pytak.gen_cot_xml(
-        lat=str(lat),
-        lon=str(lon),
-        hae=str(hae),
-        ce=ce,
-        le=le,
+    return pytak.cot_event(
         uid=f"SENSOR.{sensor_id}",
         cot_type=cot_type,
         stale=cot_stale,
+        point=pytak.cot_point(lat=lat, lon=lon, hae=hae, ce=ce, le=le),
+        detail=pytak.cot_detail(contact, cuas, flow_tag=False),
+        how="m-g",
+        access=config.get("COT_ACCESS", pytak.DEFAULT_COT_ACCESS),
     )
-    cot.set("how", "m-g")
-    cot.set("access", config.get("COT_ACCESS", pytak.DEFAULT_COT_ACCESS))
-
-    _detail = cot.find("detail")
-    if _detail is not None:
-        cot.remove(_detail)
-    cot.append(detail)
-
-    return cot

{dronecot-2.2.0 → dronecot-2.2.2}/src/dronecot/open_drone_id.py

@@ -27,8 +27,6 @@
 import datetime
 import struct
 
-import pytz
-
 from bitstruct import *
 
 
@@ -356,7 +354,7 @@ def parse_System(payload):
     if Timestamp != float("NaN") and Timestamp != 0:
         pl["Timestamp"] = (
             datetime.datetime.fromtimestamp(
-                (int(Timestamp) + 1546300800), pytz.UTC
+                (int(Timestamp) + 1546300800), datetime.timezone.utc
             ).strftime("%Y-%m-%d %H:%M %Z"),
         )
     pl["TimestampRaw"] = Timestamp
@@ -411,7 +409,7 @@ def parse_AuthPage(payload, page):
 
         if Timestamp != float("NaN") and Timestamp != 0:
             pl["Timestamp"] = datetime.datetime.fromtimestamp(
-                (int(Timestamp) + 1546300800), pytz.UTC
+                (int(Timestamp) + 1546300800), datetime.timezone.utc
             ).strftime("%Y-%m-%d %H:%M %Z")
 
         AuthData = payload[AuthPage_start_byte + 16 : AuthPage_start_byte + 16 + 17]

{dronecot-2.2.0 → dronecot-2.2.2}/tests/test_functions.py

@@ -71,8 +71,8 @@ class FunctionsTestCase(unittest.TestCase):
 
         point = cot_xml.find("point")
         self.assertIsNotNone(point)
-        self.assertEqual(point.get("lat"), "37.759979")
-        self.assertEqual(point.get("lon"), "-122.497734")
+        self.assertEqual(point.get("lat"), "37.7599")
+        self.assertEqual(point.get("lon"), "-122.4977")
         self.assertEqual(point.get("ce"), "12")
         self.assertEqual(point.get("le"), "5")
         self.assertEqual(point.get("hae"), "28.0")
@@ -111,8 +111,8 @@ class FunctionsTestCase(unittest.TestCase):
 
         point = cot_xml.find("point")
         self.assertIsNotNone(point)
-        self.assertEqual(point.get("lat"), "37.759979")
-        self.assertEqual(point.get("lon"), "-122.497734")
+        self.assertEqual(point.get("lat"), "37.7599")
+        self.assertEqual(point.get("lon"), "-122.4977")
         self.assertEqual(point.get("ce"), "12")
         self.assertEqual(point.get("le"), "5")
         self.assertEqual(point.get("hae"), "28.0")
@@ -151,8 +151,8 @@ class FunctionsTestCase(unittest.TestCase):
 
         point = cot_xml.find("point")
         self.assertIsNotNone(point)
-        self.assertEqual(point.get("lat"), "37.759979")
-        self.assertEqual(point.get("lon"), "-122.497734")
+        self.assertEqual(point.get("lat"), "37.7599")
+        self.assertEqual(point.get("lon"), "-122.4977")
         self.assertEqual(point.get("ce"), "12")
         self.assertEqual(point.get("le"), "5")
         self.assertEqual(point.get("hae"), "28.0")
@@ -191,8 +191,8 @@ class FunctionsTestCase(unittest.TestCase):
 
         point = cot_xml.find("point")
         self.assertIsNotNone(point)
-        self.assertEqual(point.get("lat"), "37.7599788")
-        self.assertEqual(point.get("lon"), "-122.4977338")
+        self.assertEqual(point.get("lat"), "37.7599")
+        self.assertEqual(point.get("lon"), "-122.4977")
         self.assertEqual(point.get("ce"), "12")
         self.assertEqual(point.get("le"), "5")
         self.assertEqual(point.get("hae"), "28.0")

dronecot-2.2.0/src/dronecot/VERSION

@@ -1 +0,0 @@
-2.2.0