From 609fd5a1daeb1307757b7cc78eb03e8e91d6c82a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9A=D0=BE=D1=88=D0=BA=D0=B8=D0=BD=20=D0=A1=D0=B5=D1=80?= =?UTF-8?q?=D0=B3=D0=B5=D0=B9?= Date: Wed, 26 Nov 2025 10:33:07 +0300 Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8=D0=BB=20?= =?UTF-8?q?=D0=BE=D0=B1=D1=8A=D0=B5=D0=B4=D0=B8=D0=BD=D0=B5=D0=BD=D0=B8?= =?UTF-8?q?=D0=B5=20=D0=B8=D1=81=D1=82=D0=BE=D1=87=D0=BD=D0=B8=D0=BA=D0=BE?= =?UTF-8?q?=D0=B2.=20=D0=92=D0=B5=D1=80=D0=BD=D1=83=D0=BB=20=D0=BD=D0=BE?= =?UTF-8?q?=D1=80=D0=BC=20=D0=BA=D0=B0=D1=80=D1=82=D1=83.=20=D0=A3=D0=B4?= =?UTF-8?q?=D0=B0=D0=BB=D0=B8=D0=BB=20=D0=BD=D0=B5=D0=BD=D1=83=D0=B6=D0=BD?= =?UTF-8?q?=D1=8B=D0=B5=20=D0=BB=D0=B8=D0=B1=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dbapp/mainapp/clusters.py | 34 - .../templates/mainapp/source_list.html | 483 ++++++++++- .../mainapp/templates/mainapp/source_map.html | 806 ++++-------------- dbapp/mainapp/urls.py | 6 +- dbapp/mainapp/views/__init__.py | 7 +- dbapp/mainapp/views/map.py | 30 +- dbapp/mainapp/views/source.py | 117 +++ .../mapsapp/templates/mapsapp/map2d_base.html | 2 +- dbapp/pyproject.toml | 5 - dbapp/uv.lock | 395 --------- 10 files changed, 785 insertions(+), 1100 deletions(-) delete mode 100644 dbapp/mainapp/clusters.py diff --git a/dbapp/mainapp/clusters.py b/dbapp/mainapp/clusters.py deleted file mode 100644 index b2a2f48..0000000 --- a/dbapp/mainapp/clusters.py +++ /dev/null @@ -1,34 +0,0 @@ -# Third-party imports -import matplotlib.pyplot as plt -import numpy as np -from sklearn.cluster import DBSCAN, HDBSCAN, KMeans - -# Local imports -from .models import ObjItem - -def get_clusters(coords: list[tuple[float, float]]): - coords = np.radians(coords) - lat, lon = coords[:, 0], coords[:, 1] - db = DBSCAN(eps=0.06, min_samples=5, algorithm='ball_tree', metric='haversine') - # db = HDBSCAN() - cluster_labels = db.fit_predict(coords) - plt.figure(figsize=(10, 8)) - unique_labels = set(cluster_labels) - colors = plt.cm.tab10(np.linspace(0, 1, len(unique_labels))) - - for label, color in zip(unique_labels, colors): - if label == -1: - color = 'k' - label_name = 'Шум' - else: - label_name = f'Кластер {label}' - - mask = cluster_labels == label - plt.scatter(lon[mask], lat[mask], c=[color], label=label_name, s=30) - - plt.xlabel('Долгота') - plt.ylabel('Широта') - plt.title('Кластеризация геоданных с DBSCAN (метрика Хаверсина)') - plt.legend() - plt.grid(True) - plt.show() diff --git a/dbapp/mainapp/templates/mainapp/source_list.html b/dbapp/mainapp/templates/mainapp/source_list.html index 7a0ba37..24b4920 100644 --- a/dbapp/mainapp/templates/mainapp/source_list.html +++ b/dbapp/mainapp/templates/mainapp/source_list.html @@ -97,6 +97,22 @@ + +
+ +
+ + +
+ +
+
- -
- - {% if polygon_coords %} - - {% endif %} -
-
@@ -182,6 +181,30 @@ {% endif %} + +
+ +
+ + {% if polygon_coords %} + + {% endif %} +
+
+ +
+
@@ -1165,8 +1188,95 @@ function toggleColumnWithoutSave(checkbox) { } } +// Initialize selected sources array from localStorage +function loadSelectedSourcesFromStorage() { + try { + const storedSources = localStorage.getItem('selectedSources'); + if (storedSources) { + window.selectedSources = JSON.parse(storedSources); + } else { + window.selectedSources = []; + } + } catch (e) { + console.error('Error loading selected sources from storage:', e); + window.selectedSources = []; + } +} + +// Function to save selected sources to localStorage +window.saveSelectedSourcesToStorage = function () { + try { + localStorage.setItem('selectedSources', JSON.stringify(window.selectedSources)); + } catch (e) { + console.error('Error saving selected sources to storage:', e); + } +} + +// Function to update the selected sources counter +window.updateSelectedSourcesCounter = function () { + const counterElement = document.getElementById('selectedSourcesCounter'); + if (window.selectedSources && window.selectedSources.length > 0) { + counterElement.textContent = window.selectedSources.length; + counterElement.style.display = 'inline'; + } else { + counterElement.style.display = 'none'; + } +} + +// Function to add selected sources to the list +window.addSelectedToList = function () { + const checkedCheckboxes = document.querySelectorAll('.item-checkbox:checked'); + + if (checkedCheckboxes.length === 0) { + alert('Пожалуйста, выберите хотя бы один источник для добавления в список'); + return; + } + + // Get the data for each selected row and add to the selectedSources array + checkedCheckboxes.forEach(checkbox => { + const row = checkbox.closest('tr'); + const sourceId = checkbox.value; + + const sourceExists = window.selectedSources.some(source => source.id === sourceId); + if (!sourceExists) { + const rowData = { + id: sourceId, + name: row.cells[2].textContent.trim(), + satellite: row.cells[3].textContent.trim(), + info: row.cells[4].textContent.trim(), + ownership: row.cells[5].textContent.trim(), + coords_average: row.cells[6].textContent.trim(), + objitem_count: row.cells[7].textContent.trim() + }; + + window.selectedSources.push(rowData); + } + }); + + // Update the counter + updateSelectedSourcesCounter(); + + // Save selected sources to localStorage + saveSelectedSourcesToStorage(); + + // Clear selections in the main table + const itemCheckboxes = document.querySelectorAll('.item-checkbox'); + itemCheckboxes.forEach(checkbox => { + checkbox.checked = false; + updateRowHighlight(checkbox); + }); + const selectAllCheckbox = document.getElementById('select-all'); + if (selectAllCheckbox) { + selectAllCheckbox.checked = false; + } +} + // Initialize on page load document.addEventListener('DOMContentLoaded', function() { + // Load selected sources from localStorage + loadSelectedSourcesFromStorage(); + updateSelectedSourcesCounter(); + // Setup select-all checkbox const selectAllCheckbox = document.getElementById('select-all'); const itemCheckboxes = document.querySelectorAll('.item-checkbox'); @@ -1227,8 +1337,221 @@ document.addEventListener('DOMContentLoaded', function() { // Initialize column visibility setTimeout(initColumnVisibility, 100); + + // Update the selected sources table when the offcanvas is shown + const selectedSourcesOffcanvas = document.getElementById('selectedSourcesOffcanvas'); + if (selectedSourcesOffcanvas) { + selectedSourcesOffcanvas.addEventListener('show.bs.offcanvas', function () { + populateSelectedSourcesTable(); + }); + } }); +// Function to populate the selected sources table in the offcanvas +function populateSelectedSourcesTable() { + const tableBody = document.getElementById('selected-sources-table-body'); + const noDataDiv = document.getElementById('selectedSourcesNoData'); + const table = tableBody.closest('.table-responsive'); + const offcanvasCounter = document.getElementById('selectedSourcesOffcanvasCounter'); + + if (!tableBody) return; + + // Clear existing rows + tableBody.innerHTML = ''; + + if (!window.selectedSources || window.selectedSources.length === 0) { + // Show no data message + if (table) table.style.display = 'none'; + if (noDataDiv) noDataDiv.style.display = 'block'; + if (offcanvasCounter) offcanvasCounter.textContent = '0'; + return; + } + + // Hide no data message and show table + if (table) table.style.display = 'block'; + if (noDataDiv) noDataDiv.style.display = 'none'; + if (offcanvasCounter) offcanvasCounter.textContent = window.selectedSources.length; + + // Add rows for each selected source + window.selectedSources.forEach((source, index) => { + const row = document.createElement('tr'); + row.innerHTML = ` + + + + ${source.id} + ${source.name} + ${source.satellite} + ${source.info} + ${source.ownership} + ${source.coords_average} + ${source.objitem_count} + `; + tableBody.appendChild(row); + }); +} + +// Function to remove selected sources from the list +function removeSelectedSources() { + const checkboxes = document.querySelectorAll('#selected-sources-table-body .selected-source-checkbox:checked'); + if (checkboxes.length === 0) { + alert('Пожалуйста, выберите хотя бы один источник для удаления из списка'); + return; + } + + // Get IDs of sources to remove + const idsToRemove = Array.from(checkboxes).map(checkbox => checkbox.value); + + // Remove sources from the selectedSources array + window.selectedSources = window.selectedSources.filter(source => !idsToRemove.includes(source.id)); + + // Save selected sources to localStorage + saveSelectedSourcesToStorage(); + + // Update the counter and table + updateSelectedSourcesCounter(); + populateSelectedSourcesTable(); +} + +// Function to show selected sources on map +function showSelectedSourcesOnMap() { + if (!window.selectedSources || window.selectedSources.length === 0) { + alert('Список источников пуст'); + return; + } + + const selectedIds = window.selectedSources.map(source => source.id); + const urlParams = new URLSearchParams(window.location.search); + const polygonParam = urlParams.get('polygon'); + + let url = '{% url "mainapp:show_sources_map" %}' + '?ids=' + selectedIds.join(','); + if (polygonParam) { + url += '&polygon=' + encodeURIComponent(polygonParam); + } + + window.open(url, '_blank'); +} + +// Function to merge selected sources +function mergeSelectedSources() { + if (!window.selectedSources || window.selectedSources.length < 2) { + alert('Для объединения необходимо выбрать минимум 2 источника'); + return; + } + + // Show merge modal + const modal = new bootstrap.Modal(document.getElementById('mergeSourcesModal')); + + // Populate target source info + const targetSource = window.selectedSources[0]; + document.getElementById('targetSourceInfo').innerHTML = ` + ID: ${targetSource.id}
+ Имя: ${targetSource.name}
+ Спутник: ${targetSource.satellite}
+ Количество точек: ${targetSource.objitem_count} + `; + + // Populate sources to merge list + const sourcesToMergeList = document.getElementById('sourcesToMergeList'); + sourcesToMergeList.innerHTML = ''; + for (let i = 1; i < window.selectedSources.length; i++) { + const source = window.selectedSources[i]; + const li = document.createElement('li'); + li.className = 'list-group-item'; + li.innerHTML = ` + ID ${source.id}: ${source.name} + ${source.objitem_count} точек + `; + sourcesToMergeList.appendChild(li); + } + + modal.show(); +} + +// Function to confirm merge +function confirmMerge() { + const infoId = document.getElementById('mergeInfoSelect').value; + const ownershipId = document.getElementById('mergeOwnershipSelect').value; + const note = document.getElementById('mergeNoteTextarea').value; + + if (!infoId) { + alert('Пожалуйста, выберите тип объекта'); + return; + } + + if (!ownershipId) { + alert('Пожалуйста, выберите принадлежность объекта'); + return; + } + + // Prepare data + const sourceIds = window.selectedSources.map(source => source.id); + + // Get CSRF token + function getCookie(name) { + let cookieValue = null; + if (document.cookie && document.cookie !== '') { + const cookies = document.cookie.split(';'); + for (let i = 0; i < cookies.length; i++) { + const cookie = cookies[i].trim(); + if (cookie.substring(0, name.length + 1) === (name + '=')) { + cookieValue = decodeURIComponent(cookie.substring(name.length + 1)); + break; + } + } + } + return cookieValue; + } + const csrftoken = getCookie('csrftoken'); + + // Send AJAX request + fetch('{% url "mainapp:merge_sources" %}', { + method: 'POST', + headers: { + 'Content-Type': 'application/json', + 'X-CSRFToken': csrftoken + }, + body: JSON.stringify({ + source_ids: sourceIds, + info_id: infoId, + ownership_id: ownershipId, + note: note + }) + }) + .then(response => response.json()) + .then(data => { + if (data.success) { + alert(data.message); + + // Clear selected sources + window.selectedSources = []; + saveSelectedSourcesToStorage(); + updateSelectedSourcesCounter(); + + // Close modal + const modal = bootstrap.Modal.getInstance(document.getElementById('mergeSourcesModal')); + modal.hide(); + + // Reload page + location.reload(); + } else { + alert('Ошибка: ' + (data.error || 'Неизвестная ошибка')); + } + }) + .catch(error => { + console.error('Error:', error); + alert('Произошла ошибка при объединении источников'); + }); +} + +// Function to toggle all checkboxes in the selected sources table +function toggleAllSelectedSources(checkbox) { + const checkboxes = document.querySelectorAll('#selected-sources-table-body .selected-source-checkbox'); + checkboxes.forEach(cb => { + cb.checked = checkbox.checked; + }); +} + // Show source details in modal function showSourceDetails(sourceId) { // Update modal title @@ -1724,6 +2047,132 @@ function showTransponderModal(transponderId) { {% include 'mainapp/components/_satellite_modal.html' %} + +
+
+
+ Выбранные источники + 0 +
+ +
+
+
+
+ + {% if user.customuser.role == 'admin' or user.customuser.role == 'moderator' %} + + {% endif %} + +
+
+ +
+ + + + + + + + + + + + + + + + +
+ + IDИмяСпутникТип объектаПринадлежностьКоординаты ГЛКол-во точек
+
+ + +
+
+ + + +