Refactor kmz.

bin/igc2kmz.py

@@ -137,7 +137,7 @@ def main(argv):
                       roots=roots,
                       tz_offset=options.tz_offset,
                       task=task)
-    kmz.write(options.output, debug=options.debug)
+    kmz.write(options.output, '2.2', debug=options.debug)
 
 
 if __name__ == '__main__':

igc2kmz/__init__.py

@@ -832,7 +832,7 @@ def flights2kmz(flights, roots=[], tz_offset=0, task=None):
     globals.graph_height = 300
     result = kmz.kmz()
     result.add_siblings(stock.kmz)
-    result.add_roots(*roots)
+    result.add_roots(kml.open(1), *roots)
     if globals.task:
         result.add_siblings(make_task_folder(globals, globals.task))
     for flight in flights:

igc2kmz/kmz.py

@@ -62,17 +62,17 @@ class kmz(object):
             self.elements.append(kml.__dict__[key](value))
         return self
 
-    def write(self, filename, debug=False):
+    def write(self, filename, version, debug=False):
         date_time = datetime.datetime.now().timetuple()[:6]
         zf = zipfile.ZipFile(filename, 'w')
-        document = kml.Document(open=1)
+        document = kml.Document()
         document.add(*self.roots)
         document.add(*self.elements)
         string_io = StringIO()
         if debug:
-            kml.kml('2.1', document).pretty_write(string_io)
+            kml.kml(version, document).pretty_write(string_io)
         else:
-            kml.kml('2.1', document).write(string_io)
+            kml.kml(version, document).write(string_io)
         zi = zipfile.ZipInfo('doc.kml')
         zi.compress_type = zipfile.ZIP_DEFLATED
         zi.date_time = date_time