Changeset 02e3694

Timestamp:

11/14/10 03:58:36 (3 years ago)

Author:

xkolman2 <xkolman2@…>

Branches:

master

Children:

102aa48

Parents:

cb42f66

git-author:

xkolman2 <xkolman2@…> (11/14/10 03:58:36)

git-committer:

xkolman2 <xkolman2@…> (11/14/10 03:58:36)

Message:

previous commit actually also added setting urrent position on POI coordinates
add asynchronous address routing
assure the screen is properly refreshed if something important for asynchronous road lookup happens

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

Location:

modules

Files:

• mod_loadTracklogs.pyc (modified) (previous)
• mod_menu.pyc (modified) (previous)
• mod_notification.pyc (modified) (previous)
• mod_onlineServices.py (modified) (4 diffs)
• mod_onlineServices.pyc (modified) (previous)
• mod_options.pyc (modified) (previous)
• mod_route.py (modified) (3 diffs)
• mod_route.pyc (modified) (previous)
• mod_tracklogManager.pyc (modified) (previous)
• mod_turnByTurn.pyc (modified) (previous)
• upoints/gpx.pyc (modified) (previous)

modules/mod_onlineServices.py

@@ -122 +122 @@
     local = self.googleLocalQuery(queryWithLL)
     return local
-
-
-
+  
   def googleDirectionsAsync(self, start, destination, outputHandler, key):
     """a background running googledirections query
-       outputHandler will be proided with the results + the specified key string"""
+       -> verbatim start and destination will be used in route descritpion, no geocoding
+       outputHandler will be provided with the results + the specified key string"""
+    self.routingThread = self.Worker(self, "onlineRoute", (start, destination), outputHandler, key)
+    self.routingThread.daemon = True
+    self.routingThread.start()
+    
+  def googleDirectionsLLAsync(self, start, destination, outputHandler, key):
+    """a background running googledirections query
+    - Lat Lon pairsversion -> for geocoding the start/destination points (NOT first/last route points)
+       outputHandler will be provided with the results + the specified key string"""
     self.routingThread = self.Worker(self, "onlineRouteLL", (start, destination), outputHandler, key)
     self.routingThread.daemon = True
@@ -164 +171 @@
 
       try:
+        print start, destination
         directions = gmap.directions(start, destination, dir)
       except:
@@ -169 +177 @@
         try:
           directions = gmap.directions(start, destination)
-        except Exception, e:
-          if e.status == 604:
-            print "onlineServices:Gdirections:ruting failed -> no route found" % e
-            self.sendMessage("ml:notification:m:No route found;3")
+        except googlemaps.googlemaps.GoogleMapsError, e:
+          if e.status == 602:
+            print "onlineServices:Gdirections:routing failed -> address not found" % e
+            self.sendMessage("ml:notification:m:Address(es) not found;5")
+          elif e.status == 604:
+            print "onlineServices:Gdirections:routing failed -> no route found" % e
+            self.sendMessage("ml:notification:m:No route found;5")
           else:
             print "onlineServices:Gdirections:ruting failed with exception:\n%s" % e
 
           directions = []
+          self.set('needRedraw', True)
 
     else:
@@ -256 +268 @@
           directions = self.getOnlineRoute(start,destination)
 
-          if type == "onlineRouteLL":
+          if self.type == "onlineRouteLL":
             # reverse geocode the start and destination coordinates (for the info menu)
             (fromLat,fromLon) = start
             (toLat,toLon) = destination
-            self.setStatusMessage("geocoding start")
+            self.setStatusMessage("geocoding start...")
             startAddress = self.reverseGeocode(fromLat,fromLon)
-            self.setStatusMessage("geocoding destination")
+            self.setStatusMessage("geocoding destination...")
             destinationAddress = self.reverseGeocode(toLat,toLon)
           else:
-            startAddress = "start address unknown"
-            destinationAddress = "destination address unknown"
+            startAddress = start
+            destinationAddress = destination
           self.setStatusMessage("online routing done")
           # send the results to the output handler

modules/mod_route.py

@@ -205 +205 @@
               traceback.print_exc(file=sys.stdout)
               self.sendMessage('ml:notification:m:No route found;3')
+              self.set('needRedraw', True)
             if "show" in args:
               """switch to map view and go to start/destination, if requested"""
@@ -306 +307 @@
     online = self.m.get('onlineServices', None)
     if online:
-#    directions = online.googleDirectionsLL(fromLat, fromLon, toLat, toLon)
-      online.googleDirectionsAsync((fromLat, fromLon), (toLat, toLon), self.handleRoute, "onlineRoute")
+      online.googleDirectionsLLAsync((fromLat, fromLon), (toLat, toLon), self.handleRoute, "onlineRoute")
+      
+  def doAddressRoute(self, start, destination):
+    """Route from one point to another, and set that as the active route"""
+    online = self.m.get('onlineServices', None)
+    if online:
+      print "routing from %s to %s" % (start,destination)
+      online.googleDirectionsAsync(start, destination, self.handleRoute, "onlineRouteAdress2Adress")
 
   def handleRoute(self, key, resultsTupple):
@@ -316 +323 @@
         # remove any possible prev. route description, so new a new one for this route is created
         self.text = None
-        if directions: # is there actually something in th directions ?
+        if directions: # is there actually something in the directions ?
           polyline = directions['Directions']['Polyline']['points'] # the route is encoded as a polyline
           route = self.decode_line(polyline) # we decode the polyline to a list of points
           self.processAndSaveResults(route, directions, startAddress, destinationAddress)
-
-  def doAddressRoute(self, start, destination):
-    """Route from one point to another, and set that as the active route"""
-    online = self.m.get('onlineServices', None)
-    if online == None:
-      return
-    print "routing from %s to %s" % (start,destination)
-    directions = None
-    try:
-      directions = online.googleDirections(start, destination)
-    except googlemaps.googlemaps.GoogleMapsError, e:
-      if e.status == 602: # address/addresses not found
-        print "address not found"
-        self.sendMessage('notification:adress(es) not found#5')
-
-    if directions == None:
-      return
-
-    # remove any possible prev. route description, so new a new one for this route is created
-    self.text = None
-
-    polyline = directions['Directions']['Polyline']['points'] # the route is encoded as a polyline
-    route = self.decode_line(polyline) # we decode the polyline to a list of points
-    # handle the results
-    if len(route) >= 2:
-      start = (route[0])
-      destination = (route[-1])
-    self.processAndSaveResults(route, directions, start, destination)
+    elif key == "onlineRouteAdress2Adress":
+      if len(resultsTupple) == 3:
+        (directions, startAddress, destinationAddress) = resultsTupple
+        # remove any possible prev. route description, so new a new one for this route is created
+        self.text = None
+        if directions: # is there actually something in the directions ?
+          polyline = directions['Directions']['Polyline']['points'] # the route is encoded as a polyline
+          route = self.decode_line(polyline) # we decode the polyline to a list of points
+          self.processAndSaveResults(route, directions, startAddress, destinationAddress)
+    self.set('needRedraw', True)
     
   def processAndSaveResults(self, route, directions, startAddress, destinationAddress):