diff --git a/PANDUAN_FITUR.md b/PANDUAN_FITUR.md
new file mode 100644
index 0000000..ff1229e
--- /dev/null
+++ b/PANDUAN_FITUR.md
@@ -0,0 +1,385 @@
+# 📍 PANDUAN FITUR GIS PONTIANAK
+
+## Setup Awal
+
+### 1. Inisialisasi Database
+
+```bash
+# Buka di browser:
+http://localhost/web-gis/create_tables.php
+```
+
+**Respons berhasil:**
+
+```json
+{
+  "status": "success",
+  "message": "Tabel berhasil dibuat atau sudah ada"
+}
+```
+
+Ini akan membuat 3 tabel baru:
+
+- `rumah_ibadah` - Lokasi tempat ibadah
+- `penduduk_miskin` - Lokasi keluarga kurang mampu
+- `jalan_rusak` - Laporan jalan rusak
+
+---
+
+## Fitur 1: RUMAH IBADAH (Tempat Ibadah)
+
+### Cara Menggunakan:
+
+**Step 1:** Buka GIS Interface
+
+```
+http://localhost/web-gis/index.html
+```
+
+**Step 2:** Klik tombol "Rumah Ibadah" di toolbar
+
+- Ikon: 🏛️ (bangunan dengan tanda plus)
+- Di toolbar utama sebelah atas map
+
+**Step 3:** Klik di mana saja di peta
+
+- Status akan berubah: "Klik Peta untuk menambah lokasi..."
+- Modal dialog akan muncul
+
+**Step 4:** Isi form:
+
+```
+┌─────────────────────────────────────┐
+│ INPUT RUMAH IBADAH                  │
+├─────────────────────────────────────┤
+│ Nama            : [Masjid Al-Nur]   │
+│ Alamat          : [Auto-fill]       │  ← Otomatis dari koordinat
+│ PIC (Nama)      : [Pengurus]        │
+│ Radius Pencarian: [1000] meter      │  ← Geser slider
+│ Koordinat       : -0.1234, 109.3456 │
+│                                     │
+│ [SIMPAN]  [BATAL]                  │
+└─────────────────────────────────────┘
+```
+
+**Field Penjelasan:**
+
+- **Nama:** Nama tempat ibadah (Masjid/Gereja/dll)
+- **Alamat:** Otomatis terisi pakai Nominatim (Reverse Geocoding)
+  - Tunggu pesan "Mencari alamat..." hingga selesai
+- **PIC:** Nama Pengurus/Koordinator
+- **Radius:** Jarak pencarian untuk keluarga miskin sekitar (default 1000m)
+
+**Step 5:** Klik "SIMPAN"
+
+- Marker teal + lingkaran akan muncul di peta
+- Data tersimpan di database
+
+### Interaksi Lanjutan:
+
+**Edit:**
+
+1. Klik marker di peta
+2. Popup muncul → Klik "Edit"
+3. Modal akan terbuka dengan data lama
+4. Ubah dan klik "Simpan"
+
+**Hapus:**
+
+1. Klik marker
+2. Popup → Klik "Hapus"
+3. Konfirmasi → Data terhapus
+
+**Cari:**
+
+- Gunakan Registry Drawer (kanan peta)
+- Filter: Input Type = "Rumah Ibadah"
+- Cari nama atau ketik untuk filter
+
+---
+
+## Fitur 2: PENDUDUK MISKIN (Keluarga Kurang Mampu)
+
+### Cara Menggunakan:
+
+**Step 1:** Klik tombol "Penduduk Miskin" di toolbar
+
+- Ikon: 👤 (orang dengan tanda plus)
+
+**Step 2:** Klik di peta untuk lokasi keluarga miskin
+
+**Step 3:** Isi form:
+
+```
+┌─────────────────────────────────────────────┐
+│ INPUT PENDUDUK MISKIN                       │
+├─────────────────────────────────────────────┤
+│ Nama Ketua KK       : [Nama Kepala Keluarga]│
+│ Jumlah Anggota      : [5]                   │
+│ Rumah Ibadah Terdekat: [OTOMATIS]           │
+│   Nama              : Masjid Al-Nur         │  ← Sistem mencari
+│   Jarak             : 234 meter             │     otomatis
+│ Koordinat           : -0.1234, 109.3456     │
+│                                             │
+│ [SIMPAN]  [BATAL]                          │
+└─────────────────────────────────────────────┘
+```
+
+**Field Penjelasan:**
+
+- **Nama Ketua KK:** Nama kepala keluarga yang bertanggung jawab
+- **Jumlah Anggota:** Total orang dalam keluarga termasuk ketua
+- **Rumah Ibadah Terdekat:** Sistem otomatis menemukan tempat ibadah terdekat
+  - Nama dan jarak ditampilkan (berdasarkan radius yang Anda set di rumah ibadah)
+  - TIDAK perlu isi manual
+
+**Step 4:** Klik "SIMPAN"
+
+- Marker merah akan muncul
+- Data tersimpan beserta referensi rumah ibadah terdekat
+
+### Fitur Khusus: Pencarian Miskin Sekitar Rumah Ibadah
+
+**Gunakan tombol di popup Rumah Ibadah:**
+
+1. Klik marker Rumah Ibadah di peta
+2. Di popup klik: **"Cari Miskin"**
+3. Semua keluarga miskin dalam radius akan ter-zoom
+4. Map akan fit ke cluster keluarga miskin
+
+---
+
+## Fitur 3: CHOROPLETH KECAMATAN (Peta Populasi)
+
+### Cara Menggunakan:
+
+**Step 1:** Klik tombol "Choropleth" di toolbar
+
+- Ikon: 🗺️ (peta)
+
+**Step 2:** Peta akan berubah
+
+- Menampilkan 6 kecamatan Pontianak
+- Warna berbeda sesuai populasi
+
+**Gradasi Warna:**
+
+```
+🔴 Merah Tua      = Populasi > 120,000 jiwa
+🟥 Merah Terang   = Populasi > 100,000 jiwa
+🟨 Merah Muda     = Populasi > 80,000 jiwa
+🟧 Merah Pucat    = Populasi ≤ 80,000 jiwa
+```
+
+**Step 3:** Klik salah satu kecamatan
+
+- Panel di kanan bawah muncul:
+
+```
+┌──────────────────────────────────┐
+│ Choropleth Kecamatan Pontianak   │
+├──────────────────────────────────┤
+│ PONTIANAK BARAT                  │
+│ 148,800 jiwa                     │
+│                                  │
+│ Kepadatan: 2,500 jiwa/km²        │
+└──────────────────────────────────┘
+```
+
+**Data Populasi (BPS 2025):**
+
+| #   | Kecamatan          | Populasi | Warna |
+| --- | ------------------ | -------- | ----- |
+| 1   | Pontianak Barat    | 148,800  | 🔴    |
+| 2   | Pontianak Selatan  | 133,600  | 🔴    |
+| 3   | Pontianak Utara    | 129,200  | 🔴    |
+| 4   | Pontianak Timur    | 121,500  | 🔴    |
+| 5   | Pontianak Kota     | 98,500   | 🟥    |
+| 6   | Pontianak Tenggara | 52,900   | 🟧    |
+
+**Fitur Interaksi:**
+
+- **Hover:** Kecamatan akan highlight
+- **Klik:** Info populasi muncul di panel
+- **Keluar Mode:** Klik tombol lain atau click tombol Choropleth lagi
+
+---
+
+## Layer Control (Kontrol Visibilitas)
+
+### Tombol Layer (atas kiri map):
+
+Klik ikon **☰** untuk membuka layer control.
+
+```
+✓ Choropleth Kecamatan
+✓ Rumah Ibadah
+✓ Penduduk Miskin
+✓ Jalan Rusak
+✓ Lokasi SPBU
+  ... (layer lainnya)
+```
+
+**Toggle on/off:**
+
+- Centang untuk tampilkan layer
+- Uncheck untuk sembunyikan
+
+**Catatan:** Saat aktif mode Choropleth, layer lain otomatis disembunyikan untuk fokus pada peta kecamatan.
+
+---
+
+## Registry / Pencarian
+
+### Buka Registry Drawer:
+
+Klik tombol **📋** di toolbar atau panel kanan.
+
+### Cara Mencari:
+
+**1. Filter by Type (Dropdown atas):**
+
+```
+Input Type:
+  ▼ Semua
+  □ Point
+  □ Polyline
+  □ Polygon
+  □ Rumah Ibadah     ← Pilih ini
+  □ Penduduk Miskin  ← atau ini
+  □ Jalan Rusak
+```
+
+**2. Filter by Registry (Dropdown bawah):**
+
+```
+Registry Type:
+  ▼ Semua
+  □ Jalan Nasional
+  □ Parkir
+  □ Rumah Ibadah
+  □ Penduduk Miskin
+```
+
+**3. Cari (Kolom input):**
+
+```
+Cari nama: [Masjid] 🔍
+
+Hasil:
+┌─────────────────────────────┐
+│ ✓ Masjid Al-Nur             │
+│   Rumah Ibadah              │
+│   -0.1234, 109.3456         │
+├─────────────────────────────┤
+│ ✓ Masjid Besar Pontianak    │
+│   Rumah Ibadah              │
+│   -0.1245, 109.3467         │
+└─────────────────────────────┘
+```
+
+**Klik hasil → Map akan:**
+
+- Zoom ke lokasi
+- Buka popup
+- Highlight marker
+
+---
+
+## Troubleshooting
+
+### ❌ Tombol tidak muncul
+
+**Solusi:**
+
+- Refresh browser (Ctrl+F5)
+- Clear cache
+- Cek console (F12) untuk error
+
+### ❌ Alamat tidak terisi (Reverse Geocode gagal)
+
+**Penyebab:** Tidak ada koneksi internet atau Nominatim API timeout
+**Solusi:**
+
+- Pastikan internet terhubung
+- Coba refresh modal
+- Manual isi alamat
+
+### ❌ Rumah Ibadah tidak ditemukan saat input miskin
+
+**Penyebab:** Belum ada data rumah ibadah, atau lokasi terlalu jauh
+**Solusi:**
+
+- Tambahkan rumah ibadah terlebih dahulu di mode Rumah Ibadah
+- Pastikan radius rumah ibadah cukup besar
+
+### ❌ Choropleth tidak tampil
+
+**Penyebab:** File GeoJSON tidak ditemukan
+**Solusi:**
+
+- Cek file ada di: `data/pontianak-kecamatan.geojson`
+- Cek console untuk error message
+
+### ❌ Database error
+
+**Solusi:**
+
+- Jalankan ulang `create_tables.php`
+- Cek koneksi database di `db_config.php`
+
+---
+
+## Tips & Trik
+
+### 💡 Shortcut
+
+- **Double-click** marker untuk langsung edit
+- **Scroll zoom** di map untuk zoom in/out
+- **Drag** untuk geser peta
+- **Ctrl+A** di search untuk select all results
+
+### 📊 Export Data
+
+Semua data tersimpan di database MySQL. Untuk export:
+
+```sql
+SELECT * FROM rumah_ibadah;
+SELECT * FROM penduduk_miskin;
+```
+
+### 🎨 Customize Warna
+
+Edit di `index.html` function:
+
+- `getPopulationFill()` - Ubah warna choropleth
+- `createRumahIbadahIcon()` - Ubah marker rumah ibadah
+- `createPendudukMiskinIcon()` - Ubah marker miskin
+
+---
+
+## File Penting
+
+```
+web-gis/
+├── index.html              ← Main GIS Interface
+├── create_tables.php       ← Init database
+├── db_config.php           ← Database config
+│
+├── api/
+│ ├── save_rumah_ibadah.php
+│ ├── get_rumah_ibadah.php
+│ ├── delete_rumah_ibadah.php
+│ ├── save_penduduk_miskin.php
+│ ├── get_penduduk_miskin.php
+│ └── delete_penduduk_miskin.php
+│
+└── data/
+  ├── pontianak-kecamatan.geojson  ← Choropleth data
+  └── Export_Output_2.json          ← Road network data
+```
+
+---
+
+**Versi:** 2025-04-20  
+**Status:** Production Ready ✅
diff --git a/create_tables.php b/create_tables.php
index 6d44224..c6851e0 100644
--- a/create_tables.php
+++ b/create_tables.php
@@ -1,8 +1,9 @@
 <?php
-// Script untuk membuat tabel jalan_rusak jika belum ada
+// Script untuk membuat tabel utama jika belum ada
 include 'db_config.php';
 
-$sql = "CREATE TABLE IF NOT EXISTS jalan_rusak (
+$statements = [
+    "CREATE TABLE IF NOT EXISTS jalan_rusak (
     id INT AUTO_INCREMENT PRIMARY KEY,
     latitude DECIMAL(10, 8) NOT NULL,
     longitude DECIMAL(11, 8) NOT NULL,
@@ -12,13 +13,51 @@ $sql = "CREATE TABLE IF NOT EXISTS jalan_rusak (
     gambar VARCHAR(255),
     created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
     INDEX idx_coords (latitude, longitude)
-)";
+)",
+    "CREATE TABLE IF NOT EXISTS rumah_ibadah (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    nama VARCHAR(255) NOT NULL,
+    alamat TEXT NOT NULL,
+    pic VARCHAR(255) NOT NULL,
+    latitude DECIMAL(10, 8) NOT NULL,
+    longitude DECIMAL(11, 8) NOT NULL,
+    radius_m INT NOT NULL DEFAULT 1000,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_rumah_ibadah_coords (latitude, longitude)
+)",
+    "CREATE TABLE IF NOT EXISTS penduduk_miskin (
+    id INT AUTO_INCREMENT PRIMARY KEY,
+    nama_ketua_kk VARCHAR(255) NOT NULL,
+    jumlah_anggota INT NOT NULL,
+    latitude DECIMAL(10, 8) NOT NULL,
+    longitude DECIMAL(11, 8) NOT NULL,
+    rumah_ibadah_id INT DEFAULT NULL,
+    rumah_ibadah_nama VARCHAR(255) DEFAULT NULL,
+    jarak_ke_rumah_ibadah_m DECIMAL(10, 2) DEFAULT NULL,
+    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
+    INDEX idx_penduduk_coords (latitude, longitude),
+    INDEX idx_penduduk_rumah_ibadah (rumah_ibadah_id)
+)"
+];
 
-if ($conn->query($sql) === TRUE) {
-    echo json_encode(['status' => 'success', 'message' => 'Tabel jalan_rusak berhasil dibuat atau sudah ada']);
-} else {
-    echo json_encode(['status' => 'error', 'message' => $conn->error]);
+foreach ($statements as $sql) {
+    if ($conn->query($sql) !== TRUE) {
+        echo json_encode(['status' => 'error', 'message' => $conn->error]);
+        $conn->close();
+        exit;
+    }
 }
 
+$alterStatements = [
+    "ALTER TABLE penduduk_miskin ADD COLUMN bantuan_status VARCHAR(20) NOT NULL DEFAULT 'belum' AFTER jarak_ke_rumah_ibadah_m",
+    "ALTER TABLE penduduk_miskin ADD COLUMN bantuan_catatan TEXT DEFAULT NULL AFTER bantuan_status",
+    "ALTER TABLE penduduk_miskin ADD COLUMN bantuan_updated_at TIMESTAMP NULL DEFAULT NULL AFTER bantuan_catatan"
+];
+
+foreach ($alterStatements as $alterSql) {
+    $conn->query($alterSql);
+}
+
+echo json_encode(['status' => 'success', 'message' => 'Tabel berhasil dibuat atau sudah ada']);
 $conn->close();
 ?>
diff --git a/delete_penduduk_miskin.php b/delete_penduduk_miskin.php
new file mode 100644
index 0000000..cdd0b98
--- /dev/null
+++ b/delete_penduduk_miskin.php
@@ -0,0 +1,26 @@
+<?php
+header('Content-Type: application/json');
+include 'db_config.php';
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $id = (int)($_POST['id'] ?? 0);
+
+    if ($id <= 0) {
+        echo json_encode(['status' => 'error', 'message' => 'ID tidak valid']);
+        $conn->close();
+        exit;
+    }
+
+    $stmt = $conn->prepare("DELETE FROM penduduk_miskin WHERE id = ?");
+    $stmt->bind_param("i", $id);
+
+    if ($stmt->execute()) {
+        echo json_encode(['status' => 'success', 'message' => 'Data penduduk miskin dihapus']);
+    } else {
+        echo json_encode(['status' => 'error', 'message' => $stmt->error]);
+    }
+
+    $stmt->close();
+}
+$conn->close();
+?>
\ No newline at end of file
diff --git a/delete_rumah_ibadah.php b/delete_rumah_ibadah.php
new file mode 100644
index 0000000..81a5a6d
--- /dev/null
+++ b/delete_rumah_ibadah.php
@@ -0,0 +1,26 @@
+<?php
+header('Content-Type: application/json');
+include 'db_config.php';
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $id = (int)($_POST['id'] ?? 0);
+
+    if ($id <= 0) {
+        echo json_encode(['status' => 'error', 'message' => 'ID tidak valid']);
+        $conn->close();
+        exit;
+    }
+
+    $stmt = $conn->prepare("DELETE FROM rumah_ibadah WHERE id = ?");
+    $stmt->bind_param("i", $id);
+
+    if ($stmt->execute()) {
+        echo json_encode(['status' => 'success', 'message' => 'Rumah ibadah dihapus']);
+    } else {
+        echo json_encode(['status' => 'error', 'message' => $stmt->error]);
+    }
+
+    $stmt->close();
+}
+$conn->close();
+?>
\ No newline at end of file
diff --git a/get_penduduk_miskin.php b/get_penduduk_miskin.php
new file mode 100644
index 0000000..0342fca
--- /dev/null
+++ b/get_penduduk_miskin.php
@@ -0,0 +1,34 @@
+<?php
+header('Content-Type: application/json');
+include 'db_config.php';
+
+$sql = "SELECT id, nama_ketua_kk, jumlah_anggota, latitude, longitude, rumah_ibadah_id, rumah_ibadah_nama, jarak_ke_rumah_ibadah_m, bantuan_status, bantuan_catatan, bantuan_updated_at, created_at 
+        FROM penduduk_miskin 
+        ORDER BY created_at DESC";
+
+$result = $conn->query($sql);
+$data = [];
+
+if (!$result) {
+    http_response_code(500);
+    echo json_encode(['status' => 'error', 'message' => 'Query gagal: ' . $conn->error]);
+    $conn->close();
+    exit;
+}
+
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        $row['latitude'] = (float)$row['latitude'];
+        $row['longitude'] = (float)$row['longitude'];
+        $row['jumlah_anggota'] = (int)$row['jumlah_anggota'];
+        $row['rumah_ibadah_id'] = $row['rumah_ibadah_id'] !== null ? (int)$row['rumah_ibadah_id'] : null;
+        $row['jarak_ke_rumah_ibadah_m'] = $row['jarak_ke_rumah_ibadah_m'] !== null ? (float)$row['jarak_ke_rumah_ibadah_m'] : null;
+        $row['bantuan_status'] = $row['bantuan_status'] ?: 'belum';
+        $row['bantuan_catatan'] = $row['bantuan_catatan'] ?? '';
+        $data[] = $row;
+    }
+}
+
+echo json_encode($data);
+$conn->close();
+?>
\ No newline at end of file
diff --git a/get_rumah_ibadah.php b/get_rumah_ibadah.php
new file mode 100644
index 0000000..7f016d8
--- /dev/null
+++ b/get_rumah_ibadah.php
@@ -0,0 +1,30 @@
+<?php
+header('Content-Type: application/json');
+include 'db_config.php';
+
+$sql = "SELECT id, nama, alamat, pic, latitude, longitude, radius_m, created_at 
+        FROM rumah_ibadah 
+        ORDER BY created_at DESC";
+
+$result = $conn->query($sql);
+$data = [];
+
+if (!$result) {
+    http_response_code(500);
+    echo json_encode(['status' => 'error', 'message' => 'Query gagal: ' . $conn->error]);
+    $conn->close();
+    exit;
+}
+
+if ($result->num_rows > 0) {
+    while ($row = $result->fetch_assoc()) {
+        $row['latitude'] = (float)$row['latitude'];
+        $row['longitude'] = (float)$row['longitude'];
+        $row['radius_m'] = (int)$row['radius_m'];
+        $data[] = $row;
+    }
+}
+
+echo json_encode($data);
+$conn->close();
+?>
\ No newline at end of file
diff --git a/index.html b/index.html
index e926a03..3885645 100644
--- a/index.html
+++ b/index.html
@@ -31,6 +31,68 @@
         .leaflet-popup-content-wrapper { border-radius: 12px; padding: 0; overflow: hidden; }
         .leaflet-popup-content { margin: 0; width: 280px !important; }
         .leaflet-draw-toolbar a { background-color: white; }
+        .leaflet-control-layers {
+            max-height: calc(100vh - 8rem);
+            overflow-y: auto;
+            width: 190px;
+            font-size: 12px;
+        }
+        .leaflet-control-layers-toggle {
+            width: 30px !important;
+            height: 30px !important;
+            background-size: 18px 18px !important;
+        }
+        .leaflet-control-layers-overlays label,
+        .leaflet-control-layers-list label {
+            margin-bottom: 0.15rem;
+            line-height: 1.2;
+        }
+        .leaflet-control-layers input {
+            margin-top: 0.15rem;
+        }
+        .leaflet-draw-toolbar a {
+            width: 32px !important;
+            height: 32px !important;
+            line-height: 32px !important;
+            background-size: 18px 18px !important;
+            background-repeat: no-repeat !important;
+            background-position: center center !important;
+        }
+        .leaflet-draw-toolbar .leaflet-draw-draw-marker {
+            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%230f172a' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='9' r='2.5'/%3E%3Cpath d='M12 2C8.13 2 5 5.13 5 9c0 5 7 13 7 13s7-8 7-13c0-3.87-3.13-7-7-7Z'/%3E%3C/svg>") !important;
+        }
+        .leaflet-draw-toolbar .leaflet-draw-draw-polyline {
+            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%230f172a' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M4 18l6-6 4 4 6-8'/%3E%3C/svg>") !important;
+        }
+        .leaflet-draw-toolbar .leaflet-draw-draw-polygon {
+            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%230f172a' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M12 2l8 5v10l-8 5-8-5V7z'/%3E%3C/svg>") !important;
+        }
+        .leaflet-draw-toolbar .leaflet-draw-draw-rectangle {
+            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%230f172a' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Crect x='5' y='5' width='14' height='14' rx='1'/%3E%3C/svg>") !important;
+        }
+        .leaflet-draw-toolbar .leaflet-draw-draw-circle {
+            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%230f172a' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Ccircle cx='12' cy='12' r='7'/%3E%3C/svg>") !important;
+        }
+        .leaflet-draw-toolbar .leaflet-draw-edit-edit {
+            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%230f172a' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M12 20h9'/%3E%3Cpath d='M16.5 3.5a2.12 2.12 0 0 1 3 3L7 19l-4 1 1-4Z'/%3E%3C/svg>") !important;
+        }
+        .leaflet-draw-toolbar .leaflet-draw-edit-remove {
+            background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 24 24' fill='none' stroke='%230f172a' stroke-width='2' stroke-linecap='round' stroke-linejoin='round'%3E%3Cpath d='M3 6h18'/%3E%3Cpath d='M8 6V4h8v2'/%3E%3Cpath d='M6 6l1 14h10l1-14'/%3E%3Cpath d='M10 11v6'/%3E%3Cpath d='M14 11v6'/%3E%3C/svg>") !important;
+        }
+        .leaflet-draw-toolbar .leaflet-draw-draw-polygon,
+        .leaflet-draw-toolbar .leaflet-draw-draw-polyline,
+        .leaflet-draw-toolbar .leaflet-draw-edit-edit,
+        .leaflet-draw-toolbar .leaflet-draw-edit-remove {
+            margin-bottom: 0;
+        }
+        .leaflet-draw-section {
+            margin-bottom: 2px;
+        }
+        .leaflet-top.leaflet-left .leaflet-control-layers,
+        .leaflet-top.leaflet-left .leaflet-bar,
+        .leaflet-top.leaflet-left .leaflet-draw {
+            margin-top: 0.35rem;
+        }
 
         /* CSS Tambahan agar ikon SVG tidak terpotong atau memiliki background */
         .custom-marker { background: transparent !important; border: none !important; }
@@ -44,7 +106,11 @@
         .registry-item:hover { transform: translateY(-1px); box-shadow: 0 12px 28px rgba(15, 23, 42, 0.1); }
         .registry-chip { display: inline-flex; align-items: center; gap: .35rem; border-radius: 9999px; padding: .25rem .6rem; font-size: .7rem; font-weight: 800; letter-spacing: .08em; text-transform: uppercase; }
         #registryDrawer { transition: transform .24s ease, opacity .24s ease; }
-        #registryDrawer.hidden-drawer { transform: translateX(-12px); opacity: 0; pointer-events: none; }
+        #registryDrawer.hidden-drawer { transform: translateX(18px); opacity: 0; pointer-events: none; }
+        #bantuanDrawer { transition: transform .24s ease, opacity .24s ease; }
+        #bantuanDrawer.hidden-drawer { transform: translateX(18px); opacity: 0; pointer-events: none; }
+        #layerDrawer { transition: transform .24s ease, opacity .24s ease; }
+        #layerDrawer.hidden-drawer { transform: translateX(-18px); opacity: 0; pointer-events: none; }
     </style>
 </head>
 <body class="bg-slate-50 text-slate-800 font-sans">
@@ -80,6 +146,12 @@
                     <button class="icon-btn" id="modePolygonBtn" title="Tambah polygon parsil">
                         <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 2l8 5v10l-8 5-8-5V7z"/></svg>
                     </button>
+                    <button class="icon-btn" id="modeRumahIbadahBtn" title="Input rumah ibadah">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 3 4 8v13h16V8z"/><path d="M9 21v-7h6v7"/><path d="M12 7v6"/><path d="M9 10h6"/></svg>
+                    </button>
+                    <button class="icon-btn" id="modePendudukMiskinBtn" title="Input penduduk miskin">
+                        <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 12a4 4 0 1 0-4-4 4 4 0 0 0 4 4z"/><path d="M4 21a8 8 0 0 1 16 0"/><path d="M18 8h4"/><path d="M20 6v4"/></svg>
+                    </button>
                     <button class="icon-btn" id="modeRoadDamageBtn" title="Lapor jalan rusak">
                         <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M6 12h12M12 6v12M2 12h20M12 2v20"/><circle cx="12" cy="12" r="10"/></svg>
                     </button>
@@ -131,6 +203,9 @@
                             <option value="point">Poin</option>
                             <option value="polyline">Polyline</option>
                             <option value="polygon">Polygon</option>
+                            <option value="rumahIbadah">Rumah Ibadah</option>
+                            <option value="pendudukMiskin">Penduduk Miskin</option>
+                            <option value="roadDamage">Jalan Rusak</option>
                         </select>
                     </div>
                     <div class="grid grid-cols-2 gap-2">
@@ -160,7 +235,7 @@
             
         </div>
 
-        <div id="minimalToolbar" class="hidden absolute right-6 top-[calc(1rem+env(safe-area-inset-top))] z-[2100] flex items-center gap-2 rounded-2xl border border-slate-200 bg-white/90 p-2 shadow-xl backdrop-blur-md">
+        <div id="minimalToolbar" class="hidden absolute left-6 top-[calc(1rem+env(safe-area-inset-top))] z-[2100] flex items-center gap-2 rounded-2xl border border-slate-200 bg-white/90 p-2 shadow-xl backdrop-blur-md">
             <button class="icon-btn" id="miniModePointBtn" title="Tambah point SPBU">
                 <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 2C8.13 2 5 5.13 5 9c0 5 7 13 7 13s7-8 7-13c0-3.87-3.13-7-7-7z"/><circle cx="12" cy="9" r="2.5"/></svg>
             </button>
@@ -170,12 +245,21 @@
             <button class="icon-btn" id="miniModePolygonBtn" title="Tambah polygon parsil">
                 <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 2l8 5v10l-8 5-8-5V7z"/></svg>
             </button>
+            <button class="icon-btn" id="miniModeRumahIbadahBtn" title="Input rumah ibadah">
+                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 3 4 8v13h16V8z"/><path d="M9 21v-7h6v7"/><path d="M12 7v6"/><path d="M9 10h6"/></svg>
+            </button>
+            <button class="icon-btn" id="miniModePendudukMiskinBtn" title="Input penduduk miskin">
+                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 12a4 4 0 1 0-4-4 4 4 0 0 0 4 4z"/><path d="M4 21a8 8 0 0 1 16 0"/><path d="M18 8h4"/><path d="M20 6v4"/></svg>
+            </button>
             <button class="icon-btn" id="toggleRegistryDrawerBtn" title="Buka registry & filter">
                 <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><line x1="4" y1="6" x2="20" y2="6"/><line x1="7" y1="12" x2="17" y2="12"/><line x1="10" y1="18" x2="14" y2="18"/></svg>
             </button>
+            <button class="icon-btn" id="toggleBantuanDrawerBtn" title="Manajemen bantuan penduduk miskin">
+                <svg xmlns="http://www.w3.org/2000/svg" width="18" height="18" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M12 21c4.97 0 9-2.24 9-5V8l-9-5-9 5v8c0 2.76 4.03 5 9 5Z"/><path d="M12 12v9"/><path d="M7 10.5 12 13l5-2.5"/></svg>
+            </button>
         </div>
 
-        <div id="registryDrawer" class="hidden-drawer absolute right-6 top-[calc(1rem+env(safe-area-inset-top)+4.2rem)] z-[2100] w-[360px] max-w-[calc(100vw-3rem)] rounded-2xl border border-slate-200 bg-white/95 p-3 shadow-2xl backdrop-blur-md">
+        <div id="registryDrawer" class="hidden-drawer fixed right-4 top-[calc(1rem+env(safe-area-inset-top))] z-[2100] h-[calc(100vh-2rem-env(safe-area-inset-top))] w-[460px] max-w-[calc(100vw-1rem)] rounded-l-2xl border border-slate-200 bg-white/95 p-3 shadow-2xl backdrop-blur-md overflow-y-auto">
             <div class="flex items-start justify-between gap-3">
                 <div>
                     <h2 class="text-sm font-black tracking-tight text-slate-800">Registry</h2>
@@ -203,6 +287,8 @@
                         <option value="point">Poin</option>
                         <option value="polyline">Polyline</option>
                         <option value="polygon">Polygon</option>
+                        <option value="rumahIbadah">Rumah Ibadah</option>
+                        <option value="pendudukMiskin">Penduduk Miskin</option>
                         <option value="roadDamage">Jalan Rusak</option>
                     </select>
                 </div>
@@ -230,6 +316,98 @@
             </div>
         </div>
 
+        <div id="bantuanDrawer" class="hidden-drawer fixed right-4 top-[calc(1rem+env(safe-area-inset-top))] z-[2101] h-[calc(100vh-2rem-env(safe-area-inset-top))] w-[460px] max-w-[calc(100vw-1rem)] rounded-l-2xl border border-slate-200 bg-white/95 p-3 shadow-2xl backdrop-blur-md overflow-y-auto">
+            <div class="flex items-start justify-between gap-3">
+                <div>
+                    <h2 class="text-sm font-black tracking-tight text-slate-800">Manajemen Bantuan</h2>
+                    <p class="mt-1 text-[11px] text-slate-500">Kelola bantuan untuk penduduk miskin per wilayah rumah ibadah.</p>
+                </div>
+                <button id="bantuanDrawerCloseBtn" class="icon-btn h-9 w-9 text-slate-600" title="Tutup manajemen bantuan">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M18 6 6 18"/><path d="m6 6 12 12"/></svg>
+                </button>
+            </div>
+
+            <div class="mt-3 grid gap-2 sm:grid-cols-2">
+                <div class="sm:col-span-2">
+                    <label class="mb-1 block text-[10px] font-bold uppercase tracking-widest text-slate-400">Rumah Ibadah Wilayah</label>
+                    <select id="bantuanRumahFilter" class="w-full rounded-lg border border-slate-300 bg-white p-2 text-sm outline-none focus:ring-2 focus:ring-indigo-500">
+                        <option value="">Pilih rumah ibadah...</option>
+                    </select>
+                </div>
+                <div>
+                    <label class="mb-1 block text-[10px] font-bold uppercase tracking-widest text-slate-400">Status Bantuan</label>
+                    <select id="bantuanStatusFilter" class="w-full rounded-lg border border-slate-300 bg-white p-2 text-sm outline-none focus:ring-2 focus:ring-indigo-500">
+                        <option value="all">Semua</option>
+                        <option value="belum">Belum Dibantu</option>
+                        <option value="proses">Sedang Diproses</option>
+                        <option value="sudah">Sudah Dibantu</option>
+                    </select>
+                </div>
+                <div>
+                    <label class="mb-1 block text-[10px] font-bold uppercase tracking-widest text-slate-400">Cari Ketua KK</label>
+                    <input id="bantuanSearchQuery" type="text" placeholder="Nama ketua KK..." class="w-full rounded-lg border border-slate-300 bg-white p-2 text-sm outline-none focus:ring-2 focus:ring-indigo-500">
+                </div>
+            </div>
+
+            <div class="mt-3 flex items-center justify-between rounded-xl bg-slate-50 px-3 py-2">
+                <span class="text-[11px] font-bold uppercase tracking-widest text-slate-500">Prioritas</span>
+                <span id="bantuanCount" class="text-sm font-black text-indigo-600">0</span>
+            </div>
+
+            <div id="bantuanList" class="registry-list mt-3 space-y-2 pr-1">
+                <div class="rounded-xl border border-dashed border-slate-200 bg-slate-50 px-3 py-4 text-sm text-slate-500">
+                    Pilih rumah ibadah untuk melihat daftar penerima bantuan.
+                </div>
+            </div>
+        </div>
+
+        <div id="layerDrawer" class="hidden-drawer absolute left-6 top-[calc(1rem+env(safe-area-inset-top)+4.4rem)] z-[2099] w-[220px] max-w-[calc(100vw-3rem)] rounded-2xl border border-slate-200 bg-white/95 p-3 shadow-2xl backdrop-blur-md">
+            <div class="flex items-start justify-between gap-3">
+                <div>
+                    <h2 class="text-sm font-black tracking-tight text-slate-800">Layer</h2>
+                    <p class="mt-1 text-[11px] text-slate-500">Dropdown semua layer.</p>
+                </div>
+                <button id="layerDrawerCloseBtn" class="icon-btn h-9 w-9 text-slate-600" title="Tutup layer">
+                    <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2"><path d="M18 6 6 18"/><path d="m6 6 12 12"/></svg>
+                </button>
+            </div>
+
+            <div class="mt-3 space-y-2 text-sm text-slate-700">
+                <label class="flex items-center gap-2 rounded-lg border border-slate-200 bg-slate-50 px-3 py-2">
+                    <input id="layerToggle-spbuBuka24JamLayer" type="checkbox" class="h-4 w-4 rounded border-slate-300 text-indigo-600 focus:ring-indigo-500">
+                    <span>SPBU Buka 24 Jam</span>
+                </label>
+                <label class="flex items-center gap-2 rounded-lg border border-slate-200 bg-slate-50 px-3 py-2">
+                    <input id="layerToggle-spbuTidak24JamLayer" type="checkbox" class="h-4 w-4 rounded border-slate-300 text-indigo-600 focus:ring-indigo-500">
+                    <span>SPBU Tidak Buka 24 Jam</span>
+                </label>
+                <label class="flex items-center gap-2 rounded-lg border border-slate-200 bg-slate-50 px-3 py-2">
+                    <input id="layerToggle-jalanLayerGroup" type="checkbox" class="h-4 w-4 rounded border-slate-300 text-indigo-600 focus:ring-indigo-500">
+                    <span>Jalan</span>
+                </label>
+                <label class="flex items-center gap-2 rounded-lg border border-slate-200 bg-slate-50 px-3 py-2">
+                    <input id="layerToggle-polygonLayerGroup" type="checkbox" class="h-4 w-4 rounded border-slate-300 text-indigo-600 focus:ring-indigo-500">
+                    <span>Polygon</span>
+                </label>
+                <label class="flex items-center gap-2 rounded-lg border border-slate-200 bg-slate-50 px-3 py-2">
+                    <input id="layerToggle-roadDamageLayer" type="checkbox" class="h-4 w-4 rounded border-slate-300 text-indigo-600 focus:ring-indigo-500">
+                    <span>Jalan Rusak</span>
+                </label>
+                <label class="flex items-center gap-2 rounded-lg border border-slate-200 bg-slate-50 px-3 py-2">
+                    <input id="layerToggle-rumahIbadahLayer" type="checkbox" class="h-4 w-4 rounded border-slate-300 text-indigo-600 focus:ring-indigo-500">
+                    <span>Rumah Ibadah</span>
+                </label>
+                <label class="flex items-center gap-2 rounded-lg border border-slate-200 bg-slate-50 px-3 py-2">
+                    <input id="layerToggle-pendudukMiskinLayer" type="checkbox" class="h-4 w-4 rounded border-slate-300 text-indigo-600 focus:ring-indigo-500">
+                    <span>Penduduk Miskin</span>
+                </label>
+                <label class="flex items-center gap-2 rounded-lg border border-slate-200 bg-slate-50 px-3 py-2">
+                    <input id="layerToggle-roadNetworkLayer" type="checkbox" class="h-4 w-4 rounded border-slate-300 text-indigo-600 focus:ring-indigo-500">
+                    <span>Jalan Eksternal</span>
+                </label>
+            </div>
+        </div>
+
         <div id="choroplethPanel" class="absolute right-6 bottom-6 z-[2000] hidden w-[320px] max-w-[calc(100vw-3rem)] rounded-2xl border border-slate-200 bg-white/95 p-3 shadow-2xl backdrop-blur-md">
             <div class="flex items-start justify-between gap-3">
                 <div>
@@ -389,6 +567,83 @@
             </div>
         </div>
 
+        <div id="rumahIbadahModal" class="fixed inset-0 z-[10003] hidden items-center justify-center bg-slate-900/50 px-4">
+            <div class="w-full max-w-xl rounded-2xl bg-white p-5 shadow-2xl">
+                <div class="flex items-start justify-between gap-4 border-b pb-3">
+                    <div>
+                        <h3 class="text-lg font-bold text-slate-800">Input Rumah Ibadah</h3>
+                        <p class="text-sm text-slate-500">Alamat diambil otomatis dari reverse geocode koordinat peta.</p>
+                    </div>
+                    <button id="closeRumahIbadahModalBtn" class="rounded-lg bg-slate-100 px-3 py-2 text-sm font-bold text-slate-700 hover:bg-slate-200">Tutup</button>
+                </div>
+                <div class="mt-4 grid gap-3 sm:grid-cols-2">
+                    <input id="rumahIbadahId" type="hidden">
+                    <div class="sm:col-span-2">
+                        <label class="mb-1 block text-[10px] font-bold uppercase tracking-widest text-slate-400">Nama Rumah Ibadah</label>
+                        <input id="rumahIbadahNama" type="text" placeholder="Masukkan nama rumah ibadah" class="w-full rounded-lg border border-slate-300 p-2 text-sm outline-none focus:ring-2 focus:ring-indigo-500">
+                    </div>
+                    <div class="sm:col-span-2">
+                        <label class="mb-1 block text-[10px] font-bold uppercase tracking-widest text-slate-400">Alamat Otomatis</label>
+                        <textarea id="rumahIbadahAlamat" rows="3" readonly class="w-full rounded-lg border border-slate-200 bg-slate-50 p-2 text-sm text-slate-600"></textarea>
+                    </div>
+                    <div>
+                        <label class="mb-1 block text-[10px] font-bold uppercase tracking-widest text-slate-400">PIC</label>
+                        <input id="rumahIbadahPic" type="text" placeholder="Nama PIC" class="w-full rounded-lg border border-slate-300 p-2 text-sm outline-none focus:ring-2 focus:ring-indigo-500">
+                    </div>
+                    <div>
+                        <label class="mb-1 block text-[10px] font-bold uppercase tracking-widest text-slate-400">Radius Pencarian</label>
+                        <input id="rumahIbadahRadius" type="range" min="50" max="5000" step="50" value="1000" class="w-full">
+                        <div class="mt-1 text-xs text-slate-600">Radius: <span id="rumahIbadahRadiusValue">1000</span> meter</div>
+                    </div>
+                    <div class="sm:col-span-2 text-[10px] text-slate-500 bg-slate-50 p-2 rounded">
+                        📍 Koordinat: <span id="rumahIbadahCoords">-</span>
+                    </div>
+                </div>
+                <div class="mt-5 flex flex-wrap gap-2 border-t pt-4">
+                    <button id="saveRumahIbadahBtn" class="rounded-lg bg-indigo-600 px-4 py-2 text-sm font-bold text-white hover:bg-indigo-700">Simpan</button>
+                    <button id="cancelRumahIbadahBtn" class="rounded-lg bg-slate-100 px-4 py-2 text-sm font-bold text-slate-700 hover:bg-slate-200">Batal</button>
+                </div>
+            </div>
+        </div>
+
+        <div id="pendudukMiskinModal" class="fixed inset-0 z-[10004] hidden items-center justify-center bg-slate-900/50 px-4">
+            <div class="w-full max-w-xl rounded-2xl bg-white p-5 shadow-2xl">
+                <div class="flex items-start justify-between gap-4 border-b pb-3">
+                    <div>
+                        <h3 class="text-lg font-bold text-slate-800">Input Penduduk Miskin</h3>
+                        <p class="text-sm text-slate-500">Data akan ditautkan otomatis ke rumah ibadah terdekat.</p>
+                    </div>
+                    <button id="closePendudukMiskinModalBtn" class="rounded-lg bg-slate-100 px-3 py-2 text-sm font-bold text-slate-700 hover:bg-slate-200">Tutup</button>
+                </div>
+                <div class="mt-4 grid gap-3 sm:grid-cols-2">
+                    <input id="pendudukMiskinId" type="hidden">
+                    <div class="sm:col-span-2">
+                        <label class="mb-1 block text-[10px] font-bold uppercase tracking-widest text-slate-400">Nama Ketua KK</label>
+                        <input id="pendudukMiskinNama" type="text" placeholder="Masukkan nama ketua KK" class="w-full rounded-lg border border-slate-300 p-2 text-sm outline-none focus:ring-2 focus:ring-indigo-500">
+                    </div>
+                    <div>
+                        <label class="mb-1 block text-[10px] font-bold uppercase tracking-widest text-slate-400">Jumlah Anggota Keluarga</label>
+                        <input id="pendudukMiskinAnggota" type="number" min="1" step="1" value="1" class="w-full rounded-lg border border-slate-300 p-2 text-sm outline-none focus:ring-2 focus:ring-indigo-500">
+                    </div>
+                    <div>
+                        <label class="mb-1 block text-[10px] font-bold uppercase tracking-widest text-slate-400">Rumah Ibadah Terdekat</label>
+                        <input id="pendudukMiskinRumahIbadah" type="text" readonly class="w-full rounded-lg border border-slate-200 bg-slate-50 p-2 text-sm text-slate-600">
+                    </div>
+                    <div class="sm:col-span-2">
+                        <label class="mb-1 block text-[10px] font-bold uppercase tracking-widest text-slate-400">Jarak ke Rumah Ibadah</label>
+                        <input id="pendudukMiskinJarak" type="text" readonly class="w-full rounded-lg border border-slate-200 bg-slate-50 p-2 text-sm text-slate-600">
+                    </div>
+                    <div class="sm:col-span-2 text-[10px] text-slate-500 bg-slate-50 p-2 rounded">
+                        📍 Koordinat: <span id="pendudukMiskinCoords">-</span>
+                    </div>
+                </div>
+                <div class="mt-5 flex flex-wrap gap-2 border-t pt-4">
+                    <button id="savePendudukMiskinBtn" class="rounded-lg bg-indigo-600 px-4 py-2 text-sm font-bold text-white hover:bg-indigo-700">Simpan</button>
+                    <button id="cancelPendudukMiskinBtn" class="rounded-lg bg-slate-100 px-4 py-2 text-sm font-bold text-slate-700 hover:bg-slate-200">Batal</button>
+                </div>
+            </div>
+        </div>
+
         <select id="featureType" class="hidden">
             <option value="polyline">polyline</option>
             <option value="polygon">polygon</option>
@@ -411,7 +666,7 @@
         let isFeatureDrawing = false;
         let isFeatureSaving = false;
         let latestSnapshotHash = '';
-        let featureLayer = L.featureGroup().addTo(map);
+        let featureLayer = L.featureGroup();
         let drawControl = null;
         let activeDrawHandler = null;
         let currentDrawMode = 'polyline';
@@ -428,12 +683,28 @@
         let spbuBuka24JamLayer = L.layerGroup().addTo(map);
         let spbuTidak24JamLayer = L.layerGroup().addTo(map);
         let spbuLayerControl = null;
+        let spatialLayerControl = null;
         let utilityControl = null;
+        let rumahIbadahLayer = L.featureGroup().addTo(map);
+        let pendudukMiskinLayer = L.featureGroup().addTo(map);
+        let rumahIbadahLayerMap = {};
+        let pendudukMiskinLayerMap = {};
+        let rumahIbadahRecords = [];
+        let pendudukMiskinRecords = [];
+        let pendingRumahIbadahCoords = null;
+        let pendingPendudukMiskinCoords = null;
+        let editingRumahIbadahId = null;
+        let selectedRumahIbadahId = null;
+        let selectedBantuanRumahIbadahId = null;
+        let jalanLayerGroup = L.featureGroup().addTo(map);
+        let polygonLayerGroup = L.featureGroup().addTo(map);
         let roadDamageLayer = L.featureGroup().addTo(map);
         let roadNetworkLayer = L.featureGroup().addTo(map);
         let roadDamageRecords = [];
         let pendingRoadDamageCoords = null;
         let isMainPanelCollapsed = false;
+        let hiddenLayersDuringChoropleth = [];
+        let layerDrawerControls = [];
 
         const ROAD_NETWORK_GEOJSON_PATH = 'data/Export_Output_2.json';
         let roadNetworkLoaded = false;
@@ -676,25 +947,19 @@
 
             panel.classList.toggle('hidden', !enabled);
             if (enabled) {
-                if (map.hasLayer(featureLayer)) {
-                    map.removeLayer(featureLayer);
-                }
+                setSpatialOverlayVisibility(false);
                 try {
                     await buildChoroplethLayer();
                 } catch (error) {
                     showMessage(error.message || 'Gagal memuat peta choropleth', 'bg-red-600 text-white');
                     panel.classList.add('hidden');
-                    if (!map.hasLayer(featureLayer)) {
-                        map.addLayer(featureLayer);
-                    }
+                    setSpatialOverlayVisibility(true);
                 }
                 return;
             }
 
             clearChoroplethLayer();
-            if (!map.hasLayer(featureLayer)) {
-                map.addLayer(featureLayer);
-            }
+            setSpatialOverlayVisibility(true);
         }
 
         function getFeatureStatusColor(type, status) {
@@ -864,7 +1129,29 @@
                 longitude: Number(record.longitude)
             }));
 
-            return [...pointRecords, ...spatialRecords, ...roadDamageRegistryRecords].sort((left, right) => {
+            const rumahIbadahRegistryRecords = rumahIbadahRecords.map(record => ({
+                id: Number(record.id),
+                type: 'rumahIbadah',
+                title: record.nama || 'Tanpa nama',
+                subtitle: record.pic || '-',
+                status: `${Number(record.radius_m || 0).toLocaleString('id-ID')} m`,
+                created_at: record.created_at || null,
+                latitude: Number(record.latitude),
+                longitude: Number(record.longitude)
+            }));
+
+            const pendudukMiskinRegistryRecords = pendudukMiskinRecords.map(record => ({
+                id: Number(record.id),
+                type: 'pendudukMiskin',
+                title: record.nama_ketua_kk || 'Tanpa nama',
+                subtitle: `${Number(record.jumlah_anggota || 0)} anggota`,
+                status: record.rumah_ibadah_nama || '-',
+                created_at: record.created_at || null,
+                latitude: Number(record.latitude),
+                longitude: Number(record.longitude)
+            }));
+
+            return [...pointRecords, ...spatialRecords, ...roadDamageRegistryRecords, ...rumahIbadahRegistryRecords, ...pendudukMiskinRegistryRecords].sort((left, right) => {
                 const leftDate = parseDateOnly(left.created_at);
                 const rightDate = parseDateOnly(right.created_at);
 
@@ -880,6 +1167,8 @@
             if (type === 'polyline') return 'Polyline';
             if (type === 'polygon') return 'Polygon';
             if (type === 'roadDamage') return 'Jalan Rusak';
+            if (type === 'rumahIbadah') return 'Rumah Ibadah';
+            if (type === 'pendudukMiskin') return 'Penduduk Miskin';
             return 'Data';
         }
 
@@ -888,6 +1177,8 @@
             if (type === 'polyline') return 'bg-indigo-100 text-indigo-700';
             if (type === 'polygon') return 'bg-amber-100 text-amber-700';
             if (type === 'roadDamage') return 'bg-red-100 text-red-700';
+            if (type === 'rumahIbadah') return 'bg-teal-100 text-teal-700';
+            if (type === 'pendudukMiskin') return 'bg-rose-100 text-rose-700';
             return 'bg-slate-100 text-slate-700';
         }
 
@@ -900,6 +1191,22 @@
                 return;
             }
 
+            if (type === 'rumahIbadah') {
+                const item = rumahIbadahLayerMap[id];
+                if (!item) return;
+                map.setView(item.marker.getLatLng(), Math.max(map.getZoom(), 16));
+                item.marker.openPopup();
+                return;
+            }
+
+            if (type === 'pendudukMiskin') {
+                const marker = pendudukMiskinLayerMap[id];
+                if (!marker) return;
+                map.setView(marker.getLatLng(), Math.max(map.getZoom(), 16));
+                marker.openPopup();
+                return;
+            }
+
             if (type === 'roadDamage') {
                 let selectedMarker = null;
                 roadDamageLayer.eachLayer(layer => {
@@ -956,11 +1263,19 @@
                     ? `Telp: ${record.subtitle}`
                     : record.type === 'roadDamage'
                         ? `Deskripsi: ${record.subtitle}`
+                        : record.type === 'rumahIbadah'
+                            ? `PIC: ${record.subtitle}`
+                            : record.type === 'pendudukMiskin'
+                                ? `Anggota: ${record.subtitle}`
                         : `Kategori: ${record.subtitle}`;
                 const statusLabel = record.type === 'point'
                     ? `24 Jam: ${record.status}`
                     : record.type === 'roadDamage'
                         ? `Tingkat: ${record.status}`
+                        : record.type === 'rumahIbadah'
+                            ? `Radius: ${record.status}`
+                            : record.type === 'pendudukMiskin'
+                                ? `Rumah Ibadah: ${record.status}`
                         : `Status: ${record.status}`;
 
                 return `
@@ -1009,10 +1324,317 @@
             }
 
             if (shouldOpen) {
+                toggleBantuanDrawer(false);
+                toggleLayerDrawer(false);
                 renderInputRegistry();
             }
         }
 
+        function getLayerDrawerUi() {
+            return {
+                panel: document.getElementById('layerDrawer'),
+                closeBtn: document.getElementById('layerDrawerCloseBtn'),
+                toggles: {
+                    spbuBuka24JamLayer: document.getElementById('layerToggle-spbuBuka24JamLayer'),
+                    spbuTidak24JamLayer: document.getElementById('layerToggle-spbuTidak24JamLayer'),
+                    jalanLayerGroup: document.getElementById('layerToggle-jalanLayerGroup'),
+                    polygonLayerGroup: document.getElementById('layerToggle-polygonLayerGroup'),
+                    roadDamageLayer: document.getElementById('layerToggle-roadDamageLayer'),
+                    rumahIbadahLayer: document.getElementById('layerToggle-rumahIbadahLayer'),
+                    pendudukMiskinLayer: document.getElementById('layerToggle-pendudukMiskinLayer'),
+                    roadNetworkLayer: document.getElementById('layerToggle-roadNetworkLayer')
+                }
+            };
+        }
+
+        function getLayerEntries() {
+            return [
+                { key: 'spbuBuka24JamLayer', layer: spbuBuka24JamLayer, label: 'SPBU Buka 24 Jam' },
+                { key: 'spbuTidak24JamLayer', layer: spbuTidak24JamLayer, label: 'SPBU Tidak Buka 24 Jam' },
+                { key: 'jalanLayerGroup', layer: jalanLayerGroup, label: 'Jalan' },
+                { key: 'polygonLayerGroup', layer: polygonLayerGroup, label: 'Polygon' },
+                { key: 'roadDamageLayer', layer: roadDamageLayer, label: 'Jalan Rusak' },
+                { key: 'rumahIbadahLayer', layer: rumahIbadahLayer, label: 'Rumah Ibadah' },
+                { key: 'pendudukMiskinLayer', layer: pendudukMiskinLayer, label: 'Penduduk Miskin' },
+                { key: 'roadNetworkLayer', layer: roadNetworkLayer, label: 'Jalan Eksternal' }
+            ];
+        }
+
+        function setLayerVisible(layer, visible) {
+            if (!layer) return;
+            if (visible) {
+                if (!map.hasLayer(layer)) {
+                    map.addLayer(layer);
+                }
+                return;
+            }
+
+            if (map.hasLayer(layer)) {
+                map.removeLayer(layer);
+            }
+        }
+
+        function syncLayerDrawerState() {
+            const ui = getLayerDrawerUi();
+            const entries = getLayerEntries();
+
+            entries.forEach(entry => {
+                const toggle = ui.toggles[entry.key];
+                if (toggle) {
+                    toggle.checked = map.hasLayer(entry.layer);
+                }
+            });
+        }
+
+        function renderLayerDrawer() {
+            syncLayerDrawerState();
+        }
+
+        function toggleLayerDrawer(forceState = null) {
+            const ui = getLayerDrawerUi();
+            const panel = ui.panel;
+            if (!panel) return;
+
+            const isHidden = panel.classList.contains('hidden-drawer');
+            const shouldOpen = forceState === null ? isHidden : !!forceState;
+
+            panel.classList.toggle('hidden-drawer', !shouldOpen);
+
+            const triggerBtn = document.getElementById('toggleLayerDrawerBtn');
+            if (triggerBtn) {
+                triggerBtn.classList.toggle('active', shouldOpen);
+            }
+
+            if (shouldOpen) {
+                toggleInputRegistry(false);
+                toggleBantuanDrawer(false);
+                renderLayerDrawer();
+            }
+        }
+
+        function bindLayerDrawerEvents() {
+            const ui = getLayerDrawerUi();
+            const entries = getLayerEntries();
+
+            entries.forEach(entry => {
+                const toggle = ui.toggles[entry.key];
+                if (!toggle || layerDrawerControls.includes(entry.key)) return;
+
+                toggle.addEventListener('change', () => setLayerVisible(entry.layer, toggle.checked));
+                layerDrawerControls.push(entry.key);
+            });
+
+            if (ui.closeBtn && !ui.closeBtn.dataset.bound) {
+                ui.closeBtn.addEventListener('click', () => toggleLayerDrawer(false));
+                ui.closeBtn.dataset.bound = '1';
+            }
+        }
+
+        function normalizeAidStatus(status) {
+            const value = String(status || '').toLowerCase().trim();
+            if (value === 'proses' || value === 'sudah') return value;
+            return 'belum';
+        }
+
+        function getAidStatusBadge(status) {
+            const normalized = normalizeAidStatus(status);
+            if (normalized === 'sudah') {
+                return { label: 'Sudah Dibantu', className: 'bg-emerald-100 text-emerald-700' };
+            }
+            if (normalized === 'proses') {
+                return { label: 'Sedang Diproses', className: 'bg-amber-100 text-amber-700' };
+            }
+            return { label: 'Belum Dibantu', className: 'bg-rose-100 text-rose-700' };
+        }
+
+        function getBantuanUi() {
+            return {
+                panel: document.getElementById('bantuanDrawer'),
+                count: document.getElementById('bantuanCount'),
+                list: document.getElementById('bantuanList'),
+                rumahFilter: document.getElementById('bantuanRumahFilter'),
+                statusFilter: document.getElementById('bantuanStatusFilter'),
+                search: document.getElementById('bantuanSearchQuery')
+            };
+        }
+
+        function getBantuanFilters() {
+            const ui = getBantuanUi();
+            return {
+                rumahId: ui.rumahFilter && ui.rumahFilter.value ? Number(ui.rumahFilter.value) : 0,
+                status: ui.statusFilter && ui.statusFilter.value ? ui.statusFilter.value : 'all',
+                search: String(ui.search && ui.search.value ? ui.search.value : '').toLowerCase().trim()
+            };
+        }
+
+        function openBantuanForRumah(rumahIbadahId) {
+            selectedBantuanRumahIbadahId = Number(rumahIbadahId) || null;
+            toggleBantuanDrawer(true);
+        }
+
+        function toggleBantuanDrawer(forceState = null) {
+            const ui = getBantuanUi();
+            const panel = ui.panel;
+            if (!panel) return;
+
+            const isHidden = panel.classList.contains('hidden-drawer');
+            const shouldOpen = forceState === null ? isHidden : !!forceState;
+
+            panel.classList.toggle('hidden-drawer', !shouldOpen);
+
+            const triggerBtn = document.getElementById('toggleBantuanDrawerBtn');
+            if (triggerBtn) {
+                triggerBtn.classList.toggle('active', shouldOpen);
+            }
+
+            const leafletTriggerBtn = document.getElementById('leafletBantuanBtn');
+            if (leafletTriggerBtn) {
+                leafletTriggerBtn.classList.toggle('active', shouldOpen);
+            }
+
+            if (shouldOpen) {
+                toggleInputRegistry(false);
+                toggleLayerDrawer(false);
+                renderBantuanDrawer();
+            }
+        }
+
+        function renderBantuanDrawer() {
+            const ui = getBantuanUi();
+            if (!ui.panel || !ui.list || !ui.count || !ui.rumahFilter || !ui.statusFilter || !ui.search) return;
+
+            const previousValue = ui.rumahFilter.value;
+            const options = ['<option value="">Pilih rumah ibadah...</option>'].concat(
+                rumahIbadahRecords.map(record => `<option value="${Number(record.id)}">${record.nama} (radius ${Number(record.radius_m || 0).toLocaleString('id-ID')} m)</option>`)
+            );
+            ui.rumahFilter.innerHTML = options.join('');
+
+            const defaultValue = selectedBantuanRumahIbadahId != null ? String(selectedBantuanRumahIbadahId) : previousValue;
+            if (defaultValue && rumahIbadahRecords.some(item => String(Number(item.id)) === String(defaultValue))) {
+                ui.rumahFilter.value = String(defaultValue);
+            }
+
+            const filters = getBantuanFilters();
+            selectedBantuanRumahIbadahId = filters.rumahId || null;
+
+            if (!filters.rumahId) {
+                ui.count.innerText = '0';
+                ui.list.innerHTML = `
+                    <div class="rounded-xl border border-dashed border-slate-200 bg-slate-50 px-3 py-4 text-sm text-slate-500">
+                        Pilih rumah ibadah untuk menampilkan daftar penerima bantuan pada wilayahnya.
+                    </div>
+                `;
+                return;
+            }
+
+            const rumahRecord = rumahIbadahRecords.find(item => Number(item.id) === Number(filters.rumahId));
+            if (!rumahRecord) {
+                ui.count.innerText = '0';
+                ui.list.innerHTML = `
+                    <div class="rounded-xl border border-dashed border-slate-200 bg-slate-50 px-3 py-4 text-sm text-slate-500">
+                        Data rumah ibadah tidak ditemukan.
+                    </div>
+                `;
+                return;
+            }
+
+            const residents = getPoorResidentsInRumahRadius(rumahRecord).filter(item => {
+                const status = normalizeAidStatus(item.bantuan_status);
+                if (filters.status !== 'all' && status !== filters.status) return false;
+                if (filters.search && !(item.nama_ketua_kk || '').toLowerCase().includes(filters.search)) return false;
+                return true;
+            });
+
+            ui.count.innerText = String(residents.length);
+
+            if (!residents.length) {
+                ui.list.innerHTML = `
+                    <div class="rounded-xl border border-dashed border-slate-200 bg-slate-50 px-3 py-4 text-sm text-slate-500">
+                        Tidak ada data penduduk miskin yang sesuai filter untuk wilayah ${rumahRecord.nama}.
+                    </div>
+                `;
+                return;
+            }
+
+            ui.list.innerHTML = residents.map(item => {
+                const badge = getAidStatusBadge(item.bantuan_status);
+                const jarak = formatDistanceMeters(Number(item._distanceToRumah));
+                const created = formatInputDate(item.created_at);
+                const updated = item.bantuan_updated_at ? formatInputDate(item.bantuan_updated_at) : '-';
+                const noteValue = String(item.bantuan_catatan || '').replace(/"/g, '&quot;');
+
+                return `
+                    <div class="rounded-xl border border-slate-200 bg-white p-3 shadow-sm">
+                        <div class="flex items-start justify-between gap-2">
+                            <div>
+                                <h3 class="text-sm font-bold text-slate-800">${item.nama_ketua_kk}</h3>
+                                <p class="mt-0.5 text-[11px] text-slate-500">${item.jumlah_anggota} anggota • ${jarak} dari ${rumahRecord.nama}</p>
+                            </div>
+                            <span class="registry-chip ${badge.className}">${badge.label}</span>
+                        </div>
+
+                        <div class="mt-2 grid grid-cols-2 gap-x-2 gap-y-1 text-[11px] text-slate-600">
+                            <div>ID: ${item.id}</div>
+                            <div>Koordinat: ${Number(item.latitude).toFixed(5)}, ${Number(item.longitude).toFixed(5)}</div>
+                            <div>Dibuat: ${created}</div>
+                            <div>Update Bantuan: ${updated}</div>
+                        </div>
+
+                        <div class="mt-3 grid gap-2">
+                            <label class="text-[10px] font-bold uppercase tracking-widest text-slate-400">Status Bantuan</label>
+                            <select id="aidStatus-${item.id}" class="w-full rounded-lg border border-slate-300 bg-white p-2 text-sm outline-none focus:ring-2 focus:ring-indigo-500">
+                                <option value="belum" ${normalizeAidStatus(item.bantuan_status) === 'belum' ? 'selected' : ''}>Belum Dibantu</option>
+                                <option value="proses" ${normalizeAidStatus(item.bantuan_status) === 'proses' ? 'selected' : ''}>Sedang Diproses</option>
+                                <option value="sudah" ${normalizeAidStatus(item.bantuan_status) === 'sudah' ? 'selected' : ''}>Sudah Dibantu</option>
+                            </select>
+                            <label class="text-[10px] font-bold uppercase tracking-widest text-slate-400">Catatan Bantuan</label>
+                            <textarea id="aidNote-${item.id}" rows="2" placeholder="Contoh: paket sembako tahap 1" class="w-full rounded-lg border border-slate-300 bg-white p-2 text-sm outline-none focus:ring-2 focus:ring-indigo-500">${noteValue}</textarea>
+                        </div>
+
+                        <div class="mt-3 grid grid-cols-2 gap-2 border-t pt-3">
+                            <button onclick="saveAidStatus(${item.id})" class="rounded-lg bg-indigo-600 px-3 py-2 text-xs font-bold text-white hover:bg-indigo-700">Simpan Bantuan</button>
+                            <button onclick="focusRegistryItem('pendudukMiskin', ${item.id})" class="rounded-lg bg-slate-100 px-3 py-2 text-xs font-bold text-slate-700 hover:bg-slate-200">Lihat di Peta</button>
+                        </div>
+                    </div>
+                `;
+            }).join('');
+        }
+
+        function saveAidStatus(id) {
+            const statusEl = document.getElementById(`aidStatus-${id}`);
+            const noteEl = document.getElementById(`aidNote-${id}`);
+            if (!statusEl || !noteEl) {
+                showMessage('Komponen update bantuan tidak ditemukan', 'bg-red-600 text-white');
+                return;
+            }
+
+            const formData = new FormData();
+            formData.append('id', String(id));
+            formData.append('bantuan_status', normalizeAidStatus(statusEl.value));
+            formData.append('bantuan_catatan', String(noteEl.value || '').trim());
+
+            fetch('update_bantuan_penduduk.php', { method: 'POST', body: formData })
+                .then(res => parseJsonResponse(res, 'update_bantuan_penduduk.php'))
+                .then(data => {
+                    if (data.status !== 'success') {
+                        throw new Error(data.message || 'Gagal memperbarui bantuan');
+                    }
+
+                    const record = pendudukMiskinRecords.find(item => Number(item.id) === Number(id));
+                    if (record) {
+                        record.bantuan_status = normalizeAidStatus(statusEl.value);
+                        record.bantuan_catatan = String(noteEl.value || '').trim();
+                        record.bantuan_updated_at = data.bantuan_updated_at || new Date().toISOString();
+                    }
+
+                    refreshRumahIbadahPopups();
+                    renderBantuanDrawer();
+                    loadPendudukMiskin(true);
+                    showMessage('✅ Status bantuan berhasil diperbarui', 'bg-green-600 text-white');
+                })
+                .catch(err => showMessage(err.message || 'Gagal memperbarui bantuan', 'bg-red-600 text-white'));
+        }
+
         function getFeatureOptions(type) {
             return FEATURE_STATUS_OPTIONS[type] || [];
         }
@@ -1055,11 +1677,15 @@
                 point: document.getElementById('modePointBtn'),
                 polyline: document.getElementById('modePolylineBtn'),
                 polygon: document.getElementById('modePolygonBtn'),
+                rumahIbadah: document.getElementById('modeRumahIbadahBtn'),
+                pendudukMiskin: document.getElementById('modePendudukMiskinBtn'),
                 choropleth: document.getElementById('modeChoroplethBtn'),
                 roadDamage: document.getElementById('leafletRoadDamageBtn') || document.getElementById('modeRoadDamageBtn'),
                 miniPoint: document.getElementById('miniModePointBtn'),
                 miniPolyline: document.getElementById('miniModePolylineBtn'),
-                miniPolygon: document.getElementById('miniModePolygonBtn')
+                miniPolygon: document.getElementById('miniModePolygonBtn'),
+                miniRumahIbadah: document.getElementById('miniModeRumahIbadahBtn'),
+                miniPendudukMiskin: document.getElementById('miniModePendudukMiskinBtn')
             };
 
             Object.values(modeButtons).forEach(button => {
@@ -1077,6 +1703,14 @@
                 if (modeButtons.polygon) modeButtons.polygon.classList.add('active');
                 if (modeButtons.miniPolygon) modeButtons.miniPolygon.classList.add('active');
             }
+            if (mode === 'rumahIbadah') {
+                if (modeButtons.rumahIbadah) modeButtons.rumahIbadah.classList.add('active');
+                if (modeButtons.miniRumahIbadah) modeButtons.miniRumahIbadah.classList.add('active');
+            }
+            if (mode === 'pendudukMiskin') {
+                if (modeButtons.pendudukMiskin) modeButtons.pendudukMiskin.classList.add('active');
+                if (modeButtons.miniPendudukMiskin) modeButtons.miniPendudukMiskin.classList.add('active');
+            }
             if (modeButtons[mode]) {
                 modeButtons[mode].classList.add('active');
             }
@@ -1114,6 +1748,16 @@
                 return;
             }
 
+            if (mode === 'rumahIbadah' || mode === 'pendudukMiskin') {
+                spatialControls.classList.add('hidden');
+                runActionBtn.innerText = 'Klik Peta';
+                runActionBtn.disabled = true;
+                clearDraftBtn.disabled = true;
+                updateDrawControl(null);
+                document.getElementById('modeMeasure').value = '';
+                return;
+            }
+
             runActionBtn.disabled = false;
             clearDraftBtn.disabled = false;
 
@@ -1562,6 +2206,518 @@
             L.popup().setLatLng([lat, lng]).setContent(content).openOn(map);
         }
 
+        async function reverseGeocodeLocation(lat, lng) {
+            const url = new URL('https://nominatim.openstreetmap.org/reverse');
+            url.searchParams.set('format', 'jsonv2');
+            url.searchParams.set('lat', String(lat));
+            url.searchParams.set('lon', String(lng));
+            url.searchParams.set('accept-language', 'id');
+
+            const response = await fetch(url.toString(), {
+                headers: {
+                    'Accept': 'application/json'
+                }
+            });
+
+            if (!response.ok) {
+                throw new Error(`Reverse geocode gagal (HTTP ${response.status})`);
+            }
+
+            const data = await response.json();
+            return data.display_name || 'Alamat tidak ditemukan';
+        }
+
+        function distanceMeters(lat1, lng1, lat2, lng2) {
+            const earthRadius = 6371000;
+            const toRadians = value => (value * Math.PI) / 180;
+            const deltaLat = toRadians(lat2 - lat1);
+            const deltaLng = toRadians(lng2 - lng1);
+            const a = Math.sin(deltaLat / 2) ** 2 + Math.cos(toRadians(lat1)) * Math.cos(toRadians(lat2)) * Math.sin(deltaLng / 2) ** 2;
+            return 2 * earthRadius * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+        }
+
+        function formatDistanceMeters(value) {
+            if (!Number.isFinite(value)) return '-';
+            if (value >= 1000) {
+                return `${(value / 1000).toFixed(2)} km`;
+            }
+            return `${Math.round(value)} m`;
+        }
+
+        function findNearestRumahIbadah(lat, lng) {
+            if (!Array.isArray(rumahIbadahRecords) || !rumahIbadahRecords.length) {
+                return null;
+            }
+
+            return rumahIbadahRecords.reduce((nearest, record) => {
+                const distance = distanceMeters(lat, lng, Number(record.latitude), Number(record.longitude));
+                if (!nearest || distance < nearest.distance) {
+                    return { record, distance };
+                }
+                return nearest;
+            }, null);
+        }
+
+        function syncRumahIbadahRadius(value) {
+            const slider = document.getElementById('rumahIbadahRadius');
+            const field = document.getElementById('rumahIbadahRadiusValue');
+            const numericValue = Math.max(50, Number(value) || 1000);
+
+            if (slider) slider.value = numericValue;
+            if (field) field.innerText = String(numericValue);
+        }
+
+        function openRumahIbadahModal(lat, lng, record = null) {
+            pendingRumahIbadahCoords = { lat, lng };
+            editingRumahIbadahId = record ? Number(record.id) : null;
+
+            document.getElementById('rumahIbadahId').value = record ? String(record.id) : '';
+            document.getElementById('rumahIbadahNama').value = record ? record.nama || '' : '';
+            document.getElementById('rumahIbadahPic').value = record ? record.pic || '' : '';
+            document.getElementById('rumahIbadahAlamat').value = record ? record.alamat || '' : 'Mencari alamat...';
+            syncRumahIbadahRadius(record ? record.radius_m : 1000);
+            document.getElementById('rumahIbadahCoords').innerText = `${lat.toFixed(5)}, ${lng.toFixed(5)}`;
+
+            const modal = document.getElementById('rumahIbadahModal');
+            modal.classList.remove('hidden');
+            modal.classList.add('flex');
+            suppressAutoReload = true;
+
+            if (!record) {
+                reverseGeocodeLocation(lat, lng)
+                    .then(address => {
+                        if (pendingRumahIbadahCoords && pendingRumahIbadahCoords.lat === lat && pendingRumahIbadahCoords.lng === lng) {
+                            document.getElementById('rumahIbadahAlamat').value = address;
+                        }
+                    })
+                    .catch(() => {
+                        if (pendingRumahIbadahCoords && pendingRumahIbadahCoords.lat === lat && pendingRumahIbadahCoords.lng === lng) {
+                            document.getElementById('rumahIbadahAlamat').value = 'Alamat tidak ditemukan';
+                        }
+                    });
+            }
+        }
+
+        function closeRumahIbadahModal() {
+            const modal = document.getElementById('rumahIbadahModal');
+            modal.classList.add('hidden');
+            modal.classList.remove('flex');
+            pendingRumahIbadahCoords = null;
+            editingRumahIbadahId = null;
+            suppressAutoReload = !!document.querySelector('[id^="edit-mode-"]:not(.hidden)') || !!editingFeatureId;
+        }
+
+        function openPendudukMiskinModal(lat, lng, record = null) {
+            pendingPendudukMiskinCoords = { lat, lng };
+            document.getElementById('pendudukMiskinId').value = record ? String(record.id) : '';
+            document.getElementById('pendudukMiskinNama').value = record ? (record.nama_ketua_kk || '') : '';
+            document.getElementById('pendudukMiskinAnggota').value = record ? String(Number(record.jumlah_anggota) || 1) : '1';
+            document.getElementById('pendudukMiskinCoords').innerText = `${lat.toFixed(5)}, ${lng.toFixed(5)}`;
+            const nearest = findNearestRumahIbadah(lat, lng);
+
+            if (nearest) {
+                document.getElementById('pendudukMiskinRumahIbadah').value = nearest.record.nama;
+                document.getElementById('pendudukMiskinJarak').value = `${formatDistanceMeters(nearest.distance)} dari rumah ibadah terdekat`;
+            } else {
+                document.getElementById('pendudukMiskinRumahIbadah').value = 'Belum ada data rumah ibadah';
+                document.getElementById('pendudukMiskinJarak').value = '-';
+            }
+
+            const modal = document.getElementById('pendudukMiskinModal');
+            modal.classList.remove('hidden');
+            modal.classList.add('flex');
+            suppressAutoReload = true;
+        }
+
+        function closePendudukMiskinModal() {
+            const modal = document.getElementById('pendudukMiskinModal');
+            modal.classList.add('hidden');
+            modal.classList.remove('flex');
+            pendingPendudukMiskinCoords = null;
+            suppressAutoReload = !!document.querySelector('[id^="edit-mode-"]:not(.hidden)') || !!editingFeatureId;
+        }
+
+        function buildRumahIbadahPopup(record) {
+            const residentsInArea = getPoorResidentsInRumahRadius(record);
+
+            return `
+                <div class="w-full p-4">
+                    <h3 class="text-lg font-bold text-slate-800">${record.nama}</h3>
+                    <p class="mt-1 text-sm text-slate-600">PIC: ${record.pic}</p>
+                    <p class="mt-1 text-sm text-slate-600">Radius: ${Number(record.radius_m).toLocaleString('id-ID')} m</p>
+                    <p class="mt-1 text-sm text-slate-600">Alamat: ${record.alamat}</p>
+                    <p class="mt-1 text-sm text-slate-600">Penduduk miskin dalam wilayah: <span class="font-semibold">${residentsInArea.length}</span></p>
+                    <div class="mt-4 grid grid-cols-2 gap-2 border-t pt-3">
+                        <button onclick="openRumahIbadahEditor(${record.id})" class="rounded-lg bg-indigo-50 px-3 py-2 text-xs font-bold text-indigo-700 hover:bg-indigo-100">Edit</button>
+                        <button onclick="showNearbyPoorLocations(${record.id})" class="rounded-lg bg-emerald-50 px-3 py-2 text-xs font-bold text-emerald-700 hover:bg-emerald-100">Cari Miskin</button>
+                        <button onclick="openBantuanForRumah(${record.id})" class="rounded-lg bg-violet-50 px-3 py-2 text-xs font-bold text-violet-700 hover:bg-violet-100">Kelola Bantuan</button>
+                        <button onclick="deleteRumahIbadah(${record.id})" class="rounded-lg bg-red-50 px-3 py-2 text-xs font-bold text-red-700 hover:bg-red-100">Hapus</button>
+                    </div>
+                </div>
+            `;
+        }
+
+        function buildPendudukMiskinPopup(record) {
+            const nearestName = record.rumah_ibadah_nama || '-';
+            const radiusInfo = record.jarak_ke_rumah_ibadah_m != null ? formatDistanceMeters(Number(record.jarak_ke_rumah_ibadah_m)) : '-';
+            const aidStatus = getAidStatusBadge(record.bantuan_status);
+            const aidNote = record.bantuan_catatan ? record.bantuan_catatan : '-';
+
+            return `
+                <div class="w-full p-4">
+                    <h3 class="text-lg font-bold text-slate-800">${record.nama_ketua_kk}</h3>
+                    <p class="mt-1 text-sm text-slate-600">Anggota keluarga: ${record.jumlah_anggota}</p>
+                    <p class="mt-1 text-sm text-slate-600">Rumah ibadah terdekat: ${nearestName}</p>
+                    <p class="mt-1 text-sm text-slate-600">Jarak: ${radiusInfo}</p>
+                    <p class="mt-1 text-sm text-slate-600">Status bantuan: <span class="font-semibold">${aidStatus.label}</span></p>
+                    <p class="mt-1 text-xs text-slate-500">Catatan: ${aidNote}</p>
+                    <div class="mt-4 grid grid-cols-3 gap-2 border-t pt-3">
+                        <button onclick="openPendudukMiskinEditor(${record.id})" class="rounded-lg bg-indigo-50 px-3 py-2 text-xs font-bold text-indigo-700 hover:bg-indigo-100">Edit</button>
+                        <button onclick="deletePendudukMiskin(${record.id})" class="rounded-lg bg-red-50 px-3 py-2 text-xs font-bold text-red-700 hover:bg-red-100">Hapus</button>
+                        <button onclick="focusRegistryItem('rumahIbadah', ${record.rumah_ibadah_id || 0})" class="rounded-lg bg-emerald-50 px-3 py-2 text-xs font-bold text-emerald-700 hover:bg-emerald-100">Lihat Rumah Ibadah</button>
+                    </div>
+                </div>
+            `;
+        }
+
+        function getPoorResidentsInRumahRadius(rumahRecord) {
+            if (!rumahRecord) return [];
+
+            const radius = Number(rumahRecord.radius_m || 0);
+            const rumahLat = Number(rumahRecord.latitude);
+            const rumahLng = Number(rumahRecord.longitude);
+
+            if (!Number.isFinite(radius) || !Number.isFinite(rumahLat) || !Number.isFinite(rumahLng)) {
+                return [];
+            }
+
+            return pendudukMiskinRecords
+                .map(item => {
+                    const distance = distanceMeters(rumahLat, rumahLng, Number(item.latitude), Number(item.longitude));
+                    return { ...item, _distanceToRumah: distance };
+                })
+                .filter(item => {
+                    if (!Number.isFinite(item._distanceToRumah) || item._distanceToRumah > radius) {
+                        return false;
+                    }
+
+                    if (item.rumah_ibadah_id != null) {
+                        return Number(item.rumah_ibadah_id) === Number(rumahRecord.id);
+                    }
+
+                    const nearest = findNearestRumahIbadah(Number(item.latitude), Number(item.longitude));
+                    return nearest && Number(nearest.record.id) === Number(rumahRecord.id);
+                })
+                .sort((a, b) => a._distanceToRumah - b._distanceToRumah);
+        }
+
+        function openRumahIbadahEditor(id) {
+            const record = rumahIbadahRecords.find(item => Number(item.id) === Number(id));
+            if (!record) {
+                showMessage('Rumah ibadah tidak ditemukan', 'bg-red-600 text-white');
+                return;
+            }
+
+            openRumahIbadahModal(Number(record.latitude), Number(record.longitude), record);
+        }
+
+        function openPendudukMiskinEditor(id) {
+            const record = pendudukMiskinRecords.find(item => Number(item.id) === Number(id));
+            if (!record) {
+                showMessage('Data penduduk miskin tidak ditemukan', 'bg-red-600 text-white');
+                return;
+            }
+
+            openPendudukMiskinModal(Number(record.latitude), Number(record.longitude), record);
+        }
+
+        function showNearbyPoorLocations(rumahIbadahId) {
+            const record = rumahIbadahRecords.find(item => Number(item.id) === Number(rumahIbadahId));
+            if (!record) {
+                showMessage('Rumah ibadah tidak ditemukan', 'bg-red-600 text-white');
+                return;
+            }
+
+            selectedRumahIbadahId = Number(rumahIbadahId);
+            const withinRadius = getPoorResidentsInRumahRadius(record);
+
+            if (!withinRadius.length) {
+                showMessage('Belum ada penduduk miskin di dalam radius ini', 'bg-amber-600 text-white');
+                return;
+            }
+
+            const bounds = L.latLngBounds(withinRadius.map(item => [Number(item.latitude), Number(item.longitude)]));
+            map.fitBounds(bounds.pad(0.2));
+
+            withinRadius.forEach(item => {
+                const layer = pendudukMiskinLayerMap[item.id];
+                if (layer) {
+                    layer.openPopup();
+                }
+            });
+
+            showMessage(`Menampilkan ${withinRadius.length} lokasi miskin terdekat`, 'bg-emerald-600 text-white');
+        }
+
+        function saveRumahIbadah() {
+            if (!pendingRumahIbadahCoords) {
+                showMessage('Koordinat rumah ibadah tidak ditemukan', 'bg-red-600 text-white');
+                return;
+            }
+
+            const id = document.getElementById('rumahIbadahId').value;
+            const nama = document.getElementById('rumahIbadahNama').value.trim();
+            const alamat = document.getElementById('rumahIbadahAlamat').value.trim();
+            const pic = document.getElementById('rumahIbadahPic').value.trim();
+            const radius = Number(document.getElementById('rumahIbadahRadius').value || 1000);
+
+            if (!nama || !alamat || !pic) {
+                showMessage('Nama, alamat, dan PIC wajib diisi', 'bg-red-600 text-white');
+                return;
+            }
+
+            if (alamat.toLowerCase().includes('mencari alamat')) {
+                showMessage('Alamat masih diproses, tunggu reverse geocode selesai', 'bg-amber-600 text-white');
+                return;
+            }
+
+            const formData = new FormData();
+            formData.append('nama', nama);
+            formData.append('alamat', alamat);
+            formData.append('pic', pic);
+            formData.append('latitude', pendingRumahIbadahCoords.lat);
+            formData.append('longitude', pendingRumahIbadahCoords.lng);
+            formData.append('radius_m', radius);
+
+            const endpoint = id ? 'update_rumah_ibadah.php' : 'save_rumah_ibadah.php';
+            if (id) {
+                formData.append('id', id);
+            }
+
+            fetch(endpoint, { method: 'POST', body: formData })
+                .then(res => parseJsonResponse(res, endpoint))
+                .then(data => {
+                    if (data.status === 'success') {
+                        showMessage('✅ Rumah ibadah berhasil disimpan', 'bg-green-600 text-white');
+                        closeRumahIbadahModal();
+                        loadRumahIbadah(true);
+                    } else {
+                        throw new Error(data.message || 'Gagal menyimpan rumah ibadah');
+                    }
+                })
+                .catch(err => showMessage(err.message || 'Gagal menyimpan rumah ibadah', 'bg-red-600 text-white'));
+        }
+
+        function deleteRumahIbadah(id) {
+            if (!confirm('Hapus rumah ibadah ini?')) return;
+
+            const formData = new FormData();
+            formData.append('id', id);
+
+            fetch('delete_rumah_ibadah.php', { method: 'POST', body: formData })
+                .then(res => parseJsonResponse(res, 'delete_rumah_ibadah.php'))
+                .then(data => {
+                    if (data.status === 'success') {
+                        showMessage('🗑️ Rumah ibadah berhasil dihapus', 'bg-orange-600 text-white');
+                        loadRumahIbadah(true);
+                        loadPendudukMiskin(true);
+                    } else {
+                        throw new Error(data.message || 'Gagal menghapus rumah ibadah');
+                    }
+                })
+                .catch(err => showMessage(err.message || 'Gagal menghapus rumah ibadah', 'bg-red-600 text-white'));
+        }
+
+        function savePendudukMiskin() {
+            if (!pendingPendudukMiskinCoords) {
+                showMessage('Koordinat penduduk miskin tidak ditemukan', 'bg-red-600 text-white');
+                return;
+            }
+
+            const id = document.getElementById('pendudukMiskinId').value;
+            const namaKetuaKk = document.getElementById('pendudukMiskinNama').value.trim();
+            const jumlahAnggota = Number(document.getElementById('pendudukMiskinAnggota').value || 0);
+            const nearest = findNearestRumahIbadah(pendingPendudukMiskinCoords.lat, pendingPendudukMiskinCoords.lng);
+
+            if (!namaKetuaKk || jumlahAnggota <= 0) {
+                showMessage('Nama ketua KK dan jumlah anggota wajib diisi', 'bg-red-600 text-white');
+                return;
+            }
+
+            if (!nearest) {
+                showMessage('Tambahkan rumah ibadah terlebih dahulu', 'bg-red-600 text-white');
+                return;
+            }
+
+            const formData = new FormData();
+            formData.append('nama_ketua_kk', namaKetuaKk);
+            formData.append('jumlah_anggota', jumlahAnggota);
+            formData.append('latitude', pendingPendudukMiskinCoords.lat);
+            formData.append('longitude', pendingPendudukMiskinCoords.lng);
+            formData.append('rumah_ibadah_id', nearest.record.id);
+            formData.append('rumah_ibadah_nama', nearest.record.nama);
+            formData.append('jarak_ke_rumah_ibadah_m', nearest.distance.toFixed(2));
+
+            const endpoint = id ? 'update_penduduk_miskin.php' : 'save_penduduk_miskin.php';
+            if (id) {
+                formData.append('id', id);
+            }
+
+            fetch(endpoint, { method: 'POST', body: formData })
+                .then(res => parseJsonResponse(res, endpoint))
+                .then(data => {
+                    if (data.status === 'success') {
+                        showMessage('✅ Penduduk miskin berhasil disimpan', 'bg-green-600 text-white');
+                        closePendudukMiskinModal();
+                        loadPendudukMiskin(true);
+                        loadRumahIbadah(true);
+                    } else {
+                        throw new Error(data.message || 'Gagal menyimpan penduduk miskin');
+                    }
+                })
+                .catch(err => showMessage(err.message || 'Gagal menyimpan penduduk miskin', 'bg-red-600 text-white'));
+        }
+
+        function deletePendudukMiskin(id) {
+            if (!confirm('Hapus data penduduk miskin ini?')) return;
+
+            const formData = new FormData();
+            formData.append('id', id);
+
+            fetch('delete_penduduk_miskin.php', { method: 'POST', body: formData })
+                .then(res => parseJsonResponse(res, 'delete_penduduk_miskin.php'))
+                .then(data => {
+                    if (data.status === 'success') {
+                        showMessage('🗑️ Data penduduk miskin berhasil dihapus', 'bg-orange-600 text-white');
+                        loadPendudukMiskin(true);
+                        loadRumahIbadah(true);
+                    } else {
+                        throw new Error(data.message || 'Gagal menghapus data');
+                    }
+                })
+                .catch(err => showMessage(err.message || 'Gagal menghapus data', 'bg-red-600 text-white'));
+        }
+
+        function createRumahIbadahIcon() {
+            return L.divIcon({
+                className: 'custom-marker',
+                html: `<svg width="32" height="40" viewBox="0 0 24 24" fill="#0f766e" xmlns="http://www.w3.org/2000/svg"><path d="M12 2 4 7v15h16V7z"/><path d="M9 22v-8h6v8" fill="#fff" opacity="0.85"/></svg>`,
+                iconSize: [32, 40],
+                iconAnchor: [16, 40],
+                popupAnchor: [0, -40]
+            });
+        }
+
+        function createPendudukMiskinIcon() {
+            return L.divIcon({
+                className: 'custom-marker',
+                html: `<svg width="32" height="40" viewBox="0 0 24 24" fill="#b91c1c" xmlns="http://www.w3.org/2000/svg"><circle cx="12" cy="8" r="4"/><path d="M4 22a8 8 0 0 1 16 0"/></svg>`,
+                iconSize: [32, 40],
+                iconAnchor: [16, 40],
+                popupAnchor: [0, -40]
+            });
+        }
+
+        function clearRumahIbadahLayers() {
+            rumahIbadahLayer.clearLayers();
+            rumahIbadahLayerMap = {};
+        }
+
+        function clearPendudukMiskinLayers() {
+            pendudukMiskinLayer.clearLayers();
+            pendudukMiskinLayerMap = {};
+        }
+
+        function refreshRumahIbadahPopups() {
+            Object.values(rumahIbadahLayerMap).forEach(entry => {
+                if (!entry || !entry.record) return;
+                const popupContent = buildRumahIbadahPopup(entry.record);
+                if (entry.marker) entry.marker.bindPopup(popupContent);
+                if (entry.circle) entry.circle.bindPopup(popupContent);
+            });
+        }
+
+        function loadRumahIbadah(force = false) {
+            if (!force && (document.hidden || suppressAutoReload)) return;
+
+            fetch('get_rumah_ibadah.php')
+                .then(res => {
+                    if (!res.ok) throw new Error('HTTP Error: ' + res.status);
+                    return res.text();
+                })
+                .then(text => {
+                    const data = JSON.parse(text);
+                    if (!Array.isArray(data)) {
+                        throw new Error('Format data rumah ibadah tidak valid');
+                    }
+
+                    rumahIbadahRecords = data;
+                    clearRumahIbadahLayers();
+
+                    data.forEach(record => {
+                        const marker = L.marker([Number(record.latitude), Number(record.longitude)], {
+                            icon: createRumahIbadahIcon()
+                        }).addTo(rumahIbadahLayer);
+                        const circle = L.circle([Number(record.latitude), Number(record.longitude)], {
+                            radius: Number(record.radius_m || 1000),
+                            color: '#0f766e',
+                            weight: 2,
+                            fillColor: '#14b8a6',
+                            fillOpacity: 0.12
+                        }).addTo(rumahIbadahLayer);
+
+                        marker.bindPopup(buildRumahIbadahPopup(record));
+                        circle.bindPopup(buildRumahIbadahPopup(record));
+
+                        rumahIbadahLayerMap[record.id] = { marker, circle, record };
+                    });
+
+                    renderInputRegistry();
+                    const bantuanPanel = document.getElementById('bantuanDrawer');
+                    if (bantuanPanel && !bantuanPanel.classList.contains('hidden-drawer')) {
+                        renderBantuanDrawer();
+                    }
+                })
+                .catch(err => console.error('Gagal memuat rumah ibadah:', err));
+        }
+
+        function loadPendudukMiskin(force = false) {
+            if (!force && (document.hidden || suppressAutoReload)) return;
+
+            fetch('get_penduduk_miskin.php')
+                .then(res => {
+                    if (!res.ok) throw new Error('HTTP Error: ' + res.status);
+                    return res.text();
+                })
+                .then(text => {
+                    const data = JSON.parse(text);
+                    if (!Array.isArray(data)) {
+                        throw new Error('Format data penduduk miskin tidak valid');
+                    }
+
+                    pendudukMiskinRecords = data;
+                    clearPendudukMiskinLayers();
+
+                    data.forEach(record => {
+                        const marker = L.marker([Number(record.latitude), Number(record.longitude)], {
+                            icon: createPendudukMiskinIcon()
+                        }).addTo(pendudukMiskinLayer);
+
+                        marker.bindPopup(buildPendudukMiskinPopup(record));
+                        pendudukMiskinLayerMap[record.id] = marker;
+                    });
+
+                    refreshRumahIbadahPopups();
+                    const bantuanPanel = document.getElementById('bantuanDrawer');
+                    if (bantuanPanel && !bantuanPanel.classList.contains('hidden-drawer')) {
+                        renderBantuanDrawer();
+                    }
+
+                    renderInputRegistry();
+                })
+                .catch(err => console.error('Gagal memuat penduduk miskin:', err));
+        }
+
         function convertCircleToPolygon(circleLayer, vertices = 48) {
             const center = circleLayer.getLatLng();
             const radius = Number(circleLayer.getRadius() || 0);
@@ -1672,6 +2828,49 @@
             return featureLayerMap[id] || null;
         }
 
+        function addSpatialFeatureLayer(layer, type) {
+            featureLayer.addLayer(layer);
+
+            if (type === 'polyline') {
+                jalanLayerGroup.addLayer(layer);
+                return;
+            }
+
+            if (type === 'polygon') {
+                polygonLayerGroup.addLayer(layer);
+            }
+        }
+
+        function removeSpatialFeatureLayer(layer, type) {
+            featureLayer.removeLayer(layer);
+
+            if (type === 'polyline') {
+                jalanLayerGroup.removeLayer(layer);
+                return;
+            }
+
+            if (type === 'polygon') {
+                polygonLayerGroup.removeLayer(layer);
+            }
+        }
+
+        function setSpatialOverlayVisibility(visible) {
+            const overlayLayers = [jalanLayerGroup, polygonLayerGroup, roadDamageLayer, roadNetworkLayer, rumahIbadahLayer, pendudukMiskinLayer];
+
+            if (visible) {
+                hiddenLayersDuringChoropleth.forEach(layer => {
+                    if (!map.hasLayer(layer)) {
+                        map.addLayer(layer);
+                    }
+                });
+                hiddenLayersDuringChoropleth = [];
+                return;
+            }
+
+            hiddenLayersDuringChoropleth = overlayLayers.filter(layer => map.hasLayer(layer));
+            hiddenLayersDuringChoropleth.forEach(layer => map.removeLayer(layer));
+        }
+
         function clearFeatureInput() {
             document.getElementById('modeMeasure').value = '';
             document.getElementById('newFeatureName').value = '';
@@ -1709,7 +2908,8 @@
             const modal = document.getElementById('newFeatureModal');
 
             if (removeLayer && pendingNewFeatureLayer) {
-                featureLayer.removeLayer(pendingNewFeatureLayer);
+                const pendingType = pendingNewFeatureLayer.featureType || document.getElementById('featureType').value;
+                removeSpatialFeatureLayer(pendingNewFeatureLayer, pendingType);
             }
 
             modal.classList.add('hidden');
@@ -1736,6 +2936,8 @@
 
                     featureRecords = data;
                     featureLayer.clearLayers();
+                    jalanLayerGroup.clearLayers();
+                    polygonLayerGroup.clearLayers();
                     featureLayerMap = {};
 
                     data.forEach(feature => {
@@ -1747,14 +2949,14 @@
                             layer.featureData = feature;
                             layer.featureType = 'polyline';
                             featureLayerMap[feature.id] = layer;
-                            featureLayer.addLayer(layer);
+                            addSpatialFeatureLayer(layer, 'polyline');
                             layer.bindPopup(getFeaturePopup(feature));
                         } else if (feature.type === 'polygon') {
                             const layer = L.polygon(geometry, { color, fillColor: color, fillOpacity: 0.25, weight: 3 });
                             layer.featureData = feature;
                             layer.featureType = 'polygon';
                             featureLayerMap[feature.id] = layer;
-                            featureLayer.addLayer(layer);
+                            addSpatialFeatureLayer(layer, 'polygon');
                             layer.bindPopup(getFeaturePopup(feature));
                         }
                     });
@@ -1799,12 +3001,12 @@
                         clearFeatureInput();
                         closeNewFeatureModal(false);
                     } else {
-                        featureLayer.removeLayer(layer);
+                        removeSpatialFeatureLayer(layer, type);
                         throw new Error(data.message || 'Gagal menyimpan fitur');
                     }
                 })
                 .catch(err => {
-                    featureLayer.removeLayer(layer);
+                    removeSpatialFeatureLayer(layer, type);
                     showMessage(err.message || 'Gagal menyimpan fitur', 'bg-red-600 text-white');
                 })
                 .finally(() => {
@@ -2015,7 +3217,7 @@
                 .then(res => parseJsonResponse(res, 'delete_feature.php'))
                 .then(data => {
                     if (data.status === 'success') {
-                        if (layer) featureLayer.removeLayer(layer);
+                        if (layer) removeSpatialFeatureLayer(layer, layer.featureType || 'polyline');
                         delete featureLayerMap[id];
                         featureRecords = featureRecords.filter(feature => Number(feature.id) !== Number(id));
                         renderInputRegistry();
@@ -2125,7 +3327,7 @@
             }
 
             pendingShape = layer;
-            featureLayer.addLayer(layer);
+            addSpatialFeatureLayer(layer, activeType);
             updateFeatureMeasurePreview();
             isFeatureDrawing = false;
             suppressAutoReload = !!document.querySelector('[id^="edit-mode-"]:not(.hidden)');
@@ -2181,8 +3383,23 @@
                 'SPBU Buka 24 Jam': spbuBuka24JamLayer,
                 'SPBU Tidak Buka 24 Jam': spbuTidak24JamLayer
             }, {
-                collapsed: false,
-                position: 'topright'
+                collapsed: true,
+                position: 'topleft'
+            }).addTo(map);
+        }
+
+        function ensureSpatialLayerControl() {
+            if (spatialLayerControl) return;
+
+            spatialLayerControl = L.control.layers(null, {
+                'Jalan': jalanLayerGroup,
+                'Polygon': polygonLayerGroup,
+                'Jalan Rusak': roadDamageLayer,
+                'Rumah Ibadah': rumahIbadahLayer,
+                'Penduduk Miskin': pendudukMiskinLayer
+            }, {
+                collapsed: true,
+                position: 'topleft'
             }).addTo(map);
         }
 
@@ -2193,12 +3410,49 @@
             utilityControl.onAdd = function() {
                 const container = L.DomUtil.create('div', 'leaflet-bar');
 
+                function setUtilityModeActive(activeMode) {
+                    rumahIbadahBtn.classList.toggle('active', activeMode === 'rumahIbadah');
+                    pendudukMiskinBtn.classList.toggle('active', activeMode === 'pendudukMiskin');
+                    choroplethBtn.classList.toggle('active', activeMode === 'choropleth');
+                    roadDamageBtn.classList.toggle('active', activeMode === 'roadDamage');
+                }
+
                 const registryBtn = L.DomUtil.create('a', '', container);
                 registryBtn.href = '#';
                 registryBtn.id = 'leafletRegistryBtn';
                 registryBtn.title = 'Buka Registry';
                 registryBtn.innerHTML = 'Rg';
 
+                const layerBtn = L.DomUtil.create('a', '', container);
+                layerBtn.href = '#';
+                layerBtn.id = 'leafletLayerBtn';
+                layerBtn.title = 'Layer';
+                layerBtn.innerHTML = 'Ly';
+
+                const bantuanBtn = L.DomUtil.create('a', '', container);
+                bantuanBtn.href = '#';
+                bantuanBtn.id = 'leafletBantuanBtn';
+                bantuanBtn.title = 'Manajemen Bantuan';
+                bantuanBtn.innerHTML = 'Bn';
+
+                const rumahIbadahBtn = L.DomUtil.create('a', '', container);
+                rumahIbadahBtn.href = '#';
+                rumahIbadahBtn.id = 'leafletRumahIbadahBtn';
+                rumahIbadahBtn.title = 'Input Rumah Ibadah';
+                rumahIbadahBtn.innerHTML = 'Ri';
+
+                const pendudukMiskinBtn = L.DomUtil.create('a', '', container);
+                pendudukMiskinBtn.href = '#';
+                pendudukMiskinBtn.id = 'leafletPendudukMiskinBtn';
+                pendudukMiskinBtn.title = 'Input Penduduk Miskin';
+                pendudukMiskinBtn.innerHTML = 'Pm';
+
+                const choroplethBtn = L.DomUtil.create('a', '', container);
+                choroplethBtn.href = '#';
+                choroplethBtn.id = 'leafletChoroplethBtn';
+                choroplethBtn.title = 'Tampilkan Choropleth Kecamatan';
+                choroplethBtn.innerHTML = 'Ch';
+
                 const roadDamageBtn = L.DomUtil.create('a', '', container);
                 roadDamageBtn.href = '#';
                 roadDamageBtn.id = 'leafletRoadDamageBtn';
@@ -2212,11 +3466,45 @@
                     toggleInputRegistry();
                 });
 
+                L.DomEvent.on(layerBtn, 'click', function(event) {
+                    L.DomEvent.stop(event);
+                    toggleLayerDrawer();
+                });
+
+                L.DomEvent.on(bantuanBtn, 'click', function(event) {
+                    L.DomEvent.stop(event);
+                    toggleBantuanDrawer();
+                });
+
+                L.DomEvent.on(rumahIbadahBtn, 'click', function(event) {
+                    L.DomEvent.stop(event);
+                    setDataMode('rumahIbadah');
+                    toggleInputRegistry(false);
+                    setUtilityModeActive('rumahIbadah');
+                    showMessage('Mode rumah ibadah aktif. Klik peta untuk menambah lokasi.', 'bg-indigo-600 text-white');
+                });
+
+                L.DomEvent.on(pendudukMiskinBtn, 'click', function(event) {
+                    L.DomEvent.stop(event);
+                    setDataMode('pendudukMiskin');
+                    toggleInputRegistry(false);
+                    setUtilityModeActive('pendudukMiskin');
+                    showMessage('Mode penduduk miskin aktif. Klik peta untuk menambah lokasi.', 'bg-rose-600 text-white');
+                });
+
+                L.DomEvent.on(choroplethBtn, 'click', function(event) {
+                    L.DomEvent.stop(event);
+                    setDataMode('choropleth');
+                    toggleInputRegistry(false);
+                    setUtilityModeActive('choropleth');
+                    showMessage('Mode choropleth aktif. Klik kecamatan untuk melihat populasi.', 'bg-slate-700 text-white');
+                });
+
                 L.DomEvent.on(roadDamageBtn, 'click', function(event) {
                     L.DomEvent.stop(event);
                     setDataMode('roadDamage');
                     toggleInputRegistry(false);
-                    roadDamageBtn.classList.add('active');
+                    setUtilityModeActive('roadDamage');
                     showMessage('Mode laporan jalan rusak aktif. Klik peta untuk menandai lokasi.', 'bg-red-600 text-white');
                 });
 
@@ -2452,6 +3740,16 @@
                 return;
             }
 
+            if (appMode === 'rumahIbadah') {
+                openRumahIbadahModal(e.latlng.lat, e.latlng.lng);
+                return;
+            }
+
+            if (appMode === 'pendudukMiskin') {
+                openPendudukMiskinModal(e.latlng.lat, e.latlng.lng);
+                return;
+            }
+
             if (appMode !== 'point') return;
 
             openNewLocationPopup(e.latlng.lat, e.latlng.lng);
@@ -2488,6 +3786,8 @@
             autoRefreshTimer = setInterval(() => {
                 loadMarkers({ silent: true });
                 loadFeatures();
+                loadRumahIbadah();
+                loadPendudukMiskin();
             }, REFRESH_INTERVAL_MS);
         }
 
@@ -2495,6 +3795,8 @@
             if (!document.hidden) {
                 loadMarkers({ silent: true, force: true });
                 loadFeatures(true);
+                loadRumahIbadah(true);
+                loadPendudukMiskin(true);
             }
         });
 
@@ -2529,13 +3831,15 @@
         }
 
         window.onload = function () {
-            ensureSpbuLayerControl();
             ensureLeafletUtilityControl();
+            bindLayerDrawerEvents();
             updateDrawControl();
             setDataMode('view');
             enforceRegistryDateRange(false);
             loadMarkers({ force: true });
             loadFeatures(true);
+            loadRumahIbadah(true);
+            loadPendudukMiskin(true);
             loadRoadDamage(true);
             loadExternalRoadNetwork(true);
             startAutoRefresh();
@@ -2551,6 +3855,8 @@
         document.getElementById('modePointBtn').addEventListener('click', () => setDataMode('point'));
         document.getElementById('modePolylineBtn').addEventListener('click', () => setDataMode('polyline'));
         document.getElementById('modePolygonBtn').addEventListener('click', () => setDataMode('polygon'));
+        document.getElementById('modeRumahIbadahBtn').addEventListener('click', () => setDataMode('rumahIbadah'));
+        document.getElementById('modePendudukMiskinBtn').addEventListener('click', () => setDataMode('pendudukMiskin'));
         document.getElementById('modeChoroplethBtn').addEventListener('click', () => setDataMode('choropleth'));
         document.getElementById('modeRoadDamageBtn').addEventListener('click', () => setDataMode('roadDamage'));
         const miniModePointBtn = document.getElementById('miniModePointBtn');
@@ -2574,14 +3880,48 @@
                 startDraw();
             });
         }
+        const miniModeRumahIbadahBtn = document.getElementById('miniModeRumahIbadahBtn');
+        if (miniModeRumahIbadahBtn) {
+            miniModeRumahIbadahBtn.addEventListener('click', () => {
+                setDataMode('rumahIbadah');
+                showMessage('Klik peta untuk menambah rumah ibadah', 'bg-indigo-600 text-white');
+            });
+        }
+        const miniModePendudukMiskinBtn = document.getElementById('miniModePendudukMiskinBtn');
+        if (miniModePendudukMiskinBtn) {
+            miniModePendudukMiskinBtn.addEventListener('click', () => {
+                setDataMode('pendudukMiskin');
+                showMessage('Klik peta untuk menambah penduduk miskin', 'bg-indigo-600 text-white');
+            });
+        }
         const toggleRegistryDrawerBtn = document.getElementById('toggleRegistryDrawerBtn');
         if (toggleRegistryDrawerBtn) {
             toggleRegistryDrawerBtn.addEventListener('click', () => toggleInputRegistry());
         }
+        const toggleBantuanDrawerBtn = document.getElementById('toggleBantuanDrawerBtn');
+        if (toggleBantuanDrawerBtn) {
+            toggleBantuanDrawerBtn.addEventListener('click', () => toggleBantuanDrawer());
+        }
         const registryDrawerCloseBtn = document.getElementById('registryDrawerCloseBtn');
         if (registryDrawerCloseBtn) {
             registryDrawerCloseBtn.addEventListener('click', () => toggleInputRegistry(false));
         }
+        const bantuanDrawerCloseBtn = document.getElementById('bantuanDrawerCloseBtn');
+        if (bantuanDrawerCloseBtn) {
+            bantuanDrawerCloseBtn.addEventListener('click', () => toggleBantuanDrawer(false));
+        }
+        const bantuanRumahFilter = document.getElementById('bantuanRumahFilter');
+        if (bantuanRumahFilter) {
+            bantuanRumahFilter.addEventListener('change', renderBantuanDrawer);
+        }
+        const bantuanStatusFilter = document.getElementById('bantuanStatusFilter');
+        if (bantuanStatusFilter) {
+            bantuanStatusFilter.addEventListener('change', renderBantuanDrawer);
+        }
+        const bantuanSearchQuery = document.getElementById('bantuanSearchQuery');
+        if (bantuanSearchQuery) {
+            bantuanSearchQuery.addEventListener('input', renderBantuanDrawer);
+        }
         const toggleMainPanelBtn = document.getElementById('toggleMainPanelBtn');
         if (toggleMainPanelBtn) {
             toggleMainPanelBtn.addEventListener('click', () => toggleMainPanel());
@@ -2678,6 +4018,21 @@
             if (event.target.id === 'newFeatureModal') closeNewFeatureModal(true);
         });
 
+        document.getElementById('saveRumahIbadahBtn').addEventListener('click', saveRumahIbadah);
+        document.getElementById('cancelRumahIbadahBtn').addEventListener('click', closeRumahIbadahModal);
+        document.getElementById('closeRumahIbadahModalBtn').addEventListener('click', closeRumahIbadahModal);
+        document.getElementById('rumahIbadahRadius').addEventListener('input', (event) => syncRumahIbadahRadius(event.target.value));
+        document.getElementById('rumahIbadahModal').addEventListener('click', (event) => {
+            if (event.target.id === 'rumahIbadahModal') closeRumahIbadahModal();
+        });
+
+        document.getElementById('savePendudukMiskinBtn').addEventListener('click', savePendudukMiskin);
+        document.getElementById('cancelPendudukMiskinBtn').addEventListener('click', closePendudukMiskinModal);
+        document.getElementById('closePendudukMiskinModalBtn').addEventListener('click', closePendudukMiskinModal);
+        document.getElementById('pendudukMiskinModal').addEventListener('click', (event) => {
+            if (event.target.id === 'pendudukMiskinModal') closePendudukMiskinModal();
+        });
+
         // Road Damage Modal Event Listeners
         document.getElementById('saveRoadDamageBtn').addEventListener('click', saveRoadDamage);
         document.getElementById('cancelRoadDamageBtn').addEventListener('click', closeRoadDamageModal);
diff --git a/save_penduduk_miskin.php b/save_penduduk_miskin.php
new file mode 100644
index 0000000..18b4c51
--- /dev/null
+++ b/save_penduduk_miskin.php
@@ -0,0 +1,80 @@
+<?php
+header('Content-Type: application/json');
+include 'db_config.php';
+
+function distanceMeters($lat1, $lng1, $lat2, $lng2) {
+    $earthRadius = 6371000;
+    $toRadians = function ($value) {
+        return $value * M_PI / 180;
+    };
+
+    $deltaLat = $toRadians($lat2 - $lat1);
+    $deltaLng = $toRadians($lng2 - $lng1);
+    $a = sin($deltaLat / 2) * sin($deltaLat / 2) + cos($toRadians($lat1)) * cos($toRadians($lat2)) * sin($deltaLng / 2) * sin($deltaLng / 2);
+
+    return 2 * $earthRadius * atan2(sqrt($a), sqrt(1 - $a));
+}
+
+function findNearestRumahIbadah($conn, $lat, $lng) {
+    $result = $conn->query("SELECT id, nama, latitude, longitude FROM rumah_ibadah ORDER BY created_at DESC");
+    if (!$result || $result->num_rows === 0) {
+        return null;
+    }
+
+    $nearest = null;
+    while ($row = $result->fetch_assoc()) {
+        $distance = distanceMeters($lat, $lng, (float)$row['latitude'], (float)$row['longitude']);
+        if ($nearest === null || $distance < $nearest['distance']) {
+            $nearest = [
+                'id' => (int)$row['id'],
+                'nama' => $row['nama'],
+                'distance' => $distance
+            ];
+        }
+    }
+
+    return $nearest;
+}
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $namaKetuaKk = trim($_POST['nama_ketua_kk'] ?? '');
+    $jumlahAnggota = (int)($_POST['jumlah_anggota'] ?? 0);
+    $lat = $_POST['latitude'] ?? null;
+    $lng = $_POST['longitude'] ?? null;
+    $rumahIbadahId = $_POST['rumah_ibadah_id'] ?? null;
+    $rumahIbadahNama = trim($_POST['rumah_ibadah_nama'] ?? '');
+    $jarak = $_POST['jarak_ke_rumah_ibadah_m'] ?? null;
+
+    if ($namaKetuaKk === '' || $jumlahAnggota <= 0 || $lat === null || $lng === null) {
+        echo json_encode(['status' => 'error', 'message' => 'Data penduduk miskin tidak lengkap']);
+        $conn->close();
+        exit;
+    }
+
+    $lat = (float)$lat;
+    $lng = (float)$lng;
+    $nearest = findNearestRumahIbadah($conn, $lat, $lng);
+
+    if (!$nearest) {
+        echo json_encode(['status' => 'error', 'message' => 'Tambahkan rumah ibadah terlebih dahulu']);
+        $conn->close();
+        exit;
+    }
+
+    $jarak = $nearest['distance'];
+    $rumahIbadahId = $nearest['id'];
+    $rumahIbadahNama = $nearest['nama'];
+
+    $stmt = $conn->prepare("INSERT INTO penduduk_miskin (nama_ketua_kk, jumlah_anggota, latitude, longitude, rumah_ibadah_id, rumah_ibadah_nama, jarak_ke_rumah_ibadah_m) VALUES (?, ?, ?, ?, ?, ?, ?)");
+    $stmt->bind_param("siddisd", $namaKetuaKk, $jumlahAnggota, $lat, $lng, $rumahIbadahId, $rumahIbadahNama, $jarak);
+
+    if ($stmt->execute()) {
+        echo json_encode(['status' => 'success', 'message' => 'Penduduk miskin berhasil disimpan']);
+    } else {
+        echo json_encode(['status' => 'error', 'message' => $stmt->error]);
+    }
+
+    $stmt->close();
+}
+$conn->close();
+?>
\ No newline at end of file
diff --git a/save_rumah_ibadah.php b/save_rumah_ibadah.php
new file mode 100644
index 0000000..0f2481f
--- /dev/null
+++ b/save_rumah_ibadah.php
@@ -0,0 +1,35 @@
+<?php
+header('Content-Type: application/json');
+include 'db_config.php';
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $nama = trim($_POST['nama'] ?? '');
+    $alamat = trim($_POST['alamat'] ?? '');
+    $pic = trim($_POST['pic'] ?? '');
+    $lat = $_POST['latitude'] ?? null;
+    $lng = $_POST['longitude'] ?? null;
+    $radius = $_POST['radius_m'] ?? 1000;
+
+    if ($nama === '' || $alamat === '' || $pic === '' || $lat === null || $lng === null) {
+        echo json_encode(['status' => 'error', 'message' => 'Data rumah ibadah tidak lengkap']);
+        $conn->close();
+        exit;
+    }
+
+    $lat = (float)$lat;
+    $lng = (float)$lng;
+    $radius = max(50, (int)$radius);
+
+    $stmt = $conn->prepare("INSERT INTO rumah_ibadah (nama, alamat, pic, latitude, longitude, radius_m) VALUES (?, ?, ?, ?, ?, ?)");
+    $stmt->bind_param("sssddi", $nama, $alamat, $pic, $lat, $lng, $radius);
+
+    if ($stmt->execute()) {
+        echo json_encode(['status' => 'success', 'message' => 'Rumah ibadah berhasil disimpan']);
+    } else {
+        echo json_encode(['status' => 'error', 'message' => $stmt->error]);
+    }
+
+    $stmt->close();
+}
+$conn->close();
+?>
\ No newline at end of file
diff --git a/test_features.html b/test_features.html
new file mode 100644
index 0000000..ffc8094
--- /dev/null
+++ b/test_features.html
@@ -0,0 +1,278 @@
+<!DOCTYPE html>
+<html lang="id">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Test GIS Features</title>
+    <style>
+        * { margin: 0; padding: 0; box-sizing: border-box; }
+        body { font-family: system-ui, sans-serif; background: #f1f5f9; padding: 20px; }
+        .container { max-width: 1200px; margin: 0 auto; }
+        .test-section { background: white; margin-bottom: 20px; padding: 20px; border-radius: 8px; box-shadow: 0 1px 3px rgba(0,0,0,0.1); }
+        h2 { color: #1e293b; margin-bottom: 15px; border-bottom: 2px solid #3b82f6; padding-bottom: 10px; }
+        .test-item { margin: 15px 0; padding: 15px; background: #f8fafc; border-left: 4px solid #3b82f6; border-radius: 4px; }
+        .status { font-weight: bold; padding: 5px 10px; border-radius: 4px; display: inline-block; margin-top: 10px; }
+        .success { background: #dcfce7; color: #166534; }
+        .error { background: #fee2e2; color: #991b1b; }
+        .info { background: #dbeafe; color: #1e40af; }
+        button { background: #3b82f6; color: white; border: none; padding: 10px 20px; border-radius: 6px; cursor: pointer; font-weight: bold; margin: 5px; }
+        button:hover { background: #2563eb; }
+        .response { background: #1e293b; color: #10b981; padding: 15px; border-radius: 4px; font-family: monospace; font-size: 12px; margin-top: 10px; max-height: 300px; overflow-y: auto; white-space: pre-wrap; word-wrap: break-word; }
+        input { padding: 8px; margin: 5px; border: 1px solid #cbd5e1; border-radius: 4px; width: 100%; max-width: 400px; }
+    </style>
+</head>
+<body>
+
+<div class="container">
+    <h1 style="margin-bottom: 30px; color: #1e293b;">🔍 GIS Features Debug & Test</h1>
+
+    <!-- Test 1: Database -->
+    <div class="test-section">
+        <h2>📊 Test 1: Database Connection</h2>
+        <div class="test-item">
+            <button onclick="testDatabase()">Test Database Connection</button>
+            <div id="dbResult"></div>
+        </div>
+    </div>
+
+    <!-- Test 2: PHP Endpoints -->
+    <div class="test-section">
+        <h2>🔗 Test 2: Fetch PHP Endpoints</h2>
+        
+        <div class="test-item">
+            <h4>Load Rumah Ibadah Data</h4>
+            <button onclick="testLoadRumahIbadah()">GET /get_rumah_ibadah.php</button>
+            <div id="rumahIbadahResult"></div>
+        </div>
+
+        <div class="test-item">
+            <h4>Load Penduduk Miskin Data</h4>
+            <button onclick="testLoadPendudukMiskin()">GET /get_penduduk_miskin.php</button>
+            <div id="pendudukMiskinResult"></div>
+        </div>
+
+        <div class="test-item">
+            <h4>Load Jalan Rusak Data</h4>
+            <button onclick="testLoadJalanRusak()">GET /get_jalan_rusak.php</button>
+            <div id="jalanRusakResult"></div>
+        </div>
+    </div>
+
+    <!-- Test 3: Save Operations -->
+    <div class="test-section">
+        <h2>💾 Test 3: Save Operations</h2>
+        
+        <div class="test-item">
+            <h4>Test Save Rumah Ibadah</h4>
+            <input type="text" id="namaRumah" placeholder="Nama Rumah Ibadah" value="Test Masjid">
+            <input type="text" id="alamatRumah" placeholder="Alamat" value="Jl. Test No. 1">
+            <input type="text" id="picRumah" placeholder="Nama PIC" value="Test PIC">
+            <input type="number" id="latRumah" placeholder="Latitude" value="-0.012345" step="0.000001">
+            <input type="number" id="lngRumah" placeholder="Longitude" value="109.345678" step="0.000001">
+            <input type="number" id="radiusRumah" placeholder="Radius (m)" value="1000">
+            <button onclick="testSaveRumahIbadah()">Save Test Rumah Ibadah</button>
+            <div id="saveRumahResult"></div>
+        </div>
+    </div>
+
+    <!-- Test 4: DOM Elements -->
+    <div class="test-section">
+        <h2>🎨 Test 4: DOM Elements Check</h2>
+        
+        <div class="test-item">
+            <button onclick="testDOMElements()">Check HTML Elements</button>
+            <div id="domResult"></div>
+        </div>
+    </div>
+
+    <!-- Test 5: Console Monitoring -->
+    <div class="test-section">
+        <h2>📝 Test 5: Event Listener Test</h2>
+        
+        <div class="test-item">
+            <h4>Click Buttons and Check Console</h4>
+            <p>Tombol di bawah akan log ke console jika event listener berfungsi:</p>
+            <button id="testBtnRumahIbadah" onclick="console.log('✓ Rumah Ibadah button clicked')">Test: Rumah Ibadah</button>
+            <button id="testBtnPendudukMiskin" onclick="console.log('✓ Penduduk Miskin button clicked')">Test: Penduduk Miskin</button>
+            <button id="testBtnChoropleth" onclick="console.log('✓ Choropleth button clicked')">Test: Choropleth</button>
+            <p style="margin-top: 10px; color: #666; font-size: 12px;">✓ F12 → Console untuk lihat hasil</p>
+        </div>
+    </div>
+
+    <!-- Summary -->
+    <div class="test-section" style="background: #f0fdf4; border: 2px solid #22c55e;">
+        <h2 style="border-bottom-color: #22c55e;">✅ Summary</h2>
+        <div id="summary">Jalankan semua test di atas untuk diagnosis lengkap.</div>
+    </div>
+
+</div>
+
+<script>
+let testResults = {};
+
+function setResult(id, title, status, message, response = '') {
+    const resultDiv = document.getElementById(id);
+    let html = `<div class="status ${status}">${status.toUpperCase()}</div>`;
+    html += `<div style="margin-top: 10px;"><strong>${title}</strong></div>`;
+    html += `<div style="margin-top: 5px; color: #666;">${message}</div>`;
+    if (response) {
+        html += `<div class="response">${response}</div>`;
+    }
+    resultDiv.innerHTML = html;
+    
+    testResults[id] = status;
+    updateSummary();
+}
+
+function updateSummary() {
+    const summary = document.getElementById('summary');
+    const results = Object.values(testResults);
+    const successCount = results.filter(r => r === 'success').length;
+    const errorCount = results.filter(r => r === 'error').length;
+    
+    let html = `<p><strong>Results:</strong> ✅ ${successCount} passed | ❌ ${errorCount} failed | Total: ${results.length}</p>`;
+    
+    if (errorCount > 0) {
+        html += `<p style="color: #991b1b; margin-top: 10px;">⚠️ Ada ${errorCount} test yang gagal. Cek detail di atas.</p>`;
+    } else if (successCount === results.length && results.length > 0) {
+        html += `<p style="color: #166534; margin-top: 10px;">✅ Semua test berhasil! Fitur seharusnya berfungsi.</p>`;
+    }
+    
+    summary.innerHTML = html;
+}
+
+async function testDatabase() {
+    try {
+        const response = await fetch('create_tables.php', { method: 'GET' });
+        const text = await response.text();
+        
+        if (text.includes('success')) {
+            setResult('dbResult', 'Database & Tables', 'success', 'Database connection OK & tables exist', text.substring(0, 500));
+        } else {
+            setResult('dbResult', 'Database & Tables', 'error', 'Response tidak mengindikasikan success', text.substring(0, 500));
+        }
+    } catch (error) {
+        setResult('dbResult', 'Database & Tables', 'error', error.message);
+    }
+}
+
+async function testLoadRumahIbadah() {
+    try {
+        const response = await fetch('get_rumah_ibadah.php');
+        const text = await response.text();
+        const data = JSON.parse(text);
+        
+        setResult('rumahIbadahResult', 'Load Rumah Ibadah', 'success', 
+            `Loaded ${data.length} records`, JSON.stringify(data, null, 2).substring(0, 1000));
+    } catch (error) {
+        setResult('rumahIbadahResult', 'Load Rumah Ibadah', 'error', error.message);
+    }
+}
+
+async function testLoadPendudukMiskin() {
+    try {
+        const response = await fetch('get_penduduk_miskin.php');
+        const text = await response.text();
+        const data = JSON.parse(text);
+        
+        setResult('pendudukMiskinResult', 'Load Penduduk Miskin', 'success', 
+            `Loaded ${data.length} records`, JSON.stringify(data, null, 2).substring(0, 1000));
+    } catch (error) {
+        setResult('pendudukMiskinResult', 'Load Penduduk Miskin', 'error', error.message);
+    }
+}
+
+async function testLoadJalanRusak() {
+    try {
+        const response = await fetch('get_jalan_rusak.php');
+        const text = await response.text();
+        const data = JSON.parse(text);
+        
+        setResult('jalanRusakResult', 'Load Jalan Rusak', 'success', 
+            `Loaded ${data.length} records`, JSON.stringify(data, null, 2).substring(0, 1000));
+    } catch (error) {
+        setResult('jalanRusakResult', 'Load Jalan Rusak', 'error', error.message);
+    }
+}
+
+async function testSaveRumahIbadah() {
+    try {
+        const formData = new FormData();
+        formData.append('nama', document.getElementById('namaRumah').value);
+        formData.append('alamat', document.getElementById('alamatRumah').value);
+        formData.append('pic', document.getElementById('picRumah').value);
+        formData.append('latitude', document.getElementById('latRumah').value);
+        formData.append('longitude', document.getElementById('lngRumah').value);
+        formData.append('radius_m', document.getElementById('radiusRumah').value);
+        
+        const response = await fetch('save_rumah_ibadah.php', {
+            method: 'POST',
+            body: formData
+        });
+        const text = await response.text();
+        const data = JSON.parse(text);
+        
+        if (data.status === 'success') {
+            setResult('saveRumahResult', 'Save Rumah Ibadah', 'success', 
+                `Data berhasil disimpan. ID: ${data.id}`, JSON.stringify(data, null, 2));
+        } else {
+            setResult('saveRumahResult', 'Save Rumah Ibadah', 'error', 
+                data.message, JSON.stringify(data, null, 2));
+        }
+    } catch (error) {
+        setResult('saveRumahResult', 'Save Rumah Ibadah', 'error', error.message);
+    }
+}
+
+async function testDOMElements() {
+    const elements = [
+        'modeRumahIbadahBtn',
+        'modePendudukMiskinBtn',
+        'modeChoroplethBtn',
+        'rumahIbadahModal',
+        'pendudukMiskinModal',
+        'choroplethPanel',
+        'map',
+        'registryDrawer'
+    ];
+
+    let html = '<div style="margin: 10px 0;"><strong>Checking HTML Elements in index.html:</strong></div>';
+
+    try {
+        const response = await fetch('index.html', { cache: 'no-store' });
+        if (!response.ok) {
+            throw new Error(`Gagal memuat index.html (HTTP ${response.status})`);
+        }
+
+        const source = await response.text();
+        const parser = new DOMParser();
+        const doc = parser.parseFromString(source, 'text/html');
+
+        let allFound = true;
+
+        elements.forEach(id => {
+            const elem = doc.getElementById(id);
+            const status = elem ? '✅' : '❌';
+            const color = elem ? '#166534' : '#991b1b';
+            html += `<div style="color: ${color}; margin: 5px 0;">${status} #${id}</div>`;
+            if (!elem) allFound = false;
+        });
+
+        if (allFound) {
+            setResult('domResult', 'DOM Elements', 'success', 'Semua elements ditemukan di index.html.', html);
+        } else {
+            setResult('domResult', 'DOM Elements', 'error', 'Ada elements yang tidak ditemukan di index.html.', html);
+        }
+    } catch (error) {
+        setResult('domResult', 'DOM Elements', 'error', `Gagal validasi DOM index.html: ${error.message}`);
+    }
+}
+
+// Auto check on load
+window.addEventListener('load', () => {
+    console.log('✅ Test page loaded');
+});
+</script>
+
+</body>
+</html>
diff --git a/update_bantuan_penduduk.php b/update_bantuan_penduduk.php
new file mode 100644
index 0000000..d80d305
--- /dev/null
+++ b/update_bantuan_penduduk.php
@@ -0,0 +1,48 @@
+<?php
+header('Content-Type: application/json');
+include 'db_config.php';
+
+if ($_SERVER['REQUEST_METHOD'] !== 'POST') {
+    http_response_code(405);
+    echo json_encode(['status' => 'error', 'message' => 'Metode tidak diizinkan']);
+    $conn->close();
+    exit;
+}
+
+$id = (int)($_POST['id'] ?? 0);
+$status = strtolower(trim($_POST['bantuan_status'] ?? 'belum'));
+$catatan = trim($_POST['bantuan_catatan'] ?? '');
+
+if ($id <= 0) {
+    echo json_encode(['status' => 'error', 'message' => 'ID tidak valid']);
+    $conn->close();
+    exit;
+}
+
+if (!in_array($status, ['belum', 'proses', 'sudah'], true)) {
+    $status = 'belum';
+}
+
+$stmt = $conn->prepare("UPDATE penduduk_miskin SET bantuan_status = ?, bantuan_catatan = ?, bantuan_updated_at = CURRENT_TIMESTAMP WHERE id = ?");
+$stmt->bind_param("ssi", $status, $catatan, $id);
+
+if ($stmt->execute()) {
+    $updatedAtResult = $conn->query("SELECT bantuan_updated_at FROM penduduk_miskin WHERE id = " . (int)$id . " LIMIT 1");
+    $updatedAt = null;
+    if ($updatedAtResult && $updatedAtResult->num_rows > 0) {
+        $row = $updatedAtResult->fetch_assoc();
+        $updatedAt = $row['bantuan_updated_at'] ?? null;
+    }
+
+    echo json_encode([
+        'status' => 'success',
+        'message' => 'Status bantuan berhasil diperbarui',
+        'bantuan_updated_at' => $updatedAt
+    ]);
+} else {
+    echo json_encode(['status' => 'error', 'message' => $stmt->error]);
+}
+
+$stmt->close();
+$conn->close();
+?>
diff --git a/update_penduduk_miskin.php b/update_penduduk_miskin.php
new file mode 100644
index 0000000..b92f2c9
--- /dev/null
+++ b/update_penduduk_miskin.php
@@ -0,0 +1,82 @@
+<?php
+header('Content-Type: application/json');
+include 'db_config.php';
+
+function distanceMeters($lat1, $lng1, $lat2, $lng2) {
+    $earthRadius = 6371000;
+    $toRadians = function ($value) {
+        return $value * M_PI / 180;
+    };
+
+    $deltaLat = $toRadians($lat2 - $lat1);
+    $deltaLng = $toRadians($lng2 - $lng1);
+    $a = sin($deltaLat / 2) * sin($deltaLat / 2) + cos($toRadians($lat1)) * cos($toRadians($lat2)) * sin($deltaLng / 2) * sin($deltaLng / 2);
+
+    return 2 * $earthRadius * atan2(sqrt($a), sqrt(1 - $a));
+}
+
+function findNearestRumahIbadah($conn, $lat, $lng) {
+    $result = $conn->query("SELECT id, nama, latitude, longitude FROM rumah_ibadah ORDER BY created_at DESC");
+    if (!$result || $result->num_rows === 0) {
+        return null;
+    }
+
+    $nearest = null;
+    while ($row = $result->fetch_assoc()) {
+        $distance = distanceMeters($lat, $lng, (float)$row['latitude'], (float)$row['longitude']);
+        if ($nearest === null || $distance < $nearest['distance']) {
+            $nearest = [
+                'id' => (int)$row['id'],
+                'nama' => $row['nama'],
+                'distance' => $distance
+            ];
+        }
+    }
+
+    return $nearest;
+}
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $id = (int)($_POST['id'] ?? 0);
+    $namaKetuaKk = trim($_POST['nama_ketua_kk'] ?? '');
+    $jumlahAnggota = (int)($_POST['jumlah_anggota'] ?? 0);
+    $lat = $_POST['latitude'] ?? null;
+    $lng = $_POST['longitude'] ?? null;
+    $rumahIbadahId = $_POST['rumah_ibadah_id'] ?? null;
+    $rumahIbadahNama = trim($_POST['rumah_ibadah_nama'] ?? '');
+    $jarak = $_POST['jarak_ke_rumah_ibadah_m'] ?? null;
+
+    if ($id <= 0 || $namaKetuaKk === '' || $jumlahAnggota <= 0 || $lat === null || $lng === null) {
+        echo json_encode(['status' => 'error', 'message' => 'Data penduduk miskin tidak lengkap']);
+        $conn->close();
+        exit;
+    }
+
+    $lat = (float)$lat;
+    $lng = (float)$lng;
+    $nearest = findNearestRumahIbadah($conn, $lat, $lng);
+
+    if (!$nearest) {
+        echo json_encode(['status' => 'error', 'message' => 'Tambahkan rumah ibadah terlebih dahulu']);
+        $conn->close();
+        exit;
+    }
+
+    $jarak = $nearest['distance'];
+    $rumahIbadahId = $nearest['id'];
+    $rumahIbadahNama = $nearest['nama'];
+
+    $stmt = $conn->prepare("UPDATE penduduk_miskin SET nama_ketua_kk = ?, jumlah_anggota = ?, latitude = ?, longitude = ?, rumah_ibadah_id = ?, rumah_ibadah_nama = ?, jarak_ke_rumah_ibadah_m = ? WHERE id = ?");
+    $stmt->bind_param("siddisdi", $namaKetuaKk, $jumlahAnggota, $lat, $lng, $rumahIbadahId, $rumahIbadahNama, $jarak, $id);
+
+    if ($stmt->execute()) {
+        echo json_encode(['status' => 'success', 'message' => 'Data penduduk miskin berhasil diperbarui']);
+    } else {
+        echo json_encode(['status' => 'error', 'message' => $stmt->error]);
+    }
+
+    $stmt->close();
+}
+
+$conn->close();
+?>
diff --git a/update_rumah_ibadah.php b/update_rumah_ibadah.php
new file mode 100644
index 0000000..d0523ef
--- /dev/null
+++ b/update_rumah_ibadah.php
@@ -0,0 +1,36 @@
+<?php
+header('Content-Type: application/json');
+include 'db_config.php';
+
+if ($_SERVER['REQUEST_METHOD'] === 'POST') {
+    $id = (int)($_POST['id'] ?? 0);
+    $nama = trim($_POST['nama'] ?? '');
+    $alamat = trim($_POST['alamat'] ?? '');
+    $pic = trim($_POST['pic'] ?? '');
+    $lat = $_POST['latitude'] ?? null;
+    $lng = $_POST['longitude'] ?? null;
+    $radius = $_POST['radius_m'] ?? 1000;
+
+    if ($id <= 0 || $nama === '' || $alamat === '' || $pic === '' || $lat === null || $lng === null) {
+        echo json_encode(['status' => 'error', 'message' => 'Data rumah ibadah tidak lengkap']);
+        $conn->close();
+        exit;
+    }
+
+    $lat = (float)$lat;
+    $lng = (float)$lng;
+    $radius = max(50, (int)$radius);
+
+    $stmt = $conn->prepare("UPDATE rumah_ibadah SET nama = ?, alamat = ?, pic = ?, latitude = ?, longitude = ?, radius_m = ? WHERE id = ?");
+    $stmt->bind_param("sssddii", $nama, $alamat, $pic, $lat, $lng, $radius, $id);
+
+    if ($stmt->execute()) {
+        echo json_encode(['status' => 'success', 'message' => 'Rumah ibadah berhasil diperbarui']);
+    } else {
+        echo json_encode(['status' => 'error', 'message' => $stmt->error]);
+    }
+
+    $stmt->close();
+}
+$conn->close();
+?>
\ No newline at end of file