adding map_layer table, adding structure in detail_type

2 files changed, 53 insertions, 1 deletions

diff --git a/lib/d2/bin/d2_db_setup.py b/lib/d2/bin/d2_db_setup.py
index fb5ed20..139f662 100644
--- a/lib/d2/bin/d2_db_setup.py
+++ b/lib/d2/bin/d2_db_setup.py
@@ -158,7 +158,7 @@ class PopulateDetailType(object):
 
     NAMES = [u'Phone Jack', u'Network Jack', u'Polycom', u'First Name',
              u'Last Name', u'Name', u'Phone Number', u'Title', u'Email',
-             u'Department', u'Mobile', u'Fax', u'Network ID']
+             u'Department', u'Mobile', u'Fax', u'Network ID', u'Structure']
 
     def __init__(self, config):
         self._log = config.log
diff --git a/lib/d2/db.py b/lib/d2/db.py
index 0a2d1b1..18866bf 100644
--- a/lib/d2/db.py
+++ b/lib/d2/db.py
@@ -90,6 +90,8 @@ class Map(Base):
     width = Column(Integer)
     height = Column(Integer)
 
+    location = relationship(Location, backref=backref('maps', order_by=id))
+
     def __init__(self, name, filename_png, filename_svg, width, height):
         self.name = name
         self.filename_png = filename_png
@@ -131,6 +133,56 @@ class Map(Base):
             obj.location_id = data['location_id']
         return obj
 
+class MapLayer(Base):
+    """Database table object for storing the different map layers
+    """
+    __tablename__ = PREFIX + 'map_layer'
+    id = Column(Integer, primary_key=True)
+    map_id = Column(Integer, ForeignKey(PREFIX + 'map.id'),
+                         index=True)
+    detail_type_id = Column(Integer, ForeignKey(PREFIX + 'detail_type.id'), 
+                            index=True)
+    filename_svg = Column(Unicode)
+    width = Column(Integer)
+    height = Column(Integer)
+
+    map = relationship(Map, backref=backref('layers', order_by=id))
+
+    def __init__(self, filename_svg, width, height):
+        self.filename_svg = filename_svg
+        self.width = width
+        self.height = height
+
+    def __repr__(self):
+        out = "<MapLayer("\
+              "filename_svg={obj.filename_svg!r}, "\
+              "width={obj.width!r}, "\
+              "height={obj.height!r}, "\
+              ")>"
+        return out.format(obj=self)
+
+    def as_dict(self):
+        out = OrderedDict()
+        out['id'] = self.id
+        out['map_id'] = self.map_id
+        out['detail_type_id'] = self.detail_type_id
+        out['filename_svg'] = self.filename_svg
+        out['width'] = self.width
+        out['height'] = self.height
+        return out
+
+    @classmethod
+    def from_dict(cls, data):
+        obj = cls(data['filename_svg'],
+                   data['width'],
+                   data['height'])
+        if 'id' in data:
+            obj.id = data['id']
+        if 'map_id' in data:
+            obj.map_id = data['map_id']
+        if 'detail_type_id' in data:
+            obj.detail_type_id = data['detail_type_id']
+        return obj
 
 class Plot(Base):
     """Holds data pertaining to an area of a map.