Added 'optimize' parameter set to 'leastwalking' to route server to give same results...

diff --git a/zouba.madde/debian/files b/zouba.madde/debian/files
index 736ca6c..1017ff6 100644 (file)
--- a/zouba.madde/debian/files
+++ b/zouba.madde/debian/files
@@ -1,2 +1,3 @@
 zouba_0.1_armel.deb user/Other extra
 zouba_0.1_armel.deb user/Other extra
+zouba_0.1_armel.deb user/Other extra

diff --git a/zouba.madde/debian/zouba.debhelper.log b/zouba.madde/debian/zouba.debhelper.log
index 90a6153..0a38b06 100644 (file)
--- a/zouba.madde/debian/zouba.debhelper.log
+++ b/zouba.madde/debian/zouba.debhelper.log
@@ -75,3 +75,16 @@ dh_installdeb
 dh_gencontrol
 dh_md5sums
 dh_builddeb
+dh_installdirs
+dh_installchangelogs
+dh_installdocs
+dh_installexamples
+dh_installman
+dh_link
+dh_strip
+dh_compress
+dh_fixperms
+dh_installdeb
+dh_gencontrol
+dh_md5sums
+dh_builddeb

diff --git a/zouba.madde/debian/zouba/DEBIAN/md5sums b/zouba.madde/debian/zouba/DEBIAN/md5sums
index f7f0ec9..3def4ff 100644 (file)
--- a/zouba.madde/debian/zouba/DEBIAN/md5sums
+++ b/zouba.madde/debian/zouba/DEBIAN/md5sums
@@ -4,4 +4,4 @@ ff174efcc85be1270eb91a671c690feb  usr/share/doc/zouba/changelog.gz
 b941bd01bcea49cabfc186309d46fb74  usr/share/doc/zouba/copyright
 f327a6f11a43e47223c6bebe5434fd81  usr/share/applications/hildon/zouba.desktop
 b23dffe8109cbdbc0d424f176f9277a9  usr/share/icons/hicolor/64x64/apps/zouba.png
-cfd667f7954cbb3c854b55f5036a2fb2  usr/bin/zouba
+afda8e406a59f7dd44c31863d9cb4098  usr/bin/zouba

diff --git a/zouba.madde/debian/zouba/usr/bin/zouba b/zouba.madde/debian/zouba/usr/bin/zouba
index 57d0c1a..fcc4e68 100755 (executable)
Binary files a/zouba.madde/debian/zouba/usr/bin/zouba and b/zouba.madde/debian/zouba/usr/bin/zouba differ

diff --git a/zouba.madde/src/route.cpp b/zouba.madde/src/route.cpp
index 37c9377..e68c4a9 100644 (file)
--- a/zouba.madde/src/route.cpp
+++ b/zouba.madde/src/route.cpp
@@ -41,8 +41,9 @@ void Route::getRoute()
 
   fullUrl.addQueryItem( "a", a.join(",") );
   fullUrl.addQueryItem( "b", b.join(",") );
-  fullUrl.addQueryItem( "show", QString::number(Ytv::FiveResults) );
-  fullUrl.addQueryItem( "walkspeed", QString::number(Ytv::Fast) );
+  fullUrl.addQueryItem( "show", QString::number(Ytv::ShowFiveResults) );
+  fullUrl.addQueryItem( "walkspeed", QString::number(Ytv::WalkSpeedFast) );
+  fullUrl.addQueryItem( "optimize", QString::number(Ytv::OptimizeLeastWalking) );
   fullUrl.addQueryItem( "user", Ytv::Username );
   fullUrl.addQueryItem( "pass", Ytv::Password );
 

diff --git a/zouba.madde/src/ytv.h b/zouba.madde/src/ytv.h
index ee867a5..9e34102 100644 (file)
--- a/zouba.madde/src/ytv.h
+++ b/zouba.madde/src/ytv.h
@@ -10,18 +10,25 @@ namespace Ytv {
   //const QString Work( QByteArray::fromPercentEncoding( "It%E4merenkatu%2011%2CHelsinki" ) );
 
   enum {
-    Slow=1,
-    Fast=2,
-    Normal=3,
-    Running=4,
-    Cycling=5,
+    WalkSpeedSlow=1,
+    WalkSpeedFast=2,
+    WalkSpeedNormal=3,
+    WalkSpeedRunning=4,
+    WalkSpeedCycling=5,
     NoWalkSpeeds=5
   };
 
   enum {
-    OneResult=1,
-    ThreeResults=3,
-    FiveResults=5
+    ShowOneResult=1,
+    ShowThreeResults=3,
+    ShowFiveResults=5
+  };
+
+  enum {
+    OptimizeDefault=1,
+    OptimizeFastest=2,
+    OptimizeLeastTransfers=3,
+    OptimizeLeastWalking=4
   };
 
 };