diff options
Diffstat (limited to 'src/hmi/qml/Core/genivi-capi.js')
| -rw-r--r-- | src/hmi/qml/Core/genivi-capi.js | 605 |
1 files changed, 267 insertions, 338 deletions
diff --git a/src/hmi/qml/Core/genivi-capi.js b/src/hmi/qml/Core/genivi-capi.js index 697a571..e674fba 100644 --- a/src/hmi/qml/Core/genivi-capi.js +++ b/src/hmi/qml/Core/genivi-capi.js @@ -30,13 +30,12 @@ Qt.include("resource.js") -var dbusIf; +var dbusInterface; var g_nav_session=["uint32",0]; var g_locationinput_handle=["uint32",0]; var g_routing_handle=["uint32",0]; var g_mapviewer_session=["uint32",0]; var g_mapviewer_handle=["uint32",0]; -var g_mapviewer_handle2=["uint32",0]; var g_poisearch_handle=["uint32",0]; var g_language,g_country,g_script; //initialized by conf file var g_default_category_name='fuel' @@ -58,6 +57,8 @@ var translations=new Array; var simulationMode; //initialized by conf file var showroom; //initialized by conf file var autoguidance; //initialized by conf file +var verbose; //initialized by conf file +var dlt; //initialized by conf file var guidance_activated=false; var route_calculated=false; @@ -194,18 +195,6 @@ function dump(prefix,args) dump2(prefix,"",args); } -function hookContext() -{ - if(verbose===true){ - console.log("Routing: ",route_calculated," Guidance: ",guidance_activated," Simulation: ",simulationMode); - } -} - -function setVerbose() -{ - verbose=true; -} - //Manage the historyOfLastEnteredLocation function updateHistoryOfLastEnteredLocation(enteredLocation,enteredLat,enteredLon) { @@ -425,54 +414,56 @@ function gettext(arg) //----------------- Management of the DBus messages ----------------- -function hookMethod(arg) +function hookMethod(dltInterface,arg) { - if(verbose===true){ + if(dlt===true) + dltInterface.log_info_msg(arg); + else console.log("Method: ",arg); - } } // Send a dbus message to layer manager -function lm_message(par, func, args) +function lm_message(dbusInterface, dltInterface, func, args) { // console.log("Method: ",func); - return par.message("org.genivi.layermanagementservice","/org/genivi/layermanagementservice","org.genivi.layermanagementservice", func, args); + return dbusInterface.message("org.genivi.layermanagementservice","/org/genivi/layermanagementservice","org.genivi.layermanagementservice", func, args); } // Send a message to navigationcore (basic) -function navigationcore_message(par, iface, func, args) +function navigationcore_message(dbusInterface, dltInterface, iface, func, args) { - hookMethod(func); - return par.message("org.genivi.navigation.navigationcore."+iface+".v4_0_"+iface,"/"+iface,"org.genivi.navigation.navigationcore."+iface+".v4_0", func, args); + hookMethod(dltInterface,func); + return dbusInterface.message("org.genivi.navigation.navigationcore."+iface+".v4_0_"+iface,"/"+iface,"org.genivi.navigation.navigationcore."+iface+".v4_0", func, args); } // Send a message to mapviewer (basic) -function mapviewer_message(par, iface, func, args) +function mapviewer_message(dbusInterface, dltInterface, iface, func, args) { - hookMethod(func); - return par.message("org.genivi.navigation.mapviewer."+iface+".v4_0_"+iface,"/"+iface,"org.genivi.navigation.mapviewer."+iface+".v4_0", func, args); + hookMethod(dltInterface,func); + return dbusInterface.message("org.genivi.navigation.mapviewer."+iface+".v4_0_"+iface,"/"+iface,"org.genivi.navigation.mapviewer."+iface+".v4_0", func, args); } // Send a message to poiservice (basic) -function poi_message(par, iface, func, args) +function poi_message(dbusInterface, dltInterface, iface, func, args) { - hookMethod(func); - return par.message("org.genivi.navigation.poiservice."+iface+".v2_0_"+iface,"/"+iface,"org.genivi.navigation.poiservice."+iface+".v2_0", func, args); + hookMethod(dltInterface,func); + return dbusInterface.message("org.genivi.navigation.poiservice."+iface+".v2_0_"+iface,"/"+iface,"org.genivi.navigation.poiservice."+iface+".v2_0", func, args); } // Send a message to demonstrator (basic) -function demonstrator_message(par, iface, func, args) +function demonstrator_message(dbusInterface, dltInterface, iface, func, args) { - hookMethod(func); - return par.message("org.genivi.demonstrator."+iface+".v1_0_"+iface,"/"+iface,"org.genivi.demonstrator."+iface+".v1_0", func, args); + hookMethod(dltInterface,func); + return dbusInterface.message("org.genivi.demonstrator."+iface+".v1_0_"+iface,"/"+iface,"org.genivi.demonstrator."+iface+".v1_0", func, args); } //----------------- DBus signals ----------------- -function hookSignal(arg) +function hookSignal(dltInterface,arg) { - if(verbose===true){ + if(dlt===true) + dltInterface.log_info_msg(arg); + else console.log("Signal: ",arg); - } } function connect_simulationStatusChangedSignal(interface,menu) @@ -579,207 +570,194 @@ function connect_mapViewScaleChangedSignal(interface,menu) //----------------- Navigation core Session messages ----------------- -function navigationcore_session_message(par, func, args) +function navigationcore_session_message(dbusInterface, dltInterface, func, args) { - return navigationcore_message(par, "Session", func, args); + return navigationcore_message(dbusInterface, dltInterface, "Session", func, args); } -// Create a new session or get the current session -function navigationcore_session(par) { - if (!g_nav_session[1]) - { - var res=navigationcore_session_message(par,"createSession", ["string","TestHMI"]); - g_nav_session[1]=res[3]; - } - return g_nav_session; +function navigationcore_session_CreateSession(dbusInterface,dltInterface) +{ + return navigationcore_session_message(dbusInterface,dltInterface,"createSession", ["string","TestHMI"]); } -// Delete the current session if exists -function navigationcore_session_clear(par) +function navigationcore_session_DeleteSession(dbusInterface,dltInterface) { - if (g_nav_session[1]) { - var res=navigationcore_session_message(par,"deleteSession", g_nav_session); - g_nav_session[1]=0; - } + return navigationcore_session_message(dbusInterface,dltInterface,"deleteSession", g_nav_session); +} + +// Create a new session or get the current session +function navigationcore_session() { + return g_nav_session; } -function navigationcore_session_GetVersion(par) +function navigationcore_session_GetVersion(dbusInterface,dltInterface) { - return navigationcore_session_message(par,"getVersion",[]); + return navigationcore_session_message(dbusInterface,dltInterface,"getVersion",[]); } //----------------- Navigation core Configuration messages ----------------- -function navigationcore_configuration_message(par, func, args) +function navigationcore_configuration_message(dbusInterface, dltInterface, func, args) { - return navigationcore_message(par, "Configuration", func,args); + return navigationcore_message(dbusInterface, dltInterface, "Configuration", func,args); } -function navigationcore_configuration_GetSupportedLocales(dbusIf) +function navigationcore_configuration_GetSupportedLocales(dbusInterface,dltInterface) { - return navigationcore_configuration_message(dbusIf,"getSupportedLocales",[]); + return navigationcore_configuration_message(dbusInterface,dltInterface,"getSupportedLocales",[]); } -function navigationcore_configuration_GetLocale(dbusIf) +function navigationcore_configuration_GetLocale(dbusInterface,dltInterface) { - return navigationcore_configuration_message(dbusIf,"getLocale",[]); + return navigationcore_configuration_message(dbusInterface,dltInterface,"getLocale",[]); } -function navigationcore_configuration_SetLocale(dbusIf,language,country,script) +function navigationcore_configuration_SetLocale(dbusInterface,dltInterface,language,country,script) { - navigationcore_configuration_message(dbusIf,"setLocale",["string",language,"string",country,"string",script]); + navigationcore_configuration_message(dbusInterface,dltInterface,"setLocale",["string",language,"string",country,"string",script]); } -function navigationcore_configuration_GetUnitsOfMeasurement(dbusIf) +function navigationcore_configuration_GetUnitsOfMeasurement(dbusInterface,dltInterface) { - return navigationcore_configuration_message(dbusIf,"getUnitsOfMeasurement",[]); + return navigationcore_configuration_message(dbusInterface,dltInterface,"getUnitsOfMeasurement",[]); } -function navigationcore_configuration_SetUnitsOfMeasurementLength(dbusIf,unit) +function navigationcore_configuration_SetUnitsOfMeasurementLength(dbusInterface,dltInterface,unit) { - navigationcore_configuration_message(dbusIf,"setUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]); + navigationcore_configuration_message(dbusInterface,dltInterface,"setUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]); } //----------------- LocationInput messages ----------------- +function locationinput_CreateLocationInput(dbusInterface,dltInterface) +{ + return navigationcore_message(dbusInterface, dltInterface, "LocationInput","createLocationInput", g_nav_session); +} -// Create a new location handle or get the current handle -function locationinput_handle(par) +function locationinput_DeleteLocationInput(dbusInterface,dltInterface) { - if (!g_locationinput_handle[1]) - { - var res=navigationcore_message(par, "LocationInput","createLocationInput", navigationcore_session(par)); - g_locationinput_handle[1]=res[3]; - } - return g_locationinput_handle; + return locationinput_message(dbusInterface, dltInterface, "deleteLocationInput", []); } -function locationinput_message(par, func, args) +// Get the current handle +function locationinput_handle(dbusInterface,dltInterface) { - return navigationcore_message(par, "LocationInput", func, navigationcore_session(par).concat(locationinput_handle(par),args)); + return g_locationinput_handle; } -function locationinput_Spell(dbusIf,inputCharacter,maxWindowSize) +function locationinput_message(dbusInterface, dltInterface, func, args) { - locationinput_message(dbusIf,"spell",["string",inputCharacter,"uint16",maxWindowSize]); + return navigationcore_message(dbusInterface, dltInterface, "LocationInput", func, navigationcore_session().concat(locationinput_handle(dbusInterface),args)); } -function locationinput_RequestListUpdate(dbusIf,offset,maxWindowSize) +function locationinput_Spell(dbusInterface,dltInterface,inputCharacter,maxWindowSize) { - locationinput_message(dbusIf,"requestListUpdate",["uint16",offset,"uint16",maxWindowSize]); + locationinput_message(dbusInterface,dltInterface,"spell",["string",inputCharacter,"uint16",maxWindowSize]); } -function locationinput_SetSelectionCriterion(dbusIf,selectionCriterion) +function locationinput_RequestListUpdate(dbusInterface,dltInterface,offset,maxWindowSize) { - locationinput_message(dbusIf,"setSelectionCriterion",["int32",selectionCriterion]); + locationinput_message(dbusInterface,dltInterface,"requestListUpdate",["uint16",offset,"uint16",maxWindowSize]); } -function locationinput_Search(dbusIf,inputString,maxWindowSize) +function locationinput_SetSelectionCriterion(dbusInterface,dltInterface,selectionCriterion) { - locationinput_message(dbusIf,"search",["string",inputString,"uint16",maxWindowSize]); + locationinput_message(dbusInterface,dltInterface,"setSelectionCriterion",["int32",selectionCriterion]); } -function locationinput_SelectEntry(dbusIf,index) +function locationinput_Search(dbusInterface,dltInterface,inputString,maxWindowSize) { - locationinput_message(dbusIf,"selectEntry",["uint16",index]); + locationinput_message(dbusInterface,dltInterface,"search",["string",inputString,"uint16",maxWindowSize]); } -// Delete the location handle if exists -function locationinput_handle_clear(par) +function locationinput_SelectEntry(dbusInterface,dltInterface,index) { - if (g_locationinput_handle[1]) { - var res=locationinput_message(par, "deleteLocationInput", []); - g_locationinput_handle[1]=0; - } + locationinput_message(dbusInterface,dltInterface,"selectEntry",["uint16",index]); } //----------------- Routing messages ----------------- // Send a message to routing with session handle and route handle -function routing_message(par, func, args) +function routing_message(dbusInterface, dltInterface, func, args) { //session handle sent - return navigationcore_message(par, "Routing", func, navigationcore_session(par).concat(routing_handle(par),args)); + return navigationcore_message(dbusInterface, dltInterface, "Routing", func, navigationcore_session().concat(routing_handle(),args)); } // Send a message to routing with route handle -function routing_get(par, func, args) +function routing_get(dbusInterface, dltInterface, func, args) { - return navigationcore_message(par, "Routing", func, routing_handle(par).concat(args)); + return navigationcore_message(dbusInterface, dltInterface, "Routing", func, routing_handle().concat(args)); } // Send a message to routing -function routing(par, func, args) +function routing(dbusInterface, dltInterface, func, args) { - return navigationcore_message(par, "Routing", func, args); + return navigationcore_message(dbusInterface, dltInterface, "Routing", func, args); } -// Create a new routing handle or get the current handle -function routing_handle(par) { - if (!g_routing_handle[1]) - { - var res=navigationcore_message(par, "Routing","createRoute", navigationcore_session(par)); - g_routing_handle[1]=res[3]; - } - return g_routing_handle; +function routing_CreateRoute(dbusInterface,dltInterface) +{ + return navigationcore_message(dbusInterface, dltInterface, "Routing","createRoute", navigationcore_session(dbusInterface,dltInterface)); } -// Delete the routing handle if exists -function routing_handle_clear(par) +function routing_DeleteRoute(dbusInterface,dltInterface) { - if (g_routing_handle[1]) { - var res=routing_message(par, "deleteRoute", []); - g_routing_handle[1]=0; - } + return routing_message(dbusInterface, dltInterface, "deleteRoute", []); +} + +// Get the current handle +function routing_handle() { + return g_routing_handle; } -function routing_GetRouteOverviewTimeAndDistance(dbusIf) +function routing_GetRouteOverviewTimeAndDistance(dbusInterface,dltInterface) { var valuesToReturn=[], pref=[]; pref=pref.concat("int32",NAVIGATIONCORE_TOTAL_TIME,"int32",NAVIGATIONCORE_TOTAL_DISTANCE); valuesToReturn = valuesToReturn.concat("array",[pref]); - return routing_get(dbusIf,"getRouteOverview",valuesToReturn); + return routing_get(dbusInterface,dltInterface,"getRouteOverview",valuesToReturn); } -function routing_GetCostModel(dbusIf) +function routing_GetCostModel(dbusInterface,dltInterface) { - return routing_get(dbusIf,"getCostModel",[]); + return routing_get(dbusInterface,dltInterface,"getCostModel",[]); } -function routing_SetCostModel(dbusIf,costModel) +function routing_SetCostModel(dbusInterface,dltInterface,costModel) { - var res=routing_message(dbusIf,"setCostModel",["int32",costModel]); + var res=routing_message(dbusInterface,dltInterface,"setCostModel",["int32",costModel]); } -function routing_GetSupportedCostModels(dbusIf) +function routing_GetSupportedCostModels(dbusInterface,dltInterface) { - return routing(dbusIf,"getSupportedCostModels",[]); + return routing(dbusInterface,dltInterface,"getSupportedCostModels",[]); } -function routing_GetSupportedRoutePreferences(dbusIf) +function routing_GetSupportedRoutePreferences(dbusInterface,dltInterface) { - return routing(dbusIf,"getSupportedRoutePreferences",[]); + return routing(dbusInterface,dltInterface,"getSupportedRoutePreferences",[]); } -function routing_GetRoutePreferences(dbusIf,countryCode) +function routing_GetRoutePreferences(dbusInterface,dltInterface,countryCode) { - return routing_get(dbusIf,"getRoutePreferences",["string",countryCode]); + return routing_get(dbusInterface,dltInterface,"getRoutePreferences",["string",countryCode]); } -function routing_SetRoutePreferences(dbusIf,countryCode) +function routing_SetRoutePreferences(dbusInterface,dltInterface,countryCode) { var roadMessage=["array",["structure",["int32",roadPreferenceList[NAVIGATIONCORE_FERRY],"int32",NAVIGATIONCORE_FERRY],"structure",["int32",roadPreferenceList[NAVIGATIONCORE_TOLL_ROADS],"int32",NAVIGATIONCORE_TOLL_ROADS],"structure",["int32",roadPreferenceList[NAVIGATIONCORE_HIGHWAYS_MOTORWAYS],"int32",NAVIGATIONCORE_HIGHWAYS_MOTORWAYS]]]; var conditionMessage=["array",["structure",["int32",conditionPreferenceList[NAVIGATIONCORE_TRAFFIC_REALTIME],"int32",NAVIGATIONCORE_TRAFFIC_REALTIME]]]; var message=["string",countryCode]; message=message.concat(roadMessage.concat(conditionMessage)); - var res=routing_message(dbusIf,"setRoutePreferences",message); + var res=routing_message(dbusInterface,dltInterface,"setRoutePreferences",message); } -function routing_GetRouteSegments(dbusIf,detailLevel,numberOfSegments,offset) +function routing_GetRouteSegments(dbusInterface,dltInterface,detailLevel,numberOfSegments,offset) { var routeSegmentType=["int32",NAVIGATIONCORE_DISTANCE,"int32",NAVIGATIONCORE_TIME,"int32",NAVIGATIONCORE_ROAD_NAME]; - return routing_get(dbusIf,"getRouteSegments",["int16",detailLevel,"array",routeSegmentType,"uint32",numberOfSegments,"uint32",offset]); + return routing_get(dbusInterface,dltInterface,"getRouteSegments",["int16",detailLevel,"array",routeSegmentType,"uint32",numberOfSegments,"uint32",offset]); } function latlon_to_map(latlon) @@ -790,7 +768,7 @@ function latlon_to_map(latlon) ]; } -function routing_SetWaypoints(dbusIf,startFromCurrentPosition,position,destination) +function routing_SetWaypoints(dbusInterface,dltInterface,startFromCurrentPosition,position,destination) { var message=[]; if(startFromCurrentPosition==false) @@ -801,405 +779,356 @@ function routing_SetWaypoints(dbusIf,startFromCurrentPosition,position,destinati { message=message.concat(["boolean",startFromCurrentPosition,"array",["map",destination]]); } - var res=routing_message(dbusIf,"setWaypoints",message); + var res=routing_message(dbusInterface,dltInterface,"setWaypoints",message); } -function routing_CalculateRoute(dbusIf) +function routing_CalculateRoute(dbusInterface,dltInterface) { - var res=routing_message(dbusIf,"calculateRoute",[]); + var res=routing_message(dbusInterface,dltInterface,"calculateRoute",[]); } -function routing_GetRouteBoundingBox(dbusIf,routeHandle) +function routing_GetRouteBoundingBox(dbusInterface,dltInterface,routeHandle) { var message=[]; - return navigationcore_message(dbusIf, "Routing", "getRouteBoundingBox", message.concat(routeHandle)); + return navigationcore_message(dbusInterface,dltInterface, "Routing", "getRouteBoundingBox", message.concat(routeHandle)); } //----------------- Guidance messages ----------------- // Send a message to guidance with session handle -function guidance_message(par, func, args) +function guidance_message(dbusInterface, dltInterface, func, args) { - return navigationcore_message(par, "Guidance", func, navigationcore_session(par).concat(args)); + return navigationcore_message(dbusInterface, dltInterface, "Guidance", func, navigationcore_session().concat(args)); } // Send a message to guidance without session handle -function guidance_get(par, func, args) +function guidance_get(dbusInterface, dltInterface, func, args) { - return navigationcore_message(par, "Guidance", func, args); + return navigationcore_message(dbusInterface, dltInterface, "Guidance", func, args); } -function guidance_StartGuidance(dbusIf,routeHandle) +function guidance_StartGuidance(dbusInterface,dltInterface,routeHandle) { - guidance_message(dbusIf,"startGuidance",routeHandle); + guidance_message(dbusInterface,dltInterface,"startGuidance",routeHandle); } -function guidance_StopGuidance(dbusIf) +function guidance_StopGuidance(dbusInterface,dltInterface) { - guidance_message(dbusIf,"stopGuidance",[]); + guidance_message(dbusInterface,dltInterface,"stopGuidance",[]); } -function guidance_GetGuidanceStatus(dbusIf) +function guidance_GetGuidanceStatus(dbusInterface,dltInterface) { - return guidance_get(dbusIf,"getGuidanceStatus",[]); + return guidance_get(dbusInterface,dltInterface,"getGuidanceStatus",[]); } -function guidance_GetDestinationInformation(dbusIf) +function guidance_GetDestinationInformation(dbusInterface,dltInterface) { - return guidance_get(dbusIf,"getDestinationInformation",[]); + return guidance_get(dbusInterface,dltInterface,"getDestinationInformation",[]); } -function guidance_GetManeuversList(dbusIf,requestedNumberOfManeuvers,maneuverOffset) +function guidance_GetManeuversList(dbusInterface,dltInterface,requestedNumberOfManeuvers,maneuverOffset) { - return guidance_get(dbusIf,"getManeuversList",["uint16",requestedNumberOfManeuvers,"uint32",maneuverOffset]); + return guidance_get(dbusInterface,dltInterface,"getManeuversList",["uint16",requestedNumberOfManeuvers,"uint32",maneuverOffset]); } //---------------- Map matched position messages ---------------- // Send a message to mapmatchedposition with session handle -function mapmatchedposition_message(par, func, args) +function mapmatchedposition_message(dbusInterface, dltInterface, func, args) { - return navigationcore_message(par, "MapMatchedPosition", func, navigationcore_session(par).concat(args)); + return navigationcore_message(dbusInterface, dltInterface, "MapMatchedPosition", func, navigationcore_session().concat(args)); } // Send a message to mapmatchedposition without session handle -function mapmatchedposition_get(par, func, args) +function mapmatchedposition_get(dbusInterface, dltInterface, func, args) { - return navigationcore_message(par, "MapMatchedPosition", func, args); + return navigationcore_message(dbusInterface, dltInterface, "MapMatchedPosition", func, args); } -function mapmatchedposition_GetCurrentAddress(dbusIf) +function mapmatchedposition_GetCurrentAddress(dbusInterface,dltInterface) { var valuesToReturn=["int32",NAVIGATIONCORE_STREET]; - return mapmatchedposition_get(dbusIf,"getCurrentAddress",["array",valuesToReturn]); + return mapmatchedposition_get(dbusInterface,dltInterface,"getCurrentAddress",["array",valuesToReturn]); } -function mapmatchedposition_SetSimulationMode(dbusIf,activate) +function mapmatchedposition_SetSimulationMode(dbusInterface,dltInterface,activate) { - mapmatchedposition_message(dbusIf,"setSimulationMode",["boolean",activate]); + mapmatchedposition_message(dbusInterface,dltInterface,"setSimulationMode",["boolean",activate]); } -function mapmatchedposition_StartSimulation(dbusIf) +function mapmatchedposition_StartSimulation(dbusInterface,dltInterface) { - mapmatchedposition_message(dbusIf,"startSimulation",[]); + mapmatchedposition_message(dbusInterface,dltInterface,"startSimulation",[]); } -function mapmatchedposition_PauseSimulation(dbusIf) +function mapmatchedposition_PauseSimulation(dbusInterface,dltInterface) { - mapmatchedposition_message(dbusIf,"pauseSimulation",[]); + mapmatchedposition_message(dbusInterface,dltInterface,"pauseSimulation",[]); } -function mapmatchedposition_GetSimulationStatus(dbusIf) +function mapmatchedposition_GetSimulationStatus(dbusInterface,dltInterface) { - return mapmatchedposition_get(dbusIf,"getSimulationStatus",[]); + return mapmatchedposition_get(dbusInterface,dltInterface,"getSimulationStatus",[]); } -function mapmatchedposition_GetSimulationSpeed(dbusIf) +function mapmatchedposition_GetSimulationSpeed(dbusInterface,dltInterface) { - return mapmatchedposition_get(dbusIf,"getSimulationSpeed",[]); + return mapmatchedposition_get(dbusInterface,dltInterface,"getSimulationSpeed",[]); } -function mapmatchedposition_SetSimulationSpeed(dbusIf,speedFactor) +function mapmatchedposition_SetSimulationSpeed(dbusInterface,dltInterface,speedFactor) { - mapmatchedposition_message(dbusIf,"setSimulationSpeed",["uint8",speedFactor]); + mapmatchedposition_message(dbusInterface,dltInterface,"setSimulationSpeed",["uint8",speedFactor]); } -function mapmatchedposition_GetPosition(dbusIf) +function mapmatchedposition_GetPosition(dbusInterface,dltInterface) { var valuesToReturn=["int32",NAVIGATIONCORE_SPEED,"int32",NAVIGATIONCORE_LATITUDE,"int32",NAVIGATIONCORE_LONGITUDE]; - return mapmatchedposition_get(dbusIf,"getPosition",["array",valuesToReturn]); + return mapmatchedposition_get(dbusInterface,dltInterface,"getPosition",["array",valuesToReturn]); } //---------------- MapViewer messages (handle 1) ---------------- +function mapviewer_session_CreateSession(dbusInterface,dltInterface) +{ + return mapviewer_message(dbusInterface, dltInterface, "Session", "createSession", ["string","TestHMI"]); +} -// Create a new session or get the current session -function mapviewer_session(par) { - if (!g_mapviewer_session[1]) - { - var res=mapviewer_message(par, "Session", "createSession", ["string","TestHMI"]); - g_mapviewer_session[1]=res[3]; - } - return g_mapviewer_session; +function mapviewer_session_DeleteSession(dbusInterface,dltInterface) +{ + return mapviewer_message(dbusInterface, dltInterface, "Session", "deleteSession", g_mapviewer_session); } -// Delete the current session if exists -function mapviewer_session_clear(par) +function mapviewer_CreateMapViewInstance(dbusInterface,dltInterface,width,height,type) { - if (g_mapviewer_session[1]) { - var res=mapviewer_message(par, "Session", "deleteSession", [g_mapviewer_session]); - g_mapviewer_session[1]=0; - } + return mapviewer_message(dbusInterface, dltInterface, "MapViewerControl","createMapViewInstance", mapviewer_session().concat(["structure",["uint16",width,"uint16",height],"int32",type])); } -// Create a new map handle or get the current handle -function mapviewer_handle(par,w,h,type) +function mapviewer_ReleaseMapViewInstance(dbusInterface,dltInterface) { - if (!g_mapviewer_handle[1]) - { - var res=mapviewer_message(par, "MapViewerControl","createMapViewInstance", mapviewer_session(par).concat(["structure",["uint16",w,"uint16",h],"int32",type])); - g_mapviewer_handle[1]=res[3]; - } - return g_mapviewer_handle; + return mapviewercontrol_message(dbusInterface, dltInterface, "releaseMapViewInstance", []); } -// Delete the map handle if exists -function mapviewer_handle_clear(par) +// Get the current session +function mapviewer_session() { + return g_mapviewer_session; +} + +// Create a new map handle or get the current handle +function mapviewer_handle(dbusInterface,w,h,type) { - if (g_mapviewer_handle[1]) { - var res=mapviewercontrol_message(par, "releaseMapViewInstance", []); - g_mapviewer_handle[1]=0; - } + return g_mapviewer_handle; } // Send a message to map viewer control with session handle -function mapviewercontrol_message(par, func, args) +function mapviewercontrol_message(dbusInterface, dltInterface, func, args) { - return mapviewer_message(par, "MapViewerControl", func, mapviewer_session(par).concat(g_mapviewer_handle,args)); + return mapviewer_message(dbusInterface, dltInterface, "MapViewerControl", func, mapviewer_session().concat(g_mapviewer_handle,args)); } // Send a message to map viewer control without session handle -function mapviewercontrol_get(par, func, args) +function mapviewercontrol_get(dbusInterface, dltInterface, func, args) { - return mapviewer_message(par, "MapViewerControl", func, g_mapviewer_handle,args); + return mapviewer_message(dbusInterface, dltInterface, "MapViewerControl", func, g_mapviewer_handle,args); } -function mapviewer_GetMapViewScale(dbusIf) +function mapviewer_GetMapViewScale(dbusInterface,dltInterface) { - return mapviewercontrol_get(dbusIf,"getMapViewScale", []); + return mapviewercontrol_get(dbusInterface,dltInterface,"getMapViewScale", []); } -function mapviewer_GetScaleList(dbusIf) +function mapviewer_GetScaleList(dbusInterface,dltInterface) { - return mapviewercontrol_get(dbusIf,"getScaleList", []); + return mapviewercontrol_get(dbusInterface,dltInterface,"getScaleList", []); } -function mapviewer_GetDisplayedRoutes(dbusIf) +function mapviewer_GetDisplayedRoutes(dbusInterface,dltInterface) { - return mapviewercontrol_get(dbusIf,"getDisplayedRoutes", []); + return mapviewercontrol_get(dbusInterface,dltInterface,"getDisplayedRoutes", []); } -function mapviewer_SetMapViewScale(dbusIf,scaleID) +function mapviewer_SetMapViewScale(dbusInterface,dltInterface,scaleID) { - mapviewercontrol_message(dbusIf,"setMapViewScale", ["uint8",scaleID]); + mapviewercontrol_message(dbusInterface,dltInterface,"setMapViewScale", ["uint8",scaleID]); } -function mapviewer_SetMapViewScaleByDelta(dbusIf,scaleDelta) +function mapviewer_SetMapViewScaleByDelta(dbusInterface,dltInterface,scaleDelta) { - mapviewercontrol_message(dbusIf,"setMapViewScaleByDelta", ["int16",scaleDelta]); + mapviewercontrol_message(dbusInterface,dltInterface,"setMapViewScaleByDelta", ["int16",scaleDelta]); } -function mapviewer_GetMapViewTheme(dbusIf) +function mapviewer_GetMapViewTheme(dbusInterface,dltInterface) { - return mapviewercontrol_get(dbusIf,"getMapViewTheme", []); + return mapviewercontrol_get(dbusInterface,dltInterface,"getMapViewTheme", []); } -function mapviewer_SetMapViewTheme(dbusIf,mapViewTheme) +function mapviewer_SetMapViewTheme(dbusInterface,dltInterface,mapViewTheme) { - mapviewercontrol_message(dbusIf,"setMapViewTheme", ["int32",mapViewTheme]); + mapviewercontrol_message(dbusInterface,dltInterface,"setMapViewTheme", ["int32",mapViewTheme]); } -function mapviewer_GetMapViewPerspective(dbusIf) +function mapviewer_GetMapViewPerspective(dbusInterface,dltInterface) { - return mapviewercontrol_get(dbusIf,"getMapViewPerspective", []); + return mapviewercontrol_get(dbusInterface,dltInterface,"getMapViewPerspective", []); } -function mapviewer_SetMapViewPerspective(dbusIf,perspective) +function mapviewer_SetMapViewPerspective(dbusInterface,dltInterface,perspective) { - mapviewercontrol_message(dbusIf,"setMapViewPerspective", ["int32",perspective]); + mapviewercontrol_message(dbusInterface,dltInterface,"setMapViewPerspective", ["int32",perspective]); } -function mapviewer_SetFollowCarMode(dbusIf,followCarMode) +function mapviewer_SetFollowCarMode(dbusInterface,dltInterface,followCarMode) { - mapviewercontrol_message(dbusIf,"setFollowCarMode", ["boolean",followCarMode]); + mapviewercontrol_message(dbusInterface,dltInterface,"setFollowCarMode", ["boolean",followCarMode]); } -function mapviewer_DisplayRoute(dbusIf,routeHandle,highlighted) +function mapviewer_DisplayRoute(dbusInterface,dltInterface,routeHandle,highlighted) { var args=[]; args=args.concat(routeHandle); - mapviewercontrol_message(dbusIf,"displayRoute", args.concat("boolean",highlighted)); + mapviewercontrol_message(dbusInterface,dltInterface,"displayRoute", args.concat("boolean",highlighted)); } -function mapviewer_SetTargetPoint(dbusIf,latitude,longitude,altitude) +function mapviewer_SetTargetPoint(dbusInterface,dltInterface,latitude,longitude,altitude) { - mapviewercontrol_message(dbusIf, "setTargetPoint", ["structure",["double",latitude,"double",longitude,"double",altitude]]); + mapviewercontrol_message(dbusInterface,dltInterface, "setTargetPoint", ["structure",["double",latitude,"double",longitude,"double",altitude]]); } -function mapviewer_SetMapViewBoundingBox(dbusIf,boundingBox) +function mapviewer_SetMapViewBoundingBox(dbusInterface,dltInterface,boundingBox) { - mapviewercontrol_message(dbusIf,"setMapViewBoundingBox", boundingBox); + mapviewercontrol_message(dbusInterface,dltInterface,"setMapViewBoundingBox", boundingBox); } -function mapviewer_GetTargetPoint(dbusIf) +function mapviewer_GetTargetPoint(dbusInterface,dltInterface) { - return mapviewercontrol_get(dbusIf,"getTargetPoint", []); + return mapviewercontrol_get(dbusInterface,dltInterface,"getTargetPoint", []); } -function mapviewer_GetCameraValue(dbusIf,camera) +function mapviewer_GetCameraValue(dbusInterface,dltInterface,camera) { - return mapviewercontrol_get(dbusIf,"get"+camera, []); + return mapviewercontrol_get(dbusInterface,dltInterface,"get"+camera, []); } -function mapviewer_SetCameraValue(dbusIf,camera,value) +function mapviewer_SetCameraValue(dbusInterface,dltInterface,camera,value) { - mapviewercontrol_message(dbusIf,"set"+camera, value); + mapviewercontrol_message(dbusInterface,dltInterface,"set"+camera, value); } -function mapviewer_SetMapViewRotation(dbusIf,angle) +function mapviewer_SetMapViewRotation(dbusInterface,dltInterface,angle) { - mapviewercontrol_message(dbusIf, "setMapViewRotation", ["int32",angle,"int32",15]); + mapviewercontrol_message(dbusInterface,dltInterface, "setMapViewRotation", ["int32",angle,"int32",15]); } -function mapviewer_SetCameraHeadingAngle(dbusIf,angle) +function mapviewer_SetCameraHeadingAngle(dbusInterface,dltInterface,angle) { - mapviewercontrol_message(dbusIf, "setCameraHeadingAngle", ["int32",angle]); + mapviewercontrol_message(dbusInterface,dltInterface, "setCameraHeadingAngle", ["int32",angle]); } -function mapviewer_SetCameraHeadingTrackUp(dbusIf) +function mapviewer_SetCameraHeadingTrackUp(dbusInterface,dltInterface) { - mapviewercontrol_message(dbusIf, "setCameraHeadingTrackUp", []); + mapviewercontrol_message(dbusInterface,dltInterface, "setCameraHeadingTrackUp", []); } -function mapviewer_SetMapViewPan(dbusIf,panningAction,x,y) +function mapviewer_SetMapViewPan(dbusInterface,dltInterface,panningAction,x,y) { - mapviewercontrol_message(dbusIf, "setMapViewPan", ["int32",panningAction,"structure",["uint16",x,"uint16",y]]); + mapviewercontrol_message(dbusInterface,dltInterface, "setMapViewPan", ["int32",panningAction,"structure",["uint16",x,"uint16",y]]); } -function mapviewer_ConvertPixelCoordsToGeoCoords(dbusIf,x,y) +function mapviewer_ConvertPixelCoordsToGeoCoords(dbusInterface,dltInterface,x,y) { - return mapviewercontrol_message(dbusIf, "convertPixelCoordsToGeoCoords",["array",["structure",["uint16",x,"uint16",y]]]); + return mapviewercontrol_message(dbusInterface,dltInterface, "convertPixelCoordsToGeoCoords",["array",["structure",["uint16",x,"uint16",y]]]); } -function initScale(dbusIf) +function initScale(dbusInterface,dltInterface) { - var res=mapviewer_GetScaleList(dbusIf); + var res=mapviewer_GetScaleList(dbusInterface,dltInterface); scaleList=res[1]; minZoomId=scaleList[1][1]; maxZoomId=scaleList[scaleList.length-1][1]; } -//---------------- MapViewer messages (handle 2) ---------------- - -// Create a new map handle or get the current handle -function mapviewer_handle2(par,w,h,type) -{ - if (!g_mapviewer_handle2[1]) - { - var res=mapviewer_message(par, "MapViewerControl","createMapViewInstance", mapviewer_session(par).concat(["structure",["uint16",w,"uint16",h],"int32",type])); - g_mapviewer_handle2[1]=res[3]; - } - return g_mapviewer_handle2; -} - -// Delete the map handle if exists -function mapviewer_handle_clear2(par) -{ - if (g_mapviewer_handle2[1]) { - var res=mapviewercontrol_message2(par, "releaseMapViewInstance", []); - g_mapviewer_handle2[1]=0; - } -} +//---------------- Mapviewer Configuration messages ---------------- -// Send a message to map viewer control with session handle on handle 2 -function mapviewercontrol_message2(par, func, args) +function mapviewer_configuration_message(dbusInterface, dltInterface, func, args) { - return mapviewer_message(par, "MapViewerControl", func, mapviewer_session(par).concat(g_mapviewer_handle2,args)); + return mapviewer_message(dbusInterface, dltInterface, "Configuration", func,args); } -function mapviewer2_SetMapViewTheme(dbusIf,mapViewTheme) +function mapviewer_configuration_GetSupportedLocales(dbusInterface,dltInterface) { - mapviewercontrol_message2(dbusIf,"setMapViewTheme", ["int32",mapViewTheme]); + return mapviewer_configuration_message(dbusInterface,dltInterface,"getSupportedLocales",[]); } -function mapviewer2_SetMapViewBoundingBox(dbusIf,boundingBox) +function mapviewer_configuration_GetLocale(dbusInterface,dltInterface) { - mapviewercontrol_message2(dbusIf,"setMapViewBoundingBox", boundingBox); + return mapviewer_configuration_message(dbusInterface,dltInterface,"getLocale",[]); } -function mapviewer2_DisplayRoute(dbusIf,routeHandle,highlighted) +function mapviewer_configuration_SetLocale(dbusInterface,dltInterface,language,country,script) { - var args=[]; - args=args.concat(routeHandle); - mapviewercontrol_message2(dbusIf,"displayRoute", args.concat("boolean",highlighted)); + mapviewer_configuration_message(dbusInterface,dltInterface,"setLocale",["string",language,"string",country,"string",script]); } -//---------------- Mapviewer Configuration messages ---------------- - -function mapviewer_configuration_message(par, func, args) +function mapviewer_configuration_GetUnitsOfMeasurement(dbusInterface,dltInterface) { - return mapviewer_message(par, "Configuration", func,args); + return mapviewer_configuration_message(dbusInterface,dltInterface,"getUnitsOfMeasurement",[]); } -function mapviewer_configuration_GetSupportedLocales(dbusIf) +function mapviewer_configuration_SetUnitsOfMeasurementLength(dbusInterface,dltInterface,unit) { - return mapviewer_configuration_message(dbusIf,"getSupportedLocales",[]); + mapviewer_configuration_message(dbusInterface,dltInterface,"setUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]); } -function mapviewer_configuration_GetLocale(dbusIf) -{ - return mapviewer_configuration_message(dbusIf,"getLocale",[]); -} +// -------------------- POISearch dbus messages -------------------- -function mapviewer_configuration_SetLocale(dbusIf,language,country,script) -{ - mapviewer_configuration_message(dbusIf,"setLocale",["string",language,"string",country,"string",script]); +// Send a message to poisearch with session handle +function poisearch_message(dbusInterface, dltInterface, func, args) +{ //session handle sent + return poi_message(dbusInterface, dltInterface, "POISearch", func, poisearch_handle().concat(args)); } -function mapviewer_configuration_GetUnitsOfMeasurement(dbusIf) +// Send a message to poisearch without session handle +function poisearch_message_get(dbusInterface, dltInterface, func, args) { - return mapviewer_configuration_message(dbusIf,"getUnitsOfMeasurement",[]); + return poi_message(dbusInterface, dltInterface, "POISearch", func, args); } -function mapviewer_configuration_SetUnitsOfMeasurementLength(dbusIf,unit) +function poisearch_CreatePoiSearchHandle(dbusInterface,dltInterface) { - mapviewer_configuration_message(dbusIf,"setUnitsOfMeasurement",["map",["int32",NAVIGATIONCORE_LENGTH,"int32",unit]]); + return poisearch_message_get(dbusInterface, dltInterface, "createPoiSearchHandle", []); } -// -------------------- POISearch dbus messages -------------------- - -// Send a message to poisearch with session handle -function poisearch_message(par, func, args) -{ //session handle sent - return poi_message(par, "POISearch", func, poisearch_handle(par).concat(args)); -} - -// Send a message to poisearch without session handle -function poisearch_message_get(par, func, args) +function poisearch_DeletePoiSearchHandle(dbusInterface,dltInterface) { - return poi_message(par, "POISearch", func, args); + poisearch_message(dbusInterface, dltInterface, "deletePoiSearchHandle", []); } // Create a new poisearch handle or get the current handle -function poisearch_handle(par) { - if (!g_poisearch_handle[1]) - { - var res=poisearch_message_get(par, "createPoiSearchHandle", []); - g_poisearch_handle[1]=res[1]; - } +function poisearch_handle(dbusInterface,dltInterface) { return g_poisearch_handle; } // Delete the poisearch handle if exists -function poisearch_handle_clear(par) +function poisearch_handle_clear(dbusInterface,dltInterface) { if (g_poisearch_handle[1]) { - poisearch_message(par, "deletePoiSearchHandle", []); + poisearch_message(dbusInterface, dltInterface, "deletePoiSearchHandle", []); g_poisearch_handle[1]=0; } } -function poisearch_StartPoiSearch(dbusIf,inputString,sortOption) +function poisearch_StartPoiSearch(dbusInterface,dltInterface,inputString,sortOption) { - poisearch_message(dbusIf,"startPoiSearch",["string",inputString,"int32",sortOption]); + poisearch_message(dbusInterface,dltInterface,"startPoiSearch",["string",inputString,"int32",sortOption]); } -function poisearch_SetCenter(dbusIf,latitude,longitude,altitude) +function poisearch_SetCenter(dbusInterface,dltInterface,latitude,longitude,altitude) { - poisearch_message(dbusIf, "setCenter", ["structure",["double",latitude,"double",longitude,"double",altitude]]); + poisearch_message(dbusInterface,dltInterface, "setCenter", ["structure",["double",latitude,"double",longitude,"double",altitude]]); } -function poisearch_SetCategories(dbusIf,poiCategories) +function poisearch_SetCategories(dbusInterface,dltInterface,poiCategories) { var value=[]; for(var i=0;i<poiCategories.length;i+=1) @@ -1207,74 +1136,74 @@ function poisearch_SetCategories(dbusIf,poiCategories) value=value.concat(["structure",["uint32",poiCategories[i][0],"uint32",poiCategories[i][1]]]); } - poisearch_message(dbusIf, "setCategories", ["array",value]); + poisearch_message(dbusInterface,dltInterface, "setCategories", ["array",value]); } -function poisearch_GetAvailableCategories(dbusIf) +function poisearch_GetAvailableCategories(dbusInterface,dltInterface) { - return poisearch_message_get(dbusIf,"getAvailableCategories",[]); + return poisearch_message_get(dbusInterface,dltInterface,"getAvailableCategories",[]); } -function poisearch_RequestResultList(dbusIf,offset,maxWindowSize,attributeList) +function poisearch_RequestResultList(dbusInterface,dltInterface,offset,maxWindowSize,attributeList) { var value=[]; for(var i=0;i<attributeList.length;i+=1) { value=value.concat(["uint32",attributeList[i]]); } - return poisearch_message(dbusIf,"requestResultList",["uint16",offset,"uint16",maxWindowSize,"array",value]); + return poisearch_message(dbusInterface,dltInterface,"requestResultList",["uint16",offset,"uint16",maxWindowSize,"array",value]); } -function poisearch_GetPoiDetails(dbusIf,ids) +function poisearch_GetPoiDetails(dbusInterface,dltInterface,ids) { var value=[]; for(var i=0;i<ids.length;i+=1) { value=value.concat(["uint32",ids[i]]); } - return poisearch_message_get(dbusIf,"getPoiDetails",["array",value]); + return poisearch_message_get(dbusInterface,dltInterface,"getPoiDetails",["array",value]); } //----------------- Trip Computer messages ----------------- // Send a message to tripcomputer (basic) -function tripcomputer_message(par, func, args) +function tripcomputer_message(dbusInterface, dltInterface, func, args) { - return demonstrator_message(par, "TripComputer", func, args); + return demonstrator_message(dbusInterface, dltInterface, "TripComputer", func, args); } // Send a message to fuel stop advisor (basic) -function fuelstopadvisor_message(par, func, args) +function fuelstopadvisor_message(dbusInterface, dltInterface, func, args) { - return demonstrator_message(par, "FuelStopAdvisor", func, args); + return demonstrator_message(dbusInterface, dltInterface, "FuelStopAdvisor", func, args); } -function fuelstopadvisor_ReleaseRouteHandle(dbusIf,routeHandle) +function fuelstopadvisor_ReleaseRouteHandle(dbusInterface,dltInterface,routeHandle) { - fuelstopadvisor_message(dbusIf,"releaseRouteHandle",routeHandle); + fuelstopadvisor_message(dbusInterface,dltInterface,"releaseRouteHandle",routeHandle); } -function fuelstopadvisor_SetRouteHandle(dbusIf,routeHandle) +function fuelstopadvisor_SetRouteHandle(dbusInterface,dltInterface,routeHandle) { - fuelstopadvisor_message(dbusIf,"setRouteHandle",routeHandle); + fuelstopadvisor_message(dbusInterface,dltInterface,"setRouteHandle",routeHandle); } -function fuelstopadvisor_SetFuelAdvisorSettings(dbusIf,advisorMode,distanceThreshold) +function fuelstopadvisor_SetFuelAdvisorSettings(dbusInterface,dltInterface,advisorMode,distanceThreshold) { - fuelstopadvisor_message(dbusIf,"setFuelAdvisorSettings",["boolean",advisorMode,"uint8",distanceThreshold]); + fuelstopadvisor_message(dbusInterface,dltInterface,"setFuelAdvisorSettings",["boolean",advisorMode,"uint8",distanceThreshold]); } -function fuelstopadvisor_GetTripData(dbusIf,trip) +function fuelstopadvisor_GetTripData(dbusInterface,dltInterface,trip) { - return fuelstopadvisor_message(dbusIf,"getTripData",["uint8",trip]); + return fuelstopadvisor_message(dbusInterface,dltInterface,"getTripData",["uint8",trip]); } -function fuelstopadvisor_GetInstantData(dbusIf) +function fuelstopadvisor_GetInstantData(dbusInterface,dltInterface) { - return fuelstopadvisor_message(dbusIf,"getInstantData",[]); + return fuelstopadvisor_message(dbusInterface,dltInterface,"getInstantData",[]); } -function fuelstopadvisor_ResetTripData(dbusIf,trip) +function fuelstopadvisor_ResetTripData(dbusInterface,dltInterface,trip) { - fuelstopadvisor_message(dbusIf,"resetTripData",["uint8",trip]); + fuelstopadvisor_message(dbusInterface,dltInterface,"resetTripData",["uint8",trip]); } |