diff --git a/storage.c b/storage.c index 3818b5a..bb40e12 100644 --- a/storage.c +++ b/storage.c @@ -918,7 +918,7 @@ void locations(char *filename, JsonNode *obj, JsonNode *arr, time_t s_lo, time_t * */ -static void append_to_feature_array(JsonNode *features, double lat, double lon, char *tid, char *addr, long tst) +static void append_to_feature_array(JsonNode *features, double lat, double lon, char *tid, char *addr, long tst, long vel) { JsonNode *geom, *props, *f = json_mkobject(); @@ -934,6 +934,7 @@ static void append_to_feature_array(JsonNode *features, double lat, double lon, props = json_mkobject(); json_append_member(props, "name", json_mkstring(tid)); json_append_member(props, "address", json_mkstring(addr)); + json_append_member(props, "vel", json_mknumber(vel)); json_append_member(props, "tst", json_mknumber(tst)); json_append_member(f, "geometry", geom); @@ -957,7 +958,7 @@ JsonNode *geo_json(JsonNode *location_array) json_foreach(one, location_array) { double lat = 0.0, lon = 0.0; char *addr = "", *tid = ""; - long tst = 0; + long tst = 0, vel = 0; if ((j = json_find_member(one, "lat")) != NULL) { lat = j->number_; @@ -975,8 +976,11 @@ JsonNode *geo_json(JsonNode *location_array) if ((j = json_find_member(one, "tst")) != NULL) { tst = j->number_; } + if ((j = json_find_member(one, "vel")) != NULL) { + vel = j->number_; + } - append_to_feature_array(feature_array, lat, lon, tid, addr, tst); + append_to_feature_array(feature_array, lat, lon, tid, addr, tst, vel); } json_append_member(fcollection, "features", feature_array);