diff --git a/src/pyutil/jsonutil.py b/src/pyutil/jsonutil.py index 48ece03ef74003d515d3ac2c5ea3da88f42e52de..89f42d68714421410df2ef9b3859b5238170bb76 100644 --- a/src/pyutil/jsonutil.py +++ b/src/pyutil/jsonutil.py @@ -1296,13 +1296,11 @@ def json_yaw (ns, heading, use_alias=False, use_lock=False): jobj["children"].append(json_basic_yaw(ns, heading, use_alias=use_alias, use_lock=use_lock)) return jobj -def json_flypath(ns, resps, commanded_speed, speed="", use_alias=False): - pathobj = [] - for resp in resps: - pathobj.append({"altitude": resp.alt, - "latitude": resp.lat, - "longitude": resp.lon, - "rostype": "GeoPoint"}) +def json_flypath(ns, geopath, commanded_speed, speed="", use_alias=False): + geopath = self.world_to_geo_path(path) + resps = [world_to_geo(ns, 40, 0, 20), + world_to_geo(ns, 40, 80, 20), + world_to_geo(ns, 0, 0, 20)] jobj = json_basic_seq(ns, use_alias=use_alias) jobj["children"].append(json_basic_flypath(ns, pathobj, commanded_speed, speed=speed, use_alias=use_alias)) return jobj