Merge pull request #7 from dhtech/furest-hall

Use the hall data from the seatmap

Author: SoundGoof

lib/location.py

@@ -34,7 +34,7 @@ def add_coordinates(seatmap, cursor):
             continue
         table = normalize_table_name(seat['row'])
         logging.debug("Normalized table name %s to %s", seat['row'], table)
-        hall = get_hall_from_table_name(table)
+        hall = seat['hall']
         halls.setdefault(hall, []).append(seat)
         tables.setdefault(hall, {}).setdefault(table, []).append(seat)
 
@@ -49,7 +49,7 @@ def add_coordinates(seatmap, cursor):
             if not switches.get(table, []):
               logging.debug("Table %s has no switches, ignoring", table)
               continue
-            c, scale = table_location(table, tables)
+            c, scale = table_location(table, tables, hall)
             scales.append(scale)
             table_coordinates[hall].append((table, c))
 
@@ -129,9 +129,9 @@ def switch_locations(t, n):
     return locations
 
 
-def table_location(table, tables):
+def table_location(table, tables, hall):
     seats = sorted(
-        tables[get_hall_from_table_name(table)][table],
+        tables[hall][table],
         key=lambda seat: int(seat['seat']))
     logging.debug("First and last seat on %s is %s and %s",
             table, seats[0]["seat"], seats[-1]["seat"])