commit 7866b7d185d1fecd3028ea3e2983580feb200bb3 Author: Alfnnr Date: Wed Nov 4 14:06:33 2026 +0700 first commit diff --git a/.github/copilot-instructions.md b/.github/copilot-instructions.md new file mode 100644 index 0000000..113874e --- /dev/null +++ b/.github/copilot-instructions.md @@ -0,0 +1,175 @@ +# GitHub Copilot Instructions — Prediksi Harga Cabai + +## Project +This repository is the FastAPI deployment backend for the D4 thesis: +"Analisis Model Long Short-Term Memory dalam Sistem Prediksi Harga Cabai dengan Visualisasi Peta Digital Interaktif di Kabupaten Jember" + +The API serves one-day-ahead LSTM predictions for cabai rawit at: +- Pasar_Tanjung +- Pasar_Kreongan +- Pasar_Tegal_Besar +- Pasar_Mangli +- Pasar_Wirolegi + +## Environment +Use the existing Anaconda environment: +- Conda: tf_gpu39 +- Python: 3.9.23 +- Interpreter: C:\Users\alfia\anaconda3\envs\tf_gpu39\python.exe + +Do not create another Conda environment unless explicitly requested. + +## ML artifacts +The models are already trained and deployed. Do NOT retrain them in the API. + +Each market has: +- model.h5 +- scaler.pkl +- config.json + +Final deployment configuration: +- neurons: 64 +- activation: tanh +- learning_rate: 0.05 +- batch_size: 32 +- epochs: 50 +- optimizer: Adam +- time_step: 7 +- seed: 42 +- shuffle: true + +These values are reference metadata. Do not hard-code predictions. + +## Inference rules +For each request: +1. Accept exactly 7 recent prices. +2. Convert to numeric shape (7, 1). +3. Use the saved market-specific scaler. +4. Transform the 7 values. +5. Reshape to (1, 7, 1). +6. Run the saved .h5 model once. +7. Inverse-transform the output. +8. Return the predicted next price. + +The model unit is thousand rupiah: +- 22.0 means approximately Rp22,000. + +Do not fit a new scaler on request data. + +## Model loading +Load all five model/scaler/config artifacts once during FastAPI startup/lifespan and keep them in memory. + +Do NOT: +- load models on every request +- call model.fit() +- retrain on startup +- recreate a different LSTM architecture when the saved model can be loaded directly + +For inference, loading Keras .h5 with compile=False is preferred. + +## Suggested project structure +C:\PrediksiHargaCabe\ +├── api/ +│ ├── main.py +│ ├── requirements.txt +│ └── models/ +│ └── rawit/ +│ ├── pasar_tanjung/ +│ │ ├── model.h5 +│ │ ├── scaler.pkl +│ │ └── config.json +│ ├── pasar_kreongan/ +│ ├── pasar_tegal_besar/ +│ ├── pasar_mangli/ +│ └── pasar_wirolegi/ +├── website/ +└── .github/ + └── copilot-instructions.md + +Inspect the workspace first and reuse existing files instead of creating duplicates. + +## Required API +Implement at least: + +GET / +Basic status response. + +GET /api/markets +Return Rawit and the five supported markets. + +GET /api/health +Report API status and whether all five model artifacts loaded successfully. + +POST /api/prediction/rawit/{market} +Request example: +{ + "prices": [18, 16, 19, 19, 22, 22, 22] +} + +Response should include: +- chili +- market +- time_step +- input_prices +- predicted_price_thousand +- predicted_price_rupiah + +Use Pydantic validation. + +Reject: +- unknown markets +- fewer/more than 7 prices +- non-numeric values +- NaN/infinite values +- negative prices + +## CORS +Prepare CORS so a React/React Native frontend can call the API during development. Keep allowed origins configurable and avoid recommending unrestricted wildcard CORS for production. + +## Testing +Before declaring the API complete: +1. Start from the `api` directory with: + python -m uvicorn main:app --reload +2. Verify /. +3. Verify /api/markets. +4. Verify /api/health. +5. Verify /docs. +6. Test prediction for all five markets. +7. Compare at least one known API prediction with the validated notebook inference, allowing normal floating-point differences. + +## Thesis safety +Do not silently: +- change hyperparameters +- change time_step +- change the scaler method +- retrain models +- introduce another ML model +- modify the validated ML methodology + +Never call the final configuration a "global optimum". Use wording such as: +"konfigurasi terbaik yang diperoleh dari skema eksperimen yang diterapkan pada dataset penelitian." + +## Agent workflow +Before editing: +1. Inspect the workspace. +2. Inspect existing files and model paths. +3. Reuse correct code. +4. Avoid duplicate entry points or model directories. + +When editing: +1. Make small coherent changes. +2. Preserve validated ML inference logic. +3. Use clear Python/FastAPI structure. +4. Run a practical validation after each important change. +5. If a command fails, inspect and fix the actual error; do not fake success. + +The immediate priority is Rawit only: +1. Build the FastAPI backend. +2. Load the five saved artifacts. +3. Verify startup. +4. Implement /api/markets, /api/health, and /api/prediction/rawit/{market}. +5. Test the API. +6. Prepare it for connection to the thesis frontend. + +Communication preference: +Explain important decisions briefly in Indonesian, give exact commands, state which files are changed, and avoid unrelated technologies. diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..4b5a294 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,4 @@ +{ + "python-envs.defaultEnvManager": "ms-python.python:conda", + "python-envs.defaultPackageManager": "ms-python.python:conda" +} \ No newline at end of file diff --git a/REFERENSI_APLIKASI.md b/REFERENSI_APLIKASI.md new file mode 100644 index 0000000..f6eaae2 --- /dev/null +++ b/REFERENSI_APLIKASI.md @@ -0,0 +1,651 @@ +# Referensi Lengkap Aplikasi Panen Harga + +Dokumen ini menjelaskan aplikasi **Panen Harga**, yaitu sistem prediksi harga cabai +di Kabupaten Jember dengan visualisasi peta digital interaktif. Dokumen ini dapat +digunakan sebagai referensi untuk menjelaskan tujuan aplikasi, arsitektur, fitur, +alur data, teknologi, API, database, model LSTM, pengelolaan scraping, serta +batasan sistem. + +## 1. Identitas dan tujuan aplikasi + +### Nama aplikasi + +**Panen Harga** + +### Tujuan + +Aplikasi digunakan untuk: + +- menampilkan harga cabai berdasarkan pasar di Kabupaten Jember; +- menampilkan lokasi pasar melalui peta digital; +- menghasilkan prediksi harga menggunakan model LSTM yang sudah dilatih; +- membantu pengguna membandingkan harga aktual dan hasil forecast; +- menyediakan panel admin untuk memperbarui data secara manual; +- menyediakan preprocessing terbatas untuk menangani gap data; +- mencatat riwayat scraping dan proses pengolahan data. + +Aplikasi ini bukan marketplace dan tidak melakukan transaksi jual beli. Fokusnya +adalah informasi harga, visualisasi lokasi, dan prediksi harga. + +### Komoditas + +Sistem mendukung tiga komoditas: + +| Slug API | Nama | +|---|---| +| `rawit` | Cabai Rawit | +| `merah` | Cabai Merah Besar | +| `keriting` | Cabai Merah Keriting | + +### Pasar + +Pasar yang terdaftar: + +- Pasar Tanjung +- Pasar Kreongan +- Pasar Tegal Besar +- Pasar Mangli +- Pasar Wirolegi + +Ketersediaan model dapat berbeda untuk setiap komoditas. Saat ini model cabai +merah keriting hanya tersedia untuk pasar yang memiliki artifact lengkap. +Aplikasi tidak membuat prediksi palsu untuk pasar tanpa model atau data. + +## 2. Teknologi dan tools + +### Backend + +- **Bahasa:** Python 3.9 +- **Framework:** Flask +- **Server development:** Werkzeug melalui `app.run` +- **Database driver:** PyMySQL +- **Data processing:** pandas dan NumPy +- **Machine learning runtime:** TensorFlow 2.10 +- **Preprocessing dan scaler:** scikit-learn +- **Pemuat scaler:** joblib atau pickle +- **HTTP scraping:** requests +- **Parsing tabel HTML:** pandas dan lxml +- **Pengujian:** pytest +- **CORS:** flask-cors + +Entry point backend adalah [api/main.py](api/main.py). Aplikasi Flask dibuat +melalui application factory `create_app()`. + +### Frontend + +- **Bahasa:** JavaScript modern dengan JSX +- **Framework:** React 19 +- **Build tool:** Vite +- **Lint:** Oxlint +- **Peta:** Leaflet dan React Leaflet +- **Grafik:** Recharts +- **Ikon:** Lucide React +- **Styling:** CSS biasa melalui `website/src/Public.css` + +### Database + +- **Database:** MySQL/MariaDB +- **Pengelolaan lokal:** phpMyAdmin, XAMPP, Laragon, atau WAMP +- **Nama database default:** `prediksicabe` + +### Model dan artifact + +Setiap kombinasi komoditas/pasar dapat memiliki: + +- `model.h5`: model LSTM yang sudah dilatih; +- `scaler.pkl`: scaler yang digunakan saat training; +- `config.json`: metadata model dan konfigurasi training. + +API memuat artifact satu kali saat startup. API tidak menjalankan training ulang +ketika aplikasi berjalan. + +## 3. Struktur proyek + +Struktur utama: + +```text +C:\PrediksiHargaCabe\ +├── api\ +│ ├── main.py +│ ├── requirements.txt +│ ├── restart_backend.ps1 +│ ├── README.md +│ ├── app\ +│ │ ├── __init__.py +│ │ ├── config.py +│ │ ├── errors.py +│ │ ├── api\ +│ │ │ └── routes.py +│ │ ├── data\ +│ │ │ ├── markets.json +│ │ │ └── repository.py +│ │ └── services\ +│ │ ├── forecaster.py +│ │ ├── model_registry.py +│ │ ├── prediction_service.py +│ │ └── siskaperbapo_scraper.py +│ ├── models\ +│ │ ├── rawit\ +│ │ ├── merah\ +│ │ └── keriting\ +│ └── tests\ +├── database\ +│ └── panen_harga.sql +├── website\ +│ ├── package.json +│ └── src\ +│ ├── App.jsx +│ ├── Public.css +│ └── services\ +│ └── api.js +├── RINGKASAN_FITUR.md +└── REFERENSI_APLIKASI.md +``` + +## 4. Arsitektur aplikasi + +```text +Pengguna + │ + ▼ +React/Vite frontend :5173 + │ HTTP/JSON + session cookie + ▼ +Flask REST API :8000 + ├── PredictionService + ├── ModelRegistry + ├── PriceRepository + └── SiskaperbapoScraper + │ + ├── Artifact model LSTM + └── MySQL prediksicabe +``` + +Frontend tidak mengakses database secara langsung. Semua data diambil melalui +service layer pada [website/src/services/api.js](website/src/services/api.js). +Backend bertanggung jawab atas validasi, akses database, scraping, preprocessing, +dan inference model. + +## 5. Alur data utama + +### 5.1 Data penelitian awal + +Data CSV penelitian dapat dimasukkan satu kali ke MySQL menggunakan script import. +Harga CSV dikonversi ke Rupiah penuh sebelum disimpan. + +```text +CSV penelitian + ↓ +import_csv_to_mysql.py + ↓ +price_history + ↓ +PriceRepository +``` + +### 5.2 Data scraping manual + +Scraping tidak berjalan otomatis dan tidak memiliki scheduler. + +```text +Admin memilih komoditas dan tanggal + ↓ +POST /api/v1/admin/scraping/jobs + ↓ +Background thread + ↓ +SISKAPERBAPO + ↓ +Normalisasi harga + ↓ +price_history + ↓ +scraping_logs +``` + +Data baru dicatat menggunakan `scraping_log_id`, sehingga satu riwayat scraping +dapat ditelusuri dan dihapus bersama data yang dihasilkannya. + +### 5.3 Preprocessing + +Preprocessing manual dapat dijalankan terhadap satu log scraping yang dipilih. +Metode yang digunakan adalah interpolasi linear untuk gap internal yang memenuhi +batas sistem. Gap di awal/akhir atau gap terlalu panjang tidak diisi secara +sembarangan dan dilaporkan sebagai warning. + +```text +Pilih riwayat scraping + ↓ +POST /api/v1/admin/preprocessing/jobs + ↓ +Pemeriksaan gap + ↓ +Interpolasi linear yang diizinkan + ↓ +price_history + preprocessing_runs +``` + +Repository juga melakukan interpolasi internal terbatas ketika membaca series +untuk inference. Perilaku ini berfungsi sebagai validasi/fallback agar gap kecil +tidak langsung membuat prediksi gagal. + +### 5.4 Inference prediksi + +Alur inference: + +```text +Data historis terbaru dari database + ↓ +Pilih data valid terakhir sesuai time_step + ↓ +Konversi input ke satuan ribuan untuk model + ↓ +Transform dengan scaler.pkl + ↓ +Model H5 menghasilkan prediksi + ↓ +Inverse transform + ↓ +Konversi kembali ke Rupiah penuh + ↓ +Recursive forecast 1, 3, atau 7 hari + ↓ +Response API +``` + +Data scraping baru tidak melatih ulang model. Data tersebut hanya menjadi data +aktual terbaru yang digunakan sebagai input inference. + +## 6. Satuan harga dan presisi + +Aturan penyimpanan database: + +> Semua harga positif di `price_history` disimpan dalam Rupiah penuh. + +Contoh: + +```text +8234 → Rp8.234 +8500 → Rp8.500 +9275 → Rp9.275 +``` + +Model dapat bekerja dalam satuan ribuan Rupiah sesuai artifact training. API +melakukan penyesuaian satuan ketika inference dan mengembalikan hasil dalam +Rupiah penuh. + +Harga prediksi tidak dibulatkan ke ribuan. Frontend menampilkan maksimal dua +angka desimal jika hasil model memiliki pecahan. + +Nilai `0`, kosong, dan nilai tidak valid diperlakukan sebagai data kosong, bukan +harga aktual yang valid. + +## 7. Fitur dashboard publik + +Dashboard publik berada pada route utama website. + +### 7.1 Pemilihan filter + +Pengguna dapat memilih: + +- jenis cabai; +- pasar; +- horizon prediksi 1, 3, atau 7 hari. + +Prediksi tidak dijalankan otomatis ketika halaman pertama kali dibuka. Pengguna +harus menekan tombol **Prediksi**. + +### 7.2 Data terakhir + +Bagian Data terakhir menampilkan tanggal data terbaru untuk setiap komoditas. +Sistem mencari pasar aktif yang memiliki ketersediaan komoditas tersebut, sehingga +komoditas tidak bergantung pada pasar yang kosong. + +### 7.3 Peta interaktif + +Peta menggunakan Leaflet dan OpenStreetMap tile layer. Fitur peta: + +- marker lokasi pasar; +- marker terpilih; +- tooltip nama pasar dan harga; +- popup harga aktual, forecast, perubahan, dan tren; +- pemusatan peta ke pasar yang dipilih; +- mode **Aktual** dan **Forecast**; +- legenda status harga; +- peringkat pasar berdasarkan harga aktual atau forecast. + +Pasar yang tidak memiliki model atau data tidak dipaksakan menjadi hasil prediksi. + +### 7.4 Grafik dan tabel + +Dashboard menampilkan: + +- riwayat harga aktual; +- grafik aktual dan forecast; +- tabel forecast per tanggal; +- perubahan harga dalam Rupiah; +- perubahan persentase; +- indikator tren; +- indikator harga di bagian bawah dashboard. + +### 7.5 Indikator harga + +Indikator harga mengambil data dari response prediksi, bukan membuat prediksi +sendiri di frontend. Indikator menampilkan: + +- Naik; +- Turun; +- Stabil; +- perubahan Rupiah pada langkah terakhir; +- perubahan persentase pada langkah terakhir. + +## 8. Fitur panel admin + +Panel admin menggunakan route `#/admin`. + +### 8.1 Autentikasi + +Fitur autentikasi: + +- register; +- login; +- logout; +- session cookie; +- role `user` dan `admin`. + +Endpoint admin memerlukan role admin. + +### 8.2 Ringkasan + +Ringkasan menampilkan informasi operasional: + +- jumlah data harga; +- jumlah komoditas; +- jumlah pasar; +- status pembaruan terakhir; +- jumlah data terbaru dari scraping terakhir. + +### 8.3 Dataset harga + +Halaman Dataset harga menyediakan: + +- tabel data harga; +- filter komoditas; +- filter pasar; +- pagination; +- harga dan tanggal data. + +### 8.4 Perbarui data + +Fitur Perbarui data menyediakan: + +- pilihan komoditas scraping; +- tanggal mulai dan tanggal akhir; +- progress bar scraping; +- log riwayat scraping; +- jenis cabai pada setiap log; +- status scraping; +- jumlah data baru; +- detail data yang masuk; +- filter detail berdasarkan komoditas dan pasar; +- pagination; +- tombol hapus log; +- modal konfirmasi penghapusan. + +### 8.5 Preprocessing + +Section preprocessing berada di bagian bawah halaman Perbarui data. Admin dapat: + +1. memilih satu riwayat scraping; +2. melihat jenis cabai dan jumlah data pada dropdown; +3. menjalankan preprocessing; +4. melihat progress; +5. melihat jumlah baris yang diisi; +6. melihat warning gap yang tidak dapat diisi. + +## 9. Endpoint API + +Prefix API: + +```text +/api/v1 +``` + +### Endpoint publik + +| Method | Endpoint | Keterangan | +|---|---|---| +| `GET` | `/` | Status API dasar | +| `GET` | `/api/v1/health` | Status API dan artifact model | +| `GET` | `/api/v1/commodities` | Daftar komoditas tersedia | +| `GET` | `/api/v1/markets` | Daftar pasar dan ketersediaan komoditas | +| `GET` | `/api/v1/history` | Riwayat harga | +| `GET` | `/api/v1/predict` | Prediksi satu pasar | +| `GET` | `/api/v1/predict/map` | Prediksi ringkas seluruh pasar | + +Contoh: + +```text +GET /api/v1/history?commodity=rawit&market=pasar_tanjung&days=30 +GET /api/v1/predict?commodity=rawit&market=pasar_tanjung&horizon=7 +GET /api/v1/predict/map?commodity=rawit&horizon=7 +``` + +### Endpoint autentikasi + +| Method | Endpoint | Keterangan | +|---|---|---| +| `GET` | `/api/v1/auth/me` | User session saat ini | +| `POST` | `/api/v1/auth/register` | Registrasi user | +| `POST` | `/api/v1/auth/login` | Login | +| `POST` | `/api/v1/auth/logout` | Logout | + +### Endpoint admin + +| Method | Endpoint | Keterangan | +|---|---|---| +| `GET` | `/api/v1/admin/overview` | Ringkasan operasional | +| `GET` | `/api/v1/admin/models` | Metadata/status model | +| `GET` | `/api/v1/admin/scraping/logs` | Riwayat scraping | +| `GET` | `/api/v1/admin/scraping/logs//records` | Detail data dari log | +| `POST` | `/api/v1/admin/scraping/jobs` | Memulai scraping | +| `GET` | `/api/v1/admin/scraping/jobs/` | Status scraping | +| `DELETE` | `/api/v1/admin/scraping/logs/` | Hapus log dan data terkait | +| `DELETE` | `/api/v1/admin/scraping/history` | Hapus history scraping | +| `POST` | `/api/v1/admin/preprocessing/jobs` | Memulai preprocessing | +| `GET` | `/api/v1/admin/preprocessing/jobs/` | Status preprocessing | +| `GET` | `/api/v1/prices` | Dataset harga dengan pagination | + +Format error API: + +```json +{ + "error": { + "code": "ERROR_CODE", + "message": "Pesan untuk pengguna", + "details": {} + } +} +``` + +## 10. Struktur database + +Schema lengkap tersedia pada [database/panen_harga.sql](database/panen_harga.sql). + +### Tabel utama + +| Tabel | Fungsi | +|---|---| +| `commodities` | Master jenis cabai | +| `markets` | Master pasar dan koordinat | +| `price_history` | Harga aktual per komoditas, pasar, dan tanggal | +| `scraping_logs` | Riwayat proses scraping | +| `preprocessing_runs` | Riwayat proses preprocessing | +| `users` | Akun dan role | +| `training_runs` | Metadata training jika dikelola di luar API | +| `model_versions` | Metadata versi model | +| `predictions` | Struktur penyimpanan forecast jika digunakan | + +Relasi penting: + +```text +commodities 1 ─── * price_history +markets 1 ─── * price_history +scraping_logs 1 ─── * price_history +commodities 1 ─── * training_runs +commodities 1 ─── * model_versions +``` + +Kunci unik `price_history` adalah kombinasi: + +```text +commodity_id + market_id + price_date +``` + +Karena itu scraping tanggal yang sama akan memperbarui data yang sudah ada, +bukan membuat duplikat baru. + +## 11. Konfigurasi environment + +Variabel penting backend: + +| Variabel | Default | Fungsi | +|---|---|---| +| `DATA_SOURCE` | `mysql` | Sumber data aktif | +| `MYSQL_HOST` | `127.0.0.1` | Host MySQL | +| `MYSQL_PORT` | `3306` | Port MySQL | +| `MYSQL_DATABASE` | `prediksicabe` | Nama database | +| `MYSQL_USER` | `root` | User database | +| `MYSQL_PASSWORD` | kosong | Password database | +| `MODELS_DIR` | `api/models` | Folder artifact | +| `DATA_DIR` | folder api | Folder CSV | +| `PRICE_UNIT_SCALE` | `1000` | Skala CSV lama ke Rupiah | +| `ALLOWED_HORIZONS` | `1,3,7` | Horizon yang diizinkan | +| `MAX_HORIZON` | `7` | Batas horizon | +| `CORS_ORIGINS` | localhost:5173 | Origin frontend | +| `STALE_DATA_DAYS` | `30` | Ambang data lama | +| `TREND_THRESHOLD_PCT` | `1` | Ambang status tren | +| `SISKAPERBAPO_TIMEOUT` | `30` | Timeout request scraper | + +Untuk produksi, ganti `SECRET_KEY` default dan batasi `CORS_ORIGINS` hanya pada +origin frontend yang dipercaya. + +## 12. Cara menjalankan aplikasi + +### 12.1 Menjalankan backend + +Gunakan environment Conda yang sudah tersedia: + +```powershell +cd C:\PrediksiHargaCabe\api +C:\Users\alfia\anaconda3\envs\tf_gpu39\python.exe main.py +``` + +Atau gunakan script restart: + +```powershell +cd C:\PrediksiHargaCabe\api +powershell -ExecutionPolicy Bypass -File .\restart_backend.ps1 +``` + +Backend berjalan di: + +```text +http://127.0.0.1:8000 +``` + +### 12.2 Menjalankan frontend + +```powershell +cd C:\PrediksiHargaCabe\website +npm run dev +``` + +Frontend Vite biasanya berjalan di: + +```text +http://localhost:5173 +``` + +### 12.3 Build frontend + +```powershell +cd C:\PrediksiHargaCabe\website +npm run lint +npm run build +``` + +### 12.4 Pengujian backend + +```powershell +cd C:\PrediksiHargaCabe\api +C:\Users\alfia\anaconda3\envs\tf_gpu39\python.exe -m pytest +``` + +## 13. Keamanan dan batasan operasional + +- Endpoint admin dilindungi autentikasi dan role admin. +- Password disimpan dalam bentuk hash. +- Frontend tidak terhubung langsung ke database. +- Scheduler scraping otomatis belum diaktifkan. +- Training ulang otomatis belum diaktifkan. +- API tidak menjalankan `model.fit()`. +- Data input scraping tidak boleh dianggap sebagai hasil evaluasi model baru. +- Data terbaru hasil scraping adalah data operasional untuk inference. +- Jangan mengklaim model sebagai “global optimum”. Gunakan istilah: + “konfigurasi terbaik yang diperoleh dari skema eksperimen yang diterapkan pada + dataset penelitian.” + +## 14. Batasan model dan interpretasi hasil + +### Recursive forecasting + +Prediksi lebih dari satu hari menggunakan hasil prediksi sebelumnya sebagai input +berikutnya. Akibatnya, error dapat terakumulasi pada horizon yang lebih panjang. + +### Ketersediaan artifact + +Tidak semua komoditas harus tersedia pada semua pasar. Kombinasi tanpa artifact +lengkap ditampilkan sebagai tidak tersedia. + +### Data lama + +API dapat memberikan warning `data_stale` apabila tanggal data terakhir melewati +ambang `STALE_DATA_DAYS`. + +### Model deployment tidak sama dengan training ulang + +Scraping baru tidak mengubah bobot model. Jika penelitian memerlukan model baru, +training harus dilakukan melalui proses eksperimen terpisah, divalidasi, lalu +artifact baru dideploy secara sadar. + +## 15. Cara menjelaskan aplikasi saat presentasi + +Urutan penjelasan yang disarankan: + +1. Jelaskan masalah: harga cabai berbeda antar pasar dan berubah dari waktu ke + waktu. +2. Jelaskan sumber data: dataset penelitian dan data SISKAPERBAPO. +3. Jelaskan tiga komoditas dan pasar yang diamati. +4. Tunjukkan peta digital pasar. +5. Pilih komoditas dan pasar. +6. Pilih horizon prediksi. +7. Tekan tombol Prediksi. +8. Jelaskan harga aktual terakhir, forecast, grafik, tabel, dan indikator tren. +9. Jelaskan bahwa model menggunakan artifact LSTM yang sudah divalidasi. +10. Jelaskan bahwa scraping memperbarui data aktual, bukan melatih ulang model. +11. Tunjukkan panel admin untuk log scraping dan preprocessing. +12. Jelaskan keterbatasan model dan pasar yang artifact-nya belum tersedia. + +## 16. Ringkasan satu paragraf + +Panen Harga adalah aplikasi web berbasis React dan Flask yang menggunakan model +LSTM tersimpan untuk memprediksi harga tiga komoditas cabai di pasar-pasar +Kabupaten Jember. Data harga disimpan dalam MySQL menggunakan Rupiah penuh, +sedangkan model dan scaler dimuat dari artifact saat backend dimulai. Pengguna +dapat memilih komoditas, pasar, dan horizon prediksi, kemudian melihat hasilnya +melalui peta Leaflet, ranking pasar, grafik riwayat, grafik forecast, tabel +prediksi, dan indikator tren. Admin dapat melakukan scraping manual dari +SISKAPERBAPO, memantau progress, melihat log, menghapus hasil scraping, dan +menjalankan preprocessing terbatas. Sistem tidak melakukan scheduler maupun +training ulang otomatis sehingga artifact model penelitian tetap terkendali. diff --git a/RINGKASAN_FITUR.md b/RINGKASAN_FITUR.md new file mode 100644 index 0000000..612752f --- /dev/null +++ b/RINGKASAN_FITUR.md @@ -0,0 +1,344 @@ +# Ringkasan Fitur Prediksi Harga Cabai Jember + +Dokumen ini merangkum fitur yang terdeteksi pada seluruh proyek `PrediksiHargaCabe`, terutama folder `api` dan `website`. + +## 1. Gambaran Umum + +Proyek terdiri dari dua bagian utama: + +- **Backend `api`**: REST API berbasis Flask untuk membaca data harga, memuat model LSTM tersimpan, menghasilkan prediksi, serta menyediakan data untuk peta. +- **Frontend `website`**: aplikasi React + Vite untuk menampilkan peta pasar, harga aktual, prediksi, riwayat harga, dan indikator tren. + +Walaupun beberapa instruksi atau dokumentasi lama menyebut FastAPI, implementasi backend yang aktif saat ini menggunakan **Flask**. Entry point-nya adalah `api/main.py` dan aplikasi dibuat melalui `app.create_app()`. + +## 2. Fitur Backend + +### 2.1 Status API + +- `GET /` + - Mengecek bahwa API aktif. + - Mengembalikan pesan status dalam bahasa Indonesia. +- `GET /api/v1/health` + - Menampilkan status kesehatan API. + - Menampilkan jumlah model yang berhasil dimuat. + - Menampilkan daftar model yang berhasil dimuat per komoditas. + - Menampilkan daftar artefak model yang dilewati beserta alasannya. + +### 2.2 Informasi Komoditas dan Pasar + +- `GET /api/v1/commodities` + - Mengembalikan komoditas yang memiliki model tersedia. + - Menyertakan nama komoditas dan jumlah pasar yang tersedia. +- `GET /api/v1/markets` + - Mengembalikan lima pasar di Kabupaten Jember beserta koordinatnya. + - Dapat difilter dengan query `commodity`. + - Menandai komoditas yang tersedia untuk setiap pasar. + +Komoditas yang didefinisikan backend: + +| Slug | Nama | +|---|---| +| `rawit` | Cabai Rawit | +| `merah` | Cabai Merah Besar | +| `keriting` | Cabai Merah Keriting | + +Pasar yang didefinisikan backend: + +- Pasar Tanjung +- Pasar Kreongan +- Pasar Tegal Besar +- Pasar Mangli +- Pasar Wirolegi + +### 2.3 Riwayat Harga + +- `GET /api/v1/history?commodity={komoditas}&market={pasar}&days={jumlah_hari}` +- Mengambil riwayat harga dari CSV. +- Nilai `days` default-nya 90 hari dan dibatasi antara 1 sampai 365 hari. +- Data tanggal diurutkan dan data tanggal duplikat menggunakan nilai terakhir. +- Nilai kosong atau tidak valid diproses sebagai data yang tidak tersedia. +- Nilai nol diperlakukan sebagai data kosong, lalu nilai kosong di tengah rangkaian dapat diinterpolasi secara linear hingga dua titik. +- Nilai harga dikonversi menggunakan `PRICE_UNIT_SCALE`, default `1000`. + +### 2.4 Prediksi Multi-Langkah + +- `GET /api/v1/predict?commodity={komoditas}&market={pasar}&horizon={hari}` +- Horizon yang tersedia secara default: 1, 7, 24, dan 30 hari. +- Prediksi menggunakan pendekatan **recursive multi-step forecasting**. +- Hasil prediksi mencakup: + - harga aktual terakhir; + - tanggal prediksi; + - harga setiap langkah; + - perubahan harga dalam rupiah; + - perubahan persentase; + - harga minimum, maksimum, dan rata-rata; + - tren `up`, `down`, atau `flat`; + - umur data; + - peringatan data lama atau prediksi di luar rentang training; + - metadata metode dan `time_step`. +- Hasil prediksi disimpan dalam cache berdasarkan komoditas, pasar, dan tanggal data terakhir. + +### 2.5 Prediksi untuk Peta + +- `GET /api/v1/predict/map?commodity={komoditas}&horizon={hari}` +- Menghasilkan ringkasan prediksi untuk seluruh pasar. +- Setiap lokasi dapat berisi: + - koordinat pasar; + - ketersediaan model; + - harga aktual terakhir; + - harga prediksi; + - perubahan harga; + - persentase perubahan; + - arah tren. +- Jika model atau data suatu pasar tidak tersedia, lokasi tetap dikembalikan dengan status tidak tersedia dan alasan kegagalan. + +### 2.6 Pemuatan Model dan Scaler + +- Model dan scaler dimuat ketika aplikasi dibuat melalui `ModelRegistry`. +- Model Keras dimuat menggunakan `compile=False`. +- Scaler dimuat menggunakan `joblib`, dengan fallback ke `pickle`. +- Setiap konfigurasi model dapat menentukan nama file model dan scaler melalui `config.json`. +- Path artefak divalidasi agar tidak keluar dari folder pasar. +- Model yang tidak lengkap atau gagal dimuat dilewati dan dicatat pada informasi health. +- API tidak melakukan training atau `model.fit()` ketika melayani prediksi. + +Artefak yang tersedia: + +- **Cabai Rawit**: model untuk lima pasar. +- **Cabai Merah Besar**: model untuk lima pasar. +- **Cabai Merah Keriting**: model untuk Pasar Kreongan, Pasar Mangli, dan Pasar Wirolegi. +- Setiap kombinasi model menggunakan file model Keras `.h5`, scaler `.pkl`, dan konfigurasi `.json` jika lengkap. + +### 2.7 Validasi dan Error Handling + +Backend memiliki format error terstruktur: + +```json +{ + "error": { + "code": "ERROR_CODE", + "message": "Pesan kesalahan", + "details": {} + } +} +``` + +Validasi yang tersedia meliputi: + +- komoditas tidak dikenal; +- pasar tidak dikenal; +- model tidak tersedia; +- parameter query wajib; +- horizon tidak valid; +- jumlah data historis tidak mencukupi; +- file CSV tidak ditemukan; +- kolom tanggal atau kolom pasar tidak ditemukan; +- kesalahan internal server. + +### 2.8 CORS dan Konfigurasi + +Konfigurasi backend dapat diubah melalui environment variable: + +- `MODELS_DIR`: lokasi folder model; +- `DATA_DIR`: lokasi CSV; +- `PRICE_UNIT_SCALE`: skala harga, default `1000`; +- `ALLOWED_HORIZONS`: daftar horizon yang dipisahkan koma, default `1,3,7`; +- `MAX_HORIZON`: batas horizon maksimum, default `7`; +- `CORS_ORIGINS`: origin frontend yang diizinkan; +- `STALE_DATA_DAYS`: ambang data dianggap lama; +- `TREND_THRESHOLD_PCT`: ambang perubahan untuk menentukan tren. + +Nilai default `CORS_ORIGINS` saat ini adalah `*` untuk kemudahan pengembangan. Untuk deployment produksi, sebaiknya diisi dengan daftar origin frontend yang spesifik. + +## 3. Fitur Frontend + +### 3.1 Dashboard Publik + +Frontend menampilkan dashboard bernama **Panen Harga** dengan fokus pada harga cabai Kabupaten Jember. + +Fitur dashboard: + +- indikator koneksi API; +- pilihan komoditas; +- pilihan horizon 1, 7, 24, atau 30 hari; +- pencarian pasar; +- notifikasi kesalahan dan tombol coba lagi; +- tampilan tanggal data terakhir; +- tata letak responsif untuk layar desktop dan mobile. + +### 3.2 Peta Interaktif + +- Menggunakan React Leaflet dan OpenStreetMap. +- Menampilkan marker untuk lokasi pasar. +- Marker dapat dipilih untuk membuka detail lokasi. +- Peta otomatis memusatkan tampilan ke pasar yang dipilih. +- Marker dibedakan berdasarkan status terpilih dan ketersediaan model/data. +- Popup marker menampilkan nama pasar dan prediksi harga. +- Daftar pasar di samping peta dapat digunakan sebagai alternatif pemilihan lokasi. + +### 3.3 Panel Detail Pasar + +Untuk pasar yang dipilih, frontend menampilkan: + +- nama pasar; +- koordinat; +- komoditas; +- indikator tren naik, turun, atau datar; +- prediksi pada horizon yang dipilih; +- harga aktual terakhir; +- tanggal data terakhir; +- tabel prediksi per langkah; +- perubahan harga per langkah; +- peringatan jika data sudah lama atau prediksi berada di luar rentang training. + +Untuk horizon lebih dari tujuh hari, tabel visual menampilkan tujuh langkah pertama dan mengarahkan pengguna ke endpoint API untuk data lengkap. + +### 3.4 Riwayat Harga + +- Menampilkan ringkasan harga aktual terbaru. +- Menampilkan riwayat 30 hari untuk pasar yang dipilih. +- Menggunakan visualisasi sparkline sederhana berbasis elemen HTML/CSS. +- Menampilkan tanggal awal dan tanggal akhir riwayat. + +### 3.5 State dan Loading UI + +Frontend memiliki state untuk: + +- daftar komoditas; +- daftar pasar; +- prediksi peta; +- pasar terpilih; +- horizon; +- pencarian pasar; +- detail prediksi; +- riwayat harga; +- status loading; +- status error; +- filter mobile. + +Tersedia tampilan loading saat menghubungkan ke API dan tampilan kosong ketika data API belum tersedia. + +## 4. Alur Integrasi Frontend dan Backend + +1. Frontend memanggil `/commodities` dan `/markets` ketika halaman dibuka. +2. Frontend memanggil `/predict/map` ketika komoditas atau horizon berubah. +3. Frontend memanggil `/predict` dan `/history` ketika pasar, komoditas, atau horizon berubah. +4. Respons API dipetakan ke marker, daftar pasar, panel detail, dan riwayat harga. +5. Error dari backend dibaca dari format `error.message` dan ditampilkan kepada pengguna. + +Base URL frontend dapat diubah dengan: + +```powershell +$env:VITE_API_BASE_URL="http://127.0.0.1:8000/api/v1" +``` + +Jika environment variable tersebut tidak diatur, frontend menggunakan default: + +```text +http://127.0.0.1:8000/api/v1 +``` + +## 5. Data dan Model + +Data input yang ditemukan di backend: + +- CSV Cabai Rawit; +- CSV Cabai Merah Keriting; +- CSV Cabai Merah Besar. + +Data tersebut digunakan oleh `CsvPriceRepository`, bukan database relasional. + +Folder model tersimpan di `api/models` dan dikelompokkan berdasarkan komoditas lalu pasar. Model di-load dari file yang dirujuk oleh `config.json`; nama file tidak ditebak secara bebas ketika konfigurasi tersedia. + +## 6. Pengujian + +Backend memiliki pengujian untuk: + +- proses recursive forecasting; +- perlindungan agar hasil prediksi tidak negatif; +- pemuatan registry dengan artefak tidak lengkap; +- kontrak endpoint health; +- validasi komoditas; +- validasi horizon; +- format error API. + +Perintah pengujian: + +```powershell +cd api +pytest +``` + +Perintah menjalankan backend: + +```powershell +cd api +python main.py +``` + +Atau dengan Flask CLI: + +```powershell +cd api +flask --app main:app run --host 127.0.0.1 --port 8000 +``` + +Perintah menjalankan frontend: + +```powershell +cd website +npm install +npm run dev -- --host 127.0.0.1 +``` + +Perintah build dan lint frontend: + +```powershell +cd website +npm run build +npm run lint +``` + +## 7. Struktur File Penting + +```text +api/ +├── main.py +├── requirements.txt +├── app/ +│ ├── __init__.py +│ ├── config.py +│ ├── errors.py +│ ├── api/ +│ │ ├── routes.py +│ │ └── schemas.py +│ ├── data/ +│ │ ├── markets.json +│ │ └── repository.py +│ └── services/ +│ ├── forecaster.py +│ ├── model_registry.py +│ └── prediction_service.py +├── models/ +└── tests/ + +website/ +├── package.json +├── vite.config.js +├── index.html +└── src/ + ├── App.jsx + ├── main.jsx + ├── services/api.js + ├── data/mockData.js + ├── Public.css + └── assets/ +``` + +## 8. Catatan Implementasi Saat Ini + +- Backend aktual adalah Flask dengan prefix API `/api/v1`. +- Dokumentasi `website/README.md` masih menyebut fase mock data dan integrasi backend belum dilakukan, tetapi kode `website/src/services/api.js` dan `website/src/App.jsx` saat ini sudah memanggil API backend secara langsung. +- `website/src/data/mockData.js` masih tersimpan sebagai data contoh/warisan, tetapi bukan sumber data utama pada alur dashboard saat ini. +- Folder `node_modules`, cache Python, dan `website/dist` merupakan dependensi atau hasil build; folder tersebut tidak dianggap sebagai fitur aplikasi inti. +- Halaman publik yang aktif pada implementasi saat ini adalah satu dashboard React. Rute hash seperti `#/home`, `#/map`, `#/about`, dan `#/admin` yang tertulis di README belum terlihat di komponen `App.jsx`. diff --git a/Spesifikasi_UI_UX_Website_Prediksi_Harga_Cabai_Jember.docx b/Spesifikasi_UI_UX_Website_Prediksi_Harga_Cabai_Jember.docx new file mode 100644 index 0000000..09be959 --- /dev/null +++ b/Spesifikasi_UI_UX_Website_Prediksi_Harga_Cabai_Jember.docx @@ -0,0 +1,489 @@ + DOKUMEN SPESIFIKASI UI/UX + Sistem Prediksi Harga Cabai + dengan Visualisasi Peta Digital Interaktif di Kabupaten Jember +Frontend target: React.js | Backend existing: FastAPI | Focus: UI/UX Phase 1 +Basis dokumen: Dokumen ini disusun berdasarkan proposal TA "Analisis Model Long Short-Term Memory dalam Sistem Prediksi Harga Cabai dengan Visualisasi Peta Digital Interaktif di Kabupaten Jember", khususnya bagian tujuan sistem, sumber/struktur data, hasil prediksi, peta digital interaktif, rekomendasi, dan pengujian UAT. Proposal menjelaskan bahwa hasil prediksi akan ditampilkan melalui peta wilayah Kabupaten Jember dengan titik pasar dan informasi harga aktual serta hasil prediksi. (Proposal TA, Bab 1 dan Bab 3, terutama pp. 3 - 4 dan 26 - 29).1. Tujuan Dokumen +Dokumen ini menjadi blueprint visual dan UX yang dapat langsung dipakai sebagai konteks kerja GitHub Copilot/Copilot Chat saat membangun frontend React. Fokus tahap pertama adalah menghasilkan UI/UX yang rapi, konsisten, responsif, dan mudah diuji menggunakan data mock. Integrasi endpoint FastAPI dilakukan setelah struktur antarmuka dan alur pengguna stabil.Menerjemahkan tujuan TA menjadi struktur halaman dan komponen frontend. +Menetapkan design system: warna, tipografi, spacing, card, button, tabel, chart, dan map. +Mendefinisikan perilaku pengguna untuk melihat harga aktual, membandingkan pasar, dan melihat prediksi. +Menghindari UI yang terlalu teknis pada halaman publik; detail parameter/model ditampilkan di halaman Analisis Model. +Menyediakan spesifikasi yang cukup eksplisit untuk digenerate secara bertahap oleh Copilot. +2. Posisi Produk dan Prinsip UX +Produk diposisikan sebagai dashboard informasi harga cabai berbasis lokasi, bukan marketplace dan bukan dashboard machine learning yang penuh konfigurasi teknis. Keberhasilan UX diukur dari seberapa cepat pengguna menemukan tiga informasi utama: harga aktual, lokasi pasar, dan hasil prediksi.Prinsip +Penerapan +Map-first +Peta Kabupaten Jember adalah elemen visual utama karena peta merupakan cara penyajian inti yang disebut dalam proposal. +Data-first +Angka harga, perubahan, tanggal pembaruan, dan prediksi harus terlihat lebih dahulu daripada penjelasan teknis. +Simple for public users +Bahasa UI sederhana dan familiar; hindari istilah machine learning pada dashboard utama. +Evidence over decoration +Gunakan visual, chart, dan marker untuk memperjelas data, bukan sekadar dekorasi. +Consistent +Komponen yang sama harus mempertahankan pola warna, ukuran, ikon, spacing, dan interaksi. +Responsive +Desktop menjadi fokus utama, tetapi layout wajib dapat beradaptasi ke tablet dan mobile. +3. Target Pengguna dan Kebutuhan Informasi +Kelompok pengguna +Kebutuhan utama +Informasi yang ditonjolkan +Masyarakat/konsumen +Mengetahui harga cabai terkini dan kondisi harga antar pasar. +Harga aktual, pasar, perubahan harga, peta. +Pedagang/pelaku pasar +Membandingkan harga pasar dan melihat kecenderungan harga. +Harga aktual, prediksi, grafik tren, detail pasar. +Pemerintah/instansi +Melihat gambaran spasial dan tren harga untuk pemantauan. +Peta, sebaran harga, grafik, ringkasan prediksi. +4. Information Architecture +Struktur awal dibuat ringkas. Fitur administrasi/data pipeline tidak dijadikan menu publik utama karena proposal berfokus pada penyajian hasil prediksi dan peta interaktif. Jika nantinya dibutuhkan area admin, area tersebut dapat dibuat terpisah tanpa mengubah IA publik.SISTEM PREDIKSI HARGA CABAI JEMBER +│ +├── Dashboard +│ ├── Ringkasan harga +│ ├── Peta interaktif +│ ├── Prediksi terpilih +│ ├── Grafik tren +│ └── Insight +│ +├── Harga Pasar +│ ├── Filter jenis cabai +│ ├── Filter tanggal +│ ├── Tabel harga +│ └── Detail pasar +│ +├── Prediksi +│ ├── Pilih jenis cabai +│ ├── Pilih pasar +│ ├── Ringkasan prediksi +│ └── Grafik actual vs prediction +│ +├── Analisis Model +│ ├── RMSE +│ ├── MAE +│ ├── Konfigurasi model final +│ └── Visualisasi performa +│ +└── Tentang Sistem + ├── Tujuan + ├── Sumber data + └── Penjelasan singkat LSTM +Catatan: Nama menu dapat berubah saat implementasi, tetapi urutan prioritas informasi sebaiknya tetap: Dashboard --> Harga --> Prediksi --> Analisis Model --> Tentang.5. Navigasi dan Routing +Route +Halaman +Tujuan UX +/ +Dashboard +Halaman utama untuk memahami kondisi harga secara cepat. +/harga +Harga Pasar +Melihat dan memfilter data harga antar pasar. +/prediksi +Prediksi +Melihat hasil prediksi berdasarkan jenis cabai dan pasar. +/analisis +Analisis Model +Melihat performa model dan konfigurasi eksperimen final. +/tentang +Tentang Sistem +Memberi konteks penelitian dan sumber data. +6. Design System +6.1 Warna +Token +Hex +Peran +Penggunaan +Primary +#1F6B45 +Hijau pertanian +Navbar, primary button, judul/aksen utama +Primary Dark +#14532D +Hijau gelap +Hover, heading penting, teks brand +Accent Chili +#D94A3D +Merah cabai +Aksen jenis cabai, kenaikan/perhatian +Accent Gold +#F2B84B +Kuning hangat +Highlight ringan, badge informasi +Background +#F7F8F5 +Off-white +Background halaman +Surface +#FFFFFF +Putih +Card, modal, panel +Text +#1F2937 +Teks utama +Body dan label +Muted +#6B7280 +Teks sekunder +Metadata, hint, caption +Border +#E5E7EB +Garis pembatas +Card/table/filter +Positive +#2E7D32 +Perubahan naik/turun yang dipetakan secara semantik +Gunakan bersama ikon/teks, bukan warna saja +Negative +#B42318 +Perubahan negatif/alert +Gunakan bersama ikon/teks, bukan warna saja +Aturan warna status: Jangan memakai hijau/merah sebagai satu-satunya penanda makna. Setiap perubahan harga harus disertai angka dan/atau ikon panah agar informasi tetap terbaca tanpa bergantung pada warna.6.2 Tipografi +Elemen +Ukuran +Bobot +Catatan +Hero title +32 - 40 px +700 +Desktop; responsif menjadi 28 - 32 px +Section title +22 - 26 px +700 +Judul bagian +Card number +24 - 32 px +700 +Harga/prediksi +Body +14 - 16 px +400 +Teks utama +Caption +12 - 13 px +400 +Tanggal, sumber, metadata +Font yang disarankan: Inter atau Plus Jakarta Sans. Gunakan satu keluarga font secara konsisten.6.3 Spacing, radius, dan elevation +Spacing system berbasis 4 px; gunakan 8, 12, 16, 24, 32 px sebagai ukuran utama. +Card radius 12 - 16 px; input/button 10 - 12 px; pill badge maksimal 999 px. +Gunakan shadow tipis; jangan gunakan efek glassmorphism atau gradient berlebihan. +Lebar konten desktop disarankan sekitar 1200 - 1280 px dengan ruang kosong yang cukup. +7. Spesifikasi Halaman: Dashboard +Dashboard adalah halaman prioritas tertinggi. Tujuan utamanya adalah memberi orientasi dalam satu layar: komoditas yang dipilih, kondisi harga saat ini, posisi pasar pada peta, hasil prediksi, dan tren harga.┌──────────────────────────────────────────────────────────────┐ +│ LOGO / NAMA SISTEM Dashboard Harga Prediksi Analisis │ +├──────────────────────────────────────────────────────────────┤ +│ Prediksi Harga Cabai Kabupaten Jember │ +│ Pantau harga aktual dan prediksi berdasarkan pasar. │ +│ │ +│ [Rawit ▼] [Tanggal 📅] [Cari pasar 🔍] │ +├──────────────────────────────────────────────────────────────┤ +│ [Rawit Rp42k] [Merah Besar Rp37k] [Keriting Rp40k] │ +├───────────────────────────────────┬──────────────────────────┤ +│ │ DETAIL TERPILIH │ +│ PETA KABUPATEN JEMBER │ Pasar Tanjung │ +│ ● ● │ Aktual Rp42.000/kg │ +│ ● ● │ Prediksi Rp44.300/kg │ +│ ● │ Perubahan +5,48% │ +│ │ [Lihat detail] │ +├───────────────────────────────────┴──────────────────────────┤ +│ Grafik Historis vs Prediksi │ +│ │ +│ Actual ──────────────── │ +│ Predict · · · · · · · · │ +├──────────────────────────────────────────────────────────────┤ +│ Insight Harga │ +└──────────────────────────────────────────────────────────────┘ +Komponen +Spesifikasi UX +Header/Navbar +Logo/nama sistem, Dashboard, Harga, Prediksi, Analisis, Tentang. Sticky di desktop. +Hero +Headline singkat + deskripsi + filter utama. +Summary cards +Satu card per jenis cabai: harga terkini, perubahan, tanggal pembaruan. +Interactive map +Peta Jember dengan market markers; klik marker membuka detail. +Selected market panel +Detail marker aktif: pasar, jenis cabai, aktual, prediksi, perubahan. +Trend chart +Grafik historis dan prediksi untuk konteks tren. +Insight card +Ringkasan informatif berbasis perbandingan aktual vs prediksi. +8. Spesifikasi UX Peta Interaktif +Peta merupakan elemen inti sesuai proposal. Pengguna harus dapat memilih jenis cabai, menemukan pasar, melihat harga aktual, melihat prediksi, lalu berpindah ke detail pasar.Gunakan basemap light/muted agar marker data lebih menonjol. +Marker harus menampilkan status yang ringkas; detail lengkap muncul ketika marker dipilih. +Marker minimal memiliki label/tooltip: nama pasar + harga aktual. +Popup/side panel menampilkan aktual, prediksi, persentase perubahan, tanggal data, dan tombol "Lihat Detail". +Sediakan kontrol zoom, pencarian pasar, dan filter jenis cabai. +Pada mobile, panel detail berubah menjadi bottom sheet atau drawer sehingga peta tetap terlihat. +Marker states +1. Default: marker standar. +2. Hover: marker membesar sedikit + tooltip nama pasar. +3. Selected: marker aktif + panel detail terbuka. +4. Loading: skeleton/spinner pada panel detail. +5. Empty: pesan "Tidak ada data untuk filter ini". +6. Error: pesan ramah + tombol coba lagi. +9. Spesifikasi Halaman Harga Pasar +Halaman ini berorientasi pada perbandingan. Tabel harus mudah dipindai, bukan menjadi dump seluruh dataset.Harga Pasar Kabupaten Jember + +[ Jenis Cabai ▼ ] [ Tanggal ▼ ] [ Cari Pasar __________________ ] + +┌────────────────┬──────────────┬──────────────┬────────────┐ +│ Pasar │ Aktual │ Sebelumnya │ Perubahan │ +├────────────────┼──────────────┼──────────────┼────────────┤ +│ Pasar Tanjung │ Rp42.000/kg │ Rp40.000 │ ↑ +5,0% │ +│ Pasar Mangli │ Rp41.000/kg │ Rp41.000 │ -- 0,0% │ +│ Pasar Wirolegi │ Rp39.000/kg │ Rp40.000 │ ↓ -2,5% │ +└────────────────┴──────────────┴──────────────┴────────────┘ +Desktop: tabel penuh; mobile: ubah menjadi stacked cards atau tabel horizontal yang dapat di-scroll. +Klik baris pasar untuk menuju /prediksi?market=... atau halaman detail pasar. +Gunakan pagination atau virtualisasi jika jumlah baris besar. +Tetapkan format harga konsisten "Rp42.000/kg"; jangan campur format Rp42k dan Rp42.000 dalam satu tabel. +10. Spesifikasi Halaman Prediksi +Halaman prediksi merupakan titik temu antara output model LSTM dan kebutuhan pengguna. Angka prediksi harus terlihat jelas, tetapi selalu disertai konteks tanggal dan pasar.Prediksi Harga Cabai + +[Cabai Rawit ▼] [Pasar Tanjung ▼] + +┌─────────────────────────┐ +│ Harga aktual │ +│ Rp42.000 / kg │ +└─────────────────────────┘ + +┌─────────────────────────┐ +│ Prediksi │ +│ Rp44.300 / kg │ +│ Perubahan +5,48% │ +└─────────────────────────┘ + +[ Grafik Actual vs Prediction ] + +Prediksi ini merupakan hasil model berdasarkan data historis. + +Microcopy: Hindari kata-kata yang menyatakan kepastian seperti "harga pasti besok". Gunakan "hasil prediksi", "diprediksi", atau "perkiraan berdasarkan model".11. Spesifikasi Halaman Analisis Model +Halaman ini ditujukan terutama untuk kebutuhan penelitian, demonstrasi sidang, dan transparansi model. Halaman publik tidak perlu memuat seluruh hyperparameter.Analisis Model LSTM + +┌──────────────┐ ┌──────────────┐ +│ RMSE │ │ MAE │ +│ xxxx │ │ xxxx │ +└──────────────┘ └──────────────┘ + +Konfigurasi model final +Epoch xxx +Batch Size xx +Learning Rate 0.xxx +Neuron xx +Activation xxxx +Optimizer Adam + +[ Grafik Actual vs Prediction ] +[ Tabel ringkas evaluasi ] +Nilai RMSE dan MAE menggunakan hasil eksperimen final dari notebook/model yang sudah ditetapkan. +Jangan hard-code hasil penelitian yang belum final; gunakan mock values pada fase UI. +Sediakan area untuk grafik evaluasi tanpa mengubah layout ketika nilai berubah panjang. +12. Spesifikasi Halaman Tentang Sistem +Ringkasan penelitian dan tujuan sistem. +Penjelasan singkat LSTM menggunakan bahasa non-teknis. +Sumber data: SISKAPERBAPO Jawa Timur. +Cakupan komoditas: cabai rawit merah, cabai merah keriting, dan cabai merah besar. +Penjelasan bahwa hasil ditampilkan per pasar di Kabupaten Jember. +13. Component Inventory React +Komponen +Props/data penting +Perilaku +Navbar +activeRoute, navigationItems +Sticky; mobile menjadi hamburger menu. +PageHeader +title, description, breadcrumbs +Konsisten di setiap halaman. +CommoditySelector +selectedCommodity, options, onChange +Dropdown/select dengan 3 jenis cabai. +DateFilter +date, minDate, maxDate, onChange +Validasi tanggal dan state loading. +PriceSummaryCard +commodity, price, change, updatedAt +Card angka besar + status perubahan. +MarketMap +markets, selectedMarket, onMarkerClick +Leaflet map + markers + selected state. +MarketPopup +market, actualPrice, predictedPrice, change +Popup ringkas; tombol detail. +PredictionCard +actual, predicted, change, date +Menonjolkan hasil prediksi. +PriceChart +actualSeries, predictionSeries, labels +Actual vs prediction dengan legend. +MarketTable +rows, sorting, pagination +Table responsive. +InsightCard +message, metric, severity +Informasi ringkas berdasarkan data. +Skeleton +variant +Dipakai saat loading. +EmptyState +title, description, action +Untuk filter tanpa data. +ErrorState +message, retry +Untuk kegagalan fetch API. +14. UX States yang Wajib Disiapkan +Loading -- Skeleton pada card dan panel; jangan menampilkan angka sementara yang menyesatkan.Success -- Tampilkan data aktual/prediksi lengkap dengan timestamp.Empty -- "Belum ada data untuk filter yang dipilih."Error -- "Data belum dapat dimuat. Coba lagi." + tombol Retry.Offline/slow -- Tampilkan state jaringan secara ringkas, bukan error teknis mentah.Selected map -- Marker aktif, popup/panel terbuka, map tetap menjaga konteks lokasi.15. Responsive Layout +Breakpoint +Navbar +Map + panel +Chart/table +Desktop >= 1200 px +Full navbar +2 kolom; map 60 - 65%, panel 35 - 40% +Chart penuh; tabel penuh +Tablet 768 - 1199 px +Navbar ringkas +2 kolom dengan panel lebih sempit +Chart penuh; tabel dapat scroll +Mobile < 768 px +Hamburger/drawer +Map full width + bottom sheet +Chart tinggi 240 - 280 px; cards stacked +16. Urutan Implementasi UI/UX Tahap 1 +Setup project React (Vite) + Tailwind CSS atau styling system yang sudah dipakai project. +Buat AppShell, Navbar, routing, typography, color tokens, button, card, input, badge. +Buat Dashboard menggunakan mock data statis; belum perlu memanggil FastAPI. +Implementasikan map + marker + popup menggunakan mock coordinates pasar. +Implementasikan tabel harga dan filter. +Implementasikan halaman prediksi + chart actual vs prediction menggunakan mock series. +Implementasikan halaman Analisis Model dengan mock RMSE/MAE/hyperparameters. +Implementasikan responsive/mobile states. +Lakukan visual QA, perbaiki spacing, alignment, overflow, dan consistency. +Setelah UI stabil, ganti mock data dengan service layer yang memanggil FastAPI. +Pemisahan tanggung jawab: Frontend UI/UX tidak boleh bergantung langsung pada struktur database. Buat service/API adapter di layer terpisah agar perubahan endpoint FastAPI tidak memaksa perubahan komponen UI.17. Kontrak Frontend terhadap FastAPI +Karena backend FastAPI sudah tersedia, UI/UX fase pertama harus dibuat dengan contract-friendly architecture. Endpoint nyata dapat dihubungkan setelah komponen visual selesai. Jangan membuat komponen memanggil fetch/axios langsung di banyak tempat.src/ +├── components/ +│ ├── common/ +│ ├── dashboard/ +│ ├── map/ +│ ├── market/ +│ ├── prediction/ +│ └── analysis/ +├── pages/ +├── layouts/ +├── services/ +│ └── api/ +├── hooks/ +├── data/ +│ └── mock/ +├── types/ +├── utils/ +└── App.jsx +Gunakan mock data JSON yang bentuknya menyerupai response FastAPI. +Komponen menerima data melalui props/hooks, bukan mengakses endpoint langsung. +Satu service layer menjadi pintu masuk API setelah backend disambungkan. +Jangan mengubah backend hanya untuk menyesuaikan UI pada fase pertama. +18. Contoh Mock Data untuk UI +{ + "commodity": "cabai_rawit_merah", + "market": "Pasar Tanjung", + "date": "2026-09-22", + "actual_price": 42000, + "previous_price": 40000, + "predicted_price": 44300, + "change_percent": 5.48, + "location": {"lat": -8.17, "lng": 113.70} +} +Nama field di atas hanyalah contoh kontrak UI. Sesuaikan dengan response FastAPI yang sudah kamu miliki tanpa mengubah struktur visual komponen.19. MASTER PROMPT UNTUK GITHUB COPILOT +Bagian ini dapat langsung disalin ke Copilot Chat / Agent sebagai brief pembuatan frontend tahap pertama. Prompt sengaja menahan integrasi backend agar Copilot fokus pada UI/UX terlebih dahulu.Anda adalah senior frontend engineer sekaligus UI/UX designer. Bangun frontend React.js untuk tugas akhir berjudul "Analisis Model Long Short-Term Memory dalam Sistem Prediksi Harga Cabai dengan Visualisasi Peta Digital Interaktif di Kabupaten Jember". + +KONTEKS PRODUK +- Sistem menampilkan informasi harga cabai berdasarkan pasar di Kabupaten Jember. +- Terdapat 3 komoditas: cabai rawit merah, cabai merah besar, dan cabai merah keriting. +- Fitur inti: harga aktual, perubahan harga, peta pasar interaktif, hasil prediksi harga, grafik actual vs prediction, dan insight informatif. +- Model machine learning adalah LSTM. Detail teknis model tidak boleh mendominasi dashboard publik. +- Backend sudah tersedia menggunakan FastAPI, tetapi TAHAP SEKARANG HANYA UI/UX. Jangan ubah backend dan jangan bergantung pada endpoint nyata. Gunakan mock data. + +ARAH DESAIN +- Tema: modern agricultural data dashboard. +- Bukan marketplace, bukan website pemerintah yang kaku, dan bukan dashboard AI yang penuh istilah teknis. +- Map-first, data-first, clean, minimal, professional, responsive. +- Warna utama: #1F6B45, #14532D, aksen cabai #D94A3D, aksen #F2B84B, background #F7F8F5, surface #FFFFFF, text #1F2937, muted #6B7280, border #E5E7EB. +- Gunakan Inter atau Plus Jakarta Sans. +- Card radius 12 - 16px; shadow tipis; spacing system berbasis 4px. + +HALAMAN +1. / -- Dashboard + - Navbar + - Hero singkat + - Filter jenis cabai, tanggal, pencarian pasar + - 3 summary price cards + - Interactive Jember map + - Market detail panel ketika marker dipilih + - Actual vs Prediction chart + - Insight card +2. /harga -- Harga Pasar + - filter + - table harga per pasar + - responsive mobile card/scroll +3. /prediksi -- Prediksi + - commodity selector + - market selector + - actual price + - predicted price + - change percent + - chart actual vs prediction +4. /analisis -- Analisis Model + - RMSE + - MAE + - konfigurasi model final + - evaluasi/graph +5. /tentang -- Tentang Sistem + - tujuan + - sumber data SISKAPERBAPO + - penjelasan singkat sistem dan LSTM + +KOMPONEN WAJIB +Navbar, PageHeader, CommoditySelector, DateFilter, SearchMarket, PriceSummaryCard, MarketMap, MarketPopup, PredictionCard, PriceChart, MarketTable, InsightCard, Skeleton, EmptyState, ErrorState. + +UX MAP +- Gunakan basemap light/muted. +- Marker default, hover, selected, loading, empty, error. +- Klik marker membuka detail: nama pasar, aktual, prediksi, perubahan, tanggal. +- Desktop: map + detail panel 60/40. +- Mobile: map full width + bottom sheet. + +UX RULES +- Jangan menampilkan angka palsu yang terlihat final; gunakan mock data yang jelas bersifat demo. +- Setiap status kenaikan/penurunan harus memakai ikon/teks selain warna. +- Gunakan "diprediksi" atau "perkiraan berdasarkan model", bukan bahasa yang menjamin hasil. +- Semua halaman harus punya loading, empty, dan error state. +- Jangan hard-code style per komponen jika token/style system bisa dipakai bersama. +- Hindari gradient berlebihan, glassmorphism, animasi berlebihan, shadow besar, dan layout yang padat. + +STRUKTUR KODE +Gunakan pemisahan components/pages/layouts/services/data/mock/types/hooks/utils. Komponen UI tidak boleh memanggil fetch langsung. Siapkan service layer tetapi isikan mock data terlebih dahulu. + +HASIL YANG DIHARAPKAN +- Semua route bekerja. +- Dashboard terasa seperti produk data sungguhan. +- UI konsisten dan responsif. +- Map dan chart menggunakan mock data. +- Fokus pada visual quality dan usability terlebih dahulu. +- Setelah UI selesai, berhenti dan tunggu instruksi berikutnya untuk integrasi FastAPI. + +20. Acceptance Checklist UI/UX Phase 1 +☐ Dashboard dapat dipahami dalam <=10 detik tanpa membaca dokumentasi. +☐ Pengguna dapat mengganti jenis cabai tanpa reload manual. +☐ Pengguna dapat menemukan pasar melalui map dan/atau pencarian. +☐ Marker terpilih selalu menampilkan aktual + prediksi dengan konteks tanggal. +☐ Tabel harga dapat dipindai dan tidak pecah pada mobile. +☐ Chart actual vs prediction memiliki legend dan label yang jelas. +☐ RMSE dan MAE berada pada halaman Analisis Model, bukan dipaksakan ke hero dashboard. +☐ Loading/empty/error state tersedia untuk komponen data. +☐ Tidak ada overflow horizontal pada mobile kecuali area tabel yang sengaja scrollable. +☐ Warna, typography, radius, spacing, dan button konsisten di seluruh halaman. +☐ Tidak ada ketergantungan komponen UI langsung ke database atau endpoint tertentu. +☐ Frontend fase 1 dapat berjalan penuh menggunakan mock data. +21. Catatan Kesesuaian dengan Proposal TA +Dokumen ini mempertahankan fokus proposal pada prediksi harga cabai di Kabupaten Jember, tiga jenis cabai, data per pasar, hasil prediksi model LSTM, peta digital interaktif, serta rekomendasi/insight. Proposal juga menyebut pengujian User Acceptance Testing (UAT), sehingga komponen dan alur di atas sengaja dibuat sederhana dan dapat diuji dari perspektif pengguna. (Proposal TA, Bab 3.3.4 dan 3.3.5).Catatan teknologi: Proposal yang diunggah mencantumkan Python dan Flask pada bagian software, sedangkan implementasi backend yang sedang kamu gunakan adalah FastAPI. Dokumen UI/UX ini sengaja dibuat tidak bergantung pada framework backend; frontend hanya menyiapkan service layer agar dapat mengonsumsi REST API FastAPI ketika tahap integrasi dimulai. \ No newline at end of file diff --git a/api/.env.example b/api/.env.example new file mode 100644 index 0000000..1b8425c --- /dev/null +++ b/api/.env.example @@ -0,0 +1,15 @@ +DATA_SOURCE=mysql +MYSQL_HOST=127.0.0.1 +MYSQL_PORT=3306 +MYSQL_DATABASE=prediksicabe +MYSQL_USER=root +MYSQL_PASSWORD= +MYSQL_CONNECT_TIMEOUT=5 +CORS_ORIGINS=http://127.0.0.1:5173,http://localhost:5173 +SISKAPERBAPO_URL=https://siskaperbapo.jatimprov.go.id/harga-komoditas +SISKAPERBAPO_COMMODITY_PARAM=komoditas +SISKAPERBAPO_TIMEOUT=30 +SISKAPERBAPO_COMMODITIES=rawit + +# Gunakan DATA_SOURCE=csv hanya jika ingin kembali memakai file CSV. +# DATA_DIR=C:\PrediksiHargaCabe\api diff --git a/api/README.md b/api/README.md new file mode 100644 index 0000000..71bc1ab --- /dev/null +++ b/api/README.md @@ -0,0 +1,137 @@ +# API Prediksi Harga Cabai + +API ini menggunakan Flask, application factory, dan Blueprint pada prefix `/api/v1`. Model LSTM tidak dilatih ulang dan artifact di `models/` hanya dimuat satu kali saat startup. + +## Menjalankan di Windows + +Dari folder `api` dengan environment Python proyek: + +```powershell +pip install -r requirements.txt +python main.py +``` + +Untuk menghentikan proses backend lama dan menjalankannya kembali dengan auto-reloader: + +```powershell +cd C:\PrediksiHargaCabe\api +powershell -ExecutionPolicy Bypass -File .\restart_backend.ps1 +``` + +Skrip tersebut menghentikan proses backend proyek pada port `8000`, lalu menjalankan Flask dengan +`FLASK_DEBUG=1`. Perubahan file Python akan dimuat otomatis selama proses tetap berjalan. + +Environment yang tersedia: + +- `MODELS_DIR`: lokasi folder model, default `api/models`. +- `DATA_DIR`: lokasi data CSV historis, default folder `api` karena file aktual berada di sana. +- `DATA_SOURCE`: sumber data aktif, `mysql` (default) atau `csv`. +- `MYSQL_HOST`, `MYSQL_PORT`, `MYSQL_DATABASE`, `MYSQL_USER`, `MYSQL_PASSWORD`: koneksi database MySQL melalui PyMySQL. +- `MYSQL_CONNECT_TIMEOUT`: batas waktu koneksi database dalam detik. +- `PRICE_UNIT_SCALE`: pengali nilai CSV ke Rupiah penuh, default `1000`; sumber CSV penelitian menyimpan `12.000` sebagai 12 ribu Rupiah. +- `CORS_ORIGINS`: daftar origin dipisahkan koma; default `http://127.0.0.1:5173,http://localhost:5173` untuk development dengan session login. +- `ALLOWED_HORIZONS`: default `1,3,7`. +- `MAX_HORIZON`: default `7`. + +## Endpoint + +- `GET /api/v1/health` +- `GET /api/v1/commodities` +- `GET /api/v1/markets?commodity=rawit` +- `GET /api/v1/history?commodity=rawit&market=pasar_tanjung&days=90` +- `GET /api/v1/predict?commodity=rawit&market=pasar_tanjung&horizon=7` +- `GET /api/v1/predict/map?commodity=rawit&horizon=7` + +Semua error memakai format `{ "error": { "code": "...", "message": "...", "details": {} } }`. + +## Format data historis + +Dengan `DATA_SOURCE=mysql`, loader membaca tabel `price_history` dan melakukan join ke `commodities` serta `markets` menggunakan `slug`. Dengan `DATA_SOURCE=csv`, loader membaca file aktual `harga_cabai_rawit_*.csv`, `harga_cabe_merah_besar_*.csv`, dan `harga_cabai_merah_keriting_*.csv` dari `DATA_DIR`. Pada mode CSV, kolom tanggal dapat bernama `Tanggal`, dan kolom pasar memakai nama `Pasar_Tanjung`, `Pasar_Kreongan`, `Pasar_Tegal_Besar`, `Pasar_Mangli`, serta `Pasar_Wirolegi`. Harga bernilai `0`, `N/A`, atau kosong diperlakukan sebagai `NaN`; hanya gap internal sampai dua titik yang diinterpolasi linear. + +## Menghubungkan ke MySQL phpMyAdmin + +1. Pastikan service MySQL pada XAMPP/Laragon/WAMP sedang berjalan. +2. Pastikan database yang dipakai adalah `prediksicabe`. +3. Pastikan tabel `commodities`, `markets`, dan `price_history` ada. +4. Isi data harga ke `price_history`; seed SQL hanya mengisi master komoditas dan pasar. +5. Set environment variable pada terminal; file `.env.example` hanya template dan belum dibaca otomatis oleh aplikasi. +6. Isi `MYSQL_USER` dan `MYSQL_PASSWORD` sesuai akun MySQL lokal. +7. Jalankan API dari folder `api`. + +Untuk membuat akun admin, daftar dahulu melalui endpoint register atau halaman register website, lalu ubah role akun tersebut melalui phpMyAdmin: + +```sql +UPDATE users +SET role = 'admin' +WHERE email = 'email-admin-anda@example.com'; +``` + +Password tetap disimpan dalam bentuk hash oleh API; jangan memasukkan password ke query SQL. + +Endpoint admin yang sudah tersedia: + +- `GET /api/v1/admin/overview` +- `GET /api/v1/admin/models` +- `GET /api/v1/admin/scraping/logs` +- `GET /api/v1/admin/scraping/logs//records` +- `POST /api/v1/admin/scraping/jobs` +- `GET /api/v1/admin/scraping/jobs/` +- `POST /api/v1/admin/preprocessing/jobs` dengan `{"scraping_log_id": 123}` untuk memproses satu riwayat scraping yang dipilih. +- `GET /api/v1/admin/preprocessing/jobs/` +- `DELETE /api/v1/admin/scraping/history` +- `DELETE /api/v1/admin/scraping/logs/` +- `POST /api/v1/admin/scraping/refresh` +- `GET /api/v1/prices?page=1&limit=25` (admin) + +Panel admin sekarang memiliki menu dataset dan pembaruan data manual. Endpoint refresh mengambil tabel SISKAPERBAPO, menyimpan observasi baru atau perubahan ke `price_history`, dan mencatat proses ke `scraping_logs`. Endpoint records menampilkan tanggal, komoditas, pasar, dan harga dari hasil scraping terakhir. Data baru tidak melatih ulang model; model deployment yang sudah aktif tetap digunakan untuk inference. Scheduler, preprocessing aktif, dan training aktif tetap tidak dijalankan. + +Endpoint jobs menerima opsi `commodities` (array slug), `start_date`, dan `end_date`. Jika rentang tanggal dipilih, jumlah observasi dihitung otomatis sebagai hasil tanggal yang tersedia dikalikan pasar yang berhasil dibaca. Proses berjalan di background dan dapat dipantau melalui endpoint status job; panel admin menampilkan progress bar. Penghapusan history menghapus log scraping dan baris `price_history` dengan `source = 'siskaperbapo'` saja, sehingga data hasil import CSV tetap aman. +Setiap observasi scraping memiliki `scraping_log_id`, sehingga tombol trash pada baris log menghapus hanya log tersebut dan data yang dihasilkan proses itu. Jika database lama digunakan, application factory otomatis menambahkan kolom dan mengaitkan observasi SISKAPERBAPO lama ke log terakhir. + +Konfigurasi scraper: + +```powershell +$env:SISKAPERBAPO_URL="https://siskaperbapo.jatimprov.go.id/harga-komoditas" +$env:SISKAPERBAPO_COMMODITY_PARAM="komoditas" +$env:SISKAPERBAPO_TIMEOUT="30" +$env:SISKAPERBAPO_COMMODITIES="rawit" +``` + +Tahap awal scraper dibatasi ke `rawit` agar tidak mengisi komoditas lain dengan data yang salah apabila halaman sumber mengabaikan parameter komoditas. Tambahkan slug lain setelah URL/parameter sumber sudah diverifikasi. Jika struktur halaman SISKAPERBAPO berubah atau parameter komoditas berbeda, endpoint akan mengembalikan error dan mencatat detailnya sebagai scraping gagal; sistem tidak membuat data sukses palsu. + +Untuk mengisi tabel `price_history` dari CSV penelitian secara manual satu kali: + +```powershell +cd C:\PrediksiHargaCabe\api +C:/Users/alfia/anaconda3/envs/tf_gpu39/python.exe scripts/import_csv_to_mysql.py +``` + +Script ini hanya melakukan import manual dan **tidak membuat scheduler atau auto-scraping**. Jika dijalankan lagi, constraint unik tanggal/komoditas/pasar mencegah duplikat dan nilai akan diperbarui. + +Contoh PowerShell: + +```powershell +cd C:\PrediksiHargaCabe\api +$env:DATA_SOURCE="mysql" +$env:MYSQL_DATABASE="prediksicabe" +$env:MYSQL_USER="root" +$env:MYSQL_PASSWORD="" +python main.py +``` + +Uji koneksi melalui endpoint: + +```text +http://127.0.0.1:8000/api/v1/history?commodity=rawit&market=pasar_tanjung&days=30 +``` + +Jika response menyatakan tidak ada data, koneksi berhasil tetapi baris harga belum ada untuk kombinasi tersebut. Jika muncul `Gagal membaca database MySQL`, periksa service MySQL, port, username, password, dan nama database. + +## Asumsi dan keterbatasan + +- Koordinat pada `app/data/markets.json` berasal dari spesifikasi dan perlu diverifikasi manual sebelum dipakai sebagai titik final peta. +- `keriting` memakai `time_step=14`. Config dan H5 yang tersedia untuk Kreongan, Mangli, dan Wirolegi sekarang sudah memiliki input 14 langkah dan dapat dipakai oleh registry. +- Folder model Keriting untuk Tanjung dan Tegal Besar tidak lengkap dan dilaporkan pada `/api/v1/health`. +- Evaluasi model yang tersedia adalah satu hari ke depan. Prediksi 7, 24, dan 30 hari memakai recursive forecasting, sehingga error dapat menumpuk dan tidak boleh dianggap memiliki akurasi satu hari. +- Harga API adalah Rupiah penuh. Scaler/model yang dilatih dalam ribuan Rupiah harus disesuaikan saat artifact inference divalidasi; CSV historis juga harus mengikuti unit yang sama dengan proses training. +- Semua nilai positif yang disimpan ke `price_history` menggunakan Rupiah penuh. Scraper menormalkan nilai sumber yang masih dalam ribuan sebelum menyimpannya; nilai `0` diperlakukan sebagai data kosong. diff --git a/api/SCRAPING.md b/api/SCRAPING.md new file mode 100644 index 0000000..530d002 --- /dev/null +++ b/api/SCRAPING.md @@ -0,0 +1,458 @@ +# Dokumentasi Scraping Harga Cabai + +Dokumen ini menjelaskan proses pembaruan data harga melalui panel admin, mulai dari tombol **Perbarui data** di frontend sampai data hasil scraping disimpan ke MySQL. + +## Ringkasan + +Fitur scraping mengambil data dari SISKAPERBAPO menggunakan: + +- `requests` untuk mengirim HTTP `GET` dan `POST`; +- `pandas.read_html()` untuk membaca tabel HTML; +- `lxml` sebagai parser HTML; +- MySQL untuk menyimpan hasil ke tabel `price_history`. + +Implementasi saat ini **tidak menggunakan Selenium, WebDriver, Playwright, atau browser automation**. + +Model LSTM tidak dilatih ulang setelah scraping. Data baru hanya disimpan sebagai data historis yang dapat digunakan oleh API saat melakukan inference. + +## Komponen yang terlibat + +| Komponen | Lokasi | Fungsi | +|---|---|---| +| Tombol dan panel admin | `../website/src/App.jsx` | Memulai scraping, menampilkan progress, dan memuat ulang data | +| Client API frontend | `../website/src/services/api.js` | Mengirim request ke backend | +| Route scraping | `app/api/routes.py` | Validasi admin, membuat job, membaca status, dan menyimpan data | +| Scraper SISKAPERBAPO | `app/services/siskaperbapo_scraper.py` | Mengambil dan membersihkan tabel harga | +| Konfigurasi aplikasi | `app/config.py` | Menentukan URL sumber, komoditas, timeout, dan sumber data | +| Data lokasi pasar | `app/data/markets.json` | Menyimpan slug, nama, dan koordinat pasar | +| Database | MySQL | Menyimpan `price_history` dan `scraping_logs` | + +## Alur tombol "Perbarui data" + +Alur normalnya adalah: + +```text +Admin klik "Perbarui data" + ↓ +Frontend mengirim POST /api/v1/admin/scraping/jobs + ↓ +Backend memvalidasi role admin dan opsi scraping + ↓ +Backend membuat job_id dan menjalankan thread background + ↓ +Scraper mengambil tabel SISKAPERBAPO + ↓ +Harga dibersihkan dan dikonversi ke Rupiah + ↓ +Data di-insert atau di-update ke price_history + ↓ +Status scraping_logs diperbarui + ↓ +Frontend mengecek status job setiap 700 ms + ↓ +Dashboard admin memuat ulang data +``` + +Proses ini berbeda dari pemanggilan prediksi. Scraping hanya memperbarui data historis; artifact model di `models/` tetap digunakan seperti sebelumnya. + +## Proses di frontend + +Komponen admin berada di `../website/src/App.jsx`. + +Fungsi `refreshPrices()`: + +1. Mengaktifkan status `refreshing`; +2. Memanggil `dashboardService.startScraping(options)`; +3. Menerima `job_id`; +4. Meminta status job setiap 700 ms; +5. Menampilkan progress dan pesan proses; +6. Menampilkan error jika status berubah menjadi `failed`; +7. Memanggil `loadAdminData()` setelah berhasil. + +Request frontend didefinisikan di `../website/src/services/api.js`: + +```javascript +startScraping: (options) => + request('/admin/scraping/jobs', { + method: 'POST', + headers: { 'Content-Type': 'application/json' }, + body: JSON.stringify(options) + }) +``` + +Contoh payload: + +```json +{ + "commodities": ["rawit"], + "start_date": "", + "end_date": "" +} +``` + +Contoh untuk rentang tanggal: + +```json +{ + "commodities": ["rawit"], + "start_date": "2025-10-01", + "end_date": "2025-10-07" +} +``` + +Jika tanggal tidak diisi, scraper mengambil tabel terbaru melalui metode `scrape()`. Jika tanggal awal dan akhir diisi, scraper menggunakan metode `scrape_range()`. + +## Endpoint scraping + +Semua endpoint berikut memiliki prefix `/api/v1` dan membutuhkan session admin. + +### Memulai scraping + +```text +POST /api/v1/admin/scraping/jobs +``` + +Payload: + +```json +{ + "commodities": ["rawit"], + "start_date": "2025-10-01", + "end_date": "2025-10-07", + "max_records": 1000 +} +``` + +Field: + +| Field | Wajib | Keterangan | +|---|---:|---| +| `commodities` | Tidak | Array slug: `rawit`, `merah`, atau `keriting`. Default mengikuti `SISKAPERBAPO_COMMODITIES` | +| `start_date` | Tidak | Tanggal awal format `YYYY-MM-DD` | +| `end_date` | Tidak | Tanggal akhir format `YYYY-MM-DD` | +| `max_records` | Tidak | Batas hasil antara 1 sampai 10.000 | + +Response awal menggunakan HTTP `202` karena proses berjalan di background: + +```json +{ + "data": { + "id": "job-id", + "status": "running", + "progress": 0, + "message": "Mengantri scraping", + "records_inserted": 0, + "records_updated": 0 + } +} +``` + +### Melihat status scraping + +```text +GET /api/v1/admin/scraping/jobs/{job_id} +``` + +Status yang mungkin: + +- `running`: proses masih berlangsung; +- `success`: proses selesai; +- `failed`: proses gagal. + +Field progress menunjukkan persentase proses. Field `message` menjelaskan tahap yang sedang berjalan. + +### Melihat daftar riwayat + +```text +GET /api/v1/admin/scraping/logs +``` + +### Melihat isi satu riwayat + +```text +GET /api/v1/admin/scraping/logs/{log_id}/records +``` + +### Menghapus satu riwayat + +```text +DELETE /api/v1/admin/scraping/logs/{log_id} +``` + +Endpoint ini menghapus log yang dipilih dan record `price_history` yang memiliki `scraping_log_id` tersebut. + +### Menghapus seluruh riwayat scraping + +```text +DELETE /api/v1/admin/scraping/history +``` + +Penghapusan dibatasi pada data yang bersumber dari `siskaperbapo`; data hasil import CSV tidak ikut dihapus. + +## Proses backend + +Route `POST /admin/scraping/jobs` berada di `app/api/routes.py`. Route tersebut: + +1. Memastikan user memiliki role `admin`; +2. Membaca payload JSON; +3. Memvalidasi komoditas, tanggal, dan batas record; +4. Menolak proses baru jika ada scraping atau preprocessing yang masih `running`; +5. Membuat ID job; +6. Memulai `_run_scraping_job()` di thread background. + +Fungsi `_run_scraping_job()` melakukan langkah berikut: + +1. Membuat row baru pada `scraping_logs` dengan status `running`; +2. Membuka koneksi MySQL; +3. Memanggil `scrape()` atau `scrape_range()`; +4. Mencocokkan slug komoditas dan pasar dengan tabel master; +5. Menyimpan observasi ke `price_history`; +6. Menghitung jumlah record baru dan record yang diperbarui; +7. Mengubah status log menjadi `success`; +8. Melakukan rollback dan mencatat error jika proses gagal. + +## Cara scraper mengambil data + +Implementasinya berada di `app/services/siskaperbapo_scraper.py`. + +### Data terbaru dengan `scrape()` + +Untuk setiap komoditas yang dipilih, scraper mengirim: + +```python +requests.get( + self.url, + params={self.commodity_param: commodity}, + timeout=self.timeout, + headers={"User-Agent": "PanenHarga/1.0"}, +) +``` + +Response HTML dibaca dengan: + +```python +pd.read_html(StringIO(response.text)) +``` + +Scraper kemudian mencari: + +- kolom lokasi atau pasar; +- kolom yang dapat dibaca sebagai tanggal; +- baris lima pasar target; +- harga pada setiap tanggal. + +### Data historis dengan `scrape_range()` + +Untuk rentang tanggal, scraper mengakses endpoint: + +```text +/harga/tabel.nodesign +``` + +melalui HTTP `POST`, dengan data: + +```python +{ + "tanggal": "YYYY-MM-DD", + "kabkota": "jemberkab", + "pasar": "market_id" +} +``` + +Proses dilakukan untuk setiap kombinasi: + +```text +tanggal × pasar +``` + +ID pasar yang digunakan: + +| Slug | Nama | ID sumber | +|---|---|---:| +| `pasar_tanjung` | Pasar Tanjung | `11` | +| `pasar_kreongan` | Pasar Kreongan | `12` | +| `pasar_tegal_besar` | Pasar Tegal Besar | `13` | +| `pasar_mangli` | Pasar Mangli | `148` | +| `pasar_wirolegi` | Pasar Wirolegi | `149` | + +## Normalisasi harga + +Scraper memakai `_parse_price()` untuk membersihkan nilai seperti: + +- `Rp22`; +- `22`; +- `22,5`; +- `22.000`. + +Kemudian `_price_in_rupiah()` menerapkan aturan: + +```python +price * 1000 if 0 < price < 1000 else price +``` + +Dengan demikian: + +| Nilai sumber | Nilai yang disimpan | +|---:|---:| +| `22` | `22000` | +| `22.5` | `22500` | +| `22000` | `22000` | + +Harga dalam `price_history` disimpan sebagai Rupiah penuh. + +## Penyimpanan dan duplikasi data + +Setiap observasi memiliki bentuk: + +```json +{ + "commodity": "rawit", + "market": "pasar_tanjung", + "date": "2025-10-01", + "price": 22000, + "source": "siskaperbapo" +} +``` + +Record disimpan ke `price_history` menggunakan pola: + +```sql +INSERT INTO price_history (...) +VALUES (...) +ON DUPLICATE KEY UPDATE + price = VALUES(price), + source = VALUES(source), + scraping_log_id = VALUES(scraping_log_id) +``` + +Artinya: + +- kombinasi yang belum ada menjadi record baru; +- kombinasi yang sudah ada diperbarui; +- harga tidak disimpan sebagai duplikat jika unique key database telah dikonfigurasi. + +Kolom `scraping_log_id` menghubungkan setiap harga dengan riwayat proses scraping. + +## `scraping_logs` + +Tabel `scraping_logs` dipakai untuk mencatat proses. Informasi yang disimpan meliputi: + +- waktu mulai; +- waktu selesai; +- sumber data; +- status; +- jumlah record baru; +- jumlah record diperbarui; +- pesan error atau warning. + +Status awal adalah `running`. Setelah proses selesai, status menjadi `success` atau `failed`. + +## Scraping dan preprocessing berbeda + +Scraping: + +```text +Mengambil data dari SISKAPERBAPO +``` + +Preprocessing: + +```text +Memeriksa dan mengisi data kosong dari riwayat scraping +``` + +Preprocessing dijalankan melalui: + +```text +POST /api/v1/admin/preprocessing/jobs +``` + +Proses ini menggunakan interpolasi linear dan bukan bagian dari pengambilan data dari website. + +## Konfigurasi + +Konfigurasi berada di `app/config.py` dan dapat diatur melalui environment variable: + +```powershell +$env:SISKAPERBAPO_URL="https://siskaperbapo.jatimprov.go.id/harga-komoditas" +$env:SISKAPERBAPO_COMMODITY_PARAM="komoditas" +$env:SISKAPERBAPO_TIMEOUT="30" +$env:SISKAPERBAPO_COMMODITIES="rawit" +``` + +Nilai default: + +- URL: `https://siskaperbapo.jatimprov.go.id/harga-komoditas`; +- parameter komoditas: `komoditas`; +- timeout: 30 detik; +- komoditas default: `rawit`. + +Tahap awal menggunakan `rawit` untuk mengurangi risiko sumber website mengabaikan parameter komoditas. Komoditas lain sebaiknya diaktifkan setelah struktur response sumber diverifikasi. + +## Cara menjalankan dan memeriksa proses + +Jalankan backend dari folder `api`: + +```powershell +cd C:\PrediksiHargaCabe\api +python main.py +``` + +Kemudian: + +1. Buka website frontend; +2. Login sebagai admin; +3. Buka menu **Perbarui data**; +4. Pilih komoditas; +5. Isi rentang tanggal jika ingin mengambil data historis tertentu; +6. Klik **Mulai scraping** atau tombol **Perbarui data** di bagian atas; +7. Amati progress; +8. Periksa bagian **Riwayat pembaruan**; +9. Buka detail record untuk memeriksa hasil yang disimpan. + +Jika ingin melihat proses langsung dari database, periksa: + +```sql +SELECT * +FROM scraping_logs +ORDER BY id DESC; +``` + +dan: + +```sql +SELECT * +FROM price_history +WHERE source = 'siskaperbapo' +ORDER BY price_date DESC; +``` + +## Penanganan error + +Jika request ke sumber gagal, scraper melempar `ScrapingError`. Job akan berstatus `failed`, transaksi database di-rollback, dan pesan error dicatat di `scraping_logs`. + +Penyebab yang umum: + +- website SISKAPERBAPO tidak dapat diakses; +- struktur tabel HTML berubah; +- parameter komoditas tidak sesuai; +- koneksi MySQL gagal; +- tabel master komoditas atau pasar belum tersedia; +- response tidak berisi data yang cocok. + +Jika proses gagal, periksa: + +1. status dan pesan pada panel admin; +2. kolom error di `scraping_logs`; +3. URL dan konfigurasi SISKAPERBAPO; +4. koneksi MySQL; +5. struktur HTML response sumber. + +## Catatan penting + +- Scraping hanya dapat dijalankan oleh admin. +- Hanya satu scraping atau preprocessing yang boleh berjalan pada satu waktu di proses aplikasi. +- Data baru tidak otomatis melatih ulang model. +- Tidak ada Selenium pada implementasi saat ini. +- Perubahan struktur HTML SISKAPERBAPO dapat membuat parser gagal. +- Data kosong yang dihasilkan scraping ditangani pada tahap preprocessing terpisah. diff --git a/api/__pycache__/main.cpython-311.pyc b/api/__pycache__/main.cpython-311.pyc new file mode 100644 index 0000000..95807af Binary files /dev/null and b/api/__pycache__/main.cpython-311.pyc differ diff --git a/api/__pycache__/main.cpython-39.pyc b/api/__pycache__/main.cpython-39.pyc new file mode 100644 index 0000000..f40ec7a Binary files /dev/null and b/api/__pycache__/main.cpython-39.pyc differ diff --git a/api/app/__init__.py b/api/app/__init__.py new file mode 100644 index 0000000..a17b87e --- /dev/null +++ b/api/app/__init__.py @@ -0,0 +1,95 @@ +import json +import logging +from pathlib import Path + +from flask import Flask, jsonify, request + +from app.api.routes import api +from app.config import Config +from app.data.repository import CsvPriceRepository, MySQLPriceRepository +from app.errors import register_error_handlers +from app.services.model_registry import ModelRegistry +from app.services.prediction_service import PredictionService +from app.services.siskaperbapo_scraper import SiskaperbapoScraper + + +def create_app(config_class=Config) -> Flask: + app = Flask(__name__) + app.config.from_object(config_class) + logging.basicConfig(level=logging.INFO) + origins = app.config["CORS_ORIGINS"] + allowed_origins = [value.strip() for value in origins.split(",") if value.strip()] + + @app.after_request + def add_cors_credentials(response): + origin = request.headers.get("Origin") + if origin and (origins == "*" or origin in allowed_origins): + response.headers["Access-Control-Allow-Origin"] = origin + response.headers["Access-Control-Allow-Credentials"] = "true" + response.headers["Access-Control-Allow-Headers"] = "Content-Type" + response.headers["Access-Control-Allow-Methods"] = "GET,POST,DELETE,OPTIONS" + response.headers["Vary"] = "Origin" + return response + + model_registry = ModelRegistry(app.config["MODELS_DIR"]) + if app.config["DATA_SOURCE"] == "mysql": + repository = MySQLPriceRepository(app.config) + elif app.config["DATA_SOURCE"] == "csv": + repository = CsvPriceRepository(app.config["DATA_DIR"], app.config["PRICE_UNIT_SCALE"]) + else: + raise ValueError("DATA_SOURCE harus bernilai 'mysql' atau 'csv'.") + app.extensions["model_registry"] = model_registry + app.extensions["prediction_service"] = PredictionService(model_registry, repository, app.config["STALE_DATA_DAYS"], app.config["TREND_THRESHOLD_PCT"]) + if hasattr(repository, "_connect"): + connection = repository._connect() + try: + with connection.cursor() as cursor: + cursor.execute( + """ + SELECT COUNT(*) FROM information_schema.columns + WHERE table_schema = DATABASE() + AND table_name = 'price_history' + AND column_name = 'scraping_log_id' + """ + ) + if cursor.fetchone()[0] == 0: + cursor.execute( + "ALTER TABLE price_history ADD COLUMN scraping_log_id BIGINT UNSIGNED NULL AFTER source" + ) + cursor.execute( + """ + ALTER TABLE price_history + ADD KEY idx_price_history_scraping_log (scraping_log_id), + ADD CONSTRAINT fk_price_history_scraping_log + FOREIGN KEY (scraping_log_id) REFERENCES scraping_logs(id) + ON UPDATE CASCADE ON DELETE CASCADE + """ + ) + cursor.execute( + """ + UPDATE price_history ph + JOIN ( + SELECT MAX(id) AS id FROM scraping_logs WHERE source = 'siskaperbapo' + ) latest ON 1 = 1 + SET ph.scraping_log_id = latest.id + WHERE ph.source = 'siskaperbapo' AND ph.scraping_log_id IS NULL + """ + ) + connection.commit() + finally: + connection.close() + app.extensions["siskaperbapo_scraper"] = SiskaperbapoScraper( + app.config["SISKAPERBAPO_URL"], + app.config["SISKAPERBAPO_COMMODITY_PARAM"], + app.config["SISKAPERBAPO_TIMEOUT"], + ) + markets_path = Path(__file__).parent / "data" / "markets.json" + app.extensions["markets_config"] = json.loads(markets_path.read_text(encoding="utf-8")) + app.register_blueprint(api) + register_error_handlers(app) + + @app.get("/") + def root(): + return jsonify({"message": "API Prediksi Harga Cabai aktif", "status": "ok"}) + + return app diff --git a/api/app/__pycache__/__init__.cpython-311.pyc b/api/app/__pycache__/__init__.cpython-311.pyc new file mode 100644 index 0000000..c358885 Binary files /dev/null and b/api/app/__pycache__/__init__.cpython-311.pyc differ diff --git a/api/app/__pycache__/__init__.cpython-39.pyc b/api/app/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..88ae49d Binary files /dev/null and b/api/app/__pycache__/__init__.cpython-39.pyc differ diff --git a/api/app/__pycache__/config.cpython-39.pyc b/api/app/__pycache__/config.cpython-39.pyc new file mode 100644 index 0000000..75310ec Binary files /dev/null and b/api/app/__pycache__/config.cpython-39.pyc differ diff --git a/api/app/__pycache__/errors.cpython-39.pyc b/api/app/__pycache__/errors.cpython-39.pyc new file mode 100644 index 0000000..6c4bee1 Binary files /dev/null and b/api/app/__pycache__/errors.cpython-39.pyc differ diff --git a/api/app/api/__init__.py b/api/app/api/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/api/app/api/__pycache__/__init__.cpython-39.pyc b/api/app/api/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..6e81768 Binary files /dev/null and b/api/app/api/__pycache__/__init__.cpython-39.pyc differ diff --git a/api/app/api/__pycache__/routes.cpython-39.pyc b/api/app/api/__pycache__/routes.cpython-39.pyc new file mode 100644 index 0000000..1537eb9 Binary files /dev/null and b/api/app/api/__pycache__/routes.cpython-39.pyc differ diff --git a/api/app/api/__pycache__/schemas.cpython-39.pyc b/api/app/api/__pycache__/schemas.cpython-39.pyc new file mode 100644 index 0000000..3adbba3 Binary files /dev/null and b/api/app/api/__pycache__/schemas.cpython-39.pyc differ diff --git a/api/app/api/routes.py b/api/app/api/routes.py new file mode 100644 index 0000000..1daa346 --- /dev/null +++ b/api/app/api/routes.py @@ -0,0 +1,830 @@ +from datetime import date, datetime, timedelta +from functools import wraps +from threading import Lock, Thread +from uuid import uuid4 + +from flask import Blueprint, current_app, jsonify, request, session +from pymysql import MySQLError +from werkzeug.security import check_password_hash, generate_password_hash + +from app.api.schemas import parse_days, parse_horizon, required_query +from app.errors import ApiError +from app.services.model_registry import COMMODITIES, MARKETS +from app.services.siskaperbapo_scraper import ScrapingError + +api = Blueprint("api", __name__, url_prefix="/api/v1") +_scraping_jobs = {} +_scraping_jobs_lock = Lock() +_preprocessing_jobs = {} + + +def service(): + return current_app.extensions["prediction_service"] + + +def registry(): + return current_app.extensions["model_registry"] + + +def markets_config(): + return current_app.extensions["markets_config"] + + +def _db(): + repository = current_app.extensions["prediction_service"].repository + if not hasattr(repository, "_connect"): + raise ApiError("DATABASE_NOT_CONFIGURED", "Database MySQL belum dikonfigurasi.", 503) + return repository._connect() + + +def admin_required(handler): + @wraps(handler) + def wrapped(*args, **kwargs): + if session.get("user_role") != "admin": + raise ApiError("ADMIN_REQUIRED", "Akses admin diperlukan.", 403) + return handler(*args, **kwargs) + return wrapped + + +def _set_scraping_job(job_id, **values): + with _scraping_jobs_lock: + _scraping_jobs.setdefault(job_id, {}).update(values) + + +def _scraping_job_payload(job): + return { + "id": job["id"], + "status": job["status"], + "progress": job["progress"], + "message": job["message"], + "records_inserted": job.get("records_inserted", 0), + "records_updated": job.get("records_updated", 0), + "log_id": job.get("log_id"), + "warning": job.get("warning"), + "error": job.get("error"), + } + + +def _preprocessing_job_payload(job): + return { + "id": job["id"], + "status": job["status"], + "progress": job["progress"], + "message": job["message"], + "rows_filled": job.get("rows_filled", 0), + "warning": job.get("warning"), + "run_id": job.get("run_id"), + "error": job.get("error"), + } + + +def _run_preprocessing_job(app, job_id, scraping_log_id): + with app.app_context(): + connection = None + run_id = None + try: + repository = app.extensions["prediction_service"].repository + if not hasattr(repository, "_connect"): + raise ApiError("DATABASE_NOT_CONFIGURED", "Database MySQL belum dikonfigurasi.", 503) + connection = repository._connect() + started_at = datetime.utcnow() + with connection.cursor() as cursor: + cursor.execute( + """ + INSERT INTO preprocessing_runs + (dataset_source, started_at, status, parameters_json) + VALUES ('mysql.price_history', %s, 'running', %s) + """, + (started_at, '{"method":"linear_interpolation","scope":"selected_scraping_log"}'), + ) + run_id = cursor.lastrowid + connection.commit() + _set_preprocessing_job(job_id, run_id=run_id, progress=5, message="Memeriksa data kosong") + with connection.cursor() as cursor: + cursor.execute( + """ + SELECT c.id, m.id, c.slug, m.slug, ph.price_date, ph.price + FROM price_history ph + JOIN commodities c ON c.id = ph.commodity_id + JOIN markets m ON m.id = ph.market_id + WHERE ph.scraping_log_id = %s + ORDER BY c.slug, m.slug, ph.price_date + """, + (scraping_log_id,), + ) + rows = cursor.fetchall() + groups = {} + for commodity_id, market_id, commodity, market, price_date, price in rows: + groups.setdefault((commodity_id, market_id, commodity, market), []).append((price_date, float(price))) + filled = 0 + long_gaps = [] + total_groups = max(len(groups), 1) + with connection.cursor() as cursor: + for index, ((commodity_id, market_id, commodity, market), observations) in enumerate(groups.items(), start=1): + values = {item[0]: item[1] for item in observations} + first_date, last_date = observations[0][0], observations[-1][0] + missing = [] + current = first_date + while current <= last_date: + if current not in values: + missing.append(current) + current += timedelta(days=1) + missing_runs = [] + for missing_date in missing: + if not missing_runs or (missing_date - missing_runs[-1][-1]).days > 1: + missing_runs.append([missing_date]) + else: + missing_runs[-1].append(missing_date) + for missing_run in missing_runs: + if len(missing_run) > 2: + long_gaps.append(f"{commodity}/{market}: {len(missing_run)} hari") + continue + for missing_date in missing_run: + previous = max((day for day in values if day < missing_date), default=None) + following = min((day for day in values if day > missing_date), default=None) + if previous is None or following is None: + continue + ratio = (missing_date - previous).days / (following - previous).days + interpolated = values[previous] + (values[following] - values[previous]) * ratio + cursor.execute( + """ + INSERT INTO price_history + (commodity_id, market_id, price_date, price, source, scraping_log_id) + VALUES (%s, %s, %s, %s, 'preprocessing_interpolation', %s) + """, + (commodity_id, market_id, missing_date, round(interpolated, 2), scraping_log_id), + ) + filled += 1 + progress = 5 + int(index / total_groups * 85) + _set_preprocessing_job(job_id, progress=progress, message=f"Memproses {commodity} / {market}") + with connection.cursor() as cursor: + cursor.execute( + "SELECT COUNT(*) FROM price_history" + ) + rows_after = cursor.fetchone()[0] + cursor.execute( + "UPDATE preprocessing_runs SET finished_at = %s, status = 'success', rows_before = %s, rows_after = %s WHERE id = %s", + (datetime.utcnow(), len(rows), rows_after, run_id), + ) + connection.commit() + warning = f"Gap lebih dari 2 hari tidak diisi: {', '.join(long_gaps[:5])}" if long_gaps else None + _set_preprocessing_job(job_id, status="success", progress=100, message="Preprocessing selesai", rows_filled=filled, warning=warning) + except Exception as error: + if connection and run_id: + with connection.cursor() as cursor: + cursor.execute( + "UPDATE preprocessing_runs SET finished_at = %s, status = 'failed', error_message = %s WHERE id = %s", + (datetime.utcnow(), str(error), run_id), + ) + connection.commit() + _set_preprocessing_job(job_id, status="failed", progress=100, message="Preprocessing gagal", error=str(error)) + finally: + if connection: + connection.close() + + +def _set_preprocessing_job(job_id, **values): + with _scraping_jobs_lock: + _preprocessing_jobs.setdefault(job_id, {}).update(values) + + +def _run_scraping_job(app, job_id, selected_commodities, start_date, end_date, max_records): + with app.app_context(): + connection = None + log_id = None + try: + _set_scraping_job(job_id, progress=5, message="Menyiapkan proses scraping") + repository = app.extensions["prediction_service"].repository + if not hasattr(repository, "_connect"): + raise ScrapingError("Database MySQL belum dikonfigurasi.") + connection = repository._connect() + started_at = datetime.utcnow() + with connection.cursor() as cursor: + cursor.execute( + "INSERT INTO scraping_logs (started_at, status, source) VALUES (%s, 'running', 'siskaperbapo')", + (started_at,), + ) + log_id = cursor.lastrowid + connection.commit() + _set_scraping_job(job_id, log_id=log_id, progress=8, message="Mengambil tabel SISKAPERBAPO") + + def report(progress, message): + _set_scraping_job(job_id, progress=progress, message=message) + + if start_date and end_date: + observations = app.extensions["siskaperbapo_scraper"].scrape_range( + selected_commodities, start_date, end_date, on_progress=report + ) + else: + observations = app.extensions["siskaperbapo_scraper"].scrape( + selected_commodities, on_progress=report + ) + filtered = [ + item for item in observations + if (not start_date or item["date"] >= start_date) + and (not end_date or item["date"] <= end_date) + ] + filtered.sort(key=lambda item: (item["date"], item["commodity"], item["market"])) + if max_records: + filtered = filtered[:max_records] + if not filtered: + raise ScrapingError("Tidak ada data yang sesuai dengan filter scraping.") + warning = None + if start_date and end_date: + expected = { + (day, commodity, market) + for day_offset in range((end_date - start_date).days + 1) + for day in [start_date + timedelta(days=day_offset)] + for commodity in selected_commodities + for market in [item["slug"] for item in markets_config()] + } + observed = {(item["date"], item["commodity"], item["market"]) for item in filtered} + missing_count = len(expected - observed) + if missing_count: + warning = f"{missing_count} data kosong/tidak tersedia dilewati dari rentang scraping." + + inserted = 0 + updated = 0 + total = len(filtered) + with connection.cursor() as cursor: + for index, observation in enumerate(filtered, start=1): + cursor.execute( + "SELECT c.id, m.id FROM commodities c CROSS JOIN markets m WHERE c.slug = %s AND m.slug = %s", + (observation["commodity"], observation["market"]), + ) + ids = cursor.fetchone() + if not ids: + continue + cursor.execute( + """ + INSERT INTO price_history + (commodity_id, market_id, price_date, price, source, scraping_log_id) + VALUES (%s, %s, %s, %s, %s, %s) + ON DUPLICATE KEY UPDATE price = VALUES(price), source = VALUES(source), + scraping_log_id = VALUES(scraping_log_id) + """, + (*ids, observation["date"], observation["price"], observation["source"], log_id), + ) + if cursor.rowcount == 1: + inserted += 1 + elif cursor.rowcount == 2: + updated += 1 + report(65 + int(index / total * 30), f"Menyimpan data {index} dari {total}") + cursor.execute( + """ + UPDATE scraping_logs + SET status = 'success', finished_at = UTC_TIMESTAMP(), + records_inserted = %s, records_updated = %s, error_message = %s + WHERE id = %s + """, + (inserted, updated, warning, log_id), + ) + connection.commit() + _set_scraping_job( + job_id, + status="success", + progress=100, + message="Scraping selesai", + records_inserted=inserted, + records_updated=updated, + warning=warning, + ) + except (ScrapingError, MySQLError) as error: + if connection: + connection.rollback() + if log_id: + with connection.cursor() as cursor: + cursor.execute( + "UPDATE scraping_logs SET status = 'failed', finished_at = UTC_TIMESTAMP(), error_message = %s WHERE id = %s", + (str(error), log_id), + ) + connection.commit() + _set_scraping_job(job_id, status="failed", progress=100, message="Scraping gagal", error=str(error)) + except Exception as error: + app.logger.exception("Unhandled scraping job error: %s", error) + if connection: + connection.rollback() + _set_scraping_job( + job_id, + status="failed", + progress=100, + message="Scraping gagal karena kesalahan internal", + error="Terjadi kesalahan internal pada proses scraping.", + ) + finally: + if connection: + connection.close() + + +@api.post("/auth/register") +def register(): + payload = request.get_json(silent=True) or {} + name = str(payload.get("name", "")).strip() + email = str(payload.get("email", "")).strip().lower() + password = str(payload.get("password", "")) + if not name or not email or len(password) < 8: + raise ApiError("INVALID_AUTH_INPUT", "Nama, email, dan password minimal 8 karakter wajib diisi.", 400) + connection = _db() + try: + with connection.cursor() as cursor: + cursor.execute("SELECT id FROM users WHERE email = %s", (email,)) + if cursor.fetchone(): + raise ApiError("EMAIL_EXISTS", "Email sudah terdaftar.", 409) + cursor.execute( + "INSERT INTO users (name, email, password_hash, role) VALUES (%s, %s, %s, 'user')", + (name, email, generate_password_hash(password)), + ) + user_id = cursor.lastrowid + connection.commit() + finally: + connection.close() + session.update(user_id=user_id, user_name=name, user_email=email, user_role="user") + return jsonify({"data": {"id": user_id, "name": name, "email": email, "role": "user"}}), 201 + + +@api.post("/auth/login") +def login(): + payload = request.get_json(silent=True) or {} + email = str(payload.get("email", "")).strip().lower() + password = str(payload.get("password", "")) + connection = _db() + try: + with connection.cursor() as cursor: + cursor.execute("SELECT id, name, email, password_hash, role FROM users WHERE email = %s", (email,)) + user = cursor.fetchone() + finally: + connection.close() + if not user or not check_password_hash(user[3], password): + raise ApiError("INVALID_CREDENTIALS", "Email atau password salah.", 401) + session.update(user_id=user[0], user_name=user[1], user_email=user[2], user_role=user[4]) + return jsonify({"data": {"id": user[0], "name": user[1], "email": user[2], "role": user[4]}}) + + +@api.post("/auth/logout") +def logout(): + session.clear() + return jsonify({"data": {"logged_out": True}}) + + +@api.get("/auth/me") +def me(): + if not session.get("user_id"): + return jsonify({"data": None}) + return jsonify({"data": {"id": session["user_id"], "name": session["user_name"], "email": session["user_email"], "role": session["user_role"]}}) + + +@api.get("/prices") +@admin_required +def prices(): + repository = current_app.extensions["prediction_service"].repository + if not hasattr(repository, "_connect"): + raise ApiError("DATABASE_NOT_CONFIGURED", "Endpoint raw data membutuhkan MySQL.", 503) + page = max(int(request.args.get("page", 1)), 1) + limit = min(max(int(request.args.get("limit", 25)), 1), 20000) + offset = (page - 1) * limit + connection = repository._connect() + try: + with connection.cursor() as cursor: + cursor.execute( + f""" + SELECT ph.price_date, c.name, m.name, ph.price + FROM price_history ph + JOIN commodities c ON c.id = ph.commodity_id + JOIN markets m ON m.id = ph.market_id + WHERE (%s = '' OR c.slug = %s) AND (%s = '' OR m.slug = %s) + ORDER BY ph.price_date DESC, c.name, m.name + LIMIT %s OFFSET %s + """, + (request.args.get("commodity", ""), request.args.get("commodity", ""), request.args.get("market", ""), request.args.get("market", ""), limit, offset), + ) + rows = cursor.fetchall() + cursor.execute( + f""" + SELECT COUNT(*) + FROM price_history ph + JOIN commodities c ON c.id = ph.commodity_id + JOIN markets m ON m.id = ph.market_id + WHERE (%s = '' OR c.slug = %s) AND (%s = '' OR m.slug = %s) + """, + ( + request.args.get("commodity", ""), + request.args.get("commodity", ""), + request.args.get("market", ""), + request.args.get("market", ""), + ), + ) + total = cursor.fetchone()[0] + finally: + connection.close() + return jsonify({"data": [{"date": row[0].isoformat(), "commodity": row[1], "market": row[2], "price": float(row[3])} for row in rows], "meta": {"page": page, "limit": limit, "total": total}}) + + +@api.get("/admin/overview") +@admin_required +def admin_overview(): + connection = _db() + try: + with connection.cursor() as cursor: + cursor.execute("SELECT COUNT(*) FROM price_history") + total_prices = cursor.fetchone()[0] + cursor.execute("SELECT COUNT(*) FROM commodities") + total_commodities = cursor.fetchone()[0] + cursor.execute("SELECT COUNT(*) FROM markets") + total_markets = cursor.fetchone()[0] + cursor.execute("SELECT COUNT(*) FROM model_versions WHERE is_active = 1") + active_models = cursor.fetchone()[0] + cursor.execute("SELECT COUNT(*) FROM training_runs") + training_runs = cursor.fetchone()[0] + cursor.execute("SELECT MAX(created_at) FROM preprocessing_runs") + last_preprocessing = cursor.fetchone()[0] + cursor.execute( + """ + SELECT id, status, started_at, finished_at, records_inserted, + records_updated, error_message, source, + (SELECT GROUP_CONCAT(DISTINCT c.name ORDER BY c.name SEPARATOR ', ') + FROM price_history ph JOIN commodities c ON c.id = ph.commodity_id + WHERE ph.scraping_log_id = scraping_logs.id) AS commodities + FROM scraping_logs ORDER BY id DESC LIMIT 1 + """ + ) + last_scraping = cursor.fetchone() + finally: + connection.close() + return jsonify({"data": {"total_prices": total_prices, "total_commodities": total_commodities, "total_markets": total_markets, "active_models": active_models, "training_runs": training_runs, "last_preprocessing": last_preprocessing.isoformat() if last_preprocessing else None, "scraping": {"enabled": True, "message": "Pembaruan manual tersedia.", "last_run": _scraping_log_payload(last_scraping)}}}) + + +def _scraping_log_payload(row): + if not row: + return None + return { + "id": row[0], + "status": row[1], + "started_at": row[2].isoformat() if row[2] else None, + "finished_at": row[3].isoformat() if row[3] else None, + "records_inserted": row[4], + "records_updated": row[5], + "error_message": row[6], + "source": row[7], + "commodities": row[8] if len(row) > 8 and row[8] else "-", + } + + +@api.get("/admin/scraping/logs") +@admin_required +def scraping_logs(): + connection = _db() + try: + with connection.cursor() as cursor: + cursor.execute( + """ + SELECT id, status, started_at, finished_at, records_inserted, + records_updated, error_message, source, + (SELECT GROUP_CONCAT(DISTINCT c.name ORDER BY c.name SEPARATOR ', ') + FROM price_history ph JOIN commodities c ON c.id = ph.commodity_id + WHERE ph.scraping_log_id = scraping_logs.id) AS commodities + FROM scraping_logs ORDER BY id DESC LIMIT 20 + """ + ) + rows = cursor.fetchall() + finally: + connection.close() + return jsonify({"data": [_scraping_log_payload(row) for row in rows]}) + + +@api.get("/admin/scraping/logs//records") +@admin_required +def scraping_log_records(log_id): + connection = _db() + try: + with connection.cursor() as cursor: + cursor.execute( + "SELECT status, source FROM scraping_logs WHERE id = %s", + (log_id,), + ) + log = cursor.fetchone() + if not log: + raise ApiError("SCRAPING_LOG_NOT_FOUND", "Log scraping tidak ditemukan.", 404) + cursor.execute( + """ + SELECT ph.price_date, c.name, m.name, ph.price + FROM price_history ph + JOIN commodities c ON c.id = ph.commodity_id + JOIN markets m ON m.id = ph.market_id + WHERE ph.scraping_log_id = %s + ORDER BY ph.price_date DESC, c.name, m.name + """, + (log_id,), + ) + rows = cursor.fetchall() + finally: + connection.close() + return jsonify( + { + "data": [ + { + "date": row[0].isoformat(), + "commodity": row[1], + "market": row[2], + "price": float(row[3]), + } + for row in rows + ] + } + ) + + +@api.post("/admin/scraping/refresh") +@admin_required +def refresh_scraping(): + scraper = current_app.extensions["siskaperbapo_scraper"] + connection = _db() + started_at = datetime.utcnow() + log_id = None + try: + with connection.cursor() as cursor: + cursor.execute( + "INSERT INTO scraping_logs (started_at, status, source) VALUES (%s, 'running', 'siskaperbapo')", + (started_at,), + ) + log_id = cursor.lastrowid + connection.commit() + selected_commodities = { + slug: COMMODITIES[slug] + for slug in current_app.config["SISKAPERBAPO_COMMODITIES"] + if slug in COMMODITIES + } + if not selected_commodities: + raise ScrapingError("Tidak ada komoditas scraper yang dikonfigurasi.") + observations = scraper.scrape(selected_commodities) + inserted = 0 + updated = 0 + with connection.cursor() as cursor: + for observation in observations: + cursor.execute( + "SELECT c.id, m.id FROM commodities c CROSS JOIN markets m WHERE c.slug = %s AND m.slug = %s", + (observation["commodity"], observation["market"]), + ) + ids = cursor.fetchone() + if not ids: + continue + cursor.execute( + """ + INSERT INTO price_history + (commodity_id, market_id, price_date, price, source, scraping_log_id) + VALUES (%s, %s, %s, %s, %s, %s) + ON DUPLICATE KEY UPDATE price = VALUES(price), source = VALUES(source), + scraping_log_id = VALUES(scraping_log_id) + """, + (*ids, observation["date"], observation["price"], observation["source"], log_id), + ) + if cursor.rowcount == 1: + inserted += 1 + elif cursor.rowcount in (2,): + updated += 1 + cursor.execute( + """ + UPDATE scraping_logs + SET status = 'success', finished_at = UTC_TIMESTAMP(), + records_inserted = %s, records_updated = %s + WHERE id = %s + """, + (inserted, updated, log_id), + ) + connection.commit() + except ScrapingError as error: + connection.rollback() + if log_id: + with connection.cursor() as cursor: + cursor.execute( + "UPDATE scraping_logs SET status = 'failed', finished_at = UTC_TIMESTAMP(), error_message = %s WHERE id = %s", + (str(error), log_id), + ) + connection.commit() + raise ApiError("SCRAPING_FAILED", str(error), 502) + except MySQLError as error: + connection.rollback() + if log_id: + with connection.cursor() as cursor: + cursor.execute( + "UPDATE scraping_logs SET status = 'failed', finished_at = UTC_TIMESTAMP(), error_message = %s WHERE id = %s", + (str(error), log_id), + ) + connection.commit() + raise ApiError("SCRAPING_DATABASE_FAILED", "Gagal menyimpan hasil pembaruan ke database.", 503) from error + finally: + connection.close() + return jsonify({"data": {"status": "success", "records_inserted": inserted, "records_updated": updated, "log_id": log_id}}) + + +@api.delete("/admin/scraping/logs/") +@admin_required +def delete_scraping_log(log_id): + connection = _db() + try: + with connection.cursor() as cursor: + cursor.execute( + "SELECT id, source FROM scraping_logs WHERE id = %s", + (log_id,), + ) + log = cursor.fetchone() + if not log: + raise ApiError("SCRAPING_LOG_NOT_FOUND", "Log scraping tidak ditemukan.", 404) + if log[1] != "siskaperbapo": + raise ApiError("SCRAPING_LOG_NOT_ALLOWED", "Sumber log ini tidak dapat dihapus dari panel.", 400) + cursor.execute( + "DELETE FROM price_history WHERE scraping_log_id = %s", + (log_id,), + ) + deleted_records = cursor.rowcount + cursor.execute("DELETE FROM scraping_logs WHERE id = %s", (log_id,)) + connection.commit() + finally: + connection.close() + return jsonify({"data": {"log_id": log_id, "deleted_records": deleted_records}}) + + +@api.post("/admin/scraping/jobs") +@admin_required +def start_scraping_job(): + payload = request.get_json(silent=True) or {} + selected_slugs = payload.get("commodities") or list(current_app.config["SISKAPERBAPO_COMMODITIES"]) + if not isinstance(selected_slugs, list) or not selected_slugs: + raise ApiError("INVALID_SCRAPING_OPTIONS", "Pilih minimal satu jenis cabai.", 400) + selected_commodities = { + slug: COMMODITIES[slug] for slug in selected_slugs if slug in COMMODITIES + } + if not selected_commodities: + raise ApiError("INVALID_SCRAPING_OPTIONS", "Jenis cabai tidak dikenali.", 400) + try: + start_date = date.fromisoformat(str(payload["start_date"])) if payload.get("start_date") else None + end_date = date.fromisoformat(str(payload["end_date"])) if payload.get("end_date") else None + max_records = int(payload["max_records"]) if payload.get("max_records") else None + except (TypeError, ValueError) as error: + raise ApiError("INVALID_SCRAPING_OPTIONS", "Tanggal atau jumlah data tidak valid.", 400) from error + if start_date and end_date and start_date > end_date: + raise ApiError("INVALID_SCRAPING_OPTIONS", "Tanggal mulai tidak boleh setelah tanggal akhir.", 400) + if max_records is not None and not 1 <= max_records <= 10000: + raise ApiError("INVALID_SCRAPING_OPTIONS", "Jumlah data harus antara 1 dan 10.000.", 400) + job_id = uuid4().hex + job = {"id": job_id, "status": "running", "progress": 0, "message": "Mengantri scraping"} + with _scraping_jobs_lock: + if any(item["status"] == "running" for item in _scraping_jobs.values()) or any(item["status"] == "running" for item in _preprocessing_jobs.values()): + raise ApiError("PROCESS_IN_PROGRESS", "Proses scraping atau preprocessing lain masih berjalan.", 409) + _scraping_jobs[job_id] = job + thread = Thread( + target=_run_scraping_job, + args=(current_app._get_current_object(), job_id, selected_commodities, start_date, end_date, max_records), + daemon=True, + ) + thread.start() + return jsonify({"data": _scraping_job_payload(job)}), 202 + + +@api.get("/admin/scraping/jobs/") +@admin_required +def scraping_job_status(job_id): + with _scraping_jobs_lock: + job = _scraping_jobs.get(job_id) + if not job: + raise ApiError("SCRAPING_JOB_NOT_FOUND", "Proses scraping tidak ditemukan.", 404) + return jsonify({"data": _scraping_job_payload(job)}) + + +@api.post("/admin/preprocessing/jobs") +@admin_required +def start_preprocessing_job(): + payload = request.get_json(silent=True) or {} + try: + scraping_log_id = int(payload.get("scraping_log_id")) + except (TypeError, ValueError) as error: + raise ApiError("INVALID_PREPROCESSING_OPTIONS", "Pilih riwayat scraping yang akan diproses.", 400) from error + connection = _db() + try: + with connection.cursor() as cursor: + cursor.execute( + "SELECT id, status, records_inserted FROM scraping_logs WHERE id = %s AND source = 'siskaperbapo'", + (scraping_log_id,), + ) + log = cursor.fetchone() + finally: + connection.close() + if not log: + raise ApiError("SCRAPING_LOG_NOT_FOUND", "Riwayat scraping yang dipilih tidak ditemukan.", 404) + if log[1] != "success" or not log[2]: + raise ApiError("INVALID_PREPROCESSING_OPTIONS", "Riwayat scraping tidak memiliki data valid untuk diproses.", 400) + with _scraping_jobs_lock: + if any(item["status"] == "running" for item in _scraping_jobs.values()) or any(item["status"] == "running" for item in _preprocessing_jobs.values()): + raise ApiError("PROCESS_IN_PROGRESS", "Proses scraping atau preprocessing lain masih berjalan.", 409) + job_id = uuid4().hex + job = {"id": job_id, "status": "running", "progress": 0, "message": "Mengantri preprocessing", "rows_filled": 0} + _preprocessing_jobs[job_id] = job + thread = Thread( + target=_run_preprocessing_job, + args=(current_app._get_current_object(), job_id, scraping_log_id), + daemon=True, + ) + thread.start() + return jsonify({"data": _preprocessing_job_payload(job)}), 202 + + +@api.get("/admin/preprocessing/jobs/") +@admin_required +def preprocessing_job_status(job_id): + with _scraping_jobs_lock: + job = _preprocessing_jobs.get(job_id) + if not job: + raise ApiError("PREPROCESSING_JOB_NOT_FOUND", "Proses preprocessing tidak ditemukan.", 404) + return jsonify({"data": _preprocessing_job_payload(job)}) + + +@api.delete("/admin/scraping/history") +@admin_required +def delete_scraping_history(): + with _scraping_jobs_lock: + if any(item["status"] == "running" for item in _scraping_jobs.values()): + raise ApiError("SCRAPING_IN_PROGRESS", "Tunggu scraping selesai sebelum menghapus riwayat.", 409) + connection = _db() + try: + with connection.cursor() as cursor: + cursor.execute("DELETE FROM price_history WHERE source = 'siskaperbapo'") + deleted_records = cursor.rowcount + cursor.execute("DELETE FROM scraping_logs WHERE source = 'siskaperbapo'") + deleted_logs = cursor.rowcount + connection.commit() + finally: + connection.close() + return jsonify({"data": {"deleted_records": deleted_records, "deleted_logs": deleted_logs}}) + + +@api.get("/admin/models") +@admin_required +def admin_models(): + connection = _db() + try: + with connection.cursor() as cursor: + cursor.execute( + """ + SELECT mv.id, c.name, mv.version, mv.metrics_json, mv.is_active, mv.created_at + FROM model_versions mv JOIN commodities c ON c.id = mv.commodity_id + ORDER BY mv.created_at DESC + """ + ) + rows = cursor.fetchall() + finally: + connection.close() + return jsonify({"data": [{"id": row[0], "commodity": row[1], "version": row[2], "metrics": row[3], "is_active": bool(row[4]), "created_at": row[5].isoformat()} for row in rows]}) + + +@api.get("/health") +def health(): + model_registry = registry() + loaded = sum(len(markets) for markets in model_registry.artifacts.values()) + return jsonify({"status": "healthy" if loaded else "degraded", "models_loaded": loaded, "loaded": {commodity: sorted(markets) for commodity, markets in model_registry.artifacts.items()}, "skipped": model_registry.skipped}) + + +@api.get("/commodities") +def commodities(): + model_registry = registry() + data = [{"slug": slug, "name": name, "market_count": len(model_registry.available_markets(slug))} for slug, name in COMMODITIES.items() if model_registry.available_markets(slug)] + return jsonify({"data": data}) + + +@api.get("/markets") +def markets(): + commodity = request.args.get("commodity", "").strip() + if commodity and commodity not in COMMODITIES: + raise ApiError("UNKNOWN_COMMODITY", "Komoditas tidak dikenal.", 404) + model_registry = registry() + data = [] + for market in markets_config(): + available = [slug for slug in COMMODITIES if market["slug"] in model_registry.available_markets(slug)] + if commodity: + if market["slug"] not in model_registry.available_markets(commodity): + continue + data.append({**market, "available": True}) + else: + data.append({**market, "available_commodities": available}) + return jsonify({"data": data}) + + +@api.get("/history") +def history(): + commodity = required_query("commodity") + market = required_query("market") + return jsonify(service().history(commodity, market, parse_days())) + + +@api.get("/predict") +def predict(): + commodity = required_query("commodity") + market = required_query("market") + return jsonify(service().predict(commodity, market, parse_horizon(current_app.config["ALLOWED_HORIZONS"], current_app.config["MAX_HORIZON"]))) + + +@api.get("/predict/map") +def predict_map(): + commodity = required_query("commodity") + horizon = parse_horizon(current_app.config["ALLOWED_HORIZONS"], current_app.config["MAX_HORIZON"]) + if commodity not in COMMODITIES: + raise ApiError("UNKNOWN_COMMODITY", "Komoditas tidak dikenal.", 404) + return jsonify(service().predict_map(commodity, horizon, markets_config())) diff --git a/api/app/api/schemas.py b/api/app/api/schemas.py new file mode 100644 index 0000000..083014f --- /dev/null +++ b/api/app/api/schemas.py @@ -0,0 +1,35 @@ +from typing import Iterable + +from flask import request + +from app.errors import ApiError + + +def required_query(name: str) -> str: + value = request.args.get(name, "").strip() + if not value: + raise ApiError("INVALID_PARAMETER", f"Parameter {name} wajib diisi.", 400) + return value + + +def parse_horizon(allowed: Iterable[int], maximum: int) -> int: + raw = request.args.get("horizon", "1") + try: + horizon = int(raw) + except ValueError: + raise ApiError("INVALID_HORIZON", "Horizon harus berupa angka.", 400, {"allowed": list(allowed)}) + allowed_values = list(allowed) + if horizon not in allowed_values or horizon > maximum: + raise ApiError("INVALID_HORIZON", f"Horizon harus salah satu dari {', '.join(map(str, allowed_values))}.", 400, {"allowed": allowed_values}) + return horizon + + +def parse_days() -> int: + raw = request.args.get("days", "90") + try: + days = int(raw) + except ValueError: + raise ApiError("INVALID_PARAMETER", "Parameter days harus berupa angka.", 400) + if days < 1 or days > 365: + raise ApiError("INVALID_PARAMETER", "Parameter days harus berada antara 1 dan 365.", 400, {"maximum": 365}) + return days diff --git a/api/app/config.py b/api/app/config.py new file mode 100644 index 0000000..4b1582b --- /dev/null +++ b/api/app/config.py @@ -0,0 +1,38 @@ +import os +from pathlib import Path + + +BASE_DIR = Path(__file__).resolve().parent.parent + + +class Config: + SECRET_KEY = os.getenv("SECRET_KEY", "dev-only-change-this-secret") + MODELS_DIR = Path(os.getenv("MODELS_DIR", str(BASE_DIR / "models"))).resolve() + DATA_DIR = Path(os.getenv("DATA_DIR", str(BASE_DIR))).resolve() + DATA_SOURCE = os.getenv("DATA_SOURCE", "mysql").strip().lower() + MYSQL_HOST = os.getenv("MYSQL_HOST", "127.0.0.1") + MYSQL_PORT = int(os.getenv("MYSQL_PORT", "3306")) + MYSQL_DATABASE = os.getenv("MYSQL_DATABASE", "prediksicabe") + MYSQL_USER = os.getenv("MYSQL_USER", "root") + MYSQL_PASSWORD = os.getenv("MYSQL_PASSWORD", "") + MYSQL_CONNECT_TIMEOUT = int(os.getenv("MYSQL_CONNECT_TIMEOUT", "5")) + PRICE_UNIT_SCALE = float(os.getenv("PRICE_UNIT_SCALE", "1000")) + ALLOWED_HORIZONS = (1, 3, 7, 14, 30) + MAX_HORIZON = 30 + CORS_ORIGINS = os.getenv( + "CORS_ORIGINS", + "http://127.0.0.1:5173,http://localhost:5173", + ) + STALE_DATA_DAYS = int(os.getenv("STALE_DATA_DAYS", "30")) + TREND_THRESHOLD_PCT = float(os.getenv("TREND_THRESHOLD_PCT", "1")) + SISKAPERBAPO_URL = os.getenv( + "SISKAPERBAPO_URL", + "https://siskaperbapo.jatimprov.go.id/harga-komoditas", + ) + SISKAPERBAPO_COMMODITY_PARAM = os.getenv("SISKAPERBAPO_COMMODITY_PARAM", "komoditas") + SISKAPERBAPO_TIMEOUT = int(os.getenv("SISKAPERBAPO_TIMEOUT", "30")) + SISKAPERBAPO_COMMODITIES = tuple( + value.strip() + for value in os.getenv("SISKAPERBAPO_COMMODITIES", "rawit").split(",") + if value.strip() + ) diff --git a/api/app/data/__init__.py b/api/app/data/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/api/app/data/__pycache__/__init__.cpython-39.pyc b/api/app/data/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..a3a01c6 Binary files /dev/null and b/api/app/data/__pycache__/__init__.cpython-39.pyc differ diff --git a/api/app/data/__pycache__/repository.cpython-39.pyc b/api/app/data/__pycache__/repository.cpython-39.pyc new file mode 100644 index 0000000..c41d462 Binary files /dev/null and b/api/app/data/__pycache__/repository.cpython-39.pyc differ diff --git a/api/app/data/markets.json b/api/app/data/markets.json new file mode 100644 index 0000000..4b0d765 --- /dev/null +++ b/api/app/data/markets.json @@ -0,0 +1,32 @@ +[ + { + "slug": "pasar_tanjung", + "name": "Pasar Tanjung", + "latitude": -8.1738152, + "longitude": 113.6954052 + }, + { + "slug": "pasar_kreongan", + "name": "Pasar Kreongan", + "latitude": -8.1556968, + "longitude": 113.7008754 + }, + { + "slug": "pasar_tegal_besar", + "name": "Pasar Tegal Besar", + "latitude": -8.1926152, + "longitude": 113.6987226 + }, + { + "slug": "pasar_mangli", + "name": "Pasar Mangli", + "latitude": -8.1902978, + "longitude": 113.6493539 + }, + { + "slug": "pasar_wirolegi", + "name": "Pasar Wirolegi", + "latitude": -8.1872926, + "longitude": 113.7431422 + } +] diff --git a/api/app/data/repository.py b/api/app/data/repository.py new file mode 100644 index 0000000..f12966d --- /dev/null +++ b/api/app/data/repository.py @@ -0,0 +1,158 @@ +from abc import ABC, abstractmethod +from datetime import date +from pathlib import Path +from typing import Dict + +import numpy as np +import pandas as pd +import pymysql +from pymysql import MySQLError + + +class DataUnavailableError(Exception): + pass + + +class PriceRepository(ABC): + @abstractmethod + def get_series(self, commodity: str, market: str) -> pd.Series: + raise NotImplementedError + + @abstractmethod + def last_data_date(self, commodity: str, market: str) -> date: + raise NotImplementedError + + +class CsvPriceRepository(PriceRepository): + FILE_PATTERNS = { + "rawit": ("*rawit*.csv",), + "merah": ("*cabe_merah_besar*.csv", "*merah_besar*.csv"), + "keriting": ("*merah_keriting*.csv",), + } + + def __init__(self, data_dir: Path, unit_scale: float = 1.0) -> None: + self.data_dir = data_dir + self.unit_scale = unit_scale + self._frames: Dict[str, pd.DataFrame] = {} + + def _find_file(self, commodity: str) -> Path: + candidates = [self.data_dir / f"{commodity}.csv", self.data_dir / f"data_{commodity}.csv"] + for pattern in self.FILE_PATTERNS.get(commodity, (f"*{commodity}*.csv",)): + candidates.extend(sorted(self.data_dir.rglob(pattern))) if self.data_dir.exists() else None + for candidate in candidates: + if candidate.is_file(): + return candidate + raise DataUnavailableError( + f"File CSV untuk komoditas {commodity} tidak ditemukan di {self.data_dir}." + ) + + def _load(self, commodity: str) -> pd.DataFrame: + if commodity in self._frames: + return self._frames[commodity] + path = self._find_file(commodity) + frame = pd.read_csv(path) + date_column = next( + (column for column in frame.columns if str(column).strip().lower() in {"date", "tanggal", "datetime"}), + None, + ) + if date_column is None: + raise DataUnavailableError( + f"CSV {path.name} harus memiliki kolom date atau tanggal." + ) + frame[date_column] = pd.to_datetime(frame[date_column], errors="coerce") + frame = frame.dropna(subset=[date_column]).set_index(date_column).sort_index() + if not frame.empty: + frame = frame[~frame.index.duplicated(keep="last")] + frame = frame.reindex(pd.date_range(frame.index.min(), frame.index.max(), freq="D")) + self._frames[commodity] = frame + return frame + + @staticmethod + def _market_column(frame: pd.DataFrame, market: str) -> str: + aliases = {market, market.replace("pasar_", "Pasar_")} + for column in frame.columns: + normalized = str(column).strip().lower().replace(" ", "_") + if normalized in {alias.lower() for alias in aliases}: + return column + raise DataUnavailableError(f"Kolom harga untuk pasar {market} tidak ditemukan.") + + def get_series(self, commodity: str, market: str) -> pd.Series: + frame = self._load(commodity) + column = self._market_column(frame, market) + series = pd.to_numeric(frame[column], errors="coerce").replace(0, np.nan) + series = series * self.unit_scale + series = series.interpolate(method="linear", limit=2, limit_area="inside") + return series.astype(float) + + def last_data_date(self, commodity: str, market: str) -> date: + series = self.get_series(commodity, market).dropna() + if series.empty: + raise DataUnavailableError( + f"Tidak ada data valid untuk {commodity}/{market}." + ) + return series.index[-1].date() + + +class MySQLPriceRepository(PriceRepository): + def __init__(self, config) -> None: + self.config = config + + def _connect(self): + return pymysql.connect( + host=self.config["MYSQL_HOST"], + port=self.config["MYSQL_PORT"], + database=self.config["MYSQL_DATABASE"], + user=self.config["MYSQL_USER"], + password=self.config["MYSQL_PASSWORD"], + connect_timeout=self.config["MYSQL_CONNECT_TIMEOUT"], + ) + + def _load(self, commodity: str, market: str) -> pd.Series: + connection = None + cursor = None + try: + connection = self._connect() + cursor = connection.cursor() + cursor.execute( + """ + SELECT ph.price_date, ph.price + FROM price_history AS ph + INNER JOIN commodities AS c ON c.id = ph.commodity_id + INNER JOIN markets AS m ON m.id = ph.market_id + WHERE c.slug = %s AND m.slug = %s + ORDER BY ph.price_date ASC + """, + (commodity, market), + ) + rows = cursor.fetchall() + except MySQLError as error: + raise DataUnavailableError(f"Gagal membaca database MySQL: {error}") from error + finally: + if cursor is not None: + cursor.close() + if connection is not None: + connection.close() + + if not rows: + raise DataUnavailableError( + f"Tidak ada data harga untuk {commodity}/{market} di database." + ) + frame = pd.DataFrame(rows, columns=["date", "price"]) + frame["date"] = pd.to_datetime(frame["date"], errors="coerce") + frame["price"] = pd.to_numeric(frame["price"], errors="coerce") + frame = frame.dropna(subset=["date"]).set_index("date").sort_index() + frame = frame[~frame.index.duplicated(keep="last")] + frame["price"] = frame["price"].replace(0, np.nan) + frame["price"] = frame["price"].interpolate(method="linear", limit=2, limit_area="inside") + return frame["price"].astype(float) + + def get_series(self, commodity: str, market: str) -> pd.Series: + return self._load(commodity, market) + + def last_data_date(self, commodity: str, market: str) -> date: + series = self.get_series(commodity, market).dropna() + if series.empty: + raise DataUnavailableError( + f"Tidak ada data valid untuk {commodity}/{market} di database." + ) + return series.index[-1].date() diff --git a/api/app/errors.py b/api/app/errors.py new file mode 100644 index 0000000..e70d338 --- /dev/null +++ b/api/app/errors.py @@ -0,0 +1,44 @@ +from typing import Any, Dict, Optional + +from flask import jsonify + + +class ApiError(Exception): + def __init__( + self, + code: str, + message: str, + status_code: int, + details: Optional[Dict[str, Any]] = None, + ) -> None: + super().__init__(message) + self.code = code + self.message = message + self.status_code = status_code + self.details = details or {} + + def to_response(self): + return jsonify( + { + "error": { + "code": self.code, + "message": self.message, + "details": self.details, + } + } + ), self.status_code + + +def register_error_handlers(app) -> None: + @app.errorhandler(ApiError) + def handle_api_error(error: ApiError): + return error.to_response() + + @app.errorhandler(Exception) + def handle_unexpected_error(error: Exception): + app.logger.exception("Unhandled API error: %s", error) + return ApiError( + "INTERNAL_ERROR", + "Terjadi kesalahan internal pada server.", + 500, + ).to_response() diff --git a/api/app/services/__init__.py b/api/app/services/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/api/app/services/__pycache__/__init__.cpython-39.pyc b/api/app/services/__pycache__/__init__.cpython-39.pyc new file mode 100644 index 0000000..dfae426 Binary files /dev/null and b/api/app/services/__pycache__/__init__.cpython-39.pyc differ diff --git a/api/app/services/__pycache__/forecaster.cpython-39.pyc b/api/app/services/__pycache__/forecaster.cpython-39.pyc new file mode 100644 index 0000000..aad52ec Binary files /dev/null and b/api/app/services/__pycache__/forecaster.cpython-39.pyc differ diff --git a/api/app/services/__pycache__/model_registry.cpython-39.pyc b/api/app/services/__pycache__/model_registry.cpython-39.pyc new file mode 100644 index 0000000..264be14 Binary files /dev/null and b/api/app/services/__pycache__/model_registry.cpython-39.pyc differ diff --git a/api/app/services/__pycache__/prediction_service.cpython-39.pyc b/api/app/services/__pycache__/prediction_service.cpython-39.pyc new file mode 100644 index 0000000..c3f7036 Binary files /dev/null and b/api/app/services/__pycache__/prediction_service.cpython-39.pyc differ diff --git a/api/app/services/__pycache__/siskaperbapo_scraper.cpython-39.pyc b/api/app/services/__pycache__/siskaperbapo_scraper.cpython-39.pyc new file mode 100644 index 0000000..312e46a Binary files /dev/null and b/api/app/services/__pycache__/siskaperbapo_scraper.cpython-39.pyc differ diff --git a/api/app/services/forecaster.py b/api/app/services/forecaster.py new file mode 100644 index 0000000..0c62fba --- /dev/null +++ b/api/app/services/forecaster.py @@ -0,0 +1,30 @@ +from typing import Any, List, Tuple + +import numpy as np + + +def forecast_recursive( + model: Any, + scaler: Any, + window: np.ndarray, + horizon: int, +) -> Tuple[List[float], bool]: + values = np.asarray(window, dtype=float).reshape(-1, 1) + scaled_window = scaler.transform(values) + scaled_predictions = [] + + for _ in range(horizon): + model_input = scaled_window.reshape(1, len(scaled_window), 1) + prediction = model.predict(model_input, verbose=0) + prediction_value = float(np.asarray(prediction).reshape(-1)[0]) + scaled_predictions.append(prediction_value) + scaled_window = np.vstack([scaled_window[1:], [[prediction_value]]]) + + predicted_values = scaler.inverse_transform( + np.asarray(scaled_predictions, dtype=float).reshape(-1, 1) + ).reshape(-1) + data_min = float(np.asarray(scaler.data_min_).reshape(-1)[0]) + data_max = float(np.asarray(scaler.data_max_).reshape(-1)[0]) + out_of_range = bool(np.any((predicted_values < data_min) | (predicted_values > data_max))) + prices = [max(0.0, float(np.round(value, 6))) for value in predicted_values] + return prices, out_of_range diff --git a/api/app/services/model_registry.py b/api/app/services/model_registry.py new file mode 100644 index 0000000..22c18f1 --- /dev/null +++ b/api/app/services/model_registry.py @@ -0,0 +1,100 @@ +import json +import logging +import pickle +from dataclasses import dataclass +from pathlib import Path +from typing import Any, Dict, List, Optional + +import joblib +from tensorflow.keras.models import load_model + +logger = logging.getLogger(__name__) + +COMMODITIES = { + "rawit": "Cabai Rawit", + "merah": "Cabai Merah Besar", + "keriting": "Cabai Merah Keriting", +} +MARKETS = { + "pasar_tanjung": "Pasar Tanjung", + "pasar_kreongan": "Pasar Kreongan", + "pasar_tegal_besar": "Pasar Tegal Besar", + "pasar_mangli": "Pasar Mangli", + "pasar_wirolegi": "Pasar Wirolegi", +} +DEFAULT_TIME_STEPS = {"rawit": 7, "merah": 7, "keriting": 14} + + +@dataclass +class ModelArtifact: + commodity: str + market: str + model: Any + scaler: Any + config: Dict[str, Any] + time_step: int + model_time_step: int + + +class ModelRegistry: + def __init__(self, models_dir: Path) -> None: + self.models_dir = models_dir + self.artifacts: Dict[str, Dict[str, ModelArtifact]] = {} + self.skipped: List[Dict[str, str]] = [] + self.scan() + + def scan(self) -> None: + self.artifacts.clear() + self.skipped.clear() + for commodity, commodity_name in COMMODITIES.items(): + commodity_dir = self.models_dir / commodity + for market in MARKETS: + market_dir = commodity_dir / market + config_path = market_dir / "config.json" + if not config_path.is_file(): + self._skip(commodity, market, "config.json tidak ditemukan") + continue + try: + config = json.loads(config_path.read_text(encoding="utf-8")) + files = config.get("files", {}) + model_path = self._trusted_path(market_dir, files.get("model")) + scaler_path = self._trusted_path(market_dir, files.get("scaler")) + if not model_path.is_file() or not scaler_path.is_file(): + raise FileNotFoundError("model atau scaler tidak lengkap") + model = load_model(model_path, compile=False) + try: + scaler = joblib.load(scaler_path) + except Exception: + with scaler_path.open("rb") as scaler_file: + scaler = pickle.load(scaler_file) + if not hasattr(scaler, "data_min_") or not hasattr(scaler, "data_max_"): + raise ValueError("scaler tidak memiliki data_min_ dan data_max_") + model_time_step = int(model.input_shape[1]) + configured_step = int(config.get("model", {}).get("time_step", DEFAULT_TIME_STEPS[commodity])) + time_step = DEFAULT_TIME_STEPS[commodity] + if commodity == "keriting" and configured_step != time_step: + logger.warning("Menggunakan time_step API 14 untuk keriting; config model menyatakan %s", configured_step) + self.artifacts.setdefault(commodity, {})[market] = ModelArtifact( + commodity, market, model, scaler, config, time_step, model_time_step + ) + except Exception as error: + self._skip(commodity, market, f"{type(error).__name__}: {error}") + + @staticmethod + def _trusted_path(directory: Path, filename: Optional[str]) -> Path: + if not filename: + raise FileNotFoundError("nama file artifact tidak ada di config.json") + path = (directory / filename).resolve() + if path.parent != directory.resolve(): + raise ValueError("path artifact keluar dari folder market") + return path + + def _skip(self, commodity: str, market: str, reason: str) -> None: + logger.warning("Melewati model %s/%s: %s", commodity, market, reason) + self.skipped.append({"commodity": commodity, "market": market, "reason": reason}) + + def get(self, commodity: str, market: str) -> Optional[ModelArtifact]: + return self.artifacts.get(commodity, {}).get(market) + + def available_markets(self, commodity: str) -> List[str]: + return sorted(self.artifacts.get(commodity, {})) diff --git a/api/app/services/prediction_service.py b/api/app/services/prediction_service.py new file mode 100644 index 0000000..4e8b44b --- /dev/null +++ b/api/app/services/prediction_service.py @@ -0,0 +1,112 @@ +from datetime import date, datetime, timedelta, timezone +from typing import Any, Dict, List + +import numpy as np + +from app.errors import ApiError +from app.services.forecaster import forecast_recursive +from app.services.model_registry import COMMODITIES, MARKETS, ModelRegistry +from app.data.repository import DataUnavailableError, PriceRepository + + +NOTES = [ + "Model menghasilkan prediksi rekursif hingga 30 hari; error dapat menumpuk pada horizon panjang.", +] + + +class PredictionService: + def __init__(self, registry: ModelRegistry, repository: PriceRepository, stale_days: int, trend_threshold_pct: float) -> None: + self.registry = registry + self.repository = repository + self.stale_days = stale_days + self.trend_threshold_pct = trend_threshold_pct + self._cache: Dict[Any, Dict[str, Any]] = {} + + def _validate(self, commodity: str, market: str) -> Any: + if commodity not in COMMODITIES: + raise ApiError("UNKNOWN_COMMODITY", "Komoditas tidak dikenal.", 404) + if market not in MARKETS: + raise ApiError("UNKNOWN_MARKET", "Pasar tidak dikenal.", 404) + artifact = self.registry.get(commodity, market) + if artifact is None: + raise ApiError("MODEL_NOT_AVAILABLE", "Model untuk kombinasi ini tidak tersedia.", 404) + return artifact + + def _series(self, commodity: str, market: str): + try: + series = self.repository.get_series(commodity, market).dropna() + except DataUnavailableError as error: + raise ApiError("INSUFFICIENT_DATA", str(error), 422) + if series.empty: + raise ApiError("INSUFFICIENT_DATA", "Data historis valid tidak tersedia.", 422) + return series + + def predict(self, commodity: str, market: str, horizon: int) -> Dict[str, Any]: + artifact = self._validate(commodity, market) + series = self._series(commodity, market) + if len(series) < artifact.time_step: + raise ApiError("INSUFFICIENT_DATA", "Jumlah data valid belum mencukupi window model.", 422, {"required": artifact.time_step, "available": len(series)}) + last_date = series.index[-1].date() + window_key = tuple(np.round(series.iloc[-artifact.time_step:].to_numpy(dtype=float), 6)) + cache_key = (commodity, market, last_date, window_key) + cached = self._cache.get(cache_key) + out_of_range = False + if cached is None: + window = series.iloc[-artifact.time_step:].to_numpy(dtype=float) / 1000.0 + if artifact.model_time_step != artifact.time_step: + raise ApiError("MODEL_NOT_AVAILABLE", "Artifact model keriting masih berformat 7 langkah, sedangkan API memerlukan 14 langkah.", 404, {"api_time_step": artifact.time_step, "model_time_step": artifact.model_time_step}) + prices_in_thousand, out_of_range = forecast_recursive(artifact.model, artifact.scaler, window, 30) + prices = [price * 1000 for price in prices_in_thousand] + cached = {"prices": prices, "out_of_range": out_of_range} + self._cache[cache_key] = cached + prices = cached["prices"][:horizon] + last_actual = float(series.iloc[-1]) + warnings: List[str] = [] + data_age_days = (date.today() - last_date).days + if data_age_days > self.stale_days: + warnings.append("data_stale") + if cached["out_of_range"]: + warnings.append("out_of_training_range") + predictions = [] + previous = last_actual + for step, price in enumerate(prices, 1): + change = price - previous + change_pct = round(change / previous * 100, 2) if previous else None + predictions.append({"step": step, "date": (last_date + timedelta(days=step)).isoformat(), "price": price, "change_rp": change, "change_pct": change_pct}) + previous = price + first_price = prices[0] + last_price = prices[-1] + total_pct = ((last_price - last_actual) / last_actual * 100) if last_actual else 0 + trend = "up" if total_pct > self.trend_threshold_pct else "down" if total_pct < -self.trend_threshold_pct else "flat" + return {"data": {"commodity": {"slug": commodity, "name": COMMODITIES[commodity]}, "market": {"slug": market, "name": MARKETS[market]}, "horizon": horizon, "last_data_date": last_date.isoformat(), "last_actual_price": last_actual, "predictions": predictions, "summary": {"first_price": first_price, "last_price": last_price, "min_price": min(prices), "max_price": max(prices), "average_price": sum(prices) / len(prices), "trend": trend}}, "meta": {"method": "recursive_multi_step", "time_step": artifact.time_step, "data_age_days": data_age_days, "generated_at": datetime.now(timezone(timedelta(hours=7))).isoformat(), "warnings": warnings, "notes": NOTES}} + + def history(self, commodity: str, market: str, days: int) -> Dict[str, Any]: + self._validate(commodity, market) + try: + series = self.repository.get_series(commodity, market) + except DataUnavailableError as error: + raise ApiError("INSUFFICIENT_DATA", str(error), 422) + if series.dropna().empty: + raise ApiError("INSUFFICIENT_DATA", "Data historis valid tidak tersedia.", 422) + selected = series.tail(days) + return {"data": [{"date": index.date().isoformat(), "price": None if np.isnan(value) else float(value)} for index, value in selected.items()]} + + def predict_map(self, commodity: str, horizon: int, markets: List[Dict[str, Any]]) -> Dict[str, Any]: + if commodity not in COMMODITIES: + raise ApiError("UNKNOWN_COMMODITY", "Komoditas tidak dikenal.", 404) + data = [] + for market_info in markets: + market = market_info["slug"] + artifact = self.registry.get(commodity, market) + item = {**market_info, "market": market, "available": artifact is not None} + if artifact is None: + data.append(item) + continue + try: + result = self.predict(commodity, market, horizon)["data"] + prediction = result["predictions"][-1] + item.update({"last_actual_price": result["last_actual_price"], "predicted_price": prediction["price"], "change_rp": prediction["change_rp"], "change_pct": prediction["change_pct"], "trend": result["summary"]["trend"]}) + except ApiError as error: + item.update({"available": False, "reason": error.code}) + data.append(item) + return {"data": data, "meta": {"commodity": {"slug": commodity, "name": COMMODITIES[commodity]}, "horizon": horizon}} diff --git a/api/app/services/siskaperbapo_scraper.py b/api/app/services/siskaperbapo_scraper.py new file mode 100644 index 0000000..9440ce8 --- /dev/null +++ b/api/app/services/siskaperbapo_scraper.py @@ -0,0 +1,193 @@ +from datetime import date, timedelta +from io import StringIO +from typing import Dict, List + +import pandas as pd +import requests + + +class ScrapingError(Exception): + pass + + +class SiskaperbapoScraper: + MARKET_ALIASES = { + "pasar_tanjung": "Pasar Tanjung", + "pasar_kreongan": "Pasar Kreongan", + "pasar_tegal_besar": "Pasar Tegal Besar", + "pasar_mangli": "Pasar Mangli", + "pasar_wirolegi": "Pasar Wirolegi", + } + MARKET_IDS = { + "pasar_tanjung": "11", + "pasar_kreongan": "12", + "pasar_tegal_besar": "13", + "pasar_mangli": "148", + "pasar_wirolegi": "149", + } + + def __init__(self, url: str, commodity_param: str, timeout: int = 30) -> None: + self.url = url + self.commodity_param = commodity_param + self.timeout = timeout + + @staticmethod + def _parse_price(value) -> float: + if isinstance(value, (int, float)) and not pd.isna(value): + return float(value) + text = str(value).strip().replace("Rp", "").replace(" ", "") + if not text or text.lower() in {"nan", "none", "-", "0"}: + raise ValueError("harga kosong") + text = text.replace(".", "").replace(",", ".") + return float(text) + + @staticmethod + def _price_in_rupiah(value) -> float: + price = SiskaperbapoScraper._parse_price(value) + return price * 1000 if 0 < price < 1000 else price + + def _read_tables(self, commodity: str) -> List[pd.DataFrame]: + try: + response = requests.get( + self.url, + params={self.commodity_param: commodity}, + timeout=self.timeout, + headers={"User-Agent": "PanenHarga/1.0"}, + ) + response.raise_for_status() + return pd.read_html(StringIO(response.text)) + except (requests.RequestException, ValueError) as error: + raise ScrapingError(f"Gagal membaca halaman SISKAPERBAPO: {error}") from error + + def _read_historical_table(self, price_date: date, market_id: str) -> List[pd.DataFrame]: + try: + response = requests.post( + self.url.replace("/harga-komoditas", "/harga/tabel.nodesign"), + data={"tanggal": price_date.isoformat(), "kabkota": "jemberkab", "pasar": market_id}, + timeout=self.timeout, + headers={"User-Agent": "PanenHarga/1.0"}, + ) + response.raise_for_status() + return pd.read_html(StringIO(response.text)) + except (requests.RequestException, ValueError) as error: + raise ScrapingError(f"Gagal membaca histori SISKAPERBAPO: {error}") from error + + def scrape_range(self, commodities: Dict[str, str], start_date: date, end_date: date, on_progress=None) -> List[dict]: + observations = [] + dates = [ + start_date + timedelta(days=offset) + for offset in range((end_date - start_date).days + 1) + ] + total = len(dates) * len(self.MARKET_IDS) + completed = 0 + row_patterns = { + "rawit": "cabe rawit merah", + "merah": "cabe merah besar", + "keriting": "cabe merah keriting", + } + for price_date in dates: + for market_slug, market_id in self.MARKET_IDS.items(): + tables = self._read_historical_table(price_date, market_id) + for table in tables: + if table.empty: + continue + for _, row in table.iterrows(): + text = " ".join(str(value).strip() for value in row.tolist()) + normalized = text.casefold().replace("-", " ") + commodity_slug = next( + ( + slug for slug in commodities + if row_patterns.get(slug, "") in normalized + ), + None, + ) + if not commodity_slug: + continue + values = [ + value for value in row.tolist() + if str(value).strip().replace(".", "").replace(",", "").isdigit() + ] + if len(values) < 2: + continue + try: + price = self._price_in_rupiah(values[1]) + except (TypeError, ValueError): + continue + observations.append( + { + "commodity": commodity_slug, + "market": market_slug, + "date": price_date, + "price": price, + "source": "siskaperbapo", + } + ) + break + completed += 1 + if on_progress: + on_progress( + 10 + int(completed / max(total, 1) * 55), + f"Membaca {price_date.isoformat()} · {self.MARKET_ALIASES[market_slug]}", + ) + if not observations: + raise ScrapingError( + f"Tidak ada data SISKAPERBAPO untuk periode {start_date.isoformat()} sampai {end_date.isoformat()}." + ) + return observations + + def scrape(self, commodities: Dict[str, str], on_progress=None) -> List[dict]: + observations = [] + total_commodities = len(commodities) + for commodity_index, commodity_slug in enumerate(commodities, start=1): + if on_progress: + on_progress( + 10 + int((commodity_index - 1) / max(total_commodities, 1) * 55), + f"Membaca data {commodity_slug}", + ) + tables = self._read_tables(commodity_slug) + for table in tables: + if table.empty: + continue + location_column = next( + (column for column in table.columns if "lokasi" in str(column).lower() or "pasar" in str(column).lower()), + None, + ) + if location_column is None: + continue + date_columns = [] + for column in table.columns: + try: + parsed = pd.to_datetime(str(column), errors="raise") + except (TypeError, ValueError): + continue + if not pd.isna(parsed): + date_columns.append((column, parsed.date())) + if not date_columns: + continue + for market_slug, market_name in self.MARKET_ALIASES.items(): + matches = table[table[location_column].astype(str).str.strip().str.casefold() == market_name.casefold()] + if matches.empty: + continue + row = matches.iloc[0] + for column, price_date in date_columns: + try: + price = self._price_in_rupiah(row[column]) + except (TypeError, ValueError): + continue + observations.append( + { + "commodity": commodity_slug, + "market": market_slug, + "date": price_date, + "price": price, + "source": "siskaperbapo", + } + ) + if on_progress: + on_progress( + 10 + int(commodity_index / max(total_commodities, 1) * 55), + f"Data {commodity_slug} selesai dibaca", + ) + if not observations: + raise ScrapingError("Tidak ada data pasar Jember yang cocok dari SISKAPERBAPO.") + return observations diff --git a/api/harga_cabai_merah_keriting_jemberkab_2021-11-01_2025-11-01.csv b/api/harga_cabai_merah_keriting_jemberkab_2021-11-01_2025-11-01.csv new file mode 100644 index 0000000..bc9c21d --- /dev/null +++ b/api/harga_cabai_merah_keriting_jemberkab_2021-11-01_2025-11-01.csv @@ -0,0 +1,1463 @@ +Tanggal,Pasar_Tanjung,Pasar_Kreongan,Pasar_Tegal_Besar,Pasar_Mangli,Pasar_Wirolegi,RataRata_Kemarin,RataRata_Sekarang +2021-11-01,0,0,0,0,0,0,0 +2021-11-02,0,0,0,0,0,0,0 +2021-11-03,0,0,0,0,0,0,0 +2021-11-04,0,0,0,0,0,0,0 +2021-11-05,0,0,0,0,0,0,0 +2021-11-06,0,0,0,0,0,0,0 +2021-11-07,0,0,0,0,0,0,0 +2021-11-08,0,0,0,0,0,0,0 +2021-11-09,0,0,0,0,0,, +2021-11-10,0,0,0,0,0,0,0 +2021-11-11,0,0,0,0,0,0,0 +2021-11-12,0,0,0,0,0,0,0 +2021-11-13,0,0,0,0,0,0,0 +2021-11-14,0,0,0,0,0,0,0 +2021-11-15,0,0,0,0,0,0,0 +2021-11-16,0,0,0,0,0,0,0 +2021-11-17,0,0,0,0,0,0,0 +2021-11-18,0,0,0,0,0,0,0 +2021-11-19,0,0,0,0,0,0,0 +2021-11-20,0,0,0,0,0,0,0 +2021-11-21,0,0,0,0,0,0,0 +2021-11-22,0,0,0,0,0,0,0 +2021-11-23,0,0,0,0,0,0,0 +2021-11-24,0,0,0,0,0,0,0 +2021-11-25,0,0,0,0,0,0,0 +2021-11-26,0,0,0,0,0,0,0 +2021-11-27,0,0,0,0,0,0,0 +2021-11-28,0,0,0,0,0,0,0 +2021-11-29,0,0,0,0,0,0,0 +2021-11-30,0,0,0,0,0,0,0 +2021-12-01,0,0,0,0,0,0,0 +2021-12-02,0,0,0,0,0,0,0 +2021-12-03,0,0,0,0,0,0,0 +2021-12-04,0,0,0,0,0,0,0 +2021-12-05,0,0,0,0,0,0,0 +2021-12-06,0,0,0,0,0,0,0 +2021-12-07,0,0,0,0,0,0,0 +2021-12-08,0,0,0,0,0,0,0 +2021-12-09,0,0,0,0,0,0,0 +2021-12-10,0,0,0,0,0,0,0 +2021-12-11,0,0,0,0,0,0,0 +2021-12-12,0,0,0,0,0,0,0 +2021-12-13,0,0,0,0,0,0,0 +2021-12-14,0,0,0,0,0,0,0 +2021-12-15,0,0,0,0,0,0,0 +2021-12-16,0,0,0,0,0,0,0 +2021-12-17,0,0,0,0,0,0,0 +2021-12-18,0,0,0,0,0,0,0 +2021-12-19,0,0,0,0,0,0,0 +2021-12-20,0,0,0,0,0,0,0 +2021-12-21,0,0,0,0,0,0,0 +2021-12-22,0,0,0,0,0,0,0 +2021-12-23,0,0,0,0,0,0,0 +2021-12-24,0,0,0,0,0,0,0 +2021-12-25,0,0,0,0,0,0,0 +2021-12-26,0,0,0,0,0,0,0 +2021-12-27,0,0,0,0,0,0,0 +2021-12-28,0,0,0,0,0,0,0 +2021-12-29,0,0,0,0,0,0,0 +2021-12-30,0,0,0,0,0,0,0 +2021-12-31,0,0,0,0,0,0,0 +2022-01-01,0,0,0,0,0,0,0 +2022-01-02,0,0,0,0,0,0,0 +2022-01-03,0,0,0,0,0,0,0 +2022-01-04,0,0,0,0,0,0,0 +2022-01-05,0,0,0,0,0,0,0 +2022-01-06,0,0,0,0,0,0,0 +2022-01-07,0,0,0,0,0,0,0 +2022-01-08,0,0,0,0,0,0,0 +2022-01-09,0,0,0,0,0,0,0 +2022-01-10,0,0,0,0,0,0,0 +2022-01-11,0,0,0,0,0,0,0 +2022-01-12,0,0,0,0,0,0,0 +2022-01-13,0,0,0,0,0,0,0 +2022-01-14,0,0,0,0,0,0,0 +2022-01-15,0,0,0,0,0,0,0 +2022-01-16,0,0,0,0,0,0,0 +2022-01-17,0,0,0,0,0,0,0 +2022-01-18,0,0,0,0,0,0,0 +2022-01-19,0,0,0,0,0,0,0 +2022-01-20,0,0,0,0,0,0,0 +2022-01-21,0,0,0,0,0,0,0 +2022-01-22,0,0,0,0,0,0,0 +2022-01-23,0,0,0,0,0,0,0 +2022-01-24,0,0,0,0,0,0,0 +2022-01-25,0,0,0,0,0,0,0 +2022-01-26,0,0,0,0,0,0,0 +2022-01-27,0,0,0,0,0,0,0 +2022-01-28,0,0,0,0,0,0,0 +2022-01-29,0,0,0,0,0,0,0 +2022-01-30,0,0,0,0,0,0,0 +2022-01-31,0,0,0,0,0,0,0 +2022-02-01,0,0,0,0,0,0,0 +2022-02-02,0,0,0,0,0,0,0 +2022-02-03,0,0,0,0,0,0,0 +2022-02-04,0,0,0,0,0,0,0 +2022-02-05,0,0,0,0,0,0,0 +2022-02-06,0,0,0,0,0,0,0 +2022-02-07,0,0,0,0,0,0,0 +2022-02-08,0,0,0,0,0,0,0 +2022-02-09,0,0,0,0,0,0,0 +2022-02-10,0,0,0,0,0,0,0 +2022-02-11,0,0,0,0,0,0,0 +2022-02-12,0,0,0,0,0,0,0 +2022-02-13,0,0,0,0,0,0,0 +2022-02-14,0,0,0,0,0,0,0 +2022-02-15,0,0,0,0,0,0,0 +2022-02-16,0,0,0,0,0,0,0 +2022-02-17,0,0,0,0,0,0,0 +2022-02-18,0,0,0,0,0,0,0 +2022-02-19,0,0,0,0,0,0,0 +2022-02-20,0,0,0,0,0,0,0 +2022-02-21,0,0,0,0,0,0,0 +2022-02-22,0,0,0,0,0,0,0 +2022-02-23,0,0,0,0,0,0,0 +2022-02-24,0,0,0,0,0,0,0 +2022-02-25,0,0,0,0,0,0,0 +2022-02-26,0,0,0,0,0,0,0 +2022-02-27,0,0,0,0,0,0,0 +2022-02-28,0,0,0,0,0,0,0 +2022-03-01,0,0,0,0,0,0,0 +2022-03-02,0,0,0,0,0,0,0 +2022-03-03,0,0,0,0,0,0,0 +2022-03-04,0,0,0,0,0,0,0 +2022-03-05,0,0,0,0,0,0,0 +2022-03-06,0,0,0,0,0,0,0 +2022-03-07,0,0,0,0,0,0,0 +2022-03-08,0,0,0,0,0,0,0 +2022-03-09,0,0,0,0,0,0,0 +2022-03-10,0,0,0,0,0,0,0 +2022-03-11,0,0,0,0,0,0,0 +2022-03-12,0,0,0,0,0,0,0 +2022-03-13,0,0,0,0,0,0,0 +2022-03-14,0,0,0,0,0,0,0 +2022-03-15,0,0,0,0,0,0,0 +2022-03-16,0,0,0,0,0,0,0 +2022-03-17,0,0,0,0,0,0,0 +2022-03-18,0,0,0,0,0,0,0 +2022-03-19,0,0,0,0,0,0,0 +2022-03-20,0,0,0,0,0,0,0 +2022-03-21,0,0,0,0,0,0,0 +2022-03-22,0,0,0,0,0,0,0 +2022-03-23,0,0,0,0,0,0,0 +2022-03-24,0,0,0,0,0,0,0 +2022-03-25,0,0,0,0,0,0,0 +2022-03-26,0,0,0,0,0,0,0 +2022-03-27,0,0,0,0,0,0,0 +2022-03-28,0,0,0,0,0,0,0 +2022-03-29,0,0,0,0,0,0,0 +2022-03-30,0,0,0,0,0,0,0 +2022-03-31,0,0,0,0,0,0,0 +2022-04-01,0,0,0,0,0,0,0 +2022-04-02,0,0,0,0,0,0,0 +2022-04-03,0,0,0,0,0,0,0 +2022-04-04,0,0,0,0,0,0,0 +2022-04-05,0,0,0,0,0,0,0 +2022-04-06,0,0,0,0,0,0,0 +2022-04-07,0,0,0,0,0,0,0 +2022-04-08,0,0,0,0,0,0,0 +2022-04-09,0,0,0,0,0,0,0 +2022-04-10,0,0,0,0,0,0,0 +2022-04-11,0,0,0,0,0,0,0 +2022-04-12,0,0,0,0,0,0,0 +2022-04-13,0,0,0,0,0,0,0 +2022-04-14,0,0,0,,0,0,0 +2022-04-15,0,0,0,0,0,0,0 +2022-04-16,0,0,0,0,0,0,0 +2022-04-17,0,0,0,0,0,0,0 +2022-04-18,0,0,0,0,0,0,0 +2022-04-19,0,0,0,0,0,0,0 +2022-04-20,0,0,0,0,0,0,0 +2022-04-21,0,0,0,0,0,0,0 +2022-04-22,0,0,0,0,0,0,0 +2022-04-23,0,0,0,0,0,0,0 +2022-04-24,0,0,0,0,0,0,0 +2022-04-25,0,0,0,0,0,0,0 +2022-04-26,0,0,0,0,0,0,0 +2022-04-27,0,0,0,0,0,0,0 +2022-04-28,0,0,0,0,0,0,0 +2022-04-29,0,0,0,0,0,0,0 +2022-04-30,0,0,0,0,0,0,0 +2022-05-01,0,0,0,0,0,0,0 +2022-05-02,0,0,0,0,0,0,0 +2022-05-03,0,0,0,0,0,0,0 +2022-05-04,0,0,0,0,0,0,0 +2022-05-05,0,0,0,0,0,0,0 +2022-05-06,0,0,0,0,0,0,0 +2022-05-07,0,0,0,0,0,0,0 +2022-05-08,0,0,0,0,0,0,0 +2022-05-09,0,0,0,0,0,0,0 +2022-05-10,0,0,0,0,0,0,0 +2022-05-11,0,0,0,0,0,0,0 +2022-05-12,0,0,0,0,0,0,0 +2022-05-13,0,0,0,0,0,0,0 +2022-05-14,0,0,0,0,0,0,0 +2022-05-15,0,0,0,0,0,0,0 +2022-05-16,0,0,0,0,0,0,0 +2022-05-17,0,0,0,0,0,0,0 +2022-05-18,0,0,0,0,0,0,0 +2022-05-19,0,0,0,0,0,0,0 +2022-05-20,0,0,0,0,0,0,0 +2022-05-21,0,0,0,0,0,0,0 +2022-05-22,0,0,0,0,0,0,0 +2022-05-23,0,0,0,0,0,0,0 +2022-05-24,0,0,0,0,0,0,0 +2022-05-25,0,0,0,0,0,0,0 +2022-05-26,0,0,0,0,0,0,0 +2022-05-27,0,0,0,0,0,0,0 +2022-05-28,0,0,0,,0,0,0 +2022-05-29,0,0,0,0,0,0,0 +2022-05-30,0,0,0,0,0,0,0 +2022-05-31,0,0,0,0,0,0,0 +2022-06-01,0,0,0,0,0,0,0 +2022-06-02,0,0,0,0,0,0,0 +2022-06-03,0,0,0,0,0,0,0 +2022-06-04,0,0,0,0,0,0,0 +2022-06-05,0,0,0,0,0,0,0 +2022-06-06,0,0,0,0,0,0,0 +2022-06-07,0,0,0,0,0,0,0 +2022-06-08,0,0,0,0,0,0,0 +2022-06-09,0,0,0,0,0,0,0 +2022-06-10,0,0,0,0,0,0,0 +2022-06-11,0,0,0,0,0,0,0 +2022-06-12,0,0,0,0,0,0,0 +2022-06-13,0,0,0,0,0,0,0 +2022-06-14,0,0,0,0,0,0,0 +2022-06-15,0,0,0,0,0,0,0 +2022-06-16,0,0,0,0,0,0,0 +2022-06-17,0,0,0,0,0,0,0 +2022-06-18,0,0,0,0,0,0,0 +2022-06-19,0,0,0,0,0,0,0 +2022-06-20,0,0,0,0,0,0,0 +2022-06-21,0,0,0,0,0,0,0 +2022-06-22,0,0,0,0,0,0,0 +2022-06-23,0,0,0,0,0,0,0 +2022-06-24,0,0,0,0,0,0,0 +2022-06-25,0,0,0,0,0,0,0 +2022-06-26,0,0,0,0,0,0,0 +2022-06-27,0,0,0,0,0,0,0 +2022-06-28,0,0,0,0,0,0,0 +2022-06-29,0,0,0,0,0,0,0 +2022-06-30,0,0,0,0,0,0,0 +2022-07-01,0,0,0,0,0,0,0 +2022-07-02,0,0,0,0,0,0,0 +2022-07-03,0,0,0,0,0,0,0 +2022-07-04,0,0,0,0,0,0,0 +2022-07-05,0,0,0,0,0,0,0 +2022-07-06,0,0,0,0,0,0,0 +2022-07-07,0,0,0,0,0,0,0 +2022-07-08,0,0,0,0,0,0,0 +2022-07-09,0,0,0,0,0,0,0 +2022-07-10,0,0,0,0,0,0,0 +2022-07-11,0,0,0,0,0,0,0 +2022-07-12,0,0,0,0,0,0,0 +2022-07-13,0,0,0,0,0,0,0 +2022-07-14,0,0,0,0,0,0,0 +2022-07-15,0,0,0,0,0,0,0 +2022-07-16,0,0,0,0,0,0,0 +2022-07-17,0,0,0,0,0,0,0 +2022-07-18,0,0,0,0,0,0,0 +2022-07-19,0,0,0,0,0,0,0 +2022-07-20,0,0,0,0,0,0,0 +2022-07-21,0,0,0,0,0,0,0 +2022-07-22,0,0,0,0,0,0,0 +2022-07-23,0,0,0,0,0,0,0 +2022-07-24,0,0,0,0,0,0,0 +2022-07-25,0,0,0,0,0,0,0 +2022-07-26,0,0,0,0,0,0,0 +2022-07-27,0,0,0,0,0,0,0 +2022-07-28,0,0,0,0,0,0,0 +2022-07-29,0,0,0,0,0,0,0 +2022-07-30,0,0,0,0,0,0,0 +2022-07-31,0,0,0,0,0,0,0 +2022-08-01,0,0,0,0,0,0,0 +2022-08-02,0,0,0,0,0,0,0 +2022-08-03,0,0,0,0,0,0,0 +2022-08-04,0,0,0,0,0,0,0 +2022-08-05,0,0,0,0,0,0,0 +2022-08-06,0,0,0,0,0,0,0 +2022-08-07,0,0,0,0,0,0,0 +2022-08-08,0,0,0,0,0,0,0 +2022-08-09,0,0,0,0,0,0,0 +2022-08-10,0,0,0,0,0,0,0 +2022-08-11,0,0,0,0,0,0,0 +2022-08-12,0,0,0,0,0,0,0 +2022-08-13,0,0,0,0,0,0,0 +2022-08-14,0,0,0,0,0,0,0 +2022-08-15,0,0,0,0,0,0,0 +2022-08-16,0,0,0,0,0,0,0 +2022-08-17,0,0,0,0,0,0,0 +2022-08-18,0,0,0,0,0,0,0 +2022-08-19,0,0,0,0,0,0,0 +2022-08-20,0,0,0,0,0,0,0 +2022-08-21,0,0,0,0,0,0,0 +2022-08-22,0,0,0,0,0,0,0 +2022-08-23,0,0,0,0,0,0,0 +2022-08-24,0,0,0,0,0,0,0 +2022-08-25,0,0,0,0,0,0,0 +2022-08-26,0,0,0,0,0,0,0 +2022-08-27,0,0,0,0,0,0,0 +2022-08-28,0,0,0,0,0,0,0 +2022-08-29,0,0,0,0,0,0,0 +2022-08-30,0,0,0,0,0,0,0 +2022-08-31,0,0,0,0,0,0,0 +2022-09-01,0,0,0,0,0,0,0 +2022-09-02,0,0,0,0,0,0,0 +2022-09-03,0,0,0,0,0,0,0 +2022-09-04,0,0,0,0,0,0,0 +2022-09-05,0,0,0,0,0,0,0 +2022-09-06,0,0,0,0,0,0,0 +2022-09-07,0,0,0,0,0,0,0 +2022-09-08,0,0,0,0,0,0,0 +2022-09-09,0,0,0,0,0,0,0 +2022-09-10,0,0,0,0,0,0,0 +2022-09-11,0,0,0,0,0,0,0 +2022-09-12,0,0,0,0,0,0,0 +2022-09-13,0,0,0,0,0,0,0 +2022-09-14,0,0,0,0,0,0,0 +2022-09-15,0,0,0,0,0,0,0 +2022-09-16,0,0,0,0,0,0,0 +2022-09-17,0,0,0,0,0,0,0 +2022-09-18,0,0,0,0,0,0,0 +2022-09-19,0,0,0,0,0,0,0 +2022-09-20,0,0,0,0,0,0,0 +2022-09-21,0,0,0,0,0,0,0 +2022-09-22,0,0,0,0,0,0,0 +2022-09-23,0,0,0,0,0,0,0 +2022-09-24,0,0,0,0,0,0,0 +2022-09-25,0,0,0,0,0,0,0 +2022-09-26,0,0,0,0,0,0,0 +2022-09-27,0,0,0,0,0,0,0 +2022-09-28,0,0,0,0,0,0,0 +2022-09-29,0,0,0,0,0,0,0 +2022-09-30,0,0,0,0,0,0,0 +2022-10-01,0,0,0,0,0,0,0 +2022-10-02,0,0,0,0,0,0,0 +2022-10-03,0,0,0,0,46.500,0,46.500 +2022-10-04,0,0,0,0,46.500,46.500,46.500 +2022-10-05,0,0,0,0,46.500,46.500,46.500 +2022-10-06,0,0,0,0,46.500,46.500,46.500 +2022-10-07,0,0,0,0,46.500,46.500,46.500 +2022-10-08,0,0,0,0,45.000,46.500,45.000 +2022-10-09,0,0,0,0,42.000,45.000,42.000 +2022-10-10,0,0,0,0,42.000,42.000,42.000 +2022-10-11,0,0,0,0,40.000,42.000,40.000 +2022-10-12,0,0,0,0,40.000,40.000,40.000 +2022-10-13,0,0,0,0,41.000,40.000,41.000 +2022-10-14,0,0,0,0,41.000,41.000,41.000 +2022-10-15,0,0,0,0,41.000,41.000,41.000 +2022-10-16,0,0,0,0,41.000,41.000,41.000 +2022-10-17,0,0,0,0,40.000,41.000,40.000 +2022-10-18,0,0,0,0,39.000,40.000,39.000 +2022-10-19,0,0,0,0,40.000,39.000,40.000 +2022-10-20,0,0,0,0,40.000,40.000,40.000 +2022-10-21,0,0,0,0,40.000,40.000,40.000 +2022-10-22,0,0,0,0,40.000,40.000,40.000 +2022-10-23,0,0,0,0,40.000,40.000,40.000 +2022-10-24,0,0,0,0,40.000,40.000,40.000 +2022-10-25,0,0,0,0,40.000,40.000,40.000 +2022-10-26,0,0,0,0,40.000,40.000,40.000 +2022-10-27,0,0,0,0,40.000,40.000,40.000 +2022-10-28,0,0,0,0,39.000,40.000,39.000 +2022-10-29,0,0,0,0,39.000,39.000,39.000 +2022-10-30,0,0,0,0,39.000,39.000,39.000 +2022-10-31,0,0,0,0,38.000,39.000,38.000 +2022-11-01,0,0,0,0,38.000,38.000,38.000 +2022-11-02,0,0,0,0,38.000,38.000,38.000 +2022-11-03,0,0,0,0,38.000,38.000,38.000 +2022-11-04,0,0,0,0,38.000,38.000,38.000 +2022-11-05,0,0,0,0,38.000,38.000,38.000 +2022-11-06,0,0,0,0,38.000,38.000,38.000 +2022-11-07,0,0,0,0,38.000,38.000,38.000 +2022-11-08,0,0,0,0,38.000,38.000,38.000 +2022-11-09,0,0,0,0,38.000,38.000,38.000 +2022-11-10,0,0,0,0,38.000,38.000,38.000 +2022-11-11,0,0,0,0,38.000,38.000,38.000 +2022-11-12,0,0,0,0,38.000,38.000,38.000 +2022-11-13,0,0,0,0,38.000,38.000,38.000 +2022-11-14,0,0,0,0,38.000,38.000,38.000 +2022-11-15,0,0,0,0,38.000,38.000,38.000 +2022-11-16,0,0,0,0,39.000,38.000,39.000 +2022-11-17,0,0,0,0,39.000,39.000,39.000 +2022-11-18,0,0,0,0,39.000,39.000,39.000 +2022-11-19,0,0,0,0,39.000,39.000,39.000 +2022-11-20,0,0,0,0,39.000,39.000,39.000 +2022-11-21,0,0,0,0,39.000,39.000,39.000 +2022-11-22,0,0,0,0,39.000,39.000,39.000 +2022-11-23,0,0,0,0,39.000,39.000,39.000 +2022-11-24,0,0,0,0,39.000,39.000,39.000 +2022-11-25,0,0,0,0,39.000,39.000,39.000 +2022-11-26,0,0,0,0,39.000,39.000,39.000 +2022-11-27,0,0,0,0,39.000,39.000,39.000 +2022-11-28,0,0,0,0,39.000,39.000,39.000 +2022-11-29,0,0,0,0,39.000,39.000,39.000 +2022-11-30,0,0,0,0,39.000,39.000,39.000 +2022-12-01,0,0,0,0,39.000,39.000,39.000 +2022-12-02,0,0,0,0,39.000,39.000,39.000 +2022-12-03,0,0,0,0,39.000,39.000,39.000 +2022-12-04,0,0,0,0,39.000,39.000,39.000 +2022-12-05,0,0,0,0,39.000,39.000,39.000 +2022-12-06,0,0,0,0,41.000,39.000,41.000 +2022-12-07,0,0,0,0,40.000,41.000,40.000 +2022-12-08,0,0,0,0,40.000,40.000,40.000 +2022-12-09,0,0,0,0,40.000,40.000,40.000 +2022-12-10,0,0,0,0,39.000,40.000,39.000 +2022-12-11,0,0,0,0,39.000,39.000,39.000 +2022-12-12,0,0,0,0,38.000,39.000,38.000 +2022-12-13,0,0,0,0,38.000,38.000,38.000 +2022-12-14,0,0,0,0,38.000,38.000,38.000 +2022-12-15,0,0,0,0,38.000,38.000,38.000 +2022-12-16,0,0,0,0,37.000,38.000,37.000 +2022-12-17,0,0,0,0,0,37.000,0 +2022-12-18,0,0,0,0,0,0,0 +2022-12-19,0,0,0,0,0,0,0 +2022-12-20,0,0,0,0,0,0,0 +2022-12-21,0,0,0,0,0,0,0 +2022-12-22,0,0,0,0,0,0,0 +2022-12-23,0,0,0,0,0,0,0 +2022-12-24,0,0,0,0,0,0,0 +2022-12-25,0,0,0,0,0,0,0 +2022-12-26,0,0,0,0,0,0,0 +2022-12-27,0,0,0,0,0,0,0 +2022-12-28,0,0,0,0,0,0,0 +2022-12-29,0,0,0,0,0,0,0 +2022-12-30,0,0,0,0,0,0,0 +2022-12-31,0,0,0,0,0,0,0 +2023-01-01,0,0,0,0,0,0,0 +2023-01-02,0,0,0,0,0,0,0 +2023-01-03,0,0,0,0,0,0,0 +2023-01-04,0,0,0,0,0,0,0 +2023-01-05,0,0,0,0,0,0,0 +2023-01-06,0,0,0,0,0,0,0 +2023-01-07,0,0,0,0,0,0,0 +2023-01-08,0,0,0,0,0,0,0 +2023-01-09,0,0,0,0,0,0,0 +2023-01-10,0,0,0,0,0,0,0 +2023-01-11,0,0,0,0,0,0,0 +2023-01-12,0,0,0,0,0,0,0 +2023-01-13,0,0,0,0,0,0,0 +2023-01-14,0,0,0,0,0,0,0 +2023-01-15,0,0,0,0,0,0,0 +2023-01-16,0,0,0,0,0,0,0 +2023-01-17,0,0,0,0,0,0,0 +2023-01-18,0,0,0,0,0,0,0 +2023-01-19,0,0,0,0,0,0,0 +2023-01-20,0,0,0,0,0,0,0 +2023-01-21,0,0,0,0,0,0,0 +2023-01-22,0,0,0,0,0,0,0 +2023-01-23,0,0,0,0,0,0,0 +2023-01-24,0,0,0,0,0,0,0 +2023-01-25,0,0,0,0,0,0,0 +2023-01-26,0,0,0,0,0,0,0 +2023-01-27,0,0,0,0,0,0,0 +2023-01-28,0,0,0,0,0,0,0 +2023-01-29,0,0,0,0,0,0,0 +2023-01-30,0,0,0,0,0,0,0 +2023-01-31,0,0,0,0,0,0,0 +2023-02-01,0,0,0,0,0,0,0 +2023-02-02,0,0,0,0,0,0,0 +2023-02-03,0,0,0,0,0,0,0 +2023-02-04,0,0,0,0,0,0,0 +2023-02-05,0,0,0,0,0,0,0 +2023-02-06,0,0,0,0,0,0,0 +2023-02-07,0,0,0,0,0,0,0 +2023-02-08,0,0,0,0,0,0,0 +2023-02-09,0,0,0,0,0,0,0 +2023-02-10,0,0,0,0,0,0,0 +2023-02-11,0,0,0,0,0,0,0 +2023-02-12,0,0,0,0,0,0,0 +2023-02-13,0,0,0,0,0,0,0 +2023-02-14,0,0,0,0,0,0,0 +2023-02-15,0,0,0,0,0,0,0 +2023-02-16,0,0,0,0,0,0,0 +2023-02-17,0,0,0,0,0,0,0 +2023-02-18,0,0,0,0,0,0,0 +2023-02-19,0,0,0,0,0,0,0 +2023-02-20,0,0,0,0,0,0,0 +2023-02-21,0,0,0,0,0,0,0 +2023-02-22,0,0,0,0,0,0,0 +2023-02-23,0,0,0,0,0,0,0 +2023-02-24,0,0,0,0,0,0,0 +2023-02-25,0,0,0,0,0,0,0 +2023-02-26,0,0,0,0,0,0,0 +2023-02-27,0,0,0,0,0,0,0 +2023-02-28,0,0,0,0,0,0,0 +2023-03-01,0,0,0,0,0,0,0 +2023-03-02,0,0,0,0,0,0,0 +2023-03-03,0,0,0,0,0,0,0 +2023-03-04,0,0,0,0,0,0,0 +2023-03-05,0,0,0,0,0,0,0 +2023-03-06,0,0,0,0,0,0,0 +2023-03-07,0,0,0,0,0,0,0 +2023-03-08,0,0,0,0,0,0,0 +2023-03-09,0,0,0,0,0,0,0 +2023-03-10,0,0,0,0,0,0,0 +2023-03-11,0,0,0,0,0,0,0 +2023-03-12,0,0,0,0,0,0,0 +2023-03-13,0,0,0,0,0,0,0 +2023-03-14,0,0,0,0,0,0,0 +2023-03-15,0,0,0,0,0,0,0 +2023-03-16,0,0,0,0,0,0,0 +2023-03-17,0,0,0,0,0,0,0 +2023-03-18,0,0,0,0,0,0,0 +2023-03-19,0,0,0,0,0,0,0 +2023-03-20,0,0,0,0,0,0,0 +2023-03-21,36.000,0,0,0,0,0,36.000 +2023-03-22,0,0,0,0,0,36.000,0 +2023-03-23,0,0,0,0,0,0,0 +2023-03-24,0,0,0,0,0,0,0 +2023-03-25,0,0,0,0,0,0,0 +2023-03-26,0,0,0,0,0,0,0 +2023-03-27,0,0,0,0,0,0,0 +2023-03-28,0,0,0,0,0,0,0 +2023-03-29,0,0,0,0,0,0,0 +2023-03-30,0,0,0,0,0,0,0 +2023-03-31,0,0,0,0,0,0,0 +2023-04-01,0,0,0,0,0,0,0 +2023-04-02,0,0,0,0,0,0,0 +2023-04-03,0,0,0,0,0,0,0 +2023-04-04,0,0,0,0,0,0,0 +2023-04-05,0,0,0,0,0,0,0 +2023-04-06,0,0,0,0,0,0,0 +2023-04-07,0,0,0,0,0,0,0 +2023-04-08,0,0,0,0,0,0,0 +2023-04-09,0,0,0,0,0,0,0 +2023-04-10,0,0,0,0,0,0,0 +2023-04-11,0,0,0,0,0,0,0 +2023-04-12,0,0,0,0,0,0,0 +2023-04-13,0,0,0,0,0,0,0 +2023-04-14,0,0,0,0,0,0,0 +2023-04-15,0,0,0,0,0,0,0 +2023-04-16,0,0,0,0,0,0,0 +2023-04-17,0,0,0,0,0,0,0 +2023-04-18,0,0,0,0,0,0,0 +2023-04-19,0,0,0,0,0,0,0 +2023-04-20,0,0,0,0,0,0,0 +2023-04-21,0,0,0,0,0,0,0 +2023-04-22,0,0,0,0,0,0,0 +2023-04-23,0,0,0,0,0,0,0 +2023-04-24,0,0,0,0,0,0,0 +2023-04-25,0,0,0,0,0,0,0 +2023-04-26,0,0,0,0,,, +2023-04-27,0,0,0,0,0,0,0 +2023-04-28,0,0,0,0,0,0,0 +2023-04-29,0,0,0,0,0,0,0 +2023-04-30,0,0,0,0,0,0,0 +2023-05-01,0,0,0,0,0,0,0 +2023-05-02,0,0,0,0,0,0,0 +2023-05-03,0,0,0,0,0,0,0 +2023-05-04,0,0,0,0,0,0,0 +2023-05-05,0,0,0,0,0,0,0 +2023-05-06,0,0,0,0,0,0,0 +2023-05-07,0,0,0,0,0,0,0 +2023-05-08,0,0,0,0,0,0,0 +2023-05-09,0,0,0,0,0,0,0 +2023-05-10,0,0,0,0,0,0,0 +2023-05-11,0,0,0,0,0,0,0 +2023-05-12,0,0,0,0,0,0,0 +2023-05-13,0,0,0,0,0,0,0 +2023-05-14,0,0,0,0,0,0,0 +2023-05-15,0,0,0,0,0,0,0 +2023-05-16,0,0,0,0,0,0,0 +2023-05-17,0,0,0,0,0,0,0 +2023-05-18,0,0,0,0,0,0,0 +2023-05-19,0,0,0,0,0,0,0 +2023-05-20,0,0,0,0,0,0,0 +2023-05-21,0,0,0,0,0,0,0 +2023-05-22,0,0,0,0,0,0,0 +2023-05-23,0,0,0,0,0,0,0 +2023-05-24,0,0,0,0,0,0,0 +2023-05-25,0,0,0,0,0,0,0 +2023-05-26,0,0,0,0,0,0,0 +2023-05-27,0,0,0,0,0,0,0 +2023-05-28,0,0,0,0,0,0,0 +2023-05-29,0,0,0,0,0,0,0 +2023-05-30,0,0,0,0,0,0,0 +2023-05-31,0,0,0,0,0,0,0 +2023-06-01,0,0,0,0,0,0,0 +2023-06-02,0,0,0,0,0,0,0 +2023-06-03,0,0,0,0,0,0,0 +2023-06-04,0,0,0,0,0,0,0 +2023-06-05,0,0,0,0,0,0,0 +2023-06-06,0,0,0,0,0,0,0 +2023-06-07,0,0,0,0,0,0,0 +2023-06-08,0,0,0,0,0,0,0 +2023-06-09,0,0,0,0,0,0,0 +2023-06-10,0,0,0,0,0,0,0 +2023-06-11,0,0,0,0,0,0,0 +2023-06-12,0,0,0,0,0,0,0 +2023-06-13,0,0,0,0,0,0,0 +2023-06-14,0,0,0,0,0,0,0 +2023-06-15,0,0,0,0,0,0,0 +2023-06-16,0,0,0,0,0,0,0 +2023-06-17,0,0,0,0,0,0,0 +2023-06-18,0,0,0,0,0,0,0 +2023-06-19,0,0,0,0,0,0,0 +2023-06-20,0,0,0,0,0,0,0 +2023-06-21,0,0,0,0,0,0,0 +2023-06-22,0,0,0,0,0,0,0 +2023-06-23,0,0,0,0,0,0,0 +2023-06-24,0,0,0,0,0,0,0 +2023-06-25,0,0,0,0,0,0,0 +2023-06-26,0,0,0,0,0,0,0 +2023-06-27,0,0,0,0,0,0,0 +2023-06-28,0,0,0,0,0,0,0 +2023-06-29,0,0,0,0,0,0,0 +2023-06-30,0,0,0,0,0,0,0 +2023-07-01,0,0,0,0,0,0,0 +2023-07-02,0,0,0,0,0,0,0 +2023-07-03,0,0,0,0,0,0,0 +2023-07-04,0,0,0,0,0,0,0 +2023-07-05,0,0,0,0,0,0,0 +2023-07-06,0,0,0,0,0,0,0 +2023-07-07,0,0,0,0,0,0,0 +2023-07-08,0,0,0,0,0,0,0 +2023-07-09,0,0,0,0,0,0,0 +2023-07-10,0,0,0,0,0,0,0 +2023-07-11,0,0,0,0,0,0,0 +2023-07-12,0,0,0,0,0,0,0 +2023-07-13,0,0,0,0,0,0,0 +2023-07-14,0,0,0,0,0,0,0 +2023-07-15,0,0,0,0,0,0,0 +2023-07-16,0,0,0,0,0,0,0 +2023-07-17,0,0,0,0,0,0,0 +2023-07-18,0,0,0,0,0,0,0 +2023-07-19,0,0,0,0,0,0,0 +2023-07-20,0,0,0,0,0,0,0 +2023-07-21,0,0,0,0,0,0,0 +2023-07-22,0,0,0,0,0,0,0 +2023-07-23,0,0,0,0,0,0,0 +2023-07-24,0,0,0,0,0,0,0 +2023-07-25,0,0,0,0,0,0,0 +2023-07-26,0,0,0,0,0,0,0 +2023-07-27,0,0,0,0,0,0,0 +2023-07-28,0,0,0,0,0,0,0 +2023-07-29,0,0,0,0,0,0,0 +2023-07-30,0,0,0,0,0,0,0 +2023-07-31,0,0,0,0,0,0,0 +2023-08-01,0,0,0,0,0,0,0 +2023-08-02,0,0,0,0,0,0,0 +2023-08-03,0,0,0,0,0,0,0 +2023-08-04,0,0,0,0,0,0,0 +2023-08-05,0,0,0,0,0,0,0 +2023-08-06,0,0,0,0,0,0,0 +2023-08-07,0,0,0,0,0,0,0 +2023-08-08,0,0,0,0,0,0,0 +2023-08-09,0,0,0,0,0,0,0 +2023-08-10,0,0,0,0,0,0,0 +2023-08-11,0,0,0,0,0,0,0 +2023-08-12,0,0,0,0,0,0,0 +2023-08-13,0,0,0,0,0,0,0 +2023-08-14,0,0,0,0,0,0,0 +2023-08-15,0,0,0,0,0,0,0 +2023-08-16,0,0,0,0,0,0,0 +2023-08-17,0,0,0,0,0,0,0 +2023-08-18,0,0,0,0,0,0,0 +2023-08-19,0,0,0,0,0,0,0 +2023-08-20,0,0,0,0,0,0,0 +2023-08-21,0,0,0,0,0,0,0 +2023-08-22,0,0,0,0,0,0,0 +2023-08-23,0,0,0,0,0,0,0 +2023-08-24,0,0,0,0,0,0,0 +2023-08-25,0,0,0,0,0,0,0 +2023-08-26,0,0,0,0,0,0,0 +2023-08-27,0,0,0,0,0,0,0 +2023-08-28,0,0,0,0,0,0,0 +2023-08-29,0,0,0,0,0,0,0 +2023-08-30,0,0,0,0,0,0,0 +2023-08-31,0,0,0,0,0,0,0 +2023-09-01,0,0,0,0,0,0,0 +2023-09-02,0,0,0,0,0,0,0 +2023-09-03,0,0,0,0,0,0,0 +2023-09-04,,0,0,0,0,0,0 +2023-09-05,0,0,0,0,0,0,0 +2023-09-06,0,0,0,0,0,0,0 +2023-09-07,0,0,0,0,0,0,0 +2023-09-08,0,0,0,0,0,0,0 +2023-09-09,0,0,0,0,0,0,0 +2023-09-10,0,0,0,0,0,0,0 +2023-09-11,0,0,0,0,0,0,0 +2023-09-12,0,0,0,0,0,0,0 +2023-09-13,0,0,0,0,0,0,0 +2023-09-14,0,0,0,0,0,0,0 +2023-09-15,0,0,0,0,0,0,0 +2023-09-16,0,0,0,0,0,0,0 +2023-09-17,0,0,0,0,0,0,0 +2023-09-18,0,0,0,0,0,0,0 +2023-09-19,0,0,0,0,0,0,0 +2023-09-20,0,0,0,0,0,0,0 +2023-09-21,0,0,0,0,0,0,0 +2023-09-22,0,0,0,0,0,0,0 +2023-09-23,0,0,0,0,0,0,0 +2023-09-24,0,0,0,0,0,0,0 +2023-09-25,0,0,0,0,0,0,0 +2023-09-26,0,0,0,0,0,0,0 +2023-09-27,0,0,0,0,0,0,0 +2023-09-28,0,0,0,0,0,0,0 +2023-09-29,0,0,0,0,0,0,0 +2023-09-30,0,0,0,0,0,0,0 +2023-10-01,0,0,0,0,0,0,0 +2023-10-02,0,0,0,0,0,0,0 +2023-10-03,0,0,0,0,0,0,0 +2023-10-04,0,0,0,0,0,0,0 +2023-10-05,0,0,0,0,0,0,0 +2023-10-06,0,0,0,0,0,0,0 +2023-10-07,0,0,0,0,0,0,0 +2023-10-08,0,0,0,0,0,0,0 +2023-10-09,0,0,0,0,0,0,0 +2023-10-10,0,0,0,0,0,0,0 +2023-10-11,0,0,0,0,0,0,0 +2023-10-12,0,0,0,0,0,0,0 +2023-10-13,0,0,0,0,0,0,0 +2023-10-14,0,0,0,0,0,0,0 +2023-10-15,0,0,0,0,0,0,0 +2023-10-16,0,0,0,0,0,0,0 +2023-10-17,0,0,0,0,0,0,0 +2023-10-18,0,0,0,0,0,0,0 +2023-10-19,0,0,0,0,0,0,0 +2023-10-20,0,0,0,0,0,0,0 +2023-10-21,0,0,0,0,0,0,0 +2023-10-22,0,0,0,0,0,0,0 +2023-10-23,0,0,0,0,0,0,0 +2023-10-24,0,0,0,0,0,0,0 +2023-10-25,0,0,0,0,0,0,0 +2023-10-26,0,0,0,0,0,0,0 +2023-10-27,0,0,0,0,0,0,0 +2023-10-28,0,0,0,0,0,0,0 +2023-10-29,0,0,0,0,0,0,0 +2023-10-30,0,0,0,0,0,0,0 +2023-10-31,0,0,0,0,0,0,0 +2023-11-01,0,0,0,0,0,0,0 +2023-11-02,0,0,0,0,0,0,0 +2023-11-03,0,0,0,0,0,0,0 +2023-11-04,0,0,0,0,0,0,0 +2023-11-05,0,0,0,0,0,0,0 +2023-11-06,0,0,0,0,0,0,0 +2023-11-07,0,0,0,0,0,0,0 +2023-11-08,0,0,0,0,0,0,0 +2023-11-09,0,0,0,0,0,0,0 +2023-11-10,0,0,0,0,0,0,0 +2023-11-11,0,0,0,0,0,0,0 +2023-11-12,0,0,0,0,0,0,0 +2023-11-13,0,0,0,0,0,0,0 +2023-11-14,0,0,0,0,0,0,0 +2023-11-15,0,0,0,0,0,0,0 +2023-11-16,0,0,0,0,0,0,0 +2023-11-17,0,0,0,0,0,0,0 +2023-11-18,0,0,0,0,0,0,0 +2023-11-19,0,0,0,0,0,0,0 +2023-11-20,0,0,0,0,0,0,0 +2023-11-21,0,0,0,0,0,0,0 +2023-11-22,0,0,0,0,0,0,0 +2023-11-23,0,0,0,0,0,0,0 +2023-11-24,0,0,0,0,0,0,0 +2023-11-25,0,0,0,0,0,0,0 +2023-11-26,0,0,0,0,0,0,0 +2023-11-27,0,0,0,0,0,0,0 +2023-11-28,0,0,0,0,0,0,0 +2023-11-29,0,0,0,0,0,0,0 +2023-11-30,0,0,0,0,0,0,0 +2023-12-01,0,0,0,0,0,0,0 +2023-12-02,0,,0,0,0,, +2023-12-03,0,0,0,0,0,0,0 +2023-12-04,0,0,0,0,0,0,0 +2023-12-05,0,0,0,0,0,0,0 +2023-12-06,0,0,0,0,0,0,0 +2023-12-07,0,0,0,0,0,0,0 +2023-12-08,0,0,0,0,0,0,0 +2023-12-09,0,0,0,0,0,0,0 +2023-12-10,,0,0,0,0,0,0 +2023-12-11,0,0,0,0,0,0,0 +2023-12-12,0,0,0,0,0,0,0 +2023-12-13,0,0,0,0,0,0,0 +2023-12-14,0,0,0,0,0,0,0 +2023-12-15,0,0,0,0,0,0,0 +2023-12-16,0,0,0,0,0,0,0 +2023-12-17,0,0,0,0,0,0,0 +2023-12-18,0,0,0,0,0,0,0 +2023-12-19,0,0,0,0,0,0,0 +2023-12-20,0,0,0,0,0,0,0 +2023-12-21,0,0,0,0,0,0,0 +2023-12-22,0,0,0,0,0,0,0 +2023-12-23,0,0,0,0,0,0,0 +2023-12-24,0,0,0,0,0,0,0 +2023-12-25,0,0,0,0,0,0,0 +2023-12-26,0,0,0,0,0,0,0 +2023-12-27,0,0,0,0,0,0,0 +2023-12-28,0,0,0,0,0,0,0 +2023-12-29,0,0,0,0,0,0,0 +2023-12-30,0,0,0,0,0,0,0 +2023-12-31,0,0,0,0,0,0,0 +2024-01-01,0,0,0,0,0,0,0 +2024-01-02,0,0,0,0,0,0,0 +2024-01-03,0,0,0,0,0,0,0 +2024-01-04,0,0,0,0,0,0,0 +2024-01-05,0,0,0,0,0,0,0 +2024-01-06,0,0,0,0,0,0,0 +2024-01-07,0,0,0,0,0,0,0 +2024-01-08,0,0,0,0,0,0,0 +2024-01-09,0,0,0,0,0,0,0 +2024-01-10,0,0,0,0,0,0,0 +2024-01-11,0,0,0,0,0,0,0 +2024-01-12,0,0,0,0,0,0,0 +2024-01-13,0,0,0,0,0,0,0 +2024-01-14,0,0,0,0,0,0,0 +2024-01-15,0,0,0,0,0,0,0 +2024-01-16,0,0,0,0,0,0,0 +2024-01-17,0,0,0,0,0,0,0 +2024-01-18,0,0,0,0,0,0,0 +2024-01-19,0,0,0,0,0,0,0 +2024-01-20,0,0,0,0,0,0,0 +2024-01-21,0,0,0,0,0,0,0 +2024-01-22,0,0,0,0,0,0,0 +2024-01-23,0,0,0,0,0,0,0 +2024-01-24,0,0,0,0,0,0,0 +2024-01-25,0,0,0,0,0,0,0 +2024-01-26,0,0,0,0,0,0,0 +2024-01-27,0,0,0,0,0,0,0 +2024-01-28,0,0,0,0,0,0,0 +2024-01-29,0,0,0,0,0,0,0 +2024-01-30,0,0,0,0,0,0,0 +2024-01-31,0,0,0,0,0,0,0 +2024-02-01,0,0,0,0,0,0,0 +2024-02-02,0,0,0,0,0,0,0 +2024-02-03,0,0,0,0,0,0,0 +2024-02-04,0,0,0,0,0,0,0 +2024-02-05,0,0,0,0,0,0,0 +2024-02-06,0,0,0,0,0,0,0 +2024-02-07,0,0,0,0,0,0,0 +2024-02-08,0,0,0,0,0,0,0 +2024-02-09,0,0,0,0,0,0,0 +2024-02-10,0,0,0,0,0,0,0 +2024-02-11,0,0,0,0,0,0,0 +2024-02-12,0,0,0,0,0,0,0 +2024-02-13,0,0,0,0,0,0,0 +2024-02-14,0,0,0,0,0,0,0 +2024-02-15,0,0,0,0,0,0,0 +2024-02-16,0,0,0,0,0,0,0 +2024-02-17,0,0,0,0,0,0,0 +2024-02-18,0,0,0,0,0,0,0 +2024-02-19,0,0,0,0,0,0,0 +2024-02-20,,0,0,0,0,0,0 +2024-02-21,0,0,0,0,0,0,0 +2024-02-22,0,0,0,0,0,0,0 +2024-02-23,0,0,0,0,0,0,0 +2024-02-24,0,0,0,0,0,0,0 +2024-02-25,0,0,0,0,0,0,0 +2024-02-26,0,0,0,0,0,0,0 +2024-02-27,0,0,0,0,0,0,0 +2024-02-28,0,0,0,0,0,0,0 +2024-02-29,0,0,0,0,0,0,0 +2024-03-01,0,0,0,0,0,0,0 +2024-03-02,0,0,0,0,0,0,0 +2024-03-03,0,0,0,0,0,0,0 +2024-03-04,0,0,0,0,0,0,0 +2024-03-05,0,0,0,0,0,0,0 +2024-03-06,0,0,0,0,0,0,0 +2024-03-07,0,0,0,0,0,0,0 +2024-03-08,0,0,0,0,0,0,0 +2024-03-09,0,0,0,0,0,0,0 +2024-03-10,0,0,0,0,0,0,0 +2024-03-11,0,0,0,0,0,0,0 +2024-03-12,0,0,0,0,0,0,0 +2024-03-13,0,0,0,0,0,0,0 +2024-03-14,0,0,0,0,0,0,0 +2024-03-15,0,0,0,0,0,0,0 +2024-03-16,0,0,0,0,0,0,0 +2024-03-17,0,0,0,0,0,0,0 +2024-03-18,0,0,0,0,0,0,0 +2024-03-19,0,0,0,0,0,0,0 +2024-03-20,0,0,0,0,0,0,0 +2024-03-21,0,0,0,0,0,0,0 +2024-03-22,0,0,0,0,0,0,0 +2024-03-23,0,0,0,0,0,0,0 +2024-03-24,0,0,0,0,0,0,0 +2024-03-25,0,30.000,0,0,0,0,30.000 +2024-03-26,0,30.000,0,0,0,30.000,30.000 +2024-03-27,0,30.000,0,0,0,30.000,30.000 +2024-03-28,0,30.000,0,0,0,30.000,30.000 +2024-03-29,0,35.000,0,0,0,30.000,35.000 +2024-03-30,0,35.000,0,0,0,35.000,35.000 +2024-03-31,0,35.000,0,0,0,35.000,35.000 +2024-04-01,0,35.000,0,0,0,35.000,35.000 +2024-04-02,0,33.000,0,0,0,35.000,33.000 +2024-04-03,0,35.000,0,0,0,33.000,35.000 +2024-04-04,0,38.000,0,0,0,35.000,38.000 +2024-04-05,0,32.000,0,0,0,38.000,32.000 +2024-04-06,0,32.000,0,0,0,32.000,32.000 +2024-04-07,0,32.000,0,0,0,32.000,32.000 +2024-04-08,0,40.000,0,0,0,32.000,40.000 +2024-04-09,0,40.000,0,0,0,40.000,40.000 +2024-04-10,0,40.000,0,0,0,40.000,40.000 +2024-04-11,0,40.000,0,0,0,40.000,40.000 +2024-04-12,0,40.000,0,0,0,40.000,40.000 +2024-04-13,0,40.000,0,0,0,40.000,40.000 +2024-04-14,0,40.000,0,0,0,40.000,40.000 +2024-04-15,0,30.000,0,0,0,40.000,30.000 +2024-04-16,0,30.000,0,0,0,30.000,30.000 +2024-04-17,0,30.000,0,0,0,30.000,30.000 +2024-04-18,0,27.000,0,0,0,30.000,27.000 +2024-04-19,0,32.000,0,0,0,27.000,32.000 +2024-04-20,0,32.000,0,0,0,32.000,32.000 +2024-04-21,0,32.000,0,0,0,32.000,32.000 +2024-04-22,0,29.000,0,0,0,32.000,29.000 +2024-04-23,0,35.000,0,0,0,29.000,35.000 +2024-04-24,0,35.000,0,0,0,35.000,35.000 +2024-04-25,0,35.000,0,0,0,35.000,35.000 +2024-04-26,0,35.000,0,0,0,35.000,35.000 +2024-04-27,0,30.000,0,0,0,35.000,30.000 +2024-04-28,0,30.000,0,0,0,30.000,30.000 +2024-04-29,0,35.000,0,0,0,30.000,35.000 +2024-04-30,0,50.000,0,0,0,35.000,50.000 +2024-05-01,0,50.000,0,0,0,50.000,50.000 +2024-05-02,0,50.000,0,0,0,50.000,50.000 +2024-05-03,0,50.000,0,0,0,50.000,50.000 +2024-05-04,0,50.000,0,0,0,50.000,50.000 +2024-05-05,0,50.000,0,0,0,50.000,50.000 +2024-05-06,0,45.000,0,0,0,50.000,45.000 +2024-05-07,0,45.000,0,0,0,45.000,45.000 +2024-05-08,0,45.000,0,0,0,45.000,45.000 +2024-05-09,0,40.000,0,0,0,45.000,40.000 +2024-05-10,0,40.000,0,0,0,40.000,40.000 +2024-05-11,0,40.000,0,0,0,40.000,40.000 +2024-05-12,0,25.000,0,0,0,40.000,25.000 +2024-05-13,0,25.000,0,0,0,25.000,25.000 +2024-05-14,0,25.000,0,0,0,25.000,25.000 +2024-05-15,0,25.000,0,0,0,25.000,25.000 +2024-05-16,0,25.000,0,0,0,25.000,25.000 +2024-05-17,0,25.000,0,0,0,25.000,25.000 +2024-05-18,0,25.000,0,0,0,25.000,25.000 +2024-05-19,0,25.000,0,0,0,25.000,25.000 +2024-05-20,0,25.000,0,0,0,25.000,25.000 +2024-05-21,0,35.000,0,0,0,25.000,35.000 +2024-05-22,0,35.000,0,0,0,35.000,35.000 +2024-05-23,0,35.000,0,0,0,35.000,35.000 +2024-05-24,0,40.000,0,0,0,35.000,40.000 +2024-05-25,0,40.000,0,0,0,40.000,40.000 +2024-05-26,0,35.000,0,0,0,40.000,35.000 +2024-05-27,0,35.000,0,0,0,35.000,35.000 +2024-05-28,0,35.000,0,0,0,35.000,35.000 +2024-05-29,0,35.000,0,0,0,35.000,35.000 +2024-05-30,0,35.000,0,0,0,35.000,35.000 +2024-05-31,0,35.000,0,0,0,35.000,35.000 +2024-06-01,0,35.000,0,0,0,35.000,35.000 +2024-06-02,0,37.000,0,0,0,35.000,37.000 +2024-06-03,0,37.000,0,0,0,37.000,37.000 +2024-06-04,0,37.000,0,0,0,37.000,37.000 +2024-06-05,0,36.000,0,0,0,37.000,36.000 +2024-06-06,0,36.000,0,0,0,36.000,36.000 +2024-06-07,0,36.000,0,0,0,36.000,36.000 +2024-06-08,0,36.000,0,0,0,36.000,36.000 +2024-06-09,0,40.000,0,0,0,36.000,40.000 +2024-06-10,0,40.000,0,0,0,40.000,40.000 +2024-06-11,0,40.000,0,0,0,40.000,40.000 +2024-06-12,0,42.000,0,0,0,40.000,42.000 +2024-06-13,0,46.000,0,0,0,42.000,46.000 +2024-06-14,0,46.000,0,0,0,46.000,46.000 +2024-06-15,0,46.000,0,0,0,46.000,46.000 +2024-06-16,0,40.000,0,0,0,46.000,40.000 +2024-06-17,0,40.000,0,0,0,40.000,40.000 +2024-06-18,0,40.000,0,0,0,40.000,40.000 +2024-06-19,0,39.000,0,0,0,40.000,39.000 +2024-06-20,0,45.000,0,0,0,39.000,45.000 +2024-06-21,0,40.000,0,0,0,45.000,40.000 +2024-06-22,0,40.000,0,0,0,40.000,40.000 +2024-06-23,0,40.000,0,0,0,40.000,40.000 +2024-06-24,0,28.000,0,0,0,40.000,28.000 +2024-06-25,0,24.000,0,0,0,28.000,24.000 +2024-06-26,0,24.000,0,0,0,24.000,24.000 +2024-06-27,0,22.000,0,0,0,24.000,22.000 +2024-06-28,0,22.000,0,0,0,22.000,22.000 +2024-06-29,0,22.000,0,0,0,22.000,22.000 +2024-06-30,0,22.000,0,0,0,22.000,22.000 +2024-07-01,0,22.000,0,0,0,22.000,22.000 +2024-07-02,0,22.000,0,0,0,22.000,22.000 +2024-07-03,0,22.000,0,0,0,22.000,22.000 +2024-07-04,0,22.000,0,0,0,22.000,22.000 +2024-07-05,0,22.000,0,0,0,22.000,22.000 +2024-07-06,0,22.000,0,0,0,22.000,22.000 +2024-07-07,0,22.000,0,0,0,22.000,22.000 +2024-07-08,0,22.000,0,0,0,22.000,22.000 +2024-07-09,0,22.000,0,0,0,22.000,22.000 +2024-07-10,0,22.000,0,0,0,22.000,22.000 +2024-07-11,0,22.000,0,0,0,22.000,22.000 +2024-07-12,0,22.000,0,0,0,22.000,22.000 +2024-07-13,0,22.000,0,0,0,22.000,22.000 +2024-07-14,0,22.000,0,0,0,22.000,22.000 +2024-07-15,0,22.000,0,0,0,22.000,22.000 +2024-07-16,0,22.000,0,0,0,22.000,22.000 +2024-07-17,0,22.000,0,0,0,22.000,22.000 +2024-07-18,0,28.000,0,0,0,22.000,28.000 +2024-07-19,0,30.000,0,0,0,28.000,30.000 +2024-07-20,0,30.000,0,0,0,30.000,30.000 +2024-07-21,0,30.000,0,0,0,30.000,30.000 +2024-07-22,0,30.000,0,0,0,30.000,30.000 +2024-07-23,0,25.000,0,0,0,30.000,25.000 +2024-07-24,0,25.000,0,0,0,25.000,25.000 +2024-07-25,0,25.000,0,0,0,25.000,25.000 +2024-07-26,0,25.000,0,0,0,25.000,25.000 +2024-07-27,0,25.000,0,0,0,25.000,25.000 +2024-07-28,0,25.000,0,0,0,25.000,25.000 +2024-07-29,0,26.000,0,0,0,25.000,26.000 +2024-07-30,0,28.000,0,0,0,26.000,28.000 +2024-07-31,0,28.000,0,0,0,28.000,28.000 +2024-08-01,0,28.000,0,0,0,28.000,28.000 +2024-08-02,0,28.000,0,0,0,28.000,28.000 +2024-08-03,0,28.000,0,0,0,28.000,28.000 +2024-08-04,0,28.000,0,0,0,28.000,28.000 +2024-08-05,0,28.000,0,0,0,28.000,28.000 +2024-08-06,0,28.000,0,0,0,28.000,28.000 +2024-08-07,0,28.000,0,0,0,28.000,28.000 +2024-08-08,0,28.000,0,0,0,28.000,28.000 +2024-08-09,0,28.000,0,0,0,28.000,28.000 +2024-08-10,0,28.000,0,0,0,28.000,28.000 +2024-08-11,0,28.000,0,0,0,28.000,28.000 +2024-08-12,0,25.000,0,0,0,28.000,25.000 +2024-08-13,0,25.000,0,0,0,25.000,25.000 +2024-08-14,0,25.000,0,0,0,25.000,25.000 +2024-08-15,0,25.000,0,0,0,25.000,25.000 +2024-08-16,0,25.000,0,0,0,25.000,25.000 +2024-08-17,0,25.000,0,0,0,25.000,25.000 +2024-08-18,0,25.000,0,0,0,25.000,25.000 +2024-08-19,0,25.000,0,0,0,25.000,25.000 +2024-08-20,0,24.000,0,0,0,25.000,24.000 +2024-08-21,0,24.000,0,0,0,24.000,24.000 +2024-08-22,0,24.000,0,0,0,24.000,24.000 +2024-08-23,0,24.000,0,0,0,24.000,24.000 +2024-08-24,0,22.000,0,0,0,24.000,22.000 +2024-08-25,0,22.000,0,0,0,22.000,22.000 +2024-08-26,0,20.000,0,0,0,22.000,20.000 +2024-08-27,0,20.000,0,0,0,20.000,20.000 +2024-08-28,0,16.000,0,0,0,20.000,16.000 +2024-08-29,0,16.000,0,0,0,16.000,16.000 +2024-08-30,0,17.000,0,0,0,16.000,17.000 +2024-08-31,0,17.000,0,0,0,17.000,17.000 +2024-09-01,0,17.000,0,0,0,17.000,17.000 +2024-09-02,0,14.000,0,0,0,17.000,14.000 +2024-09-03,0,14.000,0,0,0,14.000,14.000 +2024-09-04,0,14.000,0,0,0,14.000,14.000 +2024-09-05,0,14.000,0,0,0,14.000,14.000 +2024-09-06,0,13.000,0,0,0,14.000,13.000 +2024-09-07,0,13.000,0,0,0,13.000,13.000 +2024-09-08,0,13.000,0,0,0,13.000,13.000 +2024-09-09,0,12.000,0,0,0,13.000,12.000 +2024-09-10,0,12.000,0,0,0,12.000,12.000 +2024-09-11,0,12.000,0,0,0,12.000,12.000 +2024-09-12,0,12.000,0,0,0,12.000,12.000 +2024-09-13,0,12.000,0,0,0,12.000,12.000 +2024-09-14,0,12.000,0,0,0,12.000,12.000 +2024-09-15,0,12.000,0,0,0,12.000,12.000 +2024-09-16,0,12.000,0,0,0,12.000,12.000 +2024-09-17,0,12.000,0,0,0,12.000,12.000 +2024-09-18,0,12.000,0,0,0,12.000,12.000 +2024-09-19,0,12.000,0,0,0,12.000,12.000 +2024-09-20,0,12.000,0,0,0,12.000,12.000 +2024-09-21,0,12.000,0,0,0,12.000,12.000 +2024-09-22,0,12.000,0,0,0,12.000,12.000 +2024-09-23,0,12.000,0,0,0,12.000,12.000 +2024-09-24,0,13.000,0,0,0,12.000,13.000 +2024-09-25,0,13.000,0,0,0,13.000,13.000 +2024-09-26,0,13.000,0,0,0,13.000,13.000 +2024-09-27,0,13.000,0,0,0,13.000,13.000 +2024-09-28,0,14.000,0,0,0,13.000,14.000 +2024-09-29,0,14.000,0,0,0,14.000,14.000 +2024-09-30,0,12.000,0,0,0,14.000,12.000 +2024-10-01,0,12.000,0,0,0,12.000,12.000 +2024-10-02,0,11.000,0,0,,12.000,11.000 +2024-10-03,0,10.000,0,0,0,11.000,10.000 +2024-10-04,0,10.000,0,0,0,10.000,10.000 +2024-10-05,0,10.000,0,0,0,10.000,10.000 +2024-10-06,0,10.000,0,0,0,10.000,10.000 +2024-10-07,0,10.000,0,0,0,10.000,10.000 +2024-10-08,0,10.000,0,0,0,10.000,10.000 +2024-10-09,0,10.000,0,0,0,10.000,10.000 +2024-10-10,0,10.000,0,0,0,10.000,10.000 +2024-10-11,0,10.000,0,0,0,10.000,10.000 +2024-10-12,0,10.000,0,0,0,10.000,10.000 +2024-10-13,0,10.000,0,0,0,10.000,10.000 +2024-10-14,0,10.000,0,0,0,10.000,10.000 +2024-10-15,0,10.000,0,0,0,10.000,10.000 +2024-10-16,0,10.000,0,0,0,10.000,10.000 +2024-10-17,0,10.000,0,0,0,10.000,10.000 +2024-10-18,0,10.000,0,0,0,10.000,10.000 +2024-10-19,0,10.000,0,0,0,10.000,10.000 +2024-10-20,0,11.000,0,0,0,10.000,11.000 +2024-10-21,0,11.000,0,0,0,11.000,11.000 +2024-10-22,0,11.000,0,0,0,11.000,11.000 +2024-10-23,0,11.000,0,0,0,11.000,11.000 +2024-10-24,0,11.000,0,0,0,11.000,11.000 +2024-10-25,0,11.000,0,0,0,11.000,11.000 +2024-10-26,0,11.000,0,0,0,11.000,11.000 +2024-10-27,0,11.000,0,0,0,11.000,11.000 +2024-10-28,0,11.000,0,0,0,11.000,11.000 +2024-10-29,0,11.000,0,0,0,11.000,11.000 +2024-10-30,0,11.000,0,0,0,11.000,11.000 +2024-10-31,0,11.000,0,0,0,11.000,11.000 +2024-11-01,0,11.000,0,0,0,11.000,11.000 +2024-11-02,0,11.000,0,0,0,11.000,11.000 +2024-11-03,0,11.000,0,0,0,11.000,11.000 +2024-11-04,0,11.000,0,0,0,11.000,11.000 +2024-11-05,0,11.000,0,0,0,11.000,11.000 +2024-11-06,0,11.000,0,0,0,11.000,11.000 +2024-11-07,0,11.000,0,0,0,11.000,11.000 +2024-11-08,0,11.000,0,0,0,11.000,11.000 +2024-11-09,0,11.000,0,0,0,11.000,11.000 +2024-11-10,0,11.000,0,0,0,11.000,11.000 +2024-11-11,0,11.000,0,0,0,11.000,11.000 +2024-11-12,0,11.000,0,0,0,11.000,11.000 +2024-11-13,0,11.000,0,0,0,11.000,11.000 +2024-11-14,0,11.000,0,0,0,11.000,11.000 +2024-11-15,0,11.000,0,0,0,11.000,11.000 +2024-11-16,0,11.000,0,0,0,11.000,11.000 +2024-11-17,0,11.000,0,0,0,11.000,11.000 +2024-11-18,0,12.000,0,0,0,11.000,12.000 +2024-11-19,0,12.000,0,0,0,12.000,12.000 +2024-11-20,0,12.000,0,0,0,12.000,12.000 +2024-11-21,0,14.000,0,0,0,12.000,14.000 +2024-11-22,0,14.000,0,0,0,14.000,14.000 +2024-11-23,0,14.000,0,0,0,14.000,14.000 +2024-11-24,0,14.000,0,0,0,14.000,14.000 +2024-11-25,0,10.000,0,0,0,14.000,10.000 +2024-11-26,0,10.000,0,0,0,10.000,10.000 +2024-11-27,0,10.000,0,0,0,10.000,10.000 +2024-11-28,0,10.000,0,0,0,10.000,10.000 +2024-11-29,0,10.000,0,0,0,10.000,10.000 +2024-11-30,0,12.000,0,0,0,10.000,12.000 +2024-12-01,0,14.000,0,0,0,12.000,14.000 +2024-12-02,0,14.000,0,0,0,14.000,14.000 +2024-12-03,0,14.000,0,0,0,14.000,14.000 +2024-12-04,0,14.000,0,0,0,14.000,14.000 +2024-12-05,0,14.000,0,0,0,14.000,14.000 +2024-12-06,0,14.000,0,0,0,14.000,14.000 +2024-12-07,0,14.000,0,0,0,14.000,14.000 +2024-12-08,0,14.000,0,0,0,14.000,14.000 +2024-12-09,0,20.000,0,0,0,14.000,20.000 +2024-12-10,0,20.000,0,0,0,20.000,20.000 +2024-12-11,0,20.000,0,0,0,20.000,20.000 +2024-12-12,0,23.000,0,0,0,20.000,23.000 +2024-12-13,0,24.000,0,0,0,23.000,24.000 +2024-12-14,0,24.000,0,0,0,24.000,24.000 +2024-12-15,0,24.000,0,0,0,24.000,24.000 +2024-12-16,0,26.000,0,0,0,24.000,26.000 +2024-12-17,0,26.000,0,0,0,26.000,26.000 +2024-12-18,0,26.000,0,0,0,26.000,26.000 +2024-12-19,0,26.000,0,0,0,26.000,26.000 +2024-12-20,0,28.000,0,0,0,26.000,28.000 +2024-12-21,0,28.000,0,0,0,28.000,28.000 +2024-12-22,0,28.000,0,0,0,28.000,28.000 +2024-12-23,0,30.000,0,0,0,28.000,30.000 +2024-12-24,0,30.000,0,0,0,30.000,30.000 +2024-12-25,0,28.000,0,0,0,30.000,28.000 +2024-12-26,0,30.000,0,0,0,28.000,30.000 +2024-12-27,0,30.000,0,0,0,30.000,30.000 +2024-12-28,0,30.000,0,0,0,30.000,30.000 +2024-12-29,0,45.000,0,0,0,30.000,45.000 +2024-12-30,0,45.000,0,0,0,45.000,45.000 +2024-12-31,0,45.000,0,0,0,45.000,45.000 +2025-01-01,0,45.000,0,0,0,45.000,45.000 +2025-01-02,0,44.000,0,0,0,45.000,44.000 +2025-01-03,0,44.000,0,0,0,44.000,44.000 +2025-01-04,0,40.000,0,0,0,44.000,40.000 +2025-01-05,0,39.000,0,0,0,40.000,39.000 +2025-01-06,0,40.000,0,0,0,39.000,40.000 +2025-01-07,0,40.000,0,0,0,40.000,40.000 +2025-01-08,0,40.000,0,0,0,40.000,40.000 +2025-01-09,0,40.000,0,0,0,40.000,40.000 +2025-01-10,0,40.000,0,0,0,40.000,40.000 +2025-01-11,0,40.000,0,0,0,40.000,40.000 +2025-01-12,0,40.000,0,0,0,40.000,40.000 +2025-01-13,0,44.000,0,0,0,40.000,44.000 +2025-01-14,0,44.000,0,0,0,44.000,44.000 +2025-01-15,0,44.000,0,0,0,44.000,44.000 +2025-01-16,0,44.000,0,0,0,44.000,44.000 +2025-01-17,0,47.000,0,0,0,44.000,47.000 +2025-01-18,0,47.000,0,0,0,47.000,47.000 +2025-01-19,0,47.000,0,0,0,47.000,47.000 +2025-01-20,0,50.000,0,0,0,47.000,50.000 +2025-01-21,0,50.000,0,0,0,50.000,50.000 +2025-01-22,0,50.000,0,0,0,50.000,50.000 +2025-01-23,0,50.000,0,0,0,50.000,50.000 +2025-01-24,0,50.000,0,0,0,50.000,50.000 +2025-01-25,0,50.000,0,0,0,50.000,50.000 +2025-01-26,0,50.000,0,0,0,50.000,50.000 +2025-01-27,0,50.000,0,0,0,50.000,50.000 +2025-01-28,0,50.000,0,0,0,50.000,50.000 +2025-01-29,0,50.000,0,0,0,50.000,50.000 +2025-01-30,0,45.000,0,0,0,50.000,45.000 +2025-01-31,0,45.000,0,0,0,45.000,45.000 +2025-02-01,0,45.000,0,0,0,45.000,45.000 +2025-02-02,0,45.000,0,0,0,45.000,45.000 +2025-02-03,0,55.000,0,0,0,45.000,55.000 +2025-02-04,0,55.000,0,0,0,55.000,55.000 +2025-02-05,0,55.000,0,0,0,55.000,55.000 +2025-02-06,0,55.000,0,0,0,55.000,55.000 +2025-02-07,0,55.000,0,0,0,55.000,55.000 +2025-02-08,0,55.000,0,0,0,55.000,55.000 +2025-02-09,0,55.000,0,0,0,55.000,55.000 +2025-02-10,0,45.000,0,0,0,55.000,45.000 +2025-02-11,0,35.000,0,0,0,45.000,35.000 +2025-02-12,0,35.000,0,0,0,35.000,35.000 +2025-02-13,0,25.000,0,0,0,35.000,25.000 +2025-02-14,0,30.000,0,0,0,25.000,30.000 +2025-02-15,0,30.000,0,0,0,30.000,30.000 +2025-02-16,0,30.000,0,0,0,30.000,30.000 +2025-02-17,0,30.000,0,0,0,30.000,30.000 +2025-02-18,0,30.000,0,0,0,30.000,30.000 +2025-02-19,0,35.000,0,0,0,30.000,35.000 +2025-02-20,0,35.000,0,0,0,35.000,35.000 +2025-02-21,0,35.000,0,0,0,35.000,35.000 +2025-02-22,0,35.000,0,0,0,35.000,35.000 +2025-02-23,0,40.000,0,0,0,35.000,40.000 +2025-02-24,0,40.000,0,0,0,40.000,40.000 +2025-02-25,0,40.000,0,0,0,40.000,40.000 +2025-02-26,0,45.000,0,0,0,40.000,45.000 +2025-02-27,0,45.000,0,0,0,45.000,45.000 +2025-02-28,0,50.000,0,0,0,45.000,50.000 +2025-03-01,0,50.000,0,0,0,50.000,50.000 +2025-03-02,0,50.000,0,0,0,50.000,50.000 +2025-03-03,0,50.000,0,0,0,50.000,50.000 +2025-03-04,0,58.000,0,0,0,50.000,58.000 +2025-03-05,0,58.000,0,0,0,58.000,58.000 +2025-03-06,0,50.000,0,0,0,58.000,50.000 +2025-03-07,0,45.000,0,0,0,50.000,45.000 +2025-03-08,0,45.000,0,0,0,45.000,45.000 +2025-03-09,0,45.000,0,0,0,45.000,45.000 +2025-03-10,0,30.000,0,0,0,45.000,30.000 +2025-03-11,0,32.000,0,0,0,30.000,32.000 +2025-03-12,0,32.000,0,0,0,32.000,32.000 +2025-03-13,0,35.000,0,0,0,32.000,35.000 +2025-03-14,0,37.000,0,0,0,35.000,37.000 +2025-03-15,0,37.000,0,0,0,37.000,37.000 +2025-03-16,0,37.000,0,0,0,37.000,37.000 +2025-03-17,0,32.000,0,0,0,37.000,32.000 +2025-03-18,0,32.000,0,0,0,32.000,32.000 +2025-03-19,0,32.000,0,0,0,32.000,32.000 +2025-03-20,0,37.000,0,0,0,32.000,37.000 +2025-03-21,0,37.000,0,0,0,37.000,37.000 +2025-03-22,0,37.000,0,0,0,37.000,37.000 +2025-03-23,0,37.000,0,0,0,37.000,37.000 +2025-03-24,0,37.000,0,0,0,37.000,37.000 +2025-03-25,0,40.000,0,0,0,37.000,40.000 +2025-03-26,0,50.000,0,0,0,40.000,50.000 +2025-03-27,0,50.000,0,0,0,50.000,50.000 +2025-03-28,0,50.000,0,0,0,50.000,50.000 +2025-03-29,0,50.000,0,0,0,50.000,50.000 +2025-03-30,0,50.000,0,0,0,50.000,50.000 +2025-03-31,0,50.000,0,0,0,50.000,50.000 +2025-04-01,0,50.000,0,0,0,50.000,50.000 +2025-04-02,0,50.000,0,0,0,50.000,50.000 +2025-04-03,0,50.000,0,0,0,50.000,50.000 +2025-04-04,0,,0,0,0,50.000,50.000 +2025-04-05,0,30.000,0,0,0,50.000,30.000 +2025-04-06,0,30.000,0,0,0,30.000,30.000 +2025-04-07,0,28.000,0,0,0,30.000,28.000 +2025-04-08,0,28.000,0,0,0,28.000,28.000 +2025-04-09,0,30.000,0,0,0,28.000,30.000 +2025-04-10,0,30.000,0,0,0,30.000,30.000 +2025-04-11,0,28.000,0,0,0,30.000,28.000 +2025-04-12,0,28.000,0,0,0,28.000,28.000 +2025-04-13,0,28.000,0,0,0,28.000,28.000 +2025-04-14,0,26.000,0,0,0,28.000,26.000 +2025-04-15,0,26.000,0,0,0,26.000,26.000 +2025-04-16,0,26.000,0,0,0,26.000,26.000 +2025-04-17,0,26.000,0,0,0,26.000,26.000 +2025-04-18,0,34.000,0,0,0,26.000,34.000 +2025-04-19,0,34.000,0,0,0,34.000,34.000 +2025-04-20,0,34.000,0,0,0,34.000,34.000 +2025-04-21,0,30.000,0,0,0,34.000,30.000 +2025-04-22,0,26.000,0,0,0,30.000,26.000 +2025-04-23,0,26.000,0,0,0,26.000,26.000 +2025-04-24,0,32.000,0,0,0,26.000,32.000 +2025-04-25,0,32.000,0,0,0,32.000,32.000 +2025-04-26,0,32.000,0,0,0,32.000,32.000 +2025-04-27,0,32.000,0,0,0,32.000,32.000 +2025-04-28,0,18.000,0,0,0,32.000,18.000 +2025-04-29,0,28.000,0,0,0,18.000,28.000 +2025-04-30,0,28.000,0,0,0,28.000,28.000 +2025-05-01,0,28.000,0,0,0,28.000,28.000 +2025-05-02,0,28.000,0,0,0,28.000,28.000 +2025-05-03,0,28.000,0,0,0,28.000,28.000 +2025-05-04,0,28.000,0,0,0,28.000,28.000 +2025-05-05,0,28.000,0,0,0,28.000,28.000 +2025-05-06,0,28.000,0,0,0,28.000,28.000 +2025-05-07,0,24.000,0,0,0,28.000,24.000 +2025-05-08,0,24.000,0,0,0,24.000,24.000 +2025-05-09,0,24.000,0,0,0,24.000,24.000 +2025-05-10,0,24.000,0,0,0,24.000,24.000 +2025-05-11,0,24.000,0,0,0,24.000,24.000 +2025-05-12,0,24.000,0,0,0,24.000,24.000 +2025-05-13,0,24.000,0,0,0,24.000,24.000 +2025-05-14,0,24.000,0,0,0,24.000,24.000 +2025-05-15,0,24.000,0,0,0,24.000,24.000 +2025-05-16,0,24.000,0,0,0,24.000,24.000 +2025-05-17,0,24.000,0,0,0,24.000,24.000 +2025-05-18,0,24.000,0,0,0,24.000,24.000 +2025-05-19,0,24.000,0,0,0,24.000,24.000 +2025-05-20,0,24.000,0,0,0,24.000,24.000 +2025-05-21,0,24.000,0,0,0,24.000,24.000 +2025-05-22,0,24.000,0,0,0,24.000,24.000 +2025-05-23,0,24.000,0,0,0,24.000,24.000 +2025-05-24,0,24.000,0,0,0,24.000,24.000 +2025-05-25,0,24.000,0,0,0,24.000,24.000 +2025-05-26,0,26.000,0,0,0,24.000,26.000 +2025-05-27,0,26.000,0,0,0,26.000,26.000 +2025-05-28,0,26.000,0,0,0,26.000,26.000 +2025-05-29,0,26.000,0,0,0,26.000,26.000 +2025-05-30,0,26.000,0,0,0,26.000,26.000 +2025-05-31,0,26.000,0,0,0,26.000,26.000 +2025-06-01,0,26.000,0,0,0,26.000,26.000 +2025-06-02,0,26.000,0,0,0,26.000,26.000 +2025-06-03,0,28.000,0,0,0,26.000,28.000 +2025-06-04,0,36.000,0,0,0,28.000,36.000 +2025-06-05,0,36.000,0,0,0,36.000,36.000 +2025-06-06,0,36.000,0,0,0,36.000,36.000 +2025-06-07,0,36.000,0,0,0,36.000,36.000 +2025-06-08,0,36.000,0,0,0,36.000,36.000 +2025-06-09,0,32.000,0,0,0,36.000,32.000 +2025-06-10,0,32.000,0,28.000,0,32.000,30.000 +2025-06-11,0,30.000,0,23.000,0,30.000,26.500 +2025-06-12,0,30.000,0,23.000,0,26.500,26.500 +2025-06-13,0,30.000,0,22.000,0,26.500,26.000 +2025-06-14,0,30.000,0,22.000,0,26.000,26.000 +2025-06-15,0,30.000,0,22.000,0,26.000,26.000 +2025-06-16,0,30.000,0,18.000,0,26.000,24.000 +2025-06-17,0,18.000,0,18.000,0,24.000,18.000 +2025-06-18,0,18.000,0,18.000,0,18.000,18.000 +2025-06-19,0,16.000,0,18.000,0,18.000,17.000 +2025-06-20,0,16.000,0,18.000,0,17.000,17.000 +2025-06-21,0,18.000,0,18.000,0,17.000,18.000 +2025-06-22,0,18.000,0,18.000,0,18.000,18.000 +2025-06-23,0,16.000,0,20.000,0,18.000,18.000 +2025-06-24,0,16.000,0,18.000,0,18.000,17.000 +2025-06-25,0,16.000,0,18.000,0,17.000,17.000 +2025-06-26,0,16.000,0,18.000,0,17.000,17.000 +2025-06-27,0,14.000,0,20.000,0,17.000,17.000 +2025-06-28,0,14.000,0,20.000,0,17.000,17.000 +2025-06-29,0,18.000,0,24.000,0,17.000,21.000 +2025-06-30,0,22.000,0,24.000,0,21.000,23.000 +2025-07-01,0,22.000,0,22.000,0,23.000,22.000 +2025-07-02,0,20.000,0,22.000,0,22.000,21.000 +2025-07-03,0,22.000,0,22.000,0,21.000,22.000 +2025-07-04,0,22.000,0,22.000,0,22.000,22.000 +2025-07-05,0,22.000,0,22.000,0,22.000,22.000 +2025-07-06,0,24.000,0,24.000,0,22.000,24.000 +2025-07-07,0,24.000,0,24.000,0,24.000,24.000 +2025-07-08,0,24.000,0,24.000,0,24.000,24.000 +2025-07-09,0,22.000,0,24.000,0,24.000,23.000 +2025-07-10,0,26.000,0,24.000,0,23.000,25.000 +2025-07-11,0,22.000,0,24.000,0,25.000,23.000 +2025-07-12,0,28.000,0,24.000,0,23.000,26.000 +2025-07-13,0,28.000,0,24.000,0,26.000,26.000 +2025-07-14,0,28.000,0,30.000,0,26.000,29.000 +2025-07-15,0,28.000,0,30.000,0,29.000,29.000 +2025-07-16,0,28.000,0,30.000,0,29.000,29.000 +2025-07-17,0,28.000,0,26.000,0,29.000,27.000 +2025-07-18,0,28.000,0,25.000,0,27.000,26.500 +2025-07-19,0,26.000,0,25.000,0,26.500,25.500 +2025-07-20,0,26.000,0,25.000,0,, +2025-07-21,0,26.000,0,24.000,0,25.500,25.000 +2025-07-22,0,26.000,0,24.000,0,25.000,25.000 +2025-07-23,0,26.000,0,26.000,0,25.000,26.000 +2025-07-24,0,22.000,0,24.000,0,26.000,23.000 +2025-07-25,0,22.000,0,26.000,0,23.000,24.000 +2025-07-26,0,22.000,0,26.000,0,24.000,24.000 +2025-07-27,0,22.000,0,26.000,0,24.000,24.000 +2025-07-28,0,22.000,0,26.000,0,24.000,24.000 +2025-07-29,0,22.000,0,26.000,0,24.000,24.000 +2025-07-30,0,22.000,0,26.000,0,24.000,24.000 +2025-07-31,0,24.000,0,26.000,0,24.000,25.000 +2025-08-01,0,30.000,0,24.000,0,25.000,27.000 +2025-08-02,0,30.000,0,24.000,0,27.000,27.000 +2025-08-03,0,30.000,0,24.000,0,27.000,27.000 +2025-08-04,0,30.000,0,30.000,0,27.000,30.000 +2025-08-05,0,30.000,0,34.000,0,30.000,32.000 +2025-08-06,0,30.000,0,26.000,0,32.000,28.000 +2025-08-07,0,30.000,0,26.000,0,28.000,28.000 +2025-08-08,0,30.000,0,26.000,0,28.000,28.000 +2025-08-09,0,30.000,0,26.000,0,28.000,28.000 +2025-08-10,0,30.000,0,26.000,0,28.000,28.000 +2025-08-11,0,26.000,0,26.000,0,28.000,26.000 +2025-08-12,0,25.000,0,26.000,0,26.000,25.500 +2025-08-13,0,24.000,0,26.000,0,25.500,25.000 +2025-08-14,0,24.000,0,28.000,0,25.000,26.000 +2025-08-15,0,24.000,0,24.000,0,26.000,24.000 +2025-08-16,0,24.000,0,24.000,0,24.000,24.000 +2025-08-17,0,20.000,0,22.000,0,24.000,21.000 +2025-08-18,0,20.000,0,22.000,0,21.000,21.000 +2025-08-19,0,25.000,0,28.000,0,21.000,26.500 +2025-08-20,0,25.000,0,28.000,0,26.500,26.500 +2025-08-21,0,25.000,0,28.000,0,26.500,26.500 +2025-08-22,0,25.000,0,28.000,0,26.500,26.500 +2025-08-23,0,20.000,0,28.000,0,26.500,24.000 +2025-08-24,0,20.000,0,28.000,0,24.000,24.000 +2025-08-25,0,16.000,0,20.000,0,24.000,18.000 +2025-08-26,0,16.000,0,20.000,0,18.000,18.000 +2025-08-27,0,16.000,0,20.000,0,18.000,18.000 +2025-08-28,0,18.000,0,20.000,0,18.000,19.000 +2025-08-29,0,18.000,0,20.000,0,19.000,19.000 +2025-08-30,0,18.000,0,20.000,0,19.000,19.000 +2025-08-31,0,18.000,0,20.000,0,19.000,19.000 +2025-09-01,0,16.000,0,20.000,0,19.000,18.000 +2025-09-02,0,16.000,0,20.000,0,18.000,18.000 +2025-09-03,0,16.000,0,24.000,0,18.000,20.000 +2025-09-04,0,24.000,0,24.000,0,20.000,24.000 +2025-09-05,0,26.000,0,20.000,0,24.000,23.000 +2025-09-06,0,26.000,0,20.000,0,23.000,23.000 +2025-09-07,0,26.000,0,20.000,0,23.000,23.000 +2025-09-08,0,24.000,0,22.000,0,23.000,23.000 +2025-09-09,0,26.000,0,22.000,0,23.000,24.000 +2025-09-10,0,30.000,0,22.000,0,24.000,26.000 +2025-09-11,0,30.000,0,22.000,0,26.000,26.000 +2025-09-12,0,30.000,0,22.000,0,26.000,26.000 +2025-09-13,0,30.000,0,22.000,0,26.000,26.000 +2025-09-14,0,30.000,0,22.000,0,26.000,26.000 +2025-09-15,0,30.000,0,24.000,0,26.000,27.000 +2025-09-16,0,30.000,0,26.000,0,27.000,28.000 +2025-09-17,0,32.000,0,30.000,0,28.000,31.000 +2025-09-18,0,34.000,0,36.000,0,31.000,35.000 +2025-09-19,0,40.000,0,37.000,0,35.000,38.500 +2025-09-20,0,40.000,0,37.000,0,38.500,38.500 +2025-09-21,0,40.000,0,42.000,0,38.500,41.000 +2025-09-22,0,50.000,0,48.000,0,41.000,49.000 +2025-09-23,0,50.000,0,48.000,0,49.000,49.000 +2025-09-24,0,50.000,0,0,0,49.000,49.000 +2025-09-25,0,50.000,0,48.000,0,49.000,49.000 +2025-09-26,0,45.000,0,48.000,0,49.000,46.500 +2025-09-27,0,45.000,0,48.000,0,46.500,46.500 +2025-09-28,0,45.000,0,48.000,0,46.500,46.500 +2025-09-29,0,45.000,0,48.000,0,46.500,46.500 +2025-09-30,0,45.000,0,48.000,0,46.500,46.500 +2025-10-01,0,45.000,0,48.000,0,46.500,46.500 +2025-10-02,0,40.000,0,48.000,0,46.500,44.000 +2025-10-03,0,40.000,0,48.000,0,44.000,44.000 +2025-10-04,0,40.000,0,48.000,0,44.000,44.000 +2025-10-05,0,40.000,0,48.000,0,44.000,44.000 +2025-10-06,0,40.000,0,46.000,0,44.000,43.000 +2025-10-07,0,40.000,0,44.000,0,43.000,42.000 +2025-10-08,,,0,44.000,0,42.000,44.000 +2025-10-09,0,44.000,0,40.000,0,44.000,42.000 +2025-10-10,0,45.000,0,40.000,0,42.000,42.500 +2025-10-11,0,45.000,0,40.000,0,42.500,42.500 +2025-10-12,0,45.000,0,40.000,0,42.500,42.500 +2025-10-13,0,45.000,0,40.000,0,42.500,42.500 +2025-10-14,0,45.000,0,46.000,0,42.500,45.500 +2025-10-15,0,44.000,0,44.000,0,45.500,44.000 +2025-10-16,0,44.000,0,44.000,0,44.000,44.000 +2025-10-17,0,44.000,0,44.000,0,44.000,44.000 +2025-10-18,0,42.000,0,44.000,0,44.000,43.000 +2025-10-19,0,42.000,0,44.000,0,43.000,43.000 +2025-10-20,0,40.000,0,40.000,0,43.000,40.000 +2025-10-21,0,40.000,0,32.000,0,, +2025-10-22,0,40.000,0,32.000,0,36.000,36.000 +2025-10-23,0,40.000,0,32.000,0,36.000,36.000 +2025-10-24,0,35.000,0,32.000,0,36.000,33.500 +2025-10-25,0,35.000,0,32.000,0,33.500,33.500 +2025-10-26,0,35.000,0,32.000,0,33.500,33.500 +2025-10-27,0,35.000,0,32.000,0,33.500,33.500 +2025-10-28,0,35.000,0,32.000,0,33.500,33.500 +2025-10-29,0,40.000,0,38.000,0,33.500,39.000 +2025-10-30,0,40.000,0,38.000,0,39.000,39.000 +2025-10-31,0,44.000,0,38.000,0,39.000,41.000 +2025-11-01,0,44.000,0,38.000,0,41.000,41.000 diff --git a/api/harga_cabai_rawit_jemberkab_2021-11-01_2025-11-01.csv b/api/harga_cabai_rawit_jemberkab_2021-11-01_2025-11-01.csv new file mode 100644 index 0000000..1556d36 --- /dev/null +++ b/api/harga_cabai_rawit_jemberkab_2021-11-01_2025-11-01.csv @@ -0,0 +1,1463 @@ +Tanggal,Pasar_Tanjung,Pasar_Kreongan,Pasar_Tegal_Besar,Pasar_Mangli,Pasar_Wirolegi,RataRata_Kemarin,RataRata_Sekarang +2021-11-01,12.000,16.000,14.000,0,0,16.333,14.000 +2021-11-02,12.000,17.000,,0,0,14.000,14.333 +2021-11-03,12.000,17.000,14.000,0,0,14.333,14.333 +2021-11-04,15.000,17.000,14.000,0,0,14.333,15.333 +2021-11-05,15.000,17.000,14.000,0,0,15.333,15.333 +2021-11-06,15.000,14.000,14.000,0,0,15.333,14.333 +2021-11-07,15.000,15.000,14.000,0,0,14.333,14.666 +2021-11-08,15.000,16.000,16.000,0,0,14.666,15.666 +2021-11-09,12.000,16.000,16.000,0,0,15.666,14.666 +2021-11-10,12.000,14.000,16.000,0,0,14.666,14.000 +2021-11-11,12.000,13.000,16.000,0,0,14.000,13.666 +2021-11-12,12.000,13.000,16.000,0,0,13.666,13.666 +2021-11-13,12.000,13.000,16.000,0,0,13.666,13.666 +2021-11-14,12.000,13.000,16.000,0,0,13.666,13.666 +2021-11-15,12.000,13.000,16.000,0,0,13.666,13.666 +2021-11-16,12.000,14.000,16.000,0,0,13.666,14.000 +2021-11-17,16.000,14.000,16.000,0,0,14.000,15.333 +2021-11-18,14.000,14.000,16.000,0,0,15.333,14.666 +2021-11-19,14.000,14.000,16.000,0,0,14.666,14.666 +2021-11-20,14.000,18.000,16.000,0,0,14.666,16.000 +2021-11-21,16.000,18.000,16.000,0,0,16.000,16.666 +2021-11-22,18.000,19.000,20.000,0,0,16.666,19.000 +2021-11-23,18.000,20.000,20.000,0,0,19.000,19.333 +2021-11-24,20.000,21.000,25.000,0,0,19.333,22.000 +2021-11-25,20.000,21.000,25.000,0,0,22.000,22.000 +2021-11-26,26.000,27.000,28.000,0,0,22.000,27.000 +2021-11-27,26.000,,,0,0,27.000,27.000 +2021-11-28,26.000,28.000,28.000,0,0,27.000,27.333 +2021-11-29,23.000,30.000,28.000,0,0,27.333,27.000 +2021-11-30,29.000,34.000,35.000,0,0,27.000,32.666 +2021-12-01,30.000,41.000,40.000,0,0,32.666,37.000 +2021-12-02,36.000,41.000,40.000,0,0,37.000,39.000 +2021-12-03,40.000,40.000,45.000,0,0,39.000,41.666 +2021-12-04,40.000,55.000,45.000,0,0,41.666,46.666 +2021-12-05,53.000,55.000,55.000,0,0,46.666,54.333 +2021-12-06,54.000,48.000,55.000,0,0,54.333,52.333 +2021-12-07,45.000,49.000,55.000,0,0,52.333,49.666 +2021-12-08,50.000,49.000,55.000,0,0,49.666,51.333 +2021-12-09,47.000,49.000,55.000,0,0,51.333,50.333 +2021-12-10,47.000,50.000,55.000,0,0,50.333,50.666 +2021-12-11,50.000,50.000,55.000,0,0,50.666,51.666 +2021-12-12,50.000,63.000,55.000,0,0,51.666,56.000 +2021-12-13,70.000,68.000,72.000,0,0,56.000,70.000 +2021-12-14,70.000,75.000,70.000,0,0,70.000,71.666 +2021-12-15,80.000,70.000,70.000,0,0,71.666,73.333 +2021-12-16,75.000,70.000,75.000,0,0,73.333,73.333 +2021-12-17,75.000,70.000,75.000,0,0,73.333,73.333 +2021-12-18,70.000,73.000,75.000,0,0,73.333,72.666 +2021-12-19,70.000,73.000,80.000,0,0,72.666,74.333 +2021-12-20,70.000,75.000,80.000,0,0,74.333,75.000 +2021-12-21,75.000,76.000,80.000,0,0,75.000,77.000 +2021-12-22,75.000,76.000,80.000,0,0,77.000,77.000 +2021-12-23,76.000,76.000,80.000,0,0,77.000,77.333 +2021-12-24,80.000,85.000,80.000,0,0,77.333,81.666 +2021-12-25,84.000,90.000,80.000,0,0,81.666,84.666 +2021-12-26,80.000,75.000,80.000,0,0,84.666,78.333 +2021-12-27,72.000,75.000,80.000,0,0,78.333,75.666 +2021-12-28,72.000,,80.000,0,0,75.666,75.666 +2021-12-29,72.000,66.000,70.000,0,0,75.666,69.333 +2021-12-30,60.000,65.000,70.000,0,0,69.333,65.000 +2021-12-31,60.000,50.000,50.000,0,0,65.000,53.333 +2022-01-01,,55.000,50.000,0,0,53.333,53.333 +2022-01-02,55.000,55.000,50.000,0,0,53.333,53.333 +2022-01-03,60.000,60.000,60.000,0,0,53.333,60.000 +2022-01-04,60.000,55.000,60.000,0,0,60.000,58.333 +2022-01-05,48.000,45.000,60.000,0,0,58.333,51.000 +2022-01-06,45.000,34.000,60.000,0,0,51.000,46.333 +2022-01-07,35.000,34.000,60.000,0,0,46.333,43.000 +2022-01-08,35.000,39.000,50.000,0,0,43.000,41.333 +2022-01-09,35.000,39.000,50.000,0,0,41.333,41.333 +2022-01-10,35.000,38.000,50.000,0,0,41.333,41.000 +2022-01-11,30.000,35.000,40.000,0,0,41.000,35.000 +2022-01-12,30.000,35.000,40.000,0,0,35.000,35.000 +2022-01-13,32.000,35.000,40.000,0,0,35.000,35.666 +2022-01-14,32.000,32.000,40.000,0,0,35.666,34.666 +2022-01-15,32.000,32.000,40.000,0,0,34.666,34.666 +2022-01-16,32.000,32.000,40.000,0,0,34.666,34.666 +2022-01-17,25.000,30.000,35.000,0,0,34.666,30.000 +2022-01-18,30.000,30.000,35.000,0,0,30.000,31.666 +2022-01-19,30.000,30.000,35.000,0,0,31.666,31.666 +2022-01-20,28.000,26.000,35.000,0,0,31.666,29.666 +2022-01-21,22.000,23.000,25.000,0,0,29.666,23.333 +2022-01-22,23.000,23.000,25.000,0,0,23.333,23.666 +2022-01-23,23.000,24.000,25.000,0,0,23.666,24.000 +2022-01-24,24.000,24.000,25.000,0,0,24.000,24.333 +2022-01-25,24.000,22.000,25.000,0,0,24.333,23.666 +2022-01-26,22.000,22.000,25.000,0,0,23.666,23.000 +2022-01-27,22.000,20.000,25.000,0,0,23.000,22.333 +2022-01-28,19.000,23.000,20.000,0,0,22.333,20.666 +2022-01-29,19.000,22.000,20.000,0,0,20.666,20.333 +2022-01-30,19.000,22.000,20.000,0,0,20.333,20.333 +2022-01-31,24.000,24.000,25.000,0,0,20.333,24.333 +2022-02-01,24.000,24.000,25.000,0,0,24.333,24.333 +2022-02-02,22.000,23.000,25.000,0,0,24.333,23.333 +2022-02-03,28.000,30.000,25.000,0,0,23.333,27.666 +2022-02-04,38.000,40.000,40.000,0,0,27.666,39.333 +2022-02-05,38.000,45.000,40.000,0,0,39.333,41.000 +2022-02-06,38.000,45.000,40.000,0,0,41.000,41.000 +2022-02-07,26.000,30.000,30.000,0,0,41.000,28.666 +2022-02-08,28.000,32.000,35.000,0,0,28.666,31.666 +2022-02-09,32.000,34.000,35.000,0,0,31.666,33.666 +2022-02-10,36.000,36.000,35.000,0,0,33.666,35.666 +2022-02-11,30.000,33.000,36.000,0,0,35.666,33.000 +2022-02-12,32.000,36.000,32.000,0,0,33.000,33.333 +2022-02-13,32.000,35.000,32.000,0,0,33.333,33.000 +2022-02-14,35.000,36.000,35.000,0,0,33.000,35.333 +2022-02-15,35.000,40.000,38.000,0,0,35.333,37.666 +2022-02-16,38.000,44.000,40.000,0,0,37.666,40.666 +2022-02-17,41.000,40.000,40.000,0,0,40.666,40.333 +2022-02-18,38.000,38.000,40.000,0,0,40.333,38.666 +2022-02-19,37.000,38.000,40.000,0,0,38.666,38.333 +2022-02-20,35.000,44.000,40.000,0,0,38.333,39.666 +2022-02-21,40.000,44.000,44.000,0,0,39.666,42.666 +2022-02-22,40.000,44.000,45.000,0,0,42.666,43.000 +2022-02-23,42.000,48.000,45.000,0,0,43.000,45.000 +2022-02-24,45.000,48.000,45.000,0,0,45.000,46.000 +2022-02-25,45.000,49.000,45.000,0,0,46.000,46.333 +2022-02-26,45.000,50.000,45.000,0,0,46.333,46.666 +2022-02-27,45.000,54.000,48.000,0,0,46.666,49.000 +2022-02-28,48.000,50.000,48.000,0,0,49.000,48.666 +2022-03-01,58.000,60.000,48.000,0,0,48.666,55.333 +2022-03-02,62.000,60.000,60.000,0,0,55.333,60.666 +2022-03-03,55.000,52.000,60.000,0,0,60.666,55.666 +2022-03-04,52.000,54.000,60.000,0,0,55.666,55.333 +2022-03-05,55.000,58.000,55.000,0,0,55.333,56.000 +2022-03-06,55.000,60.000,55.000,0,0,56.000,56.666 +2022-03-07,60.000,60.000,55.000,0,0,56.666,58.333 +2022-03-08,60.000,60.000,60.000,0,0,58.333,60.000 +2022-03-09,58.000,48.000,60.000,0,0,60.000,55.333 +2022-03-10,40.000,39.000,50.000,0,0,55.333,43.000 +2022-03-11,40.000,47.000,45.000,0,0,43.000,44.000 +2022-03-12,45.000,50.000,45.000,0,0,44.000,46.666 +2022-03-13,45.000,45.000,55.000,0,0,46.666,48.333 +2022-03-14,48.000,40.000,55.000,0,0,48.333,47.666 +2022-03-15,40.000,42.000,50.000,0,0,47.666,44.000 +2022-03-16,40.000,45.000,45.000,0,0,44.000,43.333 +2022-03-17,39.000,46.000,45.000,0,0,43.333,43.333 +2022-03-18,43.000,46.000,45.000,0,0,43.333,44.666 +2022-03-19,43.000,50.000,50.000,0,0,44.666,47.666 +2022-03-20,43.000,50.000,50.000,0,0,47.666,47.666 +2022-03-21,50.000,40.000,50.000,0,0,47.666,46.666 +2022-03-22,40.000,40.000,50.000,0,0,46.666,43.333 +2022-03-23,40.000,41.000,40.000,0,0,43.333,40.333 +2022-03-24,40.000,41.000,45.000,0,0,40.333,42.000 +2022-03-25,39.000,40.000,45.000,0,0,42.000,41.333 +2022-03-26,39.000,40.000,45.000,0,0,41.333,41.333 +2022-03-27,39.000,40.000,45.000,0,0,41.333,41.333 +2022-03-28,39.000,47.000,45.000,0,0,41.333,43.666 +2022-03-29,40.000,40.000,40.000,0,0,43.666,40.000 +2022-03-30,42.000,40.000,40.000,0,0,40.000,40.666 +2022-03-31,42.000,40.000,35.000,0,0,40.666,39.000 +2022-04-01,36.000,38.000,35.000,0,0,39.000,36.333 +2022-04-02,36.000,38.000,35.000,0,0,36.333,36.333 +2022-04-03,36.000,38.000,35.000,0,0,36.333,36.333 +2022-04-04,34.000,30.000,35.000,0,0,36.333,33.000 +2022-04-05,34.000,43.000,50.000,0,0,33.000,42.333 +2022-04-06,36.000,38.000,50.000,0,0,42.333,41.333 +2022-04-07,38.000,25.000,50.000,0,0,41.333,37.666 +2022-04-08,28.000,25.000,40.000,0,0,37.666,31.000 +2022-04-09,24.000,25.000,40.000,0,0,31.000,29.666 +2022-04-10,24.000,25.000,30.000,0,0,29.666,26.333 +2022-04-11,26.000,25.000,30.000,0,0,26.333,27.000 +2022-04-12,22.000,25.000,30.000,0,0,27.000,25.666 +2022-04-13,21.000,25.000,30.000,0,0,25.666,25.333 +2022-04-14,23.000,24.000,25.000,0,0,25.333,24.000 +2022-04-15,22.000,24.000,25.000,0,0,24.000,23.666 +2022-04-16,22.000,25.000,25.000,0,0,23.666,24.000 +2022-04-17,24.000,20.000,25.000,0,0,24.000,23.000 +2022-04-18,22.000,25.000,25.000,0,0,23.000,24.000 +2022-04-19,21.000,25.000,25.000,0,0,24.000,23.666 +2022-04-20,20.000,20.000,25.000,0,0,23.666,21.666 +2022-04-21,21.000,20.000,25.000,0,0,21.666,22.000 +2022-04-22,22.000,18.000,24.000,0,0,22.000,21.333 +2022-04-23,24.000,18.000,24.000,0,0,21.333,22.000 +2022-04-24,19.000,24.000,24.000,0,0,22.000,22.333 +2022-04-25,20.000,22.000,24.000,0,0,22.333,22.000 +2022-04-26,22.000,25.000,26.000,0,0,22.000,24.333 +2022-04-27,28.000,28.000,28.000,0,0,24.333,28.000 +2022-04-28,26.000,28.000,28.000,0,0,28.000,27.333 +2022-04-29,24.000,24.000,25.000,0,0,27.333,24.333 +2022-04-30,24.000,23.000,25.000,0,0,24.333,24.000 +2022-05-01,24.000,25.000,25.000,0,0,24.000,24.666 +2022-05-02,24.000,25.000,25.000,0,0,24.666,24.666 +2022-05-03,24.000,25.000,25.000,0,0,24.666,24.666 +2022-05-04,24.000,25.000,25.000,0,0,24.666,24.666 +2022-05-05,24.000,24.000,25.000,0,0,24.666,24.333 +2022-05-06,24.000,24.000,25.000,0,0,24.333,24.333 +2022-05-07,24.000,24.000,25.000,0,0,24.333,24.333 +2022-05-08,25.000,24.000,25.000,0,0,24.333,24.666 +2022-05-09,24.000,24.000,25.000,0,0,24.666,24.333 +2022-05-10,24.000,28.000,25.000,0,0,24.333,25.666 +2022-05-11,24.000,25.000,25.000,0,0,25.666,24.666 +2022-05-12,24.000,20.000,25.000,0,0,24.666,23.000 +2022-05-13,22.000,20.000,25.000,0,0,23.000,22.333 +2022-05-14,22.000,20.000,,0,0,22.333,22.333 +2022-05-15,22.000,20.000,25.000,0,0,22.333,22.333 +2022-05-16,22.000,20.000,25.000,0,0,22.333,22.333 +2022-05-17,36.000,20.000,40.000,0,0,22.333,32.000 +2022-05-18,36.000,20.000,40.000,0,0,32.000,32.000 +2022-05-19,40.000,36.000,45.000,0,0,32.000,40.333 +2022-05-20,40.000,43.000,45.000,0,0,40.333,42.666 +2022-05-21,43.000,43.000,45.000,0,0,42.666,43.666 +2022-05-22,43.000,43.000,45.000,0,0,43.666,43.666 +2022-05-23,43.000,40.000,40.000,0,0,43.666,41.000 +2022-05-24,40.000,44.000,45.000,0,0,41.000,43.000 +2022-05-25,38.000,56.000,60.000,0,0,43.000,51.333 +2022-05-26,55.000,56.000,60.000,0,0,51.333,57.000 +2022-05-27,45.000,44.000,50.000,0,0,57.000,46.333 +2022-05-28,45.000,44.000,50.000,0,0,46.333,46.333 +2022-05-29,43.000,44.000,50.000,0,0,, +2022-05-30,64.000,60.000,50.000,0,0,45.666,58.000 +2022-05-31,64.000,62.000,65.000,0,0,58.000,63.666 +2022-06-01,64.000,68.000,65.000,0,0,63.666,65.666 +2022-06-02,52.000,62.000,55.000,0,0,65.666,56.333 +2022-06-03,55.000,68.000,75.000,0,0,56.333,66.000 +2022-06-04,80.000,82.000,90.000,0,0,66.000,84.000 +2022-06-05,80.000,82.000,90.000,0,0,84.000,84.000 +2022-06-06,82.000,80.000,80.000,0,0,84.000,80.666 +2022-06-07,85.000,80.000,80.000,0,0,80.666,81.666 +2022-06-08,72.000,85.000,80.000,0,0,81.666,79.000 +2022-06-09,80.000,85.000,80.000,0,0,79.000,81.666 +2022-06-10,85.000,80.000,80.000,0,0,81.666,81.666 +2022-06-11,87.000,80.000,80.000,0,0,81.666,82.333 +2022-06-12,90.000,80.000,80.000,0,0,82.333,83.333 +2022-06-13,80.000,82.000,80.000,0,0,83.333,80.666 +2022-06-14,80.000,86.000,85.000,0,0,80.666,83.666 +2022-06-15,85.000,88.000,85.000,0,0,83.666,86.000 +2022-06-16,85.000,84.000,85.000,0,0,86.000,84.666 +2022-06-17,80.000,85.000,85.000,0,0,84.666,83.333 +2022-06-18,80.000,85.000,85.000,0,0,83.333,83.333 +2022-06-19,85.000,85.000,85.000,0,0,83.333,85.000 +2022-06-20,80.000,90.000,90.000,0,0,85.000,86.666 +2022-06-21,90.000,96.000,90.000,0,0,86.666,92.000 +2022-06-22,92.000,96.000,90.000,0,0,92.000,92.666 +2022-06-23,95.000,96.000,90.000,0,0,92.666,93.666 +2022-06-24,94.000,96.000,90.000,0,0,93.666,93.333 +2022-06-25,90.000,96.000,85.000,0,0,93.333,90.333 +2022-06-26,90.000,95.000,100.000,0,0,90.333,95.000 +2022-06-27,90.000,95.000,90.000,0,0,95.000,91.666 +2022-06-28,95.000,95.000,90.000,0,0,91.666,93.333 +2022-06-29,95.000,95.000,90.000,0,0,93.333,93.333 +2022-06-30,97.000,95.000,90.000,0,0,93.333,94.000 +2022-07-01,97.000,90.000,90.000,0,0,94.000,92.333 +2022-07-02,95.000,98.000,90.000,0,0,92.333,94.333 +2022-07-03,95.000,98.000,90.000,0,0,94.333,94.333 +2022-07-04,98.000,96.000,100.000,0,0,94.333,98.000 +2022-07-05,100.000,96.000,100.000,0,0,98.000,98.666 +2022-07-06,100.000,97.000,100.000,0,0,98.666,99.000 +2022-07-07,94.000,90.000,100.000,0,0,99.000,94.666 +2022-07-08,90.000,90.000,100.000,0,0,94.666,93.333 +2022-07-09,85.000,80.000,80.000,0,0,93.333,81.666 +2022-07-10,85.000,80.000,80.000,0,0,81.666,81.666 +2022-07-11,90.000,92.000,80.000,0,0,81.666,87.333 +2022-07-12,85.000,90.000,90.000,0,0,87.333,88.333 +2022-07-13,90.000,90.000,90.000,0,0,88.333,90.000 +2022-07-14,90.000,75.000,75.000,0,0,90.000,80.000 +2022-07-15,85.000,75.000,75.000,0,0,80.000,78.333 +2022-07-16,70.000,75.000,75.000,0,0,78.333,73.333 +2022-07-17,70.000,75.000,75.000,0,0,73.333,73.333 +2022-07-18,70.000,66.000,75.000,0,0,73.333,70.333 +2022-07-19,65.000,66.000,75.000,0,0,70.333,68.666 +2022-07-20,63.000,66.000,75.000,0,0,68.666,68.000 +2022-07-21,63.000,66.000,75.000,0,0,68.000,68.000 +2022-07-22,60.000,65.000,60.000,0,0,68.000,61.666 +2022-07-23,62.000,64.000,60.000,0,0,61.666,62.000 +2022-07-24,62.000,64.000,60.000,0,0,62.000,62.000 +2022-07-25,60.000,55.000,60.000,0,0,62.000,58.333 +2022-07-26,55.000,60.000,60.000,0,0,58.333,58.333 +2022-07-27,55.000,60.000,60.000,0,0,58.333,58.333 +2022-07-28,55.000,60.000,60.000,0,0,58.333,58.333 +2022-07-29,55.000,60.000,60.000,0,0,58.333,58.333 +2022-07-30,55.000,62.000,60.000,0,0,58.333,59.000 +2022-07-31,57.000,62.000,60.000,0,0,59.000,59.666 +2022-08-01,50.000,64.000,60.000,0,0,59.666,58.000 +2022-08-02,53.000,60.000,60.000,0,0,58.000,57.666 +2022-08-03,55.000,60.000,60.000,0,0,57.666,58.333 +2022-08-04,52.000,60.000,60.000,0,0,58.333,57.333 +2022-08-05,50.000,60.000,60.000,0,0,57.333,56.666 +2022-08-06,50.000,54.000,60.000,0,0,56.666,54.666 +2022-08-07,50.000,54.000,60.000,0,0,54.666,54.666 +2022-08-08,50.000,50.000,60.000,0,0,54.666,53.333 +2022-08-09,50.000,50.000,60.000,0,0,53.333,53.333 +2022-08-10,50.000,50.000,55.000,0,0,, +2022-08-11,50.000,46.000,55.000,0,0,51.666,50.333 +2022-08-12,48.000,38.000,40.000,0,0,50.333,42.000 +2022-08-13,40.000,35.000,40.000,0,0,42.000,38.333 +2022-08-14,40.000,35.000,40.000,0,0,38.333,38.333 +2022-08-15,33.000,35.000,35.000,0,0,38.333,34.333 +2022-08-16,30.000,35.000,40.000,0,0,34.333,35.000 +2022-08-17,32.000,35.000,40.000,0,0,35.000,35.666 +2022-08-18,34.000,35.000,40.000,0,0,35.666,36.333 +2022-08-19,34.000,35.000,40.000,0,0,36.333,36.333 +2022-08-20,35.000,35.000,40.000,0,0,36.333,36.666 +2022-08-21,34.000,35.000,40.000,0,0,36.666,36.333 +2022-08-22,30.000,30.000,35.000,0,0,, +2022-08-23,,30.000,35.000,0,,0,0 +2022-08-24,,,30.000,,,31.666,31.666 +2022-08-25,30.000,32.000,35.000,0,0,31.666,32.333 +2022-08-26,30.000,32.000,35.000,0,0,32.333,32.333 +2022-08-27,30.000,32.000,35.000,0,0,32.333,32.333 +2022-08-28,30.000,32.000,35.000,0,0,32.333,32.333 +2022-08-29,32.000,32.000,35.000,0,0,32.333,33.000 +2022-08-30,36.000,40.000,45.000,0,0,33.000,40.333 +2022-08-31,32.000,44.000,45.000,0,0,40.333,40.333 +2022-09-01,33.000,45.000,50.000,0,0,40.333,42.666 +2022-09-02,40.000,45.000,48.000,0,0,42.666,44.333 +2022-09-03,44.000,45.000,48.000,0,0,44.333,45.666 +2022-09-04,44.000,45.000,48.000,0,0,45.666,45.666 +2022-09-05,49.000,50.000,48.000,0,0,45.666,49.000 +2022-09-06,45.000,52.000,60.000,0,0,49.000,52.333 +2022-09-07,49.000,52.000,60.000,0,0,52.333,53.666 +2022-09-08,50.000,52.000,55.000,0,0,53.666,52.333 +2022-09-09,50.000,45.000,40.000,0,0,52.333,45.000 +2022-09-10,50.000,40.000,40.000,0,0,45.000,43.333 +2022-09-11,50.000,40.000,40.000,0,0,43.333,43.333 +2022-09-12,48.000,44.000,55.000,0,0,43.333,49.000 +2022-09-13,45.000,52.000,55.000,0,0,49.000,50.666 +2022-09-14,48.000,52.000,50.000,0,0,50.666,50.000 +2022-09-15,52.000,48.000,50.000,0,0,50.000,50.000 +2022-09-16,48.000,55.000,60.000,0,0,50.000,54.333 +2022-09-17,70.000,70.000,70.000,0,0,54.333,70.000 +2022-09-18,65.000,65.000,70.000,0,0,70.000,66.666 +2022-09-19,65.000,60.000,60.000,0,0,66.666,61.666 +2022-09-20,60.000,58.000,60.000,0,0,61.666,59.333 +2022-09-21,52.000,58.000,55.000,0,0,59.333,55.000 +2022-09-22,52.000,55.000,55.000,0,0,55.000,54.000 +2022-09-23,54.000,55.000,55.000,0,0,54.000,54.666 +2022-09-24,54.000,50.000,55.000,0,0,54.666,53.000 +2022-09-25,54.000,50.000,55.000,0,0,53.000,53.000 +2022-09-26,48.000,50.000,50.000,0,0,53.000,49.333 +2022-09-27,48.000,50.000,50.000,0,0,49.333,49.333 +2022-09-28,48.000,50.000,50.000,0,0,49.333,49.333 +2022-09-29,50.000,50.000,50.000,0,0,49.333,50.000 +2022-09-30,50.000,52.000,50.000,0,0,50.000,50.666 +2022-10-01,50.000,52.000,50.000,50.000,48.000,50.666,50.000 +2022-10-02,,,50.000,50.000,48.000,50.000,50.000 +2022-10-03,50.000,50.000,50.000,50.000,45.000,50.000,49.000 +2022-10-04,50.000,45.000,50.000,48.000,45.000,49.000,47.600 +2022-10-05,44.000,45.000,50.000,44.000,40.000,47.600,44.600 +2022-10-06,45.000,45.000,50.000,44.000,32.000,44.600,43.200 +2022-10-07,40.000,40.000,40.000,34.000,30.000,43.200,36.800 +2022-10-08,38.000,40.000,35.000,32.000,30.000,36.800,35.000 +2022-10-09,38.000,35.000,35.000,32.000,30.000,35.000,34.000 +2022-10-10,35.000,40.000,35.000,32.000,32.000,34.000,34.800 +2022-10-11,35.000,40.000,35.000,34.000,33.000,34.800,35.400 +2022-10-12,34.000,40.000,35.000,36.000,32.000,35.400,35.400 +2022-10-13,36.000,40.000,35.000,34.000,35.000,35.400,36.000 +2022-10-14,36.000,40.000,35.000,36.000,32.000,36.000,35.800 +2022-10-15,32.000,40.000,35.000,32.000,32.000,35.800,34.200 +2022-10-16,32.000,40.000,35.000,32.000,32.000,34.200,34.200 +2022-10-17,30.000,40.000,35.000,32.000,32.000,34.200,33.800 +2022-10-18,30.000,35.000,35.000,32.000,30.000,33.800,32.400 +2022-10-19,32.000,35.000,35.000,32.000,30.000,32.400,32.800 +2022-10-20,35.000,35.000,35.000,30.000,34.000,32.800,33.800 +2022-10-21,34.000,35.000,32.000,30.000,30.000,33.800,32.200 +2022-10-22,32.000,30.000,32.000,30.000,30.000,32.200,30.800 +2022-10-23,32.000,30.000,32.000,30.000,30.000,30.800,30.800 +2022-10-24,29.000,30.000,32.000,30.000,28.000,30.800,29.800 +2022-10-25,26.000,28.000,32.000,32.000,28.000,29.800,29.200 +2022-10-26,27.000,32.000,32.000,32.000,28.000,29.200,30.200 +2022-10-27,29.000,30.000,32.000,28.000,28.000,30.200,29.400 +2022-10-28,29.000,30.000,28.000,26.000,25.000,29.400,27.600 +2022-10-29,20.000,26.000,28.000,20.000,28.000,27.600,24.400 +2022-10-30,20.000,24.000,30.000,20.000,30.000,24.400,24.800 +2022-10-31,21.000,22.000,28.000,20.000,22.000,24.800,22.600 +2022-11-01,19.000,22.000,28.000,24.000,18.000,22.600,22.200 +2022-11-02,19.000,22.000,28.000,20.000,18.000,22.200,21.400 +2022-11-03,20.000,20.000,20.000,20.000,16.000,21.400,19.200 +2022-11-04,20.000,20.000,24.000,24.000,22.000,19.200,22.000 +2022-11-05,19.000,30.000,24.000,28.000,22.000,22.000,24.600 +2022-11-06,25.000,26.000,24.000,28.000,24.000,24.600,25.400 +2022-11-07,20.000,26.000,24.000,28.000,20.000,25.400,23.600 +2022-11-08,20.000,26.000,25.000,24.000,20.000,23.600,23.000 +2022-11-09,19.000,24.000,25.000,22.000,20.000,23.000,22.000 +2022-11-10,20.000,24.000,25.000,20.000,20.000,22.000,21.800 +2022-11-11,19.000,24.000,25.000,22.000,20.000,21.800,22.000 +2022-11-12,23.000,24.000,25.000,22.000,20.000,22.000,22.800 +2022-11-13,20.000,24.000,25.000,22.000,20.000,22.800,22.200 +2022-11-14,21.000,24.000,25.000,24.000,20.000,22.200,22.800 +2022-11-15,21.000,24.000,25.000,24.000,22.000,22.800,23.200 +2022-11-16,22.000,26.000,25.000,30.000,28.000,23.200,26.200 +2022-11-17,24.000,28.000,25.000,28.000,28.000,26.200,26.600 +2022-11-18,26.000,28.000,30.000,30.000,30.000,26.600,28.800 +2022-11-19,29.000,32.000,30.000,28.000,30.000,28.800,29.800 +2022-11-20,30.000,32.000,30.000,28.000,32.000,29.800,30.400 +2022-11-21,32.000,30.000,30.000,30.000,28.000,30.400,30.000 +2022-11-22,32.000,30.000,30.000,26.000,28.000,30.000,29.200 +2022-11-23,32.000,28.000,30.000,28.000,24.000,29.200,28.400 +2022-11-24,27.000,28.000,30.000,26.000,25.000,28.400,27.200 +2022-11-25,26.000,28.000,30.000,25.000,25.000,27.200,26.800 +2022-11-26,26.000,28.000,30.000,24.000,24.000,26.800,26.400 +2022-11-27,24.000,28.000,30.000,24.000,23.000,26.400,25.800 +2022-11-28,27.000,28.000,30.000,24.000,24.000,25.800,26.600 +2022-11-29,27.000,28.000,30.000,28.000,26.000,26.600,27.800 +2022-11-30,30.000,30.000,30.000,28.000,28.000,27.800,29.200 +2022-12-01,28.000,30.000,35.000,30.000,30.000,29.200,30.600 +2022-12-02,27.000,30.000,30.000,32.000,28.000,30.600,29.400 +2022-12-03,28.000,30.000,35.000,34.000,33.000,29.400,32.000 +2022-12-04,30.000,38.000,35.000,34.000,37.000,32.000,34.800 +2022-12-05,35.000,38.000,38.000,40.000,37.000,34.800,37.600 +2022-12-06,42.000,38.000,42.000,42.000,46.000,37.600,42.000 +2022-12-07,45.000,45.000,42.000,44.000,42.000,42.000,43.600 +2022-12-08,42.000,40.000,40.000,40.000,40.000,43.600,40.400 +2022-12-09,40.000,38.000,40.000,38.000,38.000,40.400,38.800 +2022-12-10,40.000,34.000,40.000,36.000,38.000,38.800,37.600 +2022-12-11,40.000,34.000,40.000,36.000,40.000,37.600,38.000 +2022-12-12,30.000,34.000,42.000,36.000,34.000,38.000,35.200 +2022-12-13,30.000,34.000,42.000,34.000,30.000,35.200,34.000 +2022-12-14,35.000,28.000,35.000,29.000,28.000,34.000,31.000 +2022-12-15,26.000,28.000,35.000,28.000,26.000,31.000,28.600 +2022-12-16,27.000,25.000,28.000,25.000,22.000,, +2022-12-17,27.000,25.000,28.000,25.000,28.000,25.400,26.600 +2022-12-18,25.000,30.000,28.000,25.000,32.000,26.600,28.000 +2022-12-19,28.000,30.000,35.000,30.000,32.000,28.000,31.000 +2022-12-20,30.000,30.000,35.000,30.000,30.000,31.000,31.000 +2022-12-21,30.000,30.000,32.000,29.000,28.000,31.000,29.800 +2022-12-22,30.000,28.000,32.000,32.000,28.000,29.800,30.000 +2022-12-23,31.000,30.000,32.000,36.000,34.000,30.000,32.600 +2022-12-24,30.000,45.000,32.000,46.000,43.000,32.600,39.200 +2022-12-25,42.000,45.000,32.000,46.000,44.000,39.200,41.800 +2022-12-26,43.000,40.000,45.000,44.000,44.000,41.800,43.200 +2022-12-27,40.000,40.000,45.000,44.000,40.000,43.200,41.800 +2022-12-28,43.000,44.000,45.000,46.000,46.000,41.800,44.800 +2022-12-29,45.000,47.000,45.000,46.000,45.000,44.800,45.600 +2022-12-30,47.000,47.000,45.000,46.000,45.000,45.600,46.000 +2022-12-31,54.000,47.000,50.000,54.000,60.000,46.000,53.000 +2023-01-01,50.000,58.000,50.000,54.000,60.000,53.000,54.400 +2023-01-02,58.000,58.000,65.000,66.000,65.000,54.400,62.400 +2023-01-03,63.000,64.000,65.000,56.000,65.000,62.400,62.600 +2023-01-04,68.000,60.000,65.000,50.000,55.000,62.600,59.600 +2023-01-05,68.000,48.000,50.000,47.000,55.000,59.600,53.600 +2023-01-06,45.000,48.000,58.000,66.000,60.000,53.600,55.400 +2023-01-07,50.000,64.000,65.000,64.000,60.000,55.400,60.600 +2023-01-08,60.000,64.000,65.000,56.000,56.000,60.600,60.200 +2023-01-09,58.000,48.000,65.000,54.000,52.000,60.200,55.400 +2023-01-10,40.000,48.000,50.000,46.000,40.000,55.400,44.800 +2023-01-11,50.000,48.000,50.000,46.000,45.000,44.800,47.800 +2023-01-12,47.000,48.000,50.000,46.000,45.000,47.800,47.200 +2023-01-13,47.000,44.000,45.000,46.000,50.000,47.200,46.400 +2023-01-14,45.000,42.000,45.000,42.000,37.000,46.400,42.200 +2023-01-15,42.000,38.000,45.000,40.000,37.000,42.200,40.400 +2023-01-16,40.000,32.000,45.000,40.000,40.000,, +2023-01-17,40.000,38.000,43.000,40.000,40.000,39.400,40.200 +2023-01-18,40.000,40.000,43.000,50.000,50.000,40.200,44.600 +2023-01-19,45.000,42.000,43.000,46.000,48.000,44.600,44.800 +2023-01-20,42.000,42.000,43.000,46.000,48.000,44.800,44.200 +2023-01-21,42.000,42.000,43.000,40.000,38.000,44.200,41.000 +2023-01-22,40.000,,43.000,42.000,36.000,41.000,40.600 +2023-01-23,40.000,48.000,43.000,42.000,52.000,40.600,45.000 +2023-01-24,40.000,50.000,40.000,52.000,52.000,45.000,46.800 +2023-01-25,45.000,50.000,50.000,46.000,42.000,46.800,46.600 +2023-01-26,45.000,48.000,50.000,46.000,50.000,46.600,47.800 +2023-01-27,50.000,48.000,50.000,52.000,54.000,47.800,50.800 +2023-01-28,50.000,50.000,45.000,52.000,54.000,50.800,50.200 +2023-01-29,48.000,50.000,45.000,52.000,54.000,50.200,49.800 +2023-01-30,52.000,54.000,45.000,48.000,50.000,49.800,49.800 +2023-01-31,52.000,54.000,45.000,48.000,50.000,49.800,49.800 +2023-02-01,47.000,45.000,45.000,45.000,50.000,49.800,46.400 +2023-02-02,45.000,45.000,45.000,44.000,48.000,46.400,45.400 +2023-02-03,48.000,48.000,45.000,48.000,50.000,45.400,47.800 +2023-02-04,50.000,48.000,45.000,48.000,54.000,47.800,49.000 +2023-02-05,50.000,54.000,45.000,54.000,54.000,49.000,51.400 +2023-02-06,53.000,54.000,55.000,54.000,60.000,51.400,55.200 +2023-02-07,53.000,55.000,55.000,56.000,60.000,55.200,55.800 +2023-02-08,55.000,54.000,55.000,56.000,58.000,55.800,55.600 +2023-02-09,55.000,54.000,55.000,58.000,60.000,55.600,56.400 +2023-02-10,55.000,54.000,55.000,60.000,60.000,56.400,56.800 +2023-02-11,55.000,64.000,65.000,66.000,64.000,56.800,62.800 +2023-02-12,60.000,64.000,65.000,64.000,64.000,62.800,63.400 +2023-02-13,64.000,60.000,65.000,62.000,60.000,63.400,62.200 +2023-02-14,64.000,60.000,60.000,62.000,58.000,62.200,60.800 +2023-02-15,60.000,60.000,60.000,64.000,60.000,60.800,60.800 +2023-02-16,60.000,60.000,55.000,68.000,65.000,60.800,61.600 +2023-02-17,60.000,60.000,55.000,68.000,60.000,61.600,60.600 +2023-02-18,65.000,60.000,65.000,64.000,60.000,60.600,62.800 +2023-02-19,65.000,60.000,65.000,64.000,60.000,62.800,62.800 +2023-02-20,67.000,60.000,60.000,60.000,60.000,62.800,61.400 +2023-02-21,59.000,56.000,60.000,68.000,60.000,61.400,60.600 +2023-02-22,58.000,56.000,60.000,64.000,60.000,60.600,59.600 +2023-02-23,59.000,56.000,60.000,62.000,60.000,59.600,59.400 +2023-02-24,59.000,55.000,60.000,60.000,60.000,59.400,58.800 +2023-02-25,59.000,55.000,60.000,60.000,60.000,58.800,58.800 +2023-02-26,59.000,55.000,60.000,60.000,60.000,58.800,58.800 +2023-02-27,55.000,55.000,55.000,55.000,55.000,58.800,55.000 +2023-02-28,53.000,52.000,55.000,60.000,58.000,55.000,55.600 +2023-03-01,53.000,52.000,55.000,62.000,55.000,55.600,55.400 +2023-03-02,50.000,55.000,60.000,62.000,55.000,55.400,56.400 +2023-03-03,58.000,60.000,60.000,68.000,64.000,56.400,62.000 +2023-03-04,64.000,68.000,65.000,68.000,72.000,62.000,67.400 +2023-03-05,67.000,68.000,75.000,68.000,72.000,67.400,70.000 +2023-03-06,65.000,75.000,75.000,74.000,75.000,70.000,72.800 +2023-03-07,70.000,75.000,75.000,75.000,75.000,72.800,74.000 +2023-03-08,72.000,75.000,70.000,75.000,74.000,74.000,73.200 +2023-03-09,74.000,75.000,70.000,75.000,64.000,73.200,71.600 +2023-03-10,74.000,72.000,70.000,76.000,66.000,71.600,71.600 +2023-03-11,70.000,72.000,70.000,76.000,74.000,71.600,72.400 +2023-03-12,75.000,80.000,70.000,76.000,74.000,72.400,75.000 +2023-03-13,75.000,80.000,75.000,76.000,75.000,75.000,76.200 +2023-03-14,76.000,75.000,75.000,76.000,75.000,76.200,75.400 +2023-03-15,76.000,75.000,75.000,76.000,75.000,75.400,75.400 +2023-03-16,74.000,75.000,75.000,80.000,75.000,75.400,75.800 +2023-03-17,78.000,80.000,75.000,78.000,80.000,75.800,78.200 +2023-03-18,80.000,80.000,75.000,78.000,80.000,78.200,78.600 +2023-03-19,80.000,80.000,75.000,78.000,80.000,78.600,78.600 +2023-03-20,80.000,80.000,80.000,76.000,76.000,78.600,78.400 +2023-03-21,78.000,80.000,80.000,76.000,76.000,78.400,78.000 +2023-03-22,78.000,75.000,80.000,70.000,72.000,78.000,75.000 +2023-03-23,70.000,75.000,80.000,70.000,72.000,75.000,73.400 +2023-03-24,71.000,72.000,80.000,84.000,80.000,73.400,77.400 +2023-03-25,70.000,72.000,80.000,78.000,76.000,77.400,75.200 +2023-03-26,70.000,72.000,80.000,78.000,76.000,, +2023-03-27,60.000,52.000,70.000,52.000,60.000,75.200,58.800 +2023-03-28,52.000,52.000,70.000,32.000,58.000,58.800,52.800 +2023-03-29,30.000,30.000,55.000,46.000,45.000,52.800,41.200 +2023-03-30,38.000,40.000,45.000,56.000,45.000,41.200,44.800 +2023-03-31,48.000,52.000,35.000,44.000,46.000,44.800,45.000 +2023-04-01,45.000,38.000,45.000,44.000,40.000,45.000,42.400 +2023-04-02,45.000,30.000,45.000,40.000,40.000,, +2023-04-03,40.000,40.000,35.000,40.000,40.000,40.000,39.000 +2023-04-04,35.000,40.000,35.000,34.000,36.000,39.000,36.000 +2023-04-05,34.000,35.000,35.000,32.000,35.000,36.000,34.200 +2023-04-06,32.000,30.000,35.000,32.000,30.000,34.200,31.800 +2023-04-07,30.000,32.000,35.000,30.000,28.000,31.800,31.000 +2023-04-08,30.000,28.000,35.000,30.000,30.000,31.000,30.600 +2023-04-09,28.000,28.000,35.000,28.000,30.000,30.600,29.800 +2023-04-10,28.000,28.000,30.000,28.000,29.000,29.800,28.600 +2023-04-11,26.000,26.000,30.000,27.000,24.000,28.600,26.600 +2023-04-12,26.000,26.000,30.000,25.000,28.000,26.600,27.000 +2023-04-13,26.000,25.000,28.000,26.000,26.000,27.000,26.200 +2023-04-14,28.000,30.000,28.000,28.000,28.000,26.200,28.400 +2023-04-15,28.000,30.000,28.000,28.000,28.000,28.400,28.400 +2023-04-16,28.000,30.000,28.000,28.000,28.000,28.400,28.400 +2023-04-17,28.000,27.000,27.000,28.000,28.000,28.400,27.600 +2023-04-18,28.000,24.000,27.000,34.000,28.000,27.600,28.200 +2023-04-19,28.000,32.000,28.000,34.000,26.000,28.200,29.600 +2023-04-20,34.000,32.000,30.000,26.000,30.000,29.600,30.400 +2023-04-21,30.000,30.000,30.000,30.000,35.000,30.400,31.000 +2023-04-22,30.000,30.000,30.000,30.000,35.000,31.000,31.000 +2023-04-23,30.000,42.000,30.000,30.000,35.000,31.000,33.400 +2023-04-24,30.000,35.000,30.000,38.000,35.000,33.400,33.600 +2023-04-25,30.000,28.000,30.000,35.000,20.000,33.600,28.600 +2023-04-26,30.000,28.000,25.000,20.000,,28.600,24.600 +2023-04-27,20.000,25.000,25.000,16.000,20.000,24.600,21.200 +2023-04-28,20.000,20.000,25.000,18.000,18.000,21.200,20.200 +2023-04-29,18.000,20.000,25.000,18.000,18.000,20.200,19.800 +2023-04-30,18.000,20.000,25.000,18.000,18.000,19.800,19.800 +2023-05-01,20.000,25.000,25.000,25.000,17.000,19.800,22.400 +2023-05-02,21.000,22.000,25.000,22.000,20.000,22.400,22.000 +2023-05-03,19.000,22.000,25.000,22.000,20.000,22.000,21.600 +2023-05-04,20.000,22.000,25.000,22.000,20.000,21.600,21.800 +2023-05-05,20.000,22.000,25.000,22.000,22.000,21.800,22.200 +2023-05-06,20.000,20.000,25.000,22.000,18.000,22.200,21.000 +2023-05-07,20.000,20.000,25.000,22.000,18.000,21.000,21.000 +2023-05-08,23.000,20.000,25.000,24.000,24.000,21.000,23.200 +2023-05-09,23.000,24.000,25.000,28.000,24.000,23.200,24.800 +2023-05-10,27.000,24.000,25.000,28.000,25.000,24.800,25.800 +2023-05-11,27.000,28.000,25.000,28.000,25.000,25.800,26.600 +2023-05-12,27.000,25.000,30.000,24.000,24.000,26.600,26.000 +2023-05-13,25.000,25.000,30.000,24.000,24.000,26.000,25.600 +2023-05-14,25.000,25.000,30.000,24.000,24.000,25.600,25.600 +2023-05-15,27.000,25.000,28.000,26.000,24.000,25.600,26.000 +2023-05-16,27.000,25.000,28.000,32.000,28.000,26.000,28.000 +2023-05-17,28.000,30.000,30.000,30.000,28.000,28.000,29.200 +2023-05-18,28.000,30.000,30.000,28.000,28.000,29.200,28.800 +2023-05-19,27.000,28.000,30.000,32.000,30.000,28.800,29.400 +2023-05-20,27.000,28.000,30.000,35.000,35.000,29.400,31.000 +2023-05-21,30.000,28.000,30.000,35.000,35.000,31.000,31.600 +2023-05-22,28.000,35.000,35.000,35.000,40.000,31.600,34.600 +2023-05-23,33.000,35.000,35.000,34.000,38.000,34.600,35.000 +2023-05-24,33.000,35.000,35.000,32.000,36.000,35.000,34.200 +2023-05-25,31.000,32.000,35.000,34.000,36.000,34.200,33.600 +2023-05-26,32.000,32.000,30.000,38.000,36.000,33.600,33.600 +2023-05-27,35.000,36.000,30.000,42.000,40.000,33.600,36.600 +2023-05-28,37.000,40.000,30.000,42.000,40.000,36.600,37.800 +2023-05-29,34.000,32.000,30.000,32.000,35.000,37.800,32.600 +2023-05-30,29.000,30.000,30.000,36.000,36.000,32.600,32.200 +2023-05-31,29.000,34.000,38.000,36.000,36.000,32.200,34.600 +2023-06-01,32.000,36.000,38.000,36.000,36.000,34.600,35.600 +2023-06-02,32.000,36.000,38.000,36.000,36.000,35.600,35.600 +2023-06-03,34.000,36.000,38.000,40.000,36.000,35.600,36.800 +2023-06-04,34.000,36.000,38.000,40.000,35.000,36.800,36.600 +2023-06-05,37.000,32.000,32.000,34.000,32.000,36.600,33.400 +2023-06-06,31.000,32.000,32.000,37.000,36.000,33.400,33.600 +2023-06-07,32.000,34.000,38.000,34.000,30.000,33.600,33.600 +2023-06-08,30.000,34.000,38.000,34.000,30.000,33.600,33.200 +2023-06-09,30.000,34.000,32.000,34.000,35.000,33.200,33.000 +2023-06-10,30.000,34.000,32.000,34.000,36.000,33.000,33.200 +2023-06-11,30.000,35.000,32.000,34.000,36.000,33.200,33.400 +2023-06-12,35.000,28.000,32.000,30.000,36.000,33.400,32.200 +2023-06-13,37.000,28.000,35.000,33.000,30.000,32.200,32.600 +2023-06-14,31.000,26.000,35.000,32.000,34.000,32.600,31.600 +2023-06-15,32.000,26.000,30.000,32.000,32.000,31.600,30.400 +2023-06-16,27.000,26.000,30.000,30.000,30.000,30.400,28.600 +2023-06-17,27.000,30.000,28.000,30.000,30.000,28.600,29.000 +2023-06-18,26.000,30.000,28.000,30.000,30.000,29.000,28.800 +2023-06-19,26.000,24.000,28.000,25.000,26.000,28.800,25.800 +2023-06-20,26.000,24.000,28.000,30.000,26.000,25.800,26.800 +2023-06-21,26.000,28.000,32.000,30.000,30.000,26.800,29.200 +2023-06-22,28.000,30.000,32.000,27.000,30.000,29.200,29.400 +2023-06-23,28.000,24.000,28.000,27.000,30.000,29.400,27.400 +2023-06-24,28.000,24.000,28.000,27.000,30.000,27.400,27.400 +2023-06-25,28.000,24.000,28.000,27.000,30.000,27.400,27.400 +2023-06-26,28.000,30.000,28.000,27.000,30.000,27.400,28.600 +2023-06-27,24.000,25.000,28.000,28.000,28.000,28.600,26.600 +2023-06-28,24.000,22.000,28.000,22.000,28.000,26.600,24.800 +2023-06-29,27.000,22.000,28.000,22.000,28.000,24.800,25.400 +2023-06-30,27.000,22.000,28.000,22.000,28.000,25.400,25.400 +2023-07-01,28.000,22.000,28.000,22.000,28.000,25.400,25.600 +2023-07-02,30.000,22.000,28.000,22.000,28.000,25.600,26.000 +2023-07-03,27.000,20.000,25.000,22.000,28.000,26.000,24.400 +2023-07-04,0,20.000,25.000,22.000,24.000,24.400,22.750 +2023-07-05,24.000,20.000,25.000,20.000,22.000,22.750,22.200 +2023-07-06,22.000,20.000,25.000,20.000,20.000,22.200,21.400 +2023-07-07,17.000,20.000,20.000,24.000,24.000,21.400,21.000 +2023-07-08,17.000,25.000,20.000,24.000,28.000,21.000,22.800 +2023-07-09,16.000,25.000,20.000,24.000,28.000,22.800,22.600 +2023-07-10,19.000,20.000,25.000,20.000,22.000,22.600,21.200 +2023-07-11,22.000,20.000,25.000,22.000,22.000,21.200,22.200 +2023-07-12,20.000,20.000,25.000,24.000,20.000,22.200,21.800 +2023-07-13,20.000,20.000,25.000,24.000,22.000,21.800,22.200 +2023-07-14,19.000,20.000,25.000,26.000,22.000,22.200,22.400 +2023-07-15,19.000,20.000,25.000,26.000,24.000,22.400,22.800 +2023-07-16,19.000,20.000,25.000,26.000,24.000,22.800,22.800 +2023-07-17,23.000,24.000,25.000,24.000,25.000,22.800,24.200 +2023-07-18,23.000,24.000,25.000,24.000,25.000,24.200,24.200 +2023-07-19,23.000,24.000,25.000,24.000,25.000,24.200,24.200 +2023-07-20,23.000,30.000,25.000,30.000,28.000,24.200,27.200 +2023-07-21,28.000,30.000,25.000,30.000,28.000,27.200,28.200 +2023-07-22,29.000,28.000,25.000,30.000,28.000,28.200,28.000 +2023-07-23,30.000,28.000,25.000,30.000,28.000,28.000,28.200 +2023-07-24,32.000,26.000,30.000,32.000,35.000,28.200,31.000 +2023-07-25,32.000,32.000,30.000,36.000,35.000,31.000,33.000 +2023-07-26,34.000,28.000,36.000,34.000,32.000,33.000,32.800 +2023-07-27,31.000,28.000,32.000,30.000,30.000,, +2023-07-28,30.000,30.000,34.000,32.000,28.000,30.200,30.800 +2023-07-29,30.000,32.000,34.000,32.000,32.000,30.800,32.000 +2023-07-30,30.000,32.000,34.000,32.000,32.000,32.000,32.000 +2023-07-31,34.000,35.000,35.000,34.000,34.000,32.000,34.400 +2023-08-01,33.000,35.000,35.000,36.000,34.000,34.400,34.600 +2023-08-02,33.000,35.000,40.000,34.000,34.000,34.600,35.200 +2023-08-03,34.000,35.000,,38.000,35.000,35.200,35.400 +2023-08-04,34.000,35.000,38.000,38.000,36.000,35.400,36.200 +2023-08-05,37.000,35.000,38.000,38.000,36.000,36.200,36.800 +2023-08-06,37.000,35.000,38.000,38.000,36.000,36.800,36.800 +2023-08-07,42.000,40.000,38.000,41.000,38.000,36.800,39.800 +2023-08-08,42.000,40.000,38.000,44.000,38.000,39.800,40.400 +2023-08-09,44.000,42.000,40.000,38.000,38.000,40.400,40.400 +2023-08-10,40.000,42.000,40.000,38.000,36.000,40.400,39.200 +2023-08-11,36.000,40.000,40.000,42.000,36.000,39.200,38.800 +2023-08-12,38.000,42.000,40.000,42.000,36.000,38.800,39.600 +2023-08-13,37.000,42.000,40.000,42.000,36.000,39.600,39.400 +2023-08-14,44.000,42.000,38.000,38.000,40.000,39.400,40.400 +2023-08-15,42.000,42.000,38.000,48.000,44.000,40.400,42.800 +2023-08-16,43.000,45.000,45.000,44.000,38.000,42.800,43.000 +2023-08-17,43.000,40.000,45.000,44.000,38.000,43.000,42.000 +2023-08-18,42.000,40.000,45.000,38.000,35.000,42.000,40.000 +2023-08-19,39.000,40.000,45.000,38.000,35.000,40.000,39.400 +2023-08-20,39.000,40.000,45.000,38.000,35.000,39.400,39.400 +2023-08-21,39.000,40.000,38.000,38.000,36.000,39.400,38.200 +2023-08-22,39.000,37.000,38.000,38.000,35.000,38.200,37.400 +2023-08-23,37.000,35.000,38.000,36.000,32.000,37.400,35.600 +2023-08-24,35.000,30.000,38.000,32.000,24.000,35.600,31.800 +2023-08-25,34.000,26.000,28.000,30.000,24.000,31.800,28.400 +2023-08-26,34.000,26.000,28.000,30.000,25.000,28.400,28.600 +2023-08-27,35.000,26.000,28.000,30.000,25.000,28.600,28.800 +2023-08-28,28.000,26.000,28.000,26.000,24.000,28.800,26.400 +2023-08-29,24.000,25.000,28.000,28.000,24.000,26.400,25.800 +2023-08-30,24.000,24.000,25.000,25.000,24.000,25.800,24.400 +2023-08-31,24.000,24.000,25.000,25.000,22.000,24.400,24.000 +2023-09-01,24.000,24.000,25.000,22.000,20.000,24.000,23.000 +2023-09-02,24.000,24.000,25.000,22.000,20.000,23.000,23.000 +2023-09-03,24.000,24.000,25.000,22.000,20.000,23.000,23.000 +2023-09-04,25.000,22.000,25.000,24.000,22.000,23.000,23.600 +2023-09-05,25.000,22.000,25.000,24.000,22.000,23.600,23.600 +2023-09-06,18.000,22.000,25.000,24.000,20.000,23.600,21.800 +2023-09-07,19.000,22.000,25.000,24.000,20.000,21.800,22.000 +2023-09-08,20.000,22.000,25.000,24.000,22.000,22.000,22.600 +2023-09-09,20.000,22.000,,24.000,22.000,22.600,22.600 +2023-09-10,,22.000,25.000,24.000,22.000,22.600,22.600 +2023-09-11,22.000,,25.000,25.000,26.000,22.600,24.000 +2023-09-12,22.000,24.000,25.000,25.000,24.000,24.000,24.000 +2023-09-13,24.000,25.000,25.000,25.000,24.000,24.000,24.600 +2023-09-14,24.000,24.000,25.000,25.000,24.000,24.600,24.400 +2023-09-15,25.000,22.000,25.000,25.000,22.000,24.400,23.800 +2023-09-16,25.000,22.000,25.000,25.000,22.000,23.800,23.800 +2023-09-17,25.000,22.000,25.000,25.000,22.000,23.800,23.800 +2023-09-18,23.000,24.000,25.000,25.000,22.000,23.800,23.800 +2023-09-19,23.000,24.000,25.000,25.000,22.000,23.800,23.800 +2023-09-20,24.000,24.000,25.000,25.000,20.000,23.800,23.600 +2023-09-21,24.000,22.000,25.000,24.000,24.000,23.600,23.800 +2023-09-22,22.000,22.000,25.000,24.000,24.000,23.800,23.400 +2023-09-23,22.000,22.000,25.000,24.000,24.000,23.400,23.400 +2023-09-24,22.000,22.000,25.000,24.000,24.000,23.400,23.400 +2023-09-25,24.000,22.000,25.000,26.000,24.000,23.400,24.200 +2023-09-26,24.000,24.000,25.000,24.000,24.000,24.200,24.200 +2023-09-27,22.000,24.000,25.000,24.000,24.000,24.200,23.800 +2023-09-28,22.000,22.000,25.000,24.000,24.000,23.800,23.400 +2023-09-29,21.000,22.000,25.000,28.000,24.000,23.400,24.000 +2023-09-30,23.000,26.000,25.000,28.000,28.000,24.000,26.000 +2023-10-01,23.000,26.000,25.000,28.000,28.000,26.000,26.000 +2023-10-02,29.000,30.000,28.000,31.000,28.000,26.000,29.200 +2023-10-03,31.000,30.000,28.000,31.000,28.000,29.200,29.600 +2023-10-04,30.000,30.000,30.000,36.000,33.000,29.600,31.800 +2023-10-05,30.000,34.000,35.000,40.000,37.000,31.800,35.200 +2023-10-06,35.000,40.000,35.000,38.000,34.000,35.200,36.400 +2023-10-07,37.000,38.000,38.000,38.000,37.000,36.400,37.600 +2023-10-08,39.000,38.000,38.000,38.000,37.000,37.600,38.000 +2023-10-09,39.000,38.000,37.000,38.000,36.000,38.000,37.600 +2023-10-10,38.000,36.000,37.000,38.000,36.000,37.600,37.000 +2023-10-11,38.000,36.000,37.000,40.000,36.000,37.000,37.400 +2023-10-12,35.000,40.000,35.000,42.000,36.000,37.400,37.600 +2023-10-13,39.000,40.000,35.000,38.000,38.000,37.600,38.000 +2023-10-14,39.000,40.000,35.000,38.000,40.000,38.000,38.400 +2023-10-15,39.000,40.000,35.000,38.000,40.000,38.400,38.400 +2023-10-16,39.000,45.000,37.000,44.000,44.000,38.400,41.800 +2023-10-17,43.000,45.000,40.000,44.000,44.000,41.800,43.200 +2023-10-18,42.000,45.000,43.000,44.000,44.000,43.200,43.600 +2023-10-19,42.000,46.000,43.000,44.000,45.000,43.600,44.000 +2023-10-20,45.000,44.000,48.000,44.000,45.000,44.000,45.200 +2023-10-21,44.000,44.000,48.000,48.000,50.000,45.200,46.800 +2023-10-22,44.000,44.000,48.000,50.000,50.000,46.800,47.200 +2023-10-23,44.000,60.000,60.000,64.000,60.000,47.200,57.600 +2023-10-24,59.000,60.000,60.000,60.000,60.000,57.600,59.800 +2023-10-25,60.000,60.000,60.000,58.000,60.000,59.800,59.600 +2023-10-26,60.000,60.000,58.000,58.000,60.000,59.600,59.200 +2023-10-27,54.000,55.000,58.000,60.000,60.000,59.200,57.400 +2023-10-28,54.000,60.000,58.000,60.000,66.000,57.400,59.600 +2023-10-29,54.000,60.000,58.000,72.000,66.000,59.600,62.000 +2023-10-30,68.000,70.000,75.000,68.000,66.000,62.000,69.400 +2023-10-31,60.000,70.000,75.000,64.000,66.000,69.400,67.000 +2023-11-01,60.000,60.000,75.000,60.000,56.000,67.000,62.200 +2023-11-02,57.000,55.000,60.000,68.000,60.000,62.200,60.000 +2023-11-03,54.000,65.000,68.000,76.000,72.000,60.000,67.000 +2023-11-04,65.000,72.000,75.000,72.000,72.000,67.000,71.200 +2023-11-05,69.000,65.000,75.000,72.000,72.000,71.200,70.600 +2023-11-06,69.000,65.000,60.000,65.000,72.000,70.600,66.200 +2023-11-07,71.000,60.000,60.000,65.000,75.000,66.200,66.200 +2023-11-08,70.000,65.000,60.000,74.000,75.000,66.200,68.800 +2023-11-09,70.000,70.000,70.000,74.000,75.000,68.800,71.800 +2023-11-10,68.000,70.000,75.000,72.000,64.000,71.800,69.800 +2023-11-11,68.000,70.000,75.000,72.000,64.000,69.800,69.800 +2023-11-12,68.000,70.000,75.000,72.000,64.000,69.800,69.800 +2023-11-13,70.000,70.000,75.000,68.000,64.000,69.800,69.400 +2023-11-14,69.000,70.000,75.000,70.000,70.000,69.400,70.800 +2023-11-15,69.000,70.000,75.000,68.000,70.000,70.800,70.400 +2023-11-16,71.000,70.000,70.000,76.000,70.000,70.400,71.400 +2023-11-17,70.000,70.000,70.000,76.000,72.000,71.400,71.600 +2023-11-18,70.000,75.000,70.000,76.000,76.000,71.600,73.400 +2023-11-19,70.000,75.000,70.000,80.000,76.000,73.400,74.200 +2023-11-20,80.000,84.000,85.000,82.000,80.000,74.200,82.200 +2023-11-21,78.000,84.000,85.000,88.000,88.000,82.200,84.600 +2023-11-22,85.000,90.000,90.000,88.000,82.000,84.600,87.000 +2023-11-23,87.000,85.000,90.000,76.000,76.000,87.000,82.800 +2023-11-24,85.000,80.000,85.000,80.000,76.000,82.800,81.200 +2023-11-25,80.000,84.000,85.000,82.000,76.000,81.200,81.400 +2023-11-26,80.000,84.000,85.000,82.000,76.000,81.400,81.400 +2023-11-27,78.000,80.000,80.000,76.000,76.000,81.400,78.000 +2023-11-28,75.000,76.000,80.000,78.000,76.000,78.000,77.000 +2023-11-29,76.000,76.000,80.000,74.000,74.000,77.000,76.000 +2023-11-30,70.000,76.000,80.000,74.000,72.000,76.000,74.400 +2023-12-01,80.000,74.000,80.000,74.000,70.000,74.400,75.600 +2023-12-02,80.000,74.000,80.000,74.000,76.000,75.600,76.800 +2023-12-03,80.000,74.000,80.000,74.000,76.000,76.800,76.800 +2023-12-04,75.000,74.000,85.000,80.000,84.000,76.800,79.600 +2023-12-05,75.000,85.000,85.000,82.000,82.000,79.600,81.800 +2023-12-06,75.000,85.000,85.000,82.000,76.000,81.800,80.600 +2023-12-07,78.000,80.000,85.000,82.000,80.000,80.600,81.000 +2023-12-08,82.000,80.000,83.000,84.000,80.000,81.000,81.800 +2023-12-09,80.000,82.000,83.000,84.000,82.000,81.800,82.200 +2023-12-10,80.000,82.000,83.000,84.000,82.000,82.200,82.200 +2023-12-11,90.000,85.000,83.000,78.000,80.000,82.200,83.200 +2023-12-12,84.000,85.000,90.000,76.000,80.000,83.200,83.000 +2023-12-13,80.000,85.000,90.000,70.000,68.000,83.000,78.600 +2023-12-14,78.000,80.000,85.000,78.000,70.000,78.600,78.200 +2023-12-15,73.000,72.000,80.000,68.000,70.000,78.200,72.600 +2023-12-16,71.000,72.000,60.000,68.000,70.000,72.600,68.200 +2023-12-17,71.000,72.000,60.000,68.000,70.000,68.200,68.200 +2023-12-18,60.000,70.000,60.000,74.000,76.000,68.200,68.000 +2023-12-19,68.000,70.000,65.000,74.000,76.000,68.000,70.600 +2023-12-20,70.000,65.000,70.000,74.000,64.000,70.600,68.600 +2023-12-21,65.000,65.000,75.000,72.000,64.000,68.600,68.200 +2023-12-22,65.000,65.000,75.000,72.000,64.000,68.200,68.200 +2023-12-23,65.000,65.000,75.000,72.000,64.000,68.200,68.200 +2023-12-24,65.000,65.000,75.000,72.000,64.000,68.200,68.200 +2023-12-25,65.000,70.000,75.000,72.000,64.000,68.200,69.200 +2023-12-26,65.000,70.000,75.000,72.000,66.000,69.200,69.600 +2023-12-27,71.000,70.000,65.000,74.000,74.000,69.600,70.800 +2023-12-28,69.000,70.000,72.000,74.000,64.000,70.800,69.800 +2023-12-29,65.000,70.000,72.000,70.000,64.000,69.800,68.200 +2023-12-30,65.000,65.000,72.000,70.000,54.000,68.200,65.200 +2023-12-31,65.000,65.000,72.000,70.000,54.000,65.200,65.200 +2024-01-01,65.000,60.000,72.000,70.000,54.000,65.200,64.200 +2024-01-02,57.000,65.000,65.000,66.000,60.000,64.200,62.600 +2024-01-03,60.000,58.000,65.000,62.000,54.000,62.600,59.800 +2024-01-04,60.000,58.000,65.000,54.000,44.000,59.800,56.200 +2024-01-05,47.000,50.000,50.000,48.000,40.000,56.200,47.000 +2024-01-06,45.000,50.000,50.000,48.000,40.000,47.000,46.600 +2024-01-07,32.000,50.000,50.000,48.000,40.000,46.600,44.000 +2024-01-08,46.000,40.000,45.000,38.000,36.000,44.000,41.000 +2024-01-09,40.000,38.000,45.000,,36.000,41.000,40.600 +2024-01-10,38.000,38.000,42.000,42.000,36.000,40.600,39.200 +2024-01-11,35.000,38.000,40.000,38.000,34.000,39.200,37.000 +2024-01-12,35.000,35.000,40.000,34.000,30.000,37.000,34.800 +2024-01-13,35.000,28.000,40.000,34.000,30.000,34.800,33.400 +2024-01-14,37.000,28.000,40.000,34.000,35.000,33.400,34.800 +2024-01-15,37.000,40.000,45.000,44.000,36.000,34.800,40.400 +2024-01-16,30.000,37.000,45.000,44.000,32.000,40.400,37.600 +2024-01-17,33.000,37.000,45.000,34.000,30.000,37.600,35.800 +2024-01-18,31.000,37.000,32.000,34.000,28.000,35.800,32.400 +2024-01-19,28.000,28.000,35.000,32.000,28.000,32.400,30.200 +2024-01-20,30.000,28.000,30.000,32.000,32.000,30.200,30.400 +2024-01-21,30.000,28.000,30.000,32.000,32.000,30.400,30.400 +2024-01-22,35.000,28.000,30.000,32.000,24.000,30.400,29.800 +2024-01-23,38.000,25.000,30.000,28.000,24.000,29.800,29.000 +2024-01-24,38.000,24.000,28.000,34.000,28.000,29.000,30.400 +2024-01-25,35.000,27.000,35.000,34.000,28.000,30.400,31.800 +2024-01-26,30.000,27.000,35.000,28.000,28.000,31.800,29.600 +2024-01-27,30.000,30.000,35.000,28.000,26.000,29.600,29.800 +2024-01-28,30.000,30.000,35.000,28.000,26.000,29.800,29.800 +2024-01-29,36.000,28.000,30.000,30.000,26.000,29.800,30.000 +2024-01-30,31.000,28.000,,30.000,29.000,30.000,29.600 +2024-01-31,31.000,30.000,30.000,30.000,29.000,29.600,30.000 +2024-02-01,30.000,30.000,35.000,34.000,28.000,30.000,31.400 +2024-02-02,33.000,25.000,35.000,34.000,28.000,31.400,31.000 +2024-02-03,32.000,25.000,35.000,34.000,29.000,31.000,31.000 +2024-02-04,32.000,37.000,35.000,34.000,29.000,31.000,33.400 +2024-02-05,31.000,27.000,35.000,32.000,26.000,33.400,30.200 +2024-02-06,28.000,27.000,35.000,34.000,28.000,30.200,30.400 +2024-02-07,25.000,28.000,35.000,34.000,28.000,30.400,30.000 +2024-02-08,25.000,28.000,35.000,34.000,28.000,30.000,30.000 +2024-02-09,25.000,28.000,35.000,34.000,33.000,30.000,31.000 +2024-02-10,25.000,28.000,35.000,34.000,42.000,31.000,32.800 +2024-02-11,25.000,46.000,35.000,34.000,42.000,32.800,36.400 +2024-02-12,30.000,45.000,35.000,44.000,44.000,36.400,39.600 +2024-02-13,40.000,45.000,40.000,46.000,42.000,39.600,42.600 +2024-02-14,40.000,42.000,40.000,46.000,42.000,42.600,42.000 +2024-02-15,43.000,64.000,45.000,70.000,42.000,42.000,52.800 +2024-02-16,63.000,64.000,60.000,60.000,56.000,52.800,60.600 +2024-02-17,63.000,64.000,60.000,60.000,60.000,60.600,61.400 +2024-02-18,63.000,64.000,60.000,60.000,60.000,61.400,61.400 +2024-02-19,70.000,65.000,60.000,60.000,60.000,61.400,63.000 +2024-02-20,65.000,65.000,60.000,60.000,60.000,63.000,62.000 +2024-02-21,65.000,65.000,60.000,74.000,65.000,62.000,65.800 +2024-02-22,65.000,65.000,65.000,70.000,70.000,65.800,67.000 +2024-02-23,63.000,70.000,75.000,70.000,70.000,67.000,69.600 +2024-02-24,78.000,70.000,75.000,70.000,60.000,69.600,70.600 +2024-02-25,78.000,70.000,75.000,70.000,60.000,70.600,70.600 +2024-02-26,70.000,55.000,60.000,54.000,58.000,70.600,59.400 +2024-02-27,60.000,45.000,60.000,62.000,55.000,59.400,56.400 +2024-02-28,60.000,60.000,55.000,52.000,46.000,56.400,54.600 +2024-02-29,60.000,55.000,55.000,52.000,46.000,54.600,53.600 +2024-03-01,59.000,50.000,50.000,50.000,40.000,53.600,49.800 +2024-03-02,59.000,48.000,50.000,50.000,44.000,49.800,50.200 +2024-03-03,62.000,55.000,50.000,50.000,44.000,50.200,52.200 +2024-03-04,50.000,53.000,50.000,52.000,44.000,52.200,49.800 +2024-03-05,50.000,50.000,50.000,54.000,46.000,49.800,50.000 +2024-03-06,50.000,55.000,50.000,54.000,44.000,50.000,50.600 +2024-03-07,50.000,50.000,55.000,50.000,43.000,50.600,49.600 +2024-03-08,49.000,48.000,55.000,52.000,43.000,49.600,49.400 +2024-03-09,52.000,53.000,55.000,52.000,40.000,49.400,50.400 +2024-03-10,52.000,53.000,50.000,52.000,40.000,50.400,49.400 +2024-03-11,52.000,53.000,50.000,52.000,40.000,49.400,49.400 +2024-03-12,52.000,40.000,45.000,45.000,40.000,49.400,44.400 +2024-03-13,52.000,40.000,60.000,56.000,46.000,44.400,50.800 +2024-03-14,52.000,50.000,55.000,52.000,40.000,50.800,49.800 +2024-03-15,40.000,40.000,55.000,44.000,32.000,49.800,42.200 +2024-03-16,40.000,40.000,45.000,44.000,26.000,42.200,39.000 +2024-03-17,40.000,40.000,45.000,44.000,26.000,39.000,39.000 +2024-03-18,40.000,45.000,35.000,42.000,30.000,39.000,38.400 +2024-03-19,38.000,36.000,32.000,42.000,28.000,38.400,35.200 +2024-03-20,32.000,36.000,32.000,35.000,28.000,35.200,32.600 +2024-03-21,32.000,,32.000,30.000,28.000,32.600,31.600 +2024-03-22,32.000,28.000,28.000,30.000,26.000,31.600,28.800 +2024-03-23,35.000,28.000,28.000,30.000,28.000,28.800,29.800 +2024-03-24,35.000,28.000,28.000,30.000,28.000,29.800,29.800 +2024-03-25,32.000,28.000,28.000,28.000,22.000,29.800,27.600 +2024-03-26,29.000,28.000,30.000,28.000,22.000,27.600,27.400 +2024-03-27,28.000,28.000,30.000,28.000,22.000,27.400,27.200 +2024-03-28,28.000,23.000,30.000,26.000,22.000,27.200,25.800 +2024-03-29,28.000,23.000,30.000,26.000,22.000,25.800,25.800 +2024-03-30,28.000,23.000,30.000,26.000,22.000,25.800,25.800 +2024-03-31,28.000,23.000,30.000,26.000,22.000,25.800,25.800 +2024-04-01,28.000,23.000,30.000,30.000,26.000,25.800,27.400 +2024-04-02,30.000,26.000,30.000,30.000,26.000,27.400,28.400 +2024-04-03,30.000,26.000,30.000,30.000,24.000,28.400,28.000 +2024-04-04,32.000,22.000,30.000,24.000,22.000,28.000,26.000 +2024-04-05,28.000,22.000,25.000,24.000,22.000,26.000,24.200 +2024-04-06,28.000,22.000,25.000,24.000,26.000,24.200,25.000 +2024-04-07,28.000,22.000,25.000,24.000,26.000,25.000,25.000 +2024-04-08,28.000,30.000,25.000,25.000,27.000,25.000,27.000 +2024-04-09,28.000,30.000,35.000,34.000,24.000,27.000,30.200 +2024-04-10,28.000,30.000,35.000,34.000,24.000,30.200,30.200 +2024-04-11,28.000,30.000,35.000,34.000,24.000,30.200,30.200 +2024-04-12,28.000,30.000,35.000,34.000,25.000,30.200,30.400 +2024-04-13,28.000,30.000,35.000,34.000,27.000,30.400,30.800 +2024-04-14,28.000,30.000,35.000,34.000,25.000,30.800,30.400 +2024-04-15,28.000,24.000,35.000,34.000,20.000,30.400,28.200 +2024-04-16,30.000,24.000,28.000,28.000,20.000,28.200,26.000 +2024-04-17,28.000,24.000,28.000,27.000,20.000,26.000,25.400 +2024-04-18,23.000,24.000,25.000,30.000,20.000,25.400,24.400 +2024-04-19,23.000,26.000,25.000,28.000,24.000,24.400,25.200 +2024-04-20,23.000,26.000,25.000,28.000,24.000,25.200,25.200 +2024-04-21,23.000,26.000,25.000,28.000,24.000,25.200,25.200 +2024-04-22,23.000,32.000,25.000,32.000,30.000,25.200,28.400 +2024-04-23,28.000,34.000,32.000,32.000,26.000,28.400,30.400 +2024-04-24,32.000,34.000,32.000,30.000,26.000,30.400,30.800 +2024-04-25,32.000,34.000,32.000,32.000,26.000,30.800,31.200 +2024-04-26,34.000,34.000,30.000,32.000,28.000,31.200,31.600 +2024-04-27,32.000,30.000,30.000,32.000,24.000,31.600,29.600 +2024-04-28,32.000,30.000,30.000,32.000,24.000,29.600,29.600 +2024-04-29,31.000,26.000,25.000,24.000,20.000,29.600,25.200 +2024-04-30,28.000,24.000,25.000,22.000,19.000,25.200,23.600 +2024-05-01,28.000,20.000,25.000,22.000,19.000,23.600,22.800 +2024-05-02,24.000,20.000,25.000,24.000,19.000,22.800,22.400 +2024-05-03,22.000,20.000,25.000,24.000,19.000,22.400,22.000 +2024-05-04,22.000,20.000,20.000,24.000,18.000,22.000,20.800 +2024-05-05,22.000,20.000,,24.000,18.000,20.800,20.800 +2024-05-06,22.000,18.000,17.000,20.000,18.000,20.800,19.000 +2024-05-07,20.000,18.000,17.000,20.000,18.000,19.000,18.600 +2024-05-08,17.000,18.000,19.000,22.000,18.000,18.600,18.800 +2024-05-09,17.000,18.000,19.000,22.000,18.000,18.800,18.800 +2024-05-10,17.000,18.000,19.000,22.000,18.000,18.800,18.800 +2024-05-11,20.000,18.000,19.000,22.000,18.000,18.800,19.400 +2024-05-12,23.000,22.000,19.000,22.000,18.000,19.400,20.800 +2024-05-13,23.000,22.000,21.000,22.000,20.000,20.800,21.600 +2024-05-14,22.000,22.000,21.000,22.000,22.000,21.600,21.800 +2024-05-15,22.000,22.000,24.000,30.000,24.000,21.800,24.400 +2024-05-16,21.000,24.000,28.000,32.000,27.000,24.400,26.400 +2024-05-17,28.000,24.000,30.000,28.000,24.000,26.400,26.800 +2024-05-18,28.000,24.000,30.000,28.000,22.000,26.800,26.400 +2024-05-19,28.000,24.000,30.000,28.000,22.000,26.400,26.400 +2024-05-20,24.000,26.000,25.000,26.000,22.000,26.400,24.600 +2024-05-21,24.000,26.000,25.000,26.000,22.000,24.600,24.600 +2024-05-22,28.000,26.000,25.000,26.000,22.000,24.600,25.400 +2024-05-23,28.000,24.000,25.000,26.000,22.000,25.400,25.000 +2024-05-24,28.000,28.000,25.000,26.000,22.000,25.000,25.800 +2024-05-25,28.000,28.000,25.000,26.000,22.000,25.800,25.800 +2024-05-26,28.000,30.000,25.000,26.000,22.000,25.800,26.200 +2024-05-27,28.000,30.000,25.000,26.000,25.000,26.200,26.800 +2024-05-28,30.000,26.000,25.000,30.000,25.000,26.800,27.200 +2024-05-29,30.000,26.000,30.000,30.000,25.000,27.200,28.200 +2024-05-30,30.000,26.000,25.000,30.000,24.000,28.200,27.000 +2024-05-31,26.000,26.000,25.000,30.000,24.000,27.000,26.200 +2024-06-01,24.000,26.000,25.000,30.000,24.000,26.200,25.800 +2024-06-02,24.000,26.000,25.000,30.000,24.000,25.800,25.800 +2024-06-03,26.000,26.000,25.000,28.000,26.000,25.800,26.200 +2024-06-04,26.000,26.000,32.000,30.000,26.000,26.200,28.000 +2024-06-05,22.000,30.000,32.000,30.000,30.000,28.000,28.800 +2024-06-06,33.000,30.000,32.000,32.000,30.000,28.800,31.400 +2024-06-07,32.000,32.000,32.000,32.000,30.000,31.400,31.600 +2024-06-08,32.000,36.000,32.000,32.000,30.000,31.600,32.400 +2024-06-09,32.000,36.000,32.000,32.000,30.000,32.400,32.400 +2024-06-10,34.000,36.000,32.000,36.000,30.000,32.400,33.600 +2024-06-11,35.000,36.000,32.000,34.000,30.000,33.600,33.400 +2024-06-12,33.000,30.000,30.000,30.000,30.000,33.400,30.600 +2024-06-13,30.000,26.000,28.000,26.000,30.000,30.600,28.000 +2024-06-14,28.000,26.000,28.000,27.000,26.000,28.000,27.000 +2024-06-15,27.000,26.000,28.000,27.000,28.000,27.000,27.200 +2024-06-16,28.000,24.000,28.000,26.000,28.000,27.200,26.800 +2024-06-17,28.000,24.000,28.000,26.000,28.000,26.800,26.800 +2024-06-18,29.000,24.000,28.000,26.000,28.000,26.800,27.000 +2024-06-19,30.000,28.000,25.000,28.000,28.000,27.000,27.800 +2024-06-20,28.000,28.000,25.000,24.000,24.000,27.800,25.800 +2024-06-21,26.000,24.000,28.000,22.000,24.000,25.800,24.800 +2024-06-22,26.000,24.000,28.000,22.000,20.000,24.800,24.000 +2024-06-23,26.000,24.000,28.000,22.000,20.000,24.000,24.000 +2024-06-24,26.000,25.000,26.000,24.000,24.000,24.000,25.000 +2024-06-25,27.000,24.000,30.000,26.000,28.000,25.000,27.000 +2024-06-26,29.000,28.000,30.000,28.000,28.000,27.000,28.600 +2024-06-27,29.000,28.000,30.000,26.000,28.000,28.600,28.200 +2024-06-28,29.000,28.000,28.000,26.000,28.000,28.200,27.800 +2024-06-29,28.000,28.000,28.000,26.000,30.000,27.800,28.000 +2024-06-30,28.000,28.000,28.000,26.000,30.000,28.000,28.000 +2024-07-01,32.000,34.000,35.000,32.000,32.000,28.000,33.000 +2024-07-02,32.000,34.000,35.000,40.000,35.000,33.000,35.200 +2024-07-03,34.000,36.000,35.000,40.000,38.000,35.200,36.600 +2024-07-04,36.000,38.000,35.000,40.000,38.000,36.600,37.400 +2024-07-05,37.000,38.000,35.000,40.000,38.000,37.400,37.600 +2024-07-06,37.000,36.000,38.000,40.000,40.000,37.600,38.200 +2024-07-07,37.000,36.000,38.000,40.000,40.000,38.200,38.200 +2024-07-08,37.000,45.000,43.000,44.000,40.000,38.200,41.800 +2024-07-09,40.000,45.000,43.000,44.000,42.000,41.800,42.800 +2024-07-10,42.000,45.000,48.000,48.000,44.000,42.800,45.400 +2024-07-11,44.000,45.000,48.000,51.000,48.000,45.400,47.200 +2024-07-12,50.000,50.000,50.000,54.000,54.000,47.200,51.600 +2024-07-13,52.000,55.000,50.000,58.000,60.000,51.600,55.000 +2024-07-14,52.000,60.000,50.000,58.000,60.000,55.000,56.000 +2024-07-15,54.000,60.000,60.000,58.000,54.000,56.000,57.200 +2024-07-16,58.000,60.000,6.000,62.000,55.000,57.200,48.200 +2024-07-17,61.000,60.000,64.000,64.000,60.000,48.200,61.800 +2024-07-18,59.000,64.000,80.000,70.000,68.000,61.800,68.200 +2024-07-19,64.000,70.000,72.000,70.000,68.000,68.200,68.800 +2024-07-20,62.000,70.000,72.000,70.000,64.000,68.800,67.600 +2024-07-21,65.000,70.000,72.000,70.000,64.000,67.600,68.200 +2024-07-22,64.000,68.000,70.000,66.000,66.000,68.200,66.800 +2024-07-23,65.000,68.000,70.000,74.000,76.000,66.800,70.600 +2024-07-24,75.000,80.000,70.000,76.000,76.000,70.600,75.400 +2024-07-25,79.000,80.000,,66.000,66.000,75.400,72.200 +2024-07-26,65.000,70.000,60.000,66.000,56.000,72.200,63.400 +2024-07-27,65.000,60.000,60.000,66.000,56.000,63.400,61.400 +2024-07-28,65.000,60.000,60.000,66.000,56.000,61.400,61.400 +2024-07-29,68.000,72.000,70.000,66.000,70.000,61.400,69.200 +2024-07-30,70.000,75.000,70.000,74.000,70.000,69.200,71.800 +2024-07-31,72.000,75.000,70.000,64.000,64.000,71.800,69.000 +2024-08-01,70.000,75.000,70.000,62.000,56.000,69.000,66.600 +2024-08-02,65.000,65.000,70.000,68.000,64.000,66.600,66.400 +2024-08-03,65.000,68.000,70.000,68.000,66.000,66.400,67.400 +2024-08-04,65.000,68.000,70.000,68.000,66.000,67.400,67.400 +2024-08-05,68.000,68.000,70.000,68.000,66.000,67.400,68.000 +2024-08-06,67.000,68.000,75.000,64.000,64.000,68.000,67.600 +2024-08-07,64.000,68.000,65.000,60.000,58.000,67.600,63.000 +2024-08-08,67.000,65.000,65.000,60.000,58.000,63.000,63.000 +2024-08-09,65.000,65.000,60.000,58.000,58.000,63.000,61.200 +2024-08-10,65.000,65.000,60.000,58.000,56.000,61.200,60.800 +2024-08-11,65.000,65.000,60.000,58.000,56.000,60.800,60.800 +2024-08-12,50.000,58.000,60.000,50.000,56.000,60.800,54.800 +2024-08-13,50.000,55.000,50.000,50.000,48.000,54.800,50.600 +2024-08-14,50.000,55.000,50.000,44.000,40.000,50.600,47.800 +2024-08-15,50.000,50.000,48.000,48.000,40.000,47.800,47.200 +2024-08-16,50.000,45.000,48.000,46.000,40.000,47.200,45.800 +2024-08-17,50.000,45.000,48.000,46.000,40.000,45.800,45.800 +2024-08-18,50.000,45.000,48.000,46.000,40.000,45.800,45.800 +2024-08-19,46.000,50.000,52.000,48.000,46.000,45.800,48.400 +2024-08-20,48.000,50.000,50.000,40.000,46.000,48.400,46.800 +2024-08-21,48.000,45.000,50.000,40.000,46.000,46.800,45.800 +2024-08-22,44.000,40.000,50.000,42.000,46.000,45.800,44.400 +2024-08-23,40.000,40.000,42.000,36.000,36.000,44.400,38.800 +2024-08-24,40.000,38.000,42.000,36.000,36.000,38.800,38.400 +2024-08-25,40.000,38.000,42.000,36.000,36.000,38.400,38.400 +2024-08-26,40.000,25.000,31.000,34.000,30.000,38.400,32.000 +2024-08-27,31.000,25.000,31.000,34.000,30.000,32.000,30.200 +2024-08-28,25.000,25.000,31.000,35.000,28.000,30.200,28.800 +2024-08-29,28.000,30.000,36.000,35.000,32.000,28.800,32.200 +2024-08-30,33.000,35.000,36.000,34.000,26.000,32.200,32.800 +2024-08-31,33.000,32.000,36.000,34.000,26.000,32.800,32.200 +2024-09-01,33.000,32.000,36.000,34.000,26.000,32.200,32.200 +2024-09-02,30.000,30.000,30.000,32.000,26.000,32.200,29.600 +2024-09-03,30.000,30.000,36.000,34.000,29.000,29.600,31.800 +2024-09-04,30.000,32.000,36.000,34.000,28.000,31.800,32.000 +2024-09-05,30.000,32.000,36.000,34.000,28.000,32.000,32.000 +2024-09-06,32.000,32.000,36.000,34.000,28.000,32.000,32.400 +2024-09-07,32.000,32.000,36.000,34.000,30.000,32.400,32.800 +2024-09-08,32.000,32.000,36.000,34.000,30.000,32.800,32.800 +2024-09-09,31.000,32.000,36.000,34.000,35.000,32.800,33.600 +2024-09-10,31.000,30.000,36.000,34.000,28.000,33.600,31.800 +2024-09-11,32.000,30.000,32.000,34.000,28.000,31.800,31.200 +2024-09-12,30.000,30.000,32.000,30.000,28.000,31.200,30.000 +2024-09-13,30.000,30.000,28.000,30.000,30.000,30.000,29.600 +2024-09-14,30.000,30.000,28.000,30.000,30.000,29.600,29.600 +2024-09-15,30.000,30.000,28.000,30.000,30.000,29.600,29.600 +2024-09-16,30.000,30.000,28.000,30.000,30.000,29.600,29.600 +2024-09-17,31.000,30.000,32.000,30.000,28.000,29.600,30.200 +2024-09-18,30.000,30.000,32.000,32.000,32.000,, +2024-09-19,30.000,32.000,32.000,32.000,32.000,31.200,31.600 +2024-09-20,32.000,,,34.000,32.000,31.600,32.400 +2024-09-21,31.000,32.000,32.000,34.000,30.000,32.400,31.800 +2024-09-22,31.000,32.000,32.000,34.000,30.000,31.800,31.800 +2024-09-23,34.000,32.000,31.000,34.000,,31.800,32.200 +2024-09-24,33.000,32.000,30.000,34.000,30.000,32.200,31.800 +2024-09-25,30.000,30.000,30.000,34.000,28.000,31.800,30.400 +2024-09-26,30.000,30.000,30.000,32.000,28.000,30.400,30.000 +2024-09-27,29.000,30.000,28.000,32.000,26.000,30.000,29.000 +2024-09-28,29.000,30.000,28.000,32.000,26.000,29.000,29.000 +2024-09-29,29.000,30.000,28.000,32.000,26.000,29.000,29.000 +2024-09-30,30.000,,30.000,34.000,29.000,29.000,30.200 +2024-10-01,27.000,28.000,30.000,36.000,30.000,30.200,30.200 +2024-10-02,27.000,32.000,30.000,36.000,32.000,30.200,31.400 +2024-10-03,31.000,32.000,30.000,36.000,32.000,31.400,32.200 +2024-10-04,31.000,32.000,30.000,36.000,32.000,32.200,32.200 +2024-10-05,31.000,34.000,30.000,36.000,32.000,32.200,32.600 +2024-10-06,31.000,34.000,30.000,36.000,32.000,32.600,32.600 +2024-10-07,32.000,34.000,35.000,38.000,32.000,32.600,34.200 +2024-10-08,32.000,34.000,39.000,38.000,36.000,34.200,35.800 +2024-10-09,36.000,36.000,39.000,38.000,36.000,35.800,37.000 +2024-10-10,37.000,36.000,39.000,38.000,36.000,37.000,37.200 +2024-10-11,36.000,36.000,36.000,40.000,34.000,37.200,36.400 +2024-10-12,36.000,34.000,36.000,40.000,34.000,36.400,36.000 +2024-10-13,36.000,34.000,36.000,40.000,34.000,36.000,36.000 +2024-10-14,36.000,36.000,36.000,40.000,35.000,36.000,36.600 +2024-10-15,35.000,36.000,36.000,40.000,35.000,36.600,36.400 +2024-10-16,34.000,36.000,30.000,40.000,,36.400,35.000 +2024-10-17,34.000,36.000,30.000,38.000,35.000,35.000,34.600 +2024-10-18,34.000,32.000,32.000,38.000,35.000,34.600,34.200 +2024-10-19,34.000,32.000,32.000,38.000,35.000,34.200,34.200 +2024-10-20,34.000,32.000,32.000,38.000,35.000,34.200,34.200 +2024-10-21,35.000,32.000,34.000,36.000,31.000,34.200,33.600 +2024-10-22,31.000,32.000,34.000,36.000,31.000,33.600,32.800 +2024-10-23,31.000,32.000,34.000,36.000,29.000,32.800,32.400 +2024-10-24,30.000,32.000,30.000,36.000,29.000,32.400,31.400 +2024-10-25,30.000,32.000,30.000,32.000,29.000,31.400,30.600 +2024-10-26,30.000,30.000,30.000,32.000,29.000,30.600,30.200 +2024-10-27,30.000,30.000,30.000,32.000,29.000,30.200,30.200 +2024-10-28,32.000,30.000,27.000,32.000,29.000,30.200,30.000 +2024-10-29,27.000,28.000,27.000,32.000,24.000,30.000,27.600 +2024-10-30,27.000,26.000,27.000,32.000,24.000,27.600,27.200 +2024-10-31,26.000,26.000,27.000,32.000,24.000,27.200,27.000 +2024-11-01,28.000,26.000,25.000,32.000,24.000,27.000,27.000 +2024-11-02,28.000,24.000,25.000,32.000,24.000,27.000,26.600 +2024-11-03,28.000,24.000,25.000,32.000,24.000,26.600,26.600 +2024-11-04,26.000,26.000,21.000,26.000,22.000,26.600,24.200 +2024-11-05,26.000,26.000,25.000,30.000,22.000,24.200,25.800 +2024-11-06,26.000,24.000,28.000,30.000,22.000,25.800,26.000 +2024-11-07,26.000,28.000,28.000,30.000,22.000,26.000,26.800 +2024-11-08,28.000,26.000,28.000,30.000,26.000,26.800,27.600 +2024-11-09,28.000,26.000,28.000,30.000,26.000,27.600,27.600 +2024-11-10,28.000,26.000,28.000,30.000,26.000,27.600,27.600 +2024-11-11,27.000,36.000,34.000,38.000,32.000,27.600,33.400 +2024-11-12,30.000,36.000,34.000,38.000,32.000,33.400,34.000 +2024-11-13,33.000,38.000,34.000,36.000,30.000,34.000,34.200 +2024-11-14,31.000,36.000,34.000,32.000,26.000,34.200,31.800 +2024-11-15,33.000,30.000,30.000,28.000,22.000,31.800,28.600 +2024-11-16,33.000,26.000,30.000,28.000,22.000,28.600,27.800 +2024-11-17,30.000,26.000,30.000,28.000,22.000,27.800,27.200 +2024-11-18,26.000,26.000,24.000,28.000,22.000,27.200,25.200 +2024-11-19,25.000,26.000,24.000,26.000,18.000,25.200,23.800 +2024-11-20,25.000,20.000,24.000,24.000,17.000,23.800,22.000 +2024-11-21,24.000,20.000,24.000,24.000,18.000,22.000,22.000 +2024-11-22,24.000,20.000,24.000,24.000,19.000,22.000,22.200 +2024-11-23,24.000,22.000,24.000,24.000,19.000,22.200,22.600 +2024-11-24,24.000,22.000,24.000,24.000,19.000,22.600,22.600 +2024-11-25,19.000,20.000,24.000,20.000,15.000,22.600,19.600 +2024-11-26,19.000,20.000,20.000,20.000,15.000,19.600,18.800 +2024-11-27,19.000,20.000,20.000,20.000,15.000,18.800,18.800 +2024-11-28,18.000,20.000,24.000,22.000,15.000,18.800,19.800 +2024-11-29,20.000,22.000,18.000,22.000,16.000,19.800,19.600 +2024-11-30,20.000,22.000,18.000,,16.000,19.600,19.600 +2024-12-01,22.000,20.000,18.000,22.000,16.000,19.600,19.600 +2024-12-02,20.000,20.000,24.000,20.000,16.000,19.600,20.000 +2024-12-03,,20.000,20.000,22.000,16.000,, +2024-12-04,19.000,20.000,20.000,24.000,22.000,, +2024-12-05,20.000,,22.000,28.000,22.000,21.000,23.200 +2024-12-06,24.000,26.000,24.000,28.000,,23.200,24.800 +2024-12-07,24.000,26.000,24.000,28.000,22.000,24.800,24.800 +2024-12-08,25.000,26.000,24.000,28.000,22.000,24.800,25.000 +2024-12-09,26.000,28.000,32.000,28.000,22.000,25.000,27.200 +2024-12-10,28.000,28.000,36.000,28.000,22.000,27.200,28.400 +2024-12-11,28.000,26.000,32.000,30.000,27.000,28.400,28.600 +2024-12-12,30.000,30.000,35.000,32.000,27.000,28.600,30.800 +2024-12-13,31.000,30.000,32.000,30.000,24.000,30.800,29.400 +2024-12-14,32.000,28.000,32.000,30.000,24.000,29.400,29.200 +2024-12-15,34.000,28.000,32.000,30.000,24.000,29.200,29.600 +2024-12-16,36.000,36.000,45.000,31.000,34.000,29.600,36.400 +2024-12-17,34.000,36.000,42.000,34.000,34.000,36.400,36.000 +2024-12-18,34.000,36.000,40.000,30.000,30.000,36.000,34.000 +2024-12-19,,34.000,35.000,32.000,30.000,34.000,32.600 +2024-12-20,34.000,30.000,50.000,40.000,38.000,32.600,38.400 +2024-12-21,40.000,30.000,50.000,40.000,50.000,38.400,42.000 +2024-12-22,40.000,30.000,50.000,40.000,50.000,42.000,42.000 +2024-12-23,46.000,37.000,60.000,54.000,38.000,42.000,47.000 +2024-12-24,49.000,40.000,52.000,45.000,35.000,47.000,44.200 +2024-12-25,49.000,40.000,52.000,45.000,35.000,44.200,44.200 +2024-12-26,49.000,55.000,52.000,64.000,54.000,44.200,54.800 +2024-12-27,50.000,55.000,50.000,48.000,54.000,54.800,51.400 +2024-12-28,50.000,50.000,50.000,48.000,50.000,51.400,49.600 +2024-12-29,50.000,65.000,50.000,55.000,50.000,49.600,54.000 +2024-12-30,51.000,50.000,55.000,48.000,48.000,54.000,50.400 +2024-12-31,50.000,50.000,60.000,54.000,48.000,50.400,52.400 +2025-01-01,50.000,50.000,60.000,65.000,48.000,52.400,54.600 +2025-01-02,70.000,60.000,80.000,76.000,48.000,54.600,66.800 +2025-01-03,75.000,60.000,75.000,76.000,52.000,66.800,67.600 +2025-01-04,75.000,60.000,75.000,76.000,52.000,67.600,67.600 +2025-01-05,80.000,75.000,75.000,76.000,52.000,67.600,71.600 +2025-01-06,83.000,90.000,90.000,82.000,82.000,71.600,85.400 +2025-01-07,85.000,80.000,85.000,82.000,74.000,85.400,81.200 +2025-01-08,85.000,90.000,85.000,84.000,84.000,81.200,85.600 +2025-01-09,90.000,90.000,80.000,82.000,84.000,85.600,85.200 +2025-01-10,85.000,90.000,90.000,84.000,84.000,85.200,86.600 +2025-01-11,85.000,90.000,90.000,84.000,84.000,86.600,86.600 +2025-01-12,87.000,90.000,90.000,84.000,84.000,86.600,87.000 +2025-01-13,87.000,80.000,70.000,68.000,70.000,87.000,75.000 +2025-01-14,67.000,67.000,75.000,82.000,77.000,75.000,73.600 +2025-01-15,67.000,80.000,75.000,80.000,76.000,73.600,75.600 +2025-01-16,72.000,80.000,63.000,70.000,70.000,75.600,71.000 +2025-01-17,68.000,75.000,63.000,68.000,60.000,71.000,66.800 +2025-01-18,68.000,60.000,63.000,68.000,60.000,66.800,63.800 +2025-01-19,67.000,60.000,63.000,68.000,60.000,63.800,63.600 +2025-01-20,64.000,50.000,65.000,64.000,55.000,63.600,59.600 +2025-01-21,56.000,50.000,65.000,64.000,58.000,59.600,58.600 +2025-01-22,54.000,60.000,65.000,64.000,55.000,58.600,59.600 +2025-01-23,59.000,55.000,55.000,58.000,55.000,59.600,56.400 +2025-01-24,57.000,55.000,55.000,58.000,55.000,56.400,56.000 +2025-01-25,58.000,55.000,55.000,58.000,55.000,56.000,56.200 +2025-01-26,58.000,55.000,55.000,58.000,55.000,56.200,56.200 +2025-01-27,58.000,55.000,55.000,65.000,52.000,56.200,57.000 +2025-01-28,59.000,55.000,55.000,65.000,52.000,57.000,57.200 +2025-01-29,59.000,60.000,55.000,65.000,52.000,57.200,58.200 +2025-01-30,60.000,50.000,55.000,58.000,50.000,58.200,54.600 +2025-01-31,53.000,50.000,55.000,58.000,52.000,54.600,53.600 +2025-02-01,53.000,55.000,55.000,58.000,52.000,53.600,54.600 +2025-02-02,53.000,55.000,55.000,58.000,52.000,54.600,54.600 +2025-02-03,57.000,60.000,60.000,58.000,52.000,54.600,57.400 +2025-02-04,56.000,60.000,60.000,58.000,52.000,57.400,57.200 +2025-02-05,52.000,60.000,55.000,58.000,52.000,57.200,55.400 +2025-02-06,50.000,60.000,55.000,64.000,52.000,55.400,56.200 +2025-02-07,55.000,60.000,50.000,64.000,50.000,56.200,55.800 +2025-02-08,55.000,60.000,50.000,64.000,50.000,55.800,55.800 +2025-02-09,55.000,60.000,50.000,64.000,50.000,55.800,55.800 +2025-02-10,55.000,60.000,50.000,56.000,50.000,, +2025-02-11,51.000,60.000,50.000,56.000,48.000,54.200,53.000 +2025-02-12,48.000,60.000,50.000,56.000,48.000,53.000,52.400 +2025-02-13,55.000,55.000,50.000,56.000,48.000,52.400,52.800 +2025-02-14,55.000,55.000,50.000,56.000,48.000,52.800,52.800 +2025-02-15,55.000,55.000,50.000,56.000,48.000,52.800,52.800 +2025-02-16,55.000,55.000,50.000,56.000,48.000,52.800,52.800 +2025-02-17,50.000,55.000,50.000,60.000,48.000,52.800,52.600 +2025-02-18,55.000,55.000,55.000,66.000,55.000,52.600,57.200 +2025-02-19,58.000,55.000,55.000,70.000,60.000,57.200,59.600 +2025-02-20,63.000,55.000,65.000,74.000,66.000,59.600,64.600 +2025-02-21,65.000,64.000,67.000,80.000,68.000,64.600,68.800 +2025-02-22,68.000,64.000,70.000,80.000,68.000,68.800,70.000 +2025-02-23,68.000,78.000,70.000,80.000,68.000,, +2025-02-24,72.000,85.000,84.000,90.000,80.000,72.800,82.200 +2025-02-25,79.000,85.000,95.000,100.000,88.000,82.200,89.400 +2025-02-26,85.000,96.000,90.000,100.000,88.000,89.400,91.800 +2025-02-27,90.000,96.000,80.000,85.000,76.000,91.800,85.400 +2025-02-28,85.000,85.000,70.000,80.000,68.000,85.400,77.600 +2025-03-01,85.000,85.000,70.000,80.000,68.000,77.600,77.600 +2025-03-02,100.000,85.000,70.000,110.000,68.000,77.600,86.600 +2025-03-03,110.000,110.000,120.000,110.000,120.000,86.600,114.000 +2025-03-04,115.000,110.000,100.000,96.000,100.000,114.000,104.200 +2025-03-05,95.000,110.000,80.000,70.000,70.000,104.200,85.000 +2025-03-06,65.000,80.000,75.000,70.000,60.000,85.000,70.000 +2025-03-07,60.000,70.000,65.000,70.000,60.000,70.000,65.000 +2025-03-08,60.000,70.000,80.000,70.000,78.000,65.000,71.600 +2025-03-09,,70.000,80.000,70.000,78.000,71.600,73.200 +2025-03-10,68.000,70.000,73.000,88.000,70.000,73.200,73.800 +2025-03-11,68.000,70.000,73.000,88.000,78.000,73.800,75.400 +2025-03-12,70.000,70.000,80.000,90.000,78.000,75.400,77.600 +2025-03-13,80.000,90.000,100.000,88.000,98.000,77.600,91.200 +2025-03-14,95.000,90.000,120.000,80.000,98.000,91.200,96.600 +2025-03-15,90.000,90.000,80.000,80.000,90.000,96.600,86.000 +2025-03-16,90.000,90.000,80.000,80.000,76.000,86.000,83.200 +2025-03-17,79.000,96.000,80.000,80.000,78.000,83.200,82.600 +2025-03-18,77.000,80.000,80.000,80.000,80.000,82.600,79.400 +2025-03-19,80.000,80.000,90.000,90.000,88.000,79.400,85.600 +2025-03-20,80.000,90.000,90.000,84.000,88.000,85.600,86.400 +2025-03-21,76.000,90.000,90.000,80.000,50.000,86.400,77.200 +2025-03-22,76.000,80.000,75.000,80.000,70.000,77.200,76.200 +2025-03-23,76.000,80.000,75.000,80.000,70.000,76.200,76.200 +2025-03-24,71.000,74.000,75.000,80.000,70.000,76.200,74.000 +2025-03-25,90.000,85.000,90.000,82.000,80.000,74.000,85.400 +2025-03-26,88.000,80.000,90.000,82.000,80.000,85.400,84.000 +2025-03-27,90.000,80.000,90.000,82.000,80.000,84.000,84.400 +2025-03-28,90.000,80.000,80.000,82.000,80.000,84.400,82.400 +2025-03-29,90.000,80.000,80.000,80.000,68.000,82.400,79.600 +2025-03-30,90.000,80.000,80.000,85.000,68.000,79.600,80.600 +2025-03-31,90.000,80.000,80.000,85.000,68.000,80.600,80.600 +2025-04-01,90.000,120.000,80.000,85.000,68.000,80.600,88.600 +2025-04-02,90.000,120.000,80.000,80.000,68.000,88.600,87.600 +2025-04-03,90.000,120.000,80.000,80.000,68.000,87.600,87.600 +2025-04-04,90.000,120.000,80.000,70.000,68.000,87.600,85.600 +2025-04-05,65.000,60.000,70.000,70.000,68.000,85.600,66.600 +2025-04-06,65.000,60.000,70.000,80.000,70.000,66.600,69.000 +2025-04-07,65.000,85.000,70.000,80.000,70.000,69.000,74.000 +2025-04-08,70.000,80.000,75.000,68.000,70.000,74.000,72.600 +2025-04-09,75.000,70.000,70.000,68.000,70.000,72.600,70.600 +2025-04-10,72.000,70.000,70.000,70.000,70.000,70.600,70.400 +2025-04-11,72.000,75.000,70.000,70.000,72.000,70.400,71.800 +2025-04-12,70.000,72.000,70.000,70.000,72.000,71.800,70.800 +2025-04-13,70.000,72.000,70.000,70.000,72.000,70.800,70.800 +2025-04-14,70.000,60.000,65.000,58.000,60.000,70.800,62.600 +2025-04-15,68.000,60.000,65.000,58.000,64.000,62.600,63.000 +2025-04-16,65.000,60.000,65.000,64.000,64.000,63.000,63.600 +2025-04-17,65.000,65.000,60.000,48.000,48.000,63.600,57.200 +2025-04-18,65.000,50.000,60.000,48.000,48.000,57.200,54.200 +2025-04-19,68.000,50.000,60.000,64.000,54.000,54.200,59.200 +2025-04-20,68.000,50.000,60.000,64.000,54.000,59.200,59.200 +2025-04-21,65.000,40.000,55.000,40.000,42.000,59.200,48.400 +2025-04-22,40.000,40.000,40.000,40.000,40.000,48.400,40.000 +2025-04-23,37.000,40.000,40.000,38.000,38.000,40.000,38.600 +2025-04-24,39.000,36.000,38.000,38.000,38.000,38.600,37.800 +2025-04-25,36.000,36.000,38.000,36.000,38.000,37.800,36.800 +2025-04-26,36.000,36.000,38.000,36.000,34.000,36.800,36.000 +2025-04-27,36.000,36.000,38.000,36.000,34.000,36.000,36.000 +2025-04-28,37.000,26.000,35.000,30.000,30.000,36.000,31.600 +2025-04-29,29.000,28.000,35.000,32.000,32.000,31.600,31.200 +2025-04-30,31.000,32.000,35.000,30.000,30.000,31.200,31.600 +2025-05-01,31.000,32.000,35.000,30.000,30.000,31.600,31.600 +2025-05-02,27.000,28.000,30.000,26.000,27.000,31.600,27.600 +2025-05-03,27.000,28.000,30.000,26.000,28.000,27.600,27.800 +2025-05-04,29.000,28.000,30.000,26.000,28.000,27.800,28.200 +2025-05-05,31.000,26.000,28.000,30.000,26.000,28.200,28.200 +2025-05-06,28.000,28.000,28.000,30.000,26.000,28.200,28.000 +2025-05-07,29.000,28.000,28.000,26.000,23.000,28.000,26.800 +2025-05-08,25.000,24.000,22.000,24.000,22.000,26.800,23.400 +2025-05-09,22.000,24.000,22.000,24.000,22.000,23.400,22.800 +2025-05-10,24.000,24.000,22.000,24.000,22.000,22.800,23.200 +2025-05-11,24.000,24.000,22.000,26.000,22.000,23.200,23.600 +2025-05-12,24.000,24.000,22.000,26.000,22.000,23.600,23.600 +2025-05-13,24.000,24.000,22.000,22.000,22.000,23.600,22.800 +2025-05-14,22.000,20.000,24.000,24.000,20.000,22.800,22.000 +2025-05-15,25.000,26.000,24.000,24.000,20.000,22.000,23.800 +2025-05-16,24.000,26.000,24.000,24.000,20.000,23.800,23.600 +2025-05-17,24.000,26.000,24.000,24.000,18.000,23.600,23.200 +2025-05-18,22.000,26.000,24.000,24.000,18.000,23.200,22.800 +2025-05-19,21.000,22.000,24.000,24.000,21.000,22.800,22.400 +2025-05-20,20.000,22.000,24.000,24.000,21.000,22.400,22.200 +2025-05-21,18.000,22.000,18.000,24.000,20.000,22.200,20.400 +2025-05-22,22.000,20.000,20.000,24.000,19.000,20.400,21.000 +2025-05-23,20.000,20.000,22.000,20.000,19.000,21.000,20.200 +2025-05-24,20.000,20.000,22.000,20.000,19.000,20.200,20.200 +2025-05-25,20.000,20.000,22.000,20.000,19.000,20.200,20.200 +2025-05-26,20.000,20.000,22.000,22.000,19.000,20.200,20.600 +2025-05-27,20.000,20.000,22.000,22.000,23.000,20.600,21.400 +2025-05-28,20.000,26.000,22.000,24.000,23.000,21.400,23.000 +2025-05-29,20.000,26.000,22.000,24.000,23.000,23.000,23.000 +2025-05-30,20.000,26.000,22.000,24.000,24.000,23.000,23.200 +2025-05-31,20.000,26.000,22.000,24.000,24.000,23.200,23.200 +2025-06-01,20.000,26.000,22.000,24.000,24.000,23.200,23.200 +2025-06-02,36.000,35.000,36.000,36.000,30.000,23.200,34.600 +2025-06-03,38.000,35.000,42.000,40.000,34.000,34.600,37.800 +2025-06-04,38.000,36.000,40.000,38.000,34.000,37.800,37.200 +2025-06-05,35.000,36.000,32.000,28.000,26.000,37.200,31.400 +2025-06-06,35.000,36.000,32.000,28.000,26.000,31.400,31.400 +2025-06-07,35.000,36.000,32.000,28.000,26.000,, +2025-06-08,35.000,36.000,32.000,42.000,26.000,31.400,34.200 +2025-06-09,35.000,36.000,32.000,40.000,28.000,34.200,34.200 +2025-06-10,34.000,36.000,32.000,32.000,28.000,34.200,32.400 +2025-06-11,34.000,34.000,32.000,30.000,28.000,32.400,31.600 +2025-06-12,31.000,34.000,32.000,30.000,32.000,31.600,31.800 +2025-06-13,33.000,40.000,35.000,36.000,38.000,31.800,36.400 +2025-06-14,33.000,40.000,35.000,36.000,38.000,36.400,36.400 +2025-06-15,29.000,40.000,35.000,36.000,38.000,36.400,35.600 +2025-06-16,41.000,42.000,40.000,36.000,40.000,35.600,39.800 +2025-06-17,41.000,42.000,50.000,38.000,44.000,39.800,43.000 +2025-06-18,45.000,42.000,55.000,48.000,48.000,43.000,47.600 +2025-06-19,52.000,50.000,55.000,46.000,54.000,47.600,51.400 +2025-06-20,48.000,55.000,65.000,46.000,60.000,51.400,54.800 +2025-06-21,48.000,60.000,65.000,46.000,50.000,54.800,53.800 +2025-06-22,48.000,60.000,65.000,48.000,50.000,53.800,54.200 +2025-06-23,50.000,58.000,48.000,52.000,50.000,54.200,51.600 +2025-06-24,53.000,58.000,55.000,52.000,52.000,51.600,54.000 +2025-06-25,51.000,58.000,58.000,52.000,55.000,54.000,54.800 +2025-06-26,,60.000,58.000,54.000,55.000,54.800,56.400 +2025-06-27,55.000,60.000,58.000,58.000,55.000,56.400,57.200 +2025-06-28,53.000,60.000,58.000,58.000,66.000,57.200,59.000 +2025-06-29,53.000,60.000,58.000,60.000,66.000,59.000,59.400 +2025-06-30,56.000,64.000,58.000,58.000,64.000,59.400,60.000 +2025-07-01,60.000,64.000,60.000,54.000,60.000,60.000,59.600 +2025-07-02,55.000,60.000,60.000,54.000,56.000,59.600,57.000 +2025-07-03,58.000,60.000,60.000,54.000,56.000,57.000,57.600 +2025-07-04,57.000,60.000,70.000,64.000,64.000,57.600,63.000 +2025-07-05,57.000,65.000,68.000,64.000,64.000,63.000,63.600 +2025-07-06,57.000,65.000,68.000,54.000,64.000,63.600,61.600 +2025-07-07,62.000,65.000,58.000,60.000,58.000,61.600,60.600 +2025-07-08,60.000,65.000,58.000,60.000,58.000,60.600,60.200 +2025-07-09,58.000,64.000,60.000,60.000,58.000,60.200,60.000 +2025-07-10,54.000,64.000,65.000,60.000,55.000,60.000,59.600 +2025-07-11,56.000,62.000,65.000,62.000,55.000,59.600,60.000 +2025-07-12,56.000,60.000,65.000,62.000,55.000,60.000,59.600 +2025-07-13,58.000,60.000,65.000,58.000,55.000,59.600,59.200 +2025-07-14,53.000,60.000,65.000,64.000,55.000,59.200,59.400 +2025-07-15,54.000,60.000,65.000,60.000,55.000,59.400,58.800 +2025-07-16,57.000,60.000,65.000,56.000,55.000,58.800,58.600 +2025-07-17,55.000,55.000,65.000,48.000,44.000,58.600,53.400 +2025-07-18,50.000,55.000,35.000,38.000,32.000,53.400,42.000 +2025-07-19,50.000,35.000,35.000,38.000,30.000,42.000,37.600 +2025-07-20,50.000,35.000,35.000,36.000,30.000,37.600,37.200 +2025-07-21,35.000,35.000,35.000,38.000,30.000,37.200,34.600 +2025-07-22,33.000,35.000,35.000,38.000,33.000,34.600,34.800 +2025-07-23,34.000,35.000,35.000,32.000,30.000,34.800,33.200 +2025-07-24,36.000,35.000,35.000,38.000,32.000,33.200,35.200 +2025-07-25,36.000,35.000,35.000,38.000,32.000,35.200,35.200 +2025-07-26,36.000,35.000,35.000,38.000,32.000,35.200,35.200 +2025-07-27,38.000,35.000,35.000,38.000,32.000,35.200,35.600 +2025-07-28,34.000,32.000,35.000,32.000,28.000,35.600,32.200 +2025-07-29,30.000,30.000,28.000,34.000,28.000,32.200,30.000 +2025-07-30,29.000,30.000,28.000,34.000,28.000,30.000,29.800 +2025-07-31,29.000,32.000,32.000,34.000,28.000,29.800,31.000 +2025-08-01,29.000,32.000,32.000,32.000,28.000,31.000,30.600 +2025-08-02,29.000,32.000,32.000,32.000,28.000,30.600,30.600 +2025-08-03,29.000,32.000,32.000,32.000,28.000,30.600,30.600 +2025-08-04,32.000,30.000,30.000,32.000,28.000,30.600,30.400 +2025-08-05,32.000,30.000,30.000,32.000,24.000,30.400,29.600 +2025-08-06,30.000,30.000,30.000,32.000,28.000,29.600,30.000 +2025-08-07,28.000,32.000,30.000,32.000,28.000,30.000,30.000 +2025-08-08,28.000,32.000,30.000,32.000,24.000,30.000,29.200 +2025-08-09,28.000,32.000,30.000,30.000,28.000,29.200,29.600 +2025-08-10,25.000,32.000,30.000,30.000,28.000,29.600,29.000 +2025-08-11,25.000,28.000,30.000,30.000,28.000,29.000,28.200 +2025-08-12,26.000,28.000,30.000,30.000,28.000,28.200,28.400 +2025-08-13,24.000,28.000,28.000,30.000,28.000,28.400,27.600 +2025-08-14,24.000,28.000,28.000,28.000,25.000,27.600,26.600 +2025-08-15,24.000,26.000,22.000,24.000,22.000,26.600,23.600 +2025-08-16,24.000,26.000,22.000,24.000,22.000,23.600,23.600 +2025-08-17,24.000,26.000,22.000,28.000,22.000,23.600,24.400 +2025-08-18,26.000,26.000,22.000,28.000,22.000,24.400,24.800 +2025-08-19,,26.000,22.000,28.000,,24.800,24.600 +2025-08-20,23.000,26.000,25.000,28.000,24.000,, +2025-08-21,20.000,26.000,24.000,28.000,24.000,25.200,24.400 +2025-08-22,20.000,26.000,22.000,28.000,24.000,24.400,24.000 +2025-08-23,24.000,26.000,24.000,28.000,21.000,24.000,24.600 +2025-08-24,24.000,26.000,24.000,28.000,21.000,24.600,24.600 +2025-08-25,24.000,25.000,24.000,26.000,21.000,24.600,24.000 +2025-08-26,24.000,20.000,22.000,24.000,21.000,24.000,22.200 +2025-08-27,22.000,20.000,22.000,24.000,20.000,22.200,21.600 +2025-08-28,20.000,20.000,24.000,24.000,20.000,21.600,21.600 +2025-08-29,20.000,20.000,24.000,24.000,22.000,21.600,22.000 +2025-08-30,22.000,22.000,22.000,24.000,22.000,22.000,22.400 +2025-08-31,24.000,22.000,22.000,24.000,22.000,22.400,22.800 +2025-09-01,24.000,20.000,22.000,20.000,22.000,22.800,21.600 +2025-09-02,22.000,20.000,22.000,20.000,22.000,21.600,21.200 +2025-09-03,25.000,20.000,24.000,26.000,22.000,21.200,23.400 +2025-09-04,25.000,20.000,24.000,26.000,22.000,23.400,23.400 +2025-09-05,25.000,22.000,24.000,26.000,22.000,23.400,23.800 +2025-09-06,25.000,22.000,24.000,26.000,22.000,23.800,23.800 +2025-09-07,25.000,22.000,24.000,26.000,22.000,23.800,23.800 +2025-09-08,28.000,30.000,24.000,28.000,26.000,23.800,27.200 +2025-09-09,28.000,30.000,32.000,32.000,28.000,27.200,30.000 +2025-09-10,29.000,32.000,32.000,30.000,26.000,30.000,29.800 +2025-09-11,30.000,30.000,30.000,30.000,26.000,29.800,29.200 +2025-09-12,30.000,26.000,30.000,30.000,26.000,29.200,28.400 +2025-09-13,30.000,30.000,32.000,30.000,26.000,28.400,29.600 +2025-09-14,30.000,30.000,32.000,30.000,26.000,29.600,29.600 +2025-09-15,30.000,30.000,28.000,32.000,24.000,29.600,28.800 +2025-09-16,30.000,30.000,28.000,32.000,29.000,28.800,29.800 +2025-09-17,34.000,30.000,30.000,36.000,27.000,29.800,31.400 +2025-09-18,34.000,30.000,30.000,36.000,25.000,31.400,31.000 +2025-09-19,30.000,30.000,30.000,32.000,25.000,31.000,29.400 +2025-09-20,30.000,30.000,30.000,32.000,26.000,29.400,29.600 +2025-09-21,30.000,30.000,30.000,30.000,26.000,29.600,29.200 +2025-09-22,29.000,30.000,32.000,30.000,25.000,29.200,29.200 +2025-09-23,28.000,30.000,32.000,30.000,25.000,29.200,29.000 +2025-09-24,30.000,28.000,28.000,30.000,23.000,29.000,27.800 +2025-09-25,32.000,26.000,32.000,30.000,22.000,27.800,28.400 +2025-09-26,32.000,26.000,32.000,30.000,22.000,28.400,28.400 +2025-09-27,32.000,24.000,32.000,30.000,22.000,28.400,28.000 +2025-09-28,32.000,30.000,32.000,30.000,22.000,28.000,29.200 +2025-09-29,30.000,25.000,28.000,30.000,24.000,29.200,27.400 +2025-09-30,28.000,25.000,28.000,30.000,24.000,27.400,27.000 +2025-10-01,30.000,25.000,28.000,30.000,24.000,27.000,27.400 +2025-10-02,30.000,25.000,28.000,30.000,24.000,27.400,27.400 +2025-10-03,30.000,25.000,25.000,30.000,23.000,27.400,26.600 +2025-10-04,30.000,25.000,25.000,30.000,24.000,26.600,26.800 +2025-10-05,30.000,25.000,25.000,30.000,24.000,26.800,26.800 +2025-10-06,28.000,28.000,25.000,32.000,26.000,26.800,27.800 +2025-10-07,27.000,28.000,25.000,32.000,26.000,27.800,27.600 +2025-10-08,27.000,26.000,28.000,32.000,26.000,27.600,27.800 +2025-10-09,26.000,26.000,26.000,30.000,26.000,27.800,26.800 +2025-10-10,29.000,26.000,26.000,30.000,26.000,26.800,27.400 +2025-10-11,29.000,26.000,26.000,30.000,26.000,27.400,27.400 +2025-10-12,29.000,26.000,26.000,30.000,26.000,27.400,27.400 +2025-10-13,29.000,30.000,26.000,30.000,26.000,27.400,28.200 +2025-10-14,32.000,30.000,26.000,28.000,20.000,28.200,27.200 +2025-10-15,30.000,30.000,20.000,28.000,20.000,27.200,25.600 +2025-10-16,28.000,26.000,20.000,28.000,20.000,25.600,24.400 +2025-10-17,25.000,24.000,22.000,26.000,20.000,24.400,23.400 +2025-10-18,25.000,24.000,22.000,26.000,20.000,23.400,23.400 +2025-10-19,25.000,24.000,22.000,26.000,20.000,23.400,23.400 +2025-10-20,23.000,18.000,22.000,24.000,17.000,23.400,20.800 +2025-10-21,18.000,18.000,22.000,22.000,17.000,20.800,19.400 +2025-10-22,22.000,16.000,22.000,23.000,17.000,19.400,20.000 +2025-10-23,19.000,16.000,22.000,23.000,17.000,20.000,19.400 +2025-10-24,18.000,16.000,22.000,23.000,17.000,19.400,19.200 +2025-10-25,18.000,16.000,22.000,23.000,17.000,19.200,19.200 +2025-10-26,18.000,16.000,22.000,23.000,17.000,19.200,19.200 +2025-10-27,16.000,16.000,22.000,22.000,17.000,19.200,18.600 +2025-10-28,19.000,16.000,20.000,22.000,17.000,18.600,18.800 +2025-10-29,19.000,16.000,20.000,24.000,18.000,18.800,19.400 +2025-10-30,22.000,16.000,18.000,24.000,20.000,19.400,20.000 +2025-10-31,22.000,18.000,25.000,24.000,20.000,20.000,21.800 +2025-11-01,22.000,18.000,25.000,24.000,20.000,21.800,21.800 diff --git a/api/harga_cabe_merah_besar_jemberkab_2021-11-01_2025-11-01.csv b/api/harga_cabe_merah_besar_jemberkab_2021-11-01_2025-11-01.csv new file mode 100644 index 0000000..802fa9d --- /dev/null +++ b/api/harga_cabe_merah_besar_jemberkab_2021-11-01_2025-11-01.csv @@ -0,0 +1,1463 @@ +Tanggal,Pasar_Tanjung,Pasar_Kreongan,Pasar_Tegal_Besar,Pasar_Mangli,Pasar_Wirolegi,RataRata_Kemarin,RataRata_Sekarang +2021-11-01,N/A,15.000,16.000,0,0,17.000,14.666 +2021-11-02,13.000,15.000,16.000,0,0,14.666,14.666 +2021-11-03,13.000,15.000,16.000,0,0,14.666,14.666 +2021-11-04,16.000,17.000,20.000,0,0,14.666,17.666 +2021-11-05,16.000,20.000,24.000,0,0,17.666,20.000 +2021-11-06,19.000,21.000,24.000,0,0,20.000,21.333 +2021-11-07,19.000,21.000,24.000,0,0,21.333,21.333 +2021-11-08,19.000,25.000,24.000,0,0,21.333,22.666 +2021-11-09,24.000,25.000,26.000,0,0,22.666,25.000 +2021-11-10,24.000,25.000,26.000,0,0,25.000,25.000 +2021-11-11,24.000,24.000,26.000,0,0,25.000,24.666 +2021-11-12,,,26.000,0,0,24.666,24.666 +2021-11-13,24.000,24.000,26.000,0,0,24.666,24.666 +2021-11-14,24.000,24.000,26.000,0,0,24.666,24.666 +2021-11-15,24.000,24.000,26.000,0,0,24.666,24.666 +2021-11-16,24.000,25.000,26.000,0,0,24.666,25.000 +2021-11-17,26.000,23.000,26.000,0,0,25.000,25.000 +2021-11-18,26.000,25.000,26.000,0,0,25.000,25.666 +2021-11-19,26.000,26.000,26.000,0,0,25.666,26.000 +2021-11-20,26.000,28.000,28.000,0,0,26.000,27.333 +2021-11-21,26.000,28.000,28.000,0,0,27.333,27.333 +2021-11-22,34.000,35.000,36.000,0,0,27.333,35.000 +2021-11-23,34.000,35.000,36.000,0,0,35.000,35.000 +2021-11-24,35.000,35.000,36.000,0,0,35.000,35.333 +2021-11-25,35.000,35.000,36.000,0,0,35.333,35.333 +2021-11-26,35.000,34.000,36.000,0,0,35.333,35.000 +2021-11-27,31.000,34.000,32.000,0,0,35.000,32.333 +2021-11-28,31.000,34.000,32.000,0,0,32.333,32.333 +2021-11-29,31.000,34.000,32.000,0,0,32.333,32.333 +2021-11-30,34.000,33.000,35.000,0,0,32.333,34.000 +2021-12-01,34.000,31.000,35.000,0,0,34.000,33.333 +2021-12-02,34.000,30.000,32.000,0,0,33.333,32.000 +2021-12-03,35.000,30.000,38.000,0,0,32.000,34.333 +2021-12-04,35.000,36.000,38.000,0,0,34.333,36.333 +2021-12-05,35.000,36.000,38.000,0,0,36.333,36.333 +2021-12-06,36.000,37.000,38.000,0,0,36.333,37.000 +2021-12-07,35.000,37.000,38.000,0,0,37.000,36.666 +2021-12-08,35.000,37.000,38.000,0,0,36.666,36.666 +2021-12-09,37.000,37.000,38.000,0,0,36.666,37.333 +2021-12-10,37.000,39.000,38.000,0,0,37.333,38.000 +2021-12-11,33.000,39.000,38.000,0,0,38.000,36.666 +2021-12-12,33.000,35.000,38.000,0,0,36.666,35.333 +2021-12-13,30.000,35.000,38.000,0,0,35.333,34.333 +2021-12-14,28.000,28.000,28.000,0,0,34.333,28.000 +2021-12-15,28.000,30.000,28.000,0,0,28.000,28.666 +2021-12-16,28.000,30.000,28.000,0,0,28.666,28.666 +2021-12-17,27.000,30.000,28.000,0,0,28.666,28.333 +2021-12-18,27.000,28.000,28.000,0,0,28.333,27.666 +2021-12-19,27.000,28.000,28.000,0,0,27.666,27.666 +2021-12-20,27.000,28.000,28.000,0,0,27.666,27.666 +2021-12-21,27.000,25.000,28.000,0,0,27.666,26.666 +2021-12-22,27.000,25.000,28.000,0,0,26.666,26.666 +2021-12-23,20.000,25.000,28.000,0,0,26.666,24.333 +2021-12-24,20.000,23.000,28.000,0,0,24.333,23.666 +2021-12-25,20.000,24.000,28.000,0,0,23.666,24.000 +2021-12-26,20.000,23.000,28.000,0,0,24.000,23.666 +2021-12-27,25.000,23.000,25.000,0,0,23.666,24.333 +2021-12-28,20.000,23.000,25.000,0,0,24.333,22.666 +2021-12-29,22.000,22.000,25.000,0,0,22.666,23.000 +2021-12-30,17.000,22.000,25.000,0,0,23.000,21.333 +2021-12-31,17.000,18.000,25.000,0,0,21.333,20.000 +2022-01-01,17.000,18.000,25.000,0,0,20.000,20.000 +2022-01-02,17.000,18.000,25.000,0,0,20.000,20.000 +2022-01-03,25.000,22.000,25.000,0,0,20.000,24.000 +2022-01-04,20.000,22.000,25.000,0,0,24.000,22.333 +2022-01-05,20.000,22.000,25.000,0,0,22.333,22.333 +2022-01-06,20.000,22.000,25.000,0,0,22.333,22.333 +2022-01-07,20.000,22.000,25.000,0,0,22.333,22.333 +2022-01-08,20.000,22.000,25.000,0,0,22.333,22.333 +2022-01-09,20.000,22.000,25.000,0,0,22.333,22.333 +2022-01-10,20.000,18.000,25.000,0,0,22.333,21.000 +2022-01-11,20.000,18.000,20.000,0,0,21.000,19.333 +2022-01-12,20.000,18.000,20.000,0,0,19.333,19.333 +2022-01-13,20.000,18.000,20.000,0,0,19.333,19.333 +2022-01-14,20.000,18.000,20.000,0,0,19.333,19.333 +2022-01-15,20.000,19.000,20.000,0,0,19.333,19.666 +2022-01-16,20.000,19.000,20.000,0,0,19.666,19.666 +2022-01-17,20.000,24.000,25.000,0,0,19.666,23.000 +2022-01-18,25.000,28.000,25.000,0,0,23.000,26.000 +2022-01-19,27.000,24.000,28.000,0,0,26.000,26.333 +2022-01-20,28.000,24.000,28.000,0,0,26.333,26.666 +2022-01-21,26.000,28.000,28.000,0,0,26.666,27.333 +2022-01-22,26.000,26.000,30.000,0,0,27.333,27.333 +2022-01-23,28.000,26.000,30.000,0,0,27.333,28.000 +2022-01-24,24.000,26.000,28.000,0,0,28.000,26.000 +2022-01-25,24.000,28.000,28.000,0,0,26.000,26.666 +2022-01-26,22.000,28.000,28.000,0,0,26.666,26.000 +2022-01-27,22.000,23.000,25.000,0,0,26.000,23.333 +2022-01-28,22.000,22.000,20.000,0,0,23.333,21.333 +2022-01-29,20.000,22.000,20.000,0,0,21.333,20.666 +2022-01-30,20.000,22.000,20.000,0,0,20.666,20.666 +2022-01-31,20.000,20.000,20.000,0,0,20.666,20.000 +2022-02-01,20.000,20.000,20.000,0,0,20.000,20.000 +2022-02-02,20.000,21.000,20.000,0,0,20.000,20.333 +2022-02-03,22.000,21.000,28.000,0,0,20.333,23.666 +2022-02-04,22.000,22.000,24.000,0,0,23.666,22.666 +2022-02-05,22.000,24.000,24.000,0,0,22.666,23.333 +2022-02-06,22.000,24.000,24.000,0,0,23.333,23.333 +2022-02-07,22.000,24.000,24.000,0,0,23.333,23.333 +2022-02-08,22.000,24.000,24.000,0,0,23.333,23.333 +2022-02-09,22.000,22.000,24.000,0,0,23.333,22.666 +2022-02-10,26.000,22.000,28.000,0,0,22.666,25.333 +2022-02-11,25.000,24.000,28.000,0,0,25.333,25.666 +2022-02-12,25.000,28.000,28.000,0,0,25.666,27.000 +2022-02-13,28.000,28.000,28.000,0,0,27.000,28.000 +2022-02-14,28.000,28.000,35.000,0,0,28.000,30.333 +2022-02-15,28.000,32.000,35.000,0,0,30.333,31.666 +2022-02-16,30.000,32.000,35.000,0,0,31.666,32.333 +2022-02-17,35.000,32.000,35.000,0,0,32.333,34.000 +2022-02-18,32.000,31.000,35.000,0,0,34.000,32.666 +2022-02-19,30.000,31.000,35.000,0,0,32.666,32.000 +2022-02-20,29.000,32.000,35.000,0,0,32.000,32.000 +2022-02-21,30.000,32.000,35.000,0,0,32.000,32.333 +2022-02-22,30.000,32.000,35.000,0,0,32.333,32.333 +2022-02-23,30.000,32.000,35.000,0,0,32.333,32.333 +2022-02-24,32.000,30.000,35.000,0,0,32.333,32.333 +2022-02-25,32.000,32.000,35.000,0,0,32.333,33.000 +2022-02-26,35.000,32.000,35.000,0,0,33.000,34.000 +2022-02-27,35.000,36.000,35.000,0,0,34.000,35.333 +2022-02-28,35.000,36.000,35.000,0,0,35.333,35.333 +2022-03-01,40.000,39.000,35.000,0,0,35.333,38.000 +2022-03-02,42.000,40.000,40.000,0,0,38.000,40.666 +2022-03-03,41.000,40.000,42.000,0,0,40.666,41.000 +2022-03-04,41.000,34.000,42.000,0,0,41.000,39.000 +2022-03-05,45.000,35.000,45.000,0,0,39.000,41.666 +2022-03-06,45.000,46.000,45.000,0,0,41.666,45.333 +2022-03-07,45.000,46.000,45.000,0,0,45.333,45.333 +2022-03-08,45.000,46.000,48.000,0,0,45.333,46.333 +2022-03-09,45.000,44.000,48.000,0,0,46.333,45.666 +2022-03-10,40.000,44.000,46.000,0,0,45.666,43.333 +2022-03-11,40.000,44.000,40.000,0,0,43.333,41.333 +2022-03-12,40.000,40.000,40.000,0,0,41.333,40.000 +2022-03-13,40.000,44.000,N/A,0,0,40.000,43.000 +2022-03-14,44.000,42.000,45.000,0,0,43.000,43.666 +2022-03-15,44.000,44.000,40.000,0,0,43.666,42.666 +2022-03-16,45.000,39.000,40.000,0,0,42.666,41.333 +2022-03-17,42.000,46.000,45.000,0,0,41.333,44.333 +2022-03-18,45.000,46.000,45.000,0,0,44.333,45.333 +2022-03-19,45.000,45.000,45.000,0,0,45.333,45.000 +2022-03-20,45.000,45.000,45.000,0,0,45.000,45.000 +2022-03-21,45.000,44.000,45.000,0,0,45.000,44.666 +2022-03-22,45.000,44.000,40.000,0,0,44.666,43.000 +2022-03-23,45.000,44.000,40.000,0,0,43.000,43.000 +2022-03-24,45.000,44.000,45.000,0,0,43.000,44.666 +2022-03-25,43.000,40.000,45.000,0,0,44.666,42.666 +2022-03-26,43.000,40.000,45.000,0,0,42.666,42.666 +2022-03-27,42.000,44.000,45.000,0,0,42.666,43.666 +2022-03-28,42.000,46.000,45.000,0,0,43.666,44.333 +2022-03-29,43.000,46.000,45.000,0,0,44.333,44.666 +2022-03-30,45.000,46.000,45.000,0,0,44.666,45.333 +2022-03-31,45.000,47.000,46.000,0,0,45.333,46.000 +2022-04-01,50.000,48.000,46.000,0,0,46.000,48.000 +2022-04-02,50.000,48.000,48.000,0,0,48.000,48.666 +2022-04-03,49.000,48.000,50.000,0,0,48.666,49.000 +2022-04-04,49.000,48.000,50.000,0,0,49.000,49.000 +2022-04-05,49.000,44.000,50.000,0,0,49.000,47.666 +2022-04-06,45.000,45.000,50.000,0,0,47.666,46.666 +2022-04-07,45.000,41.000,45.000,0,0,46.666,43.666 +2022-04-08,45.000,40.000,40.000,0,0,43.666,41.666 +2022-04-09,40.000,40.000,40.000,0,0,41.666,40.000 +2022-04-10,40.000,35.000,40.000,0,0,40.000,38.333 +2022-04-11,40.000,24.000,35.000,0,0,38.333,33.000 +2022-04-12,30.000,24.000,30.000,0,0,33.000,28.000 +2022-04-13,29.000,24.000,30.000,0,0,28.000,27.666 +2022-04-14,29.000,24.000,30.000,0,0,27.666,27.666 +2022-04-15,24.000,24.000,25.000,0,0,27.666,24.333 +2022-04-16,24.000,23.000,25.000,0,0,24.333,24.000 +2022-04-17,24.000,20.000,25.000,0,0,24.000,23.000 +2022-04-18,23.000,24.000,25.000,0,0,23.000,24.000 +2022-04-19,22.000,24.000,25.000,0,0,24.000,23.666 +2022-04-20,22.000,24.000,25.000,0,0,23.666,23.666 +2022-04-21,24.000,26.000,25.000,0,0,23.666,25.000 +2022-04-22,26.000,28.000,25.000,0,0,25.000,26.333 +2022-04-23,40.000,28.000,28.000,0,0,26.333,32.000 +2022-04-24,40.000,28.000,30.000,0,0,32.000,32.666 +2022-04-25,36.000,32.000,38.000,0,0,32.666,35.333 +2022-04-26,38.000,38.000,40.000,0,0,35.333,38.666 +2022-04-27,40.000,38.000,45.000,0,0,38.666,41.000 +2022-04-28,40.000,36.000,45.000,0,0,41.000,40.333 +2022-04-29,34.000,34.000,40.000,0,0,40.333,36.000 +2022-04-30,34.000,34.000,40.000,0,0,36.000,36.000 +2022-05-01,36.000,36.000,40.000,0,0,36.000,37.333 +2022-05-02,36.000,36.000,40.000,0,0,37.333,37.333 +2022-05-03,36.000,36.000,40.000,0,0,37.333,37.333 +2022-05-04,36.000,36.000,40.000,0,0,37.333,37.333 +2022-05-05,36.000,40.000,40.000,0,0,37.333,38.666 +2022-05-06,36.000,40.000,40.000,0,0,38.666,38.666 +2022-05-07,36.000,40.000,40.000,0,0,38.666,38.666 +2022-05-08,34.000,40.000,40.000,0,0,38.666,38.000 +2022-05-09,28.000,40.000,25.000,0,0,38.000,31.000 +2022-05-10,28.000,25.000,25.000,0,0,31.000,26.000 +2022-05-11,28.000,26.000,25.000,0,0,26.000,26.333 +2022-05-12,28.000,26.000,38.000,0,0,26.333,30.666 +2022-05-13,24.000,35.000,38.000,0,0,30.666,32.333 +2022-05-14,24.000,36.000,38.000,0,0,32.333,32.666 +2022-05-15,24.000,36.000,38.000,0,0,32.666,32.666 +2022-05-16,30.000,35.000,38.000,0,0,32.666,34.333 +2022-05-17,36.000,35.000,40.000,0,0,34.333,37.000 +2022-05-18,36.000,35.000,40.000,0,0,37.000,37.000 +2022-05-19,44.000,44.000,46.000,0,0,37.000,44.666 +2022-05-20,44.000,44.000,46.000,0,0,44.666,44.666 +2022-05-21,44.000,45.000,46.000,0,0,44.666,45.000 +2022-05-22,44.000,45.000,46.000,0,0,45.000,45.000 +2022-05-23,45.000,44.000,40.000,0,0,45.000,43.000 +2022-05-24,43.000,44.000,45.000,0,0,43.000,44.000 +2022-05-25,43.000,48.000,45.000,0,0,44.000,45.333 +2022-05-26,56.000,48.000,45.000,0,0,45.333,49.666 +2022-05-27,49.000,44.000,50.000,0,0,49.666,47.666 +2022-05-28,49.000,44.000,50.000,0,0,47.666,47.666 +2022-05-29,45.000,44.000,50.000,0,0,47.666,46.333 +2022-05-30,60.000,52.000,50.000,0,0,46.333,54.000 +2022-05-31,62.000,52.000,50.000,0,0,54.000,54.666 +2022-06-01,50.000,52.000,50.000,0,0,54.666,50.666 +2022-06-02,50.000,52.000,55.000,0,0,50.666,52.333 +2022-06-03,50.000,52.000,60.000,0,0,52.333,54.000 +2022-06-04,60.000,52.000,60.000,0,0,54.000,57.333 +2022-06-05,54.000,52.000,60.000,0,0,57.333,55.333 +2022-06-06,60.000,52.000,60.000,0,0,55.333,57.333 +2022-06-07,62.000,63.000,60.000,0,0,57.333,61.666 +2022-06-08,55.000,64.000,65.000,0,0,61.666,61.333 +2022-06-09,60.000,65.000,70.000,0,0,61.333,65.000 +2022-06-10,65.000,65.000,65.000,0,0,65.000,65.000 +2022-06-11,65.000,65.000,70.000,0,0,65.000,66.666 +2022-06-12,68.000,65.000,70.000,0,0,66.666,67.666 +2022-06-13,60.000,68.000,65.000,0,0,67.666,64.333 +2022-06-14,65.000,64.000,70.000,0,0,64.333,66.333 +2022-06-15,65.000,64.000,70.000,0,0,66.333,66.333 +2022-06-16,65.000,64.000,70.000,0,0,66.333,66.333 +2022-06-17,63.000,65.000,70.000,0,0,66.333,66.000 +2022-06-18,63.000,65.000,70.000,0,0,66.000,66.000 +2022-06-19,65.000,65.000,70.000,0,0,66.000,66.666 +2022-06-20,63.000,65.000,60.000,0,0,66.666,62.666 +2022-06-21,65.000,60.000,65.000,0,0,62.666,63.333 +2022-06-22,65.000,60.000,65.000,0,0,63.333,63.333 +2022-06-23,60.000,60.000,65.000,0,0,63.333,61.666 +2022-06-24,60.000,60.000,65.000,0,0,61.666,61.666 +2022-06-25,60.000,60.000,60.000,0,0,61.666,60.000 +2022-06-26,60.000,60.000,85.000,0,0,60.000,68.333 +2022-06-27,60.000,70.000,65.000,0,0,68.333,65.000 +2022-06-28,65.000,70.000,65.000,0,0,65.000,66.666 +2022-06-29,65.000,70.000,65.000,0,0,66.666,66.666 +2022-06-30,65.000,65.000,65.000,0,0,66.666,65.000 +2022-07-01,65.000,65.000,65.000,0,0,65.000,65.000 +2022-07-02,65.000,60.000,65.000,0,0,65.000,63.333 +2022-07-03,65.000,60.000,65.000,0,0,63.333,63.333 +2022-07-04,65.000,70.000,75.000,0,0,63.333,70.000 +2022-07-05,68.000,70.000,80.000,0,0,70.000,72.666 +2022-07-06,75.000,78.000,85.000,0,0,72.666,79.333 +2022-07-07,80.000,80.000,85.000,0,0,79.333,81.666 +2022-07-08,78.000,80.000,85.000,0,0,81.666,81.000 +2022-07-09,80.000,75.000,80.000,0,0,81.000,78.333 +2022-07-10,80.000,75.000,80.000,0,0,78.333,78.333 +2022-07-11,60.000,80.000,80.000,0,0,78.333,73.333 +2022-07-12,60.000,80.000,85.000,0,0,73.333,75.000 +2022-07-13,60.000,80.000,85.000,0,0,75.000,75.000 +2022-07-14,60.000,78.000,85.000,0,0,75.000,74.333 +2022-07-15,60.000,78.000,85.000,0,0,74.333,74.333 +2022-07-16,60.000,78.000,85.000,0,0,74.333,74.333 +2022-07-17,60.000,78.000,85.000,0,0,74.333,74.333 +2022-07-18,78.000,80.000,85.000,0,0,74.333,81.000 +2022-07-19,80.000,80.000,85.000,0,0,81.000,81.666 +2022-07-20,80.000,80.000,85.000,0,0,81.666,81.666 +2022-07-21,80.000,80.000,85.000,0,0,81.666,81.666 +2022-07-22,80.000,70.000,85.000,0,0,81.666,78.333 +2022-07-23,80.000,76.000,85.000,0,0,78.333,80.333 +2022-07-24,80.000,76.000,85.000,0,0,80.333,80.333 +2022-07-25,80.000,79.000,80.000,0,0,80.333,79.666 +2022-07-26,75.000,79.000,80.000,0,0,79.666,78.000 +2022-07-27,75.000,68.000,75.000,0,0,78.000,72.666 +2022-07-28,75.000,68.000,75.000,0,0,72.666,72.666 +2022-07-29,75.000,68.000,75.000,0,0,72.666,72.666 +2022-07-30,75.000,76.000,75.000,0,0,72.666,75.333 +2022-07-31,73.000,76.000,75.000,0,0,75.333,74.666 +2022-08-01,63.000,64.000,65.000,0,0,74.666,64.000 +2022-08-02,63.000,64.000,65.000,0,0,64.000,64.000 +2022-08-03,60.000,64.000,65.000,0,0,64.000,63.000 +2022-08-04,56.000,56.000,60.000,0,0,63.000,57.333 +2022-08-05,55.000,56.000,60.000,0,0,57.333,57.000 +2022-08-06,55.000,54.000,60.000,0,0,57.000,56.333 +2022-08-07,51.000,54.000,60.000,0,0,56.333,55.000 +2022-08-08,51.000,50.000,60.000,0,0,55.000,53.666 +2022-08-09,51.000,50.000,60.000,0,0,53.666,53.666 +2022-08-10,55.000,50.000,60.000,0,0,53.666,55.000 +2022-08-11,58.000,54.000,60.000,0,0,55.000,57.333 +2022-08-12,57.000,54.000,50.000,0,0,57.333,53.666 +2022-08-13,52.000,52.000,50.000,0,0,53.666,51.333 +2022-08-14,52.000,52.000,50.000,0,0,51.333,51.333 +2022-08-15,50.000,52.000,50.000,0,0,51.333,50.666 +2022-08-16,45.000,48.000,45.000,0,0,50.666,46.000 +2022-08-17,47.000,48.000,45.000,0,0,46.000,46.666 +2022-08-18,45.000,48.000,45.000,0,0,46.666,46.000 +2022-08-19,45.000,45.000,45.000,0,0,46.000,45.000 +2022-08-20,45.000,45.000,45.000,0,0,45.000,45.000 +2022-08-21,45.000,45.000,45.000,0,0,45.000,45.000 +2022-08-22,40.000,44.000,45.000,0,0,45.000,43.000 +2022-08-23,37.000,44.000,45.000,0,0,43.000,42.000 +2022-08-24,38.000,44.000,45.000,0,0,42.000,42.333 +2022-08-25,38.000,41.000,45.000,0,0,42.333,41.333 +2022-08-26,38.000,41.000,40.000,0,0,41.333,39.666 +2022-08-27,38.000,40.000,40.000,0,0,39.666,39.333 +2022-08-28,38.000,38.000,40.000,0,0,39.333,38.666 +2022-08-29,44.000,38.000,40.000,0,0,38.666,40.666 +2022-08-30,45.000,40.000,45.000,0,0,40.666,43.333 +2022-08-31,41.000,40.000,50.000,0,0,43.333,43.666 +2022-09-01,42.000,45.000,50.000,0,0,43.666,45.666 +2022-09-02,44.000,45.000,50.000,0,0,45.666,46.333 +2022-09-03,40.000,40.000,50.000,0,0,46.333,43.333 +2022-09-04,40.000,40.000,50.000,0,0,43.333,43.333 +2022-09-05,48.000,52.000,50.000,0,0,43.333,50.000 +2022-09-06,46.000,52.000,60.000,0,0,50.000,52.666 +2022-09-07,51.000,55.000,60.000,0,0,52.666,55.333 +2022-09-08,55.000,50.000,60.000,0,0,55.333,55.000 +2022-09-09,55.000,50.000,50.000,0,0,55.000,51.666 +2022-09-10,56.000,50.000,50.000,0,0,51.666,52.000 +2022-09-11,56.000,50.000,50.000,0,0,52.000,52.000 +2022-09-12,50.000,40.000,55.000,0,0,52.000,48.333 +2022-09-13,43.000,42.000,55.000,0,0,48.333,46.666 +2022-09-14,42.000,42.000,40.000,0,0,46.666,41.333 +2022-09-15,30.000,30.000,30.000,0,0,41.333,30.000 +2022-09-16,28.000,28.000,25.000,0,0,30.000,27.000 +2022-09-17,28.000,25.000,25.000,0,0,27.000,26.000 +2022-09-18,30.000,24.000,30.000,0,0,26.000,28.000 +2022-09-19,24.000,24.000,25.000,0,0,28.000,24.333 +2022-09-20,24.000,26.000,25.000,0,0,24.333,25.000 +2022-09-21,28.000,26.000,30.000,0,0,25.000,28.000 +2022-09-22,30.000,32.000,32.000,0,0,28.000,31.333 +2022-09-23,32.000,32.000,32.000,0,0,31.333,32.000 +2022-09-24,34.000,28.000,32.000,0,0,32.000,31.333 +2022-09-25,34.000,26.000,32.000,0,0,31.333,30.666 +2022-09-26,28.000,32.000,32.000,0,0,30.666,30.666 +2022-09-27,28.000,30.000,32.000,0,0,30.666,30.000 +2022-09-28,28.000,30.000,32.000,0,0,30.000,30.000 +2022-09-29,30.000,30.000,32.000,0,0,30.000,30.666 +2022-09-30,32.000,32.000,32.000,0,0,30.666,32.000 +2022-10-01,32.000,32.000,32.000,28.000,30.000,32.000,30.800 +2022-10-02,32.000,28.000,30.000,28.000,30.000,30.800,29.600 +2022-10-03,30.000,32.000,30.000,28.000,35.000,29.600,31.000 +2022-10-04,30.000,32.000,35.000,32.000,35.000,31.000,32.800 +2022-10-05,32.000,32.000,35.000,36.000,33.000,32.800,33.600 +2022-10-06,35.000,32.000,35.000,36.000,33.000,33.600,34.200 +2022-10-07,30.000,28.000,35.000,28.000,30.000,34.200,30.200 +2022-10-08,30.000,28.000,30.000,30.000,30.000,30.200,29.600 +2022-10-09,30.000,28.000,30.000,30.000,32.000,29.600,30.000 +2022-10-10,30.000,30.000,30.000,30.000,32.000,30.000,30.400 +2022-10-11,30.000,30.000,30.000,32.000,32.000,30.400,30.800 +2022-10-12,30.000,30.000,30.000,28.000,30.000,30.800,29.600 +2022-10-13,30.000,30.000,30.000,24.000,30.000,29.600,28.800 +2022-10-14,30.000,25.000,28.000,20.000,28.000,28.800,26.200 +2022-10-15,28.000,25.000,28.000,22.000,28.000,26.200,26.200 +2022-10-16,28.000,25.000,28.000,22.000,28.000,26.200,26.200 +2022-10-17,28.000,25.000,28.000,22.000,20.000,26.200,24.600 +2022-10-18,28.000,25.000,28.000,20.000,20.000,24.600,24.200 +2022-10-19,23.000,25.000,28.000,20.000,20.000,24.200,23.200 +2022-10-20,23.000,25.000,28.000,20.000,20.000,23.200,23.200 +2022-10-21,22.000,25.000,20.000,20.000,20.000,23.200,21.400 +2022-10-22,22.000,20.000,20.000,20.000,20.000,21.400,20.400 +2022-10-23,22.000,20.000,20.000,20.000,20.000,20.400,20.400 +2022-10-24,21.000,20.000,20.000,20.000,20.000,20.400,20.200 +2022-10-25,20.000,20.000,20.000,20.000,20.000,20.200,20.000 +2022-10-26,20.000,20.000,20.000,20.000,20.000,20.000,20.000 +2022-10-27,20.000,20.000,20.000,20.000,20.000,20.000,20.000 +2022-10-28,20.000,20.000,20.000,20.000,20.000,20.000,20.000 +2022-10-29,20.000,20.000,20.000,20.000,22.000,20.000,20.400 +2022-10-30,20.000,20.000,22.000,20.000,25.000,20.400,21.400 +2022-10-31,22.000,19.000,24.000,20.000,20.000,21.400,21.000 +2022-11-01,19.000,19.000,24.000,22.000,20.000,21.000,20.800 +2022-11-02,20.000,19.000,24.000,22.000,22.000,20.800,21.400 +2022-11-03,20.000,19.000,20.000,22.000,20.000,21.400,20.200 +2022-11-04,20.000,20.000,24.000,22.000,20.000,20.200,21.200 +2022-11-05,19.000,20.000,24.000,20.000,20.000,21.200,20.600 +2022-11-06,19.000,20.000,24.000,20.000,20.000,20.600,20.600 +2022-11-07,20.000,20.000,24.000,20.000,20.000,20.600,20.800 +2022-11-08,20.000,20.000,24.000,20.000,20.000,20.800,20.800 +2022-11-09,18.000,18.000,24.000,16.000,20.000,20.800,19.200 +2022-11-10,19.000,18.000,20.000,16.000,20.000,19.200,18.600 +2022-11-11,18.000,18.000,20.000,16.000,18.000,18.600,18.000 +2022-11-12,18.000,18.000,18.000,16.000,20.000,18.000,18.000 +2022-11-13,18.000,18.000,18.000,18.000,16.000,18.000,17.600 +2022-11-14,18.000,18.000,18.000,18.000,18.000,17.600,18.000 +2022-11-15,18.000,18.000,18.000,16.000,16.000,18.000,17.200 +2022-11-16,18.000,18.000,16.000,,18.000,, +2022-11-17,18.000,16.000,16.000,15.000,20.000,17.000,17.000 +2022-11-18,16.000,16.000,16.000,16.000,20.000,17.000,16.800 +2022-11-19,15.000,16.000,16.000,16.000,20.000,16.800,16.600 +2022-11-20,15.000,16.000,16.000,16.000,19.000,16.600,16.400 +2022-11-21,15.000,15.000,18.000,16.000,18.000,16.400,16.400 +2022-11-22,16.000,15.000,18.000,16.000,17.000,16.400,16.400 +2022-11-23,16.000,15.000,18.000,16.000,17.000,16.400,16.400 +2022-11-24,18.000,15.000,18.000,18.000,16.000,16.400,17.000 +2022-11-25,18.000,15.000,20.000,18.000,16.000,17.000,17.400 +2022-11-26,15.000,15.000,20.000,20.000,18.000,17.400,17.600 +2022-11-27,15.000,15.000,20.000,20.000,17.000,17.600,17.400 +2022-11-28,20.000,18.000,20.000,18.000,18.000,17.400,18.800 +2022-11-29,18.000,18.000,25.000,20.000,18.000,18.800,19.800 +2022-11-30,20.000,20.000,25.000,20.000,18.000,19.800,20.600 +2022-12-01,20.000,20.000,25.000,20.000,20.000,20.600,21.000 +2022-12-02,20.000,20.000,25.000,20.000,20.000,21.000,21.000 +2022-12-03,20.000,20.000,25.000,20.000,20.000,21.000,21.000 +2022-12-04,20.000,23.000,25.000,20.000,22.000,21.000,22.000 +2022-12-05,22.000,23.000,25.000,22.000,23.000,22.000,23.000 +2022-12-06,22.000,23.000,25.000,20.000,24.000,23.000,22.800 +2022-12-07,22.000,23.000,25.000,22.000,20.000,22.800,22.400 +2022-12-08,24.000,23.000,25.000,24.000,24.000,22.400,24.000 +2022-12-09,20.000,23.000,25.000,22.000,24.000,24.000,22.800 +2022-12-10,20.000,23.000,25.000,22.000,24.000,22.800,22.800 +2022-12-11,,23.000,25.000,22.000,24.000,22.800,22.800 +2022-12-12,24.000,23.000,25.000,22.000,25.000,22.800,23.800 +2022-12-13,22.000,23.000,25.000,22.000,24.000,23.800,23.200 +2022-12-14,22.000,22.000,25.000,22.000,24.000,23.200,23.000 +2022-12-15,20.000,22.000,25.000,22.000,22.000,23.000,22.200 +2022-12-16,20.000,23.000,25.000,22.000,22.000,22.200,22.400 +2022-12-17,20.000,23.000,25.000,22.000,24.000,22.400,22.800 +2022-12-18,22.000,23.000,25.000,22.000,,22.800,23.200 +2022-12-19,28.000,23.000,20.000,20.000,20.000,23.200,22.200 +2022-12-20,20.000,20.000,20.000,19.000,18.000,22.200,19.400 +2022-12-21,20.000,20.000,20.000,18.000,16.000,19.400,18.800 +2022-12-22,18.000,20.000,20.000,18.000,16.000,18.800,18.400 +2022-12-23,18.000,17.000,20.000,18.000,14.000,18.400,17.400 +2022-12-24,17.000,17.000,20.000,18.000,16.000,17.400,17.600 +2022-12-25,17.000,17.000,20.000,18.000,20.000,17.600,18.400 +2022-12-26,17.000,17.000,20.000,17.000,20.000,18.400,18.200 +2022-12-27,18.000,16.000,20.000,20.000,18.000,18.200,18.400 +2022-12-28,19.000,16.000,20.000,20.000,20.000,18.400,19.000 +2022-12-29,19.000,20.000,20.000,20.000,18.000,19.000,19.400 +2022-12-30,17.000,20.000,20.000,20.000,18.000,19.400,19.000 +2022-12-31,17.000,20.000,20.000,22.000,20.000,19.000,19.800 +2023-01-01,18.000,24.000,20.000,22.000,20.000,19.800,20.800 +2023-01-02,22.000,24.000,20.000,30.000,20.000,20.800,23.200 +2023-01-03,20.000,24.000,20.000,28.000,26.000,23.200,23.600 +2023-01-04,24.000,25.000,20.000,28.000,26.000,23.600,24.600 +2023-01-05,24.000,25.000,20.000,27.000,26.000,24.600,24.400 +2023-01-06,27.000,25.000,20.000,27.000,28.000,24.400,25.400 +2023-01-07,28.000,25.000,20.000,27.000,26.000,25.400,25.200 +2023-01-08,28.000,32.000,20.000,32.000,24.000,25.200,27.200 +2023-01-09,26.000,36.000,20.000,36.000,30.000,27.200,29.600 +2023-01-10,26.000,36.000,30.000,36.000,35.000,29.600,32.600 +2023-01-11,36.000,35.000,30.000,36.000,38.000,32.600,35.000 +2023-01-12,34.000,35.000,30.000,36.000,38.000,35.000,34.600 +2023-01-13,35.000,32.000,35.000,34.000,35.000,34.600,34.200 +2023-01-14,35.000,32.000,35.000,34.000,34.000,34.200,34.000 +2023-01-15,35.000,28.000,35.000,32.000,34.000,34.000,32.800 +2023-01-16,30.000,32.000,30.000,32.000,36.000,32.800,32.000 +2023-01-17,30.000,32.000,30.000,30.000,35.000,32.000,31.400 +2023-01-18,30.000,32.000,30.000,30.000,35.000,31.400,31.400 +2023-01-19,30.000,28.000,30.000,30.000,36.000,31.400,30.800 +2023-01-20,32.000,28.000,30.000,30.000,36.000,30.800,31.200 +2023-01-21,28.000,28.000,30.000,28.000,32.000,31.200,29.200 +2023-01-22,28.000,28.000,30.000,28.000,40.000,29.200,30.800 +2023-01-23,28.000,28.000,30.000,28.000,38.000,30.800,30.400 +2023-01-24,28.000,28.000,30.000,28.000,35.000,30.400,29.800 +2023-01-25,28.000,28.000,30.000,24.000,30.000,29.800,28.000 +2023-01-26,28.000,28.000,30.000,24.000,32.000,28.000,28.400 +2023-01-27,26.000,25.000,30.000,24.000,30.000,28.400,27.000 +2023-01-28,26.000,25.000,25.000,24.000,34.000,27.000,26.800 +2023-01-29,24.000,25.000,25.000,24.000,34.000,26.800,26.400 +2023-01-30,26.000,22.000,25.000,24.000,32.000,26.400,25.800 +2023-01-31,26.000,24.000,25.000,24.000,28.000,25.800,25.400 +2023-02-01,22.000,23.000,25.000,24.000,28.000,25.400,24.400 +2023-02-02,22.000,23.000,25.000,28.000,26.000,24.400,24.800 +2023-02-03,24.000,23.000,25.000,28.000,28.000,24.800,25.600 +2023-02-04,26.000,23.000,25.000,28.000,26.000,25.600,25.600 +2023-02-05,26.000,28.000,25.000,28.000,26.000,25.600,26.600 +2023-02-06,27.000,34.000,28.000,32.000,30.000,26.600,30.200 +2023-02-07,27.000,34.000,28.000,32.000,28.000,30.200,29.800 +2023-02-08,27.000,30.000,28.000,32.000,28.000,29.800,29.000 +2023-02-09,30.000,30.000,35.000,32.000,25.000,29.000,30.400 +2023-02-10,30.000,30.000,35.000,32.000,30.000,30.400,31.400 +2023-02-11,30.000,30.000,35.000,30.000,30.000,31.400,31.000 +2023-02-12,30.000,30.000,35.000,30.000,30.000,31.000,31.000 +2023-02-13,30.000,30.000,35.000,32.000,28.000,31.000,31.000 +2023-02-14,30.000,30.000,35.000,32.000,34.000,31.000,32.200 +2023-02-15,30.000,30.000,35.000,34.000,36.000,32.200,33.000 +2023-02-16,33.000,30.000,35.000,38.000,36.000,33.000,34.400 +2023-02-17,33.000,40.000,35.000,42.000,34.000,34.400,36.800 +2023-02-18,35.000,40.000,35.000,38.000,38.000,36.800,37.200 +2023-02-19,35.000,40.000,35.000,38.000,38.000,37.200,37.200 +2023-02-20,39.000,40.000,40.000,38.000,38.000,37.200,39.000 +2023-02-21,38.000,38.000,40.000,42.000,38.000,39.000,39.200 +2023-02-22,40.000,38.000,45.000,40.000,40.000,39.200,40.600 +2023-02-23,40.000,40.000,45.000,36.000,40.000,40.600,40.200 +2023-02-24,40.000,35.000,45.000,28.000,44.000,40.200,38.400 +2023-02-25,40.000,40.000,45.000,28.000,30.000,38.400,36.600 +2023-02-26,30.000,40.000,30.000,28.000,30.000,36.600,31.600 +2023-02-27,27.000,25.000,25.000,28.000,40.000,31.600,29.000 +2023-02-28,27.000,25.000,25.000,24.000,30.000,29.000,26.200 +2023-03-01,24.000,25.000,25.000,24.000,30.000,26.200,25.600 +2023-03-02,24.000,24.000,25.000,24.000,30.000,25.600,25.400 +2023-03-03,27.000,24.000,25.000,22.000,30.000,25.400,25.600 +2023-03-04,27.000,24.000,28.000,22.000,30.000,25.600,26.200 +2023-03-05,25.000,24.000,28.000,22.000,30.000,26.200,25.800 +2023-03-06,23.000,30.000,28.000,28.000,28.000,25.800,27.400 +2023-03-07,28.000,30.000,30.000,32.000,28.000,27.400,29.600 +2023-03-08,32.000,30.000,30.000,32.000,28.000,29.600,30.400 +2023-03-09,30.000,30.000,30.000,28.000,28.000,30.400,29.200 +2023-03-10,30.000,30.000,30.000,28.000,28.000,29.200,29.200 +2023-03-11,28.000,30.000,30.000,28.000,30.000,29.200,29.200 +2023-03-12,30.000,26.000,30.000,28.000,30.000,29.200,28.800 +2023-03-13,30.000,30.000,30.000,28.000,32.000,28.800,30.000 +2023-03-14,32.000,30.000,30.000,32.000,30.000,30.000,30.800 +2023-03-15,31.000,30.000,35.000,32.000,36.000,30.800,32.800 +2023-03-16,30.000,35.000,35.000,32.000,34.000,32.800,33.200 +2023-03-17,30.000,35.000,35.000,32.000,35.000,33.200,33.400 +2023-03-18,32.000,35.000,35.000,32.000,35.000,33.400,33.800 +2023-03-19,32.000,35.000,35.000,32.000,35.000,33.800,33.800 +2023-03-20,36.000,40.000,40.000,42.000,40.000,33.800,39.600 +2023-03-21,36.000,40.000,40.000,40.000,40.000,39.600,39.200 +2023-03-22,38.000,40.000,40.000,30.000,40.000,39.200,37.600 +2023-03-23,30.000,40.000,40.000,30.000,40.000,37.600,36.000 +2023-03-24,34.000,40.000,45.000,30.000,40.000,36.000,37.800 +2023-03-25,35.000,35.000,45.000,36.000,40.000,37.800,38.200 +2023-03-26,35.000,35.000,45.000,36.000,40.000,38.200,38.200 +2023-03-27,25.000,35.000,45.000,24.000,35.000,38.200,32.800 +2023-03-28,29.000,24.000,40.000,22.000,30.000,32.800,29.000 +2023-03-29,20.000,20.000,40.000,20.000,32.000,29.000,26.400 +2023-03-30,20.000,20.000,35.000,26.000,32.000,26.400,26.600 +2023-03-31,20.000,25.000,25.000,25.000,35.000,26.600,26.000 +2023-04-01,20.000,24.000,25.000,25.000,28.000,26.000,24.400 +2023-04-02,20.000,24.000,25.000,25.000,28.000,24.400,24.400 +2023-04-03,20.000,24.000,25.000,20.000,22.000,24.400,22.200 +2023-04-04,23.000,22.000,25.000,20.000,28.000,22.200,23.600 +2023-04-05,22.000,22.000,25.000,20.000,25.000,23.600,22.800 +2023-04-06,24.000,20.000,25.000,22.000,24.000,22.800,23.000 +2023-04-07,20.000,22.000,,24.000,24.000,, +2023-04-08,20.000,22.000,25.000,26.000,24.000,23.000,23.400 +2023-04-09,20.000,22.000,25.000,26.000,24.000,23.400,23.400 +2023-04-10,22.000,22.000,28.000,24.000,30.000,23.400,25.200 +2023-04-11,22.000,24.000,28.000,28.000,24.000,25.200,25.200 +2023-04-12,27.000,25.000,28.000,25.000,30.000,25.200,27.000 +2023-04-13,27.000,25.000,25.000,26.000,28.000,27.000,26.200 +2023-04-14,27.000,30.000,25.000,30.000,28.000,26.200,28.000 +2023-04-15,27.000,30.000,25.000,32.000,28.000,28.000,28.400 +2023-04-16,27.000,30.000,25.000,32.000,28.000,28.400,28.400 +2023-04-17,45.000,47.000,45.000,40.000,50.000,28.400,45.400 +2023-04-18,47.000,44.000,45.000,40.000,50.000,45.400,45.200 +2023-04-19,44.000,48.000,45.000,40.000,44.000,45.200,44.200 +2023-04-20,,42.000,45.000,26.000,30.000,44.200,38.200 +2023-04-21,38.000,40.000,45.000,30.000,35.000,38.200,37.600 +2023-04-22,38.000,40.000,45.000,30.000,35.000,37.600,37.600 +2023-04-23,38.000,42.000,45.000,30.000,35.000,37.600,38.000 +2023-04-24,38.000,35.000,35.000,40.000,35.000,38.000,36.600 +2023-04-25,35.000,30.000,35.000,35.000,40.000,36.600,35.000 +2023-04-26,33.000,30.000,30.000,18.000,24.000,35.000,27.000 +2023-04-27,24.000,30.000,30.000,18.000,35.000,27.000,27.400 +2023-04-28,24.000,20.000,30.000,18.000,20.000,27.400,22.400 +2023-04-29,20.000,20.000,30.000,20.000,32.000,22.400,24.400 +2023-04-30,20.000,20.000,30.000,20.000,32.000,24.400,24.400 +2023-05-01,20.000,20.000,30.000,20.000,32.000,24.400,24.400 +2023-05-02,22.000,24.000,25.000,22.000,24.000,24.400,23.400 +2023-05-03,22.000,24.000,25.000,20.000,24.000,23.400,23.000 +2023-05-04,24.000,22.000,25.000,17.000,22.000,23.000,22.000 +2023-05-05,24.000,22.000,25.000,18.000,28.000,22.000,23.400 +2023-05-06,22.000,20.000,25.000,18.000,20.000,23.400,21.000 +2023-05-07,22.000,20.000,25.000,18.000,20.000,21.000,21.000 +2023-05-08,26.000,30.000,25.000,26.000,28.000,21.000,27.000 +2023-05-09,26.000,24.000,25.000,30.000,28.000,27.000,26.600 +2023-05-10,28.000,25.000,25.000,30.000,28.000,26.600,27.200 +2023-05-11,28.000,30.000,25.000,30.000,26.000,27.200,27.800 +2023-05-12,28.000,30.000,25.000,30.000,28.000,27.800,28.200 +2023-05-13,30.000,30.000,25.000,30.000,28.000,28.200,28.600 +2023-05-14,30.000,30.000,25.000,30.000,28.000,28.600,28.600 +2023-05-15,30.000,35.000,35.000,35.000,32.000,28.600,33.400 +2023-05-16,30.000,35.000,35.000,32.000,38.000,33.400,34.000 +2023-05-17,30.000,35.000,35.000,30.000,32.000,34.000,32.400 +2023-05-18,30.000,34.000,35.000,28.000,32.000,32.400,31.800 +2023-05-19,34.000,34.000,35.000,28.000,35.000,31.800,33.200 +2023-05-20,34.000,34.000,35.000,28.000,35.000,33.200,33.200 +2023-05-21,31.000,34.000,35.000,28.000,35.000,33.200,32.600 +2023-05-22,33.000,28.000,28.000,30.000,38.000,32.600,31.400 +2023-05-23,30.000,30.000,30.000,28.000,36.000,31.400,30.800 +2023-05-24,30.000,30.000,30.000,24.000,32.000,30.800,29.200 +2023-05-25,25.000,28.000,30.000,24.000,36.000,29.200,28.600 +2023-05-26,27.000,25.000,30.000,24.000,36.000,28.600,28.400 +2023-05-27,28.000,24.000,28.000,28.000,36.000,28.400,28.800 +2023-05-28,28.000,25.000,28.000,28.000,36.000,28.800,29.000 +2023-05-29,26.000,25.000,28.000,24.000,35.000,29.000,27.600 +2023-05-30,23.000,25.000,28.000,26.000,32.000,27.600,26.800 +2023-05-31,25.000,25.000,30.000,24.000,34.000,26.800,27.600 +2023-06-01,24.000,25.000,30.000,24.000,34.000,27.600,27.400 +2023-06-02,24.000,25.000,30.000,24.000,34.000,27.400,27.400 +2023-06-03,24.000,25.000,30.000,26.000,34.000,27.400,27.800 +2023-06-04,26.000,25.000,30.000,26.000,33.000,27.800,28.000 +2023-06-05,28.000,25.000,28.000,26.000,26.000,28.000,26.600 +2023-06-06,23.000,25.000,28.000,24.000,28.000,26.600,25.600 +2023-06-07,24.000,25.000,28.000,24.000,28.000,25.600,25.800 +2023-06-08,24.000,25.000,28.000,24.000,26.000,25.800,25.400 +2023-06-09,24.000,25.000,28.000,24.000,32.000,25.400,26.600 +2023-06-10,24.000,25.000,28.000,24.000,30.000,26.600,26.200 +2023-06-11,24.000,25.000,28.000,24.000,30.000,26.200,26.200 +2023-06-12,23.000,25.000,28.000,24.000,32.000,26.200,26.400 +2023-06-13,23.000,25.000,28.000,24.000,20.000,26.400,24.000 +2023-06-14,21.000,25.000,28.000,24.000,30.000,24.000,25.600 +2023-06-15,26.000,25.000,28.000,24.000,28.000,25.600,26.200 +2023-06-16,26.000,25.000,28.000,24.000,28.000,26.200,26.200 +2023-06-17,26.000,25.000,28.000,24.000,28.000,26.200,26.200 +2023-06-18,24.000,25.000,28.000,24.000,28.000,26.200,25.800 +2023-06-19,24.000,25.000,28.000,24.000,28.000,25.800,25.800 +2023-06-20,24.000,25.000,28.000,24.000,28.000,25.800,25.800 +2023-06-21,24.000,25.000,28.000,24.000,28.000,25.800,25.800 +2023-06-22,26.000,25.000,28.000,27.000,28.000,25.800,26.800 +2023-06-23,30.000,25.000,28.000,32.000,28.000,26.800,28.600 +2023-06-24,30.000,26.000,28.000,32.000,28.000,28.600,28.800 +2023-06-25,30.000,26.000,28.000,32.000,28.000,28.800,28.800 +2023-06-26,30.000,38.000,38.000,36.000,36.000,28.800,35.600 +2023-06-27,27.000,35.000,38.000,36.000,38.000,35.600,34.800 +2023-06-28,27.000,34.000,38.000,30.000,40.000,34.800,33.800 +2023-06-29,33.000,34.000,38.000,30.000,40.000,33.800,35.000 +2023-06-30,33.000,34.000,38.000,30.000,40.000,35.000,35.000 +2023-07-01,35.000,34.000,38.000,30.000,34.000,35.000,34.200 +2023-07-02,37.000,34.000,38.000,30.000,34.000,34.200,34.600 +2023-07-03,22.000,35.000,35.000,34.000,34.000,34.600,32.000 +2023-07-04,24.000,35.000,35.000,34.000,35.000,32.000,32.600 +2023-07-05,36.000,33.000,35.000,26.000,35.000,32.600,33.000 +2023-07-06,27.000,30.000,28.000,24.000,34.000,33.000,28.600 +2023-07-07,22.000,25.000,28.000,24.000,34.000,28.600,26.600 +2023-07-08,22.000,25.000,28.000,24.000,34.000,26.600,26.600 +2023-07-09,23.000,25.000,28.000,24.000,34.000,26.600,26.800 +2023-07-10,23.000,25.000,28.000,24.000,30.000,26.800,26.000 +2023-07-11,25.000,25.000,28.000,26.000,24.000,26.000,25.600 +2023-07-12,23.000,22.000,28.000,26.000,25.000,25.600,24.800 +2023-07-13,24.000,22.000,28.000,26.000,24.000,24.800,24.800 +2023-07-14,22.000,22.000,28.000,26.000,25.000,24.800,24.600 +2023-07-15,22.000,22.000,28.000,26.000,20.000,24.600,23.600 +2023-07-16,22.000,22.000,28.000,26.000,20.000,23.600,23.600 +2023-07-17,24.000,22.000,28.000,22.000,25.000,23.600,24.200 +2023-07-18,24.000,22.000,22.000,22.000,25.000,24.200,23.000 +2023-07-19,25.000,22.000,22.000,22.000,25.000,23.000,23.200 +2023-07-20,24.000,25.000,22.000,22.000,20.000,23.200,22.600 +2023-07-21,24.000,24.000,22.000,24.000,20.000,22.600,22.800 +2023-07-22,24.000,22.000,22.000,24.000,24.000,22.800,23.200 +2023-07-23,24.000,22.000,22.000,24.000,24.000,23.200,23.200 +2023-07-24,24.000,20.000,25.000,24.000,24.000,23.200,23.400 +2023-07-25,24.000,20.000,25.000,24.000,24.000,23.400,23.400 +2023-07-26,23.000,20.000,25.000,22.000,20.000,23.400,22.000 +2023-07-27,21.000,20.000,25.000,24.000,20.000,22.000,22.000 +2023-07-28,25.000,20.000,24.000,28.000,24.000,22.000,24.200 +2023-07-29,22.000,22.000,24.000,28.000,24.000,24.200,24.000 +2023-07-30,22.000,22.000,24.000,28.000,24.000,24.000,24.000 +2023-07-31,24.000,25.000,28.000,24.000,24.000,24.000,25.000 +2023-08-01,24.000,25.000,28.000,26.000,24.000,25.000,25.400 +2023-08-02,24.000,25.000,28.000,24.000,26.000,25.400,25.400 +2023-08-03,25.000,25.000,28.000,28.000,24.000,25.400,26.000 +2023-08-04,25.000,25.000,28.000,28.000,24.000,26.000,26.000 +2023-08-05,25.000,25.000,28.000,28.000,24.000,26.000,26.000 +2023-08-06,25.000,25.000,28.000,28.000,24.000,26.000,26.000 +2023-08-07,26.000,25.000,28.000,24.000,24.000,26.000,25.400 +2023-08-08,26.000,25.000,28.000,24.000,24.000,25.400,25.400 +2023-08-09,26.000,25.000,28.000,24.000,24.000,25.400,25.400 +2023-08-10,20.000,25.000,28.000,24.000,24.000,25.400,24.200 +2023-08-11,24.000,25.000,28.000,24.000,24.000,24.200,25.000 +2023-08-12,24.000,25.000,28.000,24.000,24.000,25.000,25.000 +2023-08-13,24.000,25.000,28.000,24.000,24.000,25.000,25.000 +2023-08-14,25.000,25.000,28.000,22.000,28.000,25.000,25.600 +2023-08-15,25.000,24.000,28.000,26.000,28.000,25.600,26.200 +2023-08-16,27.000,24.000,28.000,32.000,30.000,26.200,28.200 +2023-08-17,27.000,24.000,28.000,32.000,30.000,28.200,28.200 +2023-08-18,30.000,29.000,28.000,30.000,30.000,28.200,29.400 +2023-08-19,30.000,29.000,28.000,30.000,30.000,29.400,29.400 +2023-08-20,30.000,29.000,28.000,30.000,30.000,29.400,29.400 +2023-08-21,30.000,30.000,28.000,34.000,34.000,29.400,31.200 +2023-08-22,30.000,30.000,28.000,34.000,34.000,31.200,31.200 +2023-08-23,28.000,30.000,30.000,34.000,34.000,31.200,31.200 +2023-08-24,30.000,32.000,30.000,36.000,37.000,31.200,33.000 +2023-08-25,30.000,35.000,35.000,36.000,34.000,33.000,34.000 +2023-08-26,30.000,35.000,35.000,36.000,38.000,34.000,34.800 +2023-08-27,28.000,35.000,35.000,36.000,38.000,34.800,34.400 +2023-08-28,36.000,38.000,38.000,38.000,38.000,34.400,37.600 +2023-08-29,34.000,38.000,38.000,38.000,38.000,37.600,37.200 +2023-08-30,36.000,38.000,38.000,36.000,40.000,37.200,37.600 +2023-08-31,36.000,38.000,38.000,34.000,35.000,37.600,36.200 +2023-09-01,35.000,35.000,35.000,30.000,30.000,36.200,33.000 +2023-09-02,35.000,35.000,35.000,30.000,35.000,33.000,34.000 +2023-09-03,35.000,35.000,35.000,30.000,35.000,34.000,34.000 +2023-09-04,20.000,22.000,25.000,24.000,34.000,34.000,25.000 +2023-09-05,20.000,22.000,25.000,24.000,32.000,25.000,24.600 +2023-09-06,25.000,22.000,25.000,24.000,24.000,24.600,24.000 +2023-09-07,23.000,22.000,25.000,24.000,24.000,24.000,23.600 +2023-09-08,21.000,22.000,25.000,24.000,20.000,23.600,22.400 +2023-09-09,21.000,20.000,25.000,24.000,20.000,22.400,22.000 +2023-09-10,21.000,20.000,25.000,24.000,,22.000,22.000 +2023-09-11,26.000,20.000,25.000,24.000,20.000,22.000,23.000 +2023-09-12,26.000,20.000,25.000,24.000,20.000,23.000,23.000 +2023-09-13,20.000,20.000,25.000,24.000,20.000,23.000,21.800 +2023-09-14,22.000,20.000,25.000,24.000,20.000,21.800,22.200 +2023-09-15,22.000,22.000,25.000,24.000,20.000,22.200,22.600 +2023-09-16,22.000,22.000,25.000,24.000,20.000,22.600,22.600 +2023-09-17,22.000,22.000,25.000,24.000,20.000,22.600,22.600 +2023-09-18,21.000,22.000,25.000,22.000,26.000,22.600,23.200 +2023-09-19,21.000,22.000,25.000,22.000,26.000,23.200,23.200 +2023-09-20,22.000,22.000,25.000,22.000,26.000,23.200,23.400 +2023-09-21,22.000,24.000,25.000,27.000,28.000,23.400,25.200 +2023-09-22,27.000,24.000,25.000,27.000,28.000,25.200,26.200 +2023-09-23,27.000,24.000,25.000,27.000,28.000,26.200,26.200 +2023-09-24,27.000,30.000,25.000,27.000,28.000,, +2023-09-25,33.000,30.000,32.000,35.000,34.000,27.400,32.800 +2023-09-26,33.000,35.000,32.000,32.000,34.000,32.800,33.200 +2023-09-27,28.000,35.000,35.000,36.000,34.000,33.200,33.600 +2023-09-28,28.000,27.000,35.000,36.000,34.000,33.600,32.000 +2023-09-29,26.000,27.000,35.000,36.000,34.000,32.000,31.600 +2023-09-30,29.000,30.000,35.000,36.000,40.000,31.600,34.000 +2023-10-01,29.000,30.000,35.000,36.000,40.000,34.000,34.000 +2023-10-02,30.000,34.000,30.000,33.000,40.000,34.000,33.400 +2023-10-03,33.000,30.000,35.000,30.000,30.000,33.400,31.600 +2023-10-04,31.000,30.000,35.000,25.000,30.000,31.600,30.200 +2023-10-05,31.000,30.000,35.000,25.000,24.000,30.200,29.000 +2023-10-06,27.000,24.000,35.000,24.000,24.000,29.000,26.800 +2023-10-07,25.000,26.000,28.000,24.000,26.000,26.800,25.800 +2023-10-08,25.000,26.000,28.000,24.000,26.000,25.800,25.800 +2023-10-09,25.000,26.000,28.000,22.000,26.000,25.800,25.400 +2023-10-10,25.000,24.000,28.000,,26.000,25.400,25.000 +2023-10-11,22.000,24.000,28.000,25.000,26.000,25.000,25.000 +2023-10-12,24.000,24.000,28.000,25.000,24.000,25.000,25.000 +2023-10-13,24.000,24.000,28.000,25.000,24.000,25.000,25.000 +2023-10-14,24.000,24.000,28.000,25.000,24.000,25.000,25.000 +2023-10-15,24.000,24.000,28.000,25.000,24.000,25.000,25.000 +2023-10-16,23.000,24.000,28.000,25.000,24.000,25.000,24.800 +2023-10-17,23.000,24.000,28.000,24.000,24.000,24.800,24.600 +2023-10-18,22.000,24.000,24.000,24.000,24.000,24.600,23.600 +2023-10-19,22.000,24.000,24.000,24.000,24.000,23.600,23.600 +2023-10-20,25.000,24.000,24.000,24.000,24.000,23.600,24.200 +2023-10-21,24.000,24.000,24.000,24.000,24.000,24.200,24.000 +2023-10-22,24.000,24.000,24.000,24.000,24.000,24.000,24.000 +2023-10-23,24.000,28.000,27.000,24.000,28.000,24.000,26.200 +2023-10-24,24.000,28.000,27.000,28.000,28.000,26.200,27.000 +2023-10-25,25.000,28.000,27.000,28.000,28.000,27.000,27.200 +2023-10-26,26.000,28.000,27.000,28.000,28.000,27.200,27.400 +2023-10-27,27.000,28.000,27.000,26.000,28.000,27.400,27.200 +2023-10-28,27.000,28.000,27.000,26.000,28.000,27.200,27.200 +2023-10-29,27.000,28.000,27.000,26.000,28.000,27.200,27.200 +2023-10-30,30.000,32.000,27.000,26.000,28.000,27.200,28.600 +2023-10-31,32.000,32.000,27.000,32.000,28.000,28.600,30.200 +2023-11-01,31.000,32.000,27.000,32.000,32.000,30.200,30.800 +2023-11-02,31.000,34.000,34.000,36.000,30.000,30.800,33.000 +2023-11-03,30.000,36.000,34.000,40.000,40.000,33.000,36.000 +2023-11-04,35.000,36.000,40.000,40.000,40.000,36.000,38.200 +2023-11-05,35.000,48.000,40.000,40.000,40.000,38.200,40.600 +2023-11-06,42.000,48.000,50.000,55.000,44.000,40.600,47.800 +2023-11-07,52.000,48.000,50.000,48.000,50.000,47.800,49.600 +2023-11-08,50.000,50.000,50.000,54.000,50.000,49.600,50.800 +2023-11-09,50.000,50.000,50.000,54.000,50.000,50.800,50.800 +2023-11-10,50.000,50.000,55.000,54.000,50.000,50.800,51.800 +2023-11-11,50.000,55.000,,54.000,50.000,51.800,52.800 +2023-11-12,50.000,55.000,55.000,54.000,50.000,52.800,52.800 +2023-11-13,55.000,50.000,55.000,48.000,50.000,52.800,51.600 +2023-11-14,50.000,50.000,50.000,48.000,46.000,51.600,48.800 +2023-11-15,49.000,50.000,50.000,42.000,46.000,48.800,47.400 +2023-11-16,47.000,50.000,50.000,42.000,46.000,47.400,47.000 +2023-11-17,49.000,50.000,50.000,42.000,46.000,47.000,47.400 +2023-11-18,47.000,46.000,50.000,42.000,46.000,47.400,46.200 +2023-11-19,47.000,46.000,50.000,42.000,46.000,46.200,46.200 +2023-11-20,53.000,56.000,50.000,56.000,56.000,46.200,54.200 +2023-11-21,49.000,56.000,50.000,60.000,56.000,54.200,54.200 +2023-11-22,54.000,65.000,58.000,64.000,56.000,54.200,59.400 +2023-11-23,60.000,65.000,58.000,60.000,56.000,59.400,59.800 +2023-11-24,58.000,65.000,58.000,60.000,56.000,59.800,59.400 +2023-11-25,60.000,65.000,58.000,62.000,56.000,, +2023-11-26,,62.000,58.000,62.000,56.000,60.200,59.600 +2023-11-27,64.000,62.000,58.000,65.000,56.000,59.600,61.000 +2023-11-28,61.000,62.000,65.000,65.000,66.000,61.000,63.800 +2023-11-29,61.000,62.000,65.000,65.000,66.000,63.800,63.800 +2023-11-30,60.000,75.000,65.000,60.000,80.000,63.800,68.000 +2023-12-01,78.000,75.000,75.000,72.000,80.000,68.000,76.000 +2023-12-02,78.000,75.000,75.000,72.000,80.000,76.000,76.000 +2023-12-03,78.000,75.000,75.000,72.000,80.000,76.000,76.000 +2023-12-04,80.000,78.000,85.000,75.000,80.000,76.000,79.600 +2023-12-05,79.000,78.000,85.000,76.000,80.000,79.600,79.600 +2023-12-06,79.000,78.000,85.000,76.000,80.000,79.600,79.600 +2023-12-07,80.000,80.000,85.000,76.000,80.000,, +2023-12-08,80.000,80.000,75.000,80.000,80.000,80.200,79.000 +2023-12-09,79.000,80.000,80.000,80.000,80.000,79.000,79.800 +2023-12-10,79.000,80.000,80.000,80.000,80.000,79.800,79.800 +2023-12-11,80.000,78.000,75.000,70.000,80.000,79.800,76.600 +2023-12-12,79.000,75.000,75.000,68.000,76.000,76.600,74.600 +2023-12-13,71.000,75.000,75.000,65.000,76.000,74.600,72.400 +2023-12-14,65.000,68.000,75.000,60.000,60.000,72.400,65.600 +2023-12-15,63.000,68.000,60.000,50.000,60.000,65.600,60.200 +2023-12-16,60.000,68.000,45.000,50.000,60.000,60.200,56.600 +2023-12-17,60.000,68.000,45.000,50.000,60.000,56.600,56.600 +2023-12-18,50.000,50.000,50.000,50.000,50.000,56.600,50.000 +2023-12-19,52.000,50.000,50.000,50.000,50.000,50.000,50.400 +2023-12-20,50.000,55.000,50.000,50.000,58.000,50.400,52.600 +2023-12-21,54.000,58.000,55.000,50.000,58.000,52.600,55.000 +2023-12-22,51.000,58.000,55.000,50.000,58.000,55.000,54.400 +2023-12-23,51.000,55.000,50.000,50.000,58.000,54.400,52.800 +2023-12-24,58.000,55.000,50.000,50.000,58.000,52.800,54.200 +2023-12-25,58.000,50.000,50.000,50.000,58.000,54.200,53.200 +2023-12-26,58.000,50.000,50.000,50.000,58.000,53.200,53.200 +2023-12-27,57.000,50.000,35.000,56.000,58.000,53.200,51.200 +2023-12-28,52.000,50.000,50.000,56.000,58.000,51.200,53.200 +2023-12-29,50.000,50.000,50.000,50.000,58.000,53.200,51.600 +2023-12-30,50.000,50.000,50.000,50.000,58.000,51.600,51.600 +2023-12-31,50.000,50.000,50.000,50.000,58.000,51.600,51.600 +2024-01-01,50.000,50.000,50.000,50.000,58.000,51.600,51.600 +2024-01-02,49.000,60.000,50.000,55.000,48.000,51.600,52.400 +2024-01-03,49.000,45.000,50.000,52.000,48.000,52.400,48.800 +2024-01-04,49.000,50.000,47.000,52.000,50.000,48.800,49.600 +2024-01-05,45.000,50.000,40.000,40.000,50.000,49.600,45.000 +2024-01-06,40.000,50.000,40.000,40.000,50.000,45.000,44.000 +2024-01-07,30.000,50.000,40.000,40.000,50.000,44.000,42.000 +2024-01-08,45.000,45.000,45.000,45.000,50.000,42.000,46.000 +2024-01-09,43.000,45.000,45.000,44.000,50.000,46.000,45.400 +2024-01-10,43.000,45.000,45.000,46.000,50.000,45.400,45.800 +2024-01-11,45.000,50.000,45.000,50.000,50.000,45.800,48.000 +2024-01-12,48.000,52.000,45.000,50.000,50.000,48.000,49.000 +2024-01-13,48.000,52.000,45.000,50.000,50.000,49.000,49.000 +2024-01-14,50.000,52.000,45.000,50.000,50.000,49.000,49.400 +2024-01-15,50.000,48.000,55.000,48.000,50.000,49.400,50.200 +2024-01-16,50.000,55.000,55.000,48.000,50.000,50.200,51.600 +2024-01-17,46.000,55.000,60.000,48.000,50.000,51.600,51.800 +2024-01-18,45.000,55.000,55.000,48.000,50.000,51.800,50.600 +2024-01-19,50.000,55.000,55.000,48.000,50.000,50.600,51.600 +2024-01-20,52.000,56.000,55.000,48.000,50.000,51.600,52.200 +2024-01-21,52.000,56.000,55.000,48.000,50.000,52.200,52.200 +2024-01-22,54.000,56.000,30.000,56.000,60.000,52.200,51.200 +2024-01-23,54.000,60.000,30.000,65.000,60.000,51.200,53.800 +2024-01-24,60.000,70.000,60.000,70.000,60.000,53.800,64.000 +2024-01-25,65.000,75.000,60.000,70.000,60.000,, +2024-01-26,,70.000,60.000,70.000,60.000,66.000,64.000 +2024-01-27,60.000,68.000,65.000,70.000,60.000,64.000,64.600 +2024-01-28,60.000,68.000,65.000,70.000,60.000,64.600,64.600 +2024-01-29,65.000,64.000,70.000,64.000,60.000,64.600,64.600 +2024-01-30,61.000,64.000,70.000,64.000,60.000,64.600,63.800 +2024-01-31,62.000,64.000,70.000,64.000,60.000,63.800,64.000 +2024-02-01,60.000,64.000,70.000,70.000,60.000,64.000,64.800 +2024-02-02,67.000,68.000,70.000,70.000,60.000,64.800,67.000 +2024-02-03,65.000,64.000,70.000,70.000,68.000,67.000,67.400 +2024-02-04,65.000,70.000,70.000,70.000,68.000,67.400,68.600 +2024-02-05,62.000,68.000,60.000,60.000,68.000,68.600,63.600 +2024-02-06,64.000,68.000,60.000,60.000,68.000,63.600,64.000 +2024-02-07,68.000,68.000,60.000,70.000,68.000,64.000,66.800 +2024-02-08,68.000,68.000,70.000,70.000,68.000,66.800,68.800 +2024-02-09,68.000,68.000,70.000,70.000,68.000,68.800,68.800 +2024-02-10,68.000,68.000,70.000,70.000,68.000,68.800,68.800 +2024-02-11,68.000,55.000,70.000,70.000,68.000,68.800,66.200 +2024-02-12,64.000,55.000,70.000,58.000,60.000,66.200,61.400 +2024-02-13,60.000,68.000,70.000,58.000,60.000,61.400,63.200 +2024-02-14,60.000,68.000,70.000,58.000,60.000,63.200,63.200 +2024-02-15,58.000,55.000,70.000,70.000,60.000,63.200,62.600 +2024-02-16,60.000,55.000,60.000,56.000,60.000,62.600,58.200 +2024-02-17,60.000,55.000,60.000,56.000,60.000,58.200,58.200 +2024-02-18,60.000,55.000,60.000,56.000,60.000,58.200,58.200 +2024-02-19,63.000,70.000,60.000,72.000,60.000,58.200,65.000 +2024-02-20,68.000,70.000,60.000,72.000,60.000,65.000,66.000 +2024-02-21,70.000,70.000,60.000,80.000,80.000,66.000,72.000 +2024-02-22,70.000,85.000,70.000,85.000,80.000,72.000,78.000 +2024-02-23,75.000,92.000,75.000,85.000,80.000,78.000,81.400 +2024-02-24,90.000,90.000,75.000,85.000,80.000,, +2024-02-25,90.000,90.000,75.000,85.000,80.000,84.000,84.000 +2024-02-26,90.000,90.000,90.000,80.000,80.000,84.000,86.000 +2024-02-27,80.000,90.000,85.000,85.000,80.000,86.000,84.000 +2024-02-28,80.000,90.000,85.000,85.000,80.000,84.000,84.000 +2024-02-29,89.000,90.000,85.000,85.000,90.000,84.000,87.800 +2024-03-01,90.000,90.000,85.000,85.000,70.000,87.800,84.000 +2024-03-02,90.000,85.000,85.000,85.000,70.000,84.000,83.000 +2024-03-03,92.000,67.000,85.000,85.000,70.000,83.000,79.800 +2024-03-04,80.000,67.000,75.000,65.000,70.000,79.800,71.400 +2024-03-05,60.000,62.000,75.000,56.000,60.000,71.400,62.600 +2024-03-06,58.000,62.000,75.000,56.000,60.000,62.600,62.200 +2024-03-07,60.000,55.000,65.000,60.000,60.000,62.200,60.000 +2024-03-08,60.000,55.000,65.000,55.000,60.000,60.000,59.000 +2024-03-09,48.000,50.000,65.000,60.000,46.000,59.000,53.800 +2024-03-10,48.000,50.000,55.000,60.000,46.000,53.800,51.800 +2024-03-11,48.000,50.000,55.000,60.000,46.000,51.800,51.800 +2024-03-12,55.000,45.000,45.000,55.000,46.000,51.800,49.200 +2024-03-13,55.000,45.000,60.000,60.000,50.000,49.200,54.000 +2024-03-14,55.000,50.000,60.000,60.000,50.000,54.000,55.000 +2024-03-15,45.000,50.000,60.000,60.000,50.000,55.000,53.000 +2024-03-16,,45.000,60.000,60.000,36.000,53.000,49.200 +2024-03-17,45.000,45.000,55.000,60.000,36.000,49.200,48.200 +2024-03-18,45.000,30.000,35.000,40.000,36.000,48.200,37.200 +2024-03-19,42.000,30.000,35.000,40.000,30.000,37.200,35.400 +2024-03-20,35.000,30.000,35.000,44.000,30.000,35.400,34.800 +2024-03-21,35.000,35.000,35.000,40.000,30.000,34.800,35.000 +2024-03-22,35.000,40.000,35.000,40.000,45.000,35.000,39.000 +2024-03-23,33.000,40.000,35.000,40.000,45.000,39.000,38.600 +2024-03-24,33.000,40.000,35.000,40.000,45.000,38.600,38.600 +2024-03-25,30.000,30.000,35.000,32.000,28.000,38.600,31.000 +2024-03-26,30.000,30.000,35.000,28.000,28.000,31.000,30.200 +2024-03-27,32.000,32.000,33.000,28.000,30.000,30.200,31.000 +2024-03-28,29.000,34.000,33.000,36.000,40.000,31.000,34.400 +2024-03-29,29.000,40.000,33.000,36.000,40.000,34.400,35.600 +2024-03-30,29.000,40.000,33.000,36.000,40.000,35.600,35.600 +2024-03-31,29.000,40.000,33.000,36.000,40.000,35.600,35.600 +2024-04-01,29.000,38.000,42.000,36.000,40.000,35.600,37.000 +2024-04-02,40.000,40.000,42.000,38.000,40.000,37.000,40.000 +2024-04-03,45.000,45.000,42.000,40.000,,40.000,42.400 +2024-04-04,47.000,45.000,42.000,34.000,40.000,42.400,41.600 +2024-04-05,43.000,40.000,40.000,34.000,40.000,41.600,39.400 +2024-04-06,43.000,40.000,40.000,34.000,40.000,39.400,39.400 +2024-04-07,43.000,40.000,40.000,40.000,40.000,39.400,40.600 +2024-04-08,43.000,46.000,40.000,50.000,40.000,40.600,43.800 +2024-04-09,43.000,46.000,68.000,44.000,40.000,43.800,48.200 +2024-04-10,43.000,46.000,68.000,44.000,40.000,48.200,48.200 +2024-04-11,43.000,46.000,45.000,44.000,40.000,48.200,43.600 +2024-04-12,43.000,46.000,45.000,44.000,40.000,43.600,43.600 +2024-04-13,43.000,46.000,45.000,44.000,40.000,43.600,43.600 +2024-04-14,43.000,46.000,45.000,44.000,40.000,43.600,43.600 +2024-04-15,43.000,34.000,45.000,44.000,34.000,43.600,40.000 +2024-04-16,30.000,34.000,35.000,32.000,34.000,40.000,33.000 +2024-04-17,30.000,34.000,35.000,31.000,34.000,33.000,32.800 +2024-04-18,28.000,30.000,30.000,30.000,34.000,32.800,30.400 +2024-04-19,28.000,36.000,30.000,35.000,34.000,30.400,32.600 +2024-04-20,30.000,36.000,30.000,35.000,34.000,32.600,33.000 +2024-04-21,32.000,36.000,30.000,35.000,34.000,33.000,33.400 +2024-04-22,30.000,32.000,45.000,35.000,40.000,33.400,36.400 +2024-04-23,38.000,38.000,45.000,38.000,40.000,36.400,39.800 +2024-04-24,38.000,38.000,45.000,38.000,40.000,39.800,39.800 +2024-04-25,38.000,38.000,45.000,40.000,40.000,39.800,40.200 +2024-04-26,38.000,38.000,45.000,44.000,40.000,40.200,41.000 +2024-04-27,41.000,35.000,45.000,44.000,40.000,41.000,41.000 +2024-04-28,41.000,35.000,45.000,44.000,40.000,41.000,41.000 +2024-04-29,44.000,44.000,,52.000,40.000,41.000,48.000 +2024-04-30,49.000,60.000,60.000,52.000,52.000,48.000,54.600 +2024-05-01,49.000,60.000,60.000,52.000,52.000,54.600,54.600 +2024-05-02,55.000,55.000,60.000,52.000,52.000,54.600,54.800 +2024-05-03,53.000,55.000,45.000,44.000,52.000,54.800,49.800 +2024-05-04,53.000,55.000,45.000,44.000,50.000,49.800,49.400 +2024-05-05,53.000,55.000,45.000,44.000,50.000,49.400,49.400 +2024-05-06,53.000,52.000,55.000,44.000,50.000,49.400,50.800 +2024-05-07,50.000,50.000,55.000,40.000,50.000,50.800,49.000 +2024-05-08,50.000,50.000,55.000,40.000,36.000,49.000,46.200 +2024-05-09,50.000,45.000,55.000,40.000,36.000,46.200,45.200 +2024-05-10,50.000,45.000,55.000,40.000,35.000,45.200,45.000 +2024-05-11,44.000,45.000,55.000,40.000,35.000,45.000,43.800 +2024-05-12,44.000,30.000,55.000,40.000,35.000,43.800,40.800 +2024-05-13,48.000,30.000,40.000,34.000,35.000,40.800,37.400 +2024-05-14,40.000,30.000,40.000,30.000,35.000,37.400,35.000 +2024-05-15,34.000,30.000,40.000,30.000,36.000,35.000,34.000 +2024-05-16,36.000,34.000,40.000,30.000,36.000,34.000,35.200 +2024-05-17,40.000,34.000,40.000,34.000,36.000,35.200,36.800 +2024-05-18,40.000,34.000,40.000,34.000,36.000,36.800,36.800 +2024-05-19,40.000,34.000,40.000,34.000,36.000,36.800,36.800 +2024-05-20,36.000,36.000,40.000,44.000,36.000,36.800,38.400 +2024-05-21,39.000,40.000,40.000,44.000,36.000,38.400,39.800 +2024-05-22,40.000,40.000,40.000,38.000,36.000,39.800,38.800 +2024-05-23,40.000,40.000,40.000,38.000,36.000,38.800,38.800 +2024-05-24,40.000,44.000,40.000,38.000,36.000,38.800,39.600 +2024-05-25,40.000,44.000,40.000,38.000,36.000,39.600,39.600 +2024-05-26,40.000,40.000,40.000,45.000,36.000,39.600,40.200 +2024-05-27,40.000,40.000,40.000,42.000,36.000,40.200,39.600 +2024-05-28,40.000,40.000,40.000,40.000,36.000,39.600,39.200 +2024-05-29,41.000,40.000,40.000,40.000,36.000,39.200,39.400 +2024-05-30,40.000,40.000,40.000,40.000,40.000,39.400,40.000 +2024-05-31,40.000,40.000,40.000,40.000,40.000,40.000,40.000 +2024-06-01,40.000,40.000,40.000,40.000,40.000,40.000,40.000 +2024-06-02,40.000,42.000,40.000,40.000,40.000,40.000,40.400 +2024-06-03,41.000,42.000,40.000,36.000,36.000,40.400,39.000 +2024-06-04,41.000,42.000,40.000,36.000,36.000,39.000,39.000 +2024-06-05,40.000,40.000,45.000,36.000,40.000,39.000,40.200 +2024-06-06,40.000,40.000,45.000,36.000,40.000,40.200,40.200 +2024-06-07,40.000,40.000,40.000,36.000,40.000,40.200,39.200 +2024-06-08,40.000,40.000,40.000,36.000,42.000,39.200,39.600 +2024-06-09,40.000,46.000,40.000,36.000,42.000,39.600,40.800 +2024-06-10,40.000,46.000,40.000,48.000,42.000,40.800,43.200 +2024-06-11,44.000,46.000,50.000,46.000,48.000,43.200,46.800 +2024-06-12,45.000,46.000,50.000,48.000,48.000,46.800,47.400 +2024-06-13,48.000,52.000,50.000,48.000,48.000,47.400,49.200 +2024-06-14,48.000,52.000,50.000,48.000,50.000,49.200,49.600 +2024-06-15,50.000,52.000,50.000,48.000,50.000,49.600,50.000 +2024-06-16,50.000,45.000,50.000,46.000,50.000,50.000,48.200 +2024-06-17,50.000,45.000,50.000,46.000,50.000,48.200,48.200 +2024-06-18,48.000,45.000,50.000,46.000,50.000,48.200,47.800 +2024-06-19,42.000,44.000,50.000,42.000,48.000,47.800,45.200 +2024-06-20,44.000,50.000,50.000,40.000,48.000,45.200,46.400 +2024-06-21,44.000,44.000,50.000,34.000,48.000,46.400,44.000 +2024-06-22,44.000,44.000,50.000,34.000,30.000,44.000,40.400 +2024-06-23,44.000,44.000,50.000,34.000,30.000,40.400,40.400 +2024-06-24,45.000,32.000,35.000,28.000,30.000,40.400,34.000 +2024-06-25,37.000,30.000,35.000,28.000,30.000,34.000,32.000 +2024-06-26,27.000,30.000,35.000,28.000,24.000,32.000,28.800 +2024-06-27,25.000,28.000,35.000,28.000,24.000,28.800,28.000 +2024-06-28,25.000,28.000,35.000,26.000,24.000,28.000,27.600 +2024-06-29,26.000,28.000,35.000,26.000,24.000,27.600,27.800 +2024-06-30,26.000,28.000,35.000,26.000,24.000,27.800,27.800 +2024-07-01,27.000,28.000,35.000,26.000,24.000,27.800,28.000 +2024-07-02,24.000,28.000,35.000,26.000,24.000,28.000,27.400 +2024-07-03,26.000,28.000,35.000,26.000,28.000,27.400,28.600 +2024-07-04,28.000,28.000,35.000,26.000,28.000,28.600,29.000 +2024-07-05,26.000,26.000,30.000,26.000,28.000,29.000,27.200 +2024-07-06,26.000,26.000,30.000,26.000,28.000,27.200,27.200 +2024-07-07,26.000,26.000,30.000,26.000,28.000,27.200,27.200 +2024-07-08,27.000,26.000,30.000,28.000,28.000,27.200,27.800 +2024-07-09,27.000,28.000,30.000,28.000,28.000,27.800,28.200 +2024-07-10,28.000,26.000,28.000,28.000,28.000,28.200,27.600 +2024-07-11,27.000,26.000,28.000,28.000,28.000,27.600,27.400 +2024-07-12,27.000,26.000,28.000,28.000,28.000,27.400,27.400 +2024-07-13,26.000,26.000,28.000,28.000,28.000,27.400,27.200 +2024-07-14,26.000,26.000,28.000,28.000,28.000,27.200,27.200 +2024-07-15,28.000,26.000,25.000,28.000,28.000,27.200,27.000 +2024-07-16,24.000,26.000,32.000,32.000,28.000,27.000,28.400 +2024-07-17,28.000,28.000,30.000,32.000,32.000,28.400,30.000 +2024-07-18,29.000,32.000,32.000,32.000,32.000,30.000,31.400 +2024-07-19,30.000,32.000,32.000,32.000,32.000,31.400,31.600 +2024-07-20,30.000,32.000,32.000,32.000,30.000,31.600,31.200 +2024-07-21,30.000,32.000,32.000,32.000,30.000,31.200,31.200 +2024-07-22,30.000,32.000,30.000,28.000,28.000,31.200,29.600 +2024-07-23,29.000,28.000,28.000,28.000,28.000,29.600,28.200 +2024-07-24,29.000,28.000,28.000,28.000,28.000,28.200,28.200 +2024-07-25,29.000,28.000,28.000,28.000,28.000,28.200,28.200 +2024-07-26,28.000,28.000,28.000,28.000,28.000,28.200,28.000 +2024-07-27,28.000,28.000,28.000,28.000,28.000,28.000,28.000 +2024-07-28,28.000,28.000,28.000,28.000,28.000,28.000,28.000 +2024-07-29,28.000,30.000,23.000,28.000,30.000,28.000,27.800 +2024-07-30,28.000,28.000,28.000,28.000,30.000,27.800,28.400 +2024-07-31,28.000,28.000,28.000,30.000,30.000,28.400,28.800 +2024-08-01,28.000,28.000,28.000,30.000,30.000,28.800,28.800 +2024-08-02,28.000,30.000,28.000,32.000,30.000,28.800,29.600 +2024-08-03,28.000,30.000,28.000,32.000,30.000,29.600,29.600 +2024-08-04,28.000,30.000,28.000,32.000,30.000,29.600,29.600 +2024-08-05,27.000,30.000,28.000,30.000,30.000,29.600,29.000 +2024-08-06,28.000,30.000,32.000,30.000,28.000,29.000,29.600 +2024-08-07,28.000,30.000,32.000,30.000,30.000,29.600,30.000 +2024-08-08,30.000,30.000,27.000,30.000,30.000,30.000,29.400 +2024-08-09,30.000,30.000,27.000,28.000,30.000,29.400,29.000 +2024-08-10,30.000,30.000,27.000,28.000,28.000,29.000,28.600 +2024-08-11,30.000,30.000,27.000,28.000,28.000,28.600,28.600 +2024-08-12,28.000,28.000,27.000,28.000,28.000,28.600,27.800 +2024-08-13,28.000,28.000,27.000,28.000,28.000,27.800,27.800 +2024-08-14,28.000,28.000,27.000,28.000,28.000,27.800,27.800 +2024-08-15,28.000,28.000,27.000,26.000,28.000,27.800,27.400 +2024-08-16,28.000,28.000,27.000,26.000,28.000,27.400,27.400 +2024-08-17,28.000,28.000,27.000,26.000,28.000,27.400,27.400 +2024-08-18,28.000,28.000,27.000,26.000,28.000,27.400,27.400 +2024-08-19,28.000,28.000,30.000,28.000,28.000,27.400,28.400 +2024-08-20,28.000,26.000,28.000,28.000,28.000,28.400,27.600 +2024-08-21,28.000,26.000,28.000,28.000,28.000,27.600,27.600 +2024-08-22,28.000,26.000,28.000,26.000,28.000,27.600,27.200 +2024-08-23,26.000,26.000,28.000,24.000,28.000,27.200,26.400 +2024-08-24,26.000,24.000,28.000,24.000,28.000,26.400,26.000 +2024-08-25,26.000,24.000,28.000,24.000,28.000,26.000,26.000 +2024-08-26,24.000,20.000,24.000,20.000,20.000,26.000,21.600 +2024-08-27,21.000,20.000,24.000,20.000,20.000,21.600,21.000 +2024-08-28,21.000,18.000,22.000,20.000,17.000,21.000,19.600 +2024-08-29,19.000,18.000,22.000,24.000,17.000,19.600,20.000 +2024-08-30,20.000,17.000,22.000,20.000,17.000,20.000,19.200 +2024-08-31,20.000,17.000,22.000,20.000,17.000,19.200,19.200 +2024-09-01,20.000,17.000,22.000,20.000,17.000,19.200,19.200 +2024-09-02,19.000,15.000,20.000,18.000,17.000,19.200,17.800 +2024-09-03,16.000,15.000,20.000,18.000,16.000,17.800,17.000 +2024-09-04,17.000,15.000,20.000,16.000,16.000,17.000,16.800 +2024-09-05,16.000,14.000,20.000,14.000,16.000,16.800,16.000 +2024-09-06,14.000,13.000,18.000,16.000,16.000,16.000,15.400 +2024-09-07,14.000,13.000,18.000,16.000,15.000,15.400,15.200 +2024-09-08,15.000,13.000,18.000,16.000,15.000,15.200,15.400 +2024-09-09,15.000,12.000,18.000,14.000,24.000,15.400,16.600 +2024-09-10,17.000,12.000,18.000,14.000,15.000,16.600,15.200 +2024-09-11,15.000,12.000,18.000,14.000,15.000,15.200,14.800 +2024-09-12,13.000,12.000,18.000,14.000,15.000,14.800,14.400 +2024-09-13,13.000,12.000,16.000,14.000,15.000,14.400,14.000 +2024-09-14,13.000,12.000,16.000,14.000,15.000,14.000,14.000 +2024-09-15,13.000,12.000,16.000,14.000,15.000,14.000,14.000 +2024-09-16,13.000,12.000,16.000,14.000,15.000,14.000,14.000 +2024-09-17,17.000,12.000,15.000,16.000,15.000,14.000,15.000 +2024-09-18,15.000,12.000,15.000,16.000,15.000,15.000,14.600 +2024-09-19,15.000,12.000,15.000,16.000,15.000,14.600,14.600 +2024-09-20,15.000,12.000,15.000,14.000,15.000,14.600,14.200 +2024-09-21,15.000,12.000,15.000,14.000,15.000,14.200,14.200 +2024-09-22,15.000,12.000,15.000,14.000,15.000,14.200,14.200 +2024-09-23,15.000,12.000,14.000,14.000,15.000,14.200,14.000 +2024-09-24,14.000,13.000,14.000,14.000,15.000,14.000,14.000 +2024-09-25,14.000,13.000,14.000,14.000,14.000,14.000,13.800 +2024-09-26,14.000,13.000,14.000,14.000,14.000,13.800,13.800 +2024-09-27,14.000,13.000,14.000,14.000,14.000,13.800,13.800 +2024-09-28,14.000,14.000,14.000,14.000,14.000,13.800,14.000 +2024-09-29,14.000,14.000,14.000,14.000,14.000,14.000,14.000 +2024-09-30,13.000,12.000,15.000,14.000,14.000,14.000,13.600 +2024-10-01,13.000,12.000,15.000,14.000,13.000,13.600,13.400 +2024-10-02,12.000,11.000,12.000,14.000,13.000,13.400,12.400 +2024-10-03,13.000,10.000,12.000,14.000,13.000,12.400,12.400 +2024-10-04,13.000,10.000,12.000,14.000,13.000,12.400,12.400 +2024-10-05,13.000,10.000,12.000,14.000,13.000,12.400,12.400 +2024-10-06,13.000,10.000,12.000,14.000,13.000,12.400,12.400 +2024-10-07,13.000,10.000,12.000,14.000,13.000,12.400,12.400 +2024-10-08,13.000,10.000,12.000,14.000,13.000,12.400,12.400 +2024-10-09,13.000,10.000,12.000,14.000,13.000,12.400,12.400 +2024-10-10,13.000,10.000,12.000,14.000,13.000,12.400,12.400 +2024-10-11,12.000,10.000,12.000,14.000,13.000,12.400,12.200 +2024-10-12,12.000,10.000,12.000,14.000,13.000,12.200,12.200 +2024-10-13,12.000,10.000,12.000,14.000,13.000,12.200,12.200 +2024-10-14,12.000,10.000,12.000,12.000,13.000,12.200,11.800 +2024-10-15,11.000,10.000,10.000,12.000,13.000,11.800,11.200 +2024-10-16,10.000,10.000,10.000,14.000,13.000,11.200,11.400 +2024-10-17,11.000,10.000,10.000,14.000,13.000,11.400,11.600 +2024-10-18,10.000,10.000,12.000,14.000,13.000,11.600,11.800 +2024-10-19,10.000,10.000,12.000,14.000,13.000,11.800,11.800 +2024-10-20,10.000,11.000,12.000,14.000,13.000,11.800,12.000 +2024-10-21,10.000,11.000,12.000,14.000,12.000,12.000,11.800 +2024-10-22,12.000,11.000,12.000,14.000,12.000,11.800,12.200 +2024-10-23,12.000,11.000,12.000,14.000,12.000,12.200,12.200 +2024-10-24,11.000,11.000,12.000,14.000,12.000,12.200,12.000 +2024-10-25,11.000,11.000,12.000,14.000,12.000,12.000,12.000 +2024-10-26,11.000,11.000,12.000,14.000,12.000,12.000,12.000 +2024-10-27,11.000,11.000,12.000,14.000,12.000,12.000,12.000 +2024-10-28,12.000,11.000,12.000,14.000,12.000,12.000,12.200 +2024-10-29,12.000,11.000,12.000,14.000,12.000,12.200,12.200 +2024-10-30,11.000,11.000,10.000,14.000,12.000,12.200,11.600 +2024-10-31,11.000,11.000,10.000,14.000,12.000,11.600,11.600 +2024-11-01,12.000,11.000,10.000,14.000,12.000,11.600,11.800 +2024-11-02,12.000,11.000,10.000,14.000,12.000,11.800,11.800 +2024-11-03,12.000,11.000,10.000,14.000,12.000,11.800,11.800 +2024-11-04,12.000,11.000,10.000,14.000,12.000,11.800,11.800 +2024-11-05,12.000,11.000,10.000,14.000,12.000,11.800,11.800 +2024-11-06,12.000,11.000,12.000,14.000,12.000,11.800,12.200 +2024-11-07,12.000,11.000,12.000,14.000,12.000,12.200,12.200 +2024-11-08,12.000,11.000,12.000,14.000,12.000,12.200,12.200 +2024-11-09,12.000,11.000,12.000,14.000,12.000,12.200,12.200 +2024-11-10,12.000,11.000,12.000,14.000,12.000,12.200,12.200 +2024-11-11,13.000,11.000,12.000,14.000,12.000,12.200,12.400 +2024-11-12,13.000,11.000,12.000,14.000,12.000,12.400,12.400 +2024-11-13,13.000,11.000,14.000,14.000,12.000,12.400,12.800 +2024-11-14,13.000,11.000,14.000,14.000,12.000,12.800,12.800 +2024-11-15,11.000,11.000,14.000,14.000,12.000,12.800,12.400 +2024-11-16,11.000,11.000,14.000,14.000,12.000,12.400,12.400 +2024-11-17,11.000,11.000,14.000,14.000,12.000,12.400,12.400 +2024-11-18,12.000,15.000,10.000,16.000,12.000,12.400,13.000 +2024-11-19,12.000,17.000,10.000,16.000,16.000,13.000,14.200 +2024-11-20,15.000,17.000,10.000,16.000,16.000,14.200,14.800 +2024-11-21,14.000,17.000,12.000,16.000,16.000,14.800,15.000 +2024-11-22,14.000,17.000,14.000,16.000,16.000,15.000,15.400 +2024-11-23,14.000,17.000,14.000,16.000,16.000,15.400,15.400 +2024-11-24,14.000,17.000,14.000,16.000,16.000,15.400,15.400 +2024-11-25,13.000,15.000,14.000,16.000,16.000,15.400,14.800 +2024-11-26,13.000,15.000,14.000,16.000,14.000,14.800,14.400 +2024-11-27,13.000,15.000,14.000,16.000,14.000,14.400,14.400 +2024-11-28,13.000,15.000,14.000,16.000,14.000,14.400,14.400 +2024-11-29,12.000,15.000,14.000,16.000,14.000,14.400,14.200 +2024-11-30,12.000,16.000,14.000,16.000,14.000,14.200,14.400 +2024-12-01,15.000,16.000,14.000,16.000,14.000,14.400,15.000 +2024-12-02,14.000,16.000,14.000,16.000,18.000,15.000,15.600 +2024-12-03,16.000,16.000,18.000,16.000,18.000,15.600,16.800 +2024-12-04,15.000,16.000,18.000,16.000,17.000,16.800,16.400 +2024-12-05,15.000,16.000,18.000,16.000,17.000,16.400,16.400 +2024-12-06,16.000,16.000,18.000,18.000,17.000,16.400,17.000 +2024-12-07,16.000,16.000,18.000,18.000,17.000,17.000,17.000 +2024-12-08,17.000,16.000,18.000,18.000,17.000,17.000,17.200 +2024-12-09,18.000,24.000,24.000,24.000,17.000,17.200,21.400 +2024-12-10,20.000,24.000,24.000,24.000,24.000,21.400,23.200 +2024-12-11,20.000,26.000,24.000,24.000,24.000,23.200,23.600 +2024-12-12,23.000,27.000,28.000,24.000,24.000,23.600,25.200 +2024-12-13,25.000,28.000,28.000,30.000,24.000,25.200,27.000 +2024-12-14,25.000,28.000,28.000,30.000,24.000,27.000,27.000 +2024-12-15,26.000,28.000,28.000,30.000,24.000,27.000,27.200 +2024-12-16,25.000,30.000,32.000,32.000,30.000,27.200,29.800 +2024-12-17,29.000,30.000,30.000,32.000,32.000,29.800,30.600 +2024-12-18,30.000,32.000,30.000,32.000,30.000,30.600,30.800 +2024-12-19,30.000,34.000,32.000,32.000,30.000,30.800,31.600 +2024-12-20,31.000,34.000,32.000,32.000,30.000,31.600,31.800 +2024-12-21,31.000,34.000,32.000,32.000,30.000,31.800,31.800 +2024-12-22,31.000,34.000,32.000,32.000,30.000,31.800,31.800 +2024-12-23,36.000,36.000,32.000,40.000,30.000,31.800,34.800 +2024-12-24,39.000,36.000,32.000,35.000,30.000,34.800,34.400 +2024-12-25,39.000,36.000,32.000,35.000,30.000,34.400,34.400 +2024-12-26,39.000,36.000,32.000,35.000,38.000,34.400,36.000 +2024-12-27,36.000,36.000,35.000,35.000,38.000,36.000,36.000 +2024-12-28,36.000,36.000,35.000,35.000,46.000,36.000,37.600 +2024-12-29,40.000,50.000,35.000,35.000,46.000,37.600,41.200 +2024-12-30,42.000,40.000,35.000,35.000,40.000,41.200,38.400 +2024-12-31,38.000,40.000,40.000,35.000,40.000,38.400,38.600 +2025-01-01,38.000,40.000,40.000,35.000,40.000,38.600,38.600 +2025-01-02,38.000,48.000,40.000,40.000,40.000,38.600,41.200 +2025-01-03,43.000,48.000,50.000,46.000,40.000,41.200,45.400 +2025-01-04,43.000,44.000,50.000,46.000,40.000,45.400,44.600 +2025-01-05,43.000,35.000,50.000,46.000,40.000,44.600,42.800 +2025-01-06,43.000,44.000,40.000,45.000,44.000,42.800,43.200 +2025-01-07,43.000,44.000,40.000,45.000,44.000,43.200,43.200 +2025-01-08,43.000,44.000,48.000,45.000,40.000,43.200,44.000 +2025-01-09,43.000,44.000,45.000,45.000,40.000,44.000,43.400 +2025-01-10,43.000,44.000,45.000,44.000,40.000,43.400,43.200 +2025-01-11,43.000,44.000,45.000,44.000,40.000,43.200,43.200 +2025-01-12,43.000,44.000,45.000,44.000,40.000,43.200,43.200 +2025-01-13,43.000,48.000,45.000,48.000,40.000,43.200,44.800 +2025-01-14,43.000,48.000,48.000,46.000,48.000,44.800,46.600 +2025-01-15,43.000,48.000,48.000,52.000,48.000,46.600,47.800 +2025-01-16,43.000,48.000,50.000,55.000,50.000,47.800,49.200 +2025-01-17,48.000,52.000,55.000,52.000,50.000,49.200,51.400 +2025-01-18,48.000,52.000,55.000,52.000,50.000,51.400,51.400 +2025-01-19,47.000,52.000,55.000,52.000,50.000,51.400,51.200 +2025-01-20,45.000,54.000,55.000,56.000,55.000,51.200,53.000 +2025-01-21,50.000,54.000,55.000,56.000,55.000,53.000,54.000 +2025-01-22,52.000,56.000,55.000,56.000,55.000,54.000,54.800 +2025-01-23,54.000,55.000,55.000,54.000,55.000,54.800,54.600 +2025-01-24,54.000,55.000,55.000,54.000,58.000,54.600,55.200 +2025-01-25,54.000,55.000,55.000,54.000,55.000,55.200,54.600 +2025-01-26,54.000,55.000,55.000,54.000,55.000,54.600,54.600 +2025-01-27,54.000,55.000,55.000,60.000,55.000,54.600,55.800 +2025-01-28,55.000,55.000,55.000,60.000,55.000,55.800,56.000 +2025-01-29,55.000,55.000,55.000,60.000,55.000,56.000,56.000 +2025-01-30,52.000,50.000,45.000,54.000,58.000,56.000,51.800 +2025-01-31,58.000,50.000,45.000,54.000,52.000,51.800,51.800 +2025-02-01,58.000,50.000,45.000,54.000,52.000,51.800,51.800 +2025-02-02,58.000,50.000,45.000,54.000,52.000,51.800,51.800 +2025-02-03,55.000,60.000,60.000,60.000,58.000,51.800,58.600 +2025-02-04,60.000,60.000,60.000,60.000,58.000,58.600,59.600 +2025-02-05,55.000,60.000,60.000,60.000,50.000,59.600,57.000 +2025-02-06,56.000,60.000,60.000,56.000,50.000,57.000,56.400 +2025-02-07,56.000,60.000,60.000,56.000,50.000,56.400,56.400 +2025-02-08,56.000,60.000,55.000,56.000,50.000,56.400,55.400 +2025-02-09,56.000,60.000,55.000,56.000,50.000,55.400,55.400 +2025-02-10,56.000,50.000,30.000,44.000,50.000,55.400,46.000 +2025-02-11,51.000,40.000,30.000,42.000,38.000,46.000,40.200 +2025-02-12,43.000,40.000,35.000,42.000,38.000,40.200,39.600 +2025-02-13,36.000,30.000,35.000,42.000,38.000,39.600,36.200 +2025-02-14,32.000,35.000,40.000,42.000,38.000,36.200,37.400 +2025-02-15,32.000,35.000,40.000,42.000,38.000,37.400,37.400 +2025-02-16,32.000,35.000,40.000,42.000,38.000,37.400,37.400 +2025-02-17,35.000,35.000,35.000,44.000,38.000,37.400,37.400 +2025-02-18,35.000,35.000,35.000,44.000,38.000,37.400,37.400 +2025-02-19,35.000,40.000,35.000,48.000,38.000,37.400,39.200 +2025-02-20,35.000,40.000,35.000,44.000,38.000,39.200,38.400 +2025-02-21,35.000,40.000,35.000,44.000,46.000,38.400,40.000 +2025-02-22,36.000,40.000,45.000,44.000,46.000,40.000,42.200 +2025-02-23,36.000,45.000,45.000,44.000,46.000,42.200,43.200 +2025-02-24,44.000,45.000,45.000,44.000,50.000,43.200,45.600 +2025-02-25,44.000,45.000,45.000,52.000,52.000,45.600,47.600 +2025-02-26,47.000,50.000,45.000,52.000,52.000,47.600,49.200 +2025-02-27,47.000,50.000,47.000,58.000,52.000,49.200,50.800 +2025-02-28,55.000,54.000,47.000,54.000,52.000,50.800,52.400 +2025-03-01,55.000,54.000,60.000,54.000,52.000,52.400,55.000 +2025-03-02,55.000,54.000,60.000,54.000,52.000,55.000,55.000 +2025-03-03,60.000,56.000,60.000,60.000,64.000,55.000,60.000 +2025-03-04,60.000,62.000,60.000,54.000,64.000,60.000,60.000 +2025-03-05,55.000,62.000,60.000,58.000,64.000,60.000,59.800 +2025-03-06,55.000,55.000,60.000,58.000,47.000,59.800,55.000 +2025-03-07,55.000,50.000,60.000,55.000,47.000,55.000,53.400 +2025-03-08,55.000,50.000,60.000,55.000,47.000,53.400,53.400 +2025-03-09,55.000,50.000,60.000,55.000,47.000,53.400,53.400 +2025-03-10,35.000,30.000,35.000,42.000,32.000,53.400,34.800 +2025-03-11,30.000,32.000,35.000,42.000,32.000,34.800,34.200 +2025-03-12,33.000,36.000,55.000,44.000,32.000,34.200,40.000 +2025-03-13,43.000,40.000,55.000,44.000,32.000,40.000,42.800 +2025-03-14,43.000,42.000,40.000,44.000,32.000,42.800,40.200 +2025-03-15,40.000,42.000,40.000,44.000,45.000,40.200,42.200 +2025-03-16,40.000,42.000,40.000,44.000,36.000,42.200,40.400 +2025-03-17,37.000,35.000,40.000,40.000,38.000,40.400,38.000 +2025-03-18,36.000,35.000,40.000,44.000,40.000,38.000,39.000 +2025-03-19,38.000,35.000,44.000,44.000,40.000,39.000,40.200 +2025-03-20,40.000,42.000,44.000,44.000,48.000,40.200,43.600 +2025-03-21,40.000,42.000,50.000,44.000,40.000,43.600,43.200 +2025-03-22,40.000,42.000,45.000,44.000,40.000,43.200,42.200 +2025-03-23,40.000,42.000,45.000,44.000,40.000,42.200,42.200 +2025-03-24,41.000,42.000,45.000,48.000,40.000,42.200,43.200 +2025-03-25,45.000,46.000,50.000,55.000,40.000,43.200,47.200 +2025-03-26,45.000,55.000,60.000,58.000,58.000,47.200,55.200 +2025-03-27,52.000,55.000,60.000,58.000,58.000,55.200,56.600 +2025-03-28,52.000,55.000,60.000,58.000,58.000,56.600,56.600 +2025-03-29,52.000,55.000,45.000,55.000,58.000,56.600,53.000 +2025-03-30,52.000,55.000,45.000,54.000,58.000,53.000,52.800 +2025-03-31,52.000,55.000,45.000,54.000,58.000,52.800,52.800 +2025-04-01,52.000,55.000,45.000,54.000,58.000,52.800,52.800 +2025-04-02,52.000,55.000,45.000,80.000,58.000,52.800,58.000 +2025-04-03,52.000,55.000,45.000,80.000,58.000,58.000,58.000 +2025-04-04,52.000,55.000,45.000,60.000,60.000,58.000,54.400 +2025-04-05,35.000,35.000,40.000,60.000,34.000,54.400,40.800 +2025-04-06,35.000,35.000,40.000,30.000,34.000,40.800,34.800 +2025-04-07,35.000,32.000,40.000,30.000,30.000,34.800,33.400 +2025-04-08,35.000,28.000,35.000,32.000,34.000,33.400,32.800 +2025-04-09,38.000,34.000,32.000,32.000,34.000,32.800,34.000 +2025-04-10,36.000,34.000,32.000,30.000,34.000,34.000,33.200 +2025-04-11,36.000,32.000,32.000,32.000,32.000,33.200,32.800 +2025-04-12,36.000,32.000,32.000,32.000,32.000,32.800,32.800 +2025-04-13,36.000,32.000,32.000,32.000,32.000,32.800,32.800 +2025-04-14,31.000,30.000,32.000,30.000,34.000,32.800,31.400 +2025-04-15,30.000,30.000,32.000,30.000,34.000,31.400,31.200 +2025-04-16,32.000,30.000,32.000,30.000,34.000,31.200,31.600 +2025-04-17,32.000,30.000,32.000,30.000,34.000,31.600,31.600 +2025-04-18,32.000,34.000,32.000,30.000,34.000,31.600,32.400 +2025-04-19,30.000,34.000,32.000,30.000,34.000,32.400,32.000 +2025-04-20,30.000,34.000,32.000,30.000,34.000,32.000,32.000 +2025-04-21,32.000,30.000,32.000,30.000,34.000,32.000,31.600 +2025-04-22,32.000,30.000,32.000,30.000,34.000,31.600,31.600 +2025-04-23,30.000,30.000,32.000,28.000,30.000,31.600,30.000 +2025-04-24,30.000,28.000,30.000,28.000,30.000,30.000,29.200 +2025-04-25,30.000,26.000,30.000,24.000,30.000,29.200,28.000 +2025-04-26,30.000,26.000,30.000,24.000,34.000,28.000,28.800 +2025-04-27,30.000,26.000,30.000,24.000,34.000,28.800,28.800 +2025-04-28,30.000,22.000,30.000,24.000,34.000,28.800,28.000 +2025-04-29,24.000,24.000,30.000,26.000,24.000,28.000,25.600 +2025-04-30,,26.000,30.000,24.000,24.000,25.600,25.600 +2025-05-01,24.000,24.000,30.000,24.000,24.000,25.600,25.200 +2025-05-02,24.000,24.000,27.000,24.000,24.000,25.200,24.600 +2025-05-03,24.000,24.000,27.000,24.000,24.000,24.600,24.600 +2025-05-04,26.000,24.000,27.000,24.000,24.000,24.600,25.000 +2025-05-05,25.000,24.000,27.000,24.000,24.000,25.000,24.800 +2025-05-06,25.000,22.000,27.000,24.000,24.000,24.800,24.400 +2025-05-07,25.000,22.000,27.000,24.000,24.000,24.400,24.400 +2025-05-08,24.000,22.000,20.000,24.000,24.000,24.400,22.800 +2025-05-09,21.000,22.000,20.000,24.000,24.000,22.800,22.200 +2025-05-10,22.000,22.000,20.000,24.000,24.000,22.200,22.400 +2025-05-11,22.000,22.000,20.000,24.000,24.000,22.400,22.400 +2025-05-12,22.000,22.000,20.000,24.000,22.000,22.400,22.000 +2025-05-13,22.000,22.000,20.000,22.000,22.000,22.000,21.600 +2025-05-14,20.000,20.000,18.000,20.000,22.000,21.600,20.000 +2025-05-15,22.000,20.000,18.000,20.000,22.000,20.000,20.400 +2025-05-16,19.000,20.000,18.000,20.000,22.000,20.400,19.800 +2025-05-17,19.000,20.000,18.000,20.000,16.000,19.800,18.600 +2025-05-18,20.000,20.000,18.000,20.000,16.000,18.600,18.800 +2025-05-19,19.000,20.000,18.000,24.000,16.000,18.800,19.400 +2025-05-20,19.000,20.000,18.000,24.000,16.000,19.400,19.400 +2025-05-21,21.000,20.000,22.000,24.000,22.000,19.400,21.800 +2025-05-22,20.000,20.000,22.000,22.000,22.000,21.800,21.200 +2025-05-23,20.000,20.000,22.000,24.000,22.000,21.200,21.600 +2025-05-24,20.000,20.000,22.000,24.000,24.000,21.600,22.000 +2025-05-25,20.000,20.000,22.000,24.000,24.000,22.000,22.000 +2025-05-26,20.000,22.000,22.000,24.000,24.000,22.000,22.400 +2025-05-27,20.000,22.000,22.000,24.000,,22.400,22.400 +2025-05-28,22.000,22.000,22.000,24.000,24.000,22.400,22.800 +2025-05-29,22.000,22.000,22.000,24.000,24.000,22.800,22.800 +2025-05-30,22.000,22.000,22.000,24.000,24.000,22.800,22.800 +2025-05-31,22.000,22.000,22.000,26.000,24.000,22.800,23.200 +2025-06-01,22.000,22.000,22.000,26.000,24.000,23.200,23.200 +2025-06-02,28.000,30.000,30.000,35.000,30.000,23.200,30.600 +2025-06-03,29.000,32.000,42.000,36.000,40.000,30.600,35.800 +2025-06-04,35.000,40.000,40.000,36.000,36.000,35.800,37.400 +2025-06-05,38.000,40.000,32.000,30.000,36.000,37.400,35.200 +2025-06-06,38.000,40.000,32.000,30.000,36.000,35.200,35.200 +2025-06-07,38.000,40.000,32.000,30.000,36.000,35.200,35.200 +2025-06-08,38.000,40.000,32.000,32.000,36.000,35.200,35.600 +2025-06-09,38.000,36.000,32.000,36.000,34.000,35.600,35.200 +2025-06-10,33.000,36.000,32.000,28.000,34.000,35.200,32.600 +2025-06-11,32.000,34.000,32.000,30.000,34.000,32.600,32.400 +2025-06-12,32.000,34.000,32.000,28.000,28.000,32.400,30.800 +2025-06-13,29.000,34.000,32.000,24.000,28.000,30.800,29.400 +2025-06-14,29.000,34.000,32.000,24.000,28.000,29.400,29.400 +2025-06-15,20.000,34.000,32.000,24.000,28.000,29.400,27.600 +2025-06-16,30.000,34.000,23.000,22.000,23.000,27.600,26.400 +2025-06-17,27.000,22.000,23.000,18.000,23.000,26.400,22.600 +2025-06-18,25.000,20.000,25.000,20.000,23.000,22.600,22.600 +2025-06-19,23.000,18.000,25.000,20.000,20.000,22.600,21.200 +2025-06-20,21.000,18.000,25.000,20.000,20.000,21.200,20.800 +2025-06-21,21.000,22.000,25.000,20.000,20.000,20.800,21.600 +2025-06-22,21.000,22.000,25.000,24.000,20.000,21.600,22.400 +2025-06-23,22.000,20.000,28.000,22.000,20.000,22.400,22.400 +2025-06-24,20.000,20.000,20.000,20.000,20.000,22.400,20.000 +2025-06-25,20.000,20.000,25.000,20.000,20.000,20.000,21.000 +2025-06-26,20.000,20.000,25.000,20.000,20.000,21.000,21.000 +2025-06-27,20.000,18.000,25.000,24.000,20.000,21.000,21.400 +2025-06-28,22.000,18.000,25.000,24.000,20.000,21.400,21.800 +2025-06-29,22.000,22.000,25.000,28.000,20.000,21.800,23.400 +2025-06-30,25.000,26.000,25.000,28.000,28.000,23.400,26.400 +2025-07-01,23.000,26.000,28.000,24.000,24.000,26.400,25.000 +2025-07-02,21.000,22.000,24.000,24.000,24.000,25.000,23.000 +2025-07-03,22.000,24.000,24.000,26.000,24.000,23.000,24.000 +2025-07-04,22.000,24.000,30.000,26.000,24.000,24.000,25.200 +2025-07-05,22.000,24.000,30.000,26.000,24.000,25.200,25.200 +2025-07-06,22.000,26.000,30.000,32.000,24.000,25.200,26.800 +2025-07-07,25.000,26.000,28.000,26.000,28.000,26.800,26.600 +2025-07-08,27.000,26.000,28.000,26.000,28.000,26.600,27.000 +2025-07-09,24.000,24.000,32.000,26.000,28.000,27.000,26.800 +2025-07-10,24.000,28.000,32.000,26.000,28.000,26.800,27.600 +2025-07-11,24.000,24.000,32.000,26.000,30.000,27.600,27.200 +2025-07-12,24.000,30.000,32.000,26.000,30.000,27.200,28.400 +2025-07-13,25.000,30.000,32.000,30.000,30.000,28.400,29.400 +2025-07-14,28.000,30.000,30.000,30.000,30.000,29.400,29.600 +2025-07-15,27.000,30.000,28.000,30.000,30.000,29.600,29.000 +2025-07-16,28.000,30.000,28.000,30.000,30.000,29.000,29.200 +2025-07-17,28.000,30.000,28.000,28.000,30.000,29.200,28.800 +2025-07-18,30.000,30.000,32.000,25.000,30.000,28.800,29.400 +2025-07-19,30.000,28.000,32.000,25.000,30.000,29.400,29.000 +2025-07-20,30.000,28.000,32.000,25.000,30.000,29.000,29.000 +2025-07-21,25.000,28.000,32.000,24.000,30.000,29.000,27.800 +2025-07-22,27.000,28.000,30.000,24.000,28.000,27.800,27.400 +2025-07-23,27.000,28.000,30.000,24.000,28.000,27.400,27.400 +2025-07-24,25.000,26.000,30.000,24.000,28.000,27.400,26.600 +2025-07-25,25.000,26.000,30.000,26.000,28.000,26.600,27.000 +2025-07-26,25.000,26.000,30.000,26.000,28.000,27.000,27.000 +2025-07-27,24.000,26.000,30.000,26.000,28.000,27.000,26.800 +2025-07-28,24.000,26.000,30.000,26.000,28.000,26.800,26.800 +2025-07-29,25.000,26.000,30.000,24.000,28.000,26.800,26.600 +2025-07-30,25.000,26.000,30.000,24.000,28.000,26.600,26.600 +2025-07-31,27.000,28.000,30.000,24.000,28.000,26.600,27.400 +2025-08-01,38.000,34.000,30.000,24.000,35.000,27.400,32.200 +2025-08-02,38.000,34.000,40.000,24.000,35.000,32.200,34.200 +2025-08-03,38.000,34.000,40.000,24.000,35.000,34.200,34.200 +2025-08-04,39.000,34.000,35.000,30.000,35.000,34.200,34.600 +2025-08-05,36.000,34.000,35.000,28.000,28.000,34.600,32.200 +2025-08-06,34.000,34.000,32.000,34.000,28.000,32.200,32.400 +2025-08-07,31.000,34.000,30.000,34.000,28.000,32.400,31.400 +2025-08-08,32.000,34.000,30.000,34.000,34.000,31.400,32.800 +2025-08-09,32.000,34.000,30.000,30.000,34.000,32.800,32.000 +2025-08-10,27.000,34.000,30.000,30.000,34.000,32.000,31.000 +2025-08-11,30.000,30.000,32.000,30.000,34.000,31.000,31.200 +2025-08-12,30.000,30.000,32.000,30.000,34.000,31.200,31.200 +2025-08-13,30.000,28.000,30.000,30.000,34.000,31.200,30.400 +2025-08-14,30.000,28.000,30.000,28.000,28.000,30.400,28.800 +2025-08-15,27.000,28.000,28.000,24.000,28.000,28.800,27.000 +2025-08-16,27.000,24.000,28.000,24.000,28.000,27.000,26.200 +2025-08-17,27.000,24.000,28.000,22.000,28.000,26.200,25.800 +2025-08-18,28.000,24.000,28.000,22.000,28.000,25.800,26.000 +2025-08-19,27.000,28.000,28.000,28.000,38.000,26.000,29.800 +2025-08-20,25.000,28.000,25.000,28.000,38.000,29.800,28.800 +2025-08-21,25.000,28.000,25.000,28.000,26.000,28.800,26.400 +2025-08-22,24.000,28.000,25.000,28.000,26.000,26.400,26.200 +2025-08-23,22.000,24.000,24.000,28.000,24.000,26.200,24.400 +2025-08-24,22.000,24.000,24.000,28.000,24.000,24.400,24.400 +2025-08-25,25.000,20.000,24.000,20.000,24.000,24.400,22.600 +2025-08-26,25.000,20.000,26.000,20.000,24.000,22.600,23.000 +2025-08-27,23.000,20.000,20.000,20.000,22.000,23.000,21.000 +2025-08-28,21.000,22.000,25.000,20.000,22.000,21.000,22.000 +2025-08-29,20.000,22.000,22.000,20.000,22.000,22.000,21.200 +2025-08-30,23.000,22.000,22.000,20.000,22.000,21.200,21.800 +2025-08-31,25.000,22.000,22.000,20.000,22.000,21.800,22.200 +2025-09-01,20.000,20.000,24.000,20.000,22.000,22.200,21.200 +2025-09-02,21.000,20.000,24.000,20.000,22.000,21.200,21.400 +2025-09-03,23.000,20.000,24.000,24.000,22.000,21.400,22.600 +2025-09-04,24.000,22.000,24.000,24.000,24.000,22.600,23.600 +2025-09-05,24.000,22.000,24.000,20.000,24.000,23.600,22.800 +2025-09-06,24.000,22.000,24.000,20.000,24.000,22.800,22.800 +2025-09-07,24.000,22.000,24.000,20.000,24.000,22.800,22.800 +2025-09-08,26.000,28.000,24.000,22.000,24.000,22.800,24.800 +2025-09-09,26.000,24.000,26.000,22.000,24.000,24.800,24.400 +2025-09-10,26.000,24.000,26.000,22.000,24.000,24.400,24.400 +2025-09-11,24.000,22.000,26.000,22.000,24.000,24.400,23.600 +2025-09-12,24.000,22.000,26.000,22.000,24.000,23.600,23.600 +2025-09-13,24.000,22.000,26.000,22.000,24.000,23.600,23.600 +2025-09-14,24.000,22.000,26.000,22.000,24.000,23.600,23.600 +2025-09-15,24.000,22.000,28.000,24.000,22.000,23.600,24.000 +2025-09-16,24.000,22.000,20.000,26.000,22.000,24.000,22.800 +2025-09-17,30.000,24.000,20.000,30.000,32.000,22.800,27.200 +2025-09-18,34.000,30.000,35.000,36.000,36.000,27.200,34.200 +2025-09-19,32.000,37.000,35.000,37.000,36.000,34.200,35.400 +2025-09-20,32.000,37.000,35.000,37.000,36.000,35.400,35.400 +2025-09-21,32.000,37.000,35.000,42.000,36.000,35.400,36.400 +2025-09-22,38.000,47.000,40.000,48.000,40.000,36.400,42.600 +2025-09-23,45.000,47.000,40.000,48.000,44.000,42.600,44.800 +2025-09-24,45.000,45.000,38.000,48.000,44.000,44.800,44.000 +2025-09-25,45.000,44.000,38.000,48.000,44.000,44.000,43.800 +2025-09-26,45.000,44.000,38.000,48.000,44.000,43.800,43.800 +2025-09-27,45.000,44.000,38.000,48.000,44.000,43.800,43.800 +2025-09-28,45.000,44.000,38.000,48.000,44.000,43.800,43.800 +2025-09-29,43.000,44.000,38.000,48.000,44.000,43.800,43.400 +2025-09-30,40.000,44.000,38.000,48.000,38.000,43.400,41.600 +2025-10-01,43.000,40.000,38.000,48.000,38.000,41.600,41.400 +2025-10-02,40.000,40.000,38.000,48.000,38.000,41.400,40.800 +2025-10-03,40.000,40.000,37.000,48.000,36.000,40.800,40.200 +2025-10-04,40.000,40.000,37.000,48.000,36.000,40.200,40.200 +2025-10-05,40.000,40.000,37.000,48.000,36.000,40.200,40.200 +2025-10-06,44.000,44.000,45.000,46.000,44.000,40.200,44.600 +2025-10-07,40.000,44.000,45.000,44.000,44.000,44.600,43.400 +2025-10-08,42.000,44.000,45.000,44.000,44.000,43.400,43.800 +2025-10-09,43.000,44.000,45.000,40.000,44.000,43.800,43.200 +2025-10-10,45.000,45.000,36.000,40.000,44.000,43.200,42.000 +2025-10-11,45.000,45.000,36.000,40.000,44.000,42.000,42.000 +2025-10-12,45.000,45.000,36.000,40.000,44.000,42.000,42.000 +2025-10-13,45.000,45.000,50.000,40.000,44.000,42.000,44.800 +2025-10-14,47.000,48.000,50.000,46.000,44.000,44.800,47.000 +2025-10-15,47.000,44.000,50.000,44.000,44.000,47.000,45.800 +2025-10-16,45.000,44.000,48.000,44.000,44.000,45.800,45.000 +2025-10-17,43.000,44.000,48.000,44.000,44.000,45.000,44.600 +2025-10-18,43.000,44.000,48.000,44.000,44.000,44.600,44.600 +2025-10-19,43.000,44.000,48.000,44.000,44.000,44.600,44.600 +2025-10-20,43.000,42.000,48.000,40.000,40.000,44.600,42.600 +2025-10-21,42.000,42.000,42.000,32.000,40.000,42.600,39.600 +2025-10-22,42.000,40.000,40.000,32.000,40.000,39.600,38.800 +2025-10-23,34.000,34.000,40.000,32.000,40.000,38.800,36.000 +2025-10-24,32.000,30.000,40.000,32.000,40.000,36.000,34.800 +2025-10-25,32.000,30.000,40.000,32.000,40.000,34.800,34.800 +2025-10-26,32.000,30.000,40.000,32.000,40.000,34.800,34.800 +2025-10-27,30.000,34.000,40.000,32.000,30.000,34.800,33.200 +2025-10-28,33.000,34.000,36.000,32.000,30.000,33.200,33.000 +2025-10-29,33.000,40.000,36.000,38.000,42.000,33.000,37.800 +2025-10-30,38.000,40.000,40.000,38.000,42.000,37.800,39.600 +2025-10-31,40.000,44.000,40.000,38.000,42.000,39.600,40.800 +2025-11-01,40.000,44.000,40.000,38.000,52.000,40.800,42.800 diff --git a/api/main.py b/api/main.py new file mode 100644 index 0000000..7936189 --- /dev/null +++ b/api/main.py @@ -0,0 +1,13 @@ +import os +from app import create_app + + +app = create_app() + + +if __name__ == "__main__": + app.run( + host="0.0.0.0", + port=int(os.getenv("PORT", "8000")), + debug=os.getenv("FLASK_DEBUG", "0") == "1", + ) \ No newline at end of file diff --git a/api/models/keriting/pasar_kreongan/config.json b/api/models/keriting/pasar_kreongan/config.json new file mode 100644 index 0000000..f27a2d5 --- /dev/null +++ b/api/models/keriting/pasar_kreongan/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Keriting", + "market": "Pasar_Kreongan", + "model": { + "neurons": 64, + "activation": "relu", + "learning_rate": 0.01, + "batch_size": 32, + "epochs": 100, + "optimizer": "Adam", + "time_step": 14 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 587, + "jumlah_sequence": 573, + "tanggal_awal": "2024-03-25", + "tanggal_akhir": "2025-11-01", + "loss_awal": 0.043749384582042694, + "loss_akhir": 0.003062221920117736 + }, + "files": { + "model": "model_keriting_pasar_kreongan.h5", + "scaler": "scaler_keriting_pasar_kreongan.pkl", + "config": "config.json" + }, + "created_at": "2026-10-07T08:39:14.713085" +} \ No newline at end of file diff --git a/api/models/keriting/pasar_kreongan/model_keriting_pasar_kreongan.h5 b/api/models/keriting/pasar_kreongan/model_keriting_pasar_kreongan.h5 new file mode 100644 index 0000000..267e72d Binary files /dev/null and b/api/models/keriting/pasar_kreongan/model_keriting_pasar_kreongan.h5 differ diff --git a/api/models/keriting/pasar_kreongan/scaler_keriting_pasar_kreongan.pkl b/api/models/keriting/pasar_kreongan/scaler_keriting_pasar_kreongan.pkl new file mode 100644 index 0000000..a934bea Binary files /dev/null and b/api/models/keriting/pasar_kreongan/scaler_keriting_pasar_kreongan.pkl differ diff --git a/api/models/keriting/pasar_mangli/config.json b/api/models/keriting/pasar_mangli/config.json new file mode 100644 index 0000000..404536d --- /dev/null +++ b/api/models/keriting/pasar_mangli/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Keriting", + "market": "Pasar_Mangli", + "model": { + "neurons": 64, + "activation": "relu", + "learning_rate": 0.01, + "batch_size": 32, + "epochs": 100, + "optimizer": "Adam", + "time_step": 14 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 144, + "jumlah_sequence": 130, + "tanggal_awal": "2025-06-10", + "tanggal_akhir": "2025-11-01", + "loss_awal": 0.12295424938201904, + "loss_akhir": 0.006369924172759056 + }, + "files": { + "model": "model_keriting_pasar_mangli.h5", + "scaler": "scaler_keriting_pasar_mangli.pkl", + "config": "config.json" + }, + "created_at": "2026-10-07T08:39:14.744300" +} \ No newline at end of file diff --git a/api/models/keriting/pasar_mangli/model_keriting_pasar_mangli.h5 b/api/models/keriting/pasar_mangli/model_keriting_pasar_mangli.h5 new file mode 100644 index 0000000..2037810 Binary files /dev/null and b/api/models/keriting/pasar_mangli/model_keriting_pasar_mangli.h5 differ diff --git a/api/models/keriting/pasar_mangli/scaler_keriting_pasar_mangli.pkl b/api/models/keriting/pasar_mangli/scaler_keriting_pasar_mangli.pkl new file mode 100644 index 0000000..36fd75c Binary files /dev/null and b/api/models/keriting/pasar_mangli/scaler_keriting_pasar_mangli.pkl differ diff --git a/api/models/keriting/pasar_wirolegi/config.json b/api/models/keriting/pasar_wirolegi/config.json new file mode 100644 index 0000000..067eb0b --- /dev/null +++ b/api/models/keriting/pasar_wirolegi/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Keriting", + "market": "Pasar_Wirolegi", + "model": { + "neurons": 64, + "activation": "relu", + "learning_rate": 0.01, + "batch_size": 32, + "epochs": 100, + "optimizer": "Adam", + "time_step": 14 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 75, + "jumlah_sequence": 61, + "tanggal_awal": "2022-10-03", + "tanggal_akhir": "2022-12-16", + "loss_awal": 0.035635966807603836, + "loss_akhir": 0.001526627573184669 + }, + "files": { + "model": "model_keriting_pasar_wirolegi.h5", + "scaler": "scaler_keriting_pasar_wirolegi.pkl", + "config": "config.json" + }, + "created_at": "2026-10-07T08:39:14.777439" +} \ No newline at end of file diff --git a/api/models/keriting/pasar_wirolegi/model_keriting_pasar_wirolegi.h5 b/api/models/keriting/pasar_wirolegi/model_keriting_pasar_wirolegi.h5 new file mode 100644 index 0000000..257e81e Binary files /dev/null and b/api/models/keriting/pasar_wirolegi/model_keriting_pasar_wirolegi.h5 differ diff --git a/api/models/keriting/pasar_wirolegi/scaler_keriting_pasar_wirolegi.pkl b/api/models/keriting/pasar_wirolegi/scaler_keriting_pasar_wirolegi.pkl new file mode 100644 index 0000000..da45c2c Binary files /dev/null and b/api/models/keriting/pasar_wirolegi/scaler_keriting_pasar_wirolegi.pkl differ diff --git a/api/models/merah/pasar_kreongan/config.json b/api/models/merah/pasar_kreongan/config.json new file mode 100644 index 0000000..75db788 --- /dev/null +++ b/api/models/merah/pasar_kreongan/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Merah", + "market": "Pasar_Kreongan", + "model": { + "neurons": 64, + "activation": "linear", + "learning_rate": 0.01, + "batch_size": 24, + "epochs": 50, + "optimizer": "Adam", + "time_step": 7 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 1462, + "jumlah_sequence": 1455, + "tanggal_awal": "2021-11-01", + "tanggal_akhir": "2025-11-01", + "loss_awal": 0.011226602829992771, + "loss_akhir": 0.001685838564299047 + }, + "files": { + "model": "model_merah_pasar_kreongan.h5", + "scaler": "scaler_merah_pasar_kreongan.pkl", + "config": "config.json" + }, + "created_at": "2026-09-20T23:58:40.791301" +} \ No newline at end of file diff --git a/api/models/merah/pasar_kreongan/model_merah_pasar_kreongan.h5 b/api/models/merah/pasar_kreongan/model_merah_pasar_kreongan.h5 new file mode 100644 index 0000000..a859e0a Binary files /dev/null and b/api/models/merah/pasar_kreongan/model_merah_pasar_kreongan.h5 differ diff --git a/api/models/merah/pasar_kreongan/scaler_merah_pasar_kreongan.pkl b/api/models/merah/pasar_kreongan/scaler_merah_pasar_kreongan.pkl new file mode 100644 index 0000000..0e35167 Binary files /dev/null and b/api/models/merah/pasar_kreongan/scaler_merah_pasar_kreongan.pkl differ diff --git a/api/models/merah/pasar_mangli/config.json b/api/models/merah/pasar_mangli/config.json new file mode 100644 index 0000000..6291203 --- /dev/null +++ b/api/models/merah/pasar_mangli/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Merah", + "market": "Pasar_Mangli", + "model": { + "neurons": 64, + "activation": "linear", + "learning_rate": 0.01, + "batch_size": 24, + "epochs": 50, + "optimizer": "Adam", + "time_step": 7 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 1126, + "jumlah_sequence": 1119, + "tanggal_awal": "2022-10-01", + "tanggal_akhir": "2025-11-01", + "loss_awal": 0.009805780835449696, + "loss_akhir": 0.0020311949774622917 + }, + "files": { + "model": "model_merah_pasar_mangli.h5", + "scaler": "scaler_merah_pasar_mangli.pkl", + "config": "config.json" + }, + "created_at": "2026-09-20T23:58:40.870281" +} \ No newline at end of file diff --git a/api/models/merah/pasar_mangli/model_merah_pasar_mangli.h5 b/api/models/merah/pasar_mangli/model_merah_pasar_mangli.h5 new file mode 100644 index 0000000..f20c43f Binary files /dev/null and b/api/models/merah/pasar_mangli/model_merah_pasar_mangli.h5 differ diff --git a/api/models/merah/pasar_mangli/scaler_merah_pasar_mangli.pkl b/api/models/merah/pasar_mangli/scaler_merah_pasar_mangli.pkl new file mode 100644 index 0000000..f106f5a Binary files /dev/null and b/api/models/merah/pasar_mangli/scaler_merah_pasar_mangli.pkl differ diff --git a/api/models/merah/pasar_tanjung/config.json b/api/models/merah/pasar_tanjung/config.json new file mode 100644 index 0000000..c5970c2 --- /dev/null +++ b/api/models/merah/pasar_tanjung/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Merah", + "market": "Pasar_Tanjung", + "model": { + "neurons": 64, + "activation": "linear", + "learning_rate": 0.01, + "batch_size": 24, + "epochs": 50, + "optimizer": "Adam", + "time_step": 7 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 1461, + "jumlah_sequence": 1454, + "tanggal_awal": "2021-11-02", + "tanggal_akhir": "2025-11-01", + "loss_awal": 0.008021093904972076, + "loss_akhir": 0.0015390263870358467 + }, + "files": { + "model": "model_merah_pasar_tanjung.h5", + "scaler": "scaler_merah_pasar_tanjung.pkl", + "config": "config.json" + }, + "created_at": "2026-09-20T23:58:40.751940" +} \ No newline at end of file diff --git a/api/models/merah/pasar_tanjung/model_merah_pasar_tanjung.h5 b/api/models/merah/pasar_tanjung/model_merah_pasar_tanjung.h5 new file mode 100644 index 0000000..65a3830 Binary files /dev/null and b/api/models/merah/pasar_tanjung/model_merah_pasar_tanjung.h5 differ diff --git a/api/models/merah/pasar_tanjung/scaler_merah_pasar_tanjung.pkl b/api/models/merah/pasar_tanjung/scaler_merah_pasar_tanjung.pkl new file mode 100644 index 0000000..29a59e0 Binary files /dev/null and b/api/models/merah/pasar_tanjung/scaler_merah_pasar_tanjung.pkl differ diff --git a/api/models/merah/pasar_tegal_besar/config.json b/api/models/merah/pasar_tegal_besar/config.json new file mode 100644 index 0000000..d45a90f --- /dev/null +++ b/api/models/merah/pasar_tegal_besar/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Merah", + "market": "Pasar_Tegal_Besar", + "model": { + "neurons": 64, + "activation": "linear", + "learning_rate": 0.01, + "batch_size": 24, + "epochs": 50, + "optimizer": "Adam", + "time_step": 7 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 1462, + "jumlah_sequence": 1455, + "tanggal_awal": "2021-11-01", + "tanggal_akhir": "2025-11-01", + "loss_awal": 0.010425683110952377, + "loss_akhir": 0.0022090484853833914 + }, + "files": { + "model": "model_merah_pasar_tegal_besar.h5", + "scaler": "scaler_merah_pasar_tegal_besar.pkl", + "config": "config.json" + }, + "created_at": "2026-09-20T23:58:40.836691" +} \ No newline at end of file diff --git a/api/models/merah/pasar_tegal_besar/model_merah_pasar_tegal_besar.h5 b/api/models/merah/pasar_tegal_besar/model_merah_pasar_tegal_besar.h5 new file mode 100644 index 0000000..3e02d25 Binary files /dev/null and b/api/models/merah/pasar_tegal_besar/model_merah_pasar_tegal_besar.h5 differ diff --git a/api/models/merah/pasar_tegal_besar/scaler_merah_pasar_tegal_besar.pkl b/api/models/merah/pasar_tegal_besar/scaler_merah_pasar_tegal_besar.pkl new file mode 100644 index 0000000..82d0f70 Binary files /dev/null and b/api/models/merah/pasar_tegal_besar/scaler_merah_pasar_tegal_besar.pkl differ diff --git a/api/models/merah/pasar_wirolegi/config.json b/api/models/merah/pasar_wirolegi/config.json new file mode 100644 index 0000000..db6ffd7 --- /dev/null +++ b/api/models/merah/pasar_wirolegi/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Merah", + "market": "Pasar_Wirolegi", + "model": { + "neurons": 64, + "activation": "linear", + "learning_rate": 0.01, + "batch_size": 24, + "epochs": 50, + "optimizer": "Adam", + "time_step": 7 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 1124, + "jumlah_sequence": 1117, + "tanggal_awal": "2022-10-01", + "tanggal_akhir": "2025-11-01", + "loss_awal": 0.007541376631706953, + "loss_akhir": 0.0022759095299988985 + }, + "files": { + "model": "model_merah_pasar_wirolegi.h5", + "scaler": "scaler_merah_pasar_wirolegi.pkl", + "config": "config.json" + }, + "created_at": "2026-09-20T23:58:40.909924" +} \ No newline at end of file diff --git a/api/models/merah/pasar_wirolegi/model_merah_pasar_wirolegi.h5 b/api/models/merah/pasar_wirolegi/model_merah_pasar_wirolegi.h5 new file mode 100644 index 0000000..2f5a060 Binary files /dev/null and b/api/models/merah/pasar_wirolegi/model_merah_pasar_wirolegi.h5 differ diff --git a/api/models/merah/pasar_wirolegi/scaler_merah_pasar_wirolegi.pkl b/api/models/merah/pasar_wirolegi/scaler_merah_pasar_wirolegi.pkl new file mode 100644 index 0000000..7732730 Binary files /dev/null and b/api/models/merah/pasar_wirolegi/scaler_merah_pasar_wirolegi.pkl differ diff --git a/api/models/rawit/pasar_kreongan/config.json b/api/models/rawit/pasar_kreongan/config.json new file mode 100644 index 0000000..594635b --- /dev/null +++ b/api/models/rawit/pasar_kreongan/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Rawit", + "market": "Pasar_Kreongan", + "model": { + "neurons": 64, + "activation": "tanh", + "learning_rate": 0.05, + "batch_size": 32, + "epochs": 50, + "optimizer": "Adam", + "time_step": 7 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 1462, + "jumlah_sequence": 1455, + "tanggal_awal": "2021-11-01", + "tanggal_akhir": "2025-11-01", + "loss_awal": 0.03841866925358772, + "loss_akhir": 0.002082317601889372 + }, + "files": { + "model": "model_rawit_pasar_kreongan.h5", + "scaler": "scaler_rawit_pasar_kreongan.pkl", + "config": "config.json" + }, + "created_at": "2026-09-19T12:25:26.940616" +} \ No newline at end of file diff --git a/api/models/rawit/pasar_kreongan/model_rawit_pasar_kreongan.h5 b/api/models/rawit/pasar_kreongan/model_rawit_pasar_kreongan.h5 new file mode 100644 index 0000000..bf5ffd9 Binary files /dev/null and b/api/models/rawit/pasar_kreongan/model_rawit_pasar_kreongan.h5 differ diff --git a/api/models/rawit/pasar_kreongan/scaler_rawit_pasar_kreongan.pkl b/api/models/rawit/pasar_kreongan/scaler_rawit_pasar_kreongan.pkl new file mode 100644 index 0000000..58777f3 Binary files /dev/null and b/api/models/rawit/pasar_kreongan/scaler_rawit_pasar_kreongan.pkl differ diff --git a/api/models/rawit/pasar_mangli/config.json b/api/models/rawit/pasar_mangli/config.json new file mode 100644 index 0000000..ba02279 --- /dev/null +++ b/api/models/rawit/pasar_mangli/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Rawit", + "market": "Pasar_Mangli", + "model": { + "neurons": 64, + "activation": "tanh", + "learning_rate": 0.05, + "batch_size": 32, + "epochs": 50, + "optimizer": "Adam", + "time_step": 7 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 1126, + "jumlah_sequence": 1119, + "tanggal_awal": "2022-10-01", + "tanggal_akhir": "2025-11-01", + "loss_awal": 0.07843399047851562, + "loss_akhir": 0.002254883525893092 + }, + "files": { + "model": "model_rawit_pasar_mangli.h5", + "scaler": "scaler_rawit_pasar_mangli.pkl", + "config": "config.json" + }, + "created_at": "2026-09-19T12:25:26.985791" +} \ No newline at end of file diff --git a/api/models/rawit/pasar_mangli/model_rawit_pasar_mangli.h5 b/api/models/rawit/pasar_mangli/model_rawit_pasar_mangli.h5 new file mode 100644 index 0000000..79422d6 Binary files /dev/null and b/api/models/rawit/pasar_mangli/model_rawit_pasar_mangli.h5 differ diff --git a/api/models/rawit/pasar_mangli/scaler_rawit_pasar_mangli.pkl b/api/models/rawit/pasar_mangli/scaler_rawit_pasar_mangli.pkl new file mode 100644 index 0000000..58cf16e Binary files /dev/null and b/api/models/rawit/pasar_mangli/scaler_rawit_pasar_mangli.pkl differ diff --git a/api/models/rawit/pasar_tanjung/config.json b/api/models/rawit/pasar_tanjung/config.json new file mode 100644 index 0000000..d9395b1 --- /dev/null +++ b/api/models/rawit/pasar_tanjung/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Rawit", + "market": "Pasar_Tanjung", + "model": { + "neurons": 64, + "activation": "tanh", + "learning_rate": 0.05, + "batch_size": 32, + "epochs": 50, + "optimizer": "Adam", + "time_step": 7 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 1462, + "jumlah_sequence": 1455, + "tanggal_awal": "2021-11-01", + "tanggal_akhir": "2025-11-01", + "loss_awal": 0.06235548108816147, + "loss_akhir": 0.0018674645107239485 + }, + "files": { + "model": "model_rawit_pasar_tanjung.h5", + "scaler": "scaler_rawit_pasar_tanjung.pkl", + "config": "config.json" + }, + "created_at": "2026-09-19T12:25:26.921200" +} \ No newline at end of file diff --git a/api/models/rawit/pasar_tanjung/model_rawit_pasar_tanjung.h5 b/api/models/rawit/pasar_tanjung/model_rawit_pasar_tanjung.h5 new file mode 100644 index 0000000..938b012 Binary files /dev/null and b/api/models/rawit/pasar_tanjung/model_rawit_pasar_tanjung.h5 differ diff --git a/api/models/rawit/pasar_tanjung/scaler_rawit_pasar_tanjung.pkl b/api/models/rawit/pasar_tanjung/scaler_rawit_pasar_tanjung.pkl new file mode 100644 index 0000000..3aec76c Binary files /dev/null and b/api/models/rawit/pasar_tanjung/scaler_rawit_pasar_tanjung.pkl differ diff --git a/api/models/rawit/pasar_tegal_besar/config.json b/api/models/rawit/pasar_tegal_besar/config.json new file mode 100644 index 0000000..ae6d2a9 --- /dev/null +++ b/api/models/rawit/pasar_tegal_besar/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Rawit", + "market": "Pasar_Tegal_Besar", + "model": { + "neurons": 64, + "activation": "tanh", + "learning_rate": 0.05, + "batch_size": 32, + "epochs": 50, + "optimizer": "Adam", + "time_step": 7 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 1462, + "jumlah_sequence": 1455, + "tanggal_awal": "2021-11-01", + "tanggal_akhir": "2025-11-01", + "loss_awal": 0.10447828471660614, + "loss_akhir": 0.0019537468906491995 + }, + "files": { + "model": "model_rawit_pasar_tegal_besar.h5", + "scaler": "scaler_rawit_pasar_tegal_besar.pkl", + "config": "config.json" + }, + "created_at": "2026-09-19T12:25:26.962971" +} \ No newline at end of file diff --git a/api/models/rawit/pasar_tegal_besar/model_rawit_pasar_tegal_besar.h5 b/api/models/rawit/pasar_tegal_besar/model_rawit_pasar_tegal_besar.h5 new file mode 100644 index 0000000..6feba6a Binary files /dev/null and b/api/models/rawit/pasar_tegal_besar/model_rawit_pasar_tegal_besar.h5 differ diff --git a/api/models/rawit/pasar_tegal_besar/scaler_rawit_pasar_tegal_besar.pkl b/api/models/rawit/pasar_tegal_besar/scaler_rawit_pasar_tegal_besar.pkl new file mode 100644 index 0000000..ff0e48e Binary files /dev/null and b/api/models/rawit/pasar_tegal_besar/scaler_rawit_pasar_tegal_besar.pkl differ diff --git a/api/models/rawit/pasar_wirolegi/config.json b/api/models/rawit/pasar_wirolegi/config.json new file mode 100644 index 0000000..56e2fb3 --- /dev/null +++ b/api/models/rawit/pasar_wirolegi/config.json @@ -0,0 +1,29 @@ +{ + "chili": "Cabai Rawit", + "market": "Pasar_Wirolegi", + "model": { + "neurons": 64, + "activation": "tanh", + "learning_rate": 0.05, + "batch_size": 32, + "epochs": 50, + "optimizer": "Adam", + "time_step": 7 + }, + "training": { + "seed": 42, + "shuffle": true, + "jumlah_data": 1123, + "jumlah_sequence": 1116, + "tanggal_awal": "2022-10-01", + "tanggal_akhir": "2025-11-01", + "loss_awal": 0.10417161136865616, + "loss_akhir": 0.0018767464207485318 + }, + "files": { + "model": "model_rawit_pasar_wirolegi.h5", + "scaler": "scaler_rawit_pasar_wirolegi.pkl", + "config": "config.json" + }, + "created_at": "2026-09-19T12:25:27.010573" +} \ No newline at end of file diff --git a/api/models/rawit/pasar_wirolegi/model_rawit_pasar_wirolegi.h5 b/api/models/rawit/pasar_wirolegi/model_rawit_pasar_wirolegi.h5 new file mode 100644 index 0000000..9ef9cec Binary files /dev/null and b/api/models/rawit/pasar_wirolegi/model_rawit_pasar_wirolegi.h5 differ diff --git a/api/models/rawit/pasar_wirolegi/scaler_rawit_pasar_wirolegi.pkl b/api/models/rawit/pasar_wirolegi/scaler_rawit_pasar_wirolegi.pkl new file mode 100644 index 0000000..7ca4f68 Binary files /dev/null and b/api/models/rawit/pasar_wirolegi/scaler_rawit_pasar_wirolegi.pkl differ diff --git a/api/requirements.txt b/api/requirements.txt new file mode 100644 index 0000000..24b36e2 --- /dev/null +++ b/api/requirements.txt @@ -0,0 +1,11 @@ +Flask +flask-cors +pandas +numpy +scikit-learn +joblib +tensorflow==2.10.0 +pytest +PyMySQL +requests +lxml \ No newline at end of file diff --git a/api/restart_backend.ps1 b/api/restart_backend.ps1 new file mode 100644 index 0000000..05bd0b5 --- /dev/null +++ b/api/restart_backend.ps1 @@ -0,0 +1,39 @@ +$ErrorActionPreference = "Stop" + +$apiDir = Split-Path -Parent $MyInvocation.MyCommand.Path +$python = "C:\Users\alfia\anaconda3\envs\tf_gpu39\python.exe" +$port = 8000 + +if (-not (Test-Path $python)) { + throw "Python environment tf_gpu39 tidak ditemukan: $python" +} + +Write-Host "Menghentikan proses backend PrediksiHargaCabe..." +$projectProcesses = Get-CimInstance Win32_Process | Where-Object { + $_.ProcessId -ne $PID -and + $_.CommandLine -and + $_.CommandLine -match [regex]::Escape($apiDir) -and + $_.CommandLine -match "main\.py|flask|waitress|gunicorn" +} + +foreach ($process in $projectProcesses) { + Write-Host " Stop PID $($process.ProcessId)" + Stop-Process -Id $process.ProcessId -Force -ErrorAction SilentlyContinue +} + +$portConnections = Get-NetTCPConnection -LocalPort $port -State Listen -ErrorAction SilentlyContinue +foreach ($connection in $portConnections) { + if ($connection.OwningProcess -and $connection.OwningProcess -ne $PID) { + Write-Host " Membebaskan port $port dari PID $($connection.OwningProcess)" + Stop-Process -Id $connection.OwningProcess -Force -ErrorAction SilentlyContinue + } +} + +Start-Sleep -Seconds 1 +Set-Location $apiDir +$env:FLASK_DEBUG = "1" +$env:PYTHONUNBUFFERED = "1" + +Write-Host "Menjalankan backend dengan auto-reloader dari $apiDir" +Write-Host "Perubahan file Python akan dimuat otomatis. Tekan Ctrl+C untuk berhenti." +& $python "main.py" diff --git a/api/scripts/import_csv_to_mysql.py b/api/scripts/import_csv_to_mysql.py new file mode 100644 index 0000000..b07acd6 --- /dev/null +++ b/api/scripts/import_csv_to_mysql.py @@ -0,0 +1,89 @@ +"""Import the existing research CSV files into the configured MySQL database. + +This is a one-time/manual import utility. It does not schedule scraping. +""" + +from pathlib import Path +import sys + +import pandas as pd +import pymysql + +sys.path.insert(0, str(Path(__file__).resolve().parents[1])) + +from app.config import Config + + +BASE_DIR = Path(__file__).resolve().parents[1] +CSV_FILES = { + "rawit": next(BASE_DIR.glob("harga_cabai_rawit_*.csv")), + "merah": next(BASE_DIR.glob("harga_cabe_merah_besar_*.csv")), + "keriting": next(BASE_DIR.glob("harga_cabai_merah_keriting_*.csv")), +} +MARKETS = ( + "pasar_tanjung", + "pasar_kreongan", + "pasar_tegal_besar", + "pasar_mangli", + "pasar_wirolegi", +) + + +def normalized_market_column(market: str) -> str: + return "Pasar_" + "_".join(part.title() for part in market.removeprefix("pasar_").split("_")) + + +def main() -> None: + connection = pymysql.connect( + host=Config.MYSQL_HOST, + port=Config.MYSQL_PORT, + database=Config.MYSQL_DATABASE, + user=Config.MYSQL_USER, + password=Config.MYSQL_PASSWORD, + connect_timeout=Config.MYSQL_CONNECT_TIMEOUT, + ) + inserted = 0 + try: + with connection.cursor() as cursor: + cursor.execute("SELECT id, slug FROM commodities") + commodities = {slug: row_id for row_id, slug in cursor.fetchall()} + cursor.execute("SELECT id, slug FROM markets") + markets = {slug: row_id for row_id, slug in cursor.fetchall()} + + for commodity, csv_path in CSV_FILES.items(): + frame = pd.read_csv(csv_path) + for _, row in frame.iterrows(): + price_date = pd.to_datetime(row["Tanggal"], errors="coerce") + if pd.isna(price_date): + continue + for market in MARKETS: + value = pd.to_numeric(row.get(normalized_market_column(market)), errors="coerce") + if pd.isna(value) or float(value) <= 0: + continue + cursor.execute( + """ + INSERT INTO price_history + (commodity_id, market_id, price_date, price, source) + VALUES (%s, %s, %s, %s, 'csv_import') + ON DUPLICATE KEY UPDATE + price = VALUES(price), source = VALUES(source) + """, + ( + commodities[commodity], + markets[market], + price_date.date(), + float(value) * 1000, + ), + ) + inserted += cursor.rowcount + connection.commit() + except Exception: + connection.rollback() + raise + finally: + connection.close() + print(f"Import selesai. Baris diproses: {inserted}") + + +if __name__ == "__main__": + main() diff --git a/api/tests/__pycache__/test_forecaster.cpython-39-pytest-8.4.2.pyc b/api/tests/__pycache__/test_forecaster.cpython-39-pytest-8.4.2.pyc new file mode 100644 index 0000000..18f78d0 Binary files /dev/null and b/api/tests/__pycache__/test_forecaster.cpython-39-pytest-8.4.2.pyc differ diff --git a/api/tests/__pycache__/test_forecaster.cpython-39.pyc b/api/tests/__pycache__/test_forecaster.cpython-39.pyc new file mode 100644 index 0000000..9204e04 Binary files /dev/null and b/api/tests/__pycache__/test_forecaster.cpython-39.pyc differ diff --git a/api/tests/__pycache__/test_registry.cpython-39-pytest-8.4.2.pyc b/api/tests/__pycache__/test_registry.cpython-39-pytest-8.4.2.pyc new file mode 100644 index 0000000..dde484f Binary files /dev/null and b/api/tests/__pycache__/test_registry.cpython-39-pytest-8.4.2.pyc differ diff --git a/api/tests/__pycache__/test_registry.cpython-39.pyc b/api/tests/__pycache__/test_registry.cpython-39.pyc new file mode 100644 index 0000000..fb28023 Binary files /dev/null and b/api/tests/__pycache__/test_registry.cpython-39.pyc differ diff --git a/api/tests/__pycache__/test_routes.cpython-39-pytest-8.4.2.pyc b/api/tests/__pycache__/test_routes.cpython-39-pytest-8.4.2.pyc new file mode 100644 index 0000000..322f7df Binary files /dev/null and b/api/tests/__pycache__/test_routes.cpython-39-pytest-8.4.2.pyc differ diff --git a/api/tests/__pycache__/test_routes.cpython-39.pyc b/api/tests/__pycache__/test_routes.cpython-39.pyc new file mode 100644 index 0000000..dd796a0 Binary files /dev/null and b/api/tests/__pycache__/test_routes.cpython-39.pyc differ diff --git a/api/tests/test_forecaster.py b/api/tests/test_forecaster.py new file mode 100644 index 0000000..1d7265a --- /dev/null +++ b/api/tests/test_forecaster.py @@ -0,0 +1,28 @@ +import numpy as np +from sklearn.preprocessing import MinMaxScaler + +from app.services.forecaster import forecast_recursive + + +class IncrementModel: + def predict(self, model_input, verbose=0): + return np.asarray([[model_input[0, -1, 0] + 0.1]]) + + +def test_recursive_forecast_uses_scaled_feedback_and_keeps_prefix(): + scaler = MinMaxScaler().fit(np.asarray([[0.0], [100.0]])) + window = np.asarray([10.0, 20.0, 30.0]) + prices, out_of_range = forecast_recursive(IncrementModel(), scaler, window, 5) + + assert prices == [40, 50, 60, 70, 80] + assert out_of_range is False + + +def test_forecast_never_returns_negative_prices(): + class NegativeModel: + def predict(self, model_input, verbose=0): + return np.asarray([[-2.0]]) + + scaler = MinMaxScaler().fit(np.asarray([[0.0], [100.0]])) + prices, _ = forecast_recursive(NegativeModel(), scaler, np.asarray([10.0, 20.0, 30.0]), 1) + assert prices == [0] diff --git a/api/tests/test_registry.py b/api/tests/test_registry.py new file mode 100644 index 0000000..7f760b3 --- /dev/null +++ b/api/tests/test_registry.py @@ -0,0 +1,30 @@ +import json + +import app.services.model_registry as registry_module +from app.services.model_registry import ModelRegistry + + +class FakeModel: + input_shape = (None, 7, 1) + + +def test_registry_skips_incomplete_artifacts(tmp_path, monkeypatch): + market_dir = tmp_path / "rawit" / "pasar_tanjung" + market_dir.mkdir(parents=True) + (market_dir / "config.json").write_text( + json.dumps({"model": {"time_step": 7}, "files": {"model": "model.h5", "scaler": "scaler.pkl"}}), + encoding="utf-8", + ) + (market_dir / "model.h5").write_text("model", encoding="utf-8") + (market_dir / "scaler.pkl").write_bytes(b"scaler") + + class FakeScaler: + data_min_ = [0] + data_max_ = [1] + + monkeypatch.setattr(registry_module, "load_model", lambda *args, **kwargs: FakeModel()) + monkeypatch.setattr(registry_module.joblib, "load", lambda *args, **kwargs: FakeScaler()) + model_registry = ModelRegistry(tmp_path) + + assert model_registry.get("rawit", "pasar_tanjung") is not None + assert any(item["market"] == "pasar_kreongan" for item in model_registry.skipped) diff --git a/api/tests/test_routes.py b/api/tests/test_routes.py new file mode 100644 index 0000000..43664b1 --- /dev/null +++ b/api/tests/test_routes.py @@ -0,0 +1,24 @@ +from app import create_app +from app.config import Config +from pathlib import Path + + +class TestConfig(Config): + TESTING = True + MODELS_DIR = Path("tests/fixtures/empty-models") + DATA_DIR = Path("tests/fixtures/empty-data") + + +def test_route_contract_and_error_format(monkeypatch): + monkeypatch.setattr("app.ModelRegistry.scan", lambda self: None) + app = create_app(TestConfig) + client = app.test_client() + + assert client.get("/api/v1/health").status_code == 200 + response = client.get("/api/v1/predict?commodity=unknown&market=pasar_tanjung") + assert response.status_code == 404 + assert response.json["error"]["code"] == "UNKNOWN_COMMODITY" + + response = client.get("/api/v1/predict?commodity=rawit&market=pasar_tanjung&horizon=2") + assert response.status_code == 400 + assert response.json["error"]["code"] == "INVALID_HORIZON" diff --git a/copilot_fastapi_instructions.zip b/copilot_fastapi_instructions.zip new file mode 100644 index 0000000..a2c5e1f Binary files /dev/null and b/copilot_fastapi_instructions.zip differ diff --git a/database/panen_harga.sql b/database/panen_harga.sql new file mode 100644 index 0000000..b4006df --- /dev/null +++ b/database/panen_harga.sql @@ -0,0 +1,164 @@ +CREATE DATABASE IF NOT EXISTS prediksicabe + CHARACTER SET utf8mb4 + COLLATE utf8mb4_unicode_ci; + +USE prediksicabe; + +CREATE TABLE IF NOT EXISTS commodities ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + name VARCHAR(100) NOT NULL, + slug VARCHAR(50) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (id), + UNIQUE KEY uq_commodities_slug (slug) +) ENGINE=InnoDB; + +CREATE TABLE IF NOT EXISTS markets ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + name VARCHAR(100) NOT NULL, + slug VARCHAR(50) NOT NULL, + latitude DECIMAL(10,7) NOT NULL, + longitude DECIMAL(10,7) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (id), + UNIQUE KEY uq_markets_slug (slug) +) ENGINE=InnoDB; + +CREATE TABLE IF NOT EXISTS price_history ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + commodity_id BIGINT UNSIGNED NOT NULL, + market_id BIGINT UNSIGNED NOT NULL, + price_date DATE NOT NULL, + price DECIMAL(15,2) NOT NULL, + source VARCHAR(100) NOT NULL DEFAULT 'csv_import', + scraping_log_id BIGINT UNSIGNED NULL, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (id), + UNIQUE KEY uq_price_history_observation (commodity_id, market_id, price_date), + KEY idx_price_history_date (price_date), + KEY idx_price_history_commodity_market (commodity_id, market_id), + CONSTRAINT fk_price_history_commodity FOREIGN KEY (commodity_id) REFERENCES commodities(id) ON UPDATE CASCADE ON DELETE RESTRICT, + CONSTRAINT fk_price_history_market FOREIGN KEY (market_id) REFERENCES markets(id) ON UPDATE CASCADE ON DELETE RESTRICT +) ENGINE=InnoDB; + +CREATE TABLE IF NOT EXISTS scraping_logs ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + started_at DATETIME NOT NULL, + finished_at DATETIME NULL, + status ENUM('running', 'success', 'failed') NOT NULL, + records_inserted INT UNSIGNED NOT NULL DEFAULT 0, + records_updated INT UNSIGNED NOT NULL DEFAULT 0, + error_message TEXT NULL, + source VARCHAR(100) NOT NULL DEFAULT 'manual', + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (id), + KEY idx_scraping_logs_status (status), + KEY idx_scraping_logs_started_at (started_at) +) ENGINE=InnoDB; + +ALTER TABLE price_history + ADD KEY idx_price_history_scraping_log (scraping_log_id), + ADD CONSTRAINT fk_price_history_scraping_log + FOREIGN KEY (scraping_log_id) REFERENCES scraping_logs(id) + ON UPDATE CASCADE ON DELETE CASCADE; + +CREATE TABLE IF NOT EXISTS users ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + name VARCHAR(120) NOT NULL, + email VARCHAR(190) NOT NULL, + password_hash VARCHAR(255) NOT NULL, + role ENUM('user', 'admin') NOT NULL DEFAULT 'user', + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP, + PRIMARY KEY (id), + UNIQUE KEY uq_users_email (email) +) ENGINE=InnoDB; + +CREATE TABLE IF NOT EXISTS preprocessing_runs ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + dataset_source VARCHAR(100) NOT NULL, + started_at DATETIME NOT NULL, + finished_at DATETIME NULL, + status ENUM('pending', 'running', 'success', 'failed') NOT NULL, + rows_before INT UNSIGNED NOT NULL DEFAULT 0, + rows_after INT UNSIGNED NOT NULL DEFAULT 0, + parameters_json JSON NULL, + output_path VARCHAR(500) NULL, + error_message TEXT NULL, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (id), + KEY idx_preprocessing_status (status) +) ENGINE=InnoDB; + +CREATE TABLE IF NOT EXISTS training_runs ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + commodity_id BIGINT UNSIGNED NOT NULL, + started_at DATETIME NOT NULL, + finished_at DATETIME NULL, + status ENUM('pending', 'running', 'success', 'failed') NOT NULL, + seed INT NULL, + train_rows INT UNSIGNED NOT NULL DEFAULT 0, + test_rows INT UNSIGNED NOT NULL DEFAULT 0, + metrics_json JSON NULL, + history_path VARCHAR(500) NULL, + prediction_result_path VARCHAR(500) NULL, + error_message TEXT NULL, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (id), + KEY idx_training_status (status), + CONSTRAINT fk_training_commodity FOREIGN KEY (commodity_id) REFERENCES commodities(id) ON UPDATE CASCADE ON DELETE RESTRICT +) ENGINE=InnoDB; + +CREATE TABLE IF NOT EXISTS model_versions ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + commodity_id BIGINT UNSIGNED NOT NULL, + version VARCHAR(80) NOT NULL, + model_path VARCHAR(500) NOT NULL, + scaler_path VARCHAR(500) NOT NULL, + config_path VARCHAR(500) NULL, + metrics_json JSON NULL, + training_run_id BIGINT UNSIGNED NULL, + is_active BOOLEAN NOT NULL DEFAULT FALSE, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (id), + UNIQUE KEY uq_model_version (commodity_id, version), + KEY idx_model_active (commodity_id, is_active), + CONSTRAINT fk_model_commodity FOREIGN KEY (commodity_id) REFERENCES commodities(id) ON UPDATE CASCADE ON DELETE RESTRICT, + CONSTRAINT fk_model_training FOREIGN KEY (training_run_id) REFERENCES training_runs(id) ON UPDATE CASCADE ON DELETE SET NULL +) ENGINE=InnoDB; + +CREATE TABLE IF NOT EXISTS predictions ( + id BIGINT UNSIGNED NOT NULL AUTO_INCREMENT, + model_version_id BIGINT UNSIGNED NULL, + commodity_id BIGINT UNSIGNED NOT NULL, + market_id BIGINT UNSIGNED NOT NULL, + prediction_date DATE NOT NULL, + forecast_date DATE NOT NULL, + predicted_price DECIMAL(15,2) NOT NULL, + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + PRIMARY KEY (id), + UNIQUE KEY uq_prediction (commodity_id, market_id, prediction_date, forecast_date), + CONSTRAINT fk_prediction_model FOREIGN KEY (model_version_id) REFERENCES model_versions(id) ON UPDATE CASCADE ON DELETE SET NULL, + CONSTRAINT fk_prediction_commodity FOREIGN KEY (commodity_id) REFERENCES commodities(id) ON UPDATE CASCADE ON DELETE RESTRICT, + CONSTRAINT fk_prediction_market FOREIGN KEY (market_id) REFERENCES markets(id) ON UPDATE CASCADE ON DELETE RESTRICT +) ENGINE=InnoDB; + +INSERT INTO commodities (name, slug) VALUES + ('Cabai Rawit', 'rawit'), + ('Cabai Merah Besar', 'merah'), + ('Cabai Merah Keriting', 'keriting') +ON DUPLICATE KEY UPDATE name = VALUES(name); + +INSERT INTO markets (name, slug, latitude, longitude) VALUES + ('Pasar Tanjung', 'pasar_tanjung', -8.1738152, 113.6954052), + ('Pasar Kreongan', 'pasar_kreongan', -8.1556968, 113.7008754), + ('Pasar Tegal Besar', 'pasar_tegal_besar', -8.1926152, 113.6987226), + ('Pasar Mangli', 'pasar_mangli', -8.1902978, 113.6493539), + ('Pasar Wirolegi', 'pasar_wirolegi', -8.1872926, 113.7431422) +ON DUPLICATE KEY UPDATE + name = VALUES(name), + latitude = VALUES(latitude), + longitude = VALUES(longitude); diff --git a/node_modules/.package-lock.json b/node_modules/.package-lock.json new file mode 100644 index 0000000..d178cb4 --- /dev/null +++ b/node_modules/.package-lock.json @@ -0,0 +1,68 @@ +{ + "name": "PrediksiHargaCabe", + "lockfileVersion": 3, + "requires": true, + "packages": { + "node_modules/@react-leaflet/core": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@react-leaflet/core/-/core-3.0.0.tgz", + "integrity": "sha512-3EWmekh4Nz+pGcr+xjf0KNyYfC3U2JjnkWsh0zcqaexYqmmB5ZhH37kz41JXGmKzpaMZCnPofBBm64i+YrEvGQ==", + "license": "Hippocratic-2.1", + "peerDependencies": { + "leaflet": "^1.9.0", + "react": "^19.0.0", + "react-dom": "^19.0.0" + } + }, + "node_modules/leaflet": { + "version": "1.9.4", + "resolved": "https://registry.npmjs.org/leaflet/-/leaflet-1.9.4.tgz", + "integrity": "sha512-nxS1ynzJOmOlHp+iL3FyWqK89GtNL8U8rvlMOsQdTTssxZwCXh8N2NB3GDQOL+YR3XnWyZAxwQixURb+FA74PA==", + "license": "BSD-2-Clause" + }, + "node_modules/react": { + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/react/-/react-19.3.0.tgz", + "integrity": "sha512-E8LUcbtBWt20bbl2YoHfx4ZDBdxVTfOKtCZn9cDSJ4l6/nuoApcpIBcj47t2wZoVX8g2ZHuMHbiShgCR1T5Sog==", + "license": "MIT", + "peer": true, + "engines": { + "node": ">=0.10.0" + } + }, + "node_modules/react-dom": { + "version": "19.3.0", + "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.3.0.tgz", + "integrity": "sha512-JDk8dgif51OjFoDE70+OT9ICyYr+69HlmihNwp1+Nsfbna3t5sIiCa9ZJktDmQ4/1b/rn26hIAR2uYXDMr5r0Q==", + "license": "MIT", + "peer": true, + "dependencies": { + "scheduler": "^0.28.0" + }, + "peerDependencies": { + "react": "^19.3.0" + } + }, + "node_modules/react-leaflet": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/react-leaflet/-/react-leaflet-5.0.0.tgz", + "integrity": "sha512-CWbTpr5vcHw5bt9i4zSlPEVQdTVcML390TjeDG0cK59z1ylexpqC6M1PJFjV8jD7CF+ACBFsLIDs6DRMoLEofw==", + "license": "Hippocratic-2.1", + "dependencies": { + "@react-leaflet/core": "^3.0.0" + }, + "peerDependencies": { + "leaflet": "^1.9.0", + "react": "^19.0.0", + "react-dom": "^19.0.0" + } + }, + "node_modules/scheduler": { + "version": "0.28.0", + "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.28.0.tgz", + "integrity": "sha512-juorfCmIkIw8tT+p5BXSm6PJjQF/ycEYmKyzURCIt/RaZIhL+PulbQ9Yu2z1HdOJDdqDTlxA1+xKBmHXJsczAw==", + "license": "MIT", + "peer": true + } + } +} diff --git a/node_modules/@react-leaflet/core/LICENSE.md b/node_modules/@react-leaflet/core/LICENSE.md new file mode 100644 index 0000000..e5faf96 --- /dev/null +++ b/node_modules/@react-leaflet/core/LICENSE.md @@ -0,0 +1,33 @@ +@react-leaflet/core Copyright 2020 Paul Le Cam and contributors (“Licensor”) + +Hippocratic License Version Number: 2.1. + +Purpose. The purpose of this License is for the Licensor named above to permit the Licensee (as defined below) broad permission, if consistent with Human Rights Laws and Human Rights Principles (as each is defined below), to use and work with the Software (as defined below) within the full scope of Licensor’s copyright and patent rights, if any, in the Software, while ensuring attribution and protecting the Licensor from liability. + +Permission and Conditions. The Licensor grants permission by this license (“License”), free of charge, to the extent of Licensor’s rights under applicable copyright and patent law, to any person or entity (the “Licensee”) obtaining a copy of this software and associated documentation files (the “Software”), to do everything with the Software that would otherwise infringe (i) the Licensor’s copyright in the Software or (ii) any patent claims to the Software that the Licensor can license or becomes able to license, subject to all of the following terms and conditions: + +- Acceptance. This License is automatically offered to every person and entity subject to its terms and conditions. Licensee accepts this License and agrees to its terms and conditions by taking any action with the Software that, absent this License, would infringe any intellectual property right held by Licensor. + +- Notice. Licensee must ensure that everyone who gets a copy of any part of this Software from Licensee, with or without changes, also receives the License and the above copyright notice (and if included by the Licensor, patent, trademark and attribution notice). Licensee must cause any modified versions of the Software to carry prominent notices stating that Licensee changed the Software. For clarity, although Licensee is free to create modifications of the Software and distribute only the modified portion created by Licensee with additional or different terms, the portion of the Software not modified must be distributed pursuant to this License. If anyone notifies Licensee in writing that Licensee has not complied with this Notice section, Licensee can keep this License by taking all practical steps to comply within 30 days after the notice. If Licensee does not do so, Licensee’s License (and all rights licensed hereunder) shall end immediately. + +- Compliance with Human Rights Principles and Human Rights Laws. + + 1. Human Rights Principles. + + (a) Licensee is advised to consult the articles of the United Nations Universal Declaration of Human Rights and the United Nations Global Compact that define recognized principles of international human rights (the “Human Rights Principles”). Licensee shall use the Software in a manner consistent with Human Rights Principles. + + (b) Unless the Licensor and Licensee agree otherwise, any dispute, controversy, or claim arising out of or relating to (i) Section 1(a) regarding Human Rights Principles, including the breach of Section 1(a), termination of this License for breach of the Human Rights Principles, or invalidity of Section 1(a) or (ii) a determination of whether any Law is consistent or in conflict with Human Rights Principles pursuant to Section 2, below, shall be settled by arbitration in accordance with the Hague Rules on Business and Human Rights Arbitration (the “Rules”); provided, however, that Licensee may elect not to participate in such arbitration, in which event this License (and all rights licensed hereunder) shall end immediately. The number of arbitrators shall be one unless the Rules require otherwise. + + Unless both the Licensor and Licensee agree to the contrary: (1) All documents and information concerning the arbitration shall be public and may be disclosed by any party; (2) The repository referred to under Article 43 of the Rules shall make available to the public in a timely manner all documents concerning the arbitration which are communicated to it, including all submissions of the parties, all evidence admitted into the record of the proceedings, all transcripts or other recordings of hearings and all orders, decisions and awards of the arbitral tribunal, subject only to the arbitral tribunal's powers to take such measures as may be necessary to safeguard the integrity of the arbitral process pursuant to Articles 18, 33, 41 and 42 of the Rules; and (3) Article 26(6) of the Rules shall not apply. + + 2. Human Rights Laws. The Software shall not be used by any person or entity for any systems, activities, or other uses that violate any Human Rights Laws. “Human Rights Laws” means any applicable laws, regulations, or rules (collectively, “Laws”) that protect human, civil, labor, privacy, political, environmental, security, economic, due process, or similar rights; provided, however, that such Laws are consistent and not in conflict with Human Rights Principles (a dispute over the consistency or a conflict between Laws and Human Rights Principles shall be determined by arbitration as stated above). Where the Human Rights Laws of more than one jurisdiction are applicable or in conflict with respect to the use of the Software, the Human Rights Laws that are most protective of the individuals or groups harmed shall apply. + + 3. Indemnity. Licensee shall hold harmless and indemnify Licensor (and any other contributor) against all losses, damages, liabilities, deficiencies, claims, actions, judgments, settlements, interest, awards, penalties, fines, costs, or expenses of whatever kind, including Licensor’s reasonable attorneys’ fees, arising out of or relating to Licensee’s use of the Software in violation of Human Rights Laws or Human Rights Principles. + +- Failure to Comply. Any failure of Licensee to act according to the terms and conditions of this License is both a breach of the License and an infringement of the intellectual property rights of the Licensor (subject to exceptions under Laws, e.g., fair use). In the event of a breach or infringement, the terms and conditions of this License may be enforced by Licensor under the Laws of any jurisdiction to which Licensee is subject. Licensee also agrees that the Licensor may enforce the terms and conditions of this License against Licensee through specific performance (or similar remedy under Laws) to the extent permitted by Laws. For clarity, except in the event of a breach of this License, infringement, or as otherwise stated in this License, Licensor may not terminate this License with Licensee. + +- Enforceability and Interpretation. If any term or provision of this License is determined to be invalid, illegal, or unenforceable by a court of competent jurisdiction, then such invalidity, illegality, or unenforceability shall not affect any other term or provision of this License or invalidate or render unenforceable such term or provision in any other jurisdiction; provided, however, subject to a court modification pursuant to the immediately following sentence, if any term or provision of this License pertaining to Human Rights Laws or Human Rights Principles is deemed invalid, illegal, or unenforceable against Licensee by a court of competent jurisdiction, all rights in the Software granted to Licensee shall be deemed null and void as between Licensor and Licensee. Upon a determination that any term or provision is invalid, illegal, or unenforceable, to the extent permitted by Laws, the court may modify this License to affect the original purpose that the Software be used in compliance with Human Rights Principles and Human Rights Laws as closely as possible. The language in this License shall be interpreted as to its fair meaning and not strictly for or against any party. + +- Disclaimer. TO THE FULL EXTENT ALLOWED BY LAW, THIS SOFTWARE COMES “AS IS,” WITHOUT ANY WARRANTY, EXPRESS OR IMPLIED, AND LICENSOR AND ANY OTHER CONTRIBUTOR SHALL NOT BE LIABLE TO ANYONE FOR ANY DAMAGES OR OTHER LIABILITY ARISING FROM, OUT OF, OR IN CONNECTION WITH THE SOFTWARE OR THIS LICENSE, UNDER ANY KIND OF LEGAL CLAIM. + +This Hippocratic License is an Ethical Source license (https://ethicalsource.dev) and is offered for use by licensors and licensees at their own risk, on an “AS IS” basis, and with no warranties express or implied, to the maximum extent permitted by Laws. diff --git a/node_modules/@react-leaflet/core/README.md b/node_modules/@react-leaflet/core/README.md new file mode 100644 index 0000000..2c689b3 --- /dev/null +++ b/node_modules/@react-leaflet/core/README.md @@ -0,0 +1,3 @@ +# React Leaflet core + +[Documentation](https://react-leaflet.js.org/docs/core-introduction) diff --git a/node_modules/@react-leaflet/core/lib/attribution.d.ts b/node_modules/@react-leaflet/core/lib/attribution.d.ts new file mode 100644 index 0000000..61bb09b --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/attribution.d.ts @@ -0,0 +1,2 @@ +import type { Map as LeafletMap } from 'leaflet'; +export declare function useAttribution(map: LeafletMap, attribution: string | null | undefined): void; diff --git a/node_modules/@react-leaflet/core/lib/attribution.js b/node_modules/@react-leaflet/core/lib/attribution.js new file mode 100644 index 0000000..bce46ab --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/attribution.js @@ -0,0 +1,18 @@ +import { useEffect, useRef } from 'react'; +export function useAttribution(map, attribution) { + const attributionRef = useRef(attribution); + useEffect(function updateAttribution() { + if (attribution !== attributionRef.current && map.attributionControl != null) { + if (attributionRef.current != null) { + map.attributionControl.removeAttribution(attributionRef.current); + } + if (attribution != null) { + map.attributionControl.addAttribution(attribution); + } + } + attributionRef.current = attribution; + }, [ + map, + attribution + ]); +} diff --git a/node_modules/@react-leaflet/core/lib/circle.d.ts b/node_modules/@react-leaflet/core/lib/circle.d.ts new file mode 100644 index 0000000..e4d56c5 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/circle.d.ts @@ -0,0 +1,12 @@ +import type { CircleMarkerOptions, CircleOptions, LatLngExpression, Circle as LeafletCircle, CircleMarker as LeafletCircleMarker } from 'leaflet'; +import type { ReactNode } from 'react'; +import type { PathProps } from './path.js'; +export interface CircleMarkerProps extends CircleMarkerOptions, PathProps { + center: LatLngExpression; + children?: ReactNode; +} +export interface CircleProps extends CircleOptions, PathProps { + center: LatLngExpression; + children?: ReactNode; +} +export declare function updateCircle

(layer: LeafletCircle

| LeafletCircleMarker

, props: P, prevProps: P): void; diff --git a/node_modules/@react-leaflet/core/lib/circle.js b/node_modules/@react-leaflet/core/lib/circle.js new file mode 100644 index 0000000..f5e20ae --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/circle.js @@ -0,0 +1,8 @@ +export function updateCircle(layer, props, prevProps) { + if (props.center !== prevProps.center) { + layer.setLatLng(props.center); + } + if (props.radius != null && props.radius !== prevProps.radius) { + layer.setRadius(props.radius); + } +} diff --git a/node_modules/@react-leaflet/core/lib/component.d.ts b/node_modules/@react-leaflet/core/lib/component.d.ts new file mode 100644 index 0000000..a0869fd --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/component.d.ts @@ -0,0 +1,11 @@ +import React, { type PropsWithoutRef, type RefObject, type ReactNode } from 'react'; +import type { DivOverlay, DivOverlayHook } from './div-overlay.js'; +import type { LeafletElement } from './element.js'; +type ElementHook = (props: P) => RefObject>; +export type PropsWithChildren = PropsWithoutRef<{ + children?: ReactNode; +}>; +export declare function createContainerComponent(useElement: ElementHook>): React.ForwardRefExoticComponent & React.RefAttributes>; +export declare function createDivOverlayComponent(useElement: ReturnType>>): React.ForwardRefExoticComponent & React.RefAttributes>; +export declare function createLeafComponent(useElement: ElementHook>): React.ForwardRefExoticComponent & React.RefAttributes>; +export {}; diff --git a/node_modules/@react-leaflet/core/lib/component.js b/node_modules/@react-leaflet/core/lib/component.js new file mode 100644 index 0000000..d1cc750 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/component.js @@ -0,0 +1,43 @@ +import React, { forwardRef, useEffect, useImperativeHandle, useState } from 'react'; +import { createPortal } from 'react-dom'; +import { LeafletContext } from './context.js'; +export function createContainerComponent(useElement) { + function ContainerComponent(props, forwardedRef) { + const { instance, context } = useElement(props).current; + useImperativeHandle(forwardedRef, ()=>instance); + const { children } = props; + return children == null ? null : /*#__PURE__*/ React.createElement(LeafletContext, { + value: context + }, children); + } + return /*#__PURE__*/ forwardRef(ContainerComponent); +} +export function createDivOverlayComponent(useElement) { + function OverlayComponent(props, forwardedRef) { + const [isOpen, setOpen] = useState(false); + const { instance } = useElement(props, setOpen).current; + useImperativeHandle(forwardedRef, ()=>instance); + // biome-ignore lint/correctness/useExhaustiveDependencies: update overlay when children change + useEffect(function updateOverlay() { + if (isOpen) { + instance.update(); + } + }, [ + instance, + isOpen, + props.children + ]); + // @ts-ignore _contentNode missing in type definition + const contentNode = instance._contentNode; + return contentNode ? /*#__PURE__*/ createPortal(props.children, contentNode) : null; + } + return /*#__PURE__*/ forwardRef(OverlayComponent); +} +export function createLeafComponent(useElement) { + function LeafComponent(props, forwardedRef) { + const { instance } = useElement(props).current; + useImperativeHandle(forwardedRef, ()=>instance); + return null; + } + return /*#__PURE__*/ forwardRef(LeafComponent); +} diff --git a/node_modules/@react-leaflet/core/lib/context.d.ts b/node_modules/@react-leaflet/core/lib/context.d.ts new file mode 100644 index 0000000..55cc089 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/context.d.ts @@ -0,0 +1,25 @@ +import type { Control, Layer, LayerGroup, Map as LeafletMap } from 'leaflet'; +export declare const CONTEXT_VERSION = 1; +export type ControlledLayer = { + addLayer(layer: Layer): void; + removeLayer(layer: Layer): void; +}; +export type LeafletContextInterface = Readonly<{ + __version: number; + map: LeafletMap; + layerContainer?: ControlledLayer | LayerGroup; + layersControl?: Control.Layers; + overlayContainer?: Layer; + pane?: string; +}>; +export declare function createLeafletContext(map: LeafletMap): LeafletContextInterface; +export declare function extendContext(source: LeafletContextInterface, extra: Partial): LeafletContextInterface; +export declare const LeafletContext: import("react").Context | null>; +export declare function useLeafletContext(): LeafletContextInterface; diff --git a/node_modules/@react-leaflet/core/lib/context.js b/node_modules/@react-leaflet/core/lib/context.js new file mode 100644 index 0000000..9fc6a2c --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/context.js @@ -0,0 +1,22 @@ +import { createContext, use } from 'react'; +export const CONTEXT_VERSION = 1; +export function createLeafletContext(map) { + return Object.freeze({ + __version: CONTEXT_VERSION, + map + }); +} +export function extendContext(source, extra) { + return Object.freeze({ + ...source, + ...extra + }); +} +export const LeafletContext = createContext(null); +export function useLeafletContext() { + const context = use(LeafletContext); + if (context == null) { + throw new Error('No context provided: useLeafletContext() can only be used in a descendant of '); + } + return context; +} diff --git a/node_modules/@react-leaflet/core/lib/control.d.ts b/node_modules/@react-leaflet/core/lib/control.d.ts new file mode 100644 index 0000000..fa7d598 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/control.d.ts @@ -0,0 +1,3 @@ +import type { Control, ControlOptions } from 'leaflet'; +import type { ElementHook } from './element.js'; +export declare function createControlHook(useElement: ElementHook): (props: P) => ReturnType>; diff --git a/node_modules/@react-leaflet/core/lib/control.js b/node_modules/@react-leaflet/core/lib/control.js new file mode 100644 index 0000000..7e798e3 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/control.js @@ -0,0 +1,30 @@ +import { useEffect, useRef } from 'react'; +import { useLeafletContext } from './context.js'; +export function createControlHook(useElement) { + return function useLeafletControl(props) { + const context = useLeafletContext(); + const elementRef = useElement(props, context); + const { instance } = elementRef.current; + const positionRef = useRef(props.position); + const { position } = props; + useEffect(function addControl() { + instance.addTo(context.map); + return function removeControl() { + instance.remove(); + }; + }, [ + context.map, + instance + ]); + useEffect(function updateControl() { + if (position != null && position !== positionRef.current) { + instance.setPosition(position); + positionRef.current = position; + } + }, [ + instance, + position + ]); + return elementRef; + }; +} diff --git a/node_modules/@react-leaflet/core/lib/div-overlay.d.ts b/node_modules/@react-leaflet/core/lib/div-overlay.d.ts new file mode 100644 index 0000000..a05e307 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/div-overlay.d.ts @@ -0,0 +1,9 @@ +import type { Popup, Tooltip } from 'leaflet'; +import { type LeafletContextInterface } from './context.js'; +import type { ElementHook, LeafletElement } from './element.js'; +import type { LayerProps } from './layer.js'; +export type DivOverlay = Popup | Tooltip; +export type SetOpenFunc = (open: boolean) => void; +export type DivOverlayLifecycleHook = (element: LeafletElement, context: LeafletContextInterface, props: P, setOpen: SetOpenFunc) => void; +export type DivOverlayHook = (useElement: ElementHook, useLifecycle: DivOverlayLifecycleHook) => (props: P, setOpen: SetOpenFunc) => ReturnType>; +export declare function createDivOverlayHook(useElement: ElementHook, useLifecycle: DivOverlayLifecycleHook): (props: P, setOpen: SetOpenFunc) => ReturnType>; diff --git a/node_modules/@react-leaflet/core/lib/div-overlay.js b/node_modules/@react-leaflet/core/lib/div-overlay.js new file mode 100644 index 0000000..9659511 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/div-overlay.js @@ -0,0 +1,14 @@ +import { useAttribution } from './attribution.js'; +import { useLeafletContext } from './context.js'; +import { useEventHandlers } from './events.js'; +import { withPane } from './pane.js'; +export function createDivOverlayHook(useElement, useLifecycle) { + return function useDivOverlay(props, setOpen) { + const context = useLeafletContext(); + const elementRef = useElement(withPane(props, context), context); + useAttribution(context.map, props.attribution); + useEventHandlers(elementRef.current, props.eventHandlers); + useLifecycle(elementRef.current, context, props, setOpen); + return elementRef; + }; +} diff --git a/node_modules/@react-leaflet/core/lib/dom.d.ts b/node_modules/@react-leaflet/core/lib/dom.d.ts new file mode 100644 index 0000000..25a720f --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/dom.d.ts @@ -0,0 +1,3 @@ +export declare function addClassName(element: HTMLElement, className: string): void; +export declare function removeClassName(element: HTMLElement, className: string): void; +export declare function updateClassName(element?: HTMLElement, prevClassName?: string, nextClassName?: string): void; diff --git a/node_modules/@react-leaflet/core/lib/dom.js b/node_modules/@react-leaflet/core/lib/dom.js new file mode 100644 index 0000000..2a29092 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/dom.js @@ -0,0 +1,24 @@ +import { DomUtil } from 'leaflet'; +function splitClassName(className) { + return className.split(' ').filter(Boolean); +} +export function addClassName(element, className) { + for (const cls of splitClassName(className)){ + DomUtil.addClass(element, cls); + } +} +export function removeClassName(element, className) { + for (const cls of splitClassName(className)){ + DomUtil.removeClass(element, cls); + } +} +export function updateClassName(element, prevClassName, nextClassName) { + if (element != null && nextClassName !== prevClassName) { + if (prevClassName != null && prevClassName.length > 0) { + removeClassName(element, prevClassName); + } + if (nextClassName != null && nextClassName.length > 0) { + addClassName(element, nextClassName); + } + } +} diff --git a/node_modules/@react-leaflet/core/lib/element.d.ts b/node_modules/@react-leaflet/core/lib/element.d.ts new file mode 100644 index 0000000..6e55fb8 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/element.d.ts @@ -0,0 +1,10 @@ +import { type RefObject } from 'react'; +import type { LeafletContextInterface } from './context.js'; +export type LeafletElement = Readonly<{ + instance: T; + context: LeafletContextInterface; + container?: C | null; +}>; +export declare function createElementObject(instance: T, context: LeafletContextInterface, container?: C | null): LeafletElement; +export type ElementHook = (props: P, context: LeafletContextInterface) => RefObject>; +export declare function createElementHook(createElement: (props: P, context: LeafletContextInterface) => LeafletElement, updateElement?: (instance: E, props: P, prevProps: P) => void): (props: P, context: LeafletContextInterface) => ReturnType>; diff --git a/node_modules/@react-leaflet/core/lib/element.js b/node_modules/@react-leaflet/core/lib/element.js new file mode 100644 index 0000000..5a10883 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/element.js @@ -0,0 +1,34 @@ +import { useEffect, useRef } from 'react'; +export function createElementObject(instance, context, container) { + return Object.freeze({ + instance, + context, + container + }); +} +export function createElementHook(createElement, updateElement) { + if (updateElement == null) { + return function useImmutableLeafletElement(props, context) { + const elementRef = useRef(undefined); + if (!elementRef.current) elementRef.current = createElement(props, context); + return elementRef; + }; + } + return function useMutableLeafletElement(props, context) { + const elementRef = useRef(undefined); + if (!elementRef.current) elementRef.current = createElement(props, context); + const propsRef = useRef(props); + const { instance } = elementRef.current; + useEffect(function updateElementProps() { + if (propsRef.current !== props) { + updateElement(instance, props, propsRef.current); + propsRef.current = props; + } + }, [ + instance, + props, + updateElement + ]); + return elementRef; + }; +} diff --git a/node_modules/@react-leaflet/core/lib/events.d.ts b/node_modules/@react-leaflet/core/lib/events.d.ts new file mode 100644 index 0000000..ba8f431 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/events.d.ts @@ -0,0 +1,6 @@ +import type { Evented, LeafletEventHandlerFnMap } from 'leaflet'; +import type { LeafletElement } from './element.js'; +export type EventedProps = { + eventHandlers?: LeafletEventHandlerFnMap; +}; +export declare function useEventHandlers(element: LeafletElement, eventHandlers: LeafletEventHandlerFnMap | null | undefined): void; diff --git a/node_modules/@react-leaflet/core/lib/events.js b/node_modules/@react-leaflet/core/lib/events.js new file mode 100644 index 0000000..77eea9f --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/events.js @@ -0,0 +1,19 @@ +import { useEffect, useRef } from 'react'; +export function useEventHandlers(element, eventHandlers) { + const eventHandlersRef = useRef(undefined); + useEffect(function addEventHandlers() { + if (eventHandlers != null) { + element.instance.on(eventHandlers); + } + eventHandlersRef.current = eventHandlers; + return function removeEventHandlers() { + if (eventHandlersRef.current != null) { + element.instance.off(eventHandlersRef.current); + } + eventHandlersRef.current = null; + }; + }, [ + element, + eventHandlers + ]); +} diff --git a/node_modules/@react-leaflet/core/lib/generic.d.ts b/node_modules/@react-leaflet/core/lib/generic.d.ts new file mode 100644 index 0000000..7dec782 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/generic.d.ts @@ -0,0 +1,18 @@ +import type { Control, ControlOptions, FeatureGroup, Layer, Path } from 'leaflet'; +import type { PropsWithoutRef } from 'react'; +import { type PropsWithChildren } from './component.js'; +import type { LeafletContextInterface } from './context.js'; +import { type DivOverlay, type DivOverlayLifecycleHook } from './div-overlay.js'; +import { type LeafletElement } from './element.js'; +import { type LayerProps } from './layer.js'; +import { type PathProps } from './path.js'; +interface LayerWithChildrenProps extends LayerProps, PropsWithChildren { +} +interface PathWithChildrenProps extends PathProps, PropsWithChildren { +} +export declare function createControlComponent(createInstance: (props: PropsWithoutRef

) => E): import("react").ForwardRefExoticComponent & import("react").RefAttributes>; +export declare function createLayerComponent(createElement: (props: PropsWithoutRef

, context: LeafletContextInterface) => LeafletElement, updateElement?: (instance: E, props: PropsWithoutRef

, prevProps: PropsWithoutRef

) => void): import("react").ForwardRefExoticComponent & import("react").RefAttributes>; +export declare function createOverlayComponent(createElement: (props: PropsWithoutRef

, context: LeafletContextInterface) => LeafletElement, useLifecycle: DivOverlayLifecycleHook>): import("react").ForwardRefExoticComponent & import("react").RefAttributes>; +export declare function createPathComponent(createElement: (props: PropsWithoutRef

, context: LeafletContextInterface) => LeafletElement, updateElement?: (instance: E, props: PropsWithoutRef

, prevProps: PropsWithoutRef

) => void): import("react").ForwardRefExoticComponent & import("react").RefAttributes>; +export declare function createTileLayerComponent(createElement: (props: PropsWithoutRef

, context: LeafletContextInterface) => LeafletElement, updateElement?: (instance: E, props: PropsWithoutRef

, prevProps: PropsWithoutRef

) => void): import("react").ForwardRefExoticComponent & import("react").RefAttributes>; +export {}; diff --git a/node_modules/@react-leaflet/core/lib/generic.js b/node_modules/@react-leaflet/core/lib/generic.js new file mode 100644 index 0000000..f98463e --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/generic.js @@ -0,0 +1,34 @@ +import { createContainerComponent, createDivOverlayComponent, createLeafComponent } from './component.js'; +import { createControlHook } from './control.js'; +import { createDivOverlayHook } from './div-overlay.js'; +import { createElementHook, createElementObject } from './element.js'; +import { createLayerHook } from './layer.js'; +import { createPathHook } from './path.js'; +export function createControlComponent(createInstance) { + function createElement(props, context) { + return createElementObject(createInstance(props), context); + } + const useElement = createElementHook(createElement); + const useControl = createControlHook(useElement); + return createLeafComponent(useControl); +} +export function createLayerComponent(createElement, updateElement) { + const useElement = createElementHook(createElement, updateElement); + const useLayer = createLayerHook(useElement); + return createContainerComponent(useLayer); +} +export function createOverlayComponent(createElement, useLifecycle) { + const useElement = createElementHook(createElement); + const useOverlay = createDivOverlayHook(useElement, useLifecycle); + return createDivOverlayComponent(useOverlay); +} +export function createPathComponent(createElement, updateElement) { + const useElement = createElementHook(createElement, updateElement); + const usePath = createPathHook(useElement); + return createContainerComponent(usePath); +} +export function createTileLayerComponent(createElement, updateElement) { + const useElement = createElementHook(createElement, updateElement); + const useLayer = createLayerHook(useElement); + return createLeafComponent(useLayer); +} diff --git a/node_modules/@react-leaflet/core/lib/grid-layer.d.ts b/node_modules/@react-leaflet/core/lib/grid-layer.d.ts new file mode 100644 index 0000000..b676e90 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/grid-layer.d.ts @@ -0,0 +1,2 @@ +import type { GridLayer, GridLayerOptions } from 'leaflet'; +export declare function updateGridLayer(layer: E, props: P, prevProps: P): void; diff --git a/node_modules/@react-leaflet/core/lib/grid-layer.js b/node_modules/@react-leaflet/core/lib/grid-layer.js new file mode 100644 index 0000000..aa7a08d --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/grid-layer.js @@ -0,0 +1,9 @@ +export function updateGridLayer(layer, props, prevProps) { + const { opacity, zIndex } = props; + if (opacity != null && opacity !== prevProps.opacity) { + layer.setOpacity(opacity); + } + if (zIndex != null && zIndex !== prevProps.zIndex) { + layer.setZIndex(zIndex); + } +} diff --git a/node_modules/@react-leaflet/core/lib/index.d.ts b/node_modules/@react-leaflet/core/lib/index.d.ts new file mode 100644 index 0000000..366bb23 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/index.d.ts @@ -0,0 +1,15 @@ +export { useAttribution } from './attribution.js'; +export { type CircleMarkerProps, type CircleProps, updateCircle, } from './circle.js'; +export { createContainerComponent, createDivOverlayComponent, createLeafComponent, } from './component.js'; +export { CONTEXT_VERSION, type LeafletContextInterface, LeafletContext, createLeafletContext, extendContext, useLeafletContext, } from './context.js'; +export { createControlHook } from './control.js'; +export { type DivOverlayHook, type DivOverlayLifecycleHook, type SetOpenFunc, createDivOverlayHook, } from './div-overlay.js'; +export { addClassName, removeClassName, updateClassName } from './dom.js'; +export { type ElementHook, type LeafletElement, createElementHook, createElementObject, } from './element.js'; +export { type EventedProps, useEventHandlers } from './events.js'; +export { createControlComponent, createLayerComponent, createOverlayComponent, createPathComponent, createTileLayerComponent, } from './generic.js'; +export { updateGridLayer } from './grid-layer.js'; +export { type InteractiveLayerProps, type LayerProps, createLayerHook, useLayerLifecycle, } from './layer.js'; +export { type MediaOverlayProps, updateMediaOverlay } from './media-overlay.js'; +export { withPane } from './pane.js'; +export { type PathProps, createPathHook, usePathOptions } from './path.js'; diff --git a/node_modules/@react-leaflet/core/lib/index.js b/node_modules/@react-leaflet/core/lib/index.js new file mode 100644 index 0000000..e174cff --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/index.js @@ -0,0 +1,15 @@ +export { useAttribution } from './attribution.js'; +export { updateCircle } from './circle.js'; +export { createContainerComponent, createDivOverlayComponent, createLeafComponent } from './component.js'; +export { CONTEXT_VERSION, LeafletContext, createLeafletContext, extendContext, useLeafletContext } from './context.js'; +export { createControlHook } from './control.js'; +export { createDivOverlayHook } from './div-overlay.js'; +export { addClassName, removeClassName, updateClassName } from './dom.js'; +export { createElementHook, createElementObject } from './element.js'; +export { useEventHandlers } from './events.js'; +export { createControlComponent, createLayerComponent, createOverlayComponent, createPathComponent, createTileLayerComponent } from './generic.js'; +export { updateGridLayer } from './grid-layer.js'; +export { createLayerHook, useLayerLifecycle } from './layer.js'; +export { updateMediaOverlay } from './media-overlay.js'; +export { withPane } from './pane.js'; +export { createPathHook, usePathOptions } from './path.js'; diff --git a/node_modules/@react-leaflet/core/lib/layer.d.ts b/node_modules/@react-leaflet/core/lib/layer.d.ts new file mode 100644 index 0000000..f508d27 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/layer.d.ts @@ -0,0 +1,10 @@ +import type { InteractiveLayerOptions, Layer, LayerOptions } from 'leaflet'; +import { type LeafletContextInterface } from './context.js'; +import type { ElementHook, LeafletElement } from './element.js'; +import { type EventedProps } from './events.js'; +export interface LayerProps extends EventedProps, LayerOptions { +} +export interface InteractiveLayerProps extends LayerProps, InteractiveLayerOptions { +} +export declare function useLayerLifecycle(element: LeafletElement, context: LeafletContextInterface): void; +export declare function createLayerHook(useElement: ElementHook): (props: P) => ReturnType>; diff --git a/node_modules/@react-leaflet/core/lib/layer.js b/node_modules/@react-leaflet/core/lib/layer.js new file mode 100644 index 0000000..6364b3a --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/layer.js @@ -0,0 +1,28 @@ +import { useEffect } from 'react'; +import { useAttribution } from './attribution.js'; +import { useLeafletContext } from './context.js'; +import { useEventHandlers } from './events.js'; +import { withPane } from './pane.js'; +export function useLayerLifecycle(element, context) { + useEffect(function addLayer() { + const container = context.layerContainer ?? context.map; + container.addLayer(element.instance); + return function removeLayer() { + context.layerContainer?.removeLayer(element.instance); + context.map.removeLayer(element.instance); + }; + }, [ + context, + element + ]); +} +export function createLayerHook(useElement) { + return function useLayer(props) { + const context = useLeafletContext(); + const elementRef = useElement(withPane(props, context), context); + useAttribution(context.map, props.attribution); + useEventHandlers(elementRef.current, props.eventHandlers); + useLayerLifecycle(elementRef.current, context); + return elementRef; + }; +} diff --git a/node_modules/@react-leaflet/core/lib/media-overlay.d.ts b/node_modules/@react-leaflet/core/lib/media-overlay.d.ts new file mode 100644 index 0000000..2a1f645 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/media-overlay.d.ts @@ -0,0 +1,6 @@ +import { type ImageOverlayOptions, type LatLngBoundsExpression, type ImageOverlay as LeafletImageOverlay, type SVGOverlay as LeafletSVGOverlay, type VideoOverlay as LeafletVideoOverlay } from 'leaflet'; +import type { InteractiveLayerProps } from './layer.js'; +export interface MediaOverlayProps extends ImageOverlayOptions, InteractiveLayerProps { + bounds: LatLngBoundsExpression; +} +export declare function updateMediaOverlay(overlay: E, props: P, prevProps: P): void; diff --git a/node_modules/@react-leaflet/core/lib/media-overlay.js b/node_modules/@react-leaflet/core/lib/media-overlay.js new file mode 100644 index 0000000..fc03a12 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/media-overlay.js @@ -0,0 +1,13 @@ +import { LatLngBounds } from 'leaflet'; +export function updateMediaOverlay(overlay, props, prevProps) { + if (props.bounds instanceof LatLngBounds && props.bounds !== prevProps.bounds) { + overlay.setBounds(props.bounds); + } + if (props.opacity != null && props.opacity !== prevProps.opacity) { + overlay.setOpacity(props.opacity); + } + if (props.zIndex != null && props.zIndex !== prevProps.zIndex) { + // @ts-ignore missing in definition but inherited from ImageOverlay + overlay.setZIndex(props.zIndex); + } +} diff --git a/node_modules/@react-leaflet/core/lib/pane.d.ts b/node_modules/@react-leaflet/core/lib/pane.d.ts new file mode 100644 index 0000000..a8946ea --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/pane.d.ts @@ -0,0 +1,3 @@ +import type { LayerOptions } from 'leaflet'; +import type { LeafletContextInterface } from './context.js'; +export declare function withPane

(props: P, context: LeafletContextInterface): P; diff --git a/node_modules/@react-leaflet/core/lib/pane.js b/node_modules/@react-leaflet/core/lib/pane.js new file mode 100644 index 0000000..5673a2c --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/pane.js @@ -0,0 +1,7 @@ +export function withPane(props, context) { + const pane = props.pane ?? context.pane; + return pane ? { + ...props, + pane + } : props; +} diff --git a/node_modules/@react-leaflet/core/lib/path.d.ts b/node_modules/@react-leaflet/core/lib/path.d.ts new file mode 100644 index 0000000..befbfee --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/path.d.ts @@ -0,0 +1,8 @@ +import type { FeatureGroup, Path, PathOptions } from 'leaflet'; +import type { ElementHook, LeafletElement } from './element.js'; +import { type InteractiveLayerProps } from './layer.js'; +export interface PathProps extends InteractiveLayerProps { + pathOptions?: PathOptions; +} +export declare function usePathOptions(element: LeafletElement, props: PathProps): void; +export declare function createPathHook(useElement: ElementHook): (props: P) => ReturnType>; diff --git a/node_modules/@react-leaflet/core/lib/path.js b/node_modules/@react-leaflet/core/lib/path.js new file mode 100644 index 0000000..5f2f726 --- /dev/null +++ b/node_modules/@react-leaflet/core/lib/path.js @@ -0,0 +1,28 @@ +import { useEffect, useRef } from 'react'; +import { useLeafletContext } from './context.js'; +import { useEventHandlers } from './events.js'; +import { useLayerLifecycle } from './layer.js'; +import { withPane } from './pane.js'; +export function usePathOptions(element, props) { + const optionsRef = useRef(undefined); + useEffect(function updatePathOptions() { + if (props.pathOptions !== optionsRef.current) { + const options = props.pathOptions ?? {}; + element.instance.setStyle(options); + optionsRef.current = options; + } + }, [ + element, + props + ]); +} +export function createPathHook(useElement) { + return function usePath(props) { + const context = useLeafletContext(); + const elementRef = useElement(withPane(props, context), context); + useEventHandlers(elementRef.current, props.eventHandlers); + useLayerLifecycle(elementRef.current, context); + usePathOptions(elementRef.current, props); + return elementRef; + }; +} diff --git a/node_modules/@react-leaflet/core/package.json b/node_modules/@react-leaflet/core/package.json new file mode 100644 index 0000000..86ce7f3 --- /dev/null +++ b/node_modules/@react-leaflet/core/package.json @@ -0,0 +1,66 @@ +{ + "name": "@react-leaflet/core", + "version": "3.0.0", + "description": "React Leaflet core", + "repository": { + "type": "git", + "url": "https://github.com/PaulLeCam/react-leaflet.git" + }, + "keywords": [ + "react-component", + "react", + "leaflet", + "map" + ], + "author": "Paul Le Cam ", + "license": "Hippocratic-2.1", + "bugs": { + "url": "https://github.com/PaulLeCam/react-leaflet/issues" + }, + "homepage": "https://react-leaflet.js.org/docs/core-introduction", + "type": "module", + "main": "lib/index.js", + "types": "lib/index.d.ts", + "exports": { + ".": "./lib/index.js" + }, + "files": [ + "lib/*" + ], + "sideEffects": false, + "peerDependencies": { + "leaflet": "^1.9.0", + "react": "^19.0.0", + "react-dom": "^19.0.0" + }, + "devDependencies": { + "@types/react": "^19.0.1", + "@types/react-dom": "^19.0.2" + }, + "jest": { + "extensionsToTreatAsEsm": [ + ".ts", + ".tsx" + ], + "resolver": "ts-jest-resolver", + "testEnvironment": "jsdom", + "transform": { + "^.+\\.(t|j)sx?$": [ + "@swc/jest", + { + "root": "../.." + } + ] + } + }, + "scripts": { + "build:clean": "del lib", + "build:js": "swc src -d ./lib --config-file ../../.swcrc --strip-leading-paths", + "build:types": "tsc --emitDeclarationOnly", + "build": "pnpm run build:clean && pnpm run build:types && pnpm run build:js", + "test:types": "tsc --noEmit", + "test:unit": "cross-env NODE_ENV=test jest", + "test": "pnpm run test:types && pnpm run test:unit", + "start": "pnpm run test && pnpm run build" + } +} \ No newline at end of file diff --git a/node_modules/leaflet/CHANGELOG.md b/node_modules/leaflet/CHANGELOG.md new file mode 100644 index 0000000..477da2b --- /dev/null +++ b/node_modules/leaflet/CHANGELOG.md @@ -0,0 +1,2191 @@ +Leaflet Changelog +================= + +(all changes without author notice are by [@mourner](https://github.com/mourner)) + +## 1.9.4 (2023-05-18) + +### 🐞 Bug fixes + +- Fix tile gaps in Chromium-based browsers ([#8891](https://github.com/Leaflet/Leaflet/pull/8891) by [@IvanSanchez](https://github.com/IvanSanchez)) +- Fix vector drifts when `zoomAnimation` is `false` and zooming via `flyTo` or pinch ([#8794](https://github.com/Leaflet/Leaflet/pull/8794) by [@plainheart](https://github.com/plainheart)) +- Ensure `toGeoJSON()` still works with an empty array ([#8737](https://github.com/Leaflet/Leaflet/pull/8737) by [@Falke-Design](https://github.com/Falke-Design)) +- Ensure `LineUtil` and `PolyUtil` only iterate over array values and not properties ([#8840](https://github.com/Leaflet/Leaflet/pull/8840) by [@Falke-Design](https://github.com/Falke-Design)) +- Fix rounding errors in center calculation of `LineUtil` and `PolyUtil` for small layers ([#8784](https://github.com/Leaflet/Leaflet/pull/8784) by [@Falke-Design](https://github.com/Falke-Design)) +- Prevent unwanted layer toggle while expanding the Layers control on mobile ([#8910](https://github.com/Leaflet/Leaflet/pull/8910) by [@Falke-Design](https://github.com/Falke-Design)) +- Fix an error when a focusing on a `Tooltip`-bound `FeatureGroup` that contains a layer without a `getElement` method ([#8890](https://github.com/Leaflet/Leaflet/pull/8890) by [@Falke-Design](https://github.com/Falke-Design)) +- Fix `Tooltip` is not showing when loaded dynamically while moving the map ([#8672](https://github.com/Leaflet/Leaflet/pull/8672) by [@theGOTOguy](https://github.com/theGOTOguy)) +- Fix `noMoveStart` option not applying to `fitBounds` ([#8911](https://github.com/Leaflet/Leaflet/pull/8911) by [@AbdullahSohail-SE](https://github.com/AbdullahSohail-SE)) +- Fix outlines showing up when interacting with the map on Safari 16.4+ ([#8917](https://github.com/Leaflet/Leaflet/pull/8917) by [@jonkoops](https://github.com/jonkoops)) + +## 1.9.3 (2022-11-18) + +### 🙌 Accessibility +- Expand the layers control on Enter keydown ([#8556](https://github.com/Leaflet/Leaflet/pull/8556) by [@larsgw](https://github.com/larsgw)) +- Align the scale control's alpha transparency with the attribution control ([#8547](https://github.com/Leaflet/Leaflet/pull/8547) by [@Malvoz](https://github.com/Malvoz)) +- Allow the scale control's text to overflow the container ([#8548](https://github.com/Leaflet/Leaflet/pull/8548) by [@Malvoz](https://github.com/Malvoz)) + +### 🐞 Bug fixes +- Remove internal usage of `L` global ([#8536](https://github.com/Leaflet/Leaflet/pull/8536) by [@mourner](https://github.com/mourner)) +- Fix intermittent wobble when using `setMaxBounds(map.getBounds())` ([#8534](https://github.com/Leaflet/Leaflet/pull/8534) by [@rjackson](https://github.com/rjackson)) +- Ensure that `latLngsToCoords()` does not return references passed to it ([#7344](https://github.com/Leaflet/Leaflet/pull/7344) by [@marlo22](https://github.com/marlo22])) +- Ensure `worldCopyJump()` behavior is consistent when using a keyboard ([#8562](https://github.com/Leaflet/Leaflet/pull/8562) by [@Falke-Design](https://github.com/Falke-Design)) +- Ensure correct target is used for the `popupopen` event ([#8571](https://github.com/Leaflet/Leaflet/pull/8571) by [@Belair34](https://github.com/Belair34)) +- Prevent recursion when panning a `Popup` ([#8520](https://github.com/Leaflet/Leaflet/pull/8520) by [@rjackson](https://github.com/rjackson)) +- Support CSS [`position: sticky`](https://developer.mozilla.org/en-US/docs/Web/CSS/position#sticky) for map container ([#8550](https://github.com/Leaflet/Leaflet/pull/8550) by [@tmiaa](https://github.com/tmiaa)) + +## 1.9.2 (2022-10-04) + +### 🐞 Bug fixes +* ⚠️ Drop ESM entrypoint from package because of numerous compatibility issues with plugins (import `leaflet/dist/leaflet-src.esm.js` explicitly instead to take advantage; ESM by default will come in v2) ([#8493](https://github.com/Leaflet/Leaflet/pull/8493) by [@jonkoops](https://github.com/jonkoops)) +* Fix a bug where tooltips could throw an error with canvas renderer ([#8498](https://github.com/Leaflet/Leaflet/pull/8498) by [@Falke-Design](https://github.com/Falke-Design)) +* Fix a bug with incorrect marker popup location when there are multiple markers registered to the same popup ([#8523](https://github.com/Leaflet/Leaflet/pull/8523) by [@raychanks](https://github.com/raychanks)). + +### 🧪 Tests +* Fix unit tests suite stopping abruptly on Mac ([#8478](https://github.com/Leaflet/Leaflet/pull/8478)) + +### 📝 Docs +* Fix `Bounds` `equals` parameters in docs ([#8500](https://github.com/Leaflet/Leaflet/pull/8500) by [@Falke-Design](https://github.com/Falke-Design)) + +## 1.9.2 (2022-10-04) + +### 🐞 Bug fixes +* ⚠️ Drop ESM entrypoint from package because of numerous compatibility issues with plugins (import `leaflet/dist/leaflet-src.esm.js` explicitly instead to take advantage; ESM by default will come in v2) ([#8493](https://github.com/Leaflet/Leaflet/pull/8493) by [@jonkoops](https://github.com/jonkoops)) +* Fix a bug where tooltips could throw an error with canvas renderer ([#8498](https://github.com/Leaflet/Leaflet/pull/8498) by [@Falke-Design](https://github.com/Falke-Design)) +* Fix a bug with incorrect marker popup location when there are multiple markers registered to the same popup ([#8523](https://github.com/Leaflet/Leaflet/pull/8523) by [@raychanks](https://github.com/raychanks)). + +### 🧪 Tests +* Fix unit tests suite stopping abruptly on Mac ([#8478](https://github.com/Leaflet/Leaflet/pull/8478)) + +### 📝 Docs +* Fix `Bounds` `equals` parameters in docs ([#8500](https://github.com/Leaflet/Leaflet/pull/8500) by [@Falke-Design](https://github.com/Falke-Design)) + +## 1.9.1 (2022-09-23) +* Fix `Events` `listens` not propagating to parent objects, in particular fixing compatibility with **Leaflet.markercluster** plugin ([#8211](https://github.com/Leaflet/Leaflet/pull/8457) by [@Falke-Design](https://github.com/Falke-Design)) + +## 1.9.0 (2022-09-21) + +### ⚠️ Breaking Changes +* Update `color-adjust` to `print-color-adjust` ([#8211](https://github.com/Leaflet/Leaflet/pull/8211) by [@Malvoz](https://github.com/Malvoz)) + +### ❇️ API changes +* Add `content` and `latLng` options to `Popup` / `Tooltip` constructors ([#7783](https://github.com/Leaflet/Leaflet/pull/7783) by [@Falke-Design](https://github.com/Falke-Design)) +* Extend `Bounds` to have the same functions as `LatLngBounds` ([#7882](https://github.com/Leaflet/Leaflet/pull/7882) by [@Falke-Design](https://github.com/Falke-Design)) + +### ✨ Improvements +* Expose ESM entrypoint with Leaflet global ([#8329](https://github.com/Leaflet/Leaflet/pull/8329) by [@jonkoops](https://github.com/Falke-Design)) +* Update `getCenter()` calculation and move it to `PolyUtil` / `LineUtil` ([#7603](https://github.com/Leaflet/Leaflet/pull/7603) by [@Falke-Design](https://github.com/Falke-Design)) +* Remove border styles in overflowing popups ([#8260](https://github.com/Leaflet/Leaflet/pull/8260) by [@Malvoz](https://github.com/Malvoz)) +* Fix "listener not found" warning when setting `maxBounds` ([#8168](https://github.com/Leaflet/Leaflet/pull/8168)) +* Remove "listener not found" warning ([#8234](https://github.com/Leaflet/Leaflet/pull/8234) by [@Falke-Design](https://github.com/Falke-Design)) +* Extend `Events.listens` to search for specific function ([#8161](https://github.com/Leaflet/Leaflet/pull/8161) by [@Falke-Design](https://github.com/Falke-Design)) +* Add `noMoveStart` option to `panTo` ([#6685](https://github.com/Leaflet/Leaflet/pull/6685) by [@Chivano](https://github.com/Chivano)) +* Add `FeatureCollection` handling to `geometryToLayer` ([#8163](https://github.com/Leaflet/Leaflet/pull/8163) by [@Falke-Design](https://github.com/Falke-Design)) + +### 🙌 Accessibility +* Improve `Tooltip` accessibility (focus and voice over) ([#8247](https://github.com/Leaflet/Leaflet/pull/8247) by [@alekzvik](https://github.com/alekzvik)) +* Fix links in accessibility guide ([#8198](https://github.com/Leaflet/Leaflet/pull/8198) by [@Malvoz](https://github.com/Malvoz)) +* Remove redundant `role="presentation"` from image tiles ([#8172](https://github.com/Leaflet/Leaflet/pull/8172) by [@Malvoz](https://github.com/Malvoz)) + +### 🐞 Bug fixes +* Fix invalid GeoJSON on unbalanced arrays ([#7637](https://github.com/Leaflet/Leaflet/pull/7637) by [@steff1986](https://github.com/steff1986)) +* Fix 2 step zooming while using mouse wheel scrolling ([#8298](https://github.com/Leaflet/Leaflet/pull/8298) by [@Falke-Design](https://github.com/Falke-Design)) +* Fix wrong assigned parameter while calling `map._move` over `requestAnimFrame` ([#8328](https://github.com/Leaflet/Leaflet/pull/8328) by [@AMDvsTMD](https://github.com/AMDvsTMD)) +* Fix `_isClickDisabled` to not throw no error if parent is removed from DOM ([#8288](https://github.com/Leaflet/Leaflet/pull/8288) by [@Falke-Design](https://github.com/Falke-Design)) +* Fix `DomEvent.DoubleTap` to ignore clicks on `

` is submitted). +// Use it inside listener functions. +function preventDefault(e) { + if (e.preventDefault) { + e.preventDefault(); + } else { + e.returnValue = false; + } + return this; +} + +// @function stop(ev: DOMEvent): this +// Does `stopPropagation` and `preventDefault` at the same time. +function stop(e) { + preventDefault(e); + stopPropagation(e); + return this; +} + +// @function getPropagationPath(ev: DOMEvent): Array +// Compatibility polyfill for [`Event.composedPath()`](https://developer.mozilla.org/en-US/docs/Web/API/Event/composedPath). +// Returns an array containing the `HTMLElement`s that the given DOM event +// should propagate to (if not stopped). +function getPropagationPath(ev) { + if (ev.composedPath) { + return ev.composedPath(); + } + + var path = []; + var el = ev.target; + + while (el) { + path.push(el); + el = el.parentNode; + } + return path; +} + + +// @function getMousePosition(ev: DOMEvent, container?: HTMLElement): Point +// Gets normalized mouse position from a DOM event relative to the +// `container` (border excluded) or to the whole page if not specified. +function getMousePosition(e, container) { + if (!container) { + return new Point(e.clientX, e.clientY); + } + + var scale = getScale(container), + offset = scale.boundingClientRect; // left and top values are in page scale (like the event clientX/Y) + + return new Point( + // offset.left/top values are in page scale (like clientX/Y), + // whereas clientLeft/Top (border width) values are the original values (before CSS scale applies). + (e.clientX - offset.left) / scale.x - container.clientLeft, + (e.clientY - offset.top) / scale.y - container.clientTop + ); +} + + +// except , Safari and +// We need double the scroll pixels (see #7403 and #4538) for all Browsers +// except OSX (Mac) -> 3x, Chrome running on Linux 1x + +var wheelPxFactor = + (Browser.linux && Browser.chrome) ? window.devicePixelRatio : + Browser.mac ? window.devicePixelRatio * 3 : + window.devicePixelRatio > 0 ? 2 * window.devicePixelRatio : 1; +// @function getWheelDelta(ev: DOMEvent): Number +// Gets normalized wheel delta from a wheel DOM event, in vertical +// pixels scrolled (negative if scrolling down). +// Events from pointing devices without precise scrolling are mapped to +// a best guess of 60 pixels. +function getWheelDelta(e) { + return (Browser.edge) ? e.wheelDeltaY / 2 : // Don't trust window-geometry-based delta + (e.deltaY && e.deltaMode === 0) ? -e.deltaY / wheelPxFactor : // Pixels + (e.deltaY && e.deltaMode === 1) ? -e.deltaY * 20 : // Lines + (e.deltaY && e.deltaMode === 2) ? -e.deltaY * 60 : // Pages + (e.deltaX || e.deltaZ) ? 0 : // Skip horizontal/depth wheel events + e.wheelDelta ? (e.wheelDeltaY || e.wheelDelta) / 2 : // Legacy IE pixels + (e.detail && Math.abs(e.detail) < 32765) ? -e.detail * 20 : // Legacy Moz lines + e.detail ? e.detail / -32765 * 60 : // Legacy Moz pages + 0; +} + +// check if element really left/entered the event target (for mouseenter/mouseleave) +function isExternalTarget(el, e) { + + var related = e.relatedTarget; + + if (!related) { return true; } + + try { + while (related && (related !== el)) { + related = related.parentNode; + } + } catch (err) { + return false; + } + return (related !== el); +} + +var DomEvent = { + __proto__: null, + on: on, + off: off, + stopPropagation: stopPropagation, + disableScrollPropagation: disableScrollPropagation, + disableClickPropagation: disableClickPropagation, + preventDefault: preventDefault, + stop: stop, + getPropagationPath: getPropagationPath, + getMousePosition: getMousePosition, + getWheelDelta: getWheelDelta, + isExternalTarget: isExternalTarget, + addListener: on, + removeListener: off +}; + +/* + * @class PosAnimation + * @aka L.PosAnimation + * @inherits Evented + * Used internally for panning animations, utilizing CSS3 Transitions for modern browsers and a timer fallback for IE6-9. + * + * @example + * ```js + * var myPositionMarker = L.marker([48.864716, 2.294694]).addTo(map); + * + * myPositionMarker.on("click", function() { + * var pos = map.latLngToLayerPoint(myPositionMarker.getLatLng()); + * pos.y -= 25; + * var fx = new L.PosAnimation(); + * + * fx.once('end',function() { + * pos.y += 25; + * fx.run(myPositionMarker._icon, pos, 0.8); + * }); + * + * fx.run(myPositionMarker._icon, pos, 0.3); + * }); + * + * ``` + * + * @constructor L.PosAnimation() + * Creates a `PosAnimation` object. + * + */ + +var PosAnimation = Evented.extend({ + + // @method run(el: HTMLElement, newPos: Point, duration?: Number, easeLinearity?: Number) + // Run an animation of a given element to a new position, optionally setting + // duration in seconds (`0.25` by default) and easing linearity factor (3rd + // argument of the [cubic bezier curve](https://cubic-bezier.com/#0,0,.5,1), + // `0.5` by default). + run: function (el, newPos, duration, easeLinearity) { + this.stop(); + + this._el = el; + this._inProgress = true; + this._duration = duration || 0.25; + this._easeOutPower = 1 / Math.max(easeLinearity || 0.5, 0.2); + + this._startPos = getPosition(el); + this._offset = newPos.subtract(this._startPos); + this._startTime = +new Date(); + + // @event start: Event + // Fired when the animation starts + this.fire('start'); + + this._animate(); + }, + + // @method stop() + // Stops the animation (if currently running). + stop: function () { + if (!this._inProgress) { return; } + + this._step(true); + this._complete(); + }, + + _animate: function () { + // animation loop + this._animId = requestAnimFrame(this._animate, this); + this._step(); + }, + + _step: function (round) { + var elapsed = (+new Date()) - this._startTime, + duration = this._duration * 1000; + + if (elapsed < duration) { + this._runFrame(this._easeOut(elapsed / duration), round); + } else { + this._runFrame(1); + this._complete(); + } + }, + + _runFrame: function (progress, round) { + var pos = this._startPos.add(this._offset.multiplyBy(progress)); + if (round) { + pos._round(); + } + setPosition(this._el, pos); + + // @event step: Event + // Fired continuously during the animation. + this.fire('step'); + }, + + _complete: function () { + cancelAnimFrame(this._animId); + + this._inProgress = false; + // @event end: Event + // Fired when the animation ends. + this.fire('end'); + }, + + _easeOut: function (t) { + return 1 - Math.pow(1 - t, this._easeOutPower); + } +}); + +/* + * @class Map + * @aka L.Map + * @inherits Evented + * + * The central class of the API — it is used to create a map on a page and manipulate it. + * + * @example + * + * ```js + * // initialize the map on the "map" div with a given center and zoom + * var map = L.map('map', { + * center: [51.505, -0.09], + * zoom: 13 + * }); + * ``` + * + */ + +var Map = Evented.extend({ + + options: { + // @section Map State Options + // @option crs: CRS = L.CRS.EPSG3857 + // The [Coordinate Reference System](#crs) to use. Don't change this if you're not + // sure what it means. + crs: EPSG3857, + + // @option center: LatLng = undefined + // Initial geographic center of the map + center: undefined, + + // @option zoom: Number = undefined + // Initial map zoom level + zoom: undefined, + + // @option minZoom: Number = * + // Minimum zoom level of the map. + // If not specified and at least one `GridLayer` or `TileLayer` is in the map, + // the lowest of their `minZoom` options will be used instead. + minZoom: undefined, + + // @option maxZoom: Number = * + // Maximum zoom level of the map. + // If not specified and at least one `GridLayer` or `TileLayer` is in the map, + // the highest of their `maxZoom` options will be used instead. + maxZoom: undefined, + + // @option layers: Layer[] = [] + // Array of layers that will be added to the map initially + layers: [], + + // @option maxBounds: LatLngBounds = null + // When this option is set, the map restricts the view to the given + // geographical bounds, bouncing the user back if the user tries to pan + // outside the view. To set the restriction dynamically, use + // [`setMaxBounds`](#map-setmaxbounds) method. + maxBounds: undefined, + + // @option renderer: Renderer = * + // The default method for drawing vector layers on the map. `L.SVG` + // or `L.Canvas` by default depending on browser support. + renderer: undefined, + + + // @section Animation Options + // @option zoomAnimation: Boolean = true + // Whether the map zoom animation is enabled. By default it's enabled + // in all browsers that support CSS3 Transitions except Android. + zoomAnimation: true, + + // @option zoomAnimationThreshold: Number = 4 + // Won't animate zoom if the zoom difference exceeds this value. + zoomAnimationThreshold: 4, + + // @option fadeAnimation: Boolean = true + // Whether the tile fade animation is enabled. By default it's enabled + // in all browsers that support CSS3 Transitions except Android. + fadeAnimation: true, + + // @option markerZoomAnimation: Boolean = true + // Whether markers animate their zoom with the zoom animation, if disabled + // they will disappear for the length of the animation. By default it's + // enabled in all browsers that support CSS3 Transitions except Android. + markerZoomAnimation: true, + + // @option transform3DLimit: Number = 2^23 + // Defines the maximum size of a CSS translation transform. The default + // value should not be changed unless a web browser positions layers in + // the wrong place after doing a large `panBy`. + transform3DLimit: 8388608, // Precision limit of a 32-bit float + + // @section Interaction Options + // @option zoomSnap: Number = 1 + // Forces the map's zoom level to always be a multiple of this, particularly + // right after a [`fitBounds()`](#map-fitbounds) or a pinch-zoom. + // By default, the zoom level snaps to the nearest integer; lower values + // (e.g. `0.5` or `0.1`) allow for greater granularity. A value of `0` + // means the zoom level will not be snapped after `fitBounds` or a pinch-zoom. + zoomSnap: 1, + + // @option zoomDelta: Number = 1 + // Controls how much the map's zoom level will change after a + // [`zoomIn()`](#map-zoomin), [`zoomOut()`](#map-zoomout), pressing `+` + // or `-` on the keyboard, or using the [zoom controls](#control-zoom). + // Values smaller than `1` (e.g. `0.5`) allow for greater granularity. + zoomDelta: 1, + + // @option trackResize: Boolean = true + // Whether the map automatically handles browser window resize to update itself. + trackResize: true + }, + + initialize: function (id, options) { // (HTMLElement or String, Object) + options = setOptions(this, options); + + // Make sure to assign internal flags at the beginning, + // to avoid inconsistent state in some edge cases. + this._handlers = []; + this._layers = {}; + this._zoomBoundLayers = {}; + this._sizeChanged = true; + + this._initContainer(id); + this._initLayout(); + + // hack for https://github.com/Leaflet/Leaflet/issues/1980 + this._onResize = bind(this._onResize, this); + + this._initEvents(); + + if (options.maxBounds) { + this.setMaxBounds(options.maxBounds); + } + + if (options.zoom !== undefined) { + this._zoom = this._limitZoom(options.zoom); + } + + if (options.center && options.zoom !== undefined) { + this.setView(toLatLng(options.center), options.zoom, {reset: true}); + } + + this.callInitHooks(); + + // don't animate on browsers without hardware-accelerated transitions or old Android/Opera + this._zoomAnimated = TRANSITION && Browser.any3d && !Browser.mobileOpera && + this.options.zoomAnimation; + + // zoom transitions run with the same duration for all layers, so if one of transitionend events + // happens after starting zoom animation (propagating to the map pane), we know that it ended globally + if (this._zoomAnimated) { + this._createAnimProxy(); + on(this._proxy, TRANSITION_END, this._catchTransitionEnd, this); + } + + this._addLayers(this.options.layers); + }, + + + // @section Methods for modifying map state + + // @method setView(center: LatLng, zoom: Number, options?: Zoom/pan options): this + // Sets the view of the map (geographical center and zoom) with the given + // animation options. + setView: function (center, zoom, options) { + + zoom = zoom === undefined ? this._zoom : this._limitZoom(zoom); + center = this._limitCenter(toLatLng(center), zoom, this.options.maxBounds); + options = options || {}; + + this._stop(); + + if (this._loaded && !options.reset && options !== true) { + + if (options.animate !== undefined) { + options.zoom = extend({animate: options.animate}, options.zoom); + options.pan = extend({animate: options.animate, duration: options.duration}, options.pan); + } + + // try animating pan or zoom + var moved = (this._zoom !== zoom) ? + this._tryAnimatedZoom && this._tryAnimatedZoom(center, zoom, options.zoom) : + this._tryAnimatedPan(center, options.pan); + + if (moved) { + // prevent resize handler call, the view will refresh after animation anyway + clearTimeout(this._sizeTimer); + return this; + } + } + + // animation didn't start, just reset the map view + this._resetView(center, zoom, options.pan && options.pan.noMoveStart); + + return this; + }, + + // @method setZoom(zoom: Number, options?: Zoom/pan options): this + // Sets the zoom of the map. + setZoom: function (zoom, options) { + if (!this._loaded) { + this._zoom = zoom; + return this; + } + return this.setView(this.getCenter(), zoom, {zoom: options}); + }, + + // @method zoomIn(delta?: Number, options?: Zoom options): this + // Increases the zoom of the map by `delta` ([`zoomDelta`](#map-zoomdelta) by default). + zoomIn: function (delta, options) { + delta = delta || (Browser.any3d ? this.options.zoomDelta : 1); + return this.setZoom(this._zoom + delta, options); + }, + + // @method zoomOut(delta?: Number, options?: Zoom options): this + // Decreases the zoom of the map by `delta` ([`zoomDelta`](#map-zoomdelta) by default). + zoomOut: function (delta, options) { + delta = delta || (Browser.any3d ? this.options.zoomDelta : 1); + return this.setZoom(this._zoom - delta, options); + }, + + // @method setZoomAround(latlng: LatLng, zoom: Number, options: Zoom options): this + // Zooms the map while keeping a specified geographical point on the map + // stationary (e.g. used internally for scroll zoom and double-click zoom). + // @alternative + // @method setZoomAround(offset: Point, zoom: Number, options: Zoom options): this + // Zooms the map while keeping a specified pixel on the map (relative to the top-left corner) stationary. + setZoomAround: function (latlng, zoom, options) { + var scale = this.getZoomScale(zoom), + viewHalf = this.getSize().divideBy(2), + containerPoint = latlng instanceof Point ? latlng : this.latLngToContainerPoint(latlng), + + centerOffset = containerPoint.subtract(viewHalf).multiplyBy(1 - 1 / scale), + newCenter = this.containerPointToLatLng(viewHalf.add(centerOffset)); + + return this.setView(newCenter, zoom, {zoom: options}); + }, + + _getBoundsCenterZoom: function (bounds, options) { + + options = options || {}; + bounds = bounds.getBounds ? bounds.getBounds() : toLatLngBounds(bounds); + + var paddingTL = toPoint(options.paddingTopLeft || options.padding || [0, 0]), + paddingBR = toPoint(options.paddingBottomRight || options.padding || [0, 0]), + + zoom = this.getBoundsZoom(bounds, false, paddingTL.add(paddingBR)); + + zoom = (typeof options.maxZoom === 'number') ? Math.min(options.maxZoom, zoom) : zoom; + + if (zoom === Infinity) { + return { + center: bounds.getCenter(), + zoom: zoom + }; + } + + var paddingOffset = paddingBR.subtract(paddingTL).divideBy(2), + + swPoint = this.project(bounds.getSouthWest(), zoom), + nePoint = this.project(bounds.getNorthEast(), zoom), + center = this.unproject(swPoint.add(nePoint).divideBy(2).add(paddingOffset), zoom); + + return { + center: center, + zoom: zoom + }; + }, + + // @method fitBounds(bounds: LatLngBounds, options?: fitBounds options): this + // Sets a map view that contains the given geographical bounds with the + // maximum zoom level possible. + fitBounds: function (bounds, options) { + + bounds = toLatLngBounds(bounds); + + if (!bounds.isValid()) { + throw new Error('Bounds are not valid.'); + } + + var target = this._getBoundsCenterZoom(bounds, options); + return this.setView(target.center, target.zoom, options); + }, + + // @method fitWorld(options?: fitBounds options): this + // Sets a map view that mostly contains the whole world with the maximum + // zoom level possible. + fitWorld: function (options) { + return this.fitBounds([[-90, -180], [90, 180]], options); + }, + + // @method panTo(latlng: LatLng, options?: Pan options): this + // Pans the map to a given center. + panTo: function (center, options) { // (LatLng) + return this.setView(center, this._zoom, {pan: options}); + }, + + // @method panBy(offset: Point, options?: Pan options): this + // Pans the map by a given number of pixels (animated). + panBy: function (offset, options) { + offset = toPoint(offset).round(); + options = options || {}; + + if (!offset.x && !offset.y) { + return this.fire('moveend'); + } + // If we pan too far, Chrome gets issues with tiles + // and makes them disappear or appear in the wrong place (slightly offset) #2602 + if (options.animate !== true && !this.getSize().contains(offset)) { + this._resetView(this.unproject(this.project(this.getCenter()).add(offset)), this.getZoom()); + return this; + } + + if (!this._panAnim) { + this._panAnim = new PosAnimation(); + + this._panAnim.on({ + 'step': this._onPanTransitionStep, + 'end': this._onPanTransitionEnd + }, this); + } + + // don't fire movestart if animating inertia + if (!options.noMoveStart) { + this.fire('movestart'); + } + + // animate pan unless animate: false specified + if (options.animate !== false) { + addClass(this._mapPane, 'leaflet-pan-anim'); + + var newPos = this._getMapPanePos().subtract(offset).round(); + this._panAnim.run(this._mapPane, newPos, options.duration || 0.25, options.easeLinearity); + } else { + this._rawPanBy(offset); + this.fire('move').fire('moveend'); + } + + return this; + }, + + // @method flyTo(latlng: LatLng, zoom?: Number, options?: Zoom/pan options): this + // Sets the view of the map (geographical center and zoom) performing a smooth + // pan-zoom animation. + flyTo: function (targetCenter, targetZoom, options) { + + options = options || {}; + if (options.animate === false || !Browser.any3d) { + return this.setView(targetCenter, targetZoom, options); + } + + this._stop(); + + var from = this.project(this.getCenter()), + to = this.project(targetCenter), + size = this.getSize(), + startZoom = this._zoom; + + targetCenter = toLatLng(targetCenter); + targetZoom = targetZoom === undefined ? startZoom : targetZoom; + + var w0 = Math.max(size.x, size.y), + w1 = w0 * this.getZoomScale(startZoom, targetZoom), + u1 = (to.distanceTo(from)) || 1, + rho = 1.42, + rho2 = rho * rho; + + function r(i) { + var s1 = i ? -1 : 1, + s2 = i ? w1 : w0, + t1 = w1 * w1 - w0 * w0 + s1 * rho2 * rho2 * u1 * u1, + b1 = 2 * s2 * rho2 * u1, + b = t1 / b1, + sq = Math.sqrt(b * b + 1) - b; + + // workaround for floating point precision bug when sq = 0, log = -Infinite, + // thus triggering an infinite loop in flyTo + var log = sq < 0.000000001 ? -18 : Math.log(sq); + + return log; + } + + function sinh(n) { return (Math.exp(n) - Math.exp(-n)) / 2; } + function cosh(n) { return (Math.exp(n) + Math.exp(-n)) / 2; } + function tanh(n) { return sinh(n) / cosh(n); } + + var r0 = r(0); + + function w(s) { return w0 * (cosh(r0) / cosh(r0 + rho * s)); } + function u(s) { return w0 * (cosh(r0) * tanh(r0 + rho * s) - sinh(r0)) / rho2; } + + function easeOut(t) { return 1 - Math.pow(1 - t, 1.5); } + + var start = Date.now(), + S = (r(1) - r0) / rho, + duration = options.duration ? 1000 * options.duration : 1000 * S * 0.8; + + function frame() { + var t = (Date.now() - start) / duration, + s = easeOut(t) * S; + + if (t <= 1) { + this._flyToFrame = requestAnimFrame(frame, this); + + this._move( + this.unproject(from.add(to.subtract(from).multiplyBy(u(s) / u1)), startZoom), + this.getScaleZoom(w0 / w(s), startZoom), + {flyTo: true}); + + } else { + this + ._move(targetCenter, targetZoom) + ._moveEnd(true); + } + } + + this._moveStart(true, options.noMoveStart); + + frame.call(this); + return this; + }, + + // @method flyToBounds(bounds: LatLngBounds, options?: fitBounds options): this + // Sets the view of the map with a smooth animation like [`flyTo`](#map-flyto), + // but takes a bounds parameter like [`fitBounds`](#map-fitbounds). + flyToBounds: function (bounds, options) { + var target = this._getBoundsCenterZoom(bounds, options); + return this.flyTo(target.center, target.zoom, options); + }, + + // @method setMaxBounds(bounds: LatLngBounds): this + // Restricts the map view to the given bounds (see the [maxBounds](#map-maxbounds) option). + setMaxBounds: function (bounds) { + bounds = toLatLngBounds(bounds); + + if (this.listens('moveend', this._panInsideMaxBounds)) { + this.off('moveend', this._panInsideMaxBounds); + } + + if (!bounds.isValid()) { + this.options.maxBounds = null; + return this; + } + + this.options.maxBounds = bounds; + + if (this._loaded) { + this._panInsideMaxBounds(); + } + + return this.on('moveend', this._panInsideMaxBounds); + }, + + // @method setMinZoom(zoom: Number): this + // Sets the lower limit for the available zoom levels (see the [minZoom](#map-minzoom) option). + setMinZoom: function (zoom) { + var oldZoom = this.options.minZoom; + this.options.minZoom = zoom; + + if (this._loaded && oldZoom !== zoom) { + this.fire('zoomlevelschange'); + + if (this.getZoom() < this.options.minZoom) { + return this.setZoom(zoom); + } + } + + return this; + }, + + // @method setMaxZoom(zoom: Number): this + // Sets the upper limit for the available zoom levels (see the [maxZoom](#map-maxzoom) option). + setMaxZoom: function (zoom) { + var oldZoom = this.options.maxZoom; + this.options.maxZoom = zoom; + + if (this._loaded && oldZoom !== zoom) { + this.fire('zoomlevelschange'); + + if (this.getZoom() > this.options.maxZoom) { + return this.setZoom(zoom); + } + } + + return this; + }, + + // @method panInsideBounds(bounds: LatLngBounds, options?: Pan options): this + // Pans the map to the closest view that would lie inside the given bounds (if it's not already), controlling the animation using the options specific, if any. + panInsideBounds: function (bounds, options) { + this._enforcingBounds = true; + var center = this.getCenter(), + newCenter = this._limitCenter(center, this._zoom, toLatLngBounds(bounds)); + + if (!center.equals(newCenter)) { + this.panTo(newCenter, options); + } + + this._enforcingBounds = false; + return this; + }, + + // @method panInside(latlng: LatLng, options?: padding options): this + // Pans the map the minimum amount to make the `latlng` visible. Use + // padding options to fit the display to more restricted bounds. + // If `latlng` is already within the (optionally padded) display bounds, + // the map will not be panned. + panInside: function (latlng, options) { + options = options || {}; + + var paddingTL = toPoint(options.paddingTopLeft || options.padding || [0, 0]), + paddingBR = toPoint(options.paddingBottomRight || options.padding || [0, 0]), + pixelCenter = this.project(this.getCenter()), + pixelPoint = this.project(latlng), + pixelBounds = this.getPixelBounds(), + paddedBounds = toBounds([pixelBounds.min.add(paddingTL), pixelBounds.max.subtract(paddingBR)]), + paddedSize = paddedBounds.getSize(); + + if (!paddedBounds.contains(pixelPoint)) { + this._enforcingBounds = true; + var centerOffset = pixelPoint.subtract(paddedBounds.getCenter()); + var offset = paddedBounds.extend(pixelPoint).getSize().subtract(paddedSize); + pixelCenter.x += centerOffset.x < 0 ? -offset.x : offset.x; + pixelCenter.y += centerOffset.y < 0 ? -offset.y : offset.y; + this.panTo(this.unproject(pixelCenter), options); + this._enforcingBounds = false; + } + return this; + }, + + // @method invalidateSize(options: Zoom/pan options): this + // Checks if the map container size changed and updates the map if so — + // call it after you've changed the map size dynamically, also animating + // pan by default. If `options.pan` is `false`, panning will not occur. + // If `options.debounceMoveend` is `true`, it will delay `moveend` event so + // that it doesn't happen often even if the method is called many + // times in a row. + + // @alternative + // @method invalidateSize(animate: Boolean): this + // Checks if the map container size changed and updates the map if so — + // call it after you've changed the map size dynamically, also animating + // pan by default. + invalidateSize: function (options) { + if (!this._loaded) { return this; } + + options = extend({ + animate: false, + pan: true + }, options === true ? {animate: true} : options); + + var oldSize = this.getSize(); + this._sizeChanged = true; + this._lastCenter = null; + + var newSize = this.getSize(), + oldCenter = oldSize.divideBy(2).round(), + newCenter = newSize.divideBy(2).round(), + offset = oldCenter.subtract(newCenter); + + if (!offset.x && !offset.y) { return this; } + + if (options.animate && options.pan) { + this.panBy(offset); + + } else { + if (options.pan) { + this._rawPanBy(offset); + } + + this.fire('move'); + + if (options.debounceMoveend) { + clearTimeout(this._sizeTimer); + this._sizeTimer = setTimeout(bind(this.fire, this, 'moveend'), 200); + } else { + this.fire('moveend'); + } + } + + // @section Map state change events + // @event resize: ResizeEvent + // Fired when the map is resized. + return this.fire('resize', { + oldSize: oldSize, + newSize: newSize + }); + }, + + // @section Methods for modifying map state + // @method stop(): this + // Stops the currently running `panTo` or `flyTo` animation, if any. + stop: function () { + this.setZoom(this._limitZoom(this._zoom)); + if (!this.options.zoomSnap) { + this.fire('viewreset'); + } + return this._stop(); + }, + + // @section Geolocation methods + // @method locate(options?: Locate options): this + // Tries to locate the user using the Geolocation API, firing a [`locationfound`](#map-locationfound) + // event with location data on success or a [`locationerror`](#map-locationerror) event on failure, + // and optionally sets the map view to the user's location with respect to + // detection accuracy (or to the world view if geolocation failed). + // Note that, if your page doesn't use HTTPS, this method will fail in + // modern browsers ([Chrome 50 and newer](https://sites.google.com/a/chromium.org/dev/Home/chromium-security/deprecating-powerful-features-on-insecure-origins)) + // See `Locate options` for more details. + locate: function (options) { + + options = this._locateOptions = extend({ + timeout: 10000, + watch: false + // setView: false + // maxZoom: + // maximumAge: 0 + // enableHighAccuracy: false + }, options); + + if (!('geolocation' in navigator)) { + this._handleGeolocationError({ + code: 0, + message: 'Geolocation not supported.' + }); + return this; + } + + var onResponse = bind(this._handleGeolocationResponse, this), + onError = bind(this._handleGeolocationError, this); + + if (options.watch) { + this._locationWatchId = + navigator.geolocation.watchPosition(onResponse, onError, options); + } else { + navigator.geolocation.getCurrentPosition(onResponse, onError, options); + } + return this; + }, + + // @method stopLocate(): this + // Stops watching location previously initiated by `map.locate({watch: true})` + // and aborts resetting the map view if map.locate was called with + // `{setView: true}`. + stopLocate: function () { + if (navigator.geolocation && navigator.geolocation.clearWatch) { + navigator.geolocation.clearWatch(this._locationWatchId); + } + if (this._locateOptions) { + this._locateOptions.setView = false; + } + return this; + }, + + _handleGeolocationError: function (error) { + if (!this._container._leaflet_id) { return; } + + var c = error.code, + message = error.message || + (c === 1 ? 'permission denied' : + (c === 2 ? 'position unavailable' : 'timeout')); + + if (this._locateOptions.setView && !this._loaded) { + this.fitWorld(); + } + + // @section Location events + // @event locationerror: ErrorEvent + // Fired when geolocation (using the [`locate`](#map-locate) method) failed. + this.fire('locationerror', { + code: c, + message: 'Geolocation error: ' + message + '.' + }); + }, + + _handleGeolocationResponse: function (pos) { + if (!this._container._leaflet_id) { return; } + + var lat = pos.coords.latitude, + lng = pos.coords.longitude, + latlng = new LatLng(lat, lng), + bounds = latlng.toBounds(pos.coords.accuracy * 2), + options = this._locateOptions; + + if (options.setView) { + var zoom = this.getBoundsZoom(bounds); + this.setView(latlng, options.maxZoom ? Math.min(zoom, options.maxZoom) : zoom); + } + + var data = { + latlng: latlng, + bounds: bounds, + timestamp: pos.timestamp + }; + + for (var i in pos.coords) { + if (typeof pos.coords[i] === 'number') { + data[i] = pos.coords[i]; + } + } + + // @event locationfound: LocationEvent + // Fired when geolocation (using the [`locate`](#map-locate) method) + // went successfully. + this.fire('locationfound', data); + }, + + // TODO Appropriate docs section? + // @section Other Methods + // @method addHandler(name: String, HandlerClass: Function): this + // Adds a new `Handler` to the map, given its name and constructor function. + addHandler: function (name, HandlerClass) { + if (!HandlerClass) { return this; } + + var handler = this[name] = new HandlerClass(this); + + this._handlers.push(handler); + + if (this.options[name]) { + handler.enable(); + } + + return this; + }, + + // @method remove(): this + // Destroys the map and clears all related event listeners. + remove: function () { + + this._initEvents(true); + if (this.options.maxBounds) { this.off('moveend', this._panInsideMaxBounds); } + + if (this._containerId !== this._container._leaflet_id) { + throw new Error('Map container is being reused by another instance'); + } + + try { + // throws error in IE6-8 + delete this._container._leaflet_id; + delete this._containerId; + } catch (e) { + /*eslint-disable */ + this._container._leaflet_id = undefined; + /* eslint-enable */ + this._containerId = undefined; + } + + if (this._locationWatchId !== undefined) { + this.stopLocate(); + } + + this._stop(); + + remove(this._mapPane); + + if (this._clearControlPos) { + this._clearControlPos(); + } + if (this._resizeRequest) { + cancelAnimFrame(this._resizeRequest); + this._resizeRequest = null; + } + + this._clearHandlers(); + + if (this._loaded) { + // @section Map state change events + // @event unload: Event + // Fired when the map is destroyed with [remove](#map-remove) method. + this.fire('unload'); + } + + var i; + for (i in this._layers) { + this._layers[i].remove(); + } + for (i in this._panes) { + remove(this._panes[i]); + } + + this._layers = []; + this._panes = []; + delete this._mapPane; + delete this._renderer; + + return this; + }, + + // @section Other Methods + // @method createPane(name: String, container?: HTMLElement): HTMLElement + // Creates a new [map pane](#map-pane) with the given name if it doesn't exist already, + // then returns it. The pane is created as a child of `container`, or + // as a child of the main map pane if not set. + createPane: function (name, container) { + var className = 'leaflet-pane' + (name ? ' leaflet-' + name.replace('Pane', '') + '-pane' : ''), + pane = create$1('div', className, container || this._mapPane); + + if (name) { + this._panes[name] = pane; + } + return pane; + }, + + // @section Methods for Getting Map State + + // @method getCenter(): LatLng + // Returns the geographical center of the map view + getCenter: function () { + this._checkIfLoaded(); + + if (this._lastCenter && !this._moved()) { + return this._lastCenter.clone(); + } + return this.layerPointToLatLng(this._getCenterLayerPoint()); + }, + + // @method getZoom(): Number + // Returns the current zoom level of the map view + getZoom: function () { + return this._zoom; + }, + + // @method getBounds(): LatLngBounds + // Returns the geographical bounds visible in the current map view + getBounds: function () { + var bounds = this.getPixelBounds(), + sw = this.unproject(bounds.getBottomLeft()), + ne = this.unproject(bounds.getTopRight()); + + return new LatLngBounds(sw, ne); + }, + + // @method getMinZoom(): Number + // Returns the minimum zoom level of the map (if set in the `minZoom` option of the map or of any layers), or `0` by default. + getMinZoom: function () { + return this.options.minZoom === undefined ? this._layersMinZoom || 0 : this.options.minZoom; + }, + + // @method getMaxZoom(): Number + // Returns the maximum zoom level of the map (if set in the `maxZoom` option of the map or of any layers). + getMaxZoom: function () { + return this.options.maxZoom === undefined ? + (this._layersMaxZoom === undefined ? Infinity : this._layersMaxZoom) : + this.options.maxZoom; + }, + + // @method getBoundsZoom(bounds: LatLngBounds, inside?: Boolean, padding?: Point): Number + // Returns the maximum zoom level on which the given bounds fit to the map + // view in its entirety. If `inside` (optional) is set to `true`, the method + // instead returns the minimum zoom level on which the map view fits into + // the given bounds in its entirety. + getBoundsZoom: function (bounds, inside, padding) { // (LatLngBounds[, Boolean, Point]) -> Number + bounds = toLatLngBounds(bounds); + padding = toPoint(padding || [0, 0]); + + var zoom = this.getZoom() || 0, + min = this.getMinZoom(), + max = this.getMaxZoom(), + nw = bounds.getNorthWest(), + se = bounds.getSouthEast(), + size = this.getSize().subtract(padding), + boundsSize = toBounds(this.project(se, zoom), this.project(nw, zoom)).getSize(), + snap = Browser.any3d ? this.options.zoomSnap : 1, + scalex = size.x / boundsSize.x, + scaley = size.y / boundsSize.y, + scale = inside ? Math.max(scalex, scaley) : Math.min(scalex, scaley); + + zoom = this.getScaleZoom(scale, zoom); + + if (snap) { + zoom = Math.round(zoom / (snap / 100)) * (snap / 100); // don't jump if within 1% of a snap level + zoom = inside ? Math.ceil(zoom / snap) * snap : Math.floor(zoom / snap) * snap; + } + + return Math.max(min, Math.min(max, zoom)); + }, + + // @method getSize(): Point + // Returns the current size of the map container (in pixels). + getSize: function () { + if (!this._size || this._sizeChanged) { + this._size = new Point( + this._container.clientWidth || 0, + this._container.clientHeight || 0); + + this._sizeChanged = false; + } + return this._size.clone(); + }, + + // @method getPixelBounds(): Bounds + // Returns the bounds of the current map view in projected pixel + // coordinates (sometimes useful in layer and overlay implementations). + getPixelBounds: function (center, zoom) { + var topLeftPoint = this._getTopLeftPoint(center, zoom); + return new Bounds(topLeftPoint, topLeftPoint.add(this.getSize())); + }, + + // TODO: Check semantics - isn't the pixel origin the 0,0 coord relative to + // the map pane? "left point of the map layer" can be confusing, specially + // since there can be negative offsets. + // @method getPixelOrigin(): Point + // Returns the projected pixel coordinates of the top left point of + // the map layer (useful in custom layer and overlay implementations). + getPixelOrigin: function () { + this._checkIfLoaded(); + return this._pixelOrigin; + }, + + // @method getPixelWorldBounds(zoom?: Number): Bounds + // Returns the world's bounds in pixel coordinates for zoom level `zoom`. + // If `zoom` is omitted, the map's current zoom level is used. + getPixelWorldBounds: function (zoom) { + return this.options.crs.getProjectedBounds(zoom === undefined ? this.getZoom() : zoom); + }, + + // @section Other Methods + + // @method getPane(pane: String|HTMLElement): HTMLElement + // Returns a [map pane](#map-pane), given its name or its HTML element (its identity). + getPane: function (pane) { + return typeof pane === 'string' ? this._panes[pane] : pane; + }, + + // @method getPanes(): Object + // Returns a plain object containing the names of all [panes](#map-pane) as keys and + // the panes as values. + getPanes: function () { + return this._panes; + }, + + // @method getContainer: HTMLElement + // Returns the HTML element that contains the map. + getContainer: function () { + return this._container; + }, + + + // @section Conversion Methods + + // @method getZoomScale(toZoom: Number, fromZoom: Number): Number + // Returns the scale factor to be applied to a map transition from zoom level + // `fromZoom` to `toZoom`. Used internally to help with zoom animations. + getZoomScale: function (toZoom, fromZoom) { + // TODO replace with universal implementation after refactoring projections + var crs = this.options.crs; + fromZoom = fromZoom === undefined ? this._zoom : fromZoom; + return crs.scale(toZoom) / crs.scale(fromZoom); + }, + + // @method getScaleZoom(scale: Number, fromZoom: Number): Number + // Returns the zoom level that the map would end up at, if it is at `fromZoom` + // level and everything is scaled by a factor of `scale`. Inverse of + // [`getZoomScale`](#map-getZoomScale). + getScaleZoom: function (scale, fromZoom) { + var crs = this.options.crs; + fromZoom = fromZoom === undefined ? this._zoom : fromZoom; + var zoom = crs.zoom(scale * crs.scale(fromZoom)); + return isNaN(zoom) ? Infinity : zoom; + }, + + // @method project(latlng: LatLng, zoom: Number): Point + // Projects a geographical coordinate `LatLng` according to the projection + // of the map's CRS, then scales it according to `zoom` and the CRS's + // `Transformation`. The result is pixel coordinate relative to + // the CRS origin. + project: function (latlng, zoom) { + zoom = zoom === undefined ? this._zoom : zoom; + return this.options.crs.latLngToPoint(toLatLng(latlng), zoom); + }, + + // @method unproject(point: Point, zoom: Number): LatLng + // Inverse of [`project`](#map-project). + unproject: function (point, zoom) { + zoom = zoom === undefined ? this._zoom : zoom; + return this.options.crs.pointToLatLng(toPoint(point), zoom); + }, + + // @method layerPointToLatLng(point: Point): LatLng + // Given a pixel coordinate relative to the [origin pixel](#map-getpixelorigin), + // returns the corresponding geographical coordinate (for the current zoom level). + layerPointToLatLng: function (point) { + var projectedPoint = toPoint(point).add(this.getPixelOrigin()); + return this.unproject(projectedPoint); + }, + + // @method latLngToLayerPoint(latlng: LatLng): Point + // Given a geographical coordinate, returns the corresponding pixel coordinate + // relative to the [origin pixel](#map-getpixelorigin). + latLngToLayerPoint: function (latlng) { + var projectedPoint = this.project(toLatLng(latlng))._round(); + return projectedPoint._subtract(this.getPixelOrigin()); + }, + + // @method wrapLatLng(latlng: LatLng): LatLng + // Returns a `LatLng` where `lat` and `lng` has been wrapped according to the + // map's CRS's `wrapLat` and `wrapLng` properties, if they are outside the + // CRS's bounds. + // By default this means longitude is wrapped around the dateline so its + // value is between -180 and +180 degrees. + wrapLatLng: function (latlng) { + return this.options.crs.wrapLatLng(toLatLng(latlng)); + }, + + // @method wrapLatLngBounds(bounds: LatLngBounds): LatLngBounds + // Returns a `LatLngBounds` with the same size as the given one, ensuring that + // its center is within the CRS's bounds. + // By default this means the center longitude is wrapped around the dateline so its + // value is between -180 and +180 degrees, and the majority of the bounds + // overlaps the CRS's bounds. + wrapLatLngBounds: function (latlng) { + return this.options.crs.wrapLatLngBounds(toLatLngBounds(latlng)); + }, + + // @method distance(latlng1: LatLng, latlng2: LatLng): Number + // Returns the distance between two geographical coordinates according to + // the map's CRS. By default this measures distance in meters. + distance: function (latlng1, latlng2) { + return this.options.crs.distance(toLatLng(latlng1), toLatLng(latlng2)); + }, + + // @method containerPointToLayerPoint(point: Point): Point + // Given a pixel coordinate relative to the map container, returns the corresponding + // pixel coordinate relative to the [origin pixel](#map-getpixelorigin). + containerPointToLayerPoint: function (point) { // (Point) + return toPoint(point).subtract(this._getMapPanePos()); + }, + + // @method layerPointToContainerPoint(point: Point): Point + // Given a pixel coordinate relative to the [origin pixel](#map-getpixelorigin), + // returns the corresponding pixel coordinate relative to the map container. + layerPointToContainerPoint: function (point) { // (Point) + return toPoint(point).add(this._getMapPanePos()); + }, + + // @method containerPointToLatLng(point: Point): LatLng + // Given a pixel coordinate relative to the map container, returns + // the corresponding geographical coordinate (for the current zoom level). + containerPointToLatLng: function (point) { + var layerPoint = this.containerPointToLayerPoint(toPoint(point)); + return this.layerPointToLatLng(layerPoint); + }, + + // @method latLngToContainerPoint(latlng: LatLng): Point + // Given a geographical coordinate, returns the corresponding pixel coordinate + // relative to the map container. + latLngToContainerPoint: function (latlng) { + return this.layerPointToContainerPoint(this.latLngToLayerPoint(toLatLng(latlng))); + }, + + // @method mouseEventToContainerPoint(ev: MouseEvent): Point + // Given a MouseEvent object, returns the pixel coordinate relative to the + // map container where the event took place. + mouseEventToContainerPoint: function (e) { + return getMousePosition(e, this._container); + }, + + // @method mouseEventToLayerPoint(ev: MouseEvent): Point + // Given a MouseEvent object, returns the pixel coordinate relative to + // the [origin pixel](#map-getpixelorigin) where the event took place. + mouseEventToLayerPoint: function (e) { + return this.containerPointToLayerPoint(this.mouseEventToContainerPoint(e)); + }, + + // @method mouseEventToLatLng(ev: MouseEvent): LatLng + // Given a MouseEvent object, returns geographical coordinate where the + // event took place. + mouseEventToLatLng: function (e) { // (MouseEvent) + return this.layerPointToLatLng(this.mouseEventToLayerPoint(e)); + }, + + + // map initialization methods + + _initContainer: function (id) { + var container = this._container = get(id); + + if (!container) { + throw new Error('Map container not found.'); + } else if (container._leaflet_id) { + throw new Error('Map container is already initialized.'); + } + + on(container, 'scroll', this._onScroll, this); + this._containerId = stamp(container); + }, + + _initLayout: function () { + var container = this._container; + + this._fadeAnimated = this.options.fadeAnimation && Browser.any3d; + + addClass(container, 'leaflet-container' + + (Browser.touch ? ' leaflet-touch' : '') + + (Browser.retina ? ' leaflet-retina' : '') + + (Browser.ielt9 ? ' leaflet-oldie' : '') + + (Browser.safari ? ' leaflet-safari' : '') + + (this._fadeAnimated ? ' leaflet-fade-anim' : '')); + + var position = getStyle(container, 'position'); + + if (position !== 'absolute' && position !== 'relative' && position !== 'fixed' && position !== 'sticky') { + container.style.position = 'relative'; + } + + this._initPanes(); + + if (this._initControlPos) { + this._initControlPos(); + } + }, + + _initPanes: function () { + var panes = this._panes = {}; + this._paneRenderers = {}; + + // @section + // + // Panes are DOM elements used to control the ordering of layers on the map. You + // can access panes with [`map.getPane`](#map-getpane) or + // [`map.getPanes`](#map-getpanes) methods. New panes can be created with the + // [`map.createPane`](#map-createpane) method. + // + // Every map has the following default panes that differ only in zIndex. + // + // @pane mapPane: HTMLElement = 'auto' + // Pane that contains all other map panes + + this._mapPane = this.createPane('mapPane', this._container); + setPosition(this._mapPane, new Point(0, 0)); + + // @pane tilePane: HTMLElement = 200 + // Pane for `GridLayer`s and `TileLayer`s + this.createPane('tilePane'); + // @pane overlayPane: HTMLElement = 400 + // Pane for vectors (`Path`s, like `Polyline`s and `Polygon`s), `ImageOverlay`s and `VideoOverlay`s + this.createPane('overlayPane'); + // @pane shadowPane: HTMLElement = 500 + // Pane for overlay shadows (e.g. `Marker` shadows) + this.createPane('shadowPane'); + // @pane markerPane: HTMLElement = 600 + // Pane for `Icon`s of `Marker`s + this.createPane('markerPane'); + // @pane tooltipPane: HTMLElement = 650 + // Pane for `Tooltip`s. + this.createPane('tooltipPane'); + // @pane popupPane: HTMLElement = 700 + // Pane for `Popup`s. + this.createPane('popupPane'); + + if (!this.options.markerZoomAnimation) { + addClass(panes.markerPane, 'leaflet-zoom-hide'); + addClass(panes.shadowPane, 'leaflet-zoom-hide'); + } + }, + + + // private methods that modify map state + + // @section Map state change events + _resetView: function (center, zoom, noMoveStart) { + setPosition(this._mapPane, new Point(0, 0)); + + var loading = !this._loaded; + this._loaded = true; + zoom = this._limitZoom(zoom); + + this.fire('viewprereset'); + + var zoomChanged = this._zoom !== zoom; + this + ._moveStart(zoomChanged, noMoveStart) + ._move(center, zoom) + ._moveEnd(zoomChanged); + + // @event viewreset: Event + // Fired when the map needs to redraw its content (this usually happens + // on map zoom or load). Very useful for creating custom overlays. + this.fire('viewreset'); + + // @event load: Event + // Fired when the map is initialized (when its center and zoom are set + // for the first time). + if (loading) { + this.fire('load'); + } + }, + + _moveStart: function (zoomChanged, noMoveStart) { + // @event zoomstart: Event + // Fired when the map zoom is about to change (e.g. before zoom animation). + // @event movestart: Event + // Fired when the view of the map starts changing (e.g. user starts dragging the map). + if (zoomChanged) { + this.fire('zoomstart'); + } + if (!noMoveStart) { + this.fire('movestart'); + } + return this; + }, + + _move: function (center, zoom, data, supressEvent) { + if (zoom === undefined) { + zoom = this._zoom; + } + var zoomChanged = this._zoom !== zoom; + + this._zoom = zoom; + this._lastCenter = center; + this._pixelOrigin = this._getNewPixelOrigin(center); + + if (!supressEvent) { + // @event zoom: Event + // Fired repeatedly during any change in zoom level, + // including zoom and fly animations. + if (zoomChanged || (data && data.pinch)) { // Always fire 'zoom' if pinching because #3530 + this.fire('zoom', data); + } + + // @event move: Event + // Fired repeatedly during any movement of the map, + // including pan and fly animations. + this.fire('move', data); + } else if (data && data.pinch) { // Always fire 'zoom' if pinching because #3530 + this.fire('zoom', data); + } + return this; + }, + + _moveEnd: function (zoomChanged) { + // @event zoomend: Event + // Fired when the map zoom changed, after any animations. + if (zoomChanged) { + this.fire('zoomend'); + } + + // @event moveend: Event + // Fired when the center of the map stops changing + // (e.g. user stopped dragging the map or after non-centered zoom). + return this.fire('moveend'); + }, + + _stop: function () { + cancelAnimFrame(this._flyToFrame); + if (this._panAnim) { + this._panAnim.stop(); + } + return this; + }, + + _rawPanBy: function (offset) { + setPosition(this._mapPane, this._getMapPanePos().subtract(offset)); + }, + + _getZoomSpan: function () { + return this.getMaxZoom() - this.getMinZoom(); + }, + + _panInsideMaxBounds: function () { + if (!this._enforcingBounds) { + this.panInsideBounds(this.options.maxBounds); + } + }, + + _checkIfLoaded: function () { + if (!this._loaded) { + throw new Error('Set map center and zoom first.'); + } + }, + + // DOM event handling + + // @section Interaction events + _initEvents: function (remove) { + this._targets = {}; + this._targets[stamp(this._container)] = this; + + var onOff = remove ? off : on; + + // @event click: MouseEvent + // Fired when the user clicks (or taps) the map. + // @event dblclick: MouseEvent + // Fired when the user double-clicks (or double-taps) the map. + // @event mousedown: MouseEvent + // Fired when the user pushes the mouse button on the map. + // @event mouseup: MouseEvent + // Fired when the user releases the mouse button on the map. + // @event mouseover: MouseEvent + // Fired when the mouse enters the map. + // @event mouseout: MouseEvent + // Fired when the mouse leaves the map. + // @event mousemove: MouseEvent + // Fired while the mouse moves over the map. + // @event contextmenu: MouseEvent + // Fired when the user pushes the right mouse button on the map, prevents + // default browser context menu from showing if there are listeners on + // this event. Also fired on mobile when the user holds a single touch + // for a second (also called long press). + // @event keypress: KeyboardEvent + // Fired when the user presses a key from the keyboard that produces a character value while the map is focused. + // @event keydown: KeyboardEvent + // Fired when the user presses a key from the keyboard while the map is focused. Unlike the `keypress` event, + // the `keydown` event is fired for keys that produce a character value and for keys + // that do not produce a character value. + // @event keyup: KeyboardEvent + // Fired when the user releases a key from the keyboard while the map is focused. + onOff(this._container, 'click dblclick mousedown mouseup ' + + 'mouseover mouseout mousemove contextmenu keypress keydown keyup', this._handleDOMEvent, this); + + if (this.options.trackResize) { + onOff(window, 'resize', this._onResize, this); + } + + if (Browser.any3d && this.options.transform3DLimit) { + (remove ? this.off : this.on).call(this, 'moveend', this._onMoveEnd); + } + }, + + _onResize: function () { + cancelAnimFrame(this._resizeRequest); + this._resizeRequest = requestAnimFrame( + function () { this.invalidateSize({debounceMoveend: true}); }, this); + }, + + _onScroll: function () { + this._container.scrollTop = 0; + this._container.scrollLeft = 0; + }, + + _onMoveEnd: function () { + var pos = this._getMapPanePos(); + if (Math.max(Math.abs(pos.x), Math.abs(pos.y)) >= this.options.transform3DLimit) { + // https://bugzilla.mozilla.org/show_bug.cgi?id=1203873 but Webkit also have + // a pixel offset on very high values, see: https://jsfiddle.net/dg6r5hhb/ + this._resetView(this.getCenter(), this.getZoom()); + } + }, + + _findEventTargets: function (e, type) { + var targets = [], + target, + isHover = type === 'mouseout' || type === 'mouseover', + src = e.target || e.srcElement, + dragging = false; + + while (src) { + target = this._targets[stamp(src)]; + if (target && (type === 'click' || type === 'preclick') && this._draggableMoved(target)) { + // Prevent firing click after you just dragged an object. + dragging = true; + break; + } + if (target && target.listens(type, true)) { + if (isHover && !isExternalTarget(src, e)) { break; } + targets.push(target); + if (isHover) { break; } + } + if (src === this._container) { break; } + src = src.parentNode; + } + if (!targets.length && !dragging && !isHover && this.listens(type, true)) { + targets = [this]; + } + return targets; + }, + + _isClickDisabled: function (el) { + while (el && el !== this._container) { + if (el['_leaflet_disable_click']) { return true; } + el = el.parentNode; + } + }, + + _handleDOMEvent: function (e) { + var el = (e.target || e.srcElement); + if (!this._loaded || el['_leaflet_disable_events'] || e.type === 'click' && this._isClickDisabled(el)) { + return; + } + + var type = e.type; + + if (type === 'mousedown') { + // prevents outline when clicking on keyboard-focusable element + preventOutline(el); + } + + this._fireDOMEvent(e, type); + }, + + _mouseEvents: ['click', 'dblclick', 'mouseover', 'mouseout', 'contextmenu'], + + _fireDOMEvent: function (e, type, canvasTargets) { + + if (e.type === 'click') { + // Fire a synthetic 'preclick' event which propagates up (mainly for closing popups). + // @event preclick: MouseEvent + // Fired before mouse click on the map (sometimes useful when you + // want something to happen on click before any existing click + // handlers start running). + var synth = extend({}, e); + synth.type = 'preclick'; + this._fireDOMEvent(synth, synth.type, canvasTargets); + } + + // Find the layer the event is propagating from and its parents. + var targets = this._findEventTargets(e, type); + + if (canvasTargets) { + var filtered = []; // pick only targets with listeners + for (var i = 0; i < canvasTargets.length; i++) { + if (canvasTargets[i].listens(type, true)) { + filtered.push(canvasTargets[i]); + } + } + targets = filtered.concat(targets); + } + + if (!targets.length) { return; } + + if (type === 'contextmenu') { + preventDefault(e); + } + + var target = targets[0]; + var data = { + originalEvent: e + }; + + if (e.type !== 'keypress' && e.type !== 'keydown' && e.type !== 'keyup') { + var isMarker = target.getLatLng && (!target._radius || target._radius <= 10); + data.containerPoint = isMarker ? + this.latLngToContainerPoint(target.getLatLng()) : this.mouseEventToContainerPoint(e); + data.layerPoint = this.containerPointToLayerPoint(data.containerPoint); + data.latlng = isMarker ? target.getLatLng() : this.layerPointToLatLng(data.layerPoint); + } + + for (i = 0; i < targets.length; i++) { + targets[i].fire(type, data, true); + if (data.originalEvent._stopped || + (targets[i].options.bubblingMouseEvents === false && indexOf(this._mouseEvents, type) !== -1)) { return; } + } + }, + + _draggableMoved: function (obj) { + obj = obj.dragging && obj.dragging.enabled() ? obj : this; + return (obj.dragging && obj.dragging.moved()) || (this.boxZoom && this.boxZoom.moved()); + }, + + _clearHandlers: function () { + for (var i = 0, len = this._handlers.length; i < len; i++) { + this._handlers[i].disable(); + } + }, + + // @section Other Methods + + // @method whenReady(fn: Function, context?: Object): this + // Runs the given function `fn` when the map gets initialized with + // a view (center and zoom) and at least one layer, or immediately + // if it's already initialized, optionally passing a function context. + whenReady: function (callback, context) { + if (this._loaded) { + callback.call(context || this, {target: this}); + } else { + this.on('load', callback, context); + } + return this; + }, + + + // private methods for getting map state + + _getMapPanePos: function () { + return getPosition(this._mapPane) || new Point(0, 0); + }, + + _moved: function () { + var pos = this._getMapPanePos(); + return pos && !pos.equals([0, 0]); + }, + + _getTopLeftPoint: function (center, zoom) { + var pixelOrigin = center && zoom !== undefined ? + this._getNewPixelOrigin(center, zoom) : + this.getPixelOrigin(); + return pixelOrigin.subtract(this._getMapPanePos()); + }, + + _getNewPixelOrigin: function (center, zoom) { + var viewHalf = this.getSize()._divideBy(2); + return this.project(center, zoom)._subtract(viewHalf)._add(this._getMapPanePos())._round(); + }, + + _latLngToNewLayerPoint: function (latlng, zoom, center) { + var topLeft = this._getNewPixelOrigin(center, zoom); + return this.project(latlng, zoom)._subtract(topLeft); + }, + + _latLngBoundsToNewLayerBounds: function (latLngBounds, zoom, center) { + var topLeft = this._getNewPixelOrigin(center, zoom); + return toBounds([ + this.project(latLngBounds.getSouthWest(), zoom)._subtract(topLeft), + this.project(latLngBounds.getNorthWest(), zoom)._subtract(topLeft), + this.project(latLngBounds.getSouthEast(), zoom)._subtract(topLeft), + this.project(latLngBounds.getNorthEast(), zoom)._subtract(topLeft) + ]); + }, + + // layer point of the current center + _getCenterLayerPoint: function () { + return this.containerPointToLayerPoint(this.getSize()._divideBy(2)); + }, + + // offset of the specified place to the current center in pixels + _getCenterOffset: function (latlng) { + return this.latLngToLayerPoint(latlng).subtract(this._getCenterLayerPoint()); + }, + + // adjust center for view to get inside bounds + _limitCenter: function (center, zoom, bounds) { + + if (!bounds) { return center; } + + var centerPoint = this.project(center, zoom), + viewHalf = this.getSize().divideBy(2), + viewBounds = new Bounds(centerPoint.subtract(viewHalf), centerPoint.add(viewHalf)), + offset = this._getBoundsOffset(viewBounds, bounds, zoom); + + // If offset is less than a pixel, ignore. + // This prevents unstable projections from getting into + // an infinite loop of tiny offsets. + if (Math.abs(offset.x) <= 1 && Math.abs(offset.y) <= 1) { + return center; + } + + return this.unproject(centerPoint.add(offset), zoom); + }, + + // adjust offset for view to get inside bounds + _limitOffset: function (offset, bounds) { + if (!bounds) { return offset; } + + var viewBounds = this.getPixelBounds(), + newBounds = new Bounds(viewBounds.min.add(offset), viewBounds.max.add(offset)); + + return offset.add(this._getBoundsOffset(newBounds, bounds)); + }, + + // returns offset needed for pxBounds to get inside maxBounds at a specified zoom + _getBoundsOffset: function (pxBounds, maxBounds, zoom) { + var projectedMaxBounds = toBounds( + this.project(maxBounds.getNorthEast(), zoom), + this.project(maxBounds.getSouthWest(), zoom) + ), + minOffset = projectedMaxBounds.min.subtract(pxBounds.min), + maxOffset = projectedMaxBounds.max.subtract(pxBounds.max), + + dx = this._rebound(minOffset.x, -maxOffset.x), + dy = this._rebound(minOffset.y, -maxOffset.y); + + return new Point(dx, dy); + }, + + _rebound: function (left, right) { + return left + right > 0 ? + Math.round(left - right) / 2 : + Math.max(0, Math.ceil(left)) - Math.max(0, Math.floor(right)); + }, + + _limitZoom: function (zoom) { + var min = this.getMinZoom(), + max = this.getMaxZoom(), + snap = Browser.any3d ? this.options.zoomSnap : 1; + if (snap) { + zoom = Math.round(zoom / snap) * snap; + } + return Math.max(min, Math.min(max, zoom)); + }, + + _onPanTransitionStep: function () { + this.fire('move'); + }, + + _onPanTransitionEnd: function () { + removeClass(this._mapPane, 'leaflet-pan-anim'); + this.fire('moveend'); + }, + + _tryAnimatedPan: function (center, options) { + // difference between the new and current centers in pixels + var offset = this._getCenterOffset(center)._trunc(); + + // don't animate too far unless animate: true specified in options + if ((options && options.animate) !== true && !this.getSize().contains(offset)) { return false; } + + this.panBy(offset, options); + + return true; + }, + + _createAnimProxy: function () { + + var proxy = this._proxy = create$1('div', 'leaflet-proxy leaflet-zoom-animated'); + this._panes.mapPane.appendChild(proxy); + + this.on('zoomanim', function (e) { + var prop = TRANSFORM, + transform = this._proxy.style[prop]; + + setTransform(this._proxy, this.project(e.center, e.zoom), this.getZoomScale(e.zoom, 1)); + + // workaround for case when transform is the same and so transitionend event is not fired + if (transform === this._proxy.style[prop] && this._animatingZoom) { + this._onZoomTransitionEnd(); + } + }, this); + + this.on('load moveend', this._animMoveEnd, this); + + this._on('unload', this._destroyAnimProxy, this); + }, + + _destroyAnimProxy: function () { + remove(this._proxy); + this.off('load moveend', this._animMoveEnd, this); + delete this._proxy; + }, + + _animMoveEnd: function () { + var c = this.getCenter(), + z = this.getZoom(); + setTransform(this._proxy, this.project(c, z), this.getZoomScale(z, 1)); + }, + + _catchTransitionEnd: function (e) { + if (this._animatingZoom && e.propertyName.indexOf('transform') >= 0) { + this._onZoomTransitionEnd(); + } + }, + + _nothingToAnimate: function () { + return !this._container.getElementsByClassName('leaflet-zoom-animated').length; + }, + + _tryAnimatedZoom: function (center, zoom, options) { + + if (this._animatingZoom) { return true; } + + options = options || {}; + + // don't animate if disabled, not supported or zoom difference is too large + if (!this._zoomAnimated || options.animate === false || this._nothingToAnimate() || + Math.abs(zoom - this._zoom) > this.options.zoomAnimationThreshold) { return false; } + + // offset is the pixel coords of the zoom origin relative to the current center + var scale = this.getZoomScale(zoom), + offset = this._getCenterOffset(center)._divideBy(1 - 1 / scale); + + // don't animate if the zoom origin isn't within one screen from the current center, unless forced + if (options.animate !== true && !this.getSize().contains(offset)) { return false; } + + requestAnimFrame(function () { + this + ._moveStart(true, options.noMoveStart || false) + ._animateZoom(center, zoom, true); + }, this); + + return true; + }, + + _animateZoom: function (center, zoom, startAnim, noUpdate) { + if (!this._mapPane) { return; } + + if (startAnim) { + this._animatingZoom = true; + + // remember what center/zoom to set after animation + this._animateToCenter = center; + this._animateToZoom = zoom; + + addClass(this._mapPane, 'leaflet-zoom-anim'); + } + + // @section Other Events + // @event zoomanim: ZoomAnimEvent + // Fired at least once per zoom animation. For continuous zoom, like pinch zooming, fired once per frame during zoom. + this.fire('zoomanim', { + center: center, + zoom: zoom, + noUpdate: noUpdate + }); + + if (!this._tempFireZoomEvent) { + this._tempFireZoomEvent = this._zoom !== this._animateToZoom; + } + + this._move(this._animateToCenter, this._animateToZoom, undefined, true); + + // Work around webkit not firing 'transitionend', see https://github.com/Leaflet/Leaflet/issues/3689, 2693 + setTimeout(bind(this._onZoomTransitionEnd, this), 250); + }, + + _onZoomTransitionEnd: function () { + if (!this._animatingZoom) { return; } + + if (this._mapPane) { + removeClass(this._mapPane, 'leaflet-zoom-anim'); + } + + this._animatingZoom = false; + + this._move(this._animateToCenter, this._animateToZoom, undefined, true); + + if (this._tempFireZoomEvent) { + this.fire('zoom'); + } + delete this._tempFireZoomEvent; + + this.fire('move'); + + this._moveEnd(true); + } +}); + +// @section + +// @factory L.map(id: String, options?: Map options) +// Instantiates a map object given the DOM ID of a `
` element +// and optionally an object literal with `Map options`. +// +// @alternative +// @factory L.map(el: HTMLElement, options?: Map options) +// Instantiates a map object given an instance of a `
` HTML element +// and optionally an object literal with `Map options`. +function createMap(id, options) { + return new Map(id, options); +} + +/* + * @class Control + * @aka L.Control + * @inherits Class + * + * L.Control is a base class for implementing map controls. Handles positioning. + * All other controls extend from this class. + */ + +var Control = Class.extend({ + // @section + // @aka Control Options + options: { + // @option position: String = 'topright' + // The position of the control (one of the map corners). Possible values are `'topleft'`, + // `'topright'`, `'bottomleft'` or `'bottomright'` + position: 'topright' + }, + + initialize: function (options) { + setOptions(this, options); + }, + + /* @section + * Classes extending L.Control will inherit the following methods: + * + * @method getPosition: string + * Returns the position of the control. + */ + getPosition: function () { + return this.options.position; + }, + + // @method setPosition(position: string): this + // Sets the position of the control. + setPosition: function (position) { + var map = this._map; + + if (map) { + map.removeControl(this); + } + + this.options.position = position; + + if (map) { + map.addControl(this); + } + + return this; + }, + + // @method getContainer: HTMLElement + // Returns the HTMLElement that contains the control. + getContainer: function () { + return this._container; + }, + + // @method addTo(map: Map): this + // Adds the control to the given map. + addTo: function (map) { + this.remove(); + this._map = map; + + var container = this._container = this.onAdd(map), + pos = this.getPosition(), + corner = map._controlCorners[pos]; + + addClass(container, 'leaflet-control'); + + if (pos.indexOf('bottom') !== -1) { + corner.insertBefore(container, corner.firstChild); + } else { + corner.appendChild(container); + } + + this._map.on('unload', this.remove, this); + + return this; + }, + + // @method remove: this + // Removes the control from the map it is currently active on. + remove: function () { + if (!this._map) { + return this; + } + + remove(this._container); + + if (this.onRemove) { + this.onRemove(this._map); + } + + this._map.off('unload', this.remove, this); + this._map = null; + + return this; + }, + + _refocusOnMap: function (e) { + // if map exists and event is not a keyboard event + if (this._map && e && e.screenX > 0 && e.screenY > 0) { + this._map.getContainer().focus(); + } + } +}); + +var control = function (options) { + return new Control(options); +}; + +/* @section Extension methods + * @uninheritable + * + * Every control should extend from `L.Control` and (re-)implement the following methods. + * + * @method onAdd(map: Map): HTMLElement + * Should return the container DOM element for the control and add listeners on relevant map events. Called on [`control.addTo(map)`](#control-addTo). + * + * @method onRemove(map: Map) + * Optional method. Should contain all clean up code that removes the listeners previously added in [`onAdd`](#control-onadd). Called on [`control.remove()`](#control-remove). + */ + +/* @namespace Map + * @section Methods for Layers and Controls + */ +Map.include({ + // @method addControl(control: Control): this + // Adds the given control to the map + addControl: function (control) { + control.addTo(this); + return this; + }, + + // @method removeControl(control: Control): this + // Removes the given control from the map + removeControl: function (control) { + control.remove(); + return this; + }, + + _initControlPos: function () { + var corners = this._controlCorners = {}, + l = 'leaflet-', + container = this._controlContainer = + create$1('div', l + 'control-container', this._container); + + function createCorner(vSide, hSide) { + var className = l + vSide + ' ' + l + hSide; + + corners[vSide + hSide] = create$1('div', className, container); + } + + createCorner('top', 'left'); + createCorner('top', 'right'); + createCorner('bottom', 'left'); + createCorner('bottom', 'right'); + }, + + _clearControlPos: function () { + for (var i in this._controlCorners) { + remove(this._controlCorners[i]); + } + remove(this._controlContainer); + delete this._controlCorners; + delete this._controlContainer; + } +}); + +/* + * @class Control.Layers + * @aka L.Control.Layers + * @inherits Control + * + * The layers control gives users the ability to switch between different base layers and switch overlays on/off (check out the [detailed example](https://leafletjs.com/examples/layers-control/)). Extends `Control`. + * + * @example + * + * ```js + * var baseLayers = { + * "Mapbox": mapbox, + * "OpenStreetMap": osm + * }; + * + * var overlays = { + * "Marker": marker, + * "Roads": roadsLayer + * }; + * + * L.control.layers(baseLayers, overlays).addTo(map); + * ``` + * + * The `baseLayers` and `overlays` parameters are object literals with layer names as keys and `Layer` objects as values: + * + * ```js + * { + * "": layer1, + * "": layer2 + * } + * ``` + * + * The layer names can contain HTML, which allows you to add additional styling to the items: + * + * ```js + * {" My Layer": myLayer} + * ``` + */ + +var Layers = Control.extend({ + // @section + // @aka Control.Layers options + options: { + // @option collapsed: Boolean = true + // If `true`, the control will be collapsed into an icon and expanded on mouse hover, touch, or keyboard activation. + collapsed: true, + position: 'topright', + + // @option autoZIndex: Boolean = true + // If `true`, the control will assign zIndexes in increasing order to all of its layers so that the order is preserved when switching them on/off. + autoZIndex: true, + + // @option hideSingleBase: Boolean = false + // If `true`, the base layers in the control will be hidden when there is only one. + hideSingleBase: false, + + // @option sortLayers: Boolean = false + // Whether to sort the layers. When `false`, layers will keep the order + // in which they were added to the control. + sortLayers: false, + + // @option sortFunction: Function = * + // A [compare function](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array/sort) + // that will be used for sorting the layers, when `sortLayers` is `true`. + // The function receives both the `L.Layer` instances and their names, as in + // `sortFunction(layerA, layerB, nameA, nameB)`. + // By default, it sorts layers alphabetically by their name. + sortFunction: function (layerA, layerB, nameA, nameB) { + return nameA < nameB ? -1 : (nameB < nameA ? 1 : 0); + } + }, + + initialize: function (baseLayers, overlays, options) { + setOptions(this, options); + + this._layerControlInputs = []; + this._layers = []; + this._lastZIndex = 0; + this._handlingClick = false; + this._preventClick = false; + + for (var i in baseLayers) { + this._addLayer(baseLayers[i], i); + } + + for (i in overlays) { + this._addLayer(overlays[i], i, true); + } + }, + + onAdd: function (map) { + this._initLayout(); + this._update(); + + this._map = map; + map.on('zoomend', this._checkDisabledLayers, this); + + for (var i = 0; i < this._layers.length; i++) { + this._layers[i].layer.on('add remove', this._onLayerChange, this); + } + + return this._container; + }, + + addTo: function (map) { + Control.prototype.addTo.call(this, map); + // Trigger expand after Layers Control has been inserted into DOM so that is now has an actual height. + return this._expandIfNotCollapsed(); + }, + + onRemove: function () { + this._map.off('zoomend', this._checkDisabledLayers, this); + + for (var i = 0; i < this._layers.length; i++) { + this._layers[i].layer.off('add remove', this._onLayerChange, this); + } + }, + + // @method addBaseLayer(layer: Layer, name: String): this + // Adds a base layer (radio button entry) with the given name to the control. + addBaseLayer: function (layer, name) { + this._addLayer(layer, name); + return (this._map) ? this._update() : this; + }, + + // @method addOverlay(layer: Layer, name: String): this + // Adds an overlay (checkbox entry) with the given name to the control. + addOverlay: function (layer, name) { + this._addLayer(layer, name, true); + return (this._map) ? this._update() : this; + }, + + // @method removeLayer(layer: Layer): this + // Remove the given layer from the control. + removeLayer: function (layer) { + layer.off('add remove', this._onLayerChange, this); + + var obj = this._getLayer(stamp(layer)); + if (obj) { + this._layers.splice(this._layers.indexOf(obj), 1); + } + return (this._map) ? this._update() : this; + }, + + // @method expand(): this + // Expand the control container if collapsed. + expand: function () { + addClass(this._container, 'leaflet-control-layers-expanded'); + this._section.style.height = null; + var acceptableHeight = this._map.getSize().y - (this._container.offsetTop + 50); + if (acceptableHeight < this._section.clientHeight) { + addClass(this._section, 'leaflet-control-layers-scrollbar'); + this._section.style.height = acceptableHeight + 'px'; + } else { + removeClass(this._section, 'leaflet-control-layers-scrollbar'); + } + this._checkDisabledLayers(); + return this; + }, + + // @method collapse(): this + // Collapse the control container if expanded. + collapse: function () { + removeClass(this._container, 'leaflet-control-layers-expanded'); + return this; + }, + + _initLayout: function () { + var className = 'leaflet-control-layers', + container = this._container = create$1('div', className), + collapsed = this.options.collapsed; + + // makes this work on IE touch devices by stopping it from firing a mouseout event when the touch is released + container.setAttribute('aria-haspopup', true); + + disableClickPropagation(container); + disableScrollPropagation(container); + + var section = this._section = create$1('section', className + '-list'); + + if (collapsed) { + this._map.on('click', this.collapse, this); + + on(container, { + mouseenter: this._expandSafely, + mouseleave: this.collapse + }, this); + } + + var link = this._layersLink = create$1('a', className + '-toggle', container); + link.href = '#'; + link.title = 'Layers'; + link.setAttribute('role', 'button'); + + on(link, { + keydown: function (e) { + if (e.keyCode === 13) { + this._expandSafely(); + } + }, + // Certain screen readers intercept the key event and instead send a click event + click: function (e) { + preventDefault(e); + this._expandSafely(); + } + }, this); + + if (!collapsed) { + this.expand(); + } + + this._baseLayersList = create$1('div', className + '-base', section); + this._separator = create$1('div', className + '-separator', section); + this._overlaysList = create$1('div', className + '-overlays', section); + + container.appendChild(section); + }, + + _getLayer: function (id) { + for (var i = 0; i < this._layers.length; i++) { + + if (this._layers[i] && stamp(this._layers[i].layer) === id) { + return this._layers[i]; + } + } + }, + + _addLayer: function (layer, name, overlay) { + if (this._map) { + layer.on('add remove', this._onLayerChange, this); + } + + this._layers.push({ + layer: layer, + name: name, + overlay: overlay + }); + + if (this.options.sortLayers) { + this._layers.sort(bind(function (a, b) { + return this.options.sortFunction(a.layer, b.layer, a.name, b.name); + }, this)); + } + + if (this.options.autoZIndex && layer.setZIndex) { + this._lastZIndex++; + layer.setZIndex(this._lastZIndex); + } + + this._expandIfNotCollapsed(); + }, + + _update: function () { + if (!this._container) { return this; } + + empty(this._baseLayersList); + empty(this._overlaysList); + + this._layerControlInputs = []; + var baseLayersPresent, overlaysPresent, i, obj, baseLayersCount = 0; + + for (i = 0; i < this._layers.length; i++) { + obj = this._layers[i]; + this._addItem(obj); + overlaysPresent = overlaysPresent || obj.overlay; + baseLayersPresent = baseLayersPresent || !obj.overlay; + baseLayersCount += !obj.overlay ? 1 : 0; + } + + // Hide base layers section if there's only one layer. + if (this.options.hideSingleBase) { + baseLayersPresent = baseLayersPresent && baseLayersCount > 1; + this._baseLayersList.style.display = baseLayersPresent ? '' : 'none'; + } + + this._separator.style.display = overlaysPresent && baseLayersPresent ? '' : 'none'; + + return this; + }, + + _onLayerChange: function (e) { + if (!this._handlingClick) { + this._update(); + } + + var obj = this._getLayer(stamp(e.target)); + + // @namespace Map + // @section Layer events + // @event baselayerchange: LayersControlEvent + // Fired when the base layer is changed through the [layers control](#control-layers). + // @event overlayadd: LayersControlEvent + // Fired when an overlay is selected through the [layers control](#control-layers). + // @event overlayremove: LayersControlEvent + // Fired when an overlay is deselected through the [layers control](#control-layers). + // @namespace Control.Layers + var type = obj.overlay ? + (e.type === 'add' ? 'overlayadd' : 'overlayremove') : + (e.type === 'add' ? 'baselayerchange' : null); + + if (type) { + this._map.fire(type, obj); + } + }, + + // IE7 bugs out if you create a radio dynamically, so you have to do it this hacky way (see https://stackoverflow.com/a/119079) + _createRadioElement: function (name, checked) { + + var radioHtml = ''; + + var radioFragment = document.createElement('div'); + radioFragment.innerHTML = radioHtml; + + return radioFragment.firstChild; + }, + + _addItem: function (obj) { + var label = document.createElement('label'), + checked = this._map.hasLayer(obj.layer), + input; + + if (obj.overlay) { + input = document.createElement('input'); + input.type = 'checkbox'; + input.className = 'leaflet-control-layers-selector'; + input.defaultChecked = checked; + } else { + input = this._createRadioElement('leaflet-base-layers_' + stamp(this), checked); + } + + this._layerControlInputs.push(input); + input.layerId = stamp(obj.layer); + + on(input, 'click', this._onInputClick, this); + + var name = document.createElement('span'); + name.innerHTML = ' ' + obj.name; + + // Helps from preventing layer control flicker when checkboxes are disabled + // https://github.com/Leaflet/Leaflet/issues/2771 + var holder = document.createElement('span'); + + label.appendChild(holder); + holder.appendChild(input); + holder.appendChild(name); + + var container = obj.overlay ? this._overlaysList : this._baseLayersList; + container.appendChild(label); + + this._checkDisabledLayers(); + return label; + }, + + _onInputClick: function () { + // expanding the control on mobile with a click can cause adding a layer - we don't want this + if (this._preventClick) { + return; + } + + var inputs = this._layerControlInputs, + input, layer; + var addedLayers = [], + removedLayers = []; + + this._handlingClick = true; + + for (var i = inputs.length - 1; i >= 0; i--) { + input = inputs[i]; + layer = this._getLayer(input.layerId).layer; + + if (input.checked) { + addedLayers.push(layer); + } else if (!input.checked) { + removedLayers.push(layer); + } + } + + // Bugfix issue 2318: Should remove all old layers before readding new ones + for (i = 0; i < removedLayers.length; i++) { + if (this._map.hasLayer(removedLayers[i])) { + this._map.removeLayer(removedLayers[i]); + } + } + for (i = 0; i < addedLayers.length; i++) { + if (!this._map.hasLayer(addedLayers[i])) { + this._map.addLayer(addedLayers[i]); + } + } + + this._handlingClick = false; + + this._refocusOnMap(); + }, + + _checkDisabledLayers: function () { + var inputs = this._layerControlInputs, + input, + layer, + zoom = this._map.getZoom(); + + for (var i = inputs.length - 1; i >= 0; i--) { + input = inputs[i]; + layer = this._getLayer(input.layerId).layer; + input.disabled = (layer.options.minZoom !== undefined && zoom < layer.options.minZoom) || + (layer.options.maxZoom !== undefined && zoom > layer.options.maxZoom); + + } + }, + + _expandIfNotCollapsed: function () { + if (this._map && !this.options.collapsed) { + this.expand(); + } + return this; + }, + + _expandSafely: function () { + var section = this._section; + this._preventClick = true; + on(section, 'click', preventDefault); + this.expand(); + var that = this; + setTimeout(function () { + off(section, 'click', preventDefault); + that._preventClick = false; + }); + } + +}); + + +// @factory L.control.layers(baselayers?: Object, overlays?: Object, options?: Control.Layers options) +// Creates a layers control with the given layers. Base layers will be switched with radio buttons, while overlays will be switched with checkboxes. Note that all base layers should be passed in the base layers object, but only one should be added to the map during map instantiation. +var layers = function (baseLayers, overlays, options) { + return new Layers(baseLayers, overlays, options); +}; + +/* + * @class Control.Zoom + * @aka L.Control.Zoom + * @inherits Control + * + * A basic zoom control with two buttons (zoom in and zoom out). It is put on the map by default unless you set its [`zoomControl` option](#map-zoomcontrol) to `false`. Extends `Control`. + */ + +var Zoom = Control.extend({ + // @section + // @aka Control.Zoom options + options: { + position: 'topleft', + + // @option zoomInText: String = '' + // The text set on the 'zoom in' button. + zoomInText: '', + + // @option zoomInTitle: String = 'Zoom in' + // The title set on the 'zoom in' button. + zoomInTitle: 'Zoom in', + + // @option zoomOutText: String = '' + // The text set on the 'zoom out' button. + zoomOutText: '', + + // @option zoomOutTitle: String = 'Zoom out' + // The title set on the 'zoom out' button. + zoomOutTitle: 'Zoom out' + }, + + onAdd: function (map) { + var zoomName = 'leaflet-control-zoom', + container = create$1('div', zoomName + ' leaflet-bar'), + options = this.options; + + this._zoomInButton = this._createButton(options.zoomInText, options.zoomInTitle, + zoomName + '-in', container, this._zoomIn); + this._zoomOutButton = this._createButton(options.zoomOutText, options.zoomOutTitle, + zoomName + '-out', container, this._zoomOut); + + this._updateDisabled(); + map.on('zoomend zoomlevelschange', this._updateDisabled, this); + + return container; + }, + + onRemove: function (map) { + map.off('zoomend zoomlevelschange', this._updateDisabled, this); + }, + + disable: function () { + this._disabled = true; + this._updateDisabled(); + return this; + }, + + enable: function () { + this._disabled = false; + this._updateDisabled(); + return this; + }, + + _zoomIn: function (e) { + if (!this._disabled && this._map._zoom < this._map.getMaxZoom()) { + this._map.zoomIn(this._map.options.zoomDelta * (e.shiftKey ? 3 : 1)); + } + }, + + _zoomOut: function (e) { + if (!this._disabled && this._map._zoom > this._map.getMinZoom()) { + this._map.zoomOut(this._map.options.zoomDelta * (e.shiftKey ? 3 : 1)); + } + }, + + _createButton: function (html, title, className, container, fn) { + var link = create$1('a', className, container); + link.innerHTML = html; + link.href = '#'; + link.title = title; + + /* + * Will force screen readers like VoiceOver to read this as "Zoom in - button" + */ + link.setAttribute('role', 'button'); + link.setAttribute('aria-label', title); + + disableClickPropagation(link); + on(link, 'click', stop); + on(link, 'click', fn, this); + on(link, 'click', this._refocusOnMap, this); + + return link; + }, + + _updateDisabled: function () { + var map = this._map, + className = 'leaflet-disabled'; + + removeClass(this._zoomInButton, className); + removeClass(this._zoomOutButton, className); + this._zoomInButton.setAttribute('aria-disabled', 'false'); + this._zoomOutButton.setAttribute('aria-disabled', 'false'); + + if (this._disabled || map._zoom === map.getMinZoom()) { + addClass(this._zoomOutButton, className); + this._zoomOutButton.setAttribute('aria-disabled', 'true'); + } + if (this._disabled || map._zoom === map.getMaxZoom()) { + addClass(this._zoomInButton, className); + this._zoomInButton.setAttribute('aria-disabled', 'true'); + } + } +}); + +// @namespace Map +// @section Control options +// @option zoomControl: Boolean = true +// Whether a [zoom control](#control-zoom) is added to the map by default. +Map.mergeOptions({ + zoomControl: true +}); + +Map.addInitHook(function () { + if (this.options.zoomControl) { + // @section Controls + // @property zoomControl: Control.Zoom + // The default zoom control (only available if the + // [`zoomControl` option](#map-zoomcontrol) was `true` when creating the map). + this.zoomControl = new Zoom(); + this.addControl(this.zoomControl); + } +}); + +// @namespace Control.Zoom +// @factory L.control.zoom(options: Control.Zoom options) +// Creates a zoom control +var zoom = function (options) { + return new Zoom(options); +}; + +/* + * @class Control.Scale + * @aka L.Control.Scale + * @inherits Control + * + * A simple scale control that shows the scale of the current center of screen in metric (m/km) and imperial (mi/ft) systems. Extends `Control`. + * + * @example + * + * ```js + * L.control.scale().addTo(map); + * ``` + */ + +var Scale = Control.extend({ + // @section + // @aka Control.Scale options + options: { + position: 'bottomleft', + + // @option maxWidth: Number = 100 + // Maximum width of the control in pixels. The width is set dynamically to show round values (e.g. 100, 200, 500). + maxWidth: 100, + + // @option metric: Boolean = True + // Whether to show the metric scale line (m/km). + metric: true, + + // @option imperial: Boolean = True + // Whether to show the imperial scale line (mi/ft). + imperial: true + + // @option updateWhenIdle: Boolean = false + // If `true`, the control is updated on [`moveend`](#map-moveend), otherwise it's always up-to-date (updated on [`move`](#map-move)). + }, + + onAdd: function (map) { + var className = 'leaflet-control-scale', + container = create$1('div', className), + options = this.options; + + this._addScales(options, className + '-line', container); + + map.on(options.updateWhenIdle ? 'moveend' : 'move', this._update, this); + map.whenReady(this._update, this); + + return container; + }, + + onRemove: function (map) { + map.off(this.options.updateWhenIdle ? 'moveend' : 'move', this._update, this); + }, + + _addScales: function (options, className, container) { + if (options.metric) { + this._mScale = create$1('div', className, container); + } + if (options.imperial) { + this._iScale = create$1('div', className, container); + } + }, + + _update: function () { + var map = this._map, + y = map.getSize().y / 2; + + var maxMeters = map.distance( + map.containerPointToLatLng([0, y]), + map.containerPointToLatLng([this.options.maxWidth, y])); + + this._updateScales(maxMeters); + }, + + _updateScales: function (maxMeters) { + if (this.options.metric && maxMeters) { + this._updateMetric(maxMeters); + } + if (this.options.imperial && maxMeters) { + this._updateImperial(maxMeters); + } + }, + + _updateMetric: function (maxMeters) { + var meters = this._getRoundNum(maxMeters), + label = meters < 1000 ? meters + ' m' : (meters / 1000) + ' km'; + + this._updateScale(this._mScale, label, meters / maxMeters); + }, + + _updateImperial: function (maxMeters) { + var maxFeet = maxMeters * 3.2808399, + maxMiles, miles, feet; + + if (maxFeet > 5280) { + maxMiles = maxFeet / 5280; + miles = this._getRoundNum(maxMiles); + this._updateScale(this._iScale, miles + ' mi', miles / maxMiles); + + } else { + feet = this._getRoundNum(maxFeet); + this._updateScale(this._iScale, feet + ' ft', feet / maxFeet); + } + }, + + _updateScale: function (scale, text, ratio) { + scale.style.width = Math.round(this.options.maxWidth * ratio) + 'px'; + scale.innerHTML = text; + }, + + _getRoundNum: function (num) { + var pow10 = Math.pow(10, (Math.floor(num) + '').length - 1), + d = num / pow10; + + d = d >= 10 ? 10 : + d >= 5 ? 5 : + d >= 3 ? 3 : + d >= 2 ? 2 : 1; + + return pow10 * d; + } +}); + + +// @factory L.control.scale(options?: Control.Scale options) +// Creates an scale control with the given options. +var scale = function (options) { + return new Scale(options); +}; + +var ukrainianFlag = ''; + + +/* + * @class Control.Attribution + * @aka L.Control.Attribution + * @inherits Control + * + * The attribution control allows you to display attribution data in a small text box on a map. It is put on the map by default unless you set its [`attributionControl` option](#map-attributioncontrol) to `false`, and it fetches attribution texts from layers with the [`getAttribution` method](#layer-getattribution) automatically. Extends Control. + */ + +var Attribution = Control.extend({ + // @section + // @aka Control.Attribution options + options: { + position: 'bottomright', + + // @option prefix: String|false = 'Leaflet' + // The HTML text shown before the attributions. Pass `false` to disable. + prefix: '' + (Browser.inlineSvg ? ukrainianFlag + ' ' : '') + 'Leaflet' + }, + + initialize: function (options) { + setOptions(this, options); + + this._attributions = {}; + }, + + onAdd: function (map) { + map.attributionControl = this; + this._container = create$1('div', 'leaflet-control-attribution'); + disableClickPropagation(this._container); + + // TODO ugly, refactor + for (var i in map._layers) { + if (map._layers[i].getAttribution) { + this.addAttribution(map._layers[i].getAttribution()); + } + } + + this._update(); + + map.on('layeradd', this._addAttribution, this); + + return this._container; + }, + + onRemove: function (map) { + map.off('layeradd', this._addAttribution, this); + }, + + _addAttribution: function (ev) { + if (ev.layer.getAttribution) { + this.addAttribution(ev.layer.getAttribution()); + ev.layer.once('remove', function () { + this.removeAttribution(ev.layer.getAttribution()); + }, this); + } + }, + + // @method setPrefix(prefix: String|false): this + // The HTML text shown before the attributions. Pass `false` to disable. + setPrefix: function (prefix) { + this.options.prefix = prefix; + this._update(); + return this; + }, + + // @method addAttribution(text: String): this + // Adds an attribution text (e.g. `'© OpenStreetMap contributors'`). + addAttribution: function (text) { + if (!text) { return this; } + + if (!this._attributions[text]) { + this._attributions[text] = 0; + } + this._attributions[text]++; + + this._update(); + + return this; + }, + + // @method removeAttribution(text: String): this + // Removes an attribution text. + removeAttribution: function (text) { + if (!text) { return this; } + + if (this._attributions[text]) { + this._attributions[text]--; + this._update(); + } + + return this; + }, + + _update: function () { + if (!this._map) { return; } + + var attribs = []; + + for (var i in this._attributions) { + if (this._attributions[i]) { + attribs.push(i); + } + } + + var prefixAndAttribs = []; + + if (this.options.prefix) { + prefixAndAttribs.push(this.options.prefix); + } + if (attribs.length) { + prefixAndAttribs.push(attribs.join(', ')); + } + + this._container.innerHTML = prefixAndAttribs.join(' '); + } +}); + +// @namespace Map +// @section Control options +// @option attributionControl: Boolean = true +// Whether a [attribution control](#control-attribution) is added to the map by default. +Map.mergeOptions({ + attributionControl: true +}); + +Map.addInitHook(function () { + if (this.options.attributionControl) { + new Attribution().addTo(this); + } +}); + +// @namespace Control.Attribution +// @factory L.control.attribution(options: Control.Attribution options) +// Creates an attribution control. +var attribution = function (options) { + return new Attribution(options); +}; + +Control.Layers = Layers; +Control.Zoom = Zoom; +Control.Scale = Scale; +Control.Attribution = Attribution; + +control.layers = layers; +control.zoom = zoom; +control.scale = scale; +control.attribution = attribution; + +/* + L.Handler is a base class for handler classes that are used internally to inject + interaction features like dragging to classes like Map and Marker. +*/ + +// @class Handler +// @aka L.Handler +// Abstract class for map interaction handlers + +var Handler = Class.extend({ + initialize: function (map) { + this._map = map; + }, + + // @method enable(): this + // Enables the handler + enable: function () { + if (this._enabled) { return this; } + + this._enabled = true; + this.addHooks(); + return this; + }, + + // @method disable(): this + // Disables the handler + disable: function () { + if (!this._enabled) { return this; } + + this._enabled = false; + this.removeHooks(); + return this; + }, + + // @method enabled(): Boolean + // Returns `true` if the handler is enabled + enabled: function () { + return !!this._enabled; + } + + // @section Extension methods + // Classes inheriting from `Handler` must implement the two following methods: + // @method addHooks() + // Called when the handler is enabled, should add event hooks. + // @method removeHooks() + // Called when the handler is disabled, should remove the event hooks added previously. +}); + +// @section There is static function which can be called without instantiating L.Handler: +// @function addTo(map: Map, name: String): this +// Adds a new Handler to the given map with the given name. +Handler.addTo = function (map, name) { + map.addHandler(name, this); + return this; +}; + +var Mixin = {Events: Events}; + +/* + * @class Draggable + * @aka L.Draggable + * @inherits Evented + * + * A class for making DOM elements draggable (including touch support). + * Used internally for map and marker dragging. Only works for elements + * that were positioned with [`L.DomUtil.setPosition`](#domutil-setposition). + * + * @example + * ```js + * var draggable = new L.Draggable(elementToDrag); + * draggable.enable(); + * ``` + */ + +var START = Browser.touch ? 'touchstart mousedown' : 'mousedown'; + +var Draggable = Evented.extend({ + + options: { + // @section + // @aka Draggable options + // @option clickTolerance: Number = 3 + // The max number of pixels a user can shift the mouse pointer during a click + // for it to be considered a valid click (as opposed to a mouse drag). + clickTolerance: 3 + }, + + // @constructor L.Draggable(el: HTMLElement, dragHandle?: HTMLElement, preventOutline?: Boolean, options?: Draggable options) + // Creates a `Draggable` object for moving `el` when you start dragging the `dragHandle` element (equals `el` itself by default). + initialize: function (element, dragStartTarget, preventOutline, options) { + setOptions(this, options); + + this._element = element; + this._dragStartTarget = dragStartTarget || element; + this._preventOutline = preventOutline; + }, + + // @method enable() + // Enables the dragging ability + enable: function () { + if (this._enabled) { return; } + + on(this._dragStartTarget, START, this._onDown, this); + + this._enabled = true; + }, + + // @method disable() + // Disables the dragging ability + disable: function () { + if (!this._enabled) { return; } + + // If we're currently dragging this draggable, + // disabling it counts as first ending the drag. + if (Draggable._dragging === this) { + this.finishDrag(true); + } + + off(this._dragStartTarget, START, this._onDown, this); + + this._enabled = false; + this._moved = false; + }, + + _onDown: function (e) { + // Ignore the event if disabled; this happens in IE11 + // under some circumstances, see #3666. + if (!this._enabled) { return; } + + this._moved = false; + + if (hasClass(this._element, 'leaflet-zoom-anim')) { return; } + + if (e.touches && e.touches.length !== 1) { + // Finish dragging to avoid conflict with touchZoom + if (Draggable._dragging === this) { + this.finishDrag(); + } + return; + } + + if (Draggable._dragging || e.shiftKey || ((e.which !== 1) && (e.button !== 1) && !e.touches)) { return; } + Draggable._dragging = this; // Prevent dragging multiple objects at once. + + if (this._preventOutline) { + preventOutline(this._element); + } + + disableImageDrag(); + disableTextSelection(); + + if (this._moving) { return; } + + // @event down: Event + // Fired when a drag is about to start. + this.fire('down'); + + var first = e.touches ? e.touches[0] : e, + sizedParent = getSizedParentNode(this._element); + + this._startPoint = new Point(first.clientX, first.clientY); + this._startPos = getPosition(this._element); + + // Cache the scale, so that we can continuously compensate for it during drag (_onMove). + this._parentScale = getScale(sizedParent); + + var mouseevent = e.type === 'mousedown'; + on(document, mouseevent ? 'mousemove' : 'touchmove', this._onMove, this); + on(document, mouseevent ? 'mouseup' : 'touchend touchcancel', this._onUp, this); + }, + + _onMove: function (e) { + // Ignore the event if disabled; this happens in IE11 + // under some circumstances, see #3666. + if (!this._enabled) { return; } + + if (e.touches && e.touches.length > 1) { + this._moved = true; + return; + } + + var first = (e.touches && e.touches.length === 1 ? e.touches[0] : e), + offset = new Point(first.clientX, first.clientY)._subtract(this._startPoint); + + if (!offset.x && !offset.y) { return; } + if (Math.abs(offset.x) + Math.abs(offset.y) < this.options.clickTolerance) { return; } + + // We assume that the parent container's position, border and scale do not change for the duration of the drag. + // Therefore there is no need to account for the position and border (they are eliminated by the subtraction) + // and we can use the cached value for the scale. + offset.x /= this._parentScale.x; + offset.y /= this._parentScale.y; + + preventDefault(e); + + if (!this._moved) { + // @event dragstart: Event + // Fired when a drag starts + this.fire('dragstart'); + + this._moved = true; + + addClass(document.body, 'leaflet-dragging'); + + this._lastTarget = e.target || e.srcElement; + // IE and Edge do not give the element, so fetch it + // if necessary + if (window.SVGElementInstance && this._lastTarget instanceof window.SVGElementInstance) { + this._lastTarget = this._lastTarget.correspondingUseElement; + } + addClass(this._lastTarget, 'leaflet-drag-target'); + } + + this._newPos = this._startPos.add(offset); + this._moving = true; + + this._lastEvent = e; + this._updatePosition(); + }, + + _updatePosition: function () { + var e = {originalEvent: this._lastEvent}; + + // @event predrag: Event + // Fired continuously during dragging *before* each corresponding + // update of the element's position. + this.fire('predrag', e); + setPosition(this._element, this._newPos); + + // @event drag: Event + // Fired continuously during dragging. + this.fire('drag', e); + }, + + _onUp: function () { + // Ignore the event if disabled; this happens in IE11 + // under some circumstances, see #3666. + if (!this._enabled) { return; } + this.finishDrag(); + }, + + finishDrag: function (noInertia) { + removeClass(document.body, 'leaflet-dragging'); + + if (this._lastTarget) { + removeClass(this._lastTarget, 'leaflet-drag-target'); + this._lastTarget = null; + } + + off(document, 'mousemove touchmove', this._onMove, this); + off(document, 'mouseup touchend touchcancel', this._onUp, this); + + enableImageDrag(); + enableTextSelection(); + + var fireDragend = this._moved && this._moving; + + this._moving = false; + Draggable._dragging = false; + + if (fireDragend) { + // @event dragend: DragEndEvent + // Fired when the drag ends. + this.fire('dragend', { + noInertia: noInertia, + distance: this._newPos.distanceTo(this._startPos) + }); + } + } + +}); + +/* + * @namespace PolyUtil + * Various utility functions for polygon geometries. + */ + +/* @function clipPolygon(points: Point[], bounds: Bounds, round?: Boolean): Point[] + * Clips the polygon geometry defined by the given `points` by the given bounds (using the [Sutherland-Hodgman algorithm](https://en.wikipedia.org/wiki/Sutherland%E2%80%93Hodgman_algorithm)). + * Used by Leaflet to only show polygon points that are on the screen or near, increasing + * performance. Note that polygon points needs different algorithm for clipping + * than polyline, so there's a separate method for it. + */ +function clipPolygon(points, bounds, round) { + var clippedPoints, + edges = [1, 4, 2, 8], + i, j, k, + a, b, + len, edge, p; + + for (i = 0, len = points.length; i < len; i++) { + points[i]._code = _getBitCode(points[i], bounds); + } + + // for each edge (left, bottom, right, top) + for (k = 0; k < 4; k++) { + edge = edges[k]; + clippedPoints = []; + + for (i = 0, len = points.length, j = len - 1; i < len; j = i++) { + a = points[i]; + b = points[j]; + + // if a is inside the clip window + if (!(a._code & edge)) { + // if b is outside the clip window (a->b goes out of screen) + if (b._code & edge) { + p = _getEdgeIntersection(b, a, edge, bounds, round); + p._code = _getBitCode(p, bounds); + clippedPoints.push(p); + } + clippedPoints.push(a); + + // else if b is inside the clip window (a->b enters the screen) + } else if (!(b._code & edge)) { + p = _getEdgeIntersection(b, a, edge, bounds, round); + p._code = _getBitCode(p, bounds); + clippedPoints.push(p); + } + } + points = clippedPoints; + } + + return points; +} + +/* @function polygonCenter(latlngs: LatLng[], crs: CRS): LatLng + * Returns the center ([centroid](http://en.wikipedia.org/wiki/Centroid)) of the passed LatLngs (first ring) from a polygon. + */ +function polygonCenter(latlngs, crs) { + var i, j, p1, p2, f, area, x, y, center; + + if (!latlngs || latlngs.length === 0) { + throw new Error('latlngs not passed'); + } + + if (!isFlat(latlngs)) { + console.warn('latlngs are not flat! Only the first ring will be used'); + latlngs = latlngs[0]; + } + + var centroidLatLng = toLatLng([0, 0]); + + var bounds = toLatLngBounds(latlngs); + var areaBounds = bounds.getNorthWest().distanceTo(bounds.getSouthWest()) * bounds.getNorthEast().distanceTo(bounds.getNorthWest()); + // tests showed that below 1700 rounding errors are happening + if (areaBounds < 1700) { + // getting a inexact center, to move the latlngs near to [0, 0] to prevent rounding errors + centroidLatLng = centroid(latlngs); + } + + var len = latlngs.length; + var points = []; + for (i = 0; i < len; i++) { + var latlng = toLatLng(latlngs[i]); + points.push(crs.project(toLatLng([latlng.lat - centroidLatLng.lat, latlng.lng - centroidLatLng.lng]))); + } + + area = x = y = 0; + + // polygon centroid algorithm; + for (i = 0, j = len - 1; i < len; j = i++) { + p1 = points[i]; + p2 = points[j]; + + f = p1.y * p2.x - p2.y * p1.x; + x += (p1.x + p2.x) * f; + y += (p1.y + p2.y) * f; + area += f * 3; + } + + if (area === 0) { + // Polygon is so small that all points are on same pixel. + center = points[0]; + } else { + center = [x / area, y / area]; + } + + var latlngCenter = crs.unproject(toPoint(center)); + return toLatLng([latlngCenter.lat + centroidLatLng.lat, latlngCenter.lng + centroidLatLng.lng]); +} + +/* @function centroid(latlngs: LatLng[]): LatLng + * Returns the 'center of mass' of the passed LatLngs. + */ +function centroid(coords) { + var latSum = 0; + var lngSum = 0; + var len = 0; + for (var i = 0; i < coords.length; i++) { + var latlng = toLatLng(coords[i]); + latSum += latlng.lat; + lngSum += latlng.lng; + len++; + } + return toLatLng([latSum / len, lngSum / len]); +} + +var PolyUtil = { + __proto__: null, + clipPolygon: clipPolygon, + polygonCenter: polygonCenter, + centroid: centroid +}; + +/* + * @namespace LineUtil + * + * Various utility functions for polyline points processing, used by Leaflet internally to make polylines lightning-fast. + */ + +// Simplify polyline with vertex reduction and Douglas-Peucker simplification. +// Improves rendering performance dramatically by lessening the number of points to draw. + +// @function simplify(points: Point[], tolerance: Number): Point[] +// Dramatically reduces the number of points in a polyline while retaining +// its shape and returns a new array of simplified points, using the +// [Ramer-Douglas-Peucker algorithm](https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm). +// Used for a huge performance boost when processing/displaying Leaflet polylines for +// each zoom level and also reducing visual noise. tolerance affects the amount of +// simplification (lesser value means higher quality but slower and with more points). +// Also released as a separated micro-library [Simplify.js](https://mourner.github.io/simplify-js/). +function simplify(points, tolerance) { + if (!tolerance || !points.length) { + return points.slice(); + } + + var sqTolerance = tolerance * tolerance; + + // stage 1: vertex reduction + points = _reducePoints(points, sqTolerance); + + // stage 2: Douglas-Peucker simplification + points = _simplifyDP(points, sqTolerance); + + return points; +} + +// @function pointToSegmentDistance(p: Point, p1: Point, p2: Point): Number +// Returns the distance between point `p` and segment `p1` to `p2`. +function pointToSegmentDistance(p, p1, p2) { + return Math.sqrt(_sqClosestPointOnSegment(p, p1, p2, true)); +} + +// @function closestPointOnSegment(p: Point, p1: Point, p2: Point): Number +// Returns the closest point from a point `p` on a segment `p1` to `p2`. +function closestPointOnSegment(p, p1, p2) { + return _sqClosestPointOnSegment(p, p1, p2); +} + +// Ramer-Douglas-Peucker simplification, see https://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm +function _simplifyDP(points, sqTolerance) { + + var len = points.length, + ArrayConstructor = typeof Uint8Array !== undefined + '' ? Uint8Array : Array, + markers = new ArrayConstructor(len); + + markers[0] = markers[len - 1] = 1; + + _simplifyDPStep(points, markers, sqTolerance, 0, len - 1); + + var i, + newPoints = []; + + for (i = 0; i < len; i++) { + if (markers[i]) { + newPoints.push(points[i]); + } + } + + return newPoints; +} + +function _simplifyDPStep(points, markers, sqTolerance, first, last) { + + var maxSqDist = 0, + index, i, sqDist; + + for (i = first + 1; i <= last - 1; i++) { + sqDist = _sqClosestPointOnSegment(points[i], points[first], points[last], true); + + if (sqDist > maxSqDist) { + index = i; + maxSqDist = sqDist; + } + } + + if (maxSqDist > sqTolerance) { + markers[index] = 1; + + _simplifyDPStep(points, markers, sqTolerance, first, index); + _simplifyDPStep(points, markers, sqTolerance, index, last); + } +} + +// reduce points that are too close to each other to a single point +function _reducePoints(points, sqTolerance) { + var reducedPoints = [points[0]]; + + for (var i = 1, prev = 0, len = points.length; i < len; i++) { + if (_sqDist(points[i], points[prev]) > sqTolerance) { + reducedPoints.push(points[i]); + prev = i; + } + } + if (prev < len - 1) { + reducedPoints.push(points[len - 1]); + } + return reducedPoints; +} + +var _lastCode; + +// @function clipSegment(a: Point, b: Point, bounds: Bounds, useLastCode?: Boolean, round?: Boolean): Point[]|Boolean +// Clips the segment a to b by rectangular bounds with the +// [Cohen-Sutherland algorithm](https://en.wikipedia.org/wiki/Cohen%E2%80%93Sutherland_algorithm) +// (modifying the segment points directly!). Used by Leaflet to only show polyline +// points that are on the screen or near, increasing performance. +function clipSegment(a, b, bounds, useLastCode, round) { + var codeA = useLastCode ? _lastCode : _getBitCode(a, bounds), + codeB = _getBitCode(b, bounds), + + codeOut, p, newCode; + + // save 2nd code to avoid calculating it on the next segment + _lastCode = codeB; + + while (true) { + // if a,b is inside the clip window (trivial accept) + if (!(codeA | codeB)) { + return [a, b]; + } + + // if a,b is outside the clip window (trivial reject) + if (codeA & codeB) { + return false; + } + + // other cases + codeOut = codeA || codeB; + p = _getEdgeIntersection(a, b, codeOut, bounds, round); + newCode = _getBitCode(p, bounds); + + if (codeOut === codeA) { + a = p; + codeA = newCode; + } else { + b = p; + codeB = newCode; + } + } +} + +function _getEdgeIntersection(a, b, code, bounds, round) { + var dx = b.x - a.x, + dy = b.y - a.y, + min = bounds.min, + max = bounds.max, + x, y; + + if (code & 8) { // top + x = a.x + dx * (max.y - a.y) / dy; + y = max.y; + + } else if (code & 4) { // bottom + x = a.x + dx * (min.y - a.y) / dy; + y = min.y; + + } else if (code & 2) { // right + x = max.x; + y = a.y + dy * (max.x - a.x) / dx; + + } else if (code & 1) { // left + x = min.x; + y = a.y + dy * (min.x - a.x) / dx; + } + + return new Point(x, y, round); +} + +function _getBitCode(p, bounds) { + var code = 0; + + if (p.x < bounds.min.x) { // left + code |= 1; + } else if (p.x > bounds.max.x) { // right + code |= 2; + } + + if (p.y < bounds.min.y) { // bottom + code |= 4; + } else if (p.y > bounds.max.y) { // top + code |= 8; + } + + return code; +} + +// square distance (to avoid unnecessary Math.sqrt calls) +function _sqDist(p1, p2) { + var dx = p2.x - p1.x, + dy = p2.y - p1.y; + return dx * dx + dy * dy; +} + +// return closest point on segment or distance to that point +function _sqClosestPointOnSegment(p, p1, p2, sqDist) { + var x = p1.x, + y = p1.y, + dx = p2.x - x, + dy = p2.y - y, + dot = dx * dx + dy * dy, + t; + + if (dot > 0) { + t = ((p.x - x) * dx + (p.y - y) * dy) / dot; + + if (t > 1) { + x = p2.x; + y = p2.y; + } else if (t > 0) { + x += dx * t; + y += dy * t; + } + } + + dx = p.x - x; + dy = p.y - y; + + return sqDist ? dx * dx + dy * dy : new Point(x, y); +} + + +// @function isFlat(latlngs: LatLng[]): Boolean +// Returns true if `latlngs` is a flat array, false is nested. +function isFlat(latlngs) { + return !isArray(latlngs[0]) || (typeof latlngs[0][0] !== 'object' && typeof latlngs[0][0] !== 'undefined'); +} + +function _flat(latlngs) { + console.warn('Deprecated use of _flat, please use L.LineUtil.isFlat instead.'); + return isFlat(latlngs); +} + +/* @function polylineCenter(latlngs: LatLng[], crs: CRS): LatLng + * Returns the center ([centroid](http://en.wikipedia.org/wiki/Centroid)) of the passed LatLngs (first ring) from a polyline. + */ +function polylineCenter(latlngs, crs) { + var i, halfDist, segDist, dist, p1, p2, ratio, center; + + if (!latlngs || latlngs.length === 0) { + throw new Error('latlngs not passed'); + } + + if (!isFlat(latlngs)) { + console.warn('latlngs are not flat! Only the first ring will be used'); + latlngs = latlngs[0]; + } + + var centroidLatLng = toLatLng([0, 0]); + + var bounds = toLatLngBounds(latlngs); + var areaBounds = bounds.getNorthWest().distanceTo(bounds.getSouthWest()) * bounds.getNorthEast().distanceTo(bounds.getNorthWest()); + // tests showed that below 1700 rounding errors are happening + if (areaBounds < 1700) { + // getting a inexact center, to move the latlngs near to [0, 0] to prevent rounding errors + centroidLatLng = centroid(latlngs); + } + + var len = latlngs.length; + var points = []; + for (i = 0; i < len; i++) { + var latlng = toLatLng(latlngs[i]); + points.push(crs.project(toLatLng([latlng.lat - centroidLatLng.lat, latlng.lng - centroidLatLng.lng]))); + } + + for (i = 0, halfDist = 0; i < len - 1; i++) { + halfDist += points[i].distanceTo(points[i + 1]) / 2; + } + + // The line is so small in the current view that all points are on the same pixel. + if (halfDist === 0) { + center = points[0]; + } else { + for (i = 0, dist = 0; i < len - 1; i++) { + p1 = points[i]; + p2 = points[i + 1]; + segDist = p1.distanceTo(p2); + dist += segDist; + + if (dist > halfDist) { + ratio = (dist - halfDist) / segDist; + center = [ + p2.x - ratio * (p2.x - p1.x), + p2.y - ratio * (p2.y - p1.y) + ]; + break; + } + } + } + + var latlngCenter = crs.unproject(toPoint(center)); + return toLatLng([latlngCenter.lat + centroidLatLng.lat, latlngCenter.lng + centroidLatLng.lng]); +} + +var LineUtil = { + __proto__: null, + simplify: simplify, + pointToSegmentDistance: pointToSegmentDistance, + closestPointOnSegment: closestPointOnSegment, + clipSegment: clipSegment, + _getEdgeIntersection: _getEdgeIntersection, + _getBitCode: _getBitCode, + _sqClosestPointOnSegment: _sqClosestPointOnSegment, + isFlat: isFlat, + _flat: _flat, + polylineCenter: polylineCenter +}; + +/* + * @namespace Projection + * @section + * Leaflet comes with a set of already defined Projections out of the box: + * + * @projection L.Projection.LonLat + * + * Equirectangular, or Plate Carree projection — the most simple projection, + * mostly used by GIS enthusiasts. Directly maps `x` as longitude, and `y` as + * latitude. Also suitable for flat worlds, e.g. game maps. Used by the + * `EPSG:4326` and `Simple` CRS. + */ + +var LonLat = { + project: function (latlng) { + return new Point(latlng.lng, latlng.lat); + }, + + unproject: function (point) { + return new LatLng(point.y, point.x); + }, + + bounds: new Bounds([-180, -90], [180, 90]) +}; + +/* + * @namespace Projection + * @projection L.Projection.Mercator + * + * Elliptical Mercator projection — more complex than Spherical Mercator. Assumes that Earth is an ellipsoid. Used by the EPSG:3395 CRS. + */ + +var Mercator = { + R: 6378137, + R_MINOR: 6356752.314245179, + + bounds: new Bounds([-20037508.34279, -15496570.73972], [20037508.34279, 18764656.23138]), + + project: function (latlng) { + var d = Math.PI / 180, + r = this.R, + y = latlng.lat * d, + tmp = this.R_MINOR / r, + e = Math.sqrt(1 - tmp * tmp), + con = e * Math.sin(y); + + var ts = Math.tan(Math.PI / 4 - y / 2) / Math.pow((1 - con) / (1 + con), e / 2); + y = -r * Math.log(Math.max(ts, 1E-10)); + + return new Point(latlng.lng * d * r, y); + }, + + unproject: function (point) { + var d = 180 / Math.PI, + r = this.R, + tmp = this.R_MINOR / r, + e = Math.sqrt(1 - tmp * tmp), + ts = Math.exp(-point.y / r), + phi = Math.PI / 2 - 2 * Math.atan(ts); + + for (var i = 0, dphi = 0.1, con; i < 15 && Math.abs(dphi) > 1e-7; i++) { + con = e * Math.sin(phi); + con = Math.pow((1 - con) / (1 + con), e / 2); + dphi = Math.PI / 2 - 2 * Math.atan(ts * con) - phi; + phi += dphi; + } + + return new LatLng(phi * d, point.x * d / r); + } +}; + +/* + * @class Projection + + * An object with methods for projecting geographical coordinates of the world onto + * a flat surface (and back). See [Map projection](https://en.wikipedia.org/wiki/Map_projection). + + * @property bounds: Bounds + * The bounds (specified in CRS units) where the projection is valid + + * @method project(latlng: LatLng): Point + * Projects geographical coordinates into a 2D point. + * Only accepts actual `L.LatLng` instances, not arrays. + + * @method unproject(point: Point): LatLng + * The inverse of `project`. Projects a 2D point into a geographical location. + * Only accepts actual `L.Point` instances, not arrays. + + * Note that the projection instances do not inherit from Leaflet's `Class` object, + * and can't be instantiated. Also, new classes can't inherit from them, + * and methods can't be added to them with the `include` function. + + */ + +var index = { + __proto__: null, + LonLat: LonLat, + Mercator: Mercator, + SphericalMercator: SphericalMercator +}; + +/* + * @namespace CRS + * @crs L.CRS.EPSG3395 + * + * Rarely used by some commercial tile providers. Uses Elliptical Mercator projection. + */ +var EPSG3395 = extend({}, Earth, { + code: 'EPSG:3395', + projection: Mercator, + + transformation: (function () { + var scale = 0.5 / (Math.PI * Mercator.R); + return toTransformation(scale, 0.5, -scale, 0.5); + }()) +}); + +/* + * @namespace CRS + * @crs L.CRS.EPSG4326 + * + * A common CRS among GIS enthusiasts. Uses simple Equirectangular projection. + * + * Leaflet 1.0.x complies with the [TMS coordinate scheme for EPSG:4326](https://wiki.osgeo.org/wiki/Tile_Map_Service_Specification#global-geodetic), + * which is a breaking change from 0.7.x behaviour. If you are using a `TileLayer` + * with this CRS, ensure that there are two 256x256 pixel tiles covering the + * whole earth at zoom level zero, and that the tile coordinate origin is (-180,+90), + * or (-180,-90) for `TileLayer`s with [the `tms` option](#tilelayer-tms) set. + */ + +var EPSG4326 = extend({}, Earth, { + code: 'EPSG:4326', + projection: LonLat, + transformation: toTransformation(1 / 180, 1, -1 / 180, 0.5) +}); + +/* + * @namespace CRS + * @crs L.CRS.Simple + * + * A simple CRS that maps longitude and latitude into `x` and `y` directly. + * May be used for maps of flat surfaces (e.g. game maps). Note that the `y` + * axis should still be inverted (going from bottom to top). `distance()` returns + * simple euclidean distance. + */ + +var Simple = extend({}, CRS, { + projection: LonLat, + transformation: toTransformation(1, 0, -1, 0), + + scale: function (zoom) { + return Math.pow(2, zoom); + }, + + zoom: function (scale) { + return Math.log(scale) / Math.LN2; + }, + + distance: function (latlng1, latlng2) { + var dx = latlng2.lng - latlng1.lng, + dy = latlng2.lat - latlng1.lat; + + return Math.sqrt(dx * dx + dy * dy); + }, + + infinite: true +}); + +CRS.Earth = Earth; +CRS.EPSG3395 = EPSG3395; +CRS.EPSG3857 = EPSG3857; +CRS.EPSG900913 = EPSG900913; +CRS.EPSG4326 = EPSG4326; +CRS.Simple = Simple; + +/* + * @class Layer + * @inherits Evented + * @aka L.Layer + * @aka ILayer + * + * A set of methods from the Layer base class that all Leaflet layers use. + * Inherits all methods, options and events from `L.Evented`. + * + * @example + * + * ```js + * var layer = L.marker(latlng).addTo(map); + * layer.addTo(map); + * layer.remove(); + * ``` + * + * @event add: Event + * Fired after the layer is added to a map + * + * @event remove: Event + * Fired after the layer is removed from a map + */ + + +var Layer = Evented.extend({ + + // Classes extending `L.Layer` will inherit the following options: + options: { + // @option pane: String = 'overlayPane' + // By default the layer will be added to the map's [overlay pane](#map-overlaypane). Overriding this option will cause the layer to be placed on another pane by default. + pane: 'overlayPane', + + // @option attribution: String = null + // String to be shown in the attribution control, e.g. "© OpenStreetMap contributors". It describes the layer data and is often a legal obligation towards copyright holders and tile providers. + attribution: null, + + bubblingMouseEvents: true + }, + + /* @section + * Classes extending `L.Layer` will inherit the following methods: + * + * @method addTo(map: Map|LayerGroup): this + * Adds the layer to the given map or layer group. + */ + addTo: function (map) { + map.addLayer(this); + return this; + }, + + // @method remove: this + // Removes the layer from the map it is currently active on. + remove: function () { + return this.removeFrom(this._map || this._mapToAdd); + }, + + // @method removeFrom(map: Map): this + // Removes the layer from the given map + // + // @alternative + // @method removeFrom(group: LayerGroup): this + // Removes the layer from the given `LayerGroup` + removeFrom: function (obj) { + if (obj) { + obj.removeLayer(this); + } + return this; + }, + + // @method getPane(name? : String): HTMLElement + // Returns the `HTMLElement` representing the named pane on the map. If `name` is omitted, returns the pane for this layer. + getPane: function (name) { + return this._map.getPane(name ? (this.options[name] || name) : this.options.pane); + }, + + addInteractiveTarget: function (targetEl) { + this._map._targets[stamp(targetEl)] = this; + return this; + }, + + removeInteractiveTarget: function (targetEl) { + delete this._map._targets[stamp(targetEl)]; + return this; + }, + + // @method getAttribution: String + // Used by the `attribution control`, returns the [attribution option](#gridlayer-attribution). + getAttribution: function () { + return this.options.attribution; + }, + + _layerAdd: function (e) { + var map = e.target; + + // check in case layer gets added and then removed before the map is ready + if (!map.hasLayer(this)) { return; } + + this._map = map; + this._zoomAnimated = map._zoomAnimated; + + if (this.getEvents) { + var events = this.getEvents(); + map.on(events, this); + this.once('remove', function () { + map.off(events, this); + }, this); + } + + this.onAdd(map); + + this.fire('add'); + map.fire('layeradd', {layer: this}); + } +}); + +/* @section Extension methods + * @uninheritable + * + * Every layer should extend from `L.Layer` and (re-)implement the following methods. + * + * @method onAdd(map: Map): this + * Should contain code that creates DOM elements for the layer, adds them to `map panes` where they should belong and puts listeners on relevant map events. Called on [`map.addLayer(layer)`](#map-addlayer). + * + * @method onRemove(map: Map): this + * Should contain all clean up code that removes the layer's elements from the DOM and removes listeners previously added in [`onAdd`](#layer-onadd). Called on [`map.removeLayer(layer)`](#map-removelayer). + * + * @method getEvents(): Object + * This optional method should return an object like `{ viewreset: this._reset }` for [`addEventListener`](#evented-addeventlistener). The event handlers in this object will be automatically added and removed from the map with your layer. + * + * @method getAttribution(): String + * This optional method should return a string containing HTML to be shown on the `Attribution control` whenever the layer is visible. + * + * @method beforeAdd(map: Map): this + * Optional method. Called on [`map.addLayer(layer)`](#map-addlayer), before the layer is added to the map, before events are initialized, without waiting until the map is in a usable state. Use for early initialization only. + */ + + +/* @namespace Map + * @section Layer events + * + * @event layeradd: LayerEvent + * Fired when a new layer is added to the map. + * + * @event layerremove: LayerEvent + * Fired when some layer is removed from the map + * + * @section Methods for Layers and Controls + */ +Map.include({ + // @method addLayer(layer: Layer): this + // Adds the given layer to the map + addLayer: function (layer) { + if (!layer._layerAdd) { + throw new Error('The provided object is not a Layer.'); + } + + var id = stamp(layer); + if (this._layers[id]) { return this; } + this._layers[id] = layer; + + layer._mapToAdd = this; + + if (layer.beforeAdd) { + layer.beforeAdd(this); + } + + this.whenReady(layer._layerAdd, layer); + + return this; + }, + + // @method removeLayer(layer: Layer): this + // Removes the given layer from the map. + removeLayer: function (layer) { + var id = stamp(layer); + + if (!this._layers[id]) { return this; } + + if (this._loaded) { + layer.onRemove(this); + } + + delete this._layers[id]; + + if (this._loaded) { + this.fire('layerremove', {layer: layer}); + layer.fire('remove'); + } + + layer._map = layer._mapToAdd = null; + + return this; + }, + + // @method hasLayer(layer: Layer): Boolean + // Returns `true` if the given layer is currently added to the map + hasLayer: function (layer) { + return stamp(layer) in this._layers; + }, + + /* @method eachLayer(fn: Function, context?: Object): this + * Iterates over the layers of the map, optionally specifying context of the iterator function. + * ``` + * map.eachLayer(function(layer){ + * layer.bindPopup('Hello'); + * }); + * ``` + */ + eachLayer: function (method, context) { + for (var i in this._layers) { + method.call(context, this._layers[i]); + } + return this; + }, + + _addLayers: function (layers) { + layers = layers ? (isArray(layers) ? layers : [layers]) : []; + + for (var i = 0, len = layers.length; i < len; i++) { + this.addLayer(layers[i]); + } + }, + + _addZoomLimit: function (layer) { + if (!isNaN(layer.options.maxZoom) || !isNaN(layer.options.minZoom)) { + this._zoomBoundLayers[stamp(layer)] = layer; + this._updateZoomLevels(); + } + }, + + _removeZoomLimit: function (layer) { + var id = stamp(layer); + + if (this._zoomBoundLayers[id]) { + delete this._zoomBoundLayers[id]; + this._updateZoomLevels(); + } + }, + + _updateZoomLevels: function () { + var minZoom = Infinity, + maxZoom = -Infinity, + oldZoomSpan = this._getZoomSpan(); + + for (var i in this._zoomBoundLayers) { + var options = this._zoomBoundLayers[i].options; + + minZoom = options.minZoom === undefined ? minZoom : Math.min(minZoom, options.minZoom); + maxZoom = options.maxZoom === undefined ? maxZoom : Math.max(maxZoom, options.maxZoom); + } + + this._layersMaxZoom = maxZoom === -Infinity ? undefined : maxZoom; + this._layersMinZoom = minZoom === Infinity ? undefined : minZoom; + + // @section Map state change events + // @event zoomlevelschange: Event + // Fired when the number of zoomlevels on the map is changed due + // to adding or removing a layer. + if (oldZoomSpan !== this._getZoomSpan()) { + this.fire('zoomlevelschange'); + } + + if (this.options.maxZoom === undefined && this._layersMaxZoom && this.getZoom() > this._layersMaxZoom) { + this.setZoom(this._layersMaxZoom); + } + if (this.options.minZoom === undefined && this._layersMinZoom && this.getZoom() < this._layersMinZoom) { + this.setZoom(this._layersMinZoom); + } + } +}); + +/* + * @class LayerGroup + * @aka L.LayerGroup + * @inherits Interactive layer + * + * Used to group several layers and handle them as one. If you add it to the map, + * any layers added or removed from the group will be added/removed on the map as + * well. Extends `Layer`. + * + * @example + * + * ```js + * L.layerGroup([marker1, marker2]) + * .addLayer(polyline) + * .addTo(map); + * ``` + */ + +var LayerGroup = Layer.extend({ + + initialize: function (layers, options) { + setOptions(this, options); + + this._layers = {}; + + var i, len; + + if (layers) { + for (i = 0, len = layers.length; i < len; i++) { + this.addLayer(layers[i]); + } + } + }, + + // @method addLayer(layer: Layer): this + // Adds the given layer to the group. + addLayer: function (layer) { + var id = this.getLayerId(layer); + + this._layers[id] = layer; + + if (this._map) { + this._map.addLayer(layer); + } + + return this; + }, + + // @method removeLayer(layer: Layer): this + // Removes the given layer from the group. + // @alternative + // @method removeLayer(id: Number): this + // Removes the layer with the given internal ID from the group. + removeLayer: function (layer) { + var id = layer in this._layers ? layer : this.getLayerId(layer); + + if (this._map && this._layers[id]) { + this._map.removeLayer(this._layers[id]); + } + + delete this._layers[id]; + + return this; + }, + + // @method hasLayer(layer: Layer): Boolean + // Returns `true` if the given layer is currently added to the group. + // @alternative + // @method hasLayer(id: Number): Boolean + // Returns `true` if the given internal ID is currently added to the group. + hasLayer: function (layer) { + var layerId = typeof layer === 'number' ? layer : this.getLayerId(layer); + return layerId in this._layers; + }, + + // @method clearLayers(): this + // Removes all the layers from the group. + clearLayers: function () { + return this.eachLayer(this.removeLayer, this); + }, + + // @method invoke(methodName: String, …): this + // Calls `methodName` on every layer contained in this group, passing any + // additional parameters. Has no effect if the layers contained do not + // implement `methodName`. + invoke: function (methodName) { + var args = Array.prototype.slice.call(arguments, 1), + i, layer; + + for (i in this._layers) { + layer = this._layers[i]; + + if (layer[methodName]) { + layer[methodName].apply(layer, args); + } + } + + return this; + }, + + onAdd: function (map) { + this.eachLayer(map.addLayer, map); + }, + + onRemove: function (map) { + this.eachLayer(map.removeLayer, map); + }, + + // @method eachLayer(fn: Function, context?: Object): this + // Iterates over the layers of the group, optionally specifying context of the iterator function. + // ```js + // group.eachLayer(function (layer) { + // layer.bindPopup('Hello'); + // }); + // ``` + eachLayer: function (method, context) { + for (var i in this._layers) { + method.call(context, this._layers[i]); + } + return this; + }, + + // @method getLayer(id: Number): Layer + // Returns the layer with the given internal ID. + getLayer: function (id) { + return this._layers[id]; + }, + + // @method getLayers(): Layer[] + // Returns an array of all the layers added to the group. + getLayers: function () { + var layers = []; + this.eachLayer(layers.push, layers); + return layers; + }, + + // @method setZIndex(zIndex: Number): this + // Calls `setZIndex` on every layer contained in this group, passing the z-index. + setZIndex: function (zIndex) { + return this.invoke('setZIndex', zIndex); + }, + + // @method getLayerId(layer: Layer): Number + // Returns the internal ID for a layer + getLayerId: function (layer) { + return stamp(layer); + } +}); + + +// @factory L.layerGroup(layers?: Layer[], options?: Object) +// Create a layer group, optionally given an initial set of layers and an `options` object. +var layerGroup = function (layers, options) { + return new LayerGroup(layers, options); +}; + +/* + * @class FeatureGroup + * @aka L.FeatureGroup + * @inherits LayerGroup + * + * Extended `LayerGroup` that makes it easier to do the same thing to all its member layers: + * * [`bindPopup`](#layer-bindpopup) binds a popup to all of the layers at once (likewise with [`bindTooltip`](#layer-bindtooltip)) + * * Events are propagated to the `FeatureGroup`, so if the group has an event + * handler, it will handle events from any of the layers. This includes mouse events + * and custom events. + * * Has `layeradd` and `layerremove` events + * + * @example + * + * ```js + * L.featureGroup([marker1, marker2, polyline]) + * .bindPopup('Hello world!') + * .on('click', function() { alert('Clicked on a member of the group!'); }) + * .addTo(map); + * ``` + */ + +var FeatureGroup = LayerGroup.extend({ + + addLayer: function (layer) { + if (this.hasLayer(layer)) { + return this; + } + + layer.addEventParent(this); + + LayerGroup.prototype.addLayer.call(this, layer); + + // @event layeradd: LayerEvent + // Fired when a layer is added to this `FeatureGroup` + return this.fire('layeradd', {layer: layer}); + }, + + removeLayer: function (layer) { + if (!this.hasLayer(layer)) { + return this; + } + if (layer in this._layers) { + layer = this._layers[layer]; + } + + layer.removeEventParent(this); + + LayerGroup.prototype.removeLayer.call(this, layer); + + // @event layerremove: LayerEvent + // Fired when a layer is removed from this `FeatureGroup` + return this.fire('layerremove', {layer: layer}); + }, + + // @method setStyle(style: Path options): this + // Sets the given path options to each layer of the group that has a `setStyle` method. + setStyle: function (style) { + return this.invoke('setStyle', style); + }, + + // @method bringToFront(): this + // Brings the layer group to the top of all other layers + bringToFront: function () { + return this.invoke('bringToFront'); + }, + + // @method bringToBack(): this + // Brings the layer group to the back of all other layers + bringToBack: function () { + return this.invoke('bringToBack'); + }, + + // @method getBounds(): LatLngBounds + // Returns the LatLngBounds of the Feature Group (created from bounds and coordinates of its children). + getBounds: function () { + var bounds = new LatLngBounds(); + + for (var id in this._layers) { + var layer = this._layers[id]; + bounds.extend(layer.getBounds ? layer.getBounds() : layer.getLatLng()); + } + return bounds; + } +}); + +// @factory L.featureGroup(layers?: Layer[], options?: Object) +// Create a feature group, optionally given an initial set of layers and an `options` object. +var featureGroup = function (layers, options) { + return new FeatureGroup(layers, options); +}; + +/* + * @class Icon + * @aka L.Icon + * + * Represents an icon to provide when creating a marker. + * + * @example + * + * ```js + * var myIcon = L.icon({ + * iconUrl: 'my-icon.png', + * iconRetinaUrl: 'my-icon@2x.png', + * iconSize: [38, 95], + * iconAnchor: [22, 94], + * popupAnchor: [-3, -76], + * shadowUrl: 'my-icon-shadow.png', + * shadowRetinaUrl: 'my-icon-shadow@2x.png', + * shadowSize: [68, 95], + * shadowAnchor: [22, 94] + * }); + * + * L.marker([50.505, 30.57], {icon: myIcon}).addTo(map); + * ``` + * + * `L.Icon.Default` extends `L.Icon` and is the blue icon Leaflet uses for markers by default. + * + */ + +var Icon = Class.extend({ + + /* @section + * @aka Icon options + * + * @option iconUrl: String = null + * **(required)** The URL to the icon image (absolute or relative to your script path). + * + * @option iconRetinaUrl: String = null + * The URL to a retina sized version of the icon image (absolute or relative to your + * script path). Used for Retina screen devices. + * + * @option iconSize: Point = null + * Size of the icon image in pixels. + * + * @option iconAnchor: Point = null + * The coordinates of the "tip" of the icon (relative to its top left corner). The icon + * will be aligned so that this point is at the marker's geographical location. Centered + * by default if size is specified, also can be set in CSS with negative margins. + * + * @option popupAnchor: Point = [0, 0] + * The coordinates of the point from which popups will "open", relative to the icon anchor. + * + * @option tooltipAnchor: Point = [0, 0] + * The coordinates of the point from which tooltips will "open", relative to the icon anchor. + * + * @option shadowUrl: String = null + * The URL to the icon shadow image. If not specified, no shadow image will be created. + * + * @option shadowRetinaUrl: String = null + * + * @option shadowSize: Point = null + * Size of the shadow image in pixels. + * + * @option shadowAnchor: Point = null + * The coordinates of the "tip" of the shadow (relative to its top left corner) (the same + * as iconAnchor if not specified). + * + * @option className: String = '' + * A custom class name to assign to both icon and shadow images. Empty by default. + */ + + options: { + popupAnchor: [0, 0], + tooltipAnchor: [0, 0], + + // @option crossOrigin: Boolean|String = false + // Whether the crossOrigin attribute will be added to the tiles. + // If a String is provided, all tiles will have their crossOrigin attribute set to the String provided. This is needed if you want to access tile pixel data. + // Refer to [CORS Settings](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes) for valid String values. + crossOrigin: false + }, + + initialize: function (options) { + setOptions(this, options); + }, + + // @method createIcon(oldIcon?: HTMLElement): HTMLElement + // Called internally when the icon has to be shown, returns a `` HTML element + // styled according to the options. + createIcon: function (oldIcon) { + return this._createIcon('icon', oldIcon); + }, + + // @method createShadow(oldIcon?: HTMLElement): HTMLElement + // As `createIcon`, but for the shadow beneath it. + createShadow: function (oldIcon) { + return this._createIcon('shadow', oldIcon); + }, + + _createIcon: function (name, oldIcon) { + var src = this._getIconUrl(name); + + if (!src) { + if (name === 'icon') { + throw new Error('iconUrl not set in Icon options (see the docs).'); + } + return null; + } + + var img = this._createImg(src, oldIcon && oldIcon.tagName === 'IMG' ? oldIcon : null); + this._setIconStyles(img, name); + + if (this.options.crossOrigin || this.options.crossOrigin === '') { + img.crossOrigin = this.options.crossOrigin === true ? '' : this.options.crossOrigin; + } + + return img; + }, + + _setIconStyles: function (img, name) { + var options = this.options; + var sizeOption = options[name + 'Size']; + + if (typeof sizeOption === 'number') { + sizeOption = [sizeOption, sizeOption]; + } + + var size = toPoint(sizeOption), + anchor = toPoint(name === 'shadow' && options.shadowAnchor || options.iconAnchor || + size && size.divideBy(2, true)); + + img.className = 'leaflet-marker-' + name + ' ' + (options.className || ''); + + if (anchor) { + img.style.marginLeft = (-anchor.x) + 'px'; + img.style.marginTop = (-anchor.y) + 'px'; + } + + if (size) { + img.style.width = size.x + 'px'; + img.style.height = size.y + 'px'; + } + }, + + _createImg: function (src, el) { + el = el || document.createElement('img'); + el.src = src; + return el; + }, + + _getIconUrl: function (name) { + return Browser.retina && this.options[name + 'RetinaUrl'] || this.options[name + 'Url']; + } +}); + + +// @factory L.icon(options: Icon options) +// Creates an icon instance with the given options. +function icon(options) { + return new Icon(options); +} + +/* + * @miniclass Icon.Default (Icon) + * @aka L.Icon.Default + * @section + * + * A trivial subclass of `Icon`, represents the icon to use in `Marker`s when + * no icon is specified. Points to the blue marker image distributed with Leaflet + * releases. + * + * In order to customize the default icon, just change the properties of `L.Icon.Default.prototype.options` + * (which is a set of `Icon options`). + * + * If you want to _completely_ replace the default icon, override the + * `L.Marker.prototype.options.icon` with your own icon instead. + */ + +var IconDefault = Icon.extend({ + + options: { + iconUrl: 'marker-icon.png', + iconRetinaUrl: 'marker-icon-2x.png', + shadowUrl: 'marker-shadow.png', + iconSize: [25, 41], + iconAnchor: [12, 41], + popupAnchor: [1, -34], + tooltipAnchor: [16, -28], + shadowSize: [41, 41] + }, + + _getIconUrl: function (name) { + if (typeof IconDefault.imagePath !== 'string') { // Deprecated, backwards-compatibility only + IconDefault.imagePath = this._detectIconPath(); + } + + // @option imagePath: String + // `Icon.Default` will try to auto-detect the location of the + // blue icon images. If you are placing these images in a non-standard + // way, set this option to point to the right path. + return (this.options.imagePath || IconDefault.imagePath) + Icon.prototype._getIconUrl.call(this, name); + }, + + _stripUrl: function (path) { // separate function to use in tests + var strip = function (str, re, idx) { + var match = re.exec(str); + return match && match[idx]; + }; + path = strip(path, /^url\((['"])?(.+)\1\)$/, 2); + return path && strip(path, /^(.*)marker-icon\.png$/, 1); + }, + + _detectIconPath: function () { + var el = create$1('div', 'leaflet-default-icon-path', document.body); + var path = getStyle(el, 'background-image') || + getStyle(el, 'backgroundImage'); // IE8 + + document.body.removeChild(el); + path = this._stripUrl(path); + if (path) { return path; } + var link = document.querySelector('link[href$="leaflet.css"]'); + if (!link) { return ''; } + return link.href.substring(0, link.href.length - 'leaflet.css'.length - 1); + } +}); + +/* + * L.Handler.MarkerDrag is used internally by L.Marker to make the markers draggable. + */ + + +/* @namespace Marker + * @section Interaction handlers + * + * Interaction handlers are properties of a marker instance that allow you to control interaction behavior in runtime, enabling or disabling certain features such as dragging (see `Handler` methods). Example: + * + * ```js + * marker.dragging.disable(); + * ``` + * + * @property dragging: Handler + * Marker dragging handler (by both mouse and touch). Only valid when the marker is on the map (Otherwise set [`marker.options.draggable`](#marker-draggable)). + */ + +var MarkerDrag = Handler.extend({ + initialize: function (marker) { + this._marker = marker; + }, + + addHooks: function () { + var icon = this._marker._icon; + + if (!this._draggable) { + this._draggable = new Draggable(icon, icon, true); + } + + this._draggable.on({ + dragstart: this._onDragStart, + predrag: this._onPreDrag, + drag: this._onDrag, + dragend: this._onDragEnd + }, this).enable(); + + addClass(icon, 'leaflet-marker-draggable'); + }, + + removeHooks: function () { + this._draggable.off({ + dragstart: this._onDragStart, + predrag: this._onPreDrag, + drag: this._onDrag, + dragend: this._onDragEnd + }, this).disable(); + + if (this._marker._icon) { + removeClass(this._marker._icon, 'leaflet-marker-draggable'); + } + }, + + moved: function () { + return this._draggable && this._draggable._moved; + }, + + _adjustPan: function (e) { + var marker = this._marker, + map = marker._map, + speed = this._marker.options.autoPanSpeed, + padding = this._marker.options.autoPanPadding, + iconPos = getPosition(marker._icon), + bounds = map.getPixelBounds(), + origin = map.getPixelOrigin(); + + var panBounds = toBounds( + bounds.min._subtract(origin).add(padding), + bounds.max._subtract(origin).subtract(padding) + ); + + if (!panBounds.contains(iconPos)) { + // Compute incremental movement + var movement = toPoint( + (Math.max(panBounds.max.x, iconPos.x) - panBounds.max.x) / (bounds.max.x - panBounds.max.x) - + (Math.min(panBounds.min.x, iconPos.x) - panBounds.min.x) / (bounds.min.x - panBounds.min.x), + + (Math.max(panBounds.max.y, iconPos.y) - panBounds.max.y) / (bounds.max.y - panBounds.max.y) - + (Math.min(panBounds.min.y, iconPos.y) - panBounds.min.y) / (bounds.min.y - panBounds.min.y) + ).multiplyBy(speed); + + map.panBy(movement, {animate: false}); + + this._draggable._newPos._add(movement); + this._draggable._startPos._add(movement); + + setPosition(marker._icon, this._draggable._newPos); + this._onDrag(e); + + this._panRequest = requestAnimFrame(this._adjustPan.bind(this, e)); + } + }, + + _onDragStart: function () { + // @section Dragging events + // @event dragstart: Event + // Fired when the user starts dragging the marker. + + // @event movestart: Event + // Fired when the marker starts moving (because of dragging). + + this._oldLatLng = this._marker.getLatLng(); + + // When using ES6 imports it could not be set when `Popup` was not imported as well + this._marker.closePopup && this._marker.closePopup(); + + this._marker + .fire('movestart') + .fire('dragstart'); + }, + + _onPreDrag: function (e) { + if (this._marker.options.autoPan) { + cancelAnimFrame(this._panRequest); + this._panRequest = requestAnimFrame(this._adjustPan.bind(this, e)); + } + }, + + _onDrag: function (e) { + var marker = this._marker, + shadow = marker._shadow, + iconPos = getPosition(marker._icon), + latlng = marker._map.layerPointToLatLng(iconPos); + + // update shadow position + if (shadow) { + setPosition(shadow, iconPos); + } + + marker._latlng = latlng; + e.latlng = latlng; + e.oldLatLng = this._oldLatLng; + + // @event drag: Event + // Fired repeatedly while the user drags the marker. + marker + .fire('move', e) + .fire('drag', e); + }, + + _onDragEnd: function (e) { + // @event dragend: DragEndEvent + // Fired when the user stops dragging the marker. + + cancelAnimFrame(this._panRequest); + + // @event moveend: Event + // Fired when the marker stops moving (because of dragging). + delete this._oldLatLng; + this._marker + .fire('moveend') + .fire('dragend', e); + } +}); + +/* + * @class Marker + * @inherits Interactive layer + * @aka L.Marker + * L.Marker is used to display clickable/draggable icons on the map. Extends `Layer`. + * + * @example + * + * ```js + * L.marker([50.5, 30.5]).addTo(map); + * ``` + */ + +var Marker = Layer.extend({ + + // @section + // @aka Marker options + options: { + // @option icon: Icon = * + // Icon instance to use for rendering the marker. + // See [Icon documentation](#L.Icon) for details on how to customize the marker icon. + // If not specified, a common instance of `L.Icon.Default` is used. + icon: new IconDefault(), + + // Option inherited from "Interactive layer" abstract class + interactive: true, + + // @option keyboard: Boolean = true + // Whether the marker can be tabbed to with a keyboard and clicked by pressing enter. + keyboard: true, + + // @option title: String = '' + // Text for the browser tooltip that appear on marker hover (no tooltip by default). + // [Useful for accessibility](https://leafletjs.com/examples/accessibility/#markers-must-be-labelled). + title: '', + + // @option alt: String = 'Marker' + // Text for the `alt` attribute of the icon image. + // [Useful for accessibility](https://leafletjs.com/examples/accessibility/#markers-must-be-labelled). + alt: 'Marker', + + // @option zIndexOffset: Number = 0 + // By default, marker images zIndex is set automatically based on its latitude. Use this option if you want to put the marker on top of all others (or below), specifying a high value like `1000` (or high negative value, respectively). + zIndexOffset: 0, + + // @option opacity: Number = 1.0 + // The opacity of the marker. + opacity: 1, + + // @option riseOnHover: Boolean = false + // If `true`, the marker will get on top of others when you hover the mouse over it. + riseOnHover: false, + + // @option riseOffset: Number = 250 + // The z-index offset used for the `riseOnHover` feature. + riseOffset: 250, + + // @option pane: String = 'markerPane' + // `Map pane` where the markers icon will be added. + pane: 'markerPane', + + // @option shadowPane: String = 'shadowPane' + // `Map pane` where the markers shadow will be added. + shadowPane: 'shadowPane', + + // @option bubblingMouseEvents: Boolean = false + // When `true`, a mouse event on this marker will trigger the same event on the map + // (unless [`L.DomEvent.stopPropagation`](#domevent-stoppropagation) is used). + bubblingMouseEvents: false, + + // @option autoPanOnFocus: Boolean = true + // When `true`, the map will pan whenever the marker is focused (via + // e.g. pressing `tab` on the keyboard) to ensure the marker is + // visible within the map's bounds + autoPanOnFocus: true, + + // @section Draggable marker options + // @option draggable: Boolean = false + // Whether the marker is draggable with mouse/touch or not. + draggable: false, + + // @option autoPan: Boolean = false + // Whether to pan the map when dragging this marker near its edge or not. + autoPan: false, + + // @option autoPanPadding: Point = Point(50, 50) + // Distance (in pixels to the left/right and to the top/bottom) of the + // map edge to start panning the map. + autoPanPadding: [50, 50], + + // @option autoPanSpeed: Number = 10 + // Number of pixels the map should pan by. + autoPanSpeed: 10 + }, + + /* @section + * + * In addition to [shared layer methods](#Layer) like `addTo()` and `remove()` and [popup methods](#Popup) like bindPopup() you can also use the following methods: + */ + + initialize: function (latlng, options) { + setOptions(this, options); + this._latlng = toLatLng(latlng); + }, + + onAdd: function (map) { + this._zoomAnimated = this._zoomAnimated && map.options.markerZoomAnimation; + + if (this._zoomAnimated) { + map.on('zoomanim', this._animateZoom, this); + } + + this._initIcon(); + this.update(); + }, + + onRemove: function (map) { + if (this.dragging && this.dragging.enabled()) { + this.options.draggable = true; + this.dragging.removeHooks(); + } + delete this.dragging; + + if (this._zoomAnimated) { + map.off('zoomanim', this._animateZoom, this); + } + + this._removeIcon(); + this._removeShadow(); + }, + + getEvents: function () { + return { + zoom: this.update, + viewreset: this.update + }; + }, + + // @method getLatLng: LatLng + // Returns the current geographical position of the marker. + getLatLng: function () { + return this._latlng; + }, + + // @method setLatLng(latlng: LatLng): this + // Changes the marker position to the given point. + setLatLng: function (latlng) { + var oldLatLng = this._latlng; + this._latlng = toLatLng(latlng); + this.update(); + + // @event move: Event + // Fired when the marker is moved via [`setLatLng`](#marker-setlatlng) or by [dragging](#marker-dragging). Old and new coordinates are included in event arguments as `oldLatLng`, `latlng`. + return this.fire('move', {oldLatLng: oldLatLng, latlng: this._latlng}); + }, + + // @method setZIndexOffset(offset: Number): this + // Changes the [zIndex offset](#marker-zindexoffset) of the marker. + setZIndexOffset: function (offset) { + this.options.zIndexOffset = offset; + return this.update(); + }, + + // @method getIcon: Icon + // Returns the current icon used by the marker + getIcon: function () { + return this.options.icon; + }, + + // @method setIcon(icon: Icon): this + // Changes the marker icon. + setIcon: function (icon) { + + this.options.icon = icon; + + if (this._map) { + this._initIcon(); + this.update(); + } + + if (this._popup) { + this.bindPopup(this._popup, this._popup.options); + } + + return this; + }, + + getElement: function () { + return this._icon; + }, + + update: function () { + + if (this._icon && this._map) { + var pos = this._map.latLngToLayerPoint(this._latlng).round(); + this._setPos(pos); + } + + return this; + }, + + _initIcon: function () { + var options = this.options, + classToAdd = 'leaflet-zoom-' + (this._zoomAnimated ? 'animated' : 'hide'); + + var icon = options.icon.createIcon(this._icon), + addIcon = false; + + // if we're not reusing the icon, remove the old one and init new one + if (icon !== this._icon) { + if (this._icon) { + this._removeIcon(); + } + addIcon = true; + + if (options.title) { + icon.title = options.title; + } + + if (icon.tagName === 'IMG') { + icon.alt = options.alt || ''; + } + } + + addClass(icon, classToAdd); + + if (options.keyboard) { + icon.tabIndex = '0'; + icon.setAttribute('role', 'button'); + } + + this._icon = icon; + + if (options.riseOnHover) { + this.on({ + mouseover: this._bringToFront, + mouseout: this._resetZIndex + }); + } + + if (this.options.autoPanOnFocus) { + on(icon, 'focus', this._panOnFocus, this); + } + + var newShadow = options.icon.createShadow(this._shadow), + addShadow = false; + + if (newShadow !== this._shadow) { + this._removeShadow(); + addShadow = true; + } + + if (newShadow) { + addClass(newShadow, classToAdd); + newShadow.alt = ''; + } + this._shadow = newShadow; + + + if (options.opacity < 1) { + this._updateOpacity(); + } + + + if (addIcon) { + this.getPane().appendChild(this._icon); + } + this._initInteraction(); + if (newShadow && addShadow) { + this.getPane(options.shadowPane).appendChild(this._shadow); + } + }, + + _removeIcon: function () { + if (this.options.riseOnHover) { + this.off({ + mouseover: this._bringToFront, + mouseout: this._resetZIndex + }); + } + + if (this.options.autoPanOnFocus) { + off(this._icon, 'focus', this._panOnFocus, this); + } + + remove(this._icon); + this.removeInteractiveTarget(this._icon); + + this._icon = null; + }, + + _removeShadow: function () { + if (this._shadow) { + remove(this._shadow); + } + this._shadow = null; + }, + + _setPos: function (pos) { + + if (this._icon) { + setPosition(this._icon, pos); + } + + if (this._shadow) { + setPosition(this._shadow, pos); + } + + this._zIndex = pos.y + this.options.zIndexOffset; + + this._resetZIndex(); + }, + + _updateZIndex: function (offset) { + if (this._icon) { + this._icon.style.zIndex = this._zIndex + offset; + } + }, + + _animateZoom: function (opt) { + var pos = this._map._latLngToNewLayerPoint(this._latlng, opt.zoom, opt.center).round(); + + this._setPos(pos); + }, + + _initInteraction: function () { + + if (!this.options.interactive) { return; } + + addClass(this._icon, 'leaflet-interactive'); + + this.addInteractiveTarget(this._icon); + + if (MarkerDrag) { + var draggable = this.options.draggable; + if (this.dragging) { + draggable = this.dragging.enabled(); + this.dragging.disable(); + } + + this.dragging = new MarkerDrag(this); + + if (draggable) { + this.dragging.enable(); + } + } + }, + + // @method setOpacity(opacity: Number): this + // Changes the opacity of the marker. + setOpacity: function (opacity) { + this.options.opacity = opacity; + if (this._map) { + this._updateOpacity(); + } + + return this; + }, + + _updateOpacity: function () { + var opacity = this.options.opacity; + + if (this._icon) { + setOpacity(this._icon, opacity); + } + + if (this._shadow) { + setOpacity(this._shadow, opacity); + } + }, + + _bringToFront: function () { + this._updateZIndex(this.options.riseOffset); + }, + + _resetZIndex: function () { + this._updateZIndex(0); + }, + + _panOnFocus: function () { + var map = this._map; + if (!map) { return; } + + var iconOpts = this.options.icon.options; + var size = iconOpts.iconSize ? toPoint(iconOpts.iconSize) : toPoint(0, 0); + var anchor = iconOpts.iconAnchor ? toPoint(iconOpts.iconAnchor) : toPoint(0, 0); + + map.panInside(this._latlng, { + paddingTopLeft: anchor, + paddingBottomRight: size.subtract(anchor) + }); + }, + + _getPopupAnchor: function () { + return this.options.icon.options.popupAnchor; + }, + + _getTooltipAnchor: function () { + return this.options.icon.options.tooltipAnchor; + } +}); + + +// factory L.marker(latlng: LatLng, options? : Marker options) + +// @factory L.marker(latlng: LatLng, options? : Marker options) +// Instantiates a Marker object given a geographical point and optionally an options object. +function marker(latlng, options) { + return new Marker(latlng, options); +} + +/* + * @class Path + * @aka L.Path + * @inherits Interactive layer + * + * An abstract class that contains options and constants shared between vector + * overlays (Polygon, Polyline, Circle). Do not use it directly. Extends `Layer`. + */ + +var Path = Layer.extend({ + + // @section + // @aka Path options + options: { + // @option stroke: Boolean = true + // Whether to draw stroke along the path. Set it to `false` to disable borders on polygons or circles. + stroke: true, + + // @option color: String = '#3388ff' + // Stroke color + color: '#3388ff', + + // @option weight: Number = 3 + // Stroke width in pixels + weight: 3, + + // @option opacity: Number = 1.0 + // Stroke opacity + opacity: 1, + + // @option lineCap: String= 'round' + // A string that defines [shape to be used at the end](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-linecap) of the stroke. + lineCap: 'round', + + // @option lineJoin: String = 'round' + // A string that defines [shape to be used at the corners](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-linejoin) of the stroke. + lineJoin: 'round', + + // @option dashArray: String = null + // A string that defines the stroke [dash pattern](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-dasharray). Doesn't work on `Canvas`-powered layers in [some old browsers](https://developer.mozilla.org/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility). + dashArray: null, + + // @option dashOffset: String = null + // A string that defines the [distance into the dash pattern to start the dash](https://developer.mozilla.org/docs/Web/SVG/Attribute/stroke-dashoffset). Doesn't work on `Canvas`-powered layers in [some old browsers](https://developer.mozilla.org/docs/Web/API/CanvasRenderingContext2D/setLineDash#Browser_compatibility). + dashOffset: null, + + // @option fill: Boolean = depends + // Whether to fill the path with color. Set it to `false` to disable filling on polygons or circles. + fill: false, + + // @option fillColor: String = * + // Fill color. Defaults to the value of the [`color`](#path-color) option + fillColor: null, + + // @option fillOpacity: Number = 0.2 + // Fill opacity. + fillOpacity: 0.2, + + // @option fillRule: String = 'evenodd' + // A string that defines [how the inside of a shape](https://developer.mozilla.org/docs/Web/SVG/Attribute/fill-rule) is determined. + fillRule: 'evenodd', + + // className: '', + + // Option inherited from "Interactive layer" abstract class + interactive: true, + + // @option bubblingMouseEvents: Boolean = true + // When `true`, a mouse event on this path will trigger the same event on the map + // (unless [`L.DomEvent.stopPropagation`](#domevent-stoppropagation) is used). + bubblingMouseEvents: true + }, + + beforeAdd: function (map) { + // Renderer is set here because we need to call renderer.getEvents + // before this.getEvents. + this._renderer = map.getRenderer(this); + }, + + onAdd: function () { + this._renderer._initPath(this); + this._reset(); + this._renderer._addPath(this); + }, + + onRemove: function () { + this._renderer._removePath(this); + }, + + // @method redraw(): this + // Redraws the layer. Sometimes useful after you changed the coordinates that the path uses. + redraw: function () { + if (this._map) { + this._renderer._updatePath(this); + } + return this; + }, + + // @method setStyle(style: Path options): this + // Changes the appearance of a Path based on the options in the `Path options` object. + setStyle: function (style) { + setOptions(this, style); + if (this._renderer) { + this._renderer._updateStyle(this); + if (this.options.stroke && style && Object.prototype.hasOwnProperty.call(style, 'weight')) { + this._updateBounds(); + } + } + return this; + }, + + // @method bringToFront(): this + // Brings the layer to the top of all path layers. + bringToFront: function () { + if (this._renderer) { + this._renderer._bringToFront(this); + } + return this; + }, + + // @method bringToBack(): this + // Brings the layer to the bottom of all path layers. + bringToBack: function () { + if (this._renderer) { + this._renderer._bringToBack(this); + } + return this; + }, + + getElement: function () { + return this._path; + }, + + _reset: function () { + // defined in child classes + this._project(); + this._update(); + }, + + _clickTolerance: function () { + // used when doing hit detection for Canvas layers + return (this.options.stroke ? this.options.weight / 2 : 0) + + (this._renderer.options.tolerance || 0); + } +}); + +/* + * @class CircleMarker + * @aka L.CircleMarker + * @inherits Path + * + * A circle of a fixed size with radius specified in pixels. Extends `Path`. + */ + +var CircleMarker = Path.extend({ + + // @section + // @aka CircleMarker options + options: { + fill: true, + + // @option radius: Number = 10 + // Radius of the circle marker, in pixels + radius: 10 + }, + + initialize: function (latlng, options) { + setOptions(this, options); + this._latlng = toLatLng(latlng); + this._radius = this.options.radius; + }, + + // @method setLatLng(latLng: LatLng): this + // Sets the position of a circle marker to a new location. + setLatLng: function (latlng) { + var oldLatLng = this._latlng; + this._latlng = toLatLng(latlng); + this.redraw(); + + // @event move: Event + // Fired when the marker is moved via [`setLatLng`](#circlemarker-setlatlng). Old and new coordinates are included in event arguments as `oldLatLng`, `latlng`. + return this.fire('move', {oldLatLng: oldLatLng, latlng: this._latlng}); + }, + + // @method getLatLng(): LatLng + // Returns the current geographical position of the circle marker + getLatLng: function () { + return this._latlng; + }, + + // @method setRadius(radius: Number): this + // Sets the radius of a circle marker. Units are in pixels. + setRadius: function (radius) { + this.options.radius = this._radius = radius; + return this.redraw(); + }, + + // @method getRadius(): Number + // Returns the current radius of the circle + getRadius: function () { + return this._radius; + }, + + setStyle : function (options) { + var radius = options && options.radius || this._radius; + Path.prototype.setStyle.call(this, options); + this.setRadius(radius); + return this; + }, + + _project: function () { + this._point = this._map.latLngToLayerPoint(this._latlng); + this._updateBounds(); + }, + + _updateBounds: function () { + var r = this._radius, + r2 = this._radiusY || r, + w = this._clickTolerance(), + p = [r + w, r2 + w]; + this._pxBounds = new Bounds(this._point.subtract(p), this._point.add(p)); + }, + + _update: function () { + if (this._map) { + this._updatePath(); + } + }, + + _updatePath: function () { + this._renderer._updateCircle(this); + }, + + _empty: function () { + return this._radius && !this._renderer._bounds.intersects(this._pxBounds); + }, + + // Needed by the `Canvas` renderer for interactivity + _containsPoint: function (p) { + return p.distanceTo(this._point) <= this._radius + this._clickTolerance(); + } +}); + + +// @factory L.circleMarker(latlng: LatLng, options?: CircleMarker options) +// Instantiates a circle marker object given a geographical point, and an optional options object. +function circleMarker(latlng, options) { + return new CircleMarker(latlng, options); +} + +/* + * @class Circle + * @aka L.Circle + * @inherits CircleMarker + * + * A class for drawing circle overlays on a map. Extends `CircleMarker`. + * + * It's an approximation and starts to diverge from a real circle closer to poles (due to projection distortion). + * + * @example + * + * ```js + * L.circle([50.5, 30.5], {radius: 200}).addTo(map); + * ``` + */ + +var Circle = CircleMarker.extend({ + + initialize: function (latlng, options, legacyOptions) { + if (typeof options === 'number') { + // Backwards compatibility with 0.7.x factory (latlng, radius, options?) + options = extend({}, legacyOptions, {radius: options}); + } + setOptions(this, options); + this._latlng = toLatLng(latlng); + + if (isNaN(this.options.radius)) { throw new Error('Circle radius cannot be NaN'); } + + // @section + // @aka Circle options + // @option radius: Number; Radius of the circle, in meters. + this._mRadius = this.options.radius; + }, + + // @method setRadius(radius: Number): this + // Sets the radius of a circle. Units are in meters. + setRadius: function (radius) { + this._mRadius = radius; + return this.redraw(); + }, + + // @method getRadius(): Number + // Returns the current radius of a circle. Units are in meters. + getRadius: function () { + return this._mRadius; + }, + + // @method getBounds(): LatLngBounds + // Returns the `LatLngBounds` of the path. + getBounds: function () { + var half = [this._radius, this._radiusY || this._radius]; + + return new LatLngBounds( + this._map.layerPointToLatLng(this._point.subtract(half)), + this._map.layerPointToLatLng(this._point.add(half))); + }, + + setStyle: Path.prototype.setStyle, + + _project: function () { + + var lng = this._latlng.lng, + lat = this._latlng.lat, + map = this._map, + crs = map.options.crs; + + if (crs.distance === Earth.distance) { + var d = Math.PI / 180, + latR = (this._mRadius / Earth.R) / d, + top = map.project([lat + latR, lng]), + bottom = map.project([lat - latR, lng]), + p = top.add(bottom).divideBy(2), + lat2 = map.unproject(p).lat, + lngR = Math.acos((Math.cos(latR * d) - Math.sin(lat * d) * Math.sin(lat2 * d)) / + (Math.cos(lat * d) * Math.cos(lat2 * d))) / d; + + if (isNaN(lngR) || lngR === 0) { + lngR = latR / Math.cos(Math.PI / 180 * lat); // Fallback for edge case, #2425 + } + + this._point = p.subtract(map.getPixelOrigin()); + this._radius = isNaN(lngR) ? 0 : p.x - map.project([lat2, lng - lngR]).x; + this._radiusY = p.y - top.y; + + } else { + var latlng2 = crs.unproject(crs.project(this._latlng).subtract([this._mRadius, 0])); + + this._point = map.latLngToLayerPoint(this._latlng); + this._radius = this._point.x - map.latLngToLayerPoint(latlng2).x; + } + + this._updateBounds(); + } +}); + +// @factory L.circle(latlng: LatLng, options?: Circle options) +// Instantiates a circle object given a geographical point, and an options object +// which contains the circle radius. +// @alternative +// @factory L.circle(latlng: LatLng, radius: Number, options?: Circle options) +// Obsolete way of instantiating a circle, for compatibility with 0.7.x code. +// Do not use in new applications or plugins. +function circle(latlng, options, legacyOptions) { + return new Circle(latlng, options, legacyOptions); +} + +/* + * @class Polyline + * @aka L.Polyline + * @inherits Path + * + * A class for drawing polyline overlays on a map. Extends `Path`. + * + * @example + * + * ```js + * // create a red polyline from an array of LatLng points + * var latlngs = [ + * [45.51, -122.68], + * [37.77, -122.43], + * [34.04, -118.2] + * ]; + * + * var polyline = L.polyline(latlngs, {color: 'red'}).addTo(map); + * + * // zoom the map to the polyline + * map.fitBounds(polyline.getBounds()); + * ``` + * + * You can also pass a multi-dimensional array to represent a `MultiPolyline` shape: + * + * ```js + * // create a red polyline from an array of arrays of LatLng points + * var latlngs = [ + * [[45.51, -122.68], + * [37.77, -122.43], + * [34.04, -118.2]], + * [[40.78, -73.91], + * [41.83, -87.62], + * [32.76, -96.72]] + * ]; + * ``` + */ + + +var Polyline = Path.extend({ + + // @section + // @aka Polyline options + options: { + // @option smoothFactor: Number = 1.0 + // How much to simplify the polyline on each zoom level. More means + // better performance and smoother look, and less means more accurate representation. + smoothFactor: 1.0, + + // @option noClip: Boolean = false + // Disable polyline clipping. + noClip: false + }, + + initialize: function (latlngs, options) { + setOptions(this, options); + this._setLatLngs(latlngs); + }, + + // @method getLatLngs(): LatLng[] + // Returns an array of the points in the path, or nested arrays of points in case of multi-polyline. + getLatLngs: function () { + return this._latlngs; + }, + + // @method setLatLngs(latlngs: LatLng[]): this + // Replaces all the points in the polyline with the given array of geographical points. + setLatLngs: function (latlngs) { + this._setLatLngs(latlngs); + return this.redraw(); + }, + + // @method isEmpty(): Boolean + // Returns `true` if the Polyline has no LatLngs. + isEmpty: function () { + return !this._latlngs.length; + }, + + // @method closestLayerPoint(p: Point): Point + // Returns the point closest to `p` on the Polyline. + closestLayerPoint: function (p) { + var minDistance = Infinity, + minPoint = null, + closest = _sqClosestPointOnSegment, + p1, p2; + + for (var j = 0, jLen = this._parts.length; j < jLen; j++) { + var points = this._parts[j]; + + for (var i = 1, len = points.length; i < len; i++) { + p1 = points[i - 1]; + p2 = points[i]; + + var sqDist = closest(p, p1, p2, true); + + if (sqDist < minDistance) { + minDistance = sqDist; + minPoint = closest(p, p1, p2); + } + } + } + if (minPoint) { + minPoint.distance = Math.sqrt(minDistance); + } + return minPoint; + }, + + // @method getCenter(): LatLng + // Returns the center ([centroid](https://en.wikipedia.org/wiki/Centroid)) of the polyline. + getCenter: function () { + // throws error when not yet added to map as this center calculation requires projected coordinates + if (!this._map) { + throw new Error('Must add layer to map before using getCenter()'); + } + return polylineCenter(this._defaultShape(), this._map.options.crs); + }, + + // @method getBounds(): LatLngBounds + // Returns the `LatLngBounds` of the path. + getBounds: function () { + return this._bounds; + }, + + // @method addLatLng(latlng: LatLng, latlngs?: LatLng[]): this + // Adds a given point to the polyline. By default, adds to the first ring of + // the polyline in case of a multi-polyline, but can be overridden by passing + // a specific ring as a LatLng array (that you can earlier access with [`getLatLngs`](#polyline-getlatlngs)). + addLatLng: function (latlng, latlngs) { + latlngs = latlngs || this._defaultShape(); + latlng = toLatLng(latlng); + latlngs.push(latlng); + this._bounds.extend(latlng); + return this.redraw(); + }, + + _setLatLngs: function (latlngs) { + this._bounds = new LatLngBounds(); + this._latlngs = this._convertLatLngs(latlngs); + }, + + _defaultShape: function () { + return isFlat(this._latlngs) ? this._latlngs : this._latlngs[0]; + }, + + // recursively convert latlngs input into actual LatLng instances; calculate bounds along the way + _convertLatLngs: function (latlngs) { + var result = [], + flat = isFlat(latlngs); + + for (var i = 0, len = latlngs.length; i < len; i++) { + if (flat) { + result[i] = toLatLng(latlngs[i]); + this._bounds.extend(result[i]); + } else { + result[i] = this._convertLatLngs(latlngs[i]); + } + } + + return result; + }, + + _project: function () { + var pxBounds = new Bounds(); + this._rings = []; + this._projectLatlngs(this._latlngs, this._rings, pxBounds); + + if (this._bounds.isValid() && pxBounds.isValid()) { + this._rawPxBounds = pxBounds; + this._updateBounds(); + } + }, + + _updateBounds: function () { + var w = this._clickTolerance(), + p = new Point(w, w); + + if (!this._rawPxBounds) { + return; + } + + this._pxBounds = new Bounds([ + this._rawPxBounds.min.subtract(p), + this._rawPxBounds.max.add(p) + ]); + }, + + // recursively turns latlngs into a set of rings with projected coordinates + _projectLatlngs: function (latlngs, result, projectedBounds) { + var flat = latlngs[0] instanceof LatLng, + len = latlngs.length, + i, ring; + + if (flat) { + ring = []; + for (i = 0; i < len; i++) { + ring[i] = this._map.latLngToLayerPoint(latlngs[i]); + projectedBounds.extend(ring[i]); + } + result.push(ring); + } else { + for (i = 0; i < len; i++) { + this._projectLatlngs(latlngs[i], result, projectedBounds); + } + } + }, + + // clip polyline by renderer bounds so that we have less to render for performance + _clipPoints: function () { + var bounds = this._renderer._bounds; + + this._parts = []; + if (!this._pxBounds || !this._pxBounds.intersects(bounds)) { + return; + } + + if (this.options.noClip) { + this._parts = this._rings; + return; + } + + var parts = this._parts, + i, j, k, len, len2, segment, points; + + for (i = 0, k = 0, len = this._rings.length; i < len; i++) { + points = this._rings[i]; + + for (j = 0, len2 = points.length; j < len2 - 1; j++) { + segment = clipSegment(points[j], points[j + 1], bounds, j, true); + + if (!segment) { continue; } + + parts[k] = parts[k] || []; + parts[k].push(segment[0]); + + // if segment goes out of screen, or it's the last one, it's the end of the line part + if ((segment[1] !== points[j + 1]) || (j === len2 - 2)) { + parts[k].push(segment[1]); + k++; + } + } + } + }, + + // simplify each clipped part of the polyline for performance + _simplifyPoints: function () { + var parts = this._parts, + tolerance = this.options.smoothFactor; + + for (var i = 0, len = parts.length; i < len; i++) { + parts[i] = simplify(parts[i], tolerance); + } + }, + + _update: function () { + if (!this._map) { return; } + + this._clipPoints(); + this._simplifyPoints(); + this._updatePath(); + }, + + _updatePath: function () { + this._renderer._updatePoly(this); + }, + + // Needed by the `Canvas` renderer for interactivity + _containsPoint: function (p, closed) { + var i, j, k, len, len2, part, + w = this._clickTolerance(); + + if (!this._pxBounds || !this._pxBounds.contains(p)) { return false; } + + // hit detection for polylines + for (i = 0, len = this._parts.length; i < len; i++) { + part = this._parts[i]; + + for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) { + if (!closed && (j === 0)) { continue; } + + if (pointToSegmentDistance(p, part[k], part[j]) <= w) { + return true; + } + } + } + return false; + } +}); + +// @factory L.polyline(latlngs: LatLng[], options?: Polyline options) +// Instantiates a polyline object given an array of geographical points and +// optionally an options object. You can create a `Polyline` object with +// multiple separate lines (`MultiPolyline`) by passing an array of arrays +// of geographic points. +function polyline(latlngs, options) { + return new Polyline(latlngs, options); +} + +// Retrocompat. Allow plugins to support Leaflet versions before and after 1.1. +Polyline._flat = _flat; + +/* + * @class Polygon + * @aka L.Polygon + * @inherits Polyline + * + * A class for drawing polygon overlays on a map. Extends `Polyline`. + * + * Note that points you pass when creating a polygon shouldn't have an additional last point equal to the first one — it's better to filter out such points. + * + * + * @example + * + * ```js + * // create a red polygon from an array of LatLng points + * var latlngs = [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]]; + * + * var polygon = L.polygon(latlngs, {color: 'red'}).addTo(map); + * + * // zoom the map to the polygon + * map.fitBounds(polygon.getBounds()); + * ``` + * + * You can also pass an array of arrays of latlngs, with the first array representing the outer shape and the other arrays representing holes in the outer shape: + * + * ```js + * var latlngs = [ + * [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]], // outer ring + * [[37.29, -108.58],[40.71, -108.58],[40.71, -102.50],[37.29, -102.50]] // hole + * ]; + * ``` + * + * Additionally, you can pass a multi-dimensional array to represent a MultiPolygon shape. + * + * ```js + * var latlngs = [ + * [ // first polygon + * [[37, -109.05],[41, -109.03],[41, -102.05],[37, -102.04]], // outer ring + * [[37.29, -108.58],[40.71, -108.58],[40.71, -102.50],[37.29, -102.50]] // hole + * ], + * [ // second polygon + * [[41, -111.03],[45, -111.04],[45, -104.05],[41, -104.05]] + * ] + * ]; + * ``` + */ + +var Polygon = Polyline.extend({ + + options: { + fill: true + }, + + isEmpty: function () { + return !this._latlngs.length || !this._latlngs[0].length; + }, + + // @method getCenter(): LatLng + // Returns the center ([centroid](http://en.wikipedia.org/wiki/Centroid)) of the Polygon. + getCenter: function () { + // throws error when not yet added to map as this center calculation requires projected coordinates + if (!this._map) { + throw new Error('Must add layer to map before using getCenter()'); + } + return polygonCenter(this._defaultShape(), this._map.options.crs); + }, + + _convertLatLngs: function (latlngs) { + var result = Polyline.prototype._convertLatLngs.call(this, latlngs), + len = result.length; + + // remove last point if it equals first one + if (len >= 2 && result[0] instanceof LatLng && result[0].equals(result[len - 1])) { + result.pop(); + } + return result; + }, + + _setLatLngs: function (latlngs) { + Polyline.prototype._setLatLngs.call(this, latlngs); + if (isFlat(this._latlngs)) { + this._latlngs = [this._latlngs]; + } + }, + + _defaultShape: function () { + return isFlat(this._latlngs[0]) ? this._latlngs[0] : this._latlngs[0][0]; + }, + + _clipPoints: function () { + // polygons need a different clipping algorithm so we redefine that + + var bounds = this._renderer._bounds, + w = this.options.weight, + p = new Point(w, w); + + // increase clip padding by stroke width to avoid stroke on clip edges + bounds = new Bounds(bounds.min.subtract(p), bounds.max.add(p)); + + this._parts = []; + if (!this._pxBounds || !this._pxBounds.intersects(bounds)) { + return; + } + + if (this.options.noClip) { + this._parts = this._rings; + return; + } + + for (var i = 0, len = this._rings.length, clipped; i < len; i++) { + clipped = clipPolygon(this._rings[i], bounds, true); + if (clipped.length) { + this._parts.push(clipped); + } + } + }, + + _updatePath: function () { + this._renderer._updatePoly(this, true); + }, + + // Needed by the `Canvas` renderer for interactivity + _containsPoint: function (p) { + var inside = false, + part, p1, p2, i, j, k, len, len2; + + if (!this._pxBounds || !this._pxBounds.contains(p)) { return false; } + + // ray casting algorithm for detecting if point is in polygon + for (i = 0, len = this._parts.length; i < len; i++) { + part = this._parts[i]; + + for (j = 0, len2 = part.length, k = len2 - 1; j < len2; k = j++) { + p1 = part[j]; + p2 = part[k]; + + if (((p1.y > p.y) !== (p2.y > p.y)) && (p.x < (p2.x - p1.x) * (p.y - p1.y) / (p2.y - p1.y) + p1.x)) { + inside = !inside; + } + } + } + + // also check if it's on polygon stroke + return inside || Polyline.prototype._containsPoint.call(this, p, true); + } + +}); + + +// @factory L.polygon(latlngs: LatLng[], options?: Polyline options) +function polygon(latlngs, options) { + return new Polygon(latlngs, options); +} + +/* + * @class GeoJSON + * @aka L.GeoJSON + * @inherits FeatureGroup + * + * Represents a GeoJSON object or an array of GeoJSON objects. Allows you to parse + * GeoJSON data and display it on the map. Extends `FeatureGroup`. + * + * @example + * + * ```js + * L.geoJSON(data, { + * style: function (feature) { + * return {color: feature.properties.color}; + * } + * }).bindPopup(function (layer) { + * return layer.feature.properties.description; + * }).addTo(map); + * ``` + */ + +var GeoJSON = FeatureGroup.extend({ + + /* @section + * @aka GeoJSON options + * + * @option pointToLayer: Function = * + * A `Function` defining how GeoJSON points spawn Leaflet layers. It is internally + * called when data is added, passing the GeoJSON point feature and its `LatLng`. + * The default is to spawn a default `Marker`: + * ```js + * function(geoJsonPoint, latlng) { + * return L.marker(latlng); + * } + * ``` + * + * @option style: Function = * + * A `Function` defining the `Path options` for styling GeoJSON lines and polygons, + * called internally when data is added. + * The default value is to not override any defaults: + * ```js + * function (geoJsonFeature) { + * return {} + * } + * ``` + * + * @option onEachFeature: Function = * + * A `Function` that will be called once for each created `Feature`, after it has + * been created and styled. Useful for attaching events and popups to features. + * The default is to do nothing with the newly created layers: + * ```js + * function (feature, layer) {} + * ``` + * + * @option filter: Function = * + * A `Function` that will be used to decide whether to include a feature or not. + * The default is to include all features: + * ```js + * function (geoJsonFeature) { + * return true; + * } + * ``` + * Note: dynamically changing the `filter` option will have effect only on newly + * added data. It will _not_ re-evaluate already included features. + * + * @option coordsToLatLng: Function = * + * A `Function` that will be used for converting GeoJSON coordinates to `LatLng`s. + * The default is the `coordsToLatLng` static method. + * + * @option markersInheritOptions: Boolean = false + * Whether default Markers for "Point" type Features inherit from group options. + */ + + initialize: function (geojson, options) { + setOptions(this, options); + + this._layers = {}; + + if (geojson) { + this.addData(geojson); + } + }, + + // @method addData( data ): this + // Adds a GeoJSON object to the layer. + addData: function (geojson) { + var features = isArray(geojson) ? geojson : geojson.features, + i, len, feature; + + if (features) { + for (i = 0, len = features.length; i < len; i++) { + // only add this if geometry or geometries are set and not null + feature = features[i]; + if (feature.geometries || feature.geometry || feature.features || feature.coordinates) { + this.addData(feature); + } + } + return this; + } + + var options = this.options; + + if (options.filter && !options.filter(geojson)) { return this; } + + var layer = geometryToLayer(geojson, options); + if (!layer) { + return this; + } + layer.feature = asFeature(geojson); + + layer.defaultOptions = layer.options; + this.resetStyle(layer); + + if (options.onEachFeature) { + options.onEachFeature(geojson, layer); + } + + return this.addLayer(layer); + }, + + // @method resetStyle( layer? ): this + // Resets the given vector layer's style to the original GeoJSON style, useful for resetting style after hover events. + // If `layer` is omitted, the style of all features in the current layer is reset. + resetStyle: function (layer) { + if (layer === undefined) { + return this.eachLayer(this.resetStyle, this); + } + // reset any custom styles + layer.options = extend({}, layer.defaultOptions); + this._setLayerStyle(layer, this.options.style); + return this; + }, + + // @method setStyle( style ): this + // Changes styles of GeoJSON vector layers with the given style function. + setStyle: function (style) { + return this.eachLayer(function (layer) { + this._setLayerStyle(layer, style); + }, this); + }, + + _setLayerStyle: function (layer, style) { + if (layer.setStyle) { + if (typeof style === 'function') { + style = style(layer.feature); + } + layer.setStyle(style); + } + } +}); + +// @section +// There are several static functions which can be called without instantiating L.GeoJSON: + +// @function geometryToLayer(featureData: Object, options?: GeoJSON options): Layer +// Creates a `Layer` from a given GeoJSON feature. Can use a custom +// [`pointToLayer`](#geojson-pointtolayer) and/or [`coordsToLatLng`](#geojson-coordstolatlng) +// functions if provided as options. +function geometryToLayer(geojson, options) { + + var geometry = geojson.type === 'Feature' ? geojson.geometry : geojson, + coords = geometry ? geometry.coordinates : null, + layers = [], + pointToLayer = options && options.pointToLayer, + _coordsToLatLng = options && options.coordsToLatLng || coordsToLatLng, + latlng, latlngs, i, len; + + if (!coords && !geometry) { + return null; + } + + switch (geometry.type) { + case 'Point': + latlng = _coordsToLatLng(coords); + return _pointToLayer(pointToLayer, geojson, latlng, options); + + case 'MultiPoint': + for (i = 0, len = coords.length; i < len; i++) { + latlng = _coordsToLatLng(coords[i]); + layers.push(_pointToLayer(pointToLayer, geojson, latlng, options)); + } + return new FeatureGroup(layers); + + case 'LineString': + case 'MultiLineString': + latlngs = coordsToLatLngs(coords, geometry.type === 'LineString' ? 0 : 1, _coordsToLatLng); + return new Polyline(latlngs, options); + + case 'Polygon': + case 'MultiPolygon': + latlngs = coordsToLatLngs(coords, geometry.type === 'Polygon' ? 1 : 2, _coordsToLatLng); + return new Polygon(latlngs, options); + + case 'GeometryCollection': + for (i = 0, len = geometry.geometries.length; i < len; i++) { + var geoLayer = geometryToLayer({ + geometry: geometry.geometries[i], + type: 'Feature', + properties: geojson.properties + }, options); + + if (geoLayer) { + layers.push(geoLayer); + } + } + return new FeatureGroup(layers); + + case 'FeatureCollection': + for (i = 0, len = geometry.features.length; i < len; i++) { + var featureLayer = geometryToLayer(geometry.features[i], options); + + if (featureLayer) { + layers.push(featureLayer); + } + } + return new FeatureGroup(layers); + + default: + throw new Error('Invalid GeoJSON object.'); + } +} + +function _pointToLayer(pointToLayerFn, geojson, latlng, options) { + return pointToLayerFn ? + pointToLayerFn(geojson, latlng) : + new Marker(latlng, options && options.markersInheritOptions && options); +} + +// @function coordsToLatLng(coords: Array): LatLng +// Creates a `LatLng` object from an array of 2 numbers (longitude, latitude) +// or 3 numbers (longitude, latitude, altitude) used in GeoJSON for points. +function coordsToLatLng(coords) { + return new LatLng(coords[1], coords[0], coords[2]); +} + +// @function coordsToLatLngs(coords: Array, levelsDeep?: Number, coordsToLatLng?: Function): Array +// Creates a multidimensional array of `LatLng`s from a GeoJSON coordinates array. +// `levelsDeep` specifies the nesting level (0 is for an array of points, 1 for an array of arrays of points, etc., 0 by default). +// Can use a custom [`coordsToLatLng`](#geojson-coordstolatlng) function. +function coordsToLatLngs(coords, levelsDeep, _coordsToLatLng) { + var latlngs = []; + + for (var i = 0, len = coords.length, latlng; i < len; i++) { + latlng = levelsDeep ? + coordsToLatLngs(coords[i], levelsDeep - 1, _coordsToLatLng) : + (_coordsToLatLng || coordsToLatLng)(coords[i]); + + latlngs.push(latlng); + } + + return latlngs; +} + +// @function latLngToCoords(latlng: LatLng, precision?: Number|false): Array +// Reverse of [`coordsToLatLng`](#geojson-coordstolatlng) +// Coordinates values are rounded with [`formatNum`](#util-formatnum) function. +function latLngToCoords(latlng, precision) { + latlng = toLatLng(latlng); + return latlng.alt !== undefined ? + [formatNum(latlng.lng, precision), formatNum(latlng.lat, precision), formatNum(latlng.alt, precision)] : + [formatNum(latlng.lng, precision), formatNum(latlng.lat, precision)]; +} + +// @function latLngsToCoords(latlngs: Array, levelsDeep?: Number, closed?: Boolean, precision?: Number|false): Array +// Reverse of [`coordsToLatLngs`](#geojson-coordstolatlngs) +// `closed` determines whether the first point should be appended to the end of the array to close the feature, only used when `levelsDeep` is 0. False by default. +// Coordinates values are rounded with [`formatNum`](#util-formatnum) function. +function latLngsToCoords(latlngs, levelsDeep, closed, precision) { + var coords = []; + + for (var i = 0, len = latlngs.length; i < len; i++) { + // Check for flat arrays required to ensure unbalanced arrays are correctly converted in recursion + coords.push(levelsDeep ? + latLngsToCoords(latlngs[i], isFlat(latlngs[i]) ? 0 : levelsDeep - 1, closed, precision) : + latLngToCoords(latlngs[i], precision)); + } + + if (!levelsDeep && closed && coords.length > 0) { + coords.push(coords[0].slice()); + } + + return coords; +} + +function getFeature(layer, newGeometry) { + return layer.feature ? + extend({}, layer.feature, {geometry: newGeometry}) : + asFeature(newGeometry); +} + +// @function asFeature(geojson: Object): Object +// Normalize GeoJSON geometries/features into GeoJSON features. +function asFeature(geojson) { + if (geojson.type === 'Feature' || geojson.type === 'FeatureCollection') { + return geojson; + } + + return { + type: 'Feature', + properties: {}, + geometry: geojson + }; +} + +var PointToGeoJSON = { + toGeoJSON: function (precision) { + return getFeature(this, { + type: 'Point', + coordinates: latLngToCoords(this.getLatLng(), precision) + }); + } +}; + +// @namespace Marker +// @section Other methods +// @method toGeoJSON(precision?: Number|false): Object +// Coordinates values are rounded with [`formatNum`](#util-formatnum) function with given `precision`. +// Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON) representation of the marker (as a GeoJSON `Point` Feature). +Marker.include(PointToGeoJSON); + +// @namespace CircleMarker +// @method toGeoJSON(precision?: Number|false): Object +// Coordinates values are rounded with [`formatNum`](#util-formatnum) function with given `precision`. +// Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON) representation of the circle marker (as a GeoJSON `Point` Feature). +Circle.include(PointToGeoJSON); +CircleMarker.include(PointToGeoJSON); + + +// @namespace Polyline +// @method toGeoJSON(precision?: Number|false): Object +// Coordinates values are rounded with [`formatNum`](#util-formatnum) function with given `precision`. +// Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON) representation of the polyline (as a GeoJSON `LineString` or `MultiLineString` Feature). +Polyline.include({ + toGeoJSON: function (precision) { + var multi = !isFlat(this._latlngs); + + var coords = latLngsToCoords(this._latlngs, multi ? 1 : 0, false, precision); + + return getFeature(this, { + type: (multi ? 'Multi' : '') + 'LineString', + coordinates: coords + }); + } +}); + +// @namespace Polygon +// @method toGeoJSON(precision?: Number|false): Object +// Coordinates values are rounded with [`formatNum`](#util-formatnum) function with given `precision`. +// Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON) representation of the polygon (as a GeoJSON `Polygon` or `MultiPolygon` Feature). +Polygon.include({ + toGeoJSON: function (precision) { + var holes = !isFlat(this._latlngs), + multi = holes && !isFlat(this._latlngs[0]); + + var coords = latLngsToCoords(this._latlngs, multi ? 2 : holes ? 1 : 0, true, precision); + + if (!holes) { + coords = [coords]; + } + + return getFeature(this, { + type: (multi ? 'Multi' : '') + 'Polygon', + coordinates: coords + }); + } +}); + + +// @namespace LayerGroup +LayerGroup.include({ + toMultiPoint: function (precision) { + var coords = []; + + this.eachLayer(function (layer) { + coords.push(layer.toGeoJSON(precision).geometry.coordinates); + }); + + return getFeature(this, { + type: 'MultiPoint', + coordinates: coords + }); + }, + + // @method toGeoJSON(precision?: Number|false): Object + // Coordinates values are rounded with [`formatNum`](#util-formatnum) function with given `precision`. + // Returns a [`GeoJSON`](https://en.wikipedia.org/wiki/GeoJSON) representation of the layer group (as a GeoJSON `FeatureCollection`, `GeometryCollection`, or `MultiPoint`). + toGeoJSON: function (precision) { + + var type = this.feature && this.feature.geometry && this.feature.geometry.type; + + if (type === 'MultiPoint') { + return this.toMultiPoint(precision); + } + + var isGeometryCollection = type === 'GeometryCollection', + jsons = []; + + this.eachLayer(function (layer) { + if (layer.toGeoJSON) { + var json = layer.toGeoJSON(precision); + if (isGeometryCollection) { + jsons.push(json.geometry); + } else { + var feature = asFeature(json); + // Squash nested feature collections + if (feature.type === 'FeatureCollection') { + jsons.push.apply(jsons, feature.features); + } else { + jsons.push(feature); + } + } + } + }); + + if (isGeometryCollection) { + return getFeature(this, { + geometries: jsons, + type: 'GeometryCollection' + }); + } + + return { + type: 'FeatureCollection', + features: jsons + }; + } +}); + +// @namespace GeoJSON +// @factory L.geoJSON(geojson?: Object, options?: GeoJSON options) +// Creates a GeoJSON layer. Optionally accepts an object in +// [GeoJSON format](https://tools.ietf.org/html/rfc7946) to display on the map +// (you can alternatively add it later with `addData` method) and an `options` object. +function geoJSON(geojson, options) { + return new GeoJSON(geojson, options); +} + +// Backward compatibility. +var geoJson = geoJSON; + +/* + * @class ImageOverlay + * @aka L.ImageOverlay + * @inherits Interactive layer + * + * Used to load and display a single image over specific bounds of the map. Extends `Layer`. + * + * @example + * + * ```js + * var imageUrl = 'https://maps.lib.utexas.edu/maps/historical/newark_nj_1922.jpg', + * imageBounds = [[40.712216, -74.22655], [40.773941, -74.12544]]; + * L.imageOverlay(imageUrl, imageBounds).addTo(map); + * ``` + */ + +var ImageOverlay = Layer.extend({ + + // @section + // @aka ImageOverlay options + options: { + // @option opacity: Number = 1.0 + // The opacity of the image overlay. + opacity: 1, + + // @option alt: String = '' + // Text for the `alt` attribute of the image (useful for accessibility). + alt: '', + + // @option interactive: Boolean = false + // If `true`, the image overlay will emit [mouse events](#interactive-layer) when clicked or hovered. + interactive: false, + + // @option crossOrigin: Boolean|String = false + // Whether the crossOrigin attribute will be added to the image. + // If a String is provided, the image will have its crossOrigin attribute set to the String provided. This is needed if you want to access image pixel data. + // Refer to [CORS Settings](https://developer.mozilla.org/en-US/docs/Web/HTML/CORS_settings_attributes) for valid String values. + crossOrigin: false, + + // @option errorOverlayUrl: String = '' + // URL to the overlay image to show in place of the overlay that failed to load. + errorOverlayUrl: '', + + // @option zIndex: Number = 1 + // The explicit [zIndex](https://developer.mozilla.org/docs/Web/CSS/CSS_Positioning/Understanding_z_index) of the overlay layer. + zIndex: 1, + + // @option className: String = '' + // A custom class name to assign to the image. Empty by default. + className: '' + }, + + initialize: function (url, bounds, options) { // (String, LatLngBounds, Object) + this._url = url; + this._bounds = toLatLngBounds(bounds); + + setOptions(this, options); + }, + + onAdd: function () { + if (!this._image) { + this._initImage(); + + if (this.options.opacity < 1) { + this._updateOpacity(); + } + } + + if (this.options.interactive) { + addClass(this._image, 'leaflet-interactive'); + this.addInteractiveTarget(this._image); + } + + this.getPane().appendChild(this._image); + this._reset(); + }, + + onRemove: function () { + remove(this._image); + if (this.options.interactive) { + this.removeInteractiveTarget(this._image); + } + }, + + // @method setOpacity(opacity: Number): this + // Sets the opacity of the overlay. + setOpacity: function (opacity) { + this.options.opacity = opacity; + + if (this._image) { + this._updateOpacity(); + } + return this; + }, + + setStyle: function (styleOpts) { + if (styleOpts.opacity) { + this.setOpacity(styleOpts.opacity); + } + return this; + }, + + // @method bringToFront(): this + // Brings the layer to the top of all overlays. + bringToFront: function () { + if (this._map) { + toFront(this._image); + } + return this; + }, + + // @method bringToBack(): this + // Brings the layer to the bottom of all overlays. + bringToBack: function () { + if (this._map) { + toBack(this._image); + } + return this; + }, + + // @method setUrl(url: String): this + // Changes the URL of the image. + setUrl: function (url) { + this._url = url; + + if (this._image) { + this._image.src = url; + } + return this; + }, + + // @method setBounds(bounds: LatLngBounds): this + // Update the bounds that this ImageOverlay covers + setBounds: function (bounds) { + this._bounds = toLatLngBounds(bounds); + + if (this._map) { + this._reset(); + } + return this; + }, + + getEvents: function () { + var events = { + zoom: this._reset, + viewreset: this._reset + }; + + if (this._zoomAnimated) { + events.zoomanim = this._animateZoom; + } + + return events; + }, + + // @method setZIndex(value: Number): this + // Changes the [zIndex](#imageoverlay-zindex) of the image overlay. + setZIndex: function (value) { + this.options.zIndex = value; + this._updateZIndex(); + return this; + }, + + // @method getBounds(): LatLngBounds + // Get the bounds that this ImageOverlay covers + getBounds: function () { + return this._bounds; + }, + + // @method getElement(): HTMLElement + // Returns the instance of [`HTMLImageElement`](https://developer.mozilla.org/docs/Web/API/HTMLImageElement) + // used by this overlay. + getElement: function () { + return this._image; + }, + + _initImage: function () { + var wasElementSupplied = this._url.tagName === 'IMG'; + var img = this._image = wasElementSupplied ? this._url : create$1('img'); + + addClass(img, 'leaflet-image-layer'); + if (this._zoomAnimated) { addClass(img, 'leaflet-zoom-animated'); } + if (this.options.className) { addClass(img, this.options.className); } + + img.onselectstart = falseFn; + img.onmousemove = falseFn; + + // @event load: Event + // Fired when the ImageOverlay layer has loaded its image + img.onload = bind(this.fire, this, 'load'); + img.onerror = bind(this._overlayOnError, this, 'error'); + + if (this.options.crossOrigin || this.options.crossOrigin === '') { + img.crossOrigin = this.options.crossOrigin === true ? '' : this.options.crossOrigin; + } + + if (this.options.zIndex) { + this._updateZIndex(); + } + + if (wasElementSupplied) { + this._url = img.src; + return; + } + + img.src = this._url; + img.alt = this.options.alt; + }, + + _animateZoom: function (e) { + var scale = this._map.getZoomScale(e.zoom), + offset = this._map._latLngBoundsToNewLayerBounds(this._bounds, e.zoom, e.center).min; + + setTransform(this._image, offset, scale); + }, + + _reset: function () { + var image = this._image, + bounds = new Bounds( + this._map.latLngToLayerPoint(this._bounds.getNorthWest()), + this._map.latLngToLayerPoint(this._bounds.getSouthEast())), + size = bounds.getSize(); + + setPosition(image, bounds.min); + + image.style.width = size.x + 'px'; + image.style.height = size.y + 'px'; + }, + + _updateOpacity: function () { + setOpacity(this._image, this.options.opacity); + }, + + _updateZIndex: function () { + if (this._image && this.options.zIndex !== undefined && this.options.zIndex !== null) { + this._image.style.zIndex = this.options.zIndex; + } + }, + + _overlayOnError: function () { + // @event error: Event + // Fired when the ImageOverlay layer fails to load its image + this.fire('error'); + + var errorUrl = this.options.errorOverlayUrl; + if (errorUrl && this._url !== errorUrl) { + this._url = errorUrl; + this._image.src = errorUrl; + } + }, + + // @method getCenter(): LatLng + // Returns the center of the ImageOverlay. + getCenter: function () { + return this._bounds.getCenter(); + } +}); + +// @factory L.imageOverlay(imageUrl: String, bounds: LatLngBounds, options?: ImageOverlay options) +// Instantiates an image overlay object given the URL of the image and the +// geographical bounds it is tied to. +var imageOverlay = function (url, bounds, options) { + return new ImageOverlay(url, bounds, options); +}; + +/* + * @class VideoOverlay + * @aka L.VideoOverlay + * @inherits ImageOverlay + * + * Used to load and display a video player over specific bounds of the map. Extends `ImageOverlay`. + * + * A video overlay uses the [`