Upgraded Nokia Route API from 6.2 to 7.2

Since the 7.2 API supports many more lanugages(23 compared to 4) and is the
only version that supports China it was necessary to upgrade the nokia route
plugin to 7.2.

The major change is that 7.2 does not support multiple mode parameters which
6.2 did. Now if the user selects multiple route optimizations multiple
requests will be made, one for each optimization. Nokia has also reduced
the amount of different route modes, only fastest and shortest are supported
now.

In the response part noting has changed, so no parsing fixes were necessary.

Task-number: QTBUG-24808

Change-Id: I256079f9a1e91e11c961849c95b95b712021ace0
Reviewed-by: Alex Blasche <alexander.blasche@digia.com>

3 files changed, 1 insertions, 809 deletions

diff --git a/tests/auto/nokia_services/routing/optim-economic.xml b/tests/auto/nokia_services/routing/optim-economic.xml
deleted file mode 100644
index 4e61fec8..00000000
--- a/tests/auto/nokia_services/routing/optim-economic.xml
+++ /dev/null
@@ -1,402 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtcr:CalculateRoute xmlns:rtcr="http://www.navteq.com/lbsp/Routing-CalculateRoute/4">
-  <Response>
-    <MetaInfo>
-      <Timestamp>2012-04-26T14:57:55.085Z</Timestamp>
-      <AdditionalData key="CurrentTrafficLastUpdate">2012-04-26T14:56:01.116+0000</AdditionalData>
-      <AdditionalData key="CurrentTrafficElementsCount">5094983</AdditionalData>
-      <AdditionalData key="LongTermClosureLastUpdate">2012-04-26T14:56:03.396+0000</AdditionalData>
-      <AdditionalData key="LongTermClosureElementsCount">12223</AdditionalData>
-      <AdditionalData key="ShortTermClosureLastUpdate">2012-04-26T14:56:03.396+0000</AdditionalData>
-      <AdditionalData key="ShortTermClosureElementsCount">506</AdditionalData>
-      <AdditionalData key="Map0">2011Q3</AdditionalData>
-      <AdditionalData key="Module0">routeserver,9.2-2012.02.20-hotfix6.2.13.1</AdditionalData>
-      <AdditionalData key="Module0ExecTime">17</AdditionalData>
-      <AdditionalData key="Service">routing-route-service,6.2.13.1</AdditionalData>
-    </MetaInfo>
-    <Route>
-      <RouteId>REMvFQUAAAB4tdyZCURKQJROJJhqxipAAAAAYAlESkAAAADAasYqQAAAAAAAAPB_AAAAAAAA8H-XVzADV_SHZp4MKQHNgLOULCerAAEAAICiDCkBAQAAADAnqwABAAAAAADA_wEAAAAAAMD_HY0-83dwYQCu</RouteId>
-      <Waypoint>
-        <LinkId>+53499799</LinkId>
-        <MappedPosition>
-          <Latitude>52.5315361</Latitude>
-          <Longitude>13.3875332</Longitude>
-        </MappedPosition>
-        <OriginalPosition>
-          <Latitude>52.531543</Latitude>
-          <Longitude>13.387532</Longitude>
-        </OriginalPosition>
-        <Type>stopOver</Type>
-      </Waypoint>
-      <Waypoint>
-        <LinkId>-53501113</LinkId>
-        <MappedPosition>
-          <Latitude>52.5246773</Latitude>
-          <Longitude>13.3941345</Longitude>
-        </MappedPosition>
-        <OriginalPosition>
-          <Latitude>52.524646</Latitude>
-          <Longitude>13.394128</Longitude>
-        </OriginalPosition>
-        <Type>stopOver</Type>
-      </Waypoint>
-      <Mode>
-        <Type>economic</Type>
-        <TransportModes>car</TransportModes>
-      </Mode>
-      <Shape>52.5315361,13.3875332 52.5315819,13.3880997 52.5316582,13.3889303 52.5317612,13.3896999 52.5316315,13.3899002 52.5302505,13.3916502 52.5300598,13.3919001 52.5286217,13.3937197 52.5285416,13.3938799 52.5282288,13.3924398 52.5276604,13.3927898 52.5274887,13.39293 52.5264091,13.3935404 52.5262985,13.3935604 52.5254402,13.3931103 52.5249786,13.3928604 52.5246773,13.3941345</Shape>
-      <BoundingBox>
-        <TopLeft>
-          <Latitude>52.5317612</Latitude>
-          <Longitude>13.3875332</Longitude>
-        </TopLeft>
-        <BottomRight>
-          <Latitude>52.5246773</Latitude>
-          <Longitude>13.3941345</Longitude>
-        </BottomRight>
-      </BoundingBox>
-      <Leg>
-        <Start>
-          <LinkId>+53499799</LinkId>
-          <MappedPosition>
-            <Latitude>52.5315361</Latitude>
-            <Longitude>13.3875332</Longitude>
-          </MappedPosition>
-          <OriginalPosition>
-            <Latitude>52.531543</Latitude>
-            <Longitude>13.387532</Longitude>
-          </OriginalPosition>
-          <Type>stopOver</Type>
-        </Start>
-        <End>
-          <LinkId>-53501113</LinkId>
-          <MappedPosition>
-            <Latitude>52.5246773</Latitude>
-            <Longitude>13.3941345</Longitude>
-          </MappedPosition>
-          <OriginalPosition>
-            <Latitude>52.524646</Latitude>
-            <Longitude>13.394128</Longitude>
-          </OriginalPosition>
-          <Type>stopOver</Type>
-        </End>
-        <Length>1177.0</Length>
-        <TravelTime>237.7</TravelTime>
-        <Maneuver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportManeuverType" id="M1">
-          <Position>
-            <Latitude>52.5315361</Latitude>
-            <Longitude>13.3875332</Longitude>
-          </Position>
-          <Instruction>Head toward Borsigstraße on Invalidenstraße. Go for 500 feet.</Instruction>
-          <TravelTime>15.2</TravelTime>
-          <Length>148.0</Length>
-          <ToLink>+53499799</ToLink>
-          <Direction>forward</Direction>
-        </Maneuver>
-        <Maneuver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportManeuverType" id="M2">
-          <Position>
-            <Latitude>52.5317612</Latitude>
-            <Longitude>13.3896999</Longitude>
-          </Position>
-          <Instruction>Turn right onto Gartenstraße. Go for 0.3 miles.</Instruction>
-          <TravelTime>90.8</TravelTime>
-          <Length>454.0</Length>
-          <ToLink>-811854188</ToLink>
-          <Direction>right</Direction>
-        </Maneuver>
-        <Maneuver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportManeuverType" id="M3">
-          <Position>
-            <Latitude>52.5285416</Latitude>
-            <Longitude>13.3938799</Longitude>
-          </Position>
-          <Instruction>Turn right onto Torstraße. Go for 350 feet.</Instruction>
-          <TravelTime>28.4</TravelTime>
-          <Length>103.0</Length>
-          <ToLink>-53499981</ToLink>
-          <Direction>right</Direction>
-        </Maneuver>
-        <Maneuver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportManeuverType" id="M4">
-          <Position>
-            <Latitude>52.5282288</Latitude>
-            <Longitude>13.3924398</Longitude>
-          </Position>
-          <Instruction>Turn left onto Tucholskystraße. Go for 0.2 miles.</Instruction>
-          <TravelTime>72.4</TravelTime>
-          <Length>380.0</Length>
-          <ToLink>-53500024</ToLink>
-          <Direction>left</Direction>
-        </Maneuver>
-        <Maneuver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportManeuverType" id="M5">
-          <Position>
-            <Latitude>52.5249786</Latitude>
-            <Longitude>13.3928604</Longitude>
-          </Position>
-          <Instruction>Turn left onto Oranienburger Straße. Go for 300 feet.</Instruction>
-          <TravelTime>30.9</TravelTime>
-          <Length>92.0</Length>
-          <ToLink>-53501113</ToLink>
-          <Direction>left</Direction>
-        </Maneuver>
-        <Maneuver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportManeuverType" id="M6">
-          <Position>
-            <Latitude>52.5246773</Latitude>
-            <Longitude>13.3941345</Longitude>
-          </Position>
-          <Instruction>Your destination on Oranienburger Straße is on the right. The trip takes 0.7 miles and 4 mins.</Instruction>
-          <TravelTime>0.0</TravelTime>
-          <Length>0.0</Length>
-          <Direction>forward</Direction>
-        </Maneuver>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>+53499799</LinkId>
-          <Shape>52.5315361,13.3875332 52.5315819,13.3880997</Shape>
-          <Length>38.0</Length>
-          <SpeedLimit>13.89</SpeedLimit>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>7.77</TrafficSpeed>
-            <TrafficTime>4.9</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>3.9</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Invalidenstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Invalidenstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>+53499788</LinkId>
-          <Shape>52.5315819,13.3880997 52.5316582,13.3889303 52.5317612,13.3896999</Shape>
-          <Length>110.0</Length>
-          <SpeedLimit>13.89</SpeedLimit>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>7.77</TrafficSpeed>
-            <TrafficTime>14.1</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>11.3</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Invalidenstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Invalidenstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-811854188</LinkId>
-          <Shape>52.5317612,13.3896999 52.5316315,13.3899002</Shape>
-          <Length>19.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>5.0</TrafficSpeed>
-            <TrafficTime>3.8</TrafficTime>
-            <BaseSpeed>6.94</BaseSpeed>
-            <BaseTime>2.7</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Gartenstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Gartenstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-811854187</LinkId>
-          <Shape>52.5316315,13.3899002 52.5302505,13.3916502</Shape>
-          <Length>193.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>5.28</TrafficSpeed>
-            <TrafficTime>36.6</TrafficTime>
-            <BaseSpeed>6.94</BaseSpeed>
-            <BaseTime>27.8</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Gartenstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Gartenstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-53499878</LinkId>
-          <Shape>52.5302505,13.3916502 52.5300598,13.3919001</Shape>
-          <Length>27.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>5.28</TrafficSpeed>
-            <TrafficTime>5.1</TrafficTime>
-            <BaseSpeed>6.94</BaseSpeed>
-            <BaseTime>3.9</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Gartenstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Gartenstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-53499960</LinkId>
-          <Shape>52.5300598,13.3919001 52.5286217,13.3937197 52.5285416,13.3938799</Shape>
-          <Length>215.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>5.28</TrafficSpeed>
-            <TrafficTime>40.7</TrafficTime>
-            <BaseSpeed>6.94</BaseSpeed>
-            <BaseTime>31.0</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Gartenstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Gartenstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-53499981</LinkId>
-          <Shape>52.5285416,13.3938799 52.5282288,13.3924398</Shape>
-          <Length>103.0</Length>
-          <SpeedLimit>13.89</SpeedLimit>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>8.33</TrafficSpeed>
-            <TrafficTime>12.4</TrafficTime>
-            <BaseSpeed>6.94</BaseSpeed>
-            <BaseTime>14.8</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Torstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Torstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-53500024</LinkId>
-          <Shape>52.5282288,13.3924398 52.5276604,13.3927898 52.5274887,13.39293</Shape>
-          <Length>88.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>4.72</TrafficSpeed>
-            <TrafficTime>18.6</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>9.1</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Tucholskystraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Tucholskystraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-53500091</LinkId>
-          <Shape>52.5274887,13.39293 52.5264091,13.3935404</Shape>
-          <Length>126.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>4.72</TrafficSpeed>
-            <TrafficTime>26.7</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>13.0</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Tucholskystraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Tucholskystraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-844906239</LinkId>
-          <Shape>52.5264091,13.3935404 52.5262985,13.3935604 52.5254402,13.3931103</Shape>
-          <Length>112.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>4.17</TrafficSpeed>
-            <TrafficTime>26.9</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>11.5</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Tucholskystraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Tucholskystraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-844906238</LinkId>
-          <Shape>52.5254402,13.3931103 52.5249786,13.3928604</Shape>
-          <Length>54.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>3.89</TrafficSpeed>
-            <TrafficTime>13.9</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>5.6</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Tucholskystraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Tucholskystraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-53501113</LinkId>
-          <Shape>52.5249786,13.3928604 52.5246773,13.3941345</Shape>
-          <Length>92.0</Length>
-          <SpeedLimit>13.89</SpeedLimit>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>8.61</TrafficSpeed>
-            <TrafficTime>10.7</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>9.5</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Oranienburger Straße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Oranienburger Straße</Street>
-          </Address>
-        </Link>
-      </Leg>
-      <Summary>
-        <Distance>1177.0</Distance>
-        <TrafficTime>309.0</TrafficTime>
-        <BaseTime>237.0</BaseTime>
-      </Summary>
-    </Route>
-  </Response>
-</rtcr:CalculateRoute>
\ No newline at end of file
diff --git a/tests/auto/nokia_services/routing/optim-scenic.xml b/tests/auto/nokia_services/routing/optim-scenic.xml
deleted file mode 100644
index af4ca6f7..00000000
--- a/tests/auto/nokia_services/routing/optim-scenic.xml
+++ /dev/null
@@ -1,402 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<rtcr:CalculateRoute xmlns:rtcr="http://www.navteq.com/lbsp/Routing-CalculateRoute/4">
-  <Response>
-    <MetaInfo>
-      <Timestamp>2012-04-26T14:58:19.456Z</Timestamp>
-      <AdditionalData key="CurrentTrafficLastUpdate">2012-04-26T14:56:00.026+0000</AdditionalData>
-      <AdditionalData key="CurrentTrafficElementsCount">5094983</AdditionalData>
-      <AdditionalData key="LongTermClosureLastUpdate">2012-04-26T14:56:02.404+0000</AdditionalData>
-      <AdditionalData key="LongTermClosureElementsCount">12223</AdditionalData>
-      <AdditionalData key="ShortTermClosureLastUpdate">2012-04-26T14:56:02.404+0000</AdditionalData>
-      <AdditionalData key="ShortTermClosureElementsCount">506</AdditionalData>
-      <AdditionalData key="Map0">2011Q3</AdditionalData>
-      <AdditionalData key="Module0">routeserver,9.2-2012.02.20-hotfix6.2.13.1</AdditionalData>
-      <AdditionalData key="Module0ExecTime">31</AdditionalData>
-      <AdditionalData key="Service">routing-route-service,6.2.13.1</AdditionalData>
-    </MetaInfo>
-    <Route>
-      <RouteId>REMvFQUAAAB4tdyZCURKQJROJJhqxipAAAAAYAlESkAAAADAasYqQAAAAAAAAPB_AAAAAAAA8H-XVzADV_SHZp4MKQHNgLOULCerAAEAAICiDCkBAQAAADAnqwABAAAAAADA_wEAAAAAAMD_HY0-83dwYQCu</RouteId>
-      <Waypoint>
-        <LinkId>+53499799</LinkId>
-        <MappedPosition>
-          <Latitude>52.5315361</Latitude>
-          <Longitude>13.3875332</Longitude>
-        </MappedPosition>
-        <OriginalPosition>
-          <Latitude>52.531543</Latitude>
-          <Longitude>13.387532</Longitude>
-        </OriginalPosition>
-        <Type>stopOver</Type>
-      </Waypoint>
-      <Waypoint>
-        <LinkId>-53501113</LinkId>
-        <MappedPosition>
-          <Latitude>52.5246773</Latitude>
-          <Longitude>13.3941345</Longitude>
-        </MappedPosition>
-        <OriginalPosition>
-          <Latitude>52.524646</Latitude>
-          <Longitude>13.394128</Longitude>
-        </OriginalPosition>
-        <Type>stopOver</Type>
-      </Waypoint>
-      <Mode>
-        <Type>scenic</Type>
-        <TransportModes>car</TransportModes>
-      </Mode>
-      <Shape>52.5315361,13.3875332 52.5315819,13.3880997 52.5316582,13.3889303 52.5317612,13.3896999 52.5316315,13.3899002 52.5302505,13.3916502 52.5300598,13.3919001 52.5286217,13.3937197 52.5285416,13.3938799 52.5282288,13.3924398 52.5276604,13.3927898 52.5274887,13.39293 52.5264091,13.3935404 52.5262985,13.3935604 52.5254402,13.3931103 52.5249786,13.3928604 52.5246773,13.3941345</Shape>
-      <BoundingBox>
-        <TopLeft>
-          <Latitude>52.5317612</Latitude>
-          <Longitude>13.3875332</Longitude>
-        </TopLeft>
-        <BottomRight>
-          <Latitude>52.5246773</Latitude>
-          <Longitude>13.3941345</Longitude>
-        </BottomRight>
-      </BoundingBox>
-      <Leg>
-        <Start>
-          <LinkId>+53499799</LinkId>
-          <MappedPosition>
-            <Latitude>52.5315361</Latitude>
-            <Longitude>13.3875332</Longitude>
-          </MappedPosition>
-          <OriginalPosition>
-            <Latitude>52.531543</Latitude>
-            <Longitude>13.387532</Longitude>
-          </OriginalPosition>
-          <Type>stopOver</Type>
-        </Start>
-        <End>
-          <LinkId>-53501113</LinkId>
-          <MappedPosition>
-            <Latitude>52.5246773</Latitude>
-            <Longitude>13.3941345</Longitude>
-          </MappedPosition>
-          <OriginalPosition>
-            <Latitude>52.524646</Latitude>
-            <Longitude>13.394128</Longitude>
-          </OriginalPosition>
-          <Type>stopOver</Type>
-        </End>
-        <Length>1177.0</Length>
-        <TravelTime>237.7</TravelTime>
-        <Maneuver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportManeuverType" id="M1">
-          <Position>
-            <Latitude>52.5315361</Latitude>
-            <Longitude>13.3875332</Longitude>
-          </Position>
-          <Instruction>Head toward Borsigstraße on Invalidenstraße. Go for 500 feet.</Instruction>
-          <TravelTime>15.2</TravelTime>
-          <Length>148.0</Length>
-          <ToLink>+53499799</ToLink>
-          <Direction>forward</Direction>
-        </Maneuver>
-        <Maneuver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportManeuverType" id="M2">
-          <Position>
-            <Latitude>52.5317612</Latitude>
-            <Longitude>13.3896999</Longitude>
-          </Position>
-          <Instruction>Turn right onto Gartenstraße. Go for 0.3 miles.</Instruction>
-          <TravelTime>90.8</TravelTime>
-          <Length>454.0</Length>
-          <ToLink>-811854188</ToLink>
-          <Direction>right</Direction>
-        </Maneuver>
-        <Maneuver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportManeuverType" id="M3">
-          <Position>
-            <Latitude>52.5285416</Latitude>
-            <Longitude>13.3938799</Longitude>
-          </Position>
-          <Instruction>Turn right onto Torstraße. Go for 350 feet.</Instruction>
-          <TravelTime>28.4</TravelTime>
-          <Length>103.0</Length>
-          <ToLink>-53499981</ToLink>
-          <Direction>right</Direction>
-        </Maneuver>
-        <Maneuver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportManeuverType" id="M4">
-          <Position>
-            <Latitude>52.5282288</Latitude>
-            <Longitude>13.3924398</Longitude>
-          </Position>
-          <Instruction>Turn left onto Tucholskystraße. Go for 0.2 miles.</Instruction>
-          <TravelTime>72.4</TravelTime>
-          <Length>380.0</Length>
-          <ToLink>-53500024</ToLink>
-          <Direction>left</Direction>
-        </Maneuver>
-        <Maneuver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportManeuverType" id="M5">
-          <Position>
-            <Latitude>52.5249786</Latitude>
-            <Longitude>13.3928604</Longitude>
-          </Position>
-          <Instruction>Turn left onto Oranienburger Straße. Go for 300 feet.</Instruction>
-          <TravelTime>30.9</TravelTime>
-          <Length>92.0</Length>
-          <ToLink>-53501113</ToLink>
-          <Direction>left</Direction>
-        </Maneuver>
-        <Maneuver xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportManeuverType" id="M6">
-          <Position>
-            <Latitude>52.5246773</Latitude>
-            <Longitude>13.3941345</Longitude>
-          </Position>
-          <Instruction>Your destination on Oranienburger Straße is on the right. The trip takes 0.7 miles and 4 mins.</Instruction>
-          <TravelTime>0.0</TravelTime>
-          <Length>0.0</Length>
-          <Direction>forward</Direction>
-        </Maneuver>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>+53499799</LinkId>
-          <Shape>52.5315361,13.3875332 52.5315819,13.3880997</Shape>
-          <Length>38.0</Length>
-          <SpeedLimit>13.89</SpeedLimit>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>7.77</TrafficSpeed>
-            <TrafficTime>4.9</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>3.9</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Invalidenstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Invalidenstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>+53499788</LinkId>
-          <Shape>52.5315819,13.3880997 52.5316582,13.3889303 52.5317612,13.3896999</Shape>
-          <Length>110.0</Length>
-          <SpeedLimit>13.89</SpeedLimit>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>7.77</TrafficSpeed>
-            <TrafficTime>14.1</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>11.3</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Invalidenstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Invalidenstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-811854188</LinkId>
-          <Shape>52.5317612,13.3896999 52.5316315,13.3899002</Shape>
-          <Length>19.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>5.0</TrafficSpeed>
-            <TrafficTime>3.8</TrafficTime>
-            <BaseSpeed>6.94</BaseSpeed>
-            <BaseTime>2.7</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Gartenstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Gartenstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-811854187</LinkId>
-          <Shape>52.5316315,13.3899002 52.5302505,13.3916502</Shape>
-          <Length>193.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>5.28</TrafficSpeed>
-            <TrafficTime>36.6</TrafficTime>
-            <BaseSpeed>6.94</BaseSpeed>
-            <BaseTime>27.8</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Gartenstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Gartenstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-53499878</LinkId>
-          <Shape>52.5302505,13.3916502 52.5300598,13.3919001</Shape>
-          <Length>27.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>5.28</TrafficSpeed>
-            <TrafficTime>5.1</TrafficTime>
-            <BaseSpeed>6.94</BaseSpeed>
-            <BaseTime>3.9</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Gartenstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Gartenstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-53499960</LinkId>
-          <Shape>52.5300598,13.3919001 52.5286217,13.3937197 52.5285416,13.3938799</Shape>
-          <Length>215.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>5.28</TrafficSpeed>
-            <TrafficTime>40.7</TrafficTime>
-            <BaseSpeed>6.94</BaseSpeed>
-            <BaseTime>31.0</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Gartenstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Gartenstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-53499981</LinkId>
-          <Shape>52.5285416,13.3938799 52.5282288,13.3924398</Shape>
-          <Length>103.0</Length>
-          <SpeedLimit>13.89</SpeedLimit>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>8.33</TrafficSpeed>
-            <TrafficTime>12.4</TrafficTime>
-            <BaseSpeed>6.94</BaseSpeed>
-            <BaseTime>14.8</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Torstraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Torstraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-53500024</LinkId>
-          <Shape>52.5282288,13.3924398 52.5276604,13.3927898 52.5274887,13.39293</Shape>
-          <Length>88.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>4.72</TrafficSpeed>
-            <TrafficTime>18.6</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>9.1</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Tucholskystraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Tucholskystraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-53500091</LinkId>
-          <Shape>52.5274887,13.39293 52.5264091,13.3935404</Shape>
-          <Length>126.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>4.72</TrafficSpeed>
-            <TrafficTime>26.7</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>13.0</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Tucholskystraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Tucholskystraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-844906239</LinkId>
-          <Shape>52.5264091,13.3935404 52.5262985,13.3935604 52.5254402,13.3931103</Shape>
-          <Length>112.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>4.17</TrafficSpeed>
-            <TrafficTime>26.9</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>11.5</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Tucholskystraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Tucholskystraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-844906238</LinkId>
-          <Shape>52.5254402,13.3931103 52.5249786,13.3928604</Shape>
-          <Length>54.0</Length>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>3.89</TrafficSpeed>
-            <TrafficTime>13.9</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>5.6</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Tucholskystraße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Tucholskystraße</Street>
-          </Address>
-        </Link>
-        <Link xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rtc="http://www.navteq.com/lbsp/Routing-Common/4" xsi:type="rtc:PrivateTransportLinkType">
-          <LinkId>-53501113</LinkId>
-          <Shape>52.5249786,13.3928604 52.5246773,13.3941345</Shape>
-          <Length>92.0</Length>
-          <SpeedLimit>13.89</SpeedLimit>
-          <DynamicSpeedInfo>
-            <TrafficSpeed>8.61</TrafficSpeed>
-            <TrafficTime>10.7</TrafficTime>
-            <BaseSpeed>9.72</BaseSpeed>
-            <BaseTime>9.5</BaseTime>
-          </DynamicSpeedInfo>
-          <Address>
-            <Label>Oranienburger Straße</Label>
-            <Country>DE</Country>
-            <State>Berlin</State>
-            <County>Berlin</County>
-            <City>Berlin</City>
-            <District>Mitte</District>
-            <Street>Oranienburger Straße</Street>
-          </Address>
-        </Link>
-      </Leg>
-      <Summary>
-        <Distance>1177.0</Distance>
-        <TrafficTime>309.0</TrafficTime>
-        <BaseTime>237.0</BaseTime>
-      </Summary>
-    </Route>
-  </Response>
-</rtcr:CalculateRoute>
\ No newline at end of file
diff --git a/tests/auto/nokia_services/routing/tst_routing.cpp b/tests/auto/nokia_services/routing/tst_routing.cpp
index b64202a6..f3e24a93 100644
--- a/tests/auto/nokia_services/routing/tst_routing.cpp
+++ b/tests/auto/nokia_services/routing/tst_routing.cpp
@@ -410,11 +410,10 @@ void tst_nokia_routing::can_compute_route_for_all_supported_travel_modes_data()
 void tst_nokia_routing::can_compute_route_for_all_supported_optimizations()
 {
     QFETCH(int, optimization);
-    Q_UNUSED(optimization);
     QFETCH(QString, file);
     QFETCH(qreal, distance);
     QFETCH(int, duration);
-
+    m_dummyRequest.setRouteOptimization((QGeoRouteRequest::RouteOptimization)optimization);
     loadReply(file);
     calculateRoute();
     QList<QGeoRoute> routes = m_reply->routes();
@@ -434,11 +433,8 @@ void tst_nokia_routing::can_compute_route_for_all_supported_optimizations_data()
 
     QTest::newRow("Shortest") << (int)QGeoRouteRequest::ShortestRoute << QString("optim-shortest.xml") << qreal(1177.0) << 309;
     QTest::newRow("Fastest") << (int)QGeoRouteRequest::FastestRoute << QString("optim-fastest.xml") << qreal(1271.0) << 243;
-    QTest::newRow("Most Econonic") << (int)QGeoRouteRequest::MostEconomicRoute << QString("optim-economic.xml") << qreal(1177.0) << 309;
-    QTest::newRow("Most Scenic") << (int)QGeoRouteRequest::MostScenicRoute << QString("optim-scenic.xml") << qreal(1177.0) << 309;
 }
 
-
 void tst_nokia_routing::can_handle_multiple_routes_in_response()
 {
     loadReply(QStringLiteral("multiple-routes-in-response.xml"));