Update app.py

app.py

@@ -5,30 +5,16 @@ import zipfile
 import tempfile
 import os
 from streamlit_folium import st_folium
+from shapely.geometry import LineString
+
+st.set_page_config(page_title="GIS Viewer", layout="wide")
+
+st.title("🗺️ GIS Viewer with Connected Points")
+
+st.markdown("Upload a GeoJSON, KMZ, or zipped Shapefile. This app will connect every 2 consecutive points with a solid line.")
+
+uploaded_file = st.file_uploader("Upload GeoJSON, KMZ or zipped Shapefile", type=["geojson", "zip", "kmz"])
 
-# Set Google Maps API Key (Replace with your actual API Key)
-google_maps_api_key = "YOUR_GOOGLE_MAPS_API_KEY"  # Replace with your own Google Maps API Key
-
-st.set_page_config(page_title="🌍 GIS Data Viewer", layout="wide", page_icon="🗺️")
-
-# ---------- Title & Intro ----------
-st.markdown("""
-    <div style='text-align: center'>
-        <h1 style="color:#1f77b4;">🗺️ GIS Data Viewer</h1>
-        <p style="font-size:18px;">Upload and explore your geospatial data (GeoJSON, Shapefile ZIP, or KMZ) on an interactive map with **Google Maps**.</p>
-    </div>
-""", unsafe_allow_html=True)
-
-# ---------- Sidebar ----------
-with st.sidebar:
-    st.header("📂 Upload & Options")
-    uploaded_file = st.file_uploader("Choose a GeoJSON, KMZ, or zipped Shapefile", type=["geojson", "zip", "kmz"])
-    show_coordinates = st.checkbox("Show Coordinates", value=True)
-    show_table = st.checkbox("Show Attribute Table", value=True)
-    st.markdown("---")
-    st.markdown("✅ Supported formats:\n- `.geojson`\n- `.shp` in `.zip`\n- `.kmz`\n\n📍 Automatically reprojects to **WGS84 (EPSG:4326)**.")
-
-# ---------- Load File Function ----------
 def load_geodata(file):
     ext = file.name.lower()
     with tempfile.TemporaryDirectory() as tmpdir:
@@ -50,106 +36,63 @@ def load_geodata(file):
                 gdf = gpd.read_file(os.path.join(tmpdir, kml_files[0]))
         else:
             raise Exception("Unsupported file format.")
-
-        # Ensure CRS is WGS84
         if gdf.crs and gdf.crs.to_epsg() != 4326:
             gdf = gdf.to_crs(epsg=4326)
         return gdf
 
-# ---------- Show Map Function ----------
-def show_map(gdf, show_coords):
-    if gdf is not None and not gdf.empty:
+def create_lines_from_points(points_gdf):
+    lines = []
+    for i in range(0, len(points_gdf) - 1, 2):
+        p1 = points_gdf.iloc[i].geometry
+        p2 = points_gdf.iloc[i+1].geometry
+        if p1.geom_type == "Point" and p2.geom_type == "Point":
+            line = LineString([p1, p2])
+            lines.append({"geometry": line})
+    return gpd.GeoDataFrame(lines, geometry="geometry", crs="EPSG:4326")
+
+if uploaded_file:
+    try:
+        with st.spinner("Processing file..."):
+            gdf = load_geodata(uploaded_file)
+
+        st.success("File loaded successfully!")
+
+        # Filter only points
+        point_gdf = gdf[gdf.geometry.type == "Point"].reset_index(drop=True)
+        line_gdf = create_lines_from_points(point_gdf)
+
+        # Map setup
         center = gdf.geometry.unary_union.centroid
-        m = folium.Map(location=[center.y, center.x], zoom_start=10, tiles=None)
-
-        # Add Google Maps TileLayer
-        google_maps_url = f'https://{google_maps_api_key}.googleusercontent.com/maps/vt/lyrs=m&x={{x}}&y={{y}}&z={{z}}'
-        folium.TileLayer(tiles=google_maps_url, attr="Google Maps", name="Google Maps").add_to(m)
-
-        def style_func(feature):
-            return {"fillColor": "#4287f5", "color": "#003366", "weight": 2, "fillOpacity": 0.6}
-
-        folium.GeoJson(data=gdf, style_function=style_func, name="GeoData").add_to(m)
-
-        if show_coords:
-            for idx, row in gdf.iterrows():
-                if row.geometry.geom_type == 'Point':
-                    coords = row.geometry.coords[0]
-                    folium.Marker(
-                        location=[coords[1], coords[0]],
-                        popup=f"Point {idx+1} - Coordinates: ({coords[1]}, {coords[0]})",
-                        icon=folium.Icon(color='blue', icon='info-sign')
-                    ).add_to(m)
-                else:
-                    centroid = row.geometry.centroid
-                    folium.Marker(
-                        location=[centroid.y, centroid.x],
-                        popup=f"Feature {idx+1} - Coordinates: ({centroid.y}, {centroid.x})",
-                        icon=folium.Icon(color='green', icon='ok-sign')
-                    ).add_to(m)
-        
-        # Add Layer Control
+        m = folium.Map(location=[center.y, center.x], zoom_start=10)
+
+        folium.GeoJson(gdf, name="Features",
+                       tooltip=folium.GeoJsonTooltip(fields=gdf.columns[:3].tolist())).add_to(m)
+
+        # Add lines between points
+        folium.GeoJson(line_gdf, name="Lines Between Points",
+                       style_function=lambda x: {"color": "red", "weight": 3}).add_to(m)
+
+        # Add point markers
+        for idx, row in point_gdf.iterrows():
+            coords = row.geometry.coords[0]
+            folium.Marker(
+                location=[coords[1], coords[0]],
+                popup=f"Point {idx+1} - ({coords[1]}, {coords[0]})",
+                icon=folium.Icon(color="blue", icon="info-sign")
+            ).add_to(m)
+
         folium.LayerControl().add_to(m)
 
-        return m
-    else:
-        return folium.Map(location=[30.0, 70.0], zoom_start=3)
+        st.subheader("🌍 Map Viewer")
+        st_folium(m, width=1100, height=600)
 
-# ---------- Main Viewer ----------
-try:
-    if uploaded_file:
-        with st.spinner("Processing your file..."):
-            gdf = load_geodata(uploaded_file)
-        st.success("✅ File successfully loaded.")
-
-        # File Metadata
-        st.subheader("📄 File Information")
-        st.markdown(f"""
-        - **Geometry Type**: {gdf.geom_type.iloc[0] if not gdf.empty else 'N/A'}  
-        - **CRS**: {gdf.crs}  
-        - **Number of Features**: {len(gdf)}  
-        - **Columns**: {", ".join(gdf.columns)}
-        """)
-
-        # Show Map
-        st.subheader("🗺️ Map Viewer")
-        map_view = show_map(gdf, show_coordinates)
-        st_data = st_folium(map_view, width=1100, height=600)
-
-        # Show Coordinates in Table
-        if show_coordinates:
-            st.subheader("📍 Coordinates Table")
-            coords_list = []
-
-            # Extract coordinates from geometries
-            for idx, row in gdf.iterrows():
-                if row.geometry.geom_type == 'Point':
-                    coords = row.geometry.coords[0]
-                    coords_list.append({
-                        "Feature ID": idx + 1,
-                        "Geometry Type": row.geometry.geom_type,
-                        "Coordinates": f"({coords[1]}, {coords[0]})"
-                    })
-                else:
-                    centroid = row.geometry.centroid
-                    coords_list.append({
-                        "Feature ID": idx + 1,
-                        "Geometry Type": row.geometry.geom_type,
-                        "Coordinates": f"({centroid.y}, {centroid.x})"
-                    })
-
-            # Display coordinates as table
-            st.dataframe(coords_list)
-
-        # Show Attribute Table
-        if show_table:
-            st.subheader("📋 Attribute Table")
-            st.dataframe(gdf)
-
-    else:
-        st.info("Please upload a GeoJSON, zipped Shapefile, or KMZ to begin.")
-        map_view = show_map(None, False)
-        st_folium(map_view, width=1100, height=500)
-
-except Exception as e:
-    st.error(f"❌ Error: {e}")
+        st.subheader("📍 Points Table")
+        st.dataframe(point_gdf)
+
+        st.subheader("📋 Full Attribute Table")
+        st.dataframe(gdf)
+
+    except Exception as e:
+        st.error(f"Error: {e}")
+else:
+    st.info("Please upload a geospatial file to get started.")