summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasanoaozora <fifitaneki@hotmail.com>2018-04-06 17:33:34 +0200
committerasanoaozora <fifitaneki@hotmail.com>2018-04-06 17:33:34 +0200
commitc2ff541bfbd551bb56112821c6630c49d3e58b1c (patch)
tree7a1e56516cf63853230a1bc047e715c4092a7b10
parentf7e7f34a9fa1e865ea9ea1923a807f5e8374d644 (diff)
downloadpoi-service-c2ff541bfbd551bb56112821c6630c49d3e58b1c.tar.gz
update and fix some test scripts and add documentation
-rw-r--r--doc/media/guidance-to-poi-example.m4vbin0 -> 1883585 bytes
-rw-r--r--doc/media/map-matching-example.m4vbin0 -> 7470968 bytes
-rw-r--r--doc/media/navigation-tested-with-python-scripts.m4vbin0 -> 22316680 bytes
-rwxr-xr-xsrc/navigation/update_third_party.sh2
-rw-r--r--test/navigation/resource/location.xml8
-rw-r--r--test/navigation/resource/locations.xml8
-rwxr-xr-xtest/navigation/script/test-location-input.py5
-rwxr-xr-xtest/navigation/script/test-poi-guidance.py8
-rwxr-xr-xtest/navigation/script/test-route-calculation.py2
9 files changed, 10 insertions, 23 deletions
diff --git a/doc/media/guidance-to-poi-example.m4v b/doc/media/guidance-to-poi-example.m4v
new file mode 100644
index 0000000..29323ea
--- /dev/null
+++ b/doc/media/guidance-to-poi-example.m4v
Binary files differ
diff --git a/doc/media/map-matching-example.m4v b/doc/media/map-matching-example.m4v
new file mode 100644
index 0000000..2dc70db
--- /dev/null
+++ b/doc/media/map-matching-example.m4v
Binary files differ
diff --git a/doc/media/navigation-tested-with-python-scripts.m4v b/doc/media/navigation-tested-with-python-scripts.m4v
new file mode 100644
index 0000000..5bb05d0
--- /dev/null
+++ b/doc/media/navigation-tested-with-python-scripts.m4v
Binary files differ
diff --git a/src/navigation/update_third_party.sh b/src/navigation/update_third_party.sh
index 57823fb..d8fc8b2 100755
--- a/src/navigation/update_third_party.sh
+++ b/src/navigation/update_third_party.sh
@@ -1,7 +1,7 @@
#!/bin/bash
positioning_version='d4c46f13019aefb11aebd0fc1210a29a46f0b521'
-navit_version='77b0b67935ae90d4fcb8f2cf4a07cd6dc1bed9b7'
+navit_version='91c5637b320469dda4c1d0ff2ef045359df22b6e'
echo "version of positioning is: $positioning_version"
echo "version of navit is: $navit_version"
diff --git a/test/navigation/resource/location.xml b/test/navigation/resource/location.xml
index 6baddc7..9abb6fd 100644
--- a/test/navigation/resource/location.xml
+++ b/test/navigation/resource/location.xml
@@ -1,10 +1,10 @@
<location-set area="Switzerland extract">
<location>
-<latitude>47.415637</latitude>
-<longitude>8.614971</longitude>
+<latitude>47.367264</latitude>
+<longitude>8.550330</longitude>
<country>Switzerland</country>
<city>Zürich</city>
-<street>In Lampitzäckern</street>
-<number>24</number>
+<street>Schanzengasse</street>
+<number>11</number>
</location>
</location-set>
diff --git a/test/navigation/resource/locations.xml b/test/navigation/resource/locations.xml
index d86e5fc..3b9f50d 100644
--- a/test/navigation/resource/locations.xml
+++ b/test/navigation/resource/locations.xml
@@ -31,12 +31,4 @@
<street>Place des Halles</street>
<number>8</number>
</location>
-<location>
-<latitude>47.415637</latitude>
-<longitude>8.614971</longitude>
-<country>Switzerland</country>
-<city>Zürich</city>
-<street>In Lampitzäckern</street>
-<number>24</number>
-</location>
</location-set>
diff --git a/test/navigation/script/test-location-input.py b/test/navigation/script/test-location-input.py
index 1b2cef3..dce6eba 100755
--- a/test/navigation/script/test-location-input.py
+++ b/test/navigation/script/test-location-input.py
@@ -53,6 +53,9 @@ output = commands.getoutput('ps -A')
if not 'dlt' in output:
dltAvailable=False
+#constants used into the script
+TIME_OUT=20000
+
# List of addresses
COUNTRY_STRING = list()
CITY_STRING = list()
@@ -500,7 +503,7 @@ target_search_string = ''
startSearch(0)
# Main loop
-gobject.timeout_add(10000, timeout)
+gobject.timeout_add(TIME_OUT, timeout)
loop = gobject.MainLoop()
loop.run()
if g_exit == 1:
diff --git a/test/navigation/script/test-poi-guidance.py b/test/navigation/script/test-poi-guidance.py
index 0e79818..73b5069 100755
--- a/test/navigation/script/test-poi-guidance.py
+++ b/test/navigation/script/test-poi-guidance.py
@@ -128,14 +128,6 @@ def guidance_guidanceStatusChanged_handler(guidanceStatus,routeHandle):
g_guidance_active = False
g_routing_interface.DeleteRoute(dbus.UInt32(g_navigationcore_session_handle),dbus.UInt32(g_route_handle))
g_navigationcore_session_interface.DeleteSession(dbus.UInt32(g_navigationcore_session_handle))
- else:
- ret = g_guidance_interface.GetDestinationInformation()
- m, s = divmod(ret[1], 60)
- h, m = divmod(m, 60)
- print ("Travel Time: %d:%02d:%02d" % (h, m, s))
- ret = g_guidance_interface.GetManeuversList(dbus.UInt16(10),dbus.UInt32(0))
- print ("Number of maneuvers: " +str(ret[1]))
- print ("Next road to turn: " +ret[2][0][4])
def guidance_positionOnRouteChanged_handler(offsetOnRoute):
print ("Offset on route: " +str(offsetOnRoute))
diff --git a/test/navigation/script/test-route-calculation.py b/test/navigation/script/test-route-calculation.py
index ced6099..2cf19a7 100755
--- a/test/navigation/script/test-route-calculation.py
+++ b/test/navigation/script/test-route-calculation.py
@@ -53,7 +53,7 @@ if not 'dlt' in output:
test_name = "route calculation"
#constants used into the script
-TIME_OUT = 10000
+TIME_OUT = 15000
print('--------------------------')
print('Route Calculation Test')