Update app.py

app.py

@@ -1,12 +1,16 @@
 import streamlit as st
 import ee
+import folium
 import pandas as pd
+import numpy as np
+from streamlit_folium import folium_static
 from datetime import date, timedelta
 import json
-import geemap
+import geemap.foliumap as geemap
 from fpdf import FPDF
 import io
-import matplotlib.pyplot as plt
+import base64
+from PIL import Image
 import plotly.graph_objects as go
 from plotly.subplots import make_subplots
 import plotly.express as px
@@ -42,6 +46,7 @@ key_json = {
   "client_x509_cert_url": "https://www.googleapis.com/robot/v1/metadata/x509/dehkhodamap-e9f0da4ce9f6514021%40ee-esmaeilkiani13877.iam.gserviceaccount.com",
   "universe_domain": "googleapis.com"
 }
+
 # تبدیل دیکشنری به رشته JSON
 key_json_str = json.dumps(key_json)
 
@@ -75,26 +80,17 @@ def get_safe_index_value(_image, index_type, band_selection, _farm_geometry, ima
         return None
     try:
         if index_type == "MSAVI":
-            nir_band = _image.select("B8")
-            red_band = _image.select("B4")
-            if nir_band is None or red_band is None:
-                return None
             index_image = _image.expression(
                 "(2 * NIR + 1 - sqrt((2 * NIR + 1) ** 2 - 8 * (NIR - RED))) / 2",
-                {"NIR": nir_band, "RED": red_band}
+                {"NIR": _image.select("B8"), "RED": _image.select("B4")}
             ).rename("MSAVI")
         else:
             bands = band_selection[index_type]
-            band_exists = True
-            for band in bands:
-                if not _image.select(band).getInfo():
-                    band_exists = False
-                    break
-            if band_exists:
+            if all(band in _image.bandNames().getInfo() for band in bands):
                 index_image = _image.normalizedDifference(bands).rename(index_type)
             else:
                 return None
-                
+        
         mean_value = index_image.reduceRegion(
             reducer=ee.Reducer.mean(),
             geometry=_farm_geometry,
@@ -162,8 +158,14 @@ def create_heatmap(df, index_type):
     fig = px.imshow(pivot_df, 
                     labels=dict(x="تاریخ", y="نام مزرعه", color=index_type),
                     x=pivot_df.columns,
-                    y=pivot_df.index)
-    fig.update_layout(title=f"نقشه حرارتی {index_type}")
+                    y=pivot_df.index,
+                    color_continuous_scale="RdYlGn")
+    fig.update_layout(
+        title=f"نقشه حرارتی {index_type}",
+        font=dict(family="Vazir"),
+        height=600,
+        margin=dict(l=50, r=50, t=50, b=50)
+    )
     return fig
 
 def create_comparison_chart(df, farm1, farm2, index_type):
@@ -172,12 +174,18 @@ def create_comparison_chart(df, farm1, farm2, index_type):
     df_farm2 = df[df['name'] == farm2]
 
     fig = go.Figure()
-    fig.add_trace(go.Scatter(x=df_farm1['date'], y=df_farm1[index_type], name=farm1))
-    fig.add_trace(go.Scatter(x=df_farm2['date'], y=df_farm2[index_type], name=farm2))
-
-    fig.update_layout(title=f"مقایسه {index_type} بین {farm1} و {farm2}",
-                      xaxis_title="تاریخ",
-                      yaxis_title=index_type)
+    fig.add_trace(go.Scatter(x=df_farm1['date'], y=df_farm1[index_type], name=farm1, mode='lines+markers'))
+    fig.add_trace(go.Scatter(x=df_farm2['date'], y=df_farm2[index_type], name=farm2, mode='lines+markers'))
+
+    fig.update_layout(
+        title=f"مقایسه {index_type} بین {farm1} و {farm2}",
+        xaxis_title="تاریخ",
+        yaxis_title=index_type,
+        font=dict(family="Vazir"),
+        legend_title="مزرعه",
+        height=500,
+        margin=dict(l=50, r=50, t=50, b=50)
+    )
     return fig
 
 def generate_pdf_report(farm_info, index_values, lai_values, date_list):
@@ -386,11 +394,11 @@ def main():
 
                 # نمایش نمودارها
                 st.subheader("روند تغییرات شاخص‌ها در 10 روز اخیر")
-                fig = make_subplots(rows=len(band_selection), cols=1, shared_xaxes=True)
+                fig = make_subplots(rows=len(band_selection), cols=1, shared_xaxes=True, vertical_spacing=0.05)
                 for i, (index, values) in enumerate(index_values.items(), start=1):
-                    fig.add_trace(go.Scatter(x=date_list, y=values, name=index), row=i, col=1)
+                    fig.add_trace(go.Scatter(x=date_list, y=values, name=index, mode='lines+markers'), row=i, col=1)
                     fig.update_yaxes(title_text=index, row=i, col=1)
-                fig.update_layout(height=600, width=800, title_text="روند تغییرات شاخص‌ها")
+                fig.update_layout(height=200*len(band_selection), width=800, title_text="روند تغییرات شاخص‌ها", showlegend=False)
                 st.plotly_chart(fig)
 
                 # نمایش نقشه NDVI
@@ -445,4 +453,5 @@ def main():
             st.error(f"خطا در پردازش اطلاعات: {str(e)}")
 
 if __name__ == "__main__":
-    main()
+    main()
+