fixed map

biomap/streamlit_app.py

@@ -77,20 +77,16 @@ def app(model):
     if st.session_state["infered"]:
             st.plotly_chart(st.session_state["previous_fig"], use_container_width=True)
 
-    m = folium.Map(location=[DEFAULT_LATITUDE, DEFAULT_LONGITUDE], zoom_start=DEFAULT_ZOOM)
-    m.add_child(folium.LatLngPopup())
-    tabs1, tabs2 = st.tabs(["TimeLapse", "Single Image"])
-    with tabs1:
-        
-        
-        submit = st.button("Predict TimeLapse", use_container_width=True, type="primary")
-        st.session_state["submit"] = submit
-        
-        col_1, col_2 = st.columns([0.5,0.5])
-        with col_1:
-            
-            f_map = st_folium(m, key="tab1", width=FOLIUM_WIDTH, height=FOLIUM_HEIGHT)
+    
+    
+    
         
+    col_1, col_2 = st.columns([0.5, 0.5])
+    with col_1:
+        m = folium.Map(location=[DEFAULT_LATITUDE, DEFAULT_LONGITUDE], zoom_start=DEFAULT_ZOOM)
+        m.add_child(folium.LatLngPopup())
+        f_map = st_folium(m, width=FOLIUM_WIDTH, height=FOLIUM_HEIGHT)
+    
         selected_latitude = DEFAULT_LATITUDE
         selected_longitude = DEFAULT_LONGITUDE
 
@@ -98,53 +94,44 @@ def app(model):
             selected_latitude = f_map["last_clicked"]["lat"]
             selected_longitude = f_map["last_clicked"]["lng"]
 
-        with col_2:
-                col_tab1_1, col_tab1_2 = st.columns(2)
-                with col_tab1_1:
-                    lat = st.text_input("latitude", value=selected_latitude)
-                    st.session_state["lat"] = lat
-                with col_tab1_2:
-                    long = st.text_input("longitude", value=selected_longitude)
-                    st.session_state["long"] = long
-
-                col_tab1_11, col_tab1_22 = st.columns(2)
-                years = list(range(MIN_YEAR, MAX_YEAR, 1))
-                with col_tab1_11:
-                    start_date = st.selectbox("Start date", years)
-                    st.session_state["start_date"] = start_date
-
-                end_years = [year for year in years if year > start_date]
-                with col_tab1_22:
-                    end_date = st.selectbox("End date", end_years) 
-                    st.session_state["end_date"] = end_date
-            
-                segment_interval = st.radio("Interval of time between two segmentation", options=['month','2months', 'year'],horizontal=True)
-                st.session_state["segment_interval"] = segment_interval
-
-    with tabs2:
-        submit2 = st.button("Predict Single Image", use_container_width=True, type="primary")
-        st.session_state["submit2"] = submit2
-
-        col_1_tab_2, col_2_tab_2 = st.columns([0.5,0.5])
-        with col_1_tab_2:
-            m_tab_2 = folium.Map(location=[DEFAULT_LATITUDE, DEFAULT_LONGITUDE], zoom_start=DEFAULT_ZOOM)
-            m_tab_2.add_child(folium.LatLngPopup())
-            f_map_tab_2 = st_folium(m, key="tab2", width=FOLIUM_WIDTH, height=FOLIUM_HEIGHT)
+    with col_2:
+        tabs1, tabs2 = st.tabs(["TimeLapse", "Single Image"])
+        with tabs1:
+            submit = st.button("Predict TimeLapse", use_container_width=True, type="primary")
+            st.session_state["submit"] = submit
+
+            col_tab1_1, col_tab1_2 = st.columns(2)
+            with col_tab1_1:
+                lat = st.text_input("latitude", value=selected_latitude)
+                st.session_state["lat"] = lat
+            with col_tab1_2:
+                long = st.text_input("longitude", value=selected_longitude)
+                st.session_state["long"] = long
+
+            col_tab1_11, col_tab1_22 = st.columns(2)
+            years = list(range(MIN_YEAR, MAX_YEAR, 1))
+            with col_tab1_11:
+                start_date = st.selectbox("Start date", years)
+                st.session_state["start_date"] = start_date
+
+            end_years = [year for year in years if year > start_date]
+            with col_tab1_22:
+                end_date = st.selectbox("End date", end_years) 
+                st.session_state["end_date"] = end_date
         
-        selected_latitude_2 = DEFAULT_LATITUDE
-        selected_longitude_2 = DEFAULT_LONGITUDE
+            segment_interval = st.radio("Interval of time between two segmentation", options=['month','2months', 'year'],horizontal=True)
+            st.session_state["segment_interval"] = segment_interval
 
-        if f_map_tab_2.get("last_clicked"):
-            selected_latitude_2 = f_map_tab_2["last_clicked"]["lat"]
-            selected_longitude_2 = f_map_tab_2["last_clicked"]["lng"]
-
-        with col_2_tab_2:
+        with tabs2:
+            submit2 = st.button("Predict Single Image", use_container_width=True, type="primary")
+            st.session_state["submit2"] = submit2
+    
             col_tab2_1, col_tab2_2 = st.columns(2)
             with col_tab2_1:
-                lat_2 = st.text_input("lat.", value=selected_latitude_2)
+                lat_2 = st.text_input("lat.", value=selected_latitude)
                 st.session_state["lat_2"] = lat_2
             with col_tab2_2:
-                long_2 = st.text_input("long.", value=selected_longitude_2)
+                long_2 = st.text_input("long.", value=selected_longitude)
                 st.session_state["long_2"] = long_2
 
             date_2 = st.text_input("date", "2021-01-01", placeholder="2021-01-01")