From ef82d0a963647e36d2304f80375c47167f18c79b Mon Sep 17 00:00:00 2001
From: RevantBabu <revantbabu.m@gmail.com>
Date: Fri, 17 Jan 2025 23:07:54 +0000
Subject: [PATCH 1/2] fix carbon intensity geo map

---
 app.py                          | 4 +++-
 {data => assets}/world.geo.json | 0
 2 files changed, 3 insertions(+), 1 deletion(-)
 rename {data => assets}/world.geo.json (100%)

diff --git a/app.py b/app.py
index 9e34efb..c84d4d5 100644
--- a/app.py
+++ b/app.py
@@ -33,6 +33,7 @@
 
 data_dir = os.path.join(os.path.abspath(''),'data')
 image_dir = os.path.join('assets/images')
+assets_dir = os.path.join('assets')
 static_image_route = '/static/'
 
 # We download each csv and store it in a pd.DataFrame
@@ -338,8 +339,9 @@ def convertList_hex2rgba(hex_list):
 
 mapCI = go.Figure(
     data=go.Choropleth(
-        geojson=os.path.join(data_dir, 'world.geo.json'),
+        geojson=os.path.join(assets_dir, 'world.geo.json'),
         locations = map_df.ISO3,
+        featureidkey="properties.ISO_A3",
         locationmode='geojson-id',
         z=map_df.carbonIntensity.astype(float),
         colorscale=myColors['map1'],
diff --git a/data/world.geo.json b/assets/world.geo.json
similarity index 100%
rename from data/world.geo.json
rename to assets/world.geo.json

From 4401a67f9d3ab3d94e1f2e92ded8a2bd55d7028d Mon Sep 17 00:00:00 2001
From: RevantBabu <revantbabu.m@gmail.com>
Date: Sat, 18 Jan 2025 11:12:17 +0000
Subject: [PATCH 2/2] refactor: add data path URI

---
 app.py                          | 11 +++++++----
 {assets => data}/world.geo.json |  0
 2 files changed, 7 insertions(+), 4 deletions(-)
 rename {assets => data}/world.geo.json (100%)

diff --git a/app.py b/app.py
index c84d4d5..2226e93 100644
--- a/app.py
+++ b/app.py
@@ -339,7 +339,7 @@ def convertList_hex2rgba(hex_list):
 
 mapCI = go.Figure(
     data=go.Choropleth(
-        geojson=os.path.join(assets_dir, 'world.geo.json'),
+        geojson='data/world-geo-json',
         locations = map_df.ISO3,
         featureidkey="properties.ISO_A3",
         locationmode='geojson-id',
@@ -2250,10 +2250,13 @@ def fillin_report_text(aggData, data):
 # Loader IO
 @app.server.route('/loaderio-1360e50f4009cc7a15a00c7087429524/')
 def download_loader():
-    return send_file('assets/loaderio-1360e50f4009cc7a15a00c7087429524.txt',
-                     mimetype='text/plain',
-                     attachment_filename='loaderio-1360e50f4009cc7a15a00c7087429524.txt',
+    return send_file(os.path.join(assets_dir, 'loaderio-1360e50f4009cc7a15a00c7087429524.txt'),
                      as_attachment=True)
+# world.geo.json
+@app.server.route('/data/world-geo-json')
+def download_world_geo_json():
+    return send_file(os.path.join(data_dir, 'world.geo.json'))
+
 
 if __name__ == '__main__':
     # allows app to update when code is changed!
diff --git a/assets/world.geo.json b/data/world.geo.json
similarity index 100%
rename from assets/world.geo.json
rename to data/world.geo.json