Update app.py

app.py

@@ -393,13 +393,14 @@ class Engine(object):
 
         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: <span style='color:blue'>%s</span>/<span style='color:green'>%s</span>, Distance: <span style='color:blue'>%s</span>/<span style='color:green'>%s</span> km" % (
+            f"### GeoScore: <span style='color:blue'><emph>You</emph>GeoScore: %s, Distance: %s km</span> <span style='color:green'>GeoScore: %s, Distance: %s km</span>" % (
                 round(score, 2),
-                round(self.df['score'].iloc[self.index+1], 2),
                 round(distance, 2),
+                round(self.df['score'].iloc[self.index+1], 2),
                 round(self.df['distance'].iloc[self.index+1], 2)
             )
         )
+        # You: }   \green{OSV-Bot:  GeoScore: XX, distance: XX
 
         self.cache(self.index+1, score, distance, (click_lat, click_lon), time_elapsed)
         return self.get_figure(), result_text, df
@@ -427,14 +428,14 @@ class Engine(object):
             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'
+            which = 'Baseline-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'
+            which = 'Plonk-AI'
         return [which, avg_score, avg_distance, avg_country_accuracy] + aux
 
     def update_average_display(self):
@@ -474,7 +475,7 @@ if __name__ == "__main__":
     import gradio as gr
     def click(state, coords):
         if coords == '-1' or state['clicked']:
-            return gr.update(), gr.update(), gr.update(), gr.update()
+            return gr.update(), gr.update(), gr.update(), gr.update(), gr.update(), gr.update()
         lat, lon, country = coords.split(',')
         state['clicked'] = True
         image, text, df = state['engine'].click(float(lon), float(lat), country)
@@ -502,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, 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)
+                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(value='', visible=True), 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()