code.panda.quecpython/demo.tracker-v2
1
0
Fork 0
mirror of https://gitee.com/qpy-solutions/tracker-v2.git synced 2025-05-19 11:08:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

update: spelling mistake

Browse Source
This commit is contained in:
JackSun 2022-08-03 13:15:11 +08:00
parent 3989ff79fa
commit 9434cb6fa6
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules

@ -1 +1 @@
Subproject commit 735d1c8e5c7b606379be68c44386df4590f7f082 Subproject commit 8602af964eeaef29b981baa8a9786ba0a8888a8b

14
code/tracker_collector.py
View File

@ -237,13 +237,13 @@ class Collector(Singleton):
gga_data = self.__gps_match.GxGGA(loc_data) gga_data = self.__gps_match.GxGGA(loc_data)
data = {} data = {}
if gga_data: if gga_data:
Longtitude, Latitude, Altitude = self.__locator.gps.read_coordinates(loc_data) Longitude, Latitude, Altitude = self.__locator.gps.read_coordinates(loc_data)
if map_coordinate_system == "GCJ02": if map_coordinate_system == "GCJ02":
Longtitude, Latitude = self.__locator.wgs84togcj02(Longtitude, Latitude) Longitude, Latitude = self.__locator.wgs84togcj02(Longitude, Latitude)
if Latitude: if Latitude:
data["Latitude"] = float(Latitude) data["Latitude"] = float(Latitude)
if Longtitude: if Longitude:
data["Longtitude"] = float(Longtitude) data["Longitude"] = float(Longitude)
if Altitude: if Altitude:
data["Altitude"] = float(Altitude) data["Altitude"] = float(Altitude)
if data: if data:
@ -252,12 +252,12 @@ class Collector(Singleton):
elif loc_method in (0x2, 0x4): elif loc_method in (0x2, 0x4):
if loc_data: if loc_data:
if loc_data[0]: if loc_data[0]:
Longtitude = loc_data[0][0] Longitude = loc_data[0][0]
Latitude = loc_data[0][1] Latitude = loc_data[0][1]
if map_coordinate_system == "GCJ02": if map_coordinate_system == "GCJ02":
Longtitude, Latitude = self.__locator.wgs84togcj02(Longtitude, Latitude) Longitude, Latitude = self.__locator.wgs84togcj02(Longitude, Latitude)
res["GeoLocation"] = { res["GeoLocation"] = {
"Longtitude": Longtitude, "Longitude": Longitude,
"Latitude": Latitude, "Latitude": Latitude,
# "Altitude": 0.0, # "Altitude": 0.0,
"CoordinateSystem": (1 if map_coordinate_system == "WGS84" else 2) "CoordinateSystem": (1 if map_coordinate_system == "WGS84" else 2)

2
docs/tracker公版方案功能接口.md
View File

@ -836,7 +836,7 @@ collector.device_data_get(power_switch=True)
"GeoLocation": { "GeoLocation": {
"CoordinateSystem": 1, "CoordinateSystem": 1,
"Latitude": 31.82249895, "Latitude": 31.82249895,
"Longtitude": 117.1155386833333, "Longitude": 117.1155386833333,
"Altitude": 147.136 "Altitude": 147.136
}, },
"device_module_status": { "device_module_status": {