diff -r f9788970fa46 -r 7378b802ddf8 compute_regions.py --- a/compute_regions.py Wed Jul 29 23:45:53 2020 +0300 +++ b/compute_regions.py Thu Jul 30 21:52:31 2020 +0300 @@ -49,7 +49,7 @@ # Minor shapes contain major shapes, so just use those for shape in (region['minor_shapes'] or region['major_shapes']): for block in blocks_in_shape(blockmap, shape): - set.add(block, region['name']) + set.add(block, region['ref']) return blockmap def get_args(): @@ -74,9 +74,9 @@ def locate_regionally(position, region): if test_shapes(region['major_shapes'], position): - return RegionalLocation(region = region['name'], region_class = 'major') + return RegionalLocation(region = region['ref'], region_class = 'major') elif test_shapes(region['minor_shapes'], position): - return RegionalLocation(region = region['name'], region_class = 'minor') + return RegionalLocation(region = region['ref'], region_class = 'minor') else: return None