From 2ab91cfaebae5d2ab922a3bcdbd3d6babb96a565 Mon Sep 17 00:00:00 2001
From: Ruben1729 <ruben.e.sanchez.a@gmail.com>
Date: Tue, 5 Mar 2024 15:14:36 -0500
Subject: [PATCH] Visualizer upgrades

---
 __pycache__/matsim.cpython-39.pyc            | Bin 11174 -> 11259 bytes
 __pycache__/matsim_engine.cpython-39.pyc     | Bin 737 -> 737 bytes
 __pycache__/matsim_visualizer.cpython-39.pyc | Bin 4666 -> 7247 bytes
 main.py                                      |  10 +-
 matsim.py                                    |  21 ++--
 matsim_visualizer.py                         | 105 ++++++++++++++-----
 output_files/.gitignore                      |   2 -
 7 files changed, 95 insertions(+), 43 deletions(-)
 delete mode 100644 output_files/.gitignore

diff --git a/__pycache__/matsim.cpython-39.pyc b/__pycache__/matsim.cpython-39.pyc
index 23725b71602c03666e039e6b58501c55104454f7..0a7fc622a38c599384bf21db8558278c9b72df79 100644
GIT binary patch
delta 2401
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
Hs8jntua5)A

delta 2329
zcmZ`)O>7%Q6yDiguh(mP?KsYV>cmN!$W0ZJ{-spVHp)*GTBU&oS{WhB&1~Jc{_E_f
zKXk1K(hH@awu34`TS$aJf&&*{>473HNJxm|0+kRT#DOb^0)_V`Y0?CUv){aV@6Ej5
zef!7p509JKaM+OGuQKwL^}~VdW;?lgz5mIRM52Vsg+S4eB_b7r>5$;4g>cbKn?U>0
z5vrx5)Ss?9BvG9PE=x49D5qo8pux*hx}Jt;7}hv7X#~~=8lzEKcbTLcseDXI)nE7S
z>%{X-m*+|j|C+p8yCL5t#K))Aog~CBtNTea|6G08j^44*8iaxJH0wg8%$z>{y>Gi&
z2b=&rqwv_Byh+=>@K#lEmAr3Edg)+Qb=AC<_XEA7>T?P8wMa`kNCUT|WkMw2XvlF4
z*GK&=5}@89Ey^f6yZ`JC)O3P?A(SqXRT_0j4nn@IRy8LKa&wVT{fx>!aUu)USR}84
zxaz0=DjGAv{9rZU2J+E-9qeOq39vpcffRXhkegM*^@D4MF#X-xPeG%>X<TY@^=0BT
zyM8bbyscD&j<nR`$~5F^7|bmR*6`|T;z}1Hx0Pk38WM^jOuHMTbtsx6zz++47z$Dk
z{MaKtkyiO};Ko}djF&cui`Vy!oAyn(r_E>&a;ecM=5oOeiquMZ@KU5(6EXEVt@$>W
zxKdupx6_t4<f`eKOIv6wN*yVmfT-GNJKgezveZEn%cL3s-A*vjA<jU_Xy+ZZ8g-Ix
z)Q!-j(*>NaI|^-ERG}xkp|5&ge#YQQ{ZzLP+95?4E-a4FfIt9#MM$YE&X@EThc#q3
zBeWn}Sy5hNuvQecA+!T{zH`~ayv4Tg;Xtyh1KFJjNq`jblv!p!=$<Q8=AF!`xq@YL
zCvfRRH&a0D`Ns=Z(JDC%yOsHo6*xIRSD<sHobCB@tUO<$wimX`g*lq3lnWPg<&qbi
zEteUnWF5=)v}~nfmFP-TGH)<G;P;H(d|$A4kEc6j+hK5*r%`LROf9Ah6B#>u&dOXU
z7CdueWOVY#<jmywvCP=aSgMX0{AO@xzvs8-*{STT<@tm$hB@(Kk9^D6v!^XO57Dr8
z{!{P}-yP~0-1tVa2%H#%$36`p`D7wL)O>N-BnAnQ80l2F8=45HL?+rpO*Qy*ypjJH
z>S^2y+LTmb)>LJ96&2_JmHPPB@XuNgh}bqBHJiIJ5RotuxM$e&Co8NxYuUD^u=x_y
z(%^^9uJ|UWqHydIf5nUwxpve1TRtIby|JL1%Kbne+`DgZ5dI(NL#tHEzg~Zln)P;B
zEk6IPu8YKZG&Z^*I%Q)|iRSQ>f|c{sBGd)CB+DLa8*SzKO@}%$X3<vaf6ALcKEt-6
zRxd&dVH^J@wrimu$SJ5Ub{*S}fE@>B9m@+oH-2n#Y<y~Fa^wgb5^Na2o{wcqIg1@c
z<sAq(P1zX2#^kec;Cbfs(dp-pjLb|Pof4fCVq#3cfco(uYN+SS><rWRwff=BWx;`c
zrS@%oP=#^-OVd%(`2KJ+Ax*WtEu)0A)!f#PmFT|$+mqNnuo774vA_<ZEhCeq@WNzS
zwz%FUOy}1UO^Nk5gyY8O(W!~aL&E81X4Jk&?7@%DpB;(KUdHfdKG6AB&;*LrBSiR6
zvi^znE)x`fk(dgA6|s?}6Fs5_^uvJDOs!o=_K^cV)JgzMrQ{X=55gv;cpCVPLt#x}
z)5ngz26|U(_q*OEhq1Y)U_^<+;&~xVY3v5lqV?WH>H@<5UU&th@6_(~JS3!xf7ZK;
z4DsK4Clcr!6BBJcKoQ#k5PZbbeM96x?P}i^Wpk!5v0w7L+meToO371GsV2{#$<Xp_
zCc~b_YoA4U4`B%)9mrYbO14C^HXDJx7qw4kD^}s+0Pu^J!!9zJ5A^RlFXDV1k4+%t
z5HQmsY=&_#bWZf-V`*C}i>E&YFC0v+{W$V%oG7Xvs)IjS7n3O@s|0?Exgae_=XDcm
Gmiz}seDJ{l

diff --git a/__pycache__/matsim_engine.cpython-39.pyc b/__pycache__/matsim_engine.cpython-39.pyc
index bdf04f856796a51b20071b01c53198ba79da7e96..a7227acf94e9aa0881fc6a56ce065117e93b3b58 100644
GIT binary patch
delta 20
acmaFJ`jC}7k(ZZ?0SHc|Ki|lGjR^odY6b}a

delta 20
acmaFJ`jC}7k(ZZ?0SH3)&Tizs#smO0m<1pJ

diff --git a/__pycache__/matsim_visualizer.cpython-39.pyc b/__pycache__/matsim_visualizer.cpython-39.pyc
index e80f40ff7a3820d986892b568a86d0b6a6c9ae05..ec8867fa321b8461f844126c7737cfd52ef5abc5 100644
GIT binary patch
literal 7247
zcmb_h%a0?+dGD@nHk;4kydS&X(2AlpZDm%H9|<;t%|q+e28buJR<;vjolXy{In$ix
zW2%d@Geq+c&jMNjURX(vmH<u=1Qw8-a>>bmfRMkSPeF1p_G<fN7)E|yRg=S+Ss^}z
z1i!BO>Z|InzIPS<N~LJv^V$B-g3cEV<A10#|FO{d6a3;105`Z98BKb!$n3HvGd0d?
z+G;G<b(;AM=XMLtLe?&JOU;sMTT!`NX;xI*j;h^-=7MRwWAGezo*LXaW6c^j9~q7O
z3%t+RZJ22;kRk}ss5}_<T7TLLyS@zjJs?UvX#2xR@~|aaL_YtSG5#*FfzdR%(PVs;
zGj2UKn-;fu?x_K`9iGQC$6a2))8R#4!ZXjyyn?68*LaODVn%^4@nv9&d<E>Sr?qeS
zG7h`n4dbC7g`+?`XgPE5r#7+hHh%F>074@%JY%0ASOH`TS_(pXz~mHk6wD_UFmA#C
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

literal 4666
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

diff --git a/main.py b/main.py
index 2dfc576..2a5ae59 100644
--- a/main.py
+++ b/main.py
@@ -10,7 +10,7 @@ from matsim import Matsim
 from matsim_visualizer import MatsimVisualizer
 
 try:
-  file_path = (Path(__file__).parent / 'input_files' / 'summerschool_all_buildings.geojson')
+  file_path = (Path(__file__).parent / 'input_files' / 'mtlbld_v4.geojson')
   construction_format = 'nrcan'
   usage_format = 'nrcan'
   energy_systems_format = 'montreal_custom'
@@ -18,7 +18,7 @@ try:
   out_path = (Path(__file__).parent / 'output_files')
   city = GeometryFactory('geojson',
                          path=file_path,
-                         height_field='citygml_me',
+                         height_field='ETAGE_HORS',
                          year_of_construction_field='ANNEE_CONS',
                          function_field='CODE_UTILI',
                          function_to_hub=Dictionaries().montreal_function_to_hub_function).city
@@ -28,7 +28,11 @@ try:
   Matsim(city, 'output_files').export()
   MatSimEngine('output_files/Montreal_config.xml').run()
 
-  visualizer = MatsimVisualizer('output_files/Montreal/output_network.xml.gz', 'output_files/Montreal/output_events.xml.gz', 'output_files', (3830263.051512, 6043256.513982, 3866288.881858, 6012487.188767))
+  visualizer = MatsimVisualizer(
+    'output_files/Montreal',
+    'output_files',
+    (3854635.608067, 6040255.047194, 3855550.392442, 6039416.667303)
+  )
   visualizer.visualize()
 
 except Exception as ex:
diff --git a/matsim.py b/matsim.py
index 86aac4f..f08cced 100644
--- a/matsim.py
+++ b/matsim.py
@@ -11,7 +11,7 @@ import gzip
 import shutil
 
 import geopandas as gpd
-from shapely.geometry import Point
+from shapely.geometry import Polygon, MultiPolygon
 import hub.helpers.constants as cte
 from lxml import etree
 
@@ -19,6 +19,12 @@ CONFIG_DTD = "http://www.matsim.org/files/dtd/config_v2.dtd"
 FACILITIES_DTD = "http://www.matsim.org/files/dtd/facilities_v1.dtd"
 POPULATION_DTD = "http://www.matsim.org/files/dtd/population_v5.dtd"
 
+# EPSG 26911 reprojected
+MONTREAL_TOP = 6070286.884310
+MONTREAL_LEFT = 3829009.402623
+MONTREAL_BOTTOM = 6007714.543057
+MONTREAL_RIGHT = 3863759.595656
+
 
 class Matsim:
   def __init__(self, city, output_file_path):
@@ -57,11 +63,6 @@ class Matsim:
     facilities_xml = etree.Element('facilities', name=self._facilities['name'])
 
     for building in self._city.buildings:
-      for surface in building.grounds:
-        for coord in surface.solid_polygon.coordinates:
-          buildings_shape_data['id'].append(f"{building.name}")
-          buildings_shape_data['geometry'].append(Point(coord[0], coord[1]))
-
       facility = {
         'id': building.name,
         'x': str(building.centroid[0]),
@@ -109,11 +110,13 @@ class Matsim:
       facility['activity'].append(activity_info)
       self._facilities['facility'].append(facility)
 
+    viewport = Polygon([(MONTREAL_LEFT, MONTREAL_TOP), (MONTREAL_RIGHT, MONTREAL_TOP), (MONTREAL_RIGHT, MONTREAL_BOTTOM), (MONTREAL_LEFT, MONTREAL_BOTTOM)])
+
     gdf = gpd.GeoDataFrame(
-      buildings_shape_data,
+      geometry=[viewport],
       crs=self._city.srs_name
     )
-    gdf.to_file("input_files/buildings_shapefile.shp")
+    gdf.to_file(f"{self._output_file_path}/buildings_shapefile.shp")
 
     # Write xml content to file
     xml_content = etree.tostring(facilities_xml, pretty_print=True, encoding='UTF-8').decode('utf-8')
@@ -130,7 +133,7 @@ class Matsim:
       java_path,
       "-jar", jar_path,
       "input_files/merged-network.osm.pbf",
-      "input_files/buildings_shapefile.shp",
+      f"{self._output_file_path}/buildings_shapefile.shp",
       f"{self._output_file_path}/{self._city.name}_network.xml.gz"
     ]
     subprocess.run(command)
diff --git a/matsim_visualizer.py b/matsim_visualizer.py
index 1a77be0..501688f 100644
--- a/matsim_visualizer.py
+++ b/matsim_visualizer.py
@@ -3,14 +3,14 @@ import gzip
 from lxml import etree
 import networkx as nx
 import matplotlib.pyplot as plt
-from matplotlib.animation import FuncAnimation
-from collections import defaultdict
 import matplotlib.cm as cm
 import matplotlib.colors as colors
+from matplotlib.animation import FuncAnimation
+from collections import defaultdict
 
 
-class MatsimVisualizer():
-  def __init__(self, network_file_path, events_file_path, output_file_path, viewport):
+class MatsimVisualizer:
+  def __init__(self, input_file_path, output_file_path, viewport, show_facilities=False, show_nearby_nodes=False):
     self._nodes = {}
     self._links = []
     self._pos = None
@@ -23,19 +23,34 @@ class MatsimVisualizer():
     self._viewport = viewport
 
     self._output_file_path = output_file_path
-    self._network_file_path = network_file_path
-    self._events_file_path = events_file_path
+    self._network_file_path = f"{input_file_path}/output_network.xml.gz"
+    self._events_file_path = f"{input_file_path}/output_events.xml.gz"
+    self._facilities_file_path = f"{input_file_path}/output_facilities.xml.gz"
 
     self._G = nx.Graph()
     self._traffic_per_tick = defaultdict(lambda: defaultdict(int))
-    self._cmap = cm.viridis
+    self._close_to_facility_nodes = set()
 
     self._tick = 0
     self._max_traffic = 0
     self._max_traffic_link = None
     self._max_traffic_tick = None
 
-  def load_data(self):
+    self._show_facilities = show_facilities
+    self._show_nearby_nodes = show_nearby_nodes
+
+  def _load_data(self):
+    # ====== LOAD FACILITIES ====== #
+    if self._show_facilities:
+      with gzip.open(self._facilities_file_path, 'rb') as file:
+        facilities_doc = etree.parse(file)
+
+      for node in facilities_doc.xpath('/facilities/facility'):
+        x = float(node.get('x'))
+        y = float(node.get('y'))
+        if self._viewport[0] < x < self._viewport[2] and self._viewport[1] > y > self._viewport[3]:
+          self._nodes[f"facility_{node.get('id')}"] = (x, y)
+
     # ====== LOAD NETWORK ====== #
     with gzip.open(self._network_file_path, 'rb') as file:
       network_doc = etree.parse(file)
@@ -103,54 +118,86 @@ class MatsimVisualizer():
         if ticked:
           self._tick += 1
 
-  def create_graph(self):
+  def _create_graph(self):
     for node_id, coords in self._nodes.items():
-      self._G.add_node(node_id, pos=coords)
+      self._G.add_node(node_id, pos=coords, is_facility=node_id.startswith('facility_'))
     for link in self._links:
-      self._G.add_edge(link['from'], link['to'])
+      self._G.add_edge(link['from'], link['to'], id=link['id'])
     self._pos = nx.get_node_attributes(self._G, 'pos')
 
-  def setup_color_mapping(self):
-    self.norm = colors.Normalize(vmin=0, vmax=self._max_traffic)
+    if self._show_nearby_nodes:
+      self._identify_close_nodes(radius=100) # TODO: move to load data
 
-  def update(self, frame):
+  def _identify_close_nodes(self, radius):
+    facility_coords = {node: self._pos[node] for node in self._G.nodes if self._G.nodes[node].get('is_facility')}
+
+    for node, coords in self._pos.items():
+      if self._G.nodes[node].get('is_facility'):
+        continue
+
+      for facility_node, facility_coord in facility_coords.items():
+        if self._euclidean_distance(coords, facility_coord) <= radius:
+          self._close_to_facility_nodes.add(node)
+          break
+
+  def _setup_color_mapping(self):
+    self.norm = colors.Normalize(vmin=0, vmax=self._max_traffic/2)
+
+  def _update(self, frame):
     traffic_change = self._traffic_per_tick[self._tick]
 
-    edge_colors = []
-    edge_widths = []
+    edge_colors_dict = {}
+    edge_widths_dict = {}
 
     for link in self._links:
       for link_id, change in traffic_change.items():
         if link_id == link['id']:
           link['vehicles'] += change
 
-      edge_colors.append(self._cmap(link['vehicles']))
-      edge_widths.append(1 + self.norm(link['vehicles']) * 10)
+      edge_colors_dict[link['id']] = self._cmap(self.norm(link['vehicles']))
+      edge_widths_dict[link['id']] = 1 + self.norm(link['vehicles'])
+
+    edgelist = [(link['from'], link['to']) for link in self._links]
+    edge_colors = [edge_colors_dict[link["id"]] for link in self._links]
+    edge_widths = [edge_widths_dict[link["id"]] for link in self._links]
 
     plt.cla()
-    nx.draw(self._G, self._pos, node_size=0, node_color='blue', width=edge_widths, edge_color=edge_colors,
-            with_labels=False,
-            edge_cmap=self._cmap)
 
+    # Draw Facilities
+    if self._show_facilities:
+      facility_nodes = {node: pos for node, pos in self._pos.items() if self._G.nodes[node]['is_facility']}
+      nx.draw_networkx_nodes(self._G, facility_nodes, facility_nodes.keys(), node_size=1, node_color='red')
+
+    # Draw Network
+    if self._show_nearby_nodes:
+      close_nodes = {node: self._pos[node] for node in self._close_to_facility_nodes if node in self._pos}
+      nx.draw_networkx_nodes(self._G, self._pos, close_nodes.keys(), node_size=1, node_color='blue')
+    nx.draw_networkx_edges(self._G, self._pos, edgelist=edgelist, width=edge_widths, edge_color=edge_colors, edge_cmap=self._cmap)
     plt.title(f"Time: {self._tick}")
     self._tick += 1
 
-  def visualize(self):
-    self.load_data()
-    self.create_graph()
-    self.setup_color_mapping()
+  def visualize(self, fps=15, colormap='inferno'):
+    self._load_data()
+    self._create_graph()
+    self._setup_color_mapping()
 
     fig, ax = plt.subplots()
-
     ax.set_aspect((self._max_x - self._min_x) / (self._max_y - self._min_y))
 
+    if hasattr(cm, colormap):
+      self._cmap = getattr(cm, colormap)
+    else:
+      print(f"Colormap '{colormap}' not recognized. Falling back to 'inferno'. Please select from: 'inferno', 'plasma', 'magma', 'spring', 'summer', 'autumn', or 'winter'.")
+      self._cmap = cm.inferno
+
     sm = plt.cm.ScalarMappable(cmap=self._cmap, norm=self.norm)
     sm.set_array([])
     plt.colorbar(sm, ax=ax, label='Traffic Density')
 
     self._tick = 0
-    ani = FuncAnimation(fig, self.update, frames=len(self._traffic_per_tick), repeat=False)
-    ani.save(f"{self._output_file_path}/traffic_animation.gif", writer='ffmpeg', fps=5)
+    ani = FuncAnimation(fig, self._update, frames=len(self._traffic_per_tick), repeat=False)
+    ani.save(f"{self._output_file_path}/traffic_animation.gif", writer='ffmpeg', fps=fps)
     plt.show()
 
-    print(f"Largest amount of vehicles ({self._max_traffic}) seen at {self._max_traffic_tick} on link {self._max_traffic_link}")
+  def _euclidean_distance(self, coord1, coord2):
+    return ((coord1[0] - coord2[0]) ** 2 + (coord1[1] - coord2[1]) ** 2) ** 0.5
diff --git a/output_files/.gitignore b/output_files/.gitignore
deleted file mode 100644
index c96a04f..0000000
--- a/output_files/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-*
-!.gitignore
\ No newline at end of file