Changeset f1e7af7

Timestamp:

11/24/10 02:13:33 (3 years ago)

Author:

xkolman2 <xkolman2@…>

Branches:

master

Children:

e191deb

Parents:

c733969

git-author:

xkolman2 <xkolman2@…> (11/24/10 02:13:33)

git-committer:

xkolman2 <xkolman2@…> (11/24/10 02:13:33)

Message:

fix adrres routing preloading wrong addreses
fix last step nod being disaplayed du to a wrong tag breaking pango

git-svn-id: ​https://nlp.fi.muni.cz/svn/gps_navigace/trunk@232 0858a4d0-ffff-46e5-938e-62b5ecb34222

Location:

modules

Files:

• mod_menu.pyc (modified) (previous)
• mod_onlineServices.py (modified) (4 diffs)
• mod_onlineServices.pyc (modified) (previous)
• mod_route.py (modified) (2 diffs)
• mod_route.pyc (modified) (previous)
• mod_turnByTurn.pyc (modified) (previous)

modules/mod_onlineServices.py

@@ -172 +172 @@
     # respect travel mode
     mode = self.get('mode', None)
-    if mode != None:
-      if mode == 'cycle':
-        type = "b"
-      elif mode == 'foot':
-        type = "w"
-      elif mode == 'train' or mode == 'bus':
-        type = 'r'
-      else:
-        type = ""
-
-       # combine type and aother parameters
-      dir = {}
-      self.get('directionsLanguage', 'en en')
-      # the google language code is the seccond part of this whitespace delimited string
-      googleLanguageCode = self.get('directionsLanguage', 'en en').split(" ")[1]
-      dir['hl'] = googleLanguageCode
-
-      directions = self.tryToGetDirections(start, destination, dir, type, otherOptions)
-
-      return directions
+    if mode == 'cycle':
+      type = "b"
+    elif mode == 'foot':
+      type = "w"
+    elif mode == 'train' or mode == 'bus':
+      type = 'r'
+    else:
+      type = ""
+
+     # combine type and aother parameters
+    dir = {}
+    self.get('directionsLanguage', 'en en')
+    # the google language code is the seccond part of this whitespace delimited string
+    googleLanguageCode = self.get('directionsLanguage', 'en en').split(" ")[1]
+    dir['hl'] = googleLanguageCode
+
+    directions = self.tryToGetDirections(start, destination, dir, type, otherOptions)
+
+    return directions
 
   def tryToGetDirections(self, start, destination, dir, travelMode, otherOptions, seccondTime=False):
@@ -283 +282 @@
     def run(self):
       print "onlineServices: worker starting"
+      print "worker: work type: %s" % self.type
       if self.type == "localSearchGoogle":
         if self.args:
@@ -297 +297 @@
         if self.args and len(self.args) == 2:
           (start, destination) = self.args
+          print "worker: routing from",start," to ",destination
           self.setStatusMessage("online routing in progress...")
           self.callback.enableOverlay()
@@ -321 +322 @@
           self.setStatusMessage("online routing done   ")
           # send the results to the output handler
-          if self.returnResult: # check if our reulst is expected and should be returned to the oputpt handler
+          if self.returnResult: # check if our result is expected and should be returned to the oputpt handler
             self.outputHandler(self.key, (directions, startAddress, destinationAddress, startLL, destinationLL))
             

modules/mod_route.py

@@ -369 +369 @@
     # add a fake destination step, so there is a "destination reached" message
       destStep = {}
-      destStep[u'descriptionHtml'] = '<p xml:lang="en">you <b>should</b> be near the destination<p>'
+      destStep[u'descriptionEspeak'] = '<p xml:lang="en">you <b>should</b> be near the destination</p>'
+      destStep[u'descriptionHtml'] = 'you <b>should</b> be near the destination'
       # TODO: make this multilingual
       (lat,lon) = self.route[-1]
@@ -924 +925 @@
       menus.drawButton(cr, x4+(w1-x4)/2, y4+dy, (w1-x4)/2, dy, "as destination#position", "generic", "route:posToDestination|set:needRedraw:True")
 
-
-      if self.startAddress == None:
+      # try to get last used addresses
+      startText = self.get('startAddress', None)
+      destinationText = self.get('destinationAddress', None)
+
+      # if there are no last used addresses, use defaults
+      if startText == None:
         startText = "click to input starting adres"
-      else:
-        startText = self.startAddress
-      if self.destinationAddress == None:
+
+      if destinationText == None:
         destinationText = "click to input destination adres"
-      else:
-        destinationText = self.destinationAddress
 
       menus.showText(cr, startText, x4+w1/20, y4+dy/5, w1-x4-(w1/20)*2)