feat: functional automatic geolocalisation

app/geolocalisation/js_geolocation.py

@@ -37,20 +37,18 @@ js_geocode = """
 
 def display_location(location_json, individual):
     geo_dict = json.loads(location_json)
-    print(geo_dict)
-    # latitude = geo_dict["latitude"]
-    # longitude = geo_dict["longitude"]
-    # geolocalisation = create_geolocalisation_object(latitude, longitude, "NA")
-    # individual = save_geolocalisation_to_json(geolocalisation, individual)
-    # locationtext = gr.Textbox(
-    #     f"Latitude: {latitude} | Longitude: {longitude}",
-    #     visible=True, 
-    #     show_label=False,
-    #     interactive=False) 
-    # print("Done displaying location")
-    location_data = gr.JSON(value=geo_dict, label="Identified GPS Location", visible=True)
-    #return locationtext, individual
-    return location_data, individual
-
-# def display_location(location_json):
-#     return location_json
+    if "latitude" in geo_dict.keys():
+        latitude = geo_dict["latitude"]
+        longitude = geo_dict["longitude"]
+        geolocalisation = create_geolocalisation_object(latitude, longitude, "NA")
+        individual = save_geolocalisation_to_json(geolocalisation, individual)
+        geo_text = f"Latitude: {latitude} | Longitude: {longitude}"
+    else: 
+        error = geo_dict["error"]
+        geo_text = f"Error occured ({error}). Give your browser permission to use your geolocalisation or change browsers."
+    locationtext = gr.Textbox(
+        geo_text,
+        visible=True, 
+        show_label=False,
+        interactive=False) 
+    return locationtext, individual

app/mode_simple.py

@@ -110,8 +110,7 @@ with gr.Blocks(theme='shivi/calm_seafoam') as simple:
                     btn_gpslocation.click(None, [], [], js=js_geocode)
                     hidden_input.change(display_location, 
                                           inputs=[hidden_input, individual], 
-                                          #outputs=[locationtext, individual])
-                                           outputs=[location_data, individual])
+                                          outputs=[locationtext, individual])
             
     # ---------------------------------------------------------
     # Dead and Wounded Buttons

app/validation_submission/utils_individual.py

@@ -15,6 +15,6 @@ def add_data_to_individual(key, value, individual):
     return individual
 
 def reset_individual(individual):
-    individual = gr.State({})
+    individual = {}
     return individual