feature/modernize-and-enhance #4

Merged
steve-admin merged 8 commits from feature/modernize-and-enhance into main 2026-03-17 00:13:42 +00:00
4 changed files with 224 additions and 48 deletions
Showing only changes of commit f0767c798c - Show all commits
+17 -7
View File
@@ -53,8 +53,8 @@ app.get('/api/line-of-sight', async (req, res) => {
try { try {
// Generate path points for visualization and spatial query // Generate path points for visualization and spatial query
const pathPoints = []; const pathPoints = [];
const totalDistance = 10000; const totalDistance = 20000;
const steps = 20; const steps = 40;
for (let i = 0; i <= steps; i++) { for (let i = 0; i <= steps; i++) {
const dist = (totalDistance * i) / steps; const dist = (totalDistance * i) / steps;
@@ -65,7 +65,8 @@ app.get('/api/line-of-sight', async (req, res) => {
const query = ` const query = `
WITH path AS ( WITH path AS (
SELECT ST_GeogFromText($1) as route SELECT ST_GeogFromText($1) as route,
ST_MakePoint($3, $4)::geography as start_node
) )
SELECT SELECT
id, id,
@@ -74,15 +75,21 @@ app.get('/api/line-of-sight', async (req, res) => {
country, country,
ST_Y(geom::geometry) as lat, ST_Y(geom::geometry) as lat,
ST_X(geom::geometry) as lon, ST_X(geom::geometry) as lon,
ST_Distance(geom, (SELECT route FROM path)) / 1000 as distance_to_line_km, ST_Distance(geom, (SELECT route FROM path)) / 1000 as distance_off_line_km,
ST_Distance(geom, (SELECT start_node FROM path)) / 1000 as distance_from_start_km,
ST_LineLocatePoint((SELECT route FROM path)::geometry, geom::geometry) as pos_on_line ST_LineLocatePoint((SELECT route FROM path)::geometry, geom::geometry) as pos_on_line
FROM cities FROM cities
WHERE ST_DWithin(geom, (SELECT route FROM path), $2 * 1000) WHERE ST_DWithin(geom, (SELECT route FROM path), $2 * 1000)
ORDER BY pos_on_line ASC ORDER BY pos_on_line ASC
LIMIT 20; LIMIT 100;
`; `;
const result = await pool.query(query, [lineWKT, toleranceKm]); const result = await pool.query(query, [lineWKT, toleranceKm, startLon, startLat]);
console.log(`Found ${result.rows.length} conurbations near the line.`);
if (result.rows.length > 0) {
console.log('Sample result row:', result.rows[0]);
}
res.json({ res.json({
success: true, success: true,
@@ -92,7 +99,10 @@ app.get('/api/line-of-sight', async (req, res) => {
tolerance_km: toleranceKm, tolerance_km: toleranceKm,
conurbations: result.rows.map(row => ({ conurbations: result.rows.map(row => ({
...row, ...row,
distance_km: Math.round(row.distance_to_line_km) name: row.name || 'Unknown',
country: row.country || 'Unknown',
distance_km: Math.round(row.distance_from_start_km),
off_line_km: Math.round(row.distance_off_line_km)
})), })),
line_coordinates: pathPoints line_coordinates: pathPoints
} }
+19 -26
View File
@@ -6,7 +6,7 @@ const DATA_URL = 'https://raw.githubusercontent.com/nvkelso/natural-earth-vector
async function importCities() { async function importCities() {
const client = new Client({ const client = new Client({
connectionString: process.env.DATABASE_URL || 'postgresql://line_of_sight:line_of_sight_pass@localhost:5432/line_of_sight' connectionString: process.env.DATABASE_URL || 'postgresql://line_of_sight:line_of_sight_pass@postgres:5432/line_of_sight'
}); });
try { try {
@@ -19,6 +19,11 @@ async function importCities() {
console.log(`Downloaded ${data.features.length} features. Preparing database...`); console.log(`Downloaded ${data.features.length} features. Preparing database...`);
// Sample properties to verify structure
if (data.features.length > 0) {
console.log('Sample properties:', data.features[0].properties);
}
// Ensure table exists and is clean // Ensure table exists and is clean
await client.query('TRUNCATE TABLE cities'); await client.query('TRUNCATE TABLE cities');
@@ -28,40 +33,28 @@ async function importCities() {
for (let i = 0; i < data.features.length; i += batchSize) { for (let i = 0; i < data.features.length; i += batchSize) {
const batch = data.features.slice(i, i + batchSize); const batch = data.features.slice(i, i + batchSize);
const values = [];
const queryParts = []; const queryParts = [];
const values = [];
batch.forEach((feature, index) => {
const props = feature.properties;
const coords = feature.geometry.coordinates; // [lon, lat]
const name = props.NAME || 'Unknown';
const population = props.POP_MAX || 0;
const country = props.ADM0NAME || 'Unknown';
const lon = coords[0];
const lat = coords[1];
const baseIndex = index * 4;
queryParts.push(`($${baseIndex + 1}, $${baseIndex + 2}, $${baseIndex + 3}, ST_SetSRID(ST_MakePoint($${baseIndex + 4}, $${baseIndex + 1}), 4326)::geography)`);
values.push(lat, name, population, country, lon); // Note: ST_MakePoint takes lon, lat
});
// Simple positional mapping for query (lat, name, pop, country, lon)
// Actually let's refine the query to be clearer
const refinedQueryParts = [];
const refinedValues = [];
batch.forEach((feature, index) => { batch.forEach((feature, index) => {
const p = feature.properties; const p = feature.properties;
const c = feature.geometry.coordinates; const c = feature.geometry.coordinates;
// Map properties - Natural Earth simple GeoJSON usually has name, pop_max, adm0name
const name = p.name || p.NAME || 'Unknown';
const pop = p.pop_max || p.POP_MAX || 0;
const country = p.adm0name || p.ADM0NAME || 'Unknown';
const lon = c[0];
const lat = c[1];
const base = index * 5; const base = index * 5;
refinedQueryParts.push(`($${base + 1}, $${base + 2}, $${base + 3}, ST_SetSRID(ST_MakePoint($${base + 4}, $${base + 5}), 4326)::geography)`); queryParts.push(`($${base + 1}, $${base + 2}, $${base + 3}, ST_SetSRID(ST_MakePoint($${base + 4}, $${base + 5}), 4326)::geography)`);
refinedValues.push(p.NAME || 'Unknown', p.POP_MAX || 0, p.ADM0NAME || 'Unknown', c[0], c[1]); values.push(name, pop, country, lon, lat);
}); });
await client.query( await client.query(
`INSERT INTO cities (name, population, country, geom) VALUES ${refinedQueryParts.join(',')}`, `INSERT INTO cities (name, population, country, geom) VALUES ${queryParts.join(',')}`,
refinedValues values
); );
count += batch.length; count += batch.length;
+53 -9
View File
@@ -15,6 +15,7 @@ const APP = () => {
const [loading, setLoading] = useState(false); const [loading, setLoading] = useState(false);
const [mapStyle, setMapStyle] = useState('light'); // 'light' or 'dark' const [mapStyle, setMapStyle] = useState('light'); // 'light' or 'dark'
const [tolerance, setTolerance] = useState(50); const [tolerance, setTolerance] = useState(50);
const [selectedCity, setSelectedCity] = useState(null);
useEffect(() => { useEffect(() => {
// Initialize MapLibre map // Initialize MapLibre map
@@ -158,6 +159,7 @@ const APP = () => {
const handleShowLineOfSight = async () => { const handleShowLineOfSight = async () => {
setLoading(true); setLoading(true);
setSelectedCity(null);
try { try {
const response = await apiService.getLineOfSight( const response = await apiService.getLineOfSight(
selectedPoint.lat, selectedPoint.lat,
@@ -217,15 +219,16 @@ const APP = () => {
// Add city markers // Add city markers
data.conurbations.forEach((city, index) => { data.conurbations.forEach((city, index) => {
const markerId = `city-${index}`; const displayIndex = index + 1;
// Create marker element // Create marker element
const el = document.createElement('div'); const el = document.createElement('div');
el.className = 'city-marker'; el.className = 'city-marker';
el.innerHTML = ` el.innerHTML = `
<div class="marker-number">${displayIndex}</div>
<div class="marker-dot"></div> <div class="marker-dot"></div>
<div class="marker-label">${city.name}</div> <div class="marker-label">${city.name}</div>
<div class="marker-pop">${(city.population / 1000000).toFixed(1)}M</div> <div class="marker-pop">${(city.population / 1000).toFixed(0)}k</div>
`; `;
// Add marker to map // Add marker to map
@@ -249,7 +252,43 @@ const APP = () => {
return ( return (
<div className="app-container"> <div className="app-container">
<div className="map-container" ref={mapContainerRef}></div> <div className="map-container" ref={mapContainerRef}>
{selectedCity && (
<div className="info-panel-modal">
<div className="info-panel-content">
<button className="close-btn" onClick={() => setSelectedCity(null)}>&times;</button>
<h2>{selectedCity.name}</h2>
<div className="info-grid">
<div className="info-item">
<label>Country:</label>
<span>{selectedCity.country}</span>
</div>
<div className="info-item">
<label>Population:</label>
<span>{selectedCity.population.toLocaleString()}</span>
</div>
<div className="info-item">
<label>Coordinates:</label>
<span>{selectedCity.lat.toFixed(4)}, {selectedCity.lon.toFixed(4)}</span>
</div>
<div className="info-item">
<label>Distance from Start:</label>
<span>{selectedCity.distance_km} km</span>
</div>
<div className="info-item">
<label>Deviation from Line:</label>
<span>{selectedCity.off_line_km} km</span>
</div>
</div>
<button className="action-btn-small" onClick={() => {
mapRef.current.flyTo({ center: [selectedCity.lon, selectedCity.lat], zoom: 8 });
}}>
📍 Go to City
</button>
</div>
</div>
)}
</div>
<div className="controls"> <div className="controls">
<div className="control-group"> <div className="control-group">
@@ -302,28 +341,33 @@ const APP = () => {
{lineOfSightData && ( {lineOfSightData && (
<div className="results-panel"> <div className="results-panel">
<h3>Conurbations Found ({lineOfSightData.conurbations.length})</h3> <h3>Conurbations Found ({lineOfSightData.conurbations.length})</h3>
<p className="hint">Click a city for details</p>
<table> <table>
<thead> <thead>
<tr> <tr>
<th>#</th> <th>#</th>
<th>City</th> <th>City</th>
<th>Population</th> <th>Population</th>
<th>Distance</th> <th>Dist.</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
{lineOfSightData.conurbations.slice(0, 10).map((city, index) => ( {lineOfSightData.conurbations.slice(0, 50).map((city, index) => (
<tr key={city.id}> <tr
key={city.id}
onClick={() => setSelectedCity(city)}
className={selectedCity?.id === city.id ? 'selected-row' : ''}
>
<td>{index + 1}</td> <td>{index + 1}</td>
<td>{city.name}</td> <td>{city.name}</td>
<td>{(city.population / 1000000).toFixed(1)}M</td> <td>{(city.population / 1000).toFixed(0)}k</td>
<td>{city.distance_km}km</td> <td>{city.distance_km}km</td>
</tr> </tr>
))} ))}
</tbody> </tbody>
</table> </table>
{lineOfSightData.conurbations.length > 10 && ( {lineOfSightData.conurbations.length > 50 && (
<p className="more-info">... and {lineOfSightData.conurbations.length - 10} more cities</p> <p className="more-info">... and {lineOfSightData.conurbations.length - 50} more</p>
)} )}
</div> </div>
)} )}
+134 -5
View File
@@ -3,6 +3,7 @@
height: 100vh; height: 100vh;
width: 100vw; width: 100vw;
overflow: hidden; overflow: hidden;
position: relative;
} }
.map-container { .map-container {
@@ -19,6 +20,7 @@
box-shadow: -2px 0 10px rgba(0,0,0,0.1); box-shadow: -2px 0 10px rgba(0,0,0,0.1);
overflow-y: auto; overflow-y: auto;
z-index: 2; z-index: 2;
position: relative;
} }
.control-group { .control-group {
@@ -62,6 +64,7 @@
.setting-row span { .setting-row span {
font-weight: bold; font-weight: bold;
color: #2c3e50; color: #2c3e50;
min-width: 40px;
} }
.setting-row button { .setting-row button {
@@ -112,7 +115,14 @@
margin-top: 0; margin-top: 0;
color: #2c3e50; color: #2c3e50;
font-size: 16px; font-size: 16px;
margin-bottom: 15px; margin-bottom: 5px;
}
.results-panel .hint {
font-size: 11px;
color: #7f8c8d;
margin-bottom: 10px;
font-style: italic;
} }
.results-panel table { .results-panel table {
@@ -124,21 +134,114 @@
.results-panel th { .results-panel th {
background: #34495e; background: #34495e;
color: white; color: white;
padding: 10px; padding: 8px 4px;
text-align: left; text-align: left;
} }
.results-panel td { .results-panel td {
padding: 8px; padding: 8px 4px;
border-bottom: 1px solid #ddd; border-bottom: 1px solid #ddd;
cursor: pointer;
} }
.results-panel tr:nth-child(even) { .results-panel tr:nth-child(even) {
background: #f8f9fa; background: #fdfdfd;
} }
.results-panel tr:hover { .results-panel tr:hover {
background: #e9ecef; background: #ecf0f1;
}
.results-panel tr.selected-row {
background: #d5e8d4 !important;
font-weight: bold;
}
.info-panel-modal {
position: absolute;
top: 20px;
left: 20px;
width: 280px;
background: white;
border-radius: 8px;
box-shadow: 0 4px 15px rgba(0,0,0,0.3);
z-index: 1000;
animation: slideIn 0.3s ease-out;
}
@keyframes slideIn {
from { opacity: 0; transform: translateX(-20px); }
to { opacity: 1; transform: translateX(0); }
}
.info-panel-content {
padding: 20px;
position: relative;
}
.info-panel-content h2 {
margin-top: 0;
margin-bottom: 15px;
font-size: 18px;
color: #2c3e50;
border-bottom: 2px solid #4CAF50;
padding-bottom: 8px;
}
.close-btn {
position: absolute;
top: 10px;
right: 10px;
background: none;
border: none;
font-size: 24px;
cursor: pointer;
color: #95a5a6;
}
.close-btn:hover {
color: #34495e;
}
.info-grid {
display: flex;
flex-direction: column;
gap: 12px;
margin-bottom: 20px;
}
.info-item {
display: flex;
flex-direction: column;
}
.info-item label {
font-size: 11px;
color: #7f8c8d;
text-transform: uppercase;
letter-spacing: 0.5px;
}
.info-item span {
font-size: 14px;
color: #2c3e50;
font-weight: 500;
}
.action-btn-small {
width: 100%;
padding: 8px;
background: #3498db;
color: white;
border: none;
border-radius: 4px;
font-size: 14px;
cursor: pointer;
transition: background 0.2s;
}
.action-btn-small:hover {
background: #2980b9;
} }
.more-info { .more-info {
@@ -177,6 +280,23 @@
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
font-family: sans-serif; font-family: sans-serif;
z-index: 100;
}
.marker-number {
background: #2c3e50;
color: white;
width: 18px;
height: 18px;
border-radius: 50%;
display: flex;
align-items: center;
justify-content: center;
font-size: 10px;
font-weight: bold;
margin-bottom: -4px;
border: 1px solid white;
z-index: 2;
} }
.marker-dot { .marker-dot {
@@ -186,6 +306,7 @@
border: 2px solid white; border: 2px solid white;
border-radius: 50%; border-radius: 50%;
box-shadow: 0 2px 4px rgba(0,0,0,0.3); box-shadow: 0 2px 4px rgba(0,0,0,0.3);
z-index: 1;
} }
.marker-label { .marker-label {
@@ -223,4 +344,12 @@
.map-container { .map-container {
height: 60vh; height: 60vh;
} }
.info-panel-modal {
left: 10px;
right: 10px;
width: auto;
bottom: 20px;
top: auto;
}
} }