Update app.py

app.py

@@ -28,7 +28,7 @@ import matplotlib.pyplot as plt
 
 from gradio_folium import Folium
 from geographiclib.geodesic import Geodesic
-from folium import Map, Element, LatLngPopup, Marker, Icon, PolyLine, FeatureGroup
+from folium import Map, Element, LatLngPopup, Marker, PolyLine, FeatureGroup
 from folium.map import LayerControl
 from folium.plugins import BeautifyIcon
 from huggingface_hub import CommitScheduler
@@ -308,9 +308,7 @@ class Engine(object):
 
             icon_star = BeautifyIcon(
                 icon='star',
-                inner_icon_style='color:red;font-size:30px;',
-                background_color='transparent',
-                border_color='transparent',
+                border_color='red',
             )
             feature_group = FeatureGroup(name='Ground Truth')
             Marker(
@@ -323,7 +321,6 @@ class Engine(object):
             icon_square = BeautifyIcon(
                 icon_shape='rectangle-dot', 
                 border_color='green', 
-                border_width=10,
             )
             feature_group_best = FeatureGroup(name='Best Model')
             Marker(
@@ -337,7 +334,6 @@ class Engine(object):
             icon_circle = BeautifyIcon(
                 icon_shape='circle-dot', 
                 border_color='blue', 
-                border_width=10,
             )
             feature_group_user = FeatureGroup(name='User')
             Marker(
@@ -397,7 +393,14 @@ class Engine(object):
         self.stats['country'].append(int(self.admins[self.index][3] != 'nan' and country == self.admins[self.index][3]))
 
         df = pd.DataFrame([self.get_model_average(who) for who in ['user', 'best', 'base']], columns=['who', 'GeoScore', 'Distance', 'Accuracy (country)']).round(2)
-        result_text = (f"### GeoScore: {score:.0f}, distance: {distance:.0f} km")
+        result_text = (
+            f"### GeoScore: <span style='color:green'>%s</span>/<span style='color:red'>%s</span>, distance: <span style='color:green'>%s</span>/<span style='color:red'>%s</span> km" % (
+                score,
+                self.df['score'].iloc[self.index+1],
+                distance,
+                self.df['distance'].iloc[self.index+1]
+            )
+        )
 
         self.cache(self.index+1, score, distance, (click_lat, click_lon), time_elapsed)
         return self.get_figure(), result_text, df
@@ -407,8 +410,8 @@ class Engine(object):
         self.index += 1
         return self.load_image()
 
-    def get_model_average(self, which, all=False):
-        aux, i = [], self.index+1
+    def get_model_average(self, which, all=False, final=False):
+        aux, i = [], self.index+int(not final)
         if which == 'user':
             avg_score = sum(self.stats['scores']) / len(self.stats['scores']) if self.stats['scores'] else 0
             avg_distance = sum(self.stats['distances']) / len(self.stats['distances']) if self.stats['distances'] else 0
@@ -418,18 +421,21 @@ class Engine(object):
                 avg_area_accuracy = (0 if self.df['area_val'].iloc[:i].sum() == 0 else sum(self.stats['area'])/self.df['area_val'].iloc[:i].sum())*100
                 avg_region_accuracy = (0 if self.df['region_val'].iloc[:i].sum() == 0 else sum(self.stats['region'])/self.df['region_val'].iloc[:i].sum())*100
                 aux = [avg_city_accuracy, avg_area_accuracy, avg_region_accuracy]
+            which = 'You'
         elif which == 'base':
             avg_score = np.mean(self.df[['score_base']].iloc[:i])
             avg_distance = np.mean(self.df[['distance_base']].iloc[:i])
             avg_country_accuracy = self.df['accuracy_country_base'].iloc[i]
             if all:
                 aux = [self.df['accuracy_city_base'].iloc[i], self.df['accuracy_area_base'].iloc[i], self.df['accuracy_region_base'].iloc[i]]
+            which = 'Worst-AI'
         elif which == 'best':
             avg_score = np.mean(self.df[['score']].iloc[:i])
             avg_distance = np.mean(self.df[['distance']].iloc[:i])
             avg_country_accuracy = self.df['accuracy_country'].iloc[i]
             if all:
                 aux = [self.df['accuracy_city_base'].iloc[i], self.df['accuracy_area_base'].iloc[i], self.df['accuracy_region_base'].iloc[i]]
+            which = 'Best-AI'
         return [which, avg_score, avg_distance, avg_country_accuracy] + aux
 
     def update_average_display(self):
@@ -446,7 +452,7 @@ class Engine(object):
         self.stats['area'] = [(int(self.admins[self.index][1] != 'nan' and click['admin2'] == self.admins[self.index][1])) for click in clicks]
         self.stats['region'] = [(int(self.admins[self.index][2] != 'nan' and click['admin1'] == self.admins[self.index][2])) for click in clicks]
         
-        df = pd.DataFrame([self.get_model_average(who, True) for who in ['user', 'best', 'base']], columns=['who', 'GeoScore', 'Distance', 'Accuracy (country)', 'Accuracy (city)', 'Accuracy (area)', 'Accuracy (region)'])
+        df = pd.DataFrame([self.get_model_average(who, True, True) for who in ['user', 'best', 'base']], columns=['who', 'GeoScore', 'Distance', 'Accuracy (country)', 'Accuracy (city)', 'Accuracy (area)', 'Accuracy (region)'])
         return df
         
     # Function to save the game state
@@ -477,7 +483,8 @@ if __name__ == "__main__":
         kargs = {}
         if not MPL:
             kargs = {'value': empty_map()}
-        return gr.update(visible=False, **kargs), gr.update(value=image, visible=True), gr.update(value=text, visible=True), gr.update(value=df, visible=True)
+        return gr.update(visible=False, **kargs), gr.update(value=image, visible=True), gr.update(value=text, visible=True), gr.update(value=df, visible=True), gr.update(visible=False), gr.update(visible=True),
+
 
     def exit_(state):
         if state['engine'].index > 0:
@@ -496,7 +503,7 @@ if __name__ == "__main__":
                 kargs = {}
                 if not MPL:
                     kargs = {'value': empty_map()}
-                return gr.update(value=make_map_(), visible=True), gr.update(visible=False, **kargs), gr.update(value=image), gr.update(value=text), gr.update(visible=False), gr.update(), gr.update(visible=False), gr.update(value="-1"), gr.update(), gr.update(), gr.update()
+                return gr.update(value=make_map_(), visible=True), gr.update(visible=False, **kargs), gr.update(value=image), gr.update(value=text, visible=True), gr.update(visible=False), gr.update(visible=False), gr.update(visible=False), gr.update(value="-1"), gr.update(), gr.update(), gr.update(visible=True)
         else:
             return gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
 
@@ -513,7 +520,7 @@ if __name__ == "__main__":
             gr.update(value=image, visible=True),
             gr.update(value=text, visible=True),
             gr.update(visible=True),
-            gr.update(visible=True),
+            gr.update(visible=False),
             gr.update(value="<h1>OSV-5M (plonk)</h1>"),
             gr.update(visible=False),
             gr.update(visible=False),
@@ -547,7 +554,7 @@ if __name__ == "__main__":
     
         coords = gr.Textbox(value="-1", label="Latitude, Longitude", visible=False, elem_id='coords-tbox')
         start_button.click(start, inputs=[state], outputs=[map_, results, image_, text_count, text, next_button, rules, state, start_button, coords, select_button])
-        select_button.click(click, inputs=[state, coords], outputs=[map_, results, text, perf], js=map_js())
+        select_button.click(click, inputs=[state, coords], outputs=[map_, results, text, perf, select_button, next_button], js=map_js())
         next_button.click(next_, inputs=[state], outputs=[map_, results, image_, text_count, text, next_button, perf, coords, rules, text_end, select_button])
         exit_button.click(exit_, inputs=[state], outputs=[map_, results, image_, text_count, text, next_button, perf, coords, rules, text_end, select_button])