cleaning up d2_svg_processor, commit what I have done so far

2 files changed, 61 insertions, 64 deletions

diff --git a/lib/d2/bin/d2_svg_processor.py b/lib/d2/bin/d2_svg_processor.py
index b5bb2aa..c423ec6 100644
--- a/lib/d2/bin/d2_svg_processor.py
+++ b/lib/d2/bin/d2_svg_processor.py
@@ -28,27 +28,27 @@ ROOM_X_RANGE = {'3D1': {'xmin': 0,
                         'xmax': 4500}
                }
 
-nsmap = {'svg': 'http://www.w3.org/2000/svg',
+NSMAP = {'svg': 'http://www.w3.org/2000/svg',
      'xlink': "http://www.w3.org/1999/xlink"}
-nsmap2 = {None: 'http://www.w3.org/2000/svg'}
+NSMAP2 = {None: 'http://www.w3.org/2000/svg'}
 
 ROOMS = [u'3A1', u'3B1', u'3C1', u'3D1']
 
-ntwk_number_id = {'3D13A1': 'NTWK_NUMBER',
+NTWK_NUMBER_ID = {'3D13A1': 'NTWK_NUMBER',
                '3C1': 'NTWK_NUMBER-7',
                '3B1': 'NTWK_NUMBER-1'}
 
-name_label_id = {'3D13A1': 'NAME',
+NAME_LABEL_ID = {'3D13A1': 'NAME',
                  '3C1': 'NAME-2',
                  '3B1': 'NAME-6'}
 
-main_room_nodes = ['draft', 'draft-3', 'draft-4']
+MAIN_ROOM_NODES = ['draft', 'draft-3', 'draft-4']
 
-group_id_room = {'draft': '3D13A1',
+GROUP_ID_ROOM = {'draft': '3D13A1',
                  'draft-3': '3C1',
                  'draft-4': '3B1'}
 
-discard_ids = ['#REFR', '#REFR-3']
+DISCARD_IDS = ['#REFR', '#REFR-3']
 
 NAME_CORRECTIONS = {u'Deb Smith': u'Deborah Smith',
                     u'Ron Lacey': u'Ron Lacy',
@@ -76,7 +76,7 @@ floor_plan_data = {}
 
 ntwk_number_data = {}
 
-ntwk_id_pattern = re.compile("([A-Z]+)(\d+)")
+NTWK_ID_PATTERN = re.compile("([A-Z]+)(\d+)")
 
 class Args(object):
 
@@ -158,7 +158,7 @@ class Args(object):
 
 class ParseFloorPlanXLS(object):
 
-    OUTPUT_FILENAME = 'floor_plan.json'
+    MULTIPLE_RECORD_ERROR = "Data Error: multiple records for {0} in room {1}"
 
     def __init__(self):
         pass
@@ -182,21 +182,16 @@ class ParseFloorPlanXLS(object):
                 net_jack1 = unicode(sh.cell(rowx=rownum, colx=3).value)
                 net_jack2 = unicode(sh.cell(rowx=rownum, colx=4).value)
                 if room_name not in floor_plan_data:
-                     floor_plan_data[room_name] = {}
+                    floor_plan_data[room_name] = {}
                 if cube in floor_plan_data[room_name]:
-                     log_obj.error("""DATA ERROR: 
-                        multiple records for %s in room %s""" %(cube, 
-                                                                room_name))
+                    log_obj.error(self.MULTIPLE_RECORD_ERROR.format(cube,
+                                                               room_name))
                 else:
-                     floor_plan_data[room_name][cube] = {'name': name,
+                    floor_plan_data[room_name][cube] = {'name': name,
                                               'net_jack1': net_jack1,
                                               'net_jack2': net_jack2}
 
     def __call__(self, args):
-        output_filepath = os.path.join(
-                             args.data_directory,
-                             args.project + '_' + self.OUTPUT_FILENAME
-                          )
         wb = xlrd.open_workbook(args.master_spreadsheet)
         for sheet_name in wb.sheet_names():
             room_name = self._determine_room(sheet_name)
@@ -204,25 +199,22 @@ class ParseFloorPlanXLS(object):
                 self._process_sheet(wb.sheet_by_name(sheet_name), 
                                     room_name, args.log)
 
-        with open(output_filepath, 'wb') as output_fileobj:
-            output_fileobj.write(json.dumps(floor_plan_data))
-
 class CreateStructureSVG(object):
 
     OUTPUT_FILENAME = 'structure.svg'
 
-    reg_keep_elements = re.compile("(FIXED_OUTLINE$)|(FIXED_OUTLINE-\d+)|"\
+    REG_KEEP_ELEMENTS = re.compile("(FIXED_OUTLINE$)|(FIXED_OUTLINE-\d+)|"\
          "(FURN-8$)|(FINISHES-8$)|"\
          "(OUTLN$)|(OUTLN-\d+)|"\
          "(PANELS$)|(PANELS-\d+)|"\
          "(g141075$)|(g163196$)|(g55578$)|"\
          "(WALL$)|(WALL-\d+)")
 
-    reg_pat_1 = re.compile('ID_(.*)_PANEL', re.IGNORECASE)
-    reg_pat_2 = re.compile('ID_(.*)_pan', re.IGNORECASE)
-    reg_pat_3 = re.compile('ID_(.*)_panels', re.IGNORECASE)
+    REG_PAT_1 = re.compile('ID_(.*)_PANEL', re.IGNORECASE)
+    REG_PAT_2 = re.compile('ID_(.*)_pan', re.IGNORECASE)
+    REG_PAT_3 = re.compile('ID_(.*)_panels', re.IGNORECASE)
 
-    reg_panels = [reg_pat_1, reg_pat_2, reg_pat_3]
+    REG_PANELS = [REG_PAT_1, REG_PAT_2, REG_PAT_3]
 
     def __init__(self):
         self.input_svg = ""
@@ -235,10 +227,10 @@ class CreateStructureSVG(object):
         def_node = etree.SubElement(parent_el, def_el.tag,
                                               def_el.attrib)
         for el in def_el:
-            if el.tag == '{%s}g' %nsmap['svg']:
+            if el.tag == '{{{0}}}g'.format(NSMAP['svg']):
                 el_id = el.attrib['id']
                 is_panel_node = False
-                for reg_pat in self.reg_panels:
+                for reg_pat in self.REG_PANELS:
                     if reg_pat.match(el_id):
                         Util.remove_text_node(def_node, el)
                         is_panel_node = True
@@ -254,14 +246,14 @@ class CreateStructureSVG(object):
         the_node = etree.SubElement(parent_node, the_el.tag,
                                                the_el.attrib)
         for el in the_el:
-            if el.tag != '{%s}text' %nsmap['svg']:
+            if el.tag != '{{{0}}}text'.format(NSMAP['svg']):
                 the_node.append(el)
 
     def _get_room_structure_svg(self, parent_el, el, room_name):
         group_node = etree.SubElement(parent_el, el.tag,
                                                    el.attrib)
         for sub_el in el:
-            if self.reg_keep_elements.match(sub_el.attrib['id']):
+            if self.REG_KEEP_ELEMENTS.match(sub_el.attrib['id']):
                 self._remove_all_texts(group_node, sub_el)
 
     def _get_structure_svg(self):
@@ -269,8 +261,8 @@ class CreateStructureSVG(object):
 
         #create svg root element:
         parser = etree.XMLParser()
-        structure_svg = parser.makeelement('{%s}' %nsmap['svg'] + 'svg',
-                                          nsmap = nsmap2)
+        structure_svg = parser.makeelement(
+           '{{{0}}}{1}'.format(NSMAP['svg'], 'svg'), nsmap = NSMAP2)
         #copy the root element attributes to the newly created svgs:
         root = data.getroottree().getroot()
 
@@ -280,15 +272,14 @@ class CreateStructureSVG(object):
         #main_el includes defs, meta info and one main group node
         #that includes a translation
         for main_el in data:
-            if main_el.tag == '{%s}defs' %nsmap['svg']:
+            if main_el.tag == '{{{0}}}defs'.format(NSMAP['svg']):
                 self._process_def(structure_svg, main_el)
-            elif main_el.tag == '{%s}g' %nsmap['svg']:
+            elif main_el.tag == '{{{0}}}g'.format(NSMAP['svg']):
                 group_node = etree.SubElement(structure_svg, main_el.tag,
                                                    main_el.attrib)
                 for el in main_el:
-                    if el.attrib['id'] in main_room_nodes:
-                        room_name = group_id_room.get(el.attrib['id'])
-                        #print "processing %s" %room_name
+                    if el.attrib['id'] in MAIN_ROOM_NODES:
+                        room_name = GROUP_ID_ROOM.get(el.attrib['id'])
                         self._get_room_structure_svg(group_node, el, room_name)
                 else:
                     main_el.append(el)
@@ -300,7 +291,7 @@ class CreateStructureSVG(object):
         return etree.tostring(structure_svg)
 
     def _remove_extra_nodes(self, top_node):
-        for href_to_avoid in discard_ids:
+        for href_to_avoid in DISCARD_IDS:
             Util.remove_node_by_href_id(top_node, href_to_avoid)
 
     def __call__(self, args):
@@ -321,6 +312,8 @@ class PopulateTables(object):
     OUTPUT_JSON_FILENAME = 'ntwk_number_data.json'
     TABLES = [u'forge', u'label_coordinate', u'plot']
 
+    TRANSFORM_MATRIX_ERROR = "Error: transform matrix of {0} not implemented"
+
     def __init__(self):
         self.input_svg = ""
         self._db = None
@@ -353,16 +346,18 @@ class PopulateTables(object):
         for matrix in matrices:
             if matrix[0:6] == "matrix":
                 matrix_element_list = map(float, matrix[7:-1].split(','))
-                ret_x = matrix_element_list[0] * x + matrix_element_list[2] * y\
+                ret_x = matrix_element_list[0] * x \
+                        + matrix_element_list[2] * y \
                         + matrix_element_list[4]
-                ret_y = matrix_element_list[1] * x + matrix_element_list[3] * y\
+                ret_y = matrix_element_list[1] * x \
+                        + matrix_element_list[3] * y \
                         + matrix_element_list[5]
             elif matrix[0:9] == "translate":
                 (tx, ty) = map(float, matrix[10:-1].split(','))
                 ret_x = x + tx
                 ret_y = y + ty
             else:
-                raise Exception("transform matrix of %s, is not implemented" %matrix)
+                raise Exception(self.TRANSFORM_MATRIX_ERROR.format(matrix))
 
             x = ret_x
             y = ret_y
@@ -384,13 +379,13 @@ class PopulateTables(object):
                                    transform=node.attrib['transform'],
                                    id="%s_NTWK_NUMBER" %room_name)
 
-        room_ntwk_id = ntwk_number_id.get(room_name)
+        room_ntwk_id = NTWK_NUMBER_ID.get(room_name)
         for el in node:
             if el.attrib['id'] == room_ntwk_id:
                 for sub_el in el:
-                    if sub_el.tag == '{%s}text' %nsmap['svg']:
+                    if sub_el.tag == '{{{0}}}text'.format(NSMAP['svg']):
                         tspan_elem = sub_el.xpath('./svg:tspan',
-                                                  namespaces=nsmap)[0]
+                                                  namespaces=NSMAP)[0]
                         ntwk_id = tspan_elem.text
                         #tspan_elem.attrib['font-size'] = "36"
                         ntwk_group.append(sub_el)
@@ -475,8 +470,9 @@ class PopulateTables(object):
 
         #create svg root element:
         parser = etree.XMLParser()
-        ntwk_id_svg = parser.makeelement('{%s}' %nsmap['svg'] + 'svg',
-                                          nsmap = nsmap2)
+        ntwk_id_svg = parser.makeelement(
+                '{{{0}}}{1}'.format(NSMAP['svg'], 'svg'),
+                                          nsmap = NSMAP2)
         #copy the root element attributes to the newly created svgs:
         root = data.getroottree().getroot()
         for key, value in root.attrib.iteritems():
@@ -487,13 +483,13 @@ class PopulateTables(object):
                                     map(float, re.split('\s+', view_box[:]))
 
         for main_el in data:
-            if main_el.tag == '{%s}g' %nsmap['svg']:
+            if main_el.tag == '{%s}g' %NSMAP['svg']:
                 main_el_matrix = main_el.attrib['transform']
                 group_node = etree.SubElement(ntwk_id_svg, main_el.tag,
                                                    main_el.attrib)
                 for el in main_el:
-                    if el.attrib['id'] in main_room_nodes:
-                        room_name = group_id_room.get(el.attrib['id'])
+                    if el.attrib['id'] in MAIN_ROOM_NODES:
+                        room_name = GROUP_ID_ROOM.get(el.attrib['id'])
                         self._get_room_ntwk_id_svg(group_node, el, room_name,
                                                    view_box_xmin,
                                                    view_box_ymin,
@@ -507,8 +503,8 @@ class PopulateTables(object):
 
         #create svg root element:
         parser = etree.XMLParser()
-        name_label_svg = parser.makeelement('{%s}' %nsmap['svg'] + 'svg',
-                                          nsmap = nsmap2)
+        name_label_svg = parser.makeelement('{%s}' %NSMAP['svg'] + 'svg',
+                                          nsmap = NSMAP2)
         #copy the root element attributes to the newly created svgs:
         root = data.getroottree().getroot()
         for key, value in root.attrib.iteritems():
@@ -519,13 +515,13 @@ class PopulateTables(object):
                                     map(float, re.split('\s+', view_box[:]))
 
         for main_el in data:
-            if main_el.tag == '{%s}g' %nsmap['svg']:
+            if main_el.tag == '{%s}g' %NSMAP['svg']:
                 main_el_matrix = main_el.attrib['transform']
                 group_node = etree.SubElement(name_label_svg, main_el.tag,
                                                    main_el.attrib)
                 for el in main_el:
-                    if el.attrib['id'] in main_room_nodes:
-                        room_name = group_id_room.get(el.attrib['id'])
+                    if el.attrib['id'] in MAIN_ROOM_NODES:
+                        room_name = GROUP_ID_ROOM.get(el.attrib['id'])
                         self._get_room_name_label_svg(group_node,
                                                    el,
                                                    room_name,
@@ -554,13 +550,13 @@ class PopulateTables(object):
                                    transform=node.attrib['transform'],
                                    id="%s_NAME_LABEL" %approx_room_name)
 
-        room_name_label_id = name_label_id.get(approx_room_name)
+        room_name_label_id = NAME_LABEL_ID.get(approx_room_name)
         for el in node:
             if el.attrib['id'] == room_name_label_id:
                 for sub_el in el:
-                    if sub_el.tag == '{%s}text' %nsmap['svg']:
+                    if sub_el.tag == '{%s}text' %NSMAP['svg']:
                         tspan_elem = sub_el.xpath('./svg:tspan',
-                                                  namespaces=nsmap)[0]
+                                                  namespaces=NSMAP)[0]
                         transform_matrix = sub_el.attrib['transform']
                         matrices = list(base_matrices)
                         matrices.insert(0, transform_matrix)
@@ -583,7 +579,7 @@ class PopulateTables(object):
 
                             current_name_shown = ""
                             tspan_elem = sub_el.xpath('./svg:tspan',
-                                                      namespaces=nsmap)
+                                                      namespaces=NSMAP)
                             for ts in tspan_elem:
                                 current_name_shown += " " + ts.text
 
@@ -682,7 +678,7 @@ class PopulateTables(object):
             @return floor_plan format
         """
         normalized_ntwk_id = ntwk_id
-        matched = ntwk_id_pattern.match(ntwk_id)
+        matched = NTWK_ID_PATTERN.match(ntwk_id)
         if matched:
             (letters, numbers) = matched.groups()
             if len(numbers) == 1:
@@ -813,19 +809,19 @@ class Util(object):
                                            el.tag,
                                            el.attrib)
         for sub_el in el:
-           if sub_el.tag != '{%s}text' %nsmap['svg']:
+           if sub_el.tag != '{%s}text' %NSMAP['svg']:
                el_wrapper_node.append(sub_el)
 
 
     @staticmethod
     def remove_node_by_href_id(top_node, href_id):
         use_nodes = top_node.xpath('//svg:use',
-                                    namespaces = nsmap)
+                                    namespaces = NSMAP)
 
         for el in use_nodes:
-            href = '{%s}href' %nsmap['xlink']
+            href = '{%s}href' %NSMAP['xlink']
             if href in el.attrib:
-                el_href = el.attrib['{%s}href' %nsmap['xlink']]
+                el_href = el.attrib['{%s}href' %NSMAP['xlink']]
                 if el_href == href_id:
                     el.getparent().remove(el)
 
diff --git a/static/html/test_label.html b/static/html/test_label.html
index 0c45e1d..a4a0b65 100644
--- a/static/html/test_label.html
+++ b/static/html/test_label.html
@@ -25,6 +25,7 @@
                     new OpenLayers.Control.Navigation(),

                     new OpenLayers.Control.PanZoomBar(),

                     new OpenLayers.Control.LayerSwitcher(),

+                    new OpenLayers.Control.MousePosition(),

                     new OpenLayers.Control.Attribution()]};

 

      map = new OpenLayers.Map ("map", options);

@@ -55,7 +56,7 @@
    //map.addLayers([outline]);

    map.zoomToExtent(ext);

    //Note: origin is set at the bottom left corner for OpenLayers !!!

-   map.setCenter(new OpenLayers.LonLat(-900, 3650), 0, true, true) ;

+   map.setCenter(new OpenLayers.LonLat(0, 3650), 0, true, true) ;

   }

 

     </script>