Checkpoint all changes
This commit is contained in:
parent
65877acf95
commit
66c2a25457
28 changed files with 3035 additions and 621 deletions
251
server-rs/src/routes/hexagon_stats.rs
Normal file
251
server-rs/src/routes/hexagon_stats.rs
Normal file
|
|
@ -0,0 +1,251 @@
|
|||
use std::fmt::Write;
|
||||
use std::str::FromStr;
|
||||
use std::sync::Arc;
|
||||
|
||||
use axum::extract::Query;
|
||||
use axum::http::StatusCode;
|
||||
use axum::response::IntoResponse;
|
||||
use serde::Deserialize;
|
||||
use tracing::{info, warn};
|
||||
|
||||
use crate::consts::{ENUM_NULL, HISTOGRAM_BINS};
|
||||
use crate::filter::{parse_filters, row_passes_filters};
|
||||
use crate::state::AppState;
|
||||
|
||||
use super::parse::h3_cell_bounds;
|
||||
|
||||
#[derive(Deserialize)]
|
||||
pub struct HexagonStatsParams {
|
||||
pub h3: String,
|
||||
pub resolution: u8,
|
||||
pub filters: Option<String>,
|
||||
}
|
||||
|
||||
pub async fn get_hexagon_stats(
|
||||
state: Arc<AppState>,
|
||||
Query(params): Query<HexagonStatsParams>,
|
||||
) -> Result<impl IntoResponse, (StatusCode, String)> {
|
||||
let cell = h3o::CellIndex::from_str(¶ms.h3).map_err(|error| {
|
||||
warn!(h3 = %params.h3, error = %error, "Invalid H3 cell index");
|
||||
(StatusCode::BAD_REQUEST, format!("Invalid H3 cell: {}", error))
|
||||
})?;
|
||||
let cell_u64: u64 = cell.into();
|
||||
|
||||
let resolution = params.resolution as usize;
|
||||
if resolution >= state.h3_cells.len() || state.h3_cells[resolution].is_empty() {
|
||||
warn!(
|
||||
resolution,
|
||||
"Invalid or non-precomputed resolution for hexagon-stats"
|
||||
);
|
||||
return Err((
|
||||
StatusCode::BAD_REQUEST,
|
||||
"Invalid or non-precomputed resolution".to_string(),
|
||||
));
|
||||
}
|
||||
|
||||
let h3_str = params.h3.clone();
|
||||
let filters_str = params.filters.clone();
|
||||
let (parsed_filters, parsed_enum_filters) = parse_filters(
|
||||
params.filters.as_deref(),
|
||||
&state.data.feature_names,
|
||||
&state.data.enum_features,
|
||||
);
|
||||
let num_filters = parsed_filters.len() + parsed_enum_filters.len();
|
||||
|
||||
let result = tokio::task::spawn_blocking(move || {
|
||||
let start_time = std::time::Instant::now();
|
||||
let h3_data = &state.h3_cells[resolution];
|
||||
let num_features = state.data.num_features;
|
||||
let feature_data = &state.data.feature_data;
|
||||
let enum_features = &state.data.enum_features;
|
||||
|
||||
let (min_lat, min_lon, max_lat, max_lon) = h3_cell_bounds(cell, 0.001);
|
||||
|
||||
// Collect matching rows
|
||||
let mut matching_rows: Vec<usize> = Vec::new();
|
||||
state
|
||||
.grid
|
||||
.for_each_in_bounds(min_lat, min_lon, max_lat, max_lon, |row_idx| {
|
||||
let row = row_idx as usize;
|
||||
if h3_data[row] == cell_u64
|
||||
&& row_passes_filters(
|
||||
row,
|
||||
&parsed_filters,
|
||||
&parsed_enum_filters,
|
||||
feature_data,
|
||||
num_features,
|
||||
enum_features,
|
||||
)
|
||||
{
|
||||
matching_rows.push(row);
|
||||
}
|
||||
});
|
||||
|
||||
let total_count = matching_rows.len();
|
||||
|
||||
// Build JSON directly via string buffer
|
||||
let mut output = String::with_capacity(4096);
|
||||
output.push_str("{\"count\":");
|
||||
write!(output, "{}", total_count).unwrap();
|
||||
|
||||
// Numeric features: compute count, min, max, sum, histogram using global bin edges
|
||||
output.push_str(",\"numeric_features\":[");
|
||||
let mut first_numeric = true;
|
||||
for (feature_index, feature_name) in state.data.feature_names.iter().enumerate() {
|
||||
let global_stats = &state.data.feature_stats[feature_index];
|
||||
let histogram_min = global_stats.histogram.min;
|
||||
let histogram_max = global_stats.histogram.max;
|
||||
let bin_width = global_stats.histogram.bin_width;
|
||||
|
||||
let mut count = 0usize;
|
||||
let mut min_value = f64::INFINITY;
|
||||
let mut max_value = f64::NEG_INFINITY;
|
||||
let mut sum = 0.0f64;
|
||||
let mut bins = vec![0u64; HISTOGRAM_BINS];
|
||||
|
||||
for &row in &matching_rows {
|
||||
let value = feature_data[row * num_features + feature_index];
|
||||
if value.is_finite() {
|
||||
count += 1;
|
||||
if value < min_value {
|
||||
min_value = value;
|
||||
}
|
||||
if value > max_value {
|
||||
max_value = value;
|
||||
}
|
||||
sum += value;
|
||||
|
||||
// Bin into histogram using global edges
|
||||
if bin_width > 0.0 {
|
||||
let bin_index =
|
||||
((value - histogram_min) / bin_width).floor() as isize;
|
||||
let clamped_index = bin_index.max(0).min((HISTOGRAM_BINS - 1) as isize) as usize;
|
||||
bins[clamped_index] += 1;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
if count == 0 {
|
||||
continue;
|
||||
}
|
||||
|
||||
if !first_numeric {
|
||||
output.push(',');
|
||||
}
|
||||
first_numeric = false;
|
||||
|
||||
let mean = sum / count as f64;
|
||||
output.push_str("{\"name\":");
|
||||
write_json_string(&mut output, feature_name);
|
||||
write!(output, ",\"count\":{}", count).unwrap();
|
||||
write!(output, ",\"min\":{}", format_f64(min_value)).unwrap();
|
||||
write!(output, ",\"max\":{}", format_f64(max_value)).unwrap();
|
||||
write!(output, ",\"mean\":{}", format_f64(mean)).unwrap();
|
||||
output.push_str(",\"histogram\":{\"min\":");
|
||||
write!(output, "{}", format_f64(histogram_min)).unwrap();
|
||||
output.push_str(",\"max\":");
|
||||
write!(output, "{}", format_f64(histogram_max)).unwrap();
|
||||
output.push_str(",\"bin_width\":");
|
||||
write!(output, "{}", format_f64(bin_width)).unwrap();
|
||||
output.push_str(",\"counts\":[");
|
||||
for (bin_index, &bin_count) in bins.iter().enumerate() {
|
||||
if bin_index > 0 {
|
||||
output.push(',');
|
||||
}
|
||||
write!(output, "{}", bin_count).unwrap();
|
||||
}
|
||||
output.push_str("]}}")
|
||||
}
|
||||
|
||||
// Enum features: count per value
|
||||
output.push_str("],\"enum_features\":[");
|
||||
let mut first_enum = true;
|
||||
for enum_feature in enum_features {
|
||||
let enum_index = match state.enum_name_to_idx.get(&enum_feature.name) {
|
||||
Some(&index) => index,
|
||||
None => continue,
|
||||
};
|
||||
let enum_data = &state.data.enum_features[enum_index];
|
||||
|
||||
let mut value_counts = vec![0u64; enum_data.values.len()];
|
||||
for &row in &matching_rows {
|
||||
let value = enum_data.data[row];
|
||||
if value != ENUM_NULL && (value as usize) < value_counts.len() {
|
||||
value_counts[value as usize] += 1;
|
||||
}
|
||||
}
|
||||
|
||||
// Only include if there are any non-zero counts
|
||||
let has_values = value_counts.iter().any(|&count| count > 0);
|
||||
if !has_values {
|
||||
continue;
|
||||
}
|
||||
|
||||
if !first_enum {
|
||||
output.push(',');
|
||||
}
|
||||
first_enum = false;
|
||||
|
||||
output.push_str("{\"name\":");
|
||||
write_json_string(&mut output, &enum_feature.name);
|
||||
output.push_str(",\"counts\":{");
|
||||
let mut first_value = true;
|
||||
for (value_index, &count) in value_counts.iter().enumerate() {
|
||||
if count == 0 {
|
||||
continue;
|
||||
}
|
||||
if !first_value {
|
||||
output.push(',');
|
||||
}
|
||||
first_value = false;
|
||||
write_json_string(&mut output, &enum_data.values[value_index]);
|
||||
write!(output, ":{}", count).unwrap();
|
||||
}
|
||||
output.push_str("}}");
|
||||
}
|
||||
output.push_str("]}");
|
||||
|
||||
let elapsed = start_time.elapsed();
|
||||
info!(
|
||||
h3 = %h3_str,
|
||||
resolution,
|
||||
total_count,
|
||||
filters = num_filters,
|
||||
filters_raw = filters_str.as_deref().unwrap_or("-"),
|
||||
ms = format_args!("{:.1}", elapsed.as_secs_f64() * 1000.0),
|
||||
"GET /api/hexagon-stats"
|
||||
);
|
||||
|
||||
output
|
||||
})
|
||||
.await
|
||||
.map_err(|error| (StatusCode::INTERNAL_SERVER_ERROR, error.to_string()))?;
|
||||
|
||||
Ok((
|
||||
[(axum::http::header::CONTENT_TYPE, "application/json")],
|
||||
result,
|
||||
))
|
||||
}
|
||||
|
||||
fn write_json_string(output: &mut String, value: &str) {
|
||||
output.push('"');
|
||||
for character in value.chars() {
|
||||
match character {
|
||||
'"' => output.push_str("\\\""),
|
||||
'\\' => output.push_str("\\\\"),
|
||||
'\n' => output.push_str("\\n"),
|
||||
'\r' => output.push_str("\\r"),
|
||||
'\t' => output.push_str("\\t"),
|
||||
other => output.push(other),
|
||||
}
|
||||
}
|
||||
output.push('"');
|
||||
}
|
||||
|
||||
fn format_f64(value: f64) -> String {
|
||||
if value.fract() == 0.0 && value.abs() < 1e15 {
|
||||
format!("{:.1}", value)
|
||||
} else {
|
||||
format!("{}", value)
|
||||
}
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue