diff options
author | asanoaozora <fifitaneki@hotmail.com> | 2017-01-09 18:25:25 +0100 |
---|---|---|
committer | asanoaozora <fifitaneki@hotmail.com> | 2017-01-09 18:25:25 +0100 |
commit | e407d4da99320d43ff6bb4e4a807fabe7ef73135 (patch) | |
tree | eb8ce286334ca2e43e613693d7f12a19ba20cd60 | |
parent | faa3fadfcd318b975a33050fe9c0f795392e9e20 (diff) | |
download | poi-service-e407d4da99320d43ff6bb4e4a807fabe7ef73135.tar.gz |
GT-3455 GT-3456 GT-3457
8 files changed, 33 insertions, 44 deletions
diff --git a/api/franca/navigation/mapviewer/MapViewerControl.fidl b/api/franca/navigation/mapviewer/MapViewerControl.fidl index 9c26734..bf806b5 100755 --- a/api/franca/navigation/mapviewer/MapViewerControl.fidl +++ b/api/franca/navigation/mapviewer/MapViewerControl.fidl @@ -222,7 +222,21 @@ interface MapViewerControl { Boolean highlighted } - + struct CategoryVisibility { + CategoryID poiCategoryId + <** + @description : visible = TRUE means that the POI categories are visible + **> + Boolean visible + <** + @description : minScaleID = minimun scale on which the POI categories are displayed + **> + UInt8 minScaleID + <** + @description : maxScaleID = maximum scale on which the POI categories are displayed + **> + UInt8 maxScaleID + } <** @description : struct generated for DBus argument DisplayCustomElements_customElementsElem4 @@ -1710,22 +1724,8 @@ interface MapViewerControl { **> Handle mapViewInstanceHandle - CategoryID[] poiCategoryIds - - <** - @description : visible = TRUE means that the POI categories are visible - **> - Boolean visible - - <** - @description : minScaleID = minimun scale on which the POI categories are displayed - **> - UInt8 minScaleID + CategoryVisibility[] poiCategoryVisibilities - <** - @description : maxScaleID = maximum scale on which the POI categories are displayed - **> - UInt8 maxScaleID } } diff --git a/api/franca/navigation/navigationcore/LocationInput.fidl b/api/franca/navigation/navigationcore/LocationInput.fidl index aff985a..c16cb24 100644 --- a/api/franca/navigation/navigationcore/LocationInput.fidl +++ b/api/franca/navigation/navigationcore/LocationInput.fidl @@ -40,7 +40,6 @@ interface LocationInput { COUNTRYCODE = 179 //value of type String, ISO 3166‐1 alpha 3 country code (upper case)
STATE = 167
CITY = 168 //value of type String, that identifies the city name
- ZIPCODE = 169
STREET = 170 //value of type String, that identifies the street name
ROAD_NUMBER = 182 //value of type String, that identifies the road number
HOUSENUMBER = 171 //value of type String, that identifies the house number
diff --git a/api/franca/navigation/navigationcore/Routing.fidl b/api/franca/navigation/navigationcore/Routing.fidl index 2c9d773..8ae1952 100644 --- a/api/franca/navigation/navigationcore/Routing.fidl +++ b/api/franca/navigation/navigationcore/Routing.fidl @@ -596,16 +596,19 @@ interface Routing { }
<**
- @description : calculateRoutes = This method allows a client to calculate alternative routes that differs from a list of already calculated routes
+ @description : @description : calculateAlternativeRoutes = This method allows a client to calculate alternative routes of a route that already calculated.
**>
- method calculateRoutes {
+ method calculateAlternativeRoutes {
in {
<**
@description : sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value
**>
Handle sessionHandle
- Handle[] calculatedRoutesList
+ <**
+ @description : route handle of the calculated route for which alternatives should be calculated
+ **>
+ Handle calculatedRoute
}
out {
Handle[] alternativeRoutesList
diff --git a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml index 2599011..1db6da9 100644 --- a/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml +++ b/api/map-viewer/genivi-mapviewer-mapviewercontrol.xml @@ -1427,24 +1427,13 @@ cover with other windows or user interface elements</line> <line>mapViewInstanceHandle = Map instance handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="poiCategoryIds" type="au"> + <arg name="poiCategoryVisibilities" type="a(ubyy)"> <doc> - <line>poiCategoryIds = array[poiCategoryId]</line> + <line>poiCategoryIds = array[poiCategoryVisibility]</line> + <line>poiCategoryVisibility = struct{poiCategoryId,visible,minScaleID,maxScaleID}</line> <line>poiCategoryId = a POI category as defined in the 'GENIVI POIService API'.</line> - </doc> - </arg> - <arg name="visible" type="b"> - <doc> <line>visible = flag. TRUE means that the POI categories are visible</line> - </doc> - </arg> - <arg name="minScaleID" type="y"> - <doc> <line>minScaleID = minimun scale on which the POI categories are displayed</line> - </doc> - </arg> - <arg name="maxScaleID" type="y"> - <doc> <line>maxScaleID = maximum scale on which the POI categories are displayed</line> </doc> </arg> diff --git a/api/navigation-core/genivi-navigationcore-constants.xml b/api/navigation-core/genivi-navigationcore-constants.xml index 85c4a31..2e80421 100644 --- a/api/navigation-core/genivi-navigationcore-constants.xml +++ b/api/navigation-core/genivi-navigationcore-constants.xml @@ -92,7 +92,6 @@ <id name="COUNTRY" value="0x00a6" /> <id name="STATE" value="0x00a7" /> <id name="CITY" value="0x00a8" /> - <id name="ZIPCODE" value="0x00a9" /> <id name="STREET" value="0x00aa" /> <id name="HOUSENUMBER" value="0x00ab" /> <id name="CROSSING" value="0x00ac" /> diff --git a/api/navigation-core/genivi-navigationcore-routing.xml b/api/navigation-core/genivi-navigationcore-routing.xml index 1ebb6f9..c102974 100644 --- a/api/navigation-core/genivi-navigationcore-routing.xml +++ b/api/navigation-core/genivi-navigationcore-routing.xml @@ -633,19 +633,18 @@ </doc> </arg> </signal> - <method name="CalculateRoutes"> + <method name="CalculateAlternativeRoutes"> <doc> - <line>CalculateRoutes = This method allows a client to calculate alternative routes that differs from a list of already calculated routes</line> + <line>CalculateAlternativeRoutes = This method allows a client to calculate alternative routes of a route that already calculated</line> </doc> <arg name="sessionHandle" type="u" direction="in"> <doc> <line>sessionHandle = Session handle. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> - <arg name="calculatedRoutesList" type="au" direction="in"> + <arg name="calculatedRoute" type="u" direction="in"> <doc> - <line>calculatedRoutesList = array[calculatedRoute]</line> - <line>calculatedRoute = Handle identifying an already calculated route. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> + <line>calculatedRoute = route handle of the calculated route for which alternatives should be calculated. Range[0x0:0x7fffffff]. 0x0 is reserved as an invalid handle value</line> </doc> </arg> <arg name="error" type="i" direction="out"> 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 60aa611..ffca2f4 100644 --- a/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx +++ b/src/navigation/navigation-core/routing-plugin/genivi_navigationcore_routing.cxx @@ -354,7 +354,7 @@ class Routing } void - CalculateRoutes(const uint32_t& sessionHandle, const std::vector< uint32_t >& calculatedRoutesList, int32_t& error, std::vector< uint32_t >& alternativeRoutesList) + CalculateAlternativeRoutes(const uint32_t& sessionHandle, const uint32_t& calculatedRoute, int32_t& error, std::vector< uint32_t >& alternativeRoutesList) { throw DBus::ErrorNotSupported("Not yet supported"); } diff --git a/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx b/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx index 3d6d0d4..585e8ac 100644 --- a/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx +++ b/src/navigation/navigation-core/routing-server-plugin/genivi_navigationcore_routing.cxx @@ -393,10 +393,10 @@ class RoutingServerStub : public RoutingStubDefault } /** - * description: calculateRoutes = This method allows a client to calculate alternative routes - * that differs from a list of already calculated routes + * description: calculateAlternativeRoutes = This method allows a client to calculate alternative routes + * that differs from a calculated route */ - void calculateRoutes(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _sessionHandle, std::vector< ::v4::org::genivi::navigation::NavigationTypes::Handle> _calculatedRoutesList, calculateRoutesReply_t _reply){ + void calculateAlternativeRoutes(const std::shared_ptr<CommonAPI::ClientId> _client, ::v4::org::genivi::navigation::NavigationTypes::Handle _sessionHandle, ::v4::org::genivi::navigation::NavigationTypes::Handle _calculatedRoute, calculateAlternativeRoutesReply_t _reply) { throw DBus::ErrorNotSupported("Not yet supported"); } |