From 5a79858d04dfa81b90279c622241b90fb835b575 Mon Sep 17 00:00:00 2001
From: Thibaud <thibaud.gasser@gmx.com>
Date: Wed, 14 Nov 2018 14:40:05 +0100
Subject: [PATCH] Add area data model

---
 sumo_project/Area.py           | 17 ------
 sumo_project/EmissionGetter.py | 96 ----------------------------------
 sumo_project/area.py           | 28 ++++++++++
 3 files changed, 28 insertions(+), 113 deletions(-)
 delete mode 100644 sumo_project/Area.py
 delete mode 100644 sumo_project/EmissionGetter.py
 create mode 100644 sumo_project/area.py

diff --git a/sumo_project/Area.py b/sumo_project/Area.py
deleted file mode 100644
index 473c708..0000000
--- a/sumo_project/Area.py
+++ /dev/null
@@ -1,17 +0,0 @@
-'''
-Created on 6 nov. 2018
-
-@author: Admin
-'''
-
-class Area:
-    
-    locked = False 
-    
-    def __init__(self, coords):
-        self.coords = coords
-    
-    
-    def getCoords(self):
-        return self.coords
-    
\ No newline at end of file
diff --git a/sumo_project/EmissionGetter.py b/sumo_project/EmissionGetter.py
deleted file mode 100644
index 271bb36..0000000
--- a/sumo_project/EmissionGetter.py
+++ /dev/null
@@ -1,96 +0,0 @@
-import os, sys
-from sumo_project.SUMOFactory import SUMOFactory
-
-# Traci launch
-if 'SUMO_HOME' in os.environ:
-    tools = os.path.join(os.environ['SUMO_HOME'], 'tools')
-    sys.path.append(os.path.join(os.environ['SUMO_HOME'], tools))
-    sumoBinary = os.path.join(os.environ['SUMO_HOME'], 'bin', 'sumo-gui')
-    sumoCmd = [sumoBinary, "-c", "mulhouse_simulation/osm.sumocfg"]
-else:
-    sys.exit("please declare environment variable 'SUMO_HOME'")
-
-import traci
-from traci import polygon
-
-
-# creating multiple zones of equal sizes
-def init_grid():
-    default_color = (0, 255, 0)
-    for i in range(cells_step):
-        for j in range(cells_step):
-            area = ((i * width, j * height), (i * width, (j + 1) * height),
-                      ((i + 1) * width, (j + 1) * height), ((i + 1) * width, j * height))
-            areas[i][j] = area
-            polygon.add("area " + str(i) + "," + str(j), area, default_color, False, "rectangle")
-
-
-# Emissions recovery by area
-def getEmissionsByArea(i, j):
-    vehicles = []
-    
-    # Vehicle IDs retrieving into this area
-    for veh_id in traci.vehicle.getIDList():
-        pos = traci.vehicle.getPosition(veh_id)
-        if((i * width < pos[0] and (i + 1) * width > pos[0])
-            and (j * height < pos[1] and (j + 1) * height > pos[1])):
-            vehicles.append(veh_id)
-
-    # Sum all emissions
-    emissions = 0.0
-    for veh_id in vehicles:
-        emission = traci.vehicle.getCO2Emission(veh_id)
-        emissions += emission
-
-    # Change area color if emisssions exceeds the threshold
-    emissionsArea[i][j] += emissions
-    if(emissionsArea[i][j] >= CO2_threshold):
-        red = (255, 0, 0)
-        factory.lock_area(areas[i][j])
-        polygon.setColor("area " + str(i) + "," + str(j), red)
-        polygon.setFilled("area " + str(i) + "," + str(j), True)
-
-
-# Recover emissions from all areas
-def getAllEmissions():
-    for i in range(cells_step):
-        for j in range(cells_step):
-            getEmissionsByArea(i, j)
-
-
-# Display emissions information
-def showEmissions():
-    for i in range(cells_step):
-        for j in range(cells_step):
-            print("Total CO2 emissions into Area " + str(i) + "," + str(j) 
-                  +" = " , str(emissionsArea[i][j]) + " mg")
-
-
-if __name__ == "__main__":
-    # Simulation launch
-    traci.start(sumoCmd)
-
-    # Variables and constants declaration
-    cells_step = 10
-    boundary = traci.simulation.getNetBoundary()
-    areas = [[0] * cells_step for _ in range(cells_step)]
-    emissionsArea = [[0] * cells_step for _ in range(cells_step)]
-    width = boundary[1][0] / cells_step  # width/step
-    height = boundary[1][1] / cells_step  # height/step 
-    CO2_threshold = 500000
-
-    step = 0
-    init_grid()
-    factory = SUMOFactory() 
-    
-    #factory.lock_area(areas[5][5])
-    
-    while traci.simulation.getMinExpectedNumber() > 0:
-        traci.simulationStep()
-        getAllEmissions()
-        step += 1
-
-    # Display emissions information and close simulation
-    showEmissions()
-    traci.close()
-sys.stdout.flush()
diff --git a/sumo_project/area.py b/sumo_project/area.py
new file mode 100644
index 0000000..7f41202
--- /dev/null
+++ b/sumo_project/area.py
@@ -0,0 +1,28 @@
+from shapely.geometry import Polygon
+from shapely.geometry import Point
+
+
+class Area:
+
+    def __init__(self, coords, name=''):
+        self.rectangle = Polygon(coords)
+        self.name = name
+        self.emissions = 0.0
+
+    def __eq__(self, other):
+        return self.rectangle.__eq__(other)
+
+    @property
+    def bounds(self):
+        return self.rectangle.bounds
+
+    def contains(self, other):
+        return self.rectangle.contains(Point(other))
+
+    @classmethod
+    def from_bounds(cls, xmin, ymin, xmax, ymax):
+        return cls((
+            (xmin, ymin),
+            (xmin, ymax),
+            (xmax, ymax),
+            (xmax, ymin)))