Notes about remotising devices

[gregoa/zavai.git] / zavai / gps.py

diff --git a/zavai/gps.py b/zavai/gps.py
index bb551097979ec2eb3a247c8c593a3ddb73461c37..2b73da7cc917ac10b61f9ac411bd2dc78889c999 100755 (executable)
--- a/zavai/gps.py
+++ b/zavai/gps.py
@@ -208,7 +208,6 @@ class GPX(zavai.Service):
         conf = registry.resource("conf")
         self.trackdir = conf.homedir
         self.activity_monitors = set()
-        self.started = False
 
     def add_activity_monitor(self, cb):
         self.activity_monitors.add(cb)
@@ -223,24 +222,21 @@ class GPX(zavai.Service):
 
     def start(self):
         zavai.info("Starting GPX trace subsystem")
-        self.started = True
         gps = self.registry.resource("gps")
-        gps.position.connect("gps", self.on_position_changed)
+        gps.position.connect("position", self.on_position_changed)
 
     def stop(self):
-        if not self.started: return
         zavai.info("Stopping GPX trace subsystem")
         gps = self.registry.resource("gps")
-        gps.position.disconnect("gps", self.on_position_changed)
+        gps.position.disconnect("position", self.on_position_changed)
         self.stop_track()
-        self.started = False
 
     def on_position_changed(self, fields, tstamp, lat, lon, alt):
         self.last_pos = (fields, tstamp, lat, lon, alt)
         self.trackpoint()
 
     def start_track(self, tstamp = None, basename = None):
-        if basename is None:
+        if basename is not None:
             self.basename = basename
         elif tstamp is not None:
             # Compute basename for output files
@@ -256,7 +252,7 @@ class GPX(zavai.Service):
     xmlns="http://www.topografix.com/GPX/1/0"
     xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">
   <trk>
-    <trkseg>""" % VERSION
+    <trkseg>""" % zavai.VERSION
 
         self.wpt = open(self.basename + "-wpt.gpx", "wt")
         print >>self.wpt, """<?xml version="1.0" encoding="UTF-8"?>
@@ -265,7 +261,7 @@ class GPX(zavai.Service):
     creator="audiomap %s"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
     xmlns="http://www.topografix.com/GPX/1/0"
-    xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">""" % VERSION
+    xsi:schemaLocation="http://www.topografix.com/GPX/1/0 http://www.topografix.com/GPX/1/0/gpx.xsd">""" % zavai.VERSION
 
         self.wpt_seq = 1;
         self.notify_activity_monitors()