From 46a055032ba5c064c6e4263ab60d409073fcde0b Mon Sep 17 00:00:00 2001 From: Supponen Date: Mon, 19 Apr 2021 15:47:42 +0300 Subject: [PATCH] Use area_aggregation with zone areas * Loop over param.zone.area_aggregation so that area definition is unambiguous --- Scripts/datatypes/zone.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Scripts/datatypes/zone.py b/Scripts/datatypes/zone.py index 5b672837..60538e3b 100644 --- a/Scripts/datatypes/zone.py +++ b/Scripts/datatypes/zone.py @@ -1,4 +1,4 @@ -from parameters.zone import areas, municipalities +from parameters.zone import areas, area_aggregation, municipalities from utils.zone_interval import is_in @@ -10,7 +10,7 @@ def __init__(self, number): self.index = Zone.counter Zone.counter += 1 self.area = None - for area in areas: + for area in area_aggregation: if is_in(areas[area], number): self.area = area break