fly/flightgear
1
0
Fork 0
Code Activity

flighthistory service: use GeoJSON instead of own invention

Browse source 
Track now comes as a LineString object
{
  "type":"LineString",
  "coordinates": [ [lon,lat,alt], [lon,lat,alt], ... ]
}

ref: http://geojson.org/geojson-spec.html#linestring
This commit is contained in:
Torsten Dreyer 2015-02-25 10:38:22 +01:00
parent f36c81c8cb
commit 0034d6b59a
1 changed files with 16 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/Network/http/FlightHistoryUriHandler.cxx
View file

@ -32,33 +32,27 @@ using std::stringstream;
namespace flightgear {
namespace http {
static cJSON * GeodToJson(const SGGeod & geod) {
cJSON * json = cJSON_CreateObject();
cJSON_AddItemToObject(json, "latitude",
cJSON_CreateNumber(geod.getLatitudeDeg()));
cJSON_AddItemToObject(json, "longitude",
cJSON_CreateNumber(geod.getLongitudeDeg()));
cJSON_AddItemToObject(json, "altitude",
cJSON_CreateNumber(geod.getElevationFt()));
return json;
}
static string FlightHistoryToJson(const SGGeodVec & history) {
cJSON * json = cJSON_CreateObject();
cJSON * lineString = cJSON_CreateObject();
cJSON_AddItemToObject(lineString, "type", cJSON_CreateString("LineString"));
cJSON * jsonArray = cJSON_CreateArray();
cJSON * coordinates = cJSON_CreateArray();
cJSON_AddItemToObject(lineString, "coordinates", coordinates);
for (SGGeodVec::const_iterator it = history.begin(); it != history.end();
++it) {
cJSON_AddItemToArray(jsonArray, GeodToJson(*it));
}
cJSON_AddItemToObject(json, "flightHistory", jsonArray);
cJSON * coordinate = cJSON_CreateArray();
cJSON_AddItemToArray(coordinates, coordinate);
char * jsonString = cJSON_PrintUnformatted(json);
cJSON_AddItemToArray(coordinate, cJSON_CreateNumber(it->getLongitudeDeg()));
cJSON_AddItemToArray(coordinate, cJSON_CreateNumber(it->getLatitudeDeg()));
cJSON_AddItemToArray(coordinate, cJSON_CreateNumber(it->getElevationM()));
}
char * jsonString = cJSON_PrintUnformatted(lineString);
string reply(jsonString);
free(jsonString);
cJSON_Delete(json);
cJSON_Delete(lineString);
return reply;
}
@ -263,8 +257,9 @@ bool FlightHistoryUriHandler::handleRequest(const HTTPRequest & request,
history->pathForHistory(minEdgeLengthM));
} else {
response.Header["Content-Type"] = "text/html";
response.StatusCode = 404;
response.Content = "{}";
response.Content = "<html><head><title>Not found!</title></head><body>404</body></html>";
}
return true;