bugfix, more tests

fastkml/kml.py

@@ -186,9 +186,9 @@ class _Feature(_BaseObject):
     # Placemark, or ScreenOverlay—the value for the Feature's inline
     # style takes precedence over the value for the shared style.
 
-    _time_span = None #XXX
+    _time_span = None
     # Associates this Feature with a period of time.
-    _time_stamp = None #XXX
+    _time_stamp = None
     # Associates this Feature with a point in time.
 
     #TODO Region = None
@@ -278,7 +278,7 @@ class _Feature(_BaseObject):
     @end.setter
     def end(self, dt):
         if self._time_span is None:
-            self._time_span = TimeStamp(end=dt)
+            self._time_span = TimeSpan(end=dt)
         else:
             if self._time_span.end is None:
                 self._time_span.end = [dt, None]

fastkml/tests.py

@@ -750,6 +750,7 @@ class DateTimeTestCase( unittest.TestCase ):
         self.assertTrue('end>' in f.to_string())
         self.assertFalse('TimeStamp>' in f.to_string())
         self.assertFalse('when>' in f.to_string())
+        # when we set a timestamp an existing timespan will be deleted
         f.timeStamp = now
         self.assertTrue(now.isoformat() in f.to_string())
         self.assertTrue('TimeStamp>' in f.to_string())
@@ -758,6 +759,21 @@ class DateTimeTestCase( unittest.TestCase ):
         self.assertFalse('TimeSpan>' in f.to_string())
         self.assertFalse('begin>' in f.to_string())
         self.assertFalse('end>' in f.to_string())
+        # when we set a timespan an existing timestamp will be deleted
+        f.end = y2k
+        self.assertFalse(now.isoformat() in f.to_string())
+        self.assertTrue('2000-01-01' in f.to_string())
+        self.assertTrue('TimeSpan>' in f.to_string())
+        self.assertFalse('begin>' in f.to_string())
+        self.assertTrue('end>' in f.to_string())
+        self.assertFalse('TimeStamp>' in f.to_string())
+        self.assertFalse('when>' in f.to_string())
+        #We manipulate our Feature so it has timespan and stamp
+        ts = kml.TimeStamp(timestamp=now)
+        f._time_stamp = ts
+        self.assertRaises(ValueError, f.to_string)
+
+