Fixed Task - 1347

- Fixed [Task-1347](https://dev.azure.com/TDEI-UW/TDEI/_workitems/edit/1347/).
- Fixed package to removing the additional keys from the geojson files.
- Introduced garbage collection to free up memory.

Author: sujata-m

CHANGELOG.md

@@ -1,3 +1,9 @@
+### 0.0.2
+- Fixed [Task-1347](https://dev.azure.com/TDEI-UW/TDEI/_workitems/edit/1347/).
+- Fixed package to removing the additional keys from the geojson files. 
+- Introduced garbage collection to free up memory.
+
+
 ### 0.0.1
 - Introduces osw_inclination package which calculates the inclination of the sidewalk based on the DEM data.
 - Added example.py file which demonstrates how to use the package.

src/osw_incline/__init__.py

@@ -1,3 +1,4 @@
+import gc
 import time
 from typing import List
 from pathlib import Path
@@ -36,13 +37,17 @@ def calculate(self):
             )
             end_time = time.time()
             time_taken = end_time - start_time
+            del osm_graph
+            del dem_processor
             if self.debug:
                 Logger.info(f'Entire processing took: {time_taken} seconds')
             return True
         except Exception as e:
             if self.debug:
                 Logger.error(f'Error processing DEM files: {e}')
             raise Exception(f'Error processing DEM files: {e}')
+        finally:
+            gc.collect()
 
 
 

src/osw_incline/dem_processor.py

@@ -1,3 +1,4 @@
+import gc
 import math
 import pyproj
 import rasterio
@@ -39,6 +40,7 @@ def process(self, nodes_path, edges_path):
                             if self.debug:
                                 Logger.info(f'No geometry found for edge {u}-{v}')
 
+                dem.close()
                 self.OG.to_geojson(nodes_path, edges_path)
             except rasterio.errors.RasterioIOError:
                 if self.debug:
@@ -48,6 +50,11 @@ def process(self, nodes_path, edges_path):
                 if self.debug:
                     Logger.error(f'Error processing DEM file: {dem_file_path}, error: {e}')
                 raise Exception(f'Error processing DEM file: {dem_file_path}, error: {e}')
+            finally:
+                gc.collect()
+
+        del self.OG
+        gc.collect()
 
     def infer_incline(self, linestring, dem, precision=3):
         first_point = linestring.coords[0]

src/osw_incline/osm_graph.py

@@ -1,3 +1,4 @@
+import gc
 import json
 import pyproj
 import networkx as nx
@@ -36,11 +37,24 @@ def from_geojson(cls, nodes_path, edges_path):
             props['geometry'] = shape(edge_feature['geometry'])
             G.add_edge(u, v, **props)
 
+        del nodes_fc
+        del edges_fc
+        gc.collect()
+
         return osm_graph
 
     def to_geojson(self, *args):
         nodes_path = args[0]
         edges_path = args[1]
+
+        # Load the original files to retain the original top-level keys
+        with open(nodes_path) as f:
+            original_nodes_fc = json.load(f)
+
+        with open(edges_path) as f:
+            original_edges_fc = json.load(f)
+
+        # Process the edges
         edge_features = []
         for u, v, d in self.G.edges(data=True):
             d_copy = {**d}
@@ -58,8 +72,11 @@ def to_geojson(self, *args):
                 'geometry': geometry,
                 'properties': d_copy
             })
-        edges_fc = {'type': 'FeatureCollection', 'features': edge_features}
 
+        # Update the original edges feature collection
+        original_edges_fc['features'] = edge_features
+
+        # Process the nodes
         node_features = []
         for n, d in self.G.nodes(data=True):
             d_copy = {**d}
@@ -82,14 +99,18 @@ def to_geojson(self, *args):
                     'geometry': geometry,
                     'properties': d_copy
                 })
-        nodes_fc = {'type': 'FeatureCollection', 'features': node_features}
 
+        # Update the original nodes feature collection
+        original_nodes_fc['features'] = node_features
+
+        # Write the updated nodes and edges to the files
         with open(edges_path, 'w') as f:
-            json.dump(edges_fc, f)
+            json.dump(original_edges_fc, f)
 
         with open(nodes_path, 'w') as f:
-            json.dump(nodes_fc, f)
+            json.dump(original_nodes_fc, f)
 
+        # Handle points if the third argument (points_path) is provided
         if len(args) == 3:
             points_path = args[2]
             point_features = []
@@ -116,7 +137,10 @@ def to_geojson(self, *args):
                         'geometry': geometry,
                         'properties': d_copy
                     })
-            points_fc = {'type': 'FeatureCollection', 'features': point_features}
 
             with open(points_path, 'w') as f:
-                json.dump(points_fc, f)
+                json.dump({'type': 'FeatureCollection', 'features': point_features}, f)
+
+        del original_nodes_fc
+        del original_edges_fc
+        gc.collect()

src/osw_incline/version.py

@@ -1 +1 @@
-__version__ = '0.0.1'
+__version__ = '0.0.2'

tests/test_dem_processor.py

@@ -401,7 +401,6 @@ def test_interpolated_value_return_scaled(self, mock_rasterio_open):
 
         # Assert that the result is not None and that it is scaled properly
         self.assertIsNotNone(result, 'IDW interpolation should return a valid value')
-        print(f"IDW Interpolated Value (scaled): {result}")
 
         # You can adjust the expected result based on the IDW logic; here, just check that it's non-zero
         self.assertGreater(result, 0, 'The interpolated result should be greater than 0')