diff options
| author | Martin Schaller <martin.schaller@it-schaller.de> | 2014-05-15 13:21:41 -0700 |
|---|---|---|
| committer | Martin Schaller <martin.schaller@it-schaller.de> | 2014-05-15 13:21:41 -0700 |
| commit | df4540e98048ca80962098c7ceb44c152eabdac6 (patch) | |
| tree | 3c77f162607a34113110b389429c3b50715806f0 | |
| parent | 1977129b7a7951812251785591516d849bf3b164 (diff) | |
| download | poi-service-df4540e98048ca80962098c7ceb44c152eabdac6.tar.gz | |
Added support for getting the expected speed
| -rw-r--r-- | src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx index 217a9cc..cd4063a 100644 --- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx +++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx @@ -603,14 +603,17 @@ get_map(struct coord *c, struct item *item, int is_end, const std::vector< uint1 if (vector_contains(valuesToReturn, lon_key)) map[lon_key]=variant_double(g.lng); } - if (item && (vector_contains(valuesToReturn, GENIVI_NAVIGATIONCORE_DISTANCE) || vector_contains(valuesToReturn, GENIVI_NAVIGATIONCORE_TIME))) { - struct attr length, time; + if (item && (vector_contains(valuesToReturn, GENIVI_NAVIGATIONCORE_DISTANCE) || vector_contains(valuesToReturn, GENIVI_NAVIGATIONCORE_TIME) || vector_contains(valuesToReturn, GENIVI_NAVIGATIONCORE_SPEED))) { + struct attr length, time, speed; if (item_attr_get(item, attr_length, &length) && vector_contains(valuesToReturn, GENIVI_NAVIGATIONCORE_DISTANCE)) { map[GENIVI_NAVIGATIONCORE_DISTANCE]=variant_double(length.u.num); } if (item_attr_get(item, attr_time, &time) && vector_contains(valuesToReturn, GENIVI_NAVIGATIONCORE_TIME)) { map[GENIVI_NAVIGATIONCORE_TIME]=variant_uint16((time.u.num+5)/10); } + if (item_attr_get(item, attr_speed, &speed) && vector_contains(valuesToReturn, GENIVI_NAVIGATIONCORE_SPEED)) { + map[GENIVI_NAVIGATIONCORE_SPEED]=variant_uint16(speed.u.num); + } } if (item && vector_contains(valuesToReturn, GENIVI_NAVIGATIONCORE_ROAD_NAME)) { struct attr street_item; |