kml: return objects rather than tuples for KML elements

Author: peterbarker

MAVProxy/modules/lib/kmlread.py

@@ -13,6 +13,18 @@
 namespaces = {'kml': 'http://www.opengis.net/kml/2.2'}
 
 
+class Polygon():
+    def __init__(self, name, latlon):
+        self.name = name
+        self.vertexes = latlon
+
+
+class Point():
+    def __init__(self, name, latlon):
+        self.name = name
+        self.latlon = latlon
+
+
 def readkmz(filename):
     '''reads in a kmz file and returns xml nodes'''
     # Strip quotation marks if neccessary
@@ -72,15 +84,15 @@ def readObject(innode):
         if coordinates is None:
             return None
         s = coordinates.text.split(',')
-        return ("Point", name.text, [(float(s[1]), float(s[0]))])
+        return Point(name.text, (float(s[1]), float(s[0])))
 
     coordinates = find_tag_recursive(innode, 'coordinates')
     if coordinates is not None:
         latlon = []
         for c in coordinates.text.split():
             s = c.split(',')
             latlon.append((float(s[1]), float(s[0])))
-        return ("Polygon", name.text, latlon)
+        return Polygon(name.text, latlon)
 
     return ('Unknown', None, None)
 

MAVProxy/modules/mavproxy_kmlread.py

@@ -354,34 +354,33 @@ def loadkml(self, filename):
                 continue
 
             # and place any polygons on the map
-            (pointtype, name, coords) = point
-            if pointtype == 'Polygon':
-                self.add_polygon(name, coords)
+            if isinstance(point, kmlread.Polygon):
+                self.add_polygon(point.name, point.vertexes)
 
             # and points - barrell image and text
-            if pointtype == 'Point':
-                # print("Adding " + point[1])
+            if isinstance(point, kmlread.Point):
+                # print("Adding " + point.name)
                 curpoint = mp_slipmap.SlipIcon(
-                    point[1],
-                    latlon=(point[2][0][0], point[2][0][1]),
+                    point.name,
+                    latlon=point.latlon,
                     layer=3,
                     img='barrell.png',
                     rotation=0,
                     follow=False,
                 )
                 curtext = mp_slipmap.SlipLabel(
-                    point[1],
-                    point=(point[2][0][0], point[2][0][1]),
+                    point.name,
+                    point=point.latlon,
                     layer=4,
-                    label=point[1],
+                    label=point.name,
                     colour=(0, 255, 255),
                 )
                 self.add_map_object(curpoint)
                 self.add_map_object(curtext)
                 self.allayers.append(curpoint)
                 self.alltextlayers.append(curtext)
-                self.curlayers.append(point[1])
-                self.curtextlayers.append(point[1])
+                self.curlayers.append(point.name)
+                self.curtextlayers.append(point.name)
         self.menu_needs_refreshing = True
 
     def idle_task(self):

MAVProxy/tools/mavflightview.py

@@ -680,27 +680,27 @@ def load_kml(kml):
         except Exception:
             continue
 
-        if point[0] == 'Polygon':
+        if isinstance(point, kmlread.Polygon):
             newcolour = (random.randint(0, 255), 0, random.randint(0, 255))
-            curpoly = mp_slipmap.SlipPolygon(point[1], point[2],
+            curpoly = mp_slipmap.SlipPolygon(point.name, point.vertexes,
                                              layer=2, linewidth=2, colour=newcolour)
             ret.append(curpoly)
 
-        if point[0] == 'Point':
+        if isinstance(point, kmlread.Point):
             icon = mp_tile.mp_icon('barrell.png')
             curpoint = mp_slipmap.SlipIcon(
-                point[1],
-                latlon=(point[2][0][0], point[2][0][1]),
+                point.name,
+                latlon=point.latlon,
                 layer=3,
                 img=icon,
                 rotation=0,
                 follow=False,
             )
             curtext = mp_slipmap.SlipLabel(
-                point[1],
-                point=(point[2][0][0], point[2][0][1]),
+                point.name,
+                point=point.latlon,
                 layer=4,
-                label=point[1],
+                label=point.name,
                 colour=(0, 255, 255),
             )
             ret.append(curpoint)