Merge pull request #93 from datakind/Zebreu-patch-colors

Update visualization.py

Author: Zebreu

dkroutingtool/src/py/server.py

@@ -154,8 +154,6 @@ def download(session_id: str=''):
 
 @app.get('/request_map/')
 def request_map(minlat, minlon, maxlat, maxlon):  
-    stateful_info['bounding_box'] = [minlat, minlon, maxlat, maxlon]
-
     request_template = f'''
     [out:xml]
     [bbox:{minlon},{minlat}, {maxlon}, {maxlat}];
@@ -171,6 +169,7 @@ def request_map(minlat, minlon, maxlat, maxlon):
         opened.write(r.text)
     os.environ['osm_filename'] = 'ui_map'
     temporary_build_profiles()
+    stateful_info['bounding_box'] = [minlat, minlon, maxlat, maxlon]
     return {'message': 'Done'}
 
 
@@ -220,4 +219,4 @@ def temporary_build_profiles(osmpbf=False):
 
 
 if __name__ == '__main__':
-    uvicorn.run(app, host='0.0.0.0', port=5001)
+    uvicorn.run(app, host='0.0.0.0', port=5001)

dkroutingtool/src/py/ui/dashboard.py

@@ -22,8 +22,10 @@
 
 #TODO Need to make sure you can retrieve original solution state even if manual adjustments were requested? 
 
-colors_hex = ["#FF0000", "#00FF00", "#0000FF", "#FF00FF", "#00FFFF", "#FF8000", "#800080", "#008000", "#800000", "#008080", "#808000", "#4682B4", "#A0522D", "#000000", "#191970", "#00FF80", "#FF0080", "#80FF00", "#8000FF", "#0080FF", "#E9967A", "#8B008B", "#FFBF00", "#000080", "#FFFF00"]
-color_names = ["red", "lime", "blue", "magenta", "cyan", "orange", "purple", "darkgreen", "maroon", "teal", "olive", "steelblue", "sienna", "black", "midnightblue", "springgreen", "rose", "chartreuse", "violet", "dodgerblue", "darksalmon", "darkmagenta", "amber", "navy", "yellow"]
+
+
+colors_hex = ["#FF0000","#00FF00","#0000FF","#FF00FF","#00FFFF","#FF8000","#800080","#008000","#800000","#008080","#808000","#4682B4","#A0522D","#000000","#191970","#00FF80","#FF0080","#80FF00","#8000FF","#0080FF","#E9967A","#8B008B","#FFBF00","#000080","#FFFF00","#FFFFFF","#808080","#A52A2A","#FFC0CB","#FFD700","#C0C0C0","#4B0082","#D2B48C","#87CEEB","#F0E68C"]
+color_names = ["red", "lime", "blue", "magenta", "cyan", "orange", "purple", "darkgreen", "maroon", "teal", "olive", "steelblue", "sienna", "black", "midnightblue", "springgreen", "rose", "chartreuse", "violet", "dodgerblue", "darksalmon", "darkmagenta", "amber", "navy", "yellow", "white","gray","brown","pink","gold","silver","indigo","tan","skyblue","khaki"]
 color_map = {k:v for k,v in zip(color_names,colors_hex)}
 
 st.set_page_config(page_title='Container-based Action Routing Tool (CART)', layout="wide")
@@ -744,4 +746,4 @@ def update_data():
 
 
 if __name__ == '__main__':
-    main()
+    main()

dkroutingtool/src/py/visualization.py

@@ -40,8 +40,18 @@
     "#E9967A",  # darksalmon
     "#8B008B",  # darkmagenta
     "#FFBF00",  # amber
-    "#000080",   # navy
-    "#FFFF00"  # yellow
+    "#000080",  # navy
+    "#FFFF00",  # yellow
+    "#FFFFFF",  # white
+    "#808080",  # gray
+    "#A52A2A",  # brown
+    "#FFC0CB",  # pink
+    "#FFD700",  # gold
+    "#C0C0C0",  # silver
+    "#4B0082",  # indigo
+    "#D2B48C",  # tan
+    "#87CEEB",  # skyblue
+    "#F0E68C",  # khaki
 ]
 
 color_names = [
@@ -69,7 +79,17 @@
     "darkmagenta",
     "amber",
     "navy",
-    "yellow"
+    "yellow",
+    "white",
+    "gray",
+    "brown",
+    "pink",
+    "gold",
+    "silver",
+    "indigo",
+    "tan",
+    "skyblue",
+    "khaki",
 ]
 
 def folium_map(routes, nodes, manual_editing_mode,
@@ -532,4 +552,4 @@ def create_visualizations(solution: FinalOptimizationSolution,
     )
     # Create and save a js file containing geojson
     # with route geometry
-    #create_geojson(assignment, routing, data)
+    #create_geojson(assignment, routing, data)