feat(spatial): add SRID-aware geometry previews

This commit is contained in:
amwps290 authored and GitHub committed 2026-07-31 22:31:51 +08:00
1 parent ee26b2a580
commit a6a072294a
57 files changed
+2771 -384

No files matched your search

@@ -81,6 +81,85 @@ public final class EwkbWktDecoder {
return value.toString(); return value.toString();
} }
/** Decode a geometry value while retaining SRID outside the display WKT. */
public static SpatialValue decodeSpatial(Object value) {
if (value == null) {
return new SpatialValue(null, null);
}
if (value instanceof byte[]) {
byte[] raw = (byte[]) value;
String wkt = decodeBytes(raw);
return new SpatialValue(wkt, wkt.startsWith("0x") ? null : topLevelSrid(raw));
}
String text;
if (value instanceof String) {
text = (String) value;
} else {
String pgValue = tryReflectiveGetValue(value);
text = pgValue == null ? value.toString() : pgValue;
}
SpatialValue ewkt = decodeEwkt(text);
if (ewkt != null) {
return ewkt;
}
byte[] raw = tryParseHex(text);
if (raw != null) {
String wkt = decodeBytes(raw);
return new SpatialValue(wkt, wkt.startsWith("0x") ? null : topLevelSrid(raw));
}
return new SpatialValue(text, null);
}
private static SpatialValue decodeEwkt(String value) {
if (value == null || value.length() < 7 || !value.regionMatches(true, 0, "SRID=", 0, 5)) {
return null;
}
int separator = value.indexOf(';', 5);
if (separator < 0) {
return null;
}
try {
int srid = Integer.parseInt(value.substring(5, separator));
return new SpatialValue(value.substring(separator + 1), srid <= 0 ? null : srid);
} catch (NumberFormatException ignored) {
return null;
}
}
private static Integer topLevelSrid(byte[] raw) {
if (raw == null || raw.length < 9) {
return null;
}
boolean little;
if (raw[0] == 0) {
little = false;
} else if (raw[0] == 1) {
little = true;
} else {
return null;
}
long typeWord = readU32(raw, 1, little);
if ((typeWord & 0x2000_0000L) == 0) {
return null;
}
long srid = readU32(raw, 5, little);
return srid == 0 || srid > Integer.MAX_VALUE ? null : (int) srid;
}
private static long readU32(byte[] raw, int offset, boolean little) {
if (little) {
return ((long) raw[offset] & 0xFF)
| (((long) raw[offset + 1] & 0xFF) << 8)
| (((long) raw[offset + 2] & 0xFF) << 16)
| (((long) raw[offset + 3] & 0xFF) << 24);
}
return (((long) raw[offset] & 0xFF) << 24)
| (((long) raw[offset + 1] & 0xFF) << 16)
| (((long) raw[offset + 2] & 0xFF) << 8)
| ((long) raw[offset + 3] & 0xFF);
}
/** Decode a raw EWKB byte sequence; returns hex {@code 0x..} on failure. */ /** Decode a raw EWKB byte sequence; returns hex {@code 0x..} on failure. */
static String decodeBytes(byte[] raw) { static String decodeBytes(byte[] raw) {
if (raw == null) { if (raw == null) {
@@ -84,9 +84,9 @@ public abstract class PostgresLikeAgent extends AbstractJdbcAgent {
if (isPostgisGeometryTypeName(columnTypeName)) { if (isPostgisGeometryTypeName(columnTypeName)) {
Object raw = rs.getObject(index); Object raw = rs.getObject(index);
if (rs.wasNull() || raw == null) { if (rs.wasNull() || raw == null) {
return null; return new SpatialValue(null, null);
} }
return EwkbWktDecoder.decode(raw); return EwkbWktDecoder.decodeSpatial(raw);
} }
return resultValue(rs, index, sqlType, columnTypeName); return resultValue(rs, index, sqlType, columnTypeName);
}; };
@@ -7,6 +7,8 @@ import java.util.Objects;
public final class QueryPageResult { public final class QueryPageResult {
private List<String> columns; private List<String> columns;
private List<String> column_types; private List<String> column_types;
private List<SpatialColumn> spatial_columns;
private List<List<Integer>> spatial_values;
private List<List<Object>> rows; private List<List<Object>> rows;
private long affected_rows; private long affected_rows;
private long execution_time_ms; private long execution_time_ms;
@@ -56,7 +58,10 @@ public final class QueryPageResult {
) { ) {
this.columns = columns == null ? Collections.emptyList() : columns; this.columns = columns == null ? Collections.emptyList() : columns;
this.column_types = column_types == null ? Collections.emptyList() : column_types; this.column_types = column_types == null ? Collections.emptyList() : column_types;
this.rows = QueryResult.normalizeRows(rows); QueryResult.NormalizedRows normalized = QueryResult.normalizeRowsWithSpatial(rows);
this.rows = normalized.rows;
this.spatial_columns = normalized.spatialColumns.isEmpty() ? null : normalized.spatialColumns;
this.spatial_values = normalized.spatialValues.isEmpty() ? null : normalized.spatialValues;
this.affected_rows = affected_rows; this.affected_rows = affected_rows;
this.execution_time_ms = execution_time_ms; this.execution_time_ms = execution_time_ms;
this.truncated = truncated; this.truncated = truncated;
@@ -76,6 +81,14 @@ public final class QueryPageResult {
return rows; return rows;
} }
public List<SpatialColumn> getSpatial_columns() {
return spatial_columns == null ? Collections.emptyList() : spatial_columns;
}
public List<List<Integer>> getSpatial_values() {
return spatial_values == null ? Collections.emptyList() : spatial_values;
}
public long getAffected_rows() { public long getAffected_rows() {
return affected_rows; return affected_rows;
} }
@@ -105,7 +118,18 @@ public final class QueryPageResult {
} }
public void setRows(List<List<Object>> rows) { public void setRows(List<List<Object>> rows) {
this.rows = rows; QueryResult.NormalizedRows normalized = QueryResult.normalizeRowsWithSpatial(rows);
this.rows = normalized.rows;
this.spatial_columns = normalized.spatialColumns.isEmpty() ? null : normalized.spatialColumns;
this.spatial_values = normalized.spatialValues.isEmpty() ? null : normalized.spatialValues;
}
public void setSpatial_columns(List<SpatialColumn> spatial_columns) {
this.spatial_columns = spatial_columns == null || spatial_columns.isEmpty() ? null : spatial_columns;
}
public void setSpatial_values(List<List<Integer>> spatial_values) {
this.spatial_values = spatial_values == null || spatial_values.isEmpty() ? null : spatial_values;
} }
public void setAffected_rows(long affected_rows) { public void setAffected_rows(long affected_rows) {
@@ -139,19 +163,23 @@ public final class QueryPageResult {
&& has_more == that.has_more && has_more == that.has_more
&& Objects.equals(columns, that.columns) && Objects.equals(columns, that.columns)
&& Objects.equals(column_types, that.column_types) && Objects.equals(column_types, that.column_types)
&& Objects.equals(spatial_columns, that.spatial_columns)
&& Objects.equals(spatial_values, that.spatial_values)
&& Objects.equals(rows, that.rows) && Objects.equals(rows, that.rows)
&& Objects.equals(session_id, that.session_id); && Objects.equals(session_id, that.session_id);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(columns, column_types, rows, affected_rows, execution_time_ms, truncated, session_id, has_more); return Objects.hash(columns, column_types, spatial_columns, spatial_values, rows, affected_rows, execution_time_ms, truncated, session_id, has_more);
} }
@Override @Override
public String toString() { public String toString() {
return "QueryPageResult(columns=" + columns return "QueryPageResult(columns=" + columns
+ ", column_types=" + column_types + ", column_types=" + column_types
+ ", spatial_columns=" + spatial_columns
+ ", spatial_values=" + spatial_values
+ ", rows=" + rows + ", rows=" + rows
+ ", affected_rows=" + affected_rows + ", affected_rows=" + affected_rows
+ ", execution_time_ms=" + execution_time_ms + ", execution_time_ms=" + execution_time_ms
@@ -3,11 +3,17 @@ package com.dbx.agent;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map;
import java.util.Objects; import java.util.Objects;
import java.util.Set;
import java.util.TreeMap;
import java.util.TreeSet;
public final class QueryResult { public final class QueryResult {
private List<String> columns; private List<String> columns;
private List<String> column_types; private List<String> column_types;
private List<SpatialColumn> spatial_columns;
private List<List<Integer>> spatial_values;
private List<List<Object>> rows; private List<List<Object>> rows;
private long affected_rows; private long affected_rows;
private long execution_time_ms; private long execution_time_ms;
@@ -41,7 +47,10 @@ public final class QueryResult {
) { ) {
this.columns = columns == null ? Collections.emptyList() : columns; this.columns = columns == null ? Collections.emptyList() : columns;
this.column_types = column_types == null ? Collections.emptyList() : column_types; this.column_types = column_types == null ? Collections.emptyList() : column_types;
this.rows = normalizeRows(rows); NormalizedRows normalized = normalizeRowsWithSpatial(rows);
this.rows = normalized.rows;
this.spatial_columns = normalized.spatialColumns.isEmpty() ? null : normalized.spatialColumns;
this.spatial_values = normalized.spatialValues.isEmpty() ? null : normalized.spatialValues;
this.affected_rows = affected_rows; this.affected_rows = affected_rows;
this.execution_time_ms = execution_time_ms; this.execution_time_ms = execution_time_ms;
this.truncated = truncated; this.truncated = truncated;
@@ -59,6 +68,14 @@ public final class QueryResult {
return rows; return rows;
} }
public List<SpatialColumn> getSpatial_columns() {
return spatial_columns == null ? Collections.emptyList() : spatial_columns;
}
public List<List<Integer>> getSpatial_values() {
return spatial_values == null ? Collections.emptyList() : spatial_values;
}
public long getAffected_rows() { public long getAffected_rows() {
return affected_rows; return affected_rows;
} }
@@ -80,7 +97,18 @@ public final class QueryResult {
} }
public void setRows(List<List<Object>> rows) { public void setRows(List<List<Object>> rows) {
this.rows = rows; NormalizedRows normalized = normalizeRowsWithSpatial(rows);
this.rows = normalized.rows;
this.spatial_columns = normalized.spatialColumns.isEmpty() ? null : normalized.spatialColumns;
this.spatial_values = normalized.spatialValues.isEmpty() ? null : normalized.spatialValues;
}
public void setSpatial_columns(List<SpatialColumn> spatial_columns) {
this.spatial_columns = spatial_columns == null || spatial_columns.isEmpty() ? null : spatial_columns;
}
public void setSpatial_values(List<List<Integer>> spatial_values) {
this.spatial_values = spatial_values == null || spatial_values.isEmpty() ? null : spatial_values;
} }
public void setAffected_rows(long affected_rows) { public void setAffected_rows(long affected_rows) {
@@ -96,14 +124,63 @@ public final class QueryResult {
} }
static List<List<Object>> normalizeRows(List<? extends List<?>> input) { static List<List<Object>> normalizeRows(List<? extends List<?>> input) {
return normalizeRowsWithSpatial(input).rows;
}
static NormalizedRows normalizeRowsWithSpatial(List<? extends List<?>> input) {
if (input == null) { if (input == null) {
return Collections.emptyList(); return new NormalizedRows(Collections.emptyList(), Collections.emptyList(), Collections.emptyList());
} }
List<List<Object>> normalized = new ArrayList<>(input.size()); List<List<Object>> normalized = new ArrayList<>(input.size());
for (List<?> row : input) { List<List<Integer>> spatialValues = new ArrayList<>(input.size());
normalized.add(row == null ? Collections.emptyList() : new ArrayList<Object>(row)); // column_index -> first non-null SRID seen (TreeMap keeps output ordered)
Map<Integer, Integer> sridByColumn = new TreeMap<>();
Set<Integer> spatialColumnIndexes = new TreeSet<>();
for (List<?> inputRow : input) {
List<?> row = inputRow == null ? Collections.emptyList() : inputRow;
List<Object> values = new ArrayList<>(row.size());
List<Integer> rowSrids = new ArrayList<>(row.size());
for (int columnIndex = 0; columnIndex < row.size(); columnIndex++) {
Object value = row.get(columnIndex);
if (value instanceof SpatialValue) {
SpatialValue spatialValue = (SpatialValue) value;
spatialColumnIndexes.add(columnIndex);
Integer srid = spatialValue.getSrid();
// SRID 0 means unknown, mirroring the Rust drivers.
rowSrids.add(srid == null || srid == 0 ? null : srid);
if (srid != null && srid != 0 && !sridByColumn.containsKey(columnIndex)) {
sridByColumn.put(columnIndex, srid);
}
values.add(spatialValue.getWkt());
} else {
rowSrids.add(null);
values.add(value);
}
}
normalized.add(values);
spatialValues.add(rowSrids);
}
List<SpatialColumn> spatialColumns = new ArrayList<>(spatialColumnIndexes.size());
for (Integer columnIndex : spatialColumnIndexes) {
spatialColumns.add(new SpatialColumn(columnIndex, sridByColumn.get(columnIndex)));
}
return new NormalizedRows(
normalized,
spatialColumns,
spatialColumns.isEmpty() ? Collections.emptyList() : spatialValues
);
}
static final class NormalizedRows {
final List<List<Object>> rows;
final List<SpatialColumn> spatialColumns;
final List<List<Integer>> spatialValues;
NormalizedRows(List<List<Object>> rows, List<SpatialColumn> spatialColumns, List<List<Integer>> spatialValues) {
this.rows = rows;
this.spatialColumns = spatialColumns;
this.spatialValues = spatialValues;
} }
return normalized;
} }
@Override @Override
@@ -116,18 +193,22 @@ public final class QueryResult {
&& truncated == that.truncated && truncated == that.truncated
&& Objects.equals(columns, that.columns) && Objects.equals(columns, that.columns)
&& Objects.equals(column_types, that.column_types) && Objects.equals(column_types, that.column_types)
&& Objects.equals(spatial_columns, that.spatial_columns)
&& Objects.equals(spatial_values, that.spatial_values)
&& Objects.equals(rows, that.rows); && Objects.equals(rows, that.rows);
} }
@Override @Override
public int hashCode() { public int hashCode() {
return Objects.hash(columns, column_types, rows, affected_rows, execution_time_ms, truncated); return Objects.hash(columns, column_types, spatial_columns, spatial_values, rows, affected_rows, execution_time_ms, truncated);
} }
@Override @Override
public String toString() { public String toString() {
return "QueryResult(columns=" + columns return "QueryResult(columns=" + columns
+ ", column_types=" + column_types + ", column_types=" + column_types
+ ", spatial_columns=" + spatial_columns
+ ", spatial_values=" + spatial_values
+ ", rows=" + rows + ", rows=" + rows
+ ", affected_rows=" + affected_rows + ", affected_rows=" + affected_rows
+ ", execution_time_ms=" + execution_time_ms + ", execution_time_ms=" + execution_time_ms
@@ -0,0 +1,39 @@
package com.dbx.agent;
import java.util.Objects;
public final class SpatialColumn {
private final int column_index;
private final Integer srid;
public SpatialColumn(int columnIndex, Integer srid) {
this.column_index = columnIndex;
this.srid = srid;
}
public int getColumn_index() {
return column_index;
}
public Integer getSrid() {
return srid;
}
@Override
public boolean equals(Object other) {
if (this == other) return true;
if (!(other instanceof SpatialColumn)) return false;
SpatialColumn that = (SpatialColumn) other;
return column_index == that.column_index && Objects.equals(srid, that.srid);
}
@Override
public int hashCode() {
return Objects.hash(column_index, srid);
}
@Override
public String toString() {
return "SpatialColumn(column_index=" + column_index + ", srid=" + srid + ")";
}
}
@@ -0,0 +1,20 @@
package com.dbx.agent;
/** Internal JDBC result value carrying display WKT and its optional SRID. */
public final class SpatialValue {
private final String wkt;
private final Integer srid;
public SpatialValue(String wkt, Integer srid) {
this.wkt = wkt;
this.srid = srid;
}
public String getWkt() {
return wkt;
}
public Integer getSrid() {
return srid;
}
}
@@ -82,6 +82,20 @@ class EwkbWktDecoderTest {
assertEquals(ewkt, EwkbWktDecoder.decode(ewkt)); assertEquals(ewkt, EwkbWktDecoder.decode(ewkt));
} }
@Test
void spatialDecodeSeparatesSridFromVisibleWkt() {
SpatialValue value = EwkbWktDecoder.decodeSpatial("SRID=3857;POINT(1 2)");
assertEquals("POINT(1 2)", value.getWkt());
assertEquals(3857, value.getSrid());
}
@Test
void spatialDecodeRetainsEwkbSrid() {
SpatialValue value = EwkbWktDecoder.decodeSpatial(hex("0101000020E6100000C520B07268195D404E62105839F44340"));
assertEquals("POINT(116.397 39.908)", value.getWkt());
assertEquals(4326, value.getSrid());
}
@Test @Test
void truncatedBytesFallBackToHex() { void truncatedBytesFallBackToHex() {
// First few bytes of a valid point but truncated mid-coordinate. // First few bytes of a valid point but truncated mid-coordinate.
@@ -184,6 +184,54 @@ class PostgresLikeAgentTest {
assertEquals(1, result.getRows().size()); assertEquals(1, result.getRows().size());
assertEquals(1, result.getRows().get(0).get(0)); assertEquals(1, result.getRows().get(0).get(0));
assertEquals("POINT(116.397 39.908)", result.getRows().get(0).get(1)); assertEquals("POINT(116.397 39.908)", result.getRows().get(0).get(1));
assertEquals(1, result.getSpatial_columns().size());
assertEquals(1, result.getSpatial_columns().get(0).getColumn_index());
assertEquals(4326, result.getSpatial_columns().get(0).getSrid());
}
@Test
void normalizeCollapsesFirstNonNullSridPerColumn() {
List<Object> firstRow = java.util.Arrays.asList(new SpatialValue("POINT(1 2)", null), "keep");
List<Object> secondRow = java.util.Arrays.asList(new SpatialValue("POINT(3 4)", 4326), "keep");
List<Object> thirdRow = java.util.Arrays.asList(new SpatialValue("POINT(5 6)", 3857), "keep");
List<List<Object>> rows = java.util.Arrays.asList(firstRow, secondRow, thirdRow);
QueryResult result = new QueryResult(
java.util.Arrays.asList("geom", "note"),
java.util.Arrays.asList("geometry", "text"),
rows, 0L, 0L, false);
assertEquals(
java.util.Collections.singletonList(new SpatialColumn(0, 4326)),
result.getSpatial_columns());
assertEquals("POINT(1 2)", result.getRows().get(0).get(0));
// Per-cell SRIDs are preserved for every row instead of collapsing:
// unknown, then 4326, then 3857 in the same column.
assertEquals(
java.util.Arrays.asList(
java.util.Arrays.asList(null, null),
java.util.Arrays.asList(4326, null),
java.util.Arrays.asList(3857, null)),
result.getSpatial_values());
}
@Test
void normalizeOmitsSpatialValuesForNonSpatialRows() {
List<List<Object>> rows = java.util.Collections.singletonList(java.util.Arrays.asList(1, "plain text"));
QueryResult result = new QueryResult(
java.util.Arrays.asList("id", "note"),
java.util.Arrays.asList("int4", "text"),
rows, 0L, 0L, false);
QueryPageResult page = new QueryPageResult(
java.util.Arrays.asList("id", "note"),
java.util.Arrays.asList("int4", "text"),
rows, 0L, 0L, false, "session", false);
assertTrue(result.getSpatial_columns().isEmpty());
assertTrue(result.getSpatial_values().isEmpty());
assertTrue(page.getSpatial_columns().isEmpty());
assertTrue(page.getSpatial_values().isEmpty());
} }
private static final class TestPostgresLikeAgent extends PostgresLikeAgent { private static final class TestPostgresLikeAgent extends PostgresLikeAgent {
@@ -224,7 +272,7 @@ class PostgresLikeAgentTest {
if (rs.wasNull() || raw == null) { if (rs.wasNull() || raw == null) {
return null; return null;
} }
return EwkbWktDecoder.decode(raw); return EwkbWktDecoder.decodeSpatial(raw);
} }
if (sqlType == Types.INTEGER) { if (sqlType == Types.INTEGER) {
return rs.getInt(index); return rs.getInt(index);
@@ -4,6 +4,10 @@ import { useI18n } from "vue-i18n";
import { Camera, Loader2, Map, Maximize2, Minimize2, X } from "@lucide/vue"; import { Camera, Loader2, Map, Maximize2, Minimize2, X } from "@lucide/vue";
import { Button } from "@/components/ui/button"; import { Button } from "@/components/ui/button";
import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog"; import { Dialog, DialogContent, DialogTitle } from "@/components/ui/dialog";
import { renderGeometryFeaturesIndependently } from "@/lib/dataGrid/geometryLayerPreview";
import { prepareCoordsToLatLng, type CoordinateToLatLng } from "@/lib/dataGrid/geometryProjection";
import { getSpatialReference, SHORTLIST_SRIDS } from "@/lib/dataGrid/spatialReferenceCatalog";
import type { GeoJsonGeometry } from "@/lib/dataGrid/geometryPreview";
import "leaflet/dist/leaflet.css"; import "leaflet/dist/leaflet.css";
import type L from "leaflet"; import type L from "leaflet";
@@ -20,7 +24,23 @@ const emit = defineEmits<{
const { t } = useI18n(); const { t } = useI18n();
const mapContainer = ref<HTMLDivElement>(); const mapContainer = ref<HTMLDivElement>();
const mapError = ref<string>(""); const mapError = ref<string>("");
const isLoadingMap = ref(false);
const isExporting = ref(false); const isExporting = ref(false);
const skippedFeatureCount = ref(0);
// ── Effective SRID (detected default + manual override) ─────────────────────
const detectedSrid = ref<number | null>(null);
const selectedSrid = ref<number>(4326);
const customSridInput = ref<string>("");
const showCustomSrid = ref(false);
const sridOptions = computed(() => SHORTLIST_SRIDS.map((srid) => ({ srid, label: getSpatialReference(srid)?.label ?? `EPSG:${srid}` })));
const effectiveSrid = computed(() => selectedSrid.value);
const spatialSourceLabel = computed(() => {
if (selectedSrid.value !== (detectedSrid.value ?? 4326)) return t("grid.layerPreviewCrsManual");
if (detectedSrid.value != null) return t("grid.layerPreviewCrsDetected");
return t("grid.layerPreviewCrsAssumed");
});
// ── Resize / maximise ────────────────────────────────────────────────────── // ── Resize / maximise ──────────────────────────────────────────────────────
const customSize = ref<{ w: number; h: number } | null>(null); const customSize = ref<{ w: number; h: number } | null>(null);
@@ -87,18 +107,34 @@ function onResizePointerUp() {
// ── Leaflet ─────────────────────────────────────────────────────────────── // ── Leaflet ───────────────────────────────────────────────────────────────
let _L: typeof L | null = null; let _L: typeof L | null = null;
let map: L.Map | null = null; let map: L.Map | null = null;
let geoLayer: L.GeoJSON | null = null; let geoLayer: L.FeatureGroup | null = null;
let labelLayer: L.LayerGroup | null = null; let labelLayer: L.LayerGroup | null = null;
let tileLayer: L.TileLayer | null = null; let tileLayer: L.TileLayer | null = null;
let mapResizeObserver: ResizeObserver | null = null; let mapResizeObserver: ResizeObserver | null = null;
let _geojsonData: any = null; let _geojsonData: any = null;
let mapGeneration = 0;
let coordinateConverters = new globalThis.Map<number, CoordinateToLatLng>();
interface PreviewFeature {
type: "Feature";
geometry: GeoJsonGeometry | null;
properties?: Record<string, unknown> | null;
}
/**
* SRID a feature should be projected with: a manual CRS override applies to
* every feature; otherwise each feature uses its own per-cell SRID, falling
* back to the detected/selected one when unknown.
*/
function featureSrid(feature: PreviewFeature): number {
const manualSrid = selectedSrid.value !== (detectedSrid.value ?? null) ? selectedSrid.value : null;
return manualSrid ?? (typeof feature.properties?._srid === "number" ? feature.properties._srid : effectiveSrid.value);
}
async function loadLeaflet(): Promise<typeof L> { async function loadLeaflet(): Promise<typeof L> {
if (!_L) { if (!_L) {
console.log("[LayerPreview] dynamic import leaflet…");
const mod = await import("leaflet"); const mod = await import("leaflet");
_L = mod.default as unknown as typeof L; _L = mod.default as unknown as typeof L;
console.log("[LayerPreview] leaflet loaded, L.version =", (_L as any).version);
} }
return _L; return _L;
} }
@@ -184,7 +220,7 @@ function updateLabels() {
for (const f of features) { for (const f of features) {
const value = f.properties?.[prop]; const value = f.properties?.[prop];
if (value == null) continue; if (value == null) continue;
const coords = getLabelCoords(f.geometry); const coords = getLabelCoords(f.geometry, featureSrid(f));
if (!coords) continue; if (!coords) continue;
const icon = L.divIcon({ const icon = L.divIcon({
className: "layer-preview-label", className: "layer-preview-label",
@@ -196,22 +232,44 @@ function updateLabels() {
} }
} }
function getLabelCoords(geom: any): [number, number] | null { function collectCoordinatePairs(geometry: any): [number, number][] {
if (!geom) return null; const pairs: [number, number][] = [];
if (geom.type === "Point") return [geom.coordinates[1], geom.coordinates[0]]; const visit = (value: any) => {
if (geom.type === "MultiPoint") return [geom.coordinates[0][1], geom.coordinates[0][0]]; if (!Array.isArray(value)) return;
// For lines/polygons, label at the centroid (midpoint) if (value.length >= 2 && typeof value[0] === "number" && typeof value[1] === "number") {
const coords = geom.coordinates?.flat(Infinity).filter((n: any) => typeof n === "number"); pairs.push([value[0], value[1]]);
if (!coords || coords.length < 2) return null; return;
// Collect all [lng, lat] pairs }
const pts: [number, number][] = []; value.forEach(visit);
const flat = geom.coordinates?.flat(Infinity) ?? []; };
for (let i = 0; i + 1 < flat.length; i += 2) { if (geometry?.type === "GeometryCollection") {
if (typeof flat[i] === "number" && typeof flat[i + 1] === "number") pts.push([flat[i], flat[i + 1]]); for (const child of geometry.geometries ?? []) pairs.push(...collectCoordinatePairs(child));
} else {
visit(geometry?.coordinates);
} }
return pairs;
}
function geometryCoordinatesAreValid(geometry: any, srid: number, converter: (coord: [number, number]) => L.LatLng): boolean {
const coordinates = collectCoordinatePairs(geometry);
if (coordinates.length === 0) return false;
return coordinates.every(([x, y]) => {
if (!Number.isFinite(x) || !Number.isFinite(y)) return false;
if (srid === 4326 && (x < -180 || x > 180 || y < -90 || y > 90)) return false;
if (srid === 3857 && (Math.abs(x) > 20037508.342789244 || Math.abs(y) > 20037508.342789244)) return false;
const latlng = converter([x, y]);
return Number.isFinite(latlng.lat) && Number.isFinite(latlng.lng) && latlng.lat >= -90 && latlng.lat <= 90 && latlng.lng >= -180 && latlng.lng <= 180;
});
}
function getLabelCoords(geom: any, srid: number): [number, number] | null {
const converter = coordinateConverters.get(srid) ?? null;
if (!geom || !converter || !geometryCoordinatesAreValid(geom, srid, converter)) return null;
const pts = collectCoordinatePairs(geom);
if (pts.length === 0) return null; if (pts.length === 0) return null;
const avgLng = pts.reduce((s, p) => s + p[0], 0) / pts.length; const projected = pts.map((coord) => converter(coord));
const avgLat = pts.reduce((s, p) => s + p[1], 0) / pts.length; const avgLng = projected.reduce((sum, point) => sum + point.lng, 0) / projected.length;
const avgLat = projected.reduce((sum, point) => sum + point.lat, 0) / projected.length;
return [avgLat, avgLng]; return [avgLat, avgLng];
} }
@@ -249,17 +307,13 @@ async function initMap() {
return; return;
} }
cleanupMap(); cleanupMap();
const generation = mapGeneration;
mapError.value = ""; mapError.value = "";
isLoadingMap.value = true;
// Remove the "Loading map…" placeholder so Leaflet can take over.
const placeholder = container.querySelector("[data-map-placeholder]");
if (placeholder) placeholder.remove();
try { try {
console.log("[LayerPreview] container offset:", container.offsetWidth, "x", container.offsetHeight);
const L = await loadLeaflet(); const L = await loadLeaflet();
const rect = container.getBoundingClientRect(); if (generation !== mapGeneration || !props.open) return;
console.log("[LayerPreview] container getBoundingClientRect:", rect.width, "x", rect.height);
map = L.map(container, { map = L.map(container, {
zoomControl: true, zoomControl: true,
@@ -267,7 +321,6 @@ async function initMap() {
center: [35, 110], center: [35, 110],
zoom: 4, zoom: 4,
}); });
console.log("[LayerPreview] L.map created");
map.invalidateSize(); map.invalidateSize();
tileLayer = L.tileLayer(selectedBasemap.value.url, { tileLayer = L.tileLayer(selectedBasemap.value.url, {
@@ -277,9 +330,9 @@ async function initMap() {
}).addTo(map); }).addTo(map);
// Sync ID ref // Sync ID ref
selectedBasemapId.value = selectedBasemap.value.id; selectedBasemapId.value = selectedBasemap.value.id;
console.log("[LayerPreview] tileLayer added"); await addGeoJsonToMap(generation);
addGeoJsonToMap(); if (generation !== mapGeneration || !map) return;
parseLabelProperties(_geojsonData); if (_geojsonData) parseLabelProperties(_geojsonData);
mapResizeObserver = new ResizeObserver(() => { mapResizeObserver = new ResizeObserver(() => {
map?.invalidateSize(); map?.invalidateSize();
@@ -289,20 +342,24 @@ async function initMap() {
map?.invalidateSize(); map?.invalidateSize();
}, 500); }, 500);
} catch (err) { } catch (err) {
console.error("[LayerPreview] initMap error:", err); if (generation === mapGeneration) {
mapError.value = String(err); console.error("[LayerPreview] initMap error:", err);
mapError.value = String(err);
}
} finally {
if (generation === mapGeneration) isLoadingMap.value = false;
} }
} }
function addGeoJsonToMap() { async function addGeoJsonToMap(generation: number) {
if (!map || geoLayer) return; if (!map || geoLayer) return;
try { try {
_geojsonData = JSON.parse(props.geojson); _geojsonData = JSON.parse(props.geojson);
} catch { } catch {
console.warn("[LayerPreview] invalid geojson JSON"); console.warn("[LayerPreview] invalid geojson JSON");
mapError.value = t("grid.layerPreviewNoGeometryData");
return; return;
} }
console.log("[LayerPreview] GeoJSON type:", _geojsonData.type, "features:", _geojsonData.features?.length);
let data = _geojsonData; let data = _geojsonData;
if (data.type === "Feature") data = { type: "FeatureCollection", features: [data] }; if (data.type === "Feature") data = { type: "FeatureCollection", features: [data] };
@@ -313,33 +370,120 @@ function addGeoJsonToMap() {
}; };
if (!data.features?.length) { if (!data.features?.length) {
console.warn("[LayerPreview] no features"); console.warn("[LayerPreview] no features");
mapError.value = t("grid.layerPreviewNoGeometryData");
return; return;
} }
geoLayer = _L! detectedSrid.value = typeof data.detectedSrid === "number" ? data.detectedSrid : null;
.geoJSON(data, { selectedSrid.value = detectedSrid.value ?? 4326;
style: { _geojsonData = data;
color: "#ff6600",
weight: 3,
opacity: 0.95,
fillColor: "#ff6600",
fillOpacity: 0.25,
},
pointToLayer: pointToCircleFeature,
onEachFeature: (feature, layer) => {
layer.bindPopup(popupContent(feature));
},
})
.addTo(map);
const bounds = geoLayer.getBounds(); await renderLayer(generation);
console.log("[LayerPreview] geoLayer added, bounds:", bounds.toBBoxString(), "valid:", bounds.isValid()); }
if (bounds.isValid()) {
map.fitBounds(bounds, { padding: [30, 30], maxZoom: 18 }); async function renderLayer(generation: number) {
console.log("[LayerPreview] fitBounds done, zoom:", map.getZoom()); if (!map || !_geojsonData || !_L) return;
skippedFeatureCount.value = 0;
const leaflet = _L;
const data = _geojsonData;
try {
const features = (data.features ?? []) as PreviewFeature[];
const sridsNeeded = new Set<number>();
for (const feature of features) {
const srid = featureSrid(feature);
if (Number.isInteger(srid) && srid > 0) sridsNeeded.add(srid);
}
const converters = new globalThis.Map<number, CoordinateToLatLng>();
for (const srid of sridsNeeded) {
const converter = await prepareCoordsToLatLng(srid, leaflet);
if (converter) converters.set(srid, converter);
}
if (generation !== mapGeneration || !map) return;
if (converters.size === 0) {
mapError.value = t("grid.layerPreviewUnsupportedCrs", { srid: effectiveSrid.value });
return;
}
coordinateConverters = converters;
geoLayer = leaflet.featureGroup().addTo(map);
const summary = renderGeometryFeaturesIndependently(
features,
(feature) => {
const geometry = feature.geometry;
const srid = featureSrid(feature);
const converter = converters.get(srid) ?? null;
if (!geometry || !converter || !geometryCoordinatesAreValid(geometry, srid, converter)) {
return null;
}
const layer = leaflet.geoJSON(feature as unknown as Parameters<(typeof L)["geoJSON"]>[0], {
coordsToLatLng: (coords) => converter([coords[0], coords[1]]),
style: {
color: "#ff6600",
weight: 3,
opacity: 0.95,
fillColor: "#ff6600",
fillOpacity: 0.25,
},
pointToLayer: pointToCircleFeature,
onEachFeature: (sourceFeature, layer) => layer.bindPopup(popupContent(sourceFeature)),
});
return { layer, srid };
},
(layer) => layer.addTo(geoLayer!),
(error) => console.warn("[LayerPreview] skipped invalid feature", error),
);
skippedFeatureCount.value = summary.skipped;
if (summary.rendered === 0) {
mapError.value = t("grid.layerPreviewNoSupportedCrs");
return;
}
const bounds = geoLayer.getBounds();
if (bounds.isValid()) {
map.fitBounds(bounds, { padding: [30, 30], maxZoom: 18 });
}
} catch (err) {
if (generation === mapGeneration) {
console.error("[LayerPreview] renderLayer error:", err);
mapError.value = String(err);
}
} }
} }
async function applySrid(next: number) {
selectedSrid.value = next;
mapError.value = "";
if (!map) return;
mapGeneration++;
const generation = mapGeneration;
if (geoLayer) {
map.removeLayer(geoLayer);
geoLayer = null;
}
if (labelLayer) {
map.removeLayer(labelLayer);
labelLayer = null;
}
await renderLayer(generation);
if (generation === mapGeneration && labelProperty.value) updateLabels();
}
function onSridSelect(value: string) {
if (value === "custom") {
showCustomSrid.value = true;
return;
}
showCustomSrid.value = false;
void applySrid(Number(value));
}
function onCustomSridSubmit() {
const srid = Number.parseInt(customSridInput.value, 10);
if (!Number.isInteger(srid) || srid <= 0) return;
void applySrid(srid);
}
function switchBasemap(basemap: BasemapOption) { function switchBasemap(basemap: BasemapOption) {
selectedBasemap.value = basemap; selectedBasemap.value = basemap;
selectedBasemapId.value = basemap.id; selectedBasemapId.value = basemap.id;
@@ -360,6 +504,7 @@ watch(selectedBasemapId, (id) => {
}); });
function cleanupMap() { function cleanupMap() {
mapGeneration++;
mapResizeObserver?.disconnect(); mapResizeObserver?.disconnect();
mapResizeObserver = null; mapResizeObserver = null;
labelLayer = null; labelLayer = null;
@@ -370,7 +515,14 @@ function cleanupMap() {
map = null; map = null;
} }
_geojsonData = null; _geojsonData = null;
coordinateConverters = new globalThis.Map();
detectedSrid.value = null;
selectedSrid.value = 4326;
showCustomSrid.value = false;
customSridInput.value = "";
labelProperty.value = ""; labelProperty.value = "";
isLoadingMap.value = false;
skippedFeatureCount.value = 0;
} }
function close() { function close() {
@@ -418,11 +570,9 @@ async function saveAsImage() {
watch( watch(
() => props.open, () => props.open,
async (open) => { async (open) => {
console.log("[LayerPreview] open prop changed:", open);
if (open) { if (open) {
await nextTick(); await nextTick();
if (!mapContainer.value) await nextTick(); if (!mapContainer.value) await nextTick();
console.log("[LayerPreview] after nextTick, mapContainer in DOM:", !!mapContainer.value);
await initMap(); await initMap();
} else { } else {
cleanupMap(); cleanupMap();
@@ -438,31 +588,43 @@ onBeforeUnmount(() => cleanupMap());
<Dialog :open="open" @update:open="(value) => emit('update:open', value)"> <Dialog :open="open" @update:open="(value) => emit('update:open', value)">
<DialogContent :show-close-button="false" :style="contentStyle" class="layer-preview-dialog flex w-[96vw] max-w-[1800px] h-[88vh] max-h-[960px] min-w-[640px] min-h-[400px] flex-col gap-0 overflow-hidden rounded-lg border p-0 shadow-2xl" @escape-key-down="close"> <DialogContent :show-close-button="false" :style="contentStyle" class="layer-preview-dialog flex w-[96vw] max-w-[1800px] h-[88vh] max-h-[960px] min-w-[640px] min-h-[400px] flex-col gap-0 overflow-hidden rounded-lg border p-0 shadow-2xl" @escape-key-down="close">
<!-- Header --> <!-- Header -->
<div class="flex h-12 shrink-0 items-center gap-2 border-b bg-muted/20 px-3"> <div class="flex min-h-12 shrink-0 flex-wrap items-center gap-2 border-b bg-muted/20 px-3 py-2">
<div class="flex min-w-0 shrink-0 items-center gap-2"> <div class="flex min-w-32 flex-1 items-center gap-2">
<Map class="h-4 w-4 shrink-0 text-muted-foreground" /> <Map class="h-4 w-4 shrink-0 text-muted-foreground" />
<DialogTitle class="truncate text-sm font-semibold">{{ dialogTitle }}</DialogTitle> <DialogTitle class="truncate text-sm font-semibold">{{ dialogTitle }}</DialogTitle>
</div> </div>
<!-- SRID selector (built-in shortlist + custom EPSG) -->
<select class="h-6 max-w-44 shrink-0 rounded border bg-background px-1.5 text-[11px] outline-none" :value="showCustomSrid ? 'custom' : String(selectedSrid)" @change="onSridSelect(($event.target as HTMLSelectElement).value)">
<option v-for="opt in sridOptions" :key="opt.srid" :value="String(opt.srid)">{{ opt.label }}</option>
<option v-if="!sridOptions.some((o) => o.srid === selectedSrid)" :value="String(selectedSrid)">
{{ getSpatialReference(selectedSrid)?.label ?? `EPSG:${selectedSrid}` }}
</option>
<option value="custom">{{ t("grid.layerPreviewCustomCrs") }}</option>
</select>
<input v-if="showCustomSrid" v-model="customSridInput" type="number" inputmode="numeric" :placeholder="t('grid.layerPreviewCustomCrsPlaceholder')" class="h-6 w-24 shrink-0 rounded border bg-background px-1.5 text-[11px] outline-none" @keyup.enter="onCustomSridSubmit" />
<span class="shrink-0 text-[11px] text-muted-foreground">{{ spatialSourceLabel }}</span>
<span v-if="skippedFeatureCount > 0" class="shrink-0 text-[11px] text-amber-600">
{{ t("grid.layerPreviewSkipped", { count: skippedFeatureCount }) }}
</span>
<!-- Label property selector --> <!-- Label property selector -->
<select v-if="labelProperties.length" v-model="labelProperty" class="h-6 shrink-0 rounded border bg-background px-1.5 text-[11px] outline-none" @change="onLabelPropertyChange"> <select v-if="labelProperties.length" v-model="labelProperty" class="h-6 max-w-40 shrink-0 rounded border bg-background px-1.5 text-[11px] outline-none" @change="onLabelPropertyChange">
<option value="">{{ t("grid.layerPreviewLabelNone") }}</option> <option value="">{{ t("grid.layerPreviewLabel") }}</option>
<option v-for="p in labelProperties" :key="p" :value="p"> <option v-for="p in labelProperties" :key="p" :value="p">
{{ p }} {{ p }}
</option> </option>
</select> </select>
<div class="flex flex-1" />
<!-- Basemap selector --> <!-- Basemap selector -->
<select v-model="selectedBasemapId" class="h-6 shrink-0 rounded border bg-background px-1.5 text-[11px] outline-none"> <select v-model="selectedBasemapId" class="ml-auto h-6 shrink-0 rounded border bg-background px-1.5 text-[11px] outline-none">
<option v-for="bm in basemaps" :key="bm.id" :value="bm.id"> <option v-for="bm in basemaps" :key="bm.id" :value="bm.id">
{{ bm.label }} {{ bm.label }}
</option> </option>
</select> </select>
<!-- Save as image --> <!-- Save as image -->
<Button variant="ghost" size="icon" class="h-7 w-7 shrink-0 text-muted-foreground hover:bg-accent hover:text-accent-foreground" :title="t('grid.layerPreviewExportImage')" :disabled="isExporting" @click="saveAsImage"> <Button variant="ghost" size="icon" class="h-7 w-7 shrink-0 text-muted-foreground hover:bg-accent hover:text-accent-foreground" :title="t('grid.layerPreviewExport')" :disabled="isExporting" @click="saveAsImage">
<Camera v-if="!isExporting" class="h-3.5 w-3.5" /> <Camera v-if="!isExporting" class="h-3.5 w-3.5" />
<Loader2 v-else class="h-3.5 w-3.5 animate-spin" /> <Loader2 v-else class="h-3.5 w-3.5 animate-spin" />
</Button> </Button>
@@ -480,10 +642,10 @@ onBeforeUnmount(() => cleanupMap());
<!-- Map --> <!-- Map -->
<div ref="mapContainer" class="relative w-full flex-1" style="min-height: 200px" data-map-container> <div ref="mapContainer" class="relative w-full flex-1" style="min-height: 200px" data-map-container>
<div class="absolute inset-0 z-10 flex items-center justify-center text-xs text-muted-foreground pointer-events-none" data-map-placeholder>Loading map…</div> <div v-if="isLoadingMap" class="absolute inset-0 z-10 flex items-center justify-center bg-background/70 text-xs text-muted-foreground pointer-events-none" data-map-placeholder>{{ t("grid.layerPreviewLoading") }}</div>
</div> <div v-if="mapError" class="absolute inset-0 z-20 flex items-center justify-center bg-background/90 p-4 text-sm text-destructive">
<div v-if="mapError" class="absolute inset-0 flex items-center justify-center bg-background/80 p-4 text-sm text-destructive"> {{ mapError }}
{{ mapError }} </div>
</div> </div>
<!-- Resize handles --> <!-- Resize handles -->
+12 -2
View File
@@ -1340,10 +1340,20 @@ export default {
imageLoadFailed: "Image failed to load", imageLoadFailed: "Image failed to load",
geometryPreview: "Geometry Preview", geometryPreview: "Geometry Preview",
layerPreview: "Layer Preview", layerPreview: "Layer Preview",
layerPreviewLabelNone: "— Label —", layerPreviewSkipped: "Skipped {count} feature(s)",
layerPreviewExportImage: "Export image", layerPreviewNoSupportedCrs: "Unable to preview: coordinate system missing or unsupported",
layerPreviewNoGeometryData: "Unable to preview: no valid geometry data",
layerPreviewLabel: "Label",
layerPreviewExport: "Export image",
layerPreviewMaximize: "Maximize", layerPreviewMaximize: "Maximize",
layerPreviewRestore: "Restore", layerPreviewRestore: "Restore",
layerPreviewLoading: "Loading map...",
layerPreviewCustomCrs: "Custom EPSG…",
layerPreviewCustomCrsPlaceholder: "EPSG code",
layerPreviewUnsupportedCrs: "Unsupported coordinate system: EPSG:{srid}",
layerPreviewCrsManual: "Coordinate system: manual",
layerPreviewCrsDetected: "Coordinate system: detected",
layerPreviewCrsAssumed: "Coordinate system: assumed WGS 84",
insertRowsNotSupported: "The current save target does not support adding rows.", insertRowsNotSupported: "The current save target does not support adding rows.",
zoomIn: "Zoom In", zoomIn: "Zoom In",
zoomOut: "Zoom Out", zoomOut: "Zoom Out",
+12 -2
View File
@@ -1224,10 +1224,20 @@ export default withEnglishFallback({
imageLoadFailed: "No se pudo cargar la imagen", imageLoadFailed: "No se pudo cargar la imagen",
geometryPreview: "Vista previa de geometría", geometryPreview: "Vista previa de geometría",
layerPreview: "Vista previa de capa", layerPreview: "Vista previa de capa",
layerPreviewLabelNone: "— Etiqueta —", layerPreviewSkipped: "{count} elemento(s) omitido(s)",
layerPreviewExportImage: "Exportar imagen", layerPreviewNoSupportedCrs: "No se puede previsualizar: sistema de coordenadas ausente o no compatible",
layerPreviewNoGeometryData: "No se puede previsualizar: no hay datos geométricos válidos",
layerPreviewLabel: "Etiqueta",
layerPreviewExport: "Exportar imagen",
layerPreviewMaximize: "Maximizar", layerPreviewMaximize: "Maximizar",
layerPreviewRestore: "Restaurar", layerPreviewRestore: "Restaurar",
layerPreviewLoading: "Cargando mapa...",
layerPreviewCustomCrs: "EPSG personalizado…",
layerPreviewCustomCrsPlaceholder: "Código EPSG",
layerPreviewUnsupportedCrs: "Sistema de coordenadas no compatible: EPSG:{srid}",
layerPreviewCrsManual: "Sistema de coordenadas: manual",
layerPreviewCrsDetected: "Sistema de coordenadas: detectado",
layerPreviewCrsAssumed: "Sistema de coordenadas: se asume WGS 84",
insertRowsNotSupported: "El destino de guardado actual no admite añadir filas.", insertRowsNotSupported: "El destino de guardado actual no admite añadir filas.",
zoomIn: "Acercar", zoomIn: "Acercar",
zoomOut: "Alejar", zoomOut: "Alejar",
+13 -3
View File
@@ -1222,10 +1222,20 @@ export default withEnglishFallback({
imageLoadFailed: "Caricamento immagine non riuscito", imageLoadFailed: "Caricamento immagine non riuscito",
geometryPreview: "Anteprima Geometria", geometryPreview: "Anteprima Geometria",
layerPreview: "Anteprima Layer", layerPreview: "Anteprima Layer",
layerPreviewLabelNone: "— Etichetta —", layerPreviewSkipped: "{count} elemento/i ignorato/i",
layerPreviewExportImage: "Esporta immagine", layerPreviewNoSupportedCrs: "Impossibile visualizzare: sistema di coordinate mancante o non supportato",
layerPreviewMaximize: "Ingrandisci", layerPreviewNoGeometryData: "Impossibile visualizzare: nessun dato geometrico valido",
layerPreviewLabel: "Etichetta",
layerPreviewExport: "Esporta immagine",
layerPreviewMaximize: "Massimizza",
layerPreviewRestore: "Ripristina", layerPreviewRestore: "Ripristina",
layerPreviewLoading: "Caricamento mappa...",
layerPreviewCustomCrs: "EPSG personalizzato…",
layerPreviewCustomCrsPlaceholder: "Codice EPSG",
layerPreviewUnsupportedCrs: "Sistema di coordinate non supportato: EPSG:{srid}",
layerPreviewCrsManual: "Sistema di coordinate: manuale",
layerPreviewCrsDetected: "Sistema di coordinate: rilevato",
layerPreviewCrsAssumed: "Sistema di coordinate: presunto WGS 84",
insertRowsNotSupported: "La destinazione di salvataggio corrente non supporta l'aggiunta di righe.", insertRowsNotSupported: "La destinazione di salvataggio corrente non supporta l'aggiunta di righe.",
zoomIn: "Ingrandisci", zoomIn: "Ingrandisci",
zoomOut: "Rimpicciolisci", zoomOut: "Rimpicciolisci",
+13 -3
View File
@@ -1240,10 +1240,20 @@ export default withEnglishFallback({
imageLoadFailed: "画像の読み込みに失敗しました", imageLoadFailed: "画像の読み込みに失敗しました",
geometryPreview: "ジオメトリプレビュー", geometryPreview: "ジオメトリプレビュー",
layerPreview: "レイヤープレビュー", layerPreview: "レイヤープレビュー",
layerPreviewLabelNone: "— ラベル —", layerPreviewSkipped: "{count} 件をスキップ",
layerPreviewExportImage: "画像をエクスポート", layerPreviewNoSupportedCrs: "プレビューできません: 座標系がないか対応していません",
layerPreviewNoGeometryData: "プレビューできません: 有効なジオメトリデータがありません",
layerPreviewLabel: "ラベル",
layerPreviewExport: "画像を書き出す",
layerPreviewMaximize: "最大化", layerPreviewMaximize: "最大化",
layerPreviewRestore: "元に戻す", layerPreviewRestore: "復元",
layerPreviewLoading: "地図を読み込み中...",
layerPreviewCustomCrs: "カスタム EPSG…",
layerPreviewCustomCrsPlaceholder: "EPSG コード",
layerPreviewUnsupportedCrs: "サポートされていない座標系: EPSG:{srid}",
layerPreviewCrsManual: "座標系: 手動",
layerPreviewCrsDetected: "座標系: 検出済み",
layerPreviewCrsAssumed: "座標系: 既定の WGS 84",
insertRowsNotSupported: "現在の保存先は行の追加に対応していません。", insertRowsNotSupported: "現在の保存先は行の追加に対応していません。",
zoomIn: "拡大", zoomIn: "拡大",
zoomOut: "縮小", zoomOut: "縮小",
+12 -2
View File
@@ -1224,10 +1224,20 @@ export default withEnglishFallback({
imageLoadFailed: "Falha ao carregar a imagem", imageLoadFailed: "Falha ao carregar a imagem",
geometryPreview: "Visualização de Geometria", geometryPreview: "Visualização de Geometria",
layerPreview: "Visualização de Camada", layerPreview: "Visualização de Camada",
layerPreviewLabelNone: "— Rótulo —", layerPreviewSkipped: "{count} recurso(s) ignorado(s)",
layerPreviewExportImage: "Exportar imagem", layerPreviewNoSupportedCrs: "Não foi possível visualizar: sistema ausente ou não suportado",
layerPreviewNoGeometryData: "Não foi possível visualizar: não há dados geométricos válidos",
layerPreviewLabel: "Rótulo",
layerPreviewExport: "Exportar imagem",
layerPreviewMaximize: "Maximizar", layerPreviewMaximize: "Maximizar",
layerPreviewRestore: "Restaurar", layerPreviewRestore: "Restaurar",
layerPreviewLoading: "Carregando mapa...",
layerPreviewCustomCrs: "EPSG personalizado…",
layerPreviewCustomCrsPlaceholder: "Código EPSG",
layerPreviewUnsupportedCrs: "Sistema de coordenadas não suportado: EPSG:{srid}",
layerPreviewCrsManual: "Sistema de coordenadas: manual",
layerPreviewCrsDetected: "Sistema de coordenadas: detectado",
layerPreviewCrsAssumed: "Sistema de coordenadas: presumido WGS 84",
insertRowsNotSupported: "O destino de salvamento atual não suporta a adição de linhas.", insertRowsNotSupported: "O destino de salvamento atual não suporta a adição de linhas.",
zoomIn: "Aproximar", zoomIn: "Aproximar",
zoomOut: "Afastar", zoomOut: "Afastar",
+12 -2
View File
@@ -1341,10 +1341,20 @@ export default withEnglishFallback({
imageLoadFailed: "图片加载失败", imageLoadFailed: "图片加载失败",
geometryPreview: "图形预览", geometryPreview: "图形预览",
layerPreview: "图层预览", layerPreview: "图层预览",
layerPreviewLabelNone: "— 标签 —", layerPreviewSkipped: "已跳过 {count} 个要素",
layerPreviewExportImage: "导出图片", layerPreviewNoSupportedCrs: "无法预览:缺少或不支持坐标系",
layerPreviewNoGeometryData: "无法预览:没有有效的几何数据",
layerPreviewLabel: "标签",
layerPreviewExport: "导出图片",
layerPreviewMaximize: "最大化", layerPreviewMaximize: "最大化",
layerPreviewRestore: "还原", layerPreviewRestore: "还原",
layerPreviewLoading: "正在加载地图...",
layerPreviewCustomCrs: "自定义 EPSG…",
layerPreviewCustomCrsPlaceholder: "EPSG 代码",
layerPreviewUnsupportedCrs: "不支持的坐标系:EPSG:{srid}",
layerPreviewCrsManual: "坐标系:手动",
layerPreviewCrsDetected: "坐标系:已探测",
layerPreviewCrsAssumed: "坐标系:默认 WGS 84",
insertRowsNotSupported: "当前保存目标不支持新增行。", insertRowsNotSupported: "当前保存目标不支持新增行。",
zoomIn: "放大", zoomIn: "放大",
zoomOut: "缩小", zoomOut: "缩小",
+12 -2
View File
@@ -1223,10 +1223,20 @@ export default withEnglishFallback({
imageLoadFailed: "圖片載入失敗", imageLoadFailed: "圖片載入失敗",
geometryPreview: "圖形預覽", geometryPreview: "圖形預覽",
layerPreview: "圖層預覽", layerPreview: "圖層預覽",
layerPreviewLabelNone: "— 標籤 —", layerPreviewSkipped: "已略過 {count} 個圖徵",
layerPreviewExportImage: "匯出圖片", layerPreviewNoSupportedCrs: "無法預覽:缺少或不支援座標系",
layerPreviewNoGeometryData: "無法預覽:沒有有效的幾何資料",
layerPreviewLabel: "標籤",
layerPreviewExport: "匯出圖片",
layerPreviewMaximize: "最大化", layerPreviewMaximize: "最大化",
layerPreviewRestore: "還原", layerPreviewRestore: "還原",
layerPreviewLoading: "正在載入地圖...",
layerPreviewCustomCrs: "自訂 EPSG…",
layerPreviewCustomCrsPlaceholder: "EPSG 代碼",
layerPreviewUnsupportedCrs: "不支援的座標系:EPSG:{srid}",
layerPreviewCrsManual: "座標系:手動",
layerPreviewCrsDetected: "座標系:已偵測",
layerPreviewCrsAssumed: "座標系:預設 WGS 84",
insertRowsNotSupported: "目前的儲存目標不支援新增資料列。", insertRowsNotSupported: "目前的儲存目標不支援新增資料列。",
zoomIn: "放大", zoomIn: "放大",
zoomOut: "縮小", zoomOut: "縮小",
@@ -0,0 +1,40 @@
import { describe, expect, it } from "vitest";
import { renderGeometryFeaturesIndependently } from "@/lib/dataGrid/geometryLayerPreview";
describe("renderGeometryFeaturesIndependently", () => {
it("keeps valid mixed-SRID layers when other features are unsupported or throw", () => {
const added: string[] = [];
const errors: unknown[] = [];
const summary = renderGeometryFeaturesIndependently(
[
{ id: "wgs84", srid: 4326 },
{ id: "unknown", srid: null },
{ id: "broken", srid: 3857 },
{ id: "mercator", srid: 3857 },
],
(feature) => {
if (feature.srid === null) return null;
if (feature.id === "broken") throw new Error("invalid geometry");
return { layer: feature.id, srid: feature.srid };
},
(layer) => added.push(layer),
(error) => errors.push(error),
);
expect(added).toEqual(["wgs84", "mercator"]);
expect(summary).toEqual({ rendered: 2, skipped: 2, srids: [3857, 4326] });
expect(errors).toHaveLength(1);
});
it("reports an entirely unsupported result without adding layers", () => {
const summary = renderGeometryFeaturesIndependently(
[null, 4490],
() => null,
() => {
throw new Error("must not add a layer");
},
);
expect(summary).toEqual({ rendered: 0, skipped: 2, srids: [] });
});
});
@@ -0,0 +1,101 @@
import { describe, expect, it } from "vitest";
import { buildGeometryMapFeatureCollection } from "@/lib/dataGrid/geometryMapPreview";
import type { PreviewActionContext } from "@/lib/dataGrid/resultPreviewRegistry";
function context(): PreviewActionContext {
return {
result: {
columns: ["shape", "name"],
column_types: ["geometry", "text"],
column_sortables: [],
spatial_columns: [{ column_index: 0, srid: 4326 }],
rows: [
["POINT(116.397 39.908)", "wgs84"],
["POINT(12957254.77 4852618.61)", "mercator"],
["POINT(1 2)", "unknown"],
],
affected_rows: 0,
execution_time_ms: 1,
truncated: false,
has_more: false,
},
selectedRowIds: [],
displayRowRefs: [
{ id: 20, sourceIndex: 1, isNew: false },
{ id: 10, sourceIndex: 0, isNew: false },
{ id: 30, sourceIndex: 2, isNew: false },
],
};
}
describe("buildGeometryMapFeatureCollection", () => {
it("exposes the detected layer SRID and binds row properties by sourceIndex", () => {
const collection = buildGeometryMapFeatureCollection(context());
expect(collection?.detectedSrid).toBe(4326);
expect(collection?.features.map((feature) => feature.properties.name)).toEqual(["mercator", "wgs84", "unknown"]);
});
it("reports detectedSrid null when spatial metadata is absent", () => {
const ctx = context();
ctx.result.spatial_columns = undefined;
const collection = buildGeometryMapFeatureCollection(ctx);
expect(collection?.detectedSrid).toBeNull();
});
it("binds each feature to its own per-cell SRID when the column mixes SRIDs", () => {
const ctx = context();
ctx.result.spatial_columns = [{ column_index: 0, srid: 4326 }];
// Per-cell SRIDs, parallel to rows: wgs84=4326, mercator=3857, unknown=null.
ctx.result.spatial_values = [
[4326, null],
[3857, null],
[null, null],
];
const collection = buildGeometryMapFeatureCollection(ctx);
expect(collection?.features.map((feature) => feature.properties._srid)).toEqual([3857, 4326, null]);
});
it("prefers per-cell SRIDs over column-level hints", () => {
const ctx = context();
ctx.result.spatial_columns = [{ column_index: 0, srid: 3857 }];
ctx.result.spatial_values = [
[4326, null],
[null, null],
[null, null],
];
const collection = buildGeometryMapFeatureCollection(ctx);
// wgs84 row carries its own 4326 even though the column hint says 3857.
expect(collection?.features.find((f) => f.properties.name === "wgs84")?.properties._srid).toBe(4326);
});
it("uses the column-level hint only for legacy results without per-cell metadata", () => {
const ctx = context();
ctx.result.spatial_columns = [{ column_index: 0, srid: 3857 }];
ctx.result.spatial_values = undefined;
const collection = buildGeometryMapFeatureCollection(ctx);
expect(collection?.features.map((feature) => feature.properties._srid)).toEqual([3857, 3857, 3857]);
});
it("deduplicates geometry by SRID and WKT", () => {
const ctx = context();
ctx.result.rows = [
["POINT(1 2)", "wgs84"],
["POINT(1 2)", "mercator"],
["POINT(1 2)", "duplicate wgs84"],
];
ctx.result.spatial_values = [
[4326, null],
[3857, null],
[4326, null],
];
const collection = buildGeometryMapFeatureCollection(ctx);
expect(collection?.features.map((feature) => feature.properties._srid)).toEqual([3857, 4326]);
expect(collection?.features.map((feature) => feature.properties.name)).toEqual(["mercator", "wgs84"]);
});
});
@@ -1,5 +1,5 @@
import { describe, expect, it } from "vitest"; import { describe, expect, it } from "vitest";
import { wktToGeoJson } from "@/lib/dataGrid/geometryPreview"; import { parseWktGeometry, renderGeometryOnCanvas, wktToGeoJson } from "@/lib/dataGrid/geometryPreview";
describe("wktToGeoJson", () => { describe("wktToGeoJson", () => {
it("preserves polygon interior rings", () => { it("preserves polygon interior rings", () => {
@@ -51,4 +51,45 @@ describe("wktToGeoJson", () => {
], ],
}); });
}); });
it("defensively strips an old EWKT prefix", () => {
expect(wktToGeoJson("SRID=4326;POINT(116.397 39.908)")).toEqual({
type: "Point",
coordinates: [116.397, 39.908],
});
expect(parseWktGeometry("SRID=3857;POINT(1 2)")?.type).toBe("POINT");
});
it("rejects a geometry collection when any member cannot be parsed", () => {
expect(wktToGeoJson("GEOMETRYCOLLECTION(POINT(1 2),NOT_A_GEOMETRY(3 4))")).toBeNull();
});
it("fills polygon holes with the even-odd rule", () => {
const fillRules: string[] = [];
const context = {
clearRect() {},
beginPath() {},
moveTo() {},
lineTo() {},
closePath() {},
stroke() {},
arc() {},
fill(rule?: string) {
if (rule) fillRules.push(rule);
},
fillStyle: "",
strokeStyle: "",
font: "",
textAlign: "",
lineWidth: 0,
lineJoin: "",
lineCap: "",
fillText() {},
} as unknown as CanvasRenderingContext2D;
const canvas = { width: 400, height: 280, getContext: () => context } as unknown as HTMLCanvasElement;
const geometry = parseWktGeometry("POLYGON((0 0,10 0,10 10,0 10,0 0),(2 2,8 2,8 8,2 8,2 2))");
expect(geometry).not.toBeNull();
renderGeometryOnCanvas(canvas, geometry!);
expect(fillRules).toContain("evenodd");
});
}); });
@@ -0,0 +1,30 @@
// @vitest-environment happy-dom
import { describe, expect, it } from "vitest";
import L from "leaflet";
import { createBuiltInCoordsToLatLng, prepareCoordsToLatLng } from "@/lib/dataGrid/geometryProjection";
describe("geometry projection", () => {
it("maps equivalent EPSG:4326 and EPSG:3857 points to the same location", () => {
const latLng = L.latLng(39.908, 116.397);
const projected = L.CRS.EPSG3857.project(latLng);
const from4326 = createBuiltInCoordsToLatLng(4326, L)!([116.397, 39.908]);
const from3857 = createBuiltInCoordsToLatLng(3857, L)!([projected.x, projected.y]);
expect(from3857.lat).toBeCloseTo(from4326.lat, 8);
expect(from3857.lng).toBeCloseTo(from4326.lng, 8);
});
it("projects a CGCS2000 zone-40 (EPSG:4528) easting near 120E", async () => {
const toLatLng = await prepareCoordsToLatLng(4528, L);
expect(toLatLng).not.toBeNull();
const ll = toLatLng!([40_500_000, 2_600_000]); // zone-40 false easting, ~lon 120
expect(ll.lng).toBeCloseTo(120, 1);
expect(ll.lat).toBeGreaterThan(0);
});
it("returns no converter for missing and unsupported spatial references", async () => {
expect(createBuiltInCoordsToLatLng(null, L)).toBeNull();
await expect(prepareCoordsToLatLng(2154, L)).resolves.toBeNull();
});
});
@@ -0,0 +1,40 @@
import { describe, it, expect } from "vitest";
import { getSpatialReference, SHORTLIST_SRIDS } from "@/lib/dataGrid/spatialReferenceCatalog";
describe("spatialReferenceCatalog", () => {
it("resolves WGS84 and Web Mercator natively", () => {
expect(getSpatialReference(4326)?.kind).toBe("lnglat");
expect(getSpatialReference(3857)?.kind).toBe("webmercator");
});
it("resolves CGCS2000 3-degree zone 40 (4528) with false easting 40500000", () => {
const entry = getSpatialReference(4528);
expect(entry?.kind).toBe("proj4");
expect(entry?.proj4).toContain("+lon_0=120");
expect(entry?.proj4).toContain("+x_0=40500000 ");
});
it("resolves CGCS2000 3-degree CM 120E (4549) with false easting 500000", () => {
const entry = getSpatialReference(4549);
expect(entry?.proj4).toContain("+lon_0=120");
expect(entry?.proj4).toContain("+x_0=500000 ");
});
it("resolves CGCS2000 3-degree CM 114E (4547) with false easting 500000", () => {
const entry = getSpatialReference(4547);
expect(entry?.proj4).toContain("+lon_0=114");
expect(entry?.proj4).toContain("+x_0=500000 ");
});
it("treats CGCS2000 geographic (4490) as lng/lat", () => {
expect(getSpatialReference(4490)?.kind).toBe("lnglat");
});
it("returns null for codes outside the offline subset", () => {
expect(getSpatialReference(2154)).toBeNull();
});
it("shortlist starts with 4326 and 3857", () => {
expect(SHORTLIST_SRIDS.slice(0, 2)).toEqual([4326, 3857]);
});
});
@@ -144,6 +144,25 @@ describe("tab result cache statement execution metadata", () => {
}); });
}); });
it("preserves spatial metadata", () => {
const encoded = encodeTabResultSnapshot({
result: {
columns: ["geom"],
column_types: ["geometry"],
spatial_columns: [{ column_index: 0, srid: 4326 }],
spatial_values: [[4326], [3857], [null]],
rows: [["POINT(116.397 39.908)"], ["POINT(12957255 4852583)"], [null]],
affected_rows: 0,
execution_time_ms: 1,
},
cachedAt: 1,
});
const result = decodeTabResultSnapshot(encoded).result;
expect(result?.spatial_columns).toEqual([{ column_index: 0, srid: 4326 }]);
expect(result?.spatial_values).toEqual([[4326], [3857], [null]]);
});
it("restores multi-result, pagination, local-sort, and editable metadata fixtures", () => { it("restores multi-result, pagination, local-sort, and editable metadata fixtures", () => {
const restored = decodeTabResultSnapshot(encodeTabResultSnapshot(queryResultLifecycleSnapshot())); const restored = decodeTabResultSnapshot(encodeTabResultSnapshot(queryResultLifecycleSnapshot()));
@@ -0,0 +1,35 @@
export interface PreparedGeometryLayer<TLayer> {
layer: TLayer;
srid: number;
}
export interface GeometryLayerRenderSummary {
rendered: number;
skipped: number;
srids: number[];
}
/** Render features independently so one malformed geometry cannot hide valid layers. */
export function renderGeometryFeaturesIndependently<TFeature, TLayer>(features: readonly TFeature[], prepareLayer: (feature: TFeature) => PreparedGeometryLayer<TLayer> | null, addLayer: (layer: TLayer) => void, onError?: (error: unknown) => void): GeometryLayerRenderSummary {
let rendered = 0;
let skipped = 0;
const srids = new Set<number>();
for (const feature of features) {
try {
const prepared = prepareLayer(feature);
if (!prepared) {
skipped++;
continue;
}
addLayer(prepared.layer);
rendered++;
srids.add(prepared.srid);
} catch (error) {
skipped++;
onError?.(error);
}
}
return { rendered, skipped, srids: Array.from(srids).sort((a, b) => a - b) };
}
@@ -1,8 +1,21 @@
import { Map as MapIcon } from "@lucide/vue"; import { Map as MapIcon } from "@lucide/vue";
import { registerPreviewAction } from "@/lib/dataGrid/resultPreviewRegistry"; import { registerPreviewAction, type PreviewActionContext } from "@/lib/dataGrid/resultPreviewRegistry";
import { wktToGeoJson } from "@/lib/dataGrid/geometryPreview"; import { wktToGeoJson, type GeoJsonGeometry } from "@/lib/dataGrid/geometryPreview";
import LayerPreviewDialog from "@/components/grid/LayerPreviewDialog.vue"; import LayerPreviewDialog from "@/components/grid/LayerPreviewDialog.vue";
export interface GeometryMapFeature {
type: "Feature";
geometry: GeoJsonGeometry;
properties: Record<string, unknown>;
}
export interface GeometryMapFeatureCollection {
type: "FeatureCollection";
features: GeometryMapFeature[];
/** First non-null SRID among rendered features' columns, or null if unknown. */
detectedSrid: number | null;
}
registerPreviewAction({ registerPreviewAction({
id: "geometry-map-preview", id: "geometry-map-preview",
label: "grid.layerPreview", label: "grid.layerPreview",
@@ -17,59 +30,63 @@ registerPreviewAction({
}); });
}, },
execute(ctx) { execute(ctx) {
const geomIndices = geometryColumnIndices(ctx.result.column_types); const featureCollection = buildGeometryMapFeatureCollection(ctx);
if (geomIndices.length === 0) return null; if (!featureCollection) return null;
const features: Record<string, any>[] = [];
const seen = new Set<string>();
for (const ref of ctx.displayRowRefs) {
if (ref.isNew) continue;
// Only include selected rows if there's an active selection
if (ctx.selectedRowIds.length > 0 && !ctx.selectedRowIds.includes(ref.id)) continue;
const row = ctx.result.rows[ref.sourceIndex];
if (!row) continue;
for (const colIdx of geomIndices) {
const raw = row[colIdx];
if (raw === null || raw === undefined) continue;
const wkt = String(raw);
if (wkt.startsWith("0x") || seen.has(wkt)) continue;
seen.add(wkt);
const geom = wktToGeoJson(wkt);
if (geom) {
// Include all non-geometry column values as properties for labelling.
const props: Record<string, any> = {
_column: ctx.result.columns[colIdx],
_row: ref.sourceIndex,
};
for (let c = 0; c < ctx.result.columns.length; c++) {
if (geomIndices.includes(c)) continue; // skip geometry columns
const colName = ctx.result.columns[c] ?? `col_${c}`;
const val = row[c];
props[colName] = val ?? null;
}
features.push({
type: "Feature",
geometry: geom,
properties: props,
});
}
}
}
if (features.length === 0) return null;
const fc = { type: "FeatureCollection", features };
return { return {
component: LayerPreviewDialog, component: LayerPreviewDialog,
props: { props: {
geojson: JSON.stringify(fc), geojson: JSON.stringify(featureCollection),
}, },
}; };
}, },
}); });
export function buildGeometryMapFeatureCollection(ctx: PreviewActionContext): GeometryMapFeatureCollection | null {
const geomIndices = geometryColumnIndices(ctx.result.column_types);
if (geomIndices.length === 0) return null;
const features: GeometryMapFeature[] = [];
const seen = new Set<string>();
const sridByColumn = new Map<number, number | null>((ctx.result.spatial_columns ?? []).map((entry) => [entry.column_index, entry.srid]));
const spatialValues = ctx.result.spatial_values;
let detectedSrid: number | null = null;
for (const ref of ctx.displayRowRefs) {
if (ref.isNew) continue;
if (ctx.selectedRowIds.length > 0 && !ctx.selectedRowIds.includes(ref.id)) continue;
const row = ctx.result.rows[ref.sourceIndex];
if (!row) continue;
for (const colIdx of geomIndices) {
const raw = row[colIdx];
if (raw === null || raw === undefined) continue;
const wkt = String(raw);
if (wkt.startsWith("0x")) continue;
const srid = spatialValues === undefined ? (sridByColumn.get(colIdx) ?? null) : (spatialValues[ref.sourceIndex]?.[colIdx] ?? null);
const geometryKey = JSON.stringify([srid, wkt]);
if (seen.has(geometryKey)) continue;
seen.add(geometryKey);
const geometry = wktToGeoJson(wkt);
if (!geometry) continue;
if (detectedSrid == null && srid != null) detectedSrid = srid;
const properties: Record<string, unknown> = {
_column: ctx.result.columns[colIdx],
_row: ref.sourceIndex,
_srid: srid,
};
for (let c = 0; c < ctx.result.columns.length; c++) {
if (geomIndices.includes(c)) continue;
const columnName = ctx.result.columns[c] ?? `col_${c}`;
properties[columnName] = row[c] ?? null;
}
features.push({ type: "Feature", geometry, properties });
}
}
return features.length > 0 ? { type: "FeatureCollection", features, detectedSrid } : null;
}
function geometryColumnIndices(columnTypes: readonly string[] | undefined): number[] { function geometryColumnIndices(columnTypes: readonly string[] | undefined): number[] {
if (!columnTypes) return []; if (!columnTypes) return [];
const indices: number[] = []; const indices: number[] = [];
@@ -1,6 +1,12 @@
type Coord = [number, number]; export type Coord = [number, number];
interface GeometryGroup { export interface ParsedWktGeometry {
type: string;
groups: GeometryGroup[];
coordinates: Coord[];
}
export interface GeometryGroup {
coords: Coord[]; coords: Coord[];
children: GeometryGroup[]; children: GeometryGroup[];
} }
@@ -112,20 +118,18 @@ function extractCoords(g: GeometryGroup): Coord[] {
function drawPolygonRings(ctx: CanvasRenderingContext2D, group: GeometryGroup, mapX: (v: number) => number, mapY: (v: number) => number) { function drawPolygonRings(ctx: CanvasRenderingContext2D, group: GeometryGroup, mapX: (v: number) => number, mapY: (v: number) => number) {
// group.children contains ring groups // group.children contains ring groups
const rings = group.children.length > 0 ? group.children : [group]; const rings = group.children.length > 0 ? group.children : [group];
let ringIndex = 0; ctx.beginPath();
for (const ringGroup of rings) { for (const ringGroup of rings) {
const coords = extractCoords(ringGroup); const coords = extractCoords(ringGroup);
if (coords.length < 2) continue; if (coords.length < 2) continue;
ctx.beginPath();
ctx.moveTo(mapX(coords[0][0]), mapY(coords[0][1])); ctx.moveTo(mapX(coords[0][0]), mapY(coords[0][1]));
for (let j = 1; j < coords.length; j++) { for (let j = 1; j < coords.length; j++) {
ctx.lineTo(mapX(coords[j][0]), mapY(coords[j][1])); ctx.lineTo(mapX(coords[j][0]), mapY(coords[j][1]));
} }
ctx.closePath(); ctx.closePath();
if (ringIndex === 0) ctx.fill();
ctx.stroke();
ringIndex++;
} }
ctx.fill("evenodd");
ctx.stroke();
} }
function drawGroups(ctx: CanvasRenderingContext2D, groups: GeometryGroup[], type: string, mapX: (v: number) => number, mapY: (v: number) => number) { function drawGroups(ctx: CanvasRenderingContext2D, groups: GeometryGroup[], type: string, mapX: (v: number) => number, mapY: (v: number) => number) {
@@ -201,12 +205,72 @@ function detectWktType(wkt: string): string {
return m ? m[1].toUpperCase() : "GEOMETRYCOLLECTION"; return m ? m[1].toUpperCase() : "GEOMETRYCOLLECTION";
} }
function cleanWktInput(wkt: string): string {
const trimmed = wkt.trim();
const ewkt = trimmed.match(/^SRID=\d+\s*;\s*/i);
return ewkt ? trimmed.slice(ewkt[0].length).trim() : trimmed;
}
// EWKB parsing on the backend can fall back to hex for unsupported geometry types // EWKB parsing on the backend can fall back to hex for unsupported geometry types
// (e.g. TIN, Triangle, CircularString). Don't attempt to render hex as WKT. // (e.g. TIN, Triangle, CircularString). Don't attempt to render hex as WKT.
export function isHexGeometry(value: string): boolean { export function isHexGeometry(value: string): boolean {
return value.startsWith("0x"); return value.startsWith("0x");
} }
export function parseWktGeometry(wkt: string): ParsedWktGeometry | null {
const cleaned = cleanWktInput(wkt);
if (!cleaned || isHexGeometry(cleaned)) return null;
const type = detectWktType(cleaned);
const tokens = tokenize(cleaned);
const { groups } = parseGroups(tokens, 0);
const coordinates = flattenCoords(groups).filter(([x, y]) => Number.isFinite(x) && Number.isFinite(y));
return groups.length > 0 || /\bEMPTY\b/i.test(cleaned) ? { type, groups, coordinates } : null;
}
export function renderGeometryOnCanvas(canvas: HTMLCanvasElement, geometry: ParsedWktGeometry): void {
const allCoords = geometry.coordinates;
const ctx = canvas.getContext("2d");
if (!ctx) return;
const W = canvas.width;
const H = canvas.height;
const pad = 20;
ctx.clearRect(0, 0, W, H);
if (allCoords.length === 0) {
ctx.fillStyle = "#888";
ctx.font = "12px sans-serif";
ctx.textAlign = "center";
ctx.fillText("Empty geometry", W / 2, H / 2);
return;
}
let minX = Infinity,
maxX = -Infinity,
minY = Infinity,
maxY = -Infinity;
for (const [x, y] of allCoords) {
minX = Math.min(minX, x);
maxX = Math.max(maxX, x);
minY = Math.min(minY, y);
maxY = Math.max(maxY, y);
}
if (minX === maxX && minY === maxY) {
minX -= 1;
maxX += 1;
minY -= 1;
maxY += 1;
}
const scale = Math.min((W - pad * 2) / (maxX - minX || 1), (H - pad * 2) / (maxY - minY || 1));
const midX = (minX + maxX) / 2;
const midY = (minY + maxY) / 2;
const mapX = (x: number) => (x - midX) * scale + W / 2;
const mapY = (y: number) => -(y - midY) * scale + H / 2;
ctx.strokeStyle = "#3b82f6";
ctx.fillStyle = "rgba(59, 130, 246, 0.15)";
ctx.lineWidth = 1.5;
ctx.lineJoin = "round";
ctx.lineCap = "round";
drawGroups(ctx, geometry.groups, geometry.type, mapX, mapY);
}
export function renderWktOnCanvas(canvas: HTMLCanvasElement, wkt: string): void { export function renderWktOnCanvas(canvas: HTMLCanvasElement, wkt: string): void {
if (isHexGeometry(wkt)) { if (isHexGeometry(wkt)) {
const ctx = canvas.getContext("2d"); const ctx = canvas.getContext("2d");
@@ -219,70 +283,15 @@ export function renderWktOnCanvas(canvas: HTMLCanvasElement, wkt: string): void
return; return;
} }
const type = detectWktType(wkt); const geometry = parseWktGeometry(wkt);
const tokens = tokenize(wkt); if (geometry) renderGeometryOnCanvas(canvas, geometry);
const { groups } = parseGroups(tokens, 0);
const allCoords = flattenCoords(groups);
const ctx = canvas.getContext("2d");
if (!ctx) return;
const W = canvas.width;
const H = canvas.height;
const pad = 20;
ctx.clearRect(0, 0, W, H);
if (allCoords.length === 0) {
ctx.fillStyle = "#888";
ctx.font = "12px sans-serif";
ctx.textAlign = "center";
ctx.fillText("Empty geometry", W / 2, H / 2);
return;
}
let minX = Infinity,
maxX = -Infinity,
minY = Infinity,
maxY = -Infinity;
for (const [x, y] of allCoords) {
if (x < minX) minX = x;
if (x > maxX) maxX = x;
if (y < minY) minY = y;
if (y > maxY) maxY = y;
}
if (minX === maxX && minY === maxY) {
minX -= 1;
maxX += 1;
minY -= 1;
maxY += 1;
}
const rangeX = maxX - minX || 1;
const rangeY = maxY - minY || 1;
const scale = Math.min((W - pad * 2) / rangeX, (H - pad * 2) / rangeY);
const midX = (minX + maxX) / 2;
const midY = (minY + maxY) / 2;
const mapX = (x: number) => (x - midX) * scale + W / 2;
const mapY = (y: number) => -(y - midY) * scale + H / 2;
ctx.strokeStyle = "#3b82f6";
ctx.fillStyle = "rgba(59, 130, 246, 0.15)";
ctx.lineWidth = 1.5;
ctx.lineJoin = "round";
ctx.lineCap = "round";
drawGroups(ctx, groups, type, mapX, mapY);
} }
/** GeoJSON geometry type. */ /** GeoJSON geometry type. */
export interface GeoJsonGeometry { export interface GeoJsonGeometry {
type: string; type: string;
coordinates?: any; coordinates?: any;
geometries?: (GeoJsonGeometry | null)[]; geometries?: GeoJsonGeometry[];
} }
/** /**
@@ -290,10 +299,11 @@ export interface GeoJsonGeometry {
* Returns `null` for binary (hex) geometries or parse failures. * Returns `null` for binary (hex) geometries or parse failures.
*/ */
export function wktToGeoJson(wkt: string): GeoJsonGeometry | null { export function wktToGeoJson(wkt: string): GeoJsonGeometry | null {
if (isHexGeometry(wkt)) return null; const cleaned = cleanWktInput(wkt);
const type = detectWktType(wkt); if (isHexGeometry(cleaned)) return null;
if (type === "GEOMETRYCOLLECTION") return geometryCollectionToGeoJson(wkt); const type = detectWktType(cleaned);
const tokens = tokenize(wkt); if (type === "GEOMETRYCOLLECTION") return geometryCollectionToGeoJson(cleaned);
const tokens = tokenize(cleaned);
const { groups } = parseGroups(tokens, 0); const { groups } = parseGroups(tokens, 0);
if (groups.length === 0) return null; if (groups.length === 0) return null;
try { try {
@@ -369,9 +379,11 @@ function geometryCollectionToGeoJson(wkt: string): GeoJsonGeometry | null {
const content = inner.slice(1, -1).trim(); const content = inner.slice(1, -1).trim();
if (!content) return null; if (!content) return null;
const parts = splitGeomCollectionMembers(content); const parts = splitGeomCollectionMembers(content);
const geometries = parts.map((part) => wktToGeoJson(part));
if (geometries.some((geometry) => geometry === null)) return null;
return { return {
type: "GeometryCollection", type: "GeometryCollection",
geometries: parts.map((p) => wktToGeoJson(p)), geometries: geometries as GeoJsonGeometry[],
}; };
} }
@@ -0,0 +1,48 @@
import type L from "leaflet";
import type { Coord } from "@/lib/dataGrid/geometryPreview";
import { getSpatialReference } from "@/lib/dataGrid/spatialReferenceCatalog";
export type CoordinateToLatLng = (coord: Coord) => L.LatLng;
type CoordinateTransform = (coord: Coord) => Coord;
const transformPromises = new Map<number, Promise<CoordinateTransform>>();
export function createBuiltInCoordsToLatLng(srid: number | null | undefined, leaflet: typeof L): CoordinateToLatLng | null {
if (srid == null) return null;
const entry = getSpatialReference(srid);
if (entry?.kind === "lnglat") return (coord) => leaflet.latLng(coord[1], coord[0]);
if (entry?.kind === "webmercator") return (coord) => leaflet.CRS.EPSG3857.unproject(leaflet.point(coord[0], coord[1]));
return null;
}
export async function prepareCoordsToLatLng(srid: number | null | undefined, leaflet: typeof L): Promise<CoordinateToLatLng | null> {
const builtIn = createBuiltInCoordsToLatLng(srid, leaflet);
if (builtIn) return builtIn;
if (srid == null) return null;
const entry = getSpatialReference(srid);
if (!entry || entry.kind !== "proj4" || !entry.proj4) return null;
let transformPromise = transformPromises.get(srid);
if (!transformPromise) {
transformPromise = loadCoordinateTransform(srid, entry.proj4);
transformPromises.set(srid, transformPromise);
transformPromise.catch(() => transformPromises.delete(srid));
}
const transform = await transformPromise;
return (coord) => {
const [longitude, latitude] = transform(coord);
return leaflet.latLng(latitude, longitude);
};
}
async function loadCoordinateTransform(srid: number, definition: string): Promise<CoordinateTransform> {
const { default: proj4 } = await import("proj4");
const source = `EPSG:${srid}`;
proj4.defs(source, definition);
const converter = proj4(source, "EPSG:4326");
return ([x, y]) => {
const [longitude, latitude] = converter.forward([x, y]);
return [longitude, latitude];
};
}
@@ -0,0 +1,57 @@
export interface SpatialReferenceEntry {
srid: number;
label: string;
kind: "lnglat" | "webmercator" | "proj4";
/** proj4 definition string for kind === "proj4". */
proj4?: string;
}
const GRS80 = "+ellps=GRS80 +towgs84=0,0,0 +units=m +no_defs";
/** CGCS2000 Gauss-Kruger definitions follow the official EPSG parameters. */
function gaussKruger(lon0: number, falseEasting: number): string {
return `+proj=tmerc +lat_0=0 +lon_0=${lon0} +k=1 +x_0=${falseEasting} +y_0=0 ${GRS80}`;
}
const entries = new Map<number, SpatialReferenceEntry>();
function add(entry: SpatialReferenceEntry) {
entries.set(entry.srid, entry);
}
// Geographic / native
add({ srid: 4326, label: "WGS 84 (EPSG:4326)", kind: "lnglat" });
add({ srid: 4490, label: "CGCS2000 geographic (EPSG:4490)", kind: "lnglat" });
add({ srid: 3857, label: "Web Mercator (EPSG:3857)", kind: "webmercator" });
add({ srid: 3395, label: "World Mercator (EPSG:3395)", kind: "proj4", proj4: `+proj=merc +lon_0=0 +k=1 +x_0=0 +y_0=0 ${GRS80}` });
// CGCS2000 3-degree Gauss-Kruger, ZONE-numbered series: EPSG 4513..4533, zones 25..45.
// x_0 = zone*1e6 + 500000 — the leading digits encode the zone (e.g. 4528 = zone 40, x_0=40500000).
for (let code = 4513; code <= 4533; code++) {
const zone = 25 + (code - 4513);
add({ srid: code, label: `CGCS2000 3-degree GK zone ${zone} · CM ${zone * 3}E (EPSG:${code})`, kind: "proj4", proj4: gaussKruger(zone * 3, zone * 1_000_000 + 500_000) });
}
// CGCS2000 3-degree Gauss-Kruger, CM (no zone prefix) series: EPSG 4534..4554, CM 75E..135E, x_0=500000
// (e.g. 4547 = CM 114E, 4549 = CM 120E).
for (let code = 4534; code <= 4554; code++) {
const lon0 = 75 + (code - 4534) * 3;
add({ srid: code, label: `CGCS2000 3-degree GK CM ${lon0}E (EPSG:${code})`, kind: "proj4", proj4: gaussKruger(lon0, 500000) });
}
// CGCS2000 6-degree Gauss-Kruger, ZONE-numbered series: EPSG 4491..4501, zones 13..23.
// x_0 = zone*1e6 + 500000.
for (let code = 4491; code <= 4501; code++) {
const zone = 13 + (code - 4491);
add({ srid: code, label: `CGCS2000 6-degree GK zone ${zone} · CM ${zone * 6 - 3}E (EPSG:${code})`, kind: "proj4", proj4: gaussKruger(zone * 6 - 3, zone * 1_000_000 + 500_000) });
}
// CGCS2000 6-degree Gauss-Kruger, CM (no zone prefix) series: EPSG 4502..4512, CM 75E..135E, x_0=500000
for (let code = 4502; code <= 4512; code++) {
const lon0 = 75 + (code - 4502) * 6;
add({ srid: code, label: `CGCS2000 6-degree GK CM ${lon0}E (EPSG:${code})`, kind: "proj4", proj4: gaussKruger(lon0, 500000) });
}
export function getSpatialReference(srid: number): SpatialReferenceEntry | null {
return entries.get(srid) ?? null;
}
/** Curated dropdown order: WGS84, Web Mercator, then common CGCS2000 zones. */
export const SHORTLIST_SRIDS: number[] = [4326, 3857, 4490, 4528, 4549, 4526, 4547];
@@ -46,6 +46,8 @@ export interface TabResultSnapshot {
interface ColumnarQueryResult { interface ColumnarQueryResult {
columns: string[]; columns: string[];
spatial_columns?: QueryResult["spatial_columns"];
spatial_values?: QueryResult["spatial_values"];
execution_error?: true; execution_error?: true;
statement_index?: number; statement_index?: number;
column_types?: string[]; column_types?: string[];
@@ -324,6 +326,8 @@ function stripSessionIds(result: QueryResult | undefined): QueryResult | undefin
execution_error: result.execution_error, execution_error: result.execution_error,
statement_index: result.statement_index, statement_index: result.statement_index,
column_types: result.column_types ? [...result.column_types] : undefined, column_types: result.column_types ? [...result.column_types] : undefined,
spatial_columns: result.spatial_columns?.map((entry) => ({ column_index: entry.column_index, srid: entry.srid })),
spatial_values: result.spatial_values?.map((row) => [...row]),
rows: result.rows.map((row) => [...row]), rows: result.rows.map((row) => [...row]),
mongo_documents: result.mongo_documents ? clonePlain(result.mongo_documents) : undefined, mongo_documents: result.mongo_documents ? clonePlain(result.mongo_documents) : undefined,
mongo_copy_documents: result.mongo_copy_documents ? clonePlain(result.mongo_copy_documents) : undefined, mongo_copy_documents: result.mongo_copy_documents ? clonePlain(result.mongo_copy_documents) : undefined,
@@ -363,6 +367,8 @@ function toColumnarResult(result: QueryResult | undefined): ColumnarQueryResult
execution_error: result.execution_error, execution_error: result.execution_error,
statement_index: result.statement_index, statement_index: result.statement_index,
column_types: result.column_types ? [...result.column_types] : undefined, column_types: result.column_types ? [...result.column_types] : undefined,
spatial_columns: result.spatial_columns?.map((entry) => ({ column_index: entry.column_index, srid: entry.srid })),
spatial_values: result.spatial_values?.map((row) => [...row]),
columnValues, columnValues,
rowCount: result.rows.length, rowCount: result.rows.length,
mongo_documents: result.mongo_documents ? clonePlain(result.mongo_documents) : undefined, mongo_documents: result.mongo_documents ? clonePlain(result.mongo_documents) : undefined,
@@ -386,6 +392,8 @@ function fromColumnarResult(result: ColumnarQueryResult | undefined): QueryResul
execution_error: result.execution_error, execution_error: result.execution_error,
statement_index: result.statement_index, statement_index: result.statement_index,
column_types: result.column_types ? [...result.column_types] : undefined, column_types: result.column_types ? [...result.column_types] : undefined,
spatial_columns: result.spatial_columns?.map((entry) => ({ column_index: entry.column_index, srid: entry.srid })),
spatial_values: result.spatial_values?.map((row) => [...row]),
rows, rows,
mongo_documents: result.mongo_documents ? clonePlain(result.mongo_documents) : undefined, mongo_documents: result.mongo_documents ? clonePlain(result.mongo_documents) : undefined,
mongo_copy_documents: result.mongo_copy_documents ? clonePlain(result.mongo_copy_documents) : undefined, mongo_copy_documents: result.mongo_copy_documents ? clonePlain(result.mongo_copy_documents) : undefined,
@@ -0,0 +1,42 @@
import { describe, it, expect } from "vitest";
import { appendQueryResultSegment } from "@/stores/queryStore";
import type { QueryResult } from "@/types/database";
function make(rows: number, spatial?: QueryResult["spatial_columns"]): QueryResult {
return {
columns: ["geom"],
column_types: ["geometry"],
spatial_columns: spatial,
rows: Array.from({ length: rows }, (_, i) => [`POINT(${i} ${i})`]),
affected_rows: 0,
execution_time_ms: 0,
} as unknown as QueryResult;
}
describe("appendQueryResultSegment spatial merge", () => {
it("keeps the first non-null SRID per column across pages", () => {
const previous = make(2, [{ column_index: 0, srid: 4326 }]);
const segment = make(2, [{ column_index: 0, srid: 3857 }]);
const merged = appendQueryResultSegment(previous, segment, 100);
expect(merged.spatial_columns).toEqual([{ column_index: 0, srid: 4326 }]);
expect(merged.rows).toHaveLength(4);
});
it("adopts the segment SRID when the previous page was unknown", () => {
const previous = make(1, [{ column_index: 0, srid: null }]);
const segment = make(1, [{ column_index: 0, srid: 4490 }]);
const merged = appendQueryResultSegment(previous, segment, 100);
expect(merged.spatial_columns).toEqual([{ column_index: 0, srid: 4490 }]);
});
it("concatenates per-cell SRIDs across pages without collapsing", () => {
const previous = make(2, [{ column_index: 0, srid: 4326 }]);
previous.spatial_values = [[4326], [3857]];
const segment = make(2, [{ column_index: 0, srid: null }]);
segment.spatial_values = [[3857], [4490]];
const merged = appendQueryResultSegment(previous, segment, 100);
// Every row keeps its own SRID; a later page does not overwrite earlier cells.
expect(merged.spatial_values).toEqual([[4326], [3857], [3857], [4490]]);
});
});
+14 -1
View File
@@ -157,7 +157,7 @@ function exactTotalFromIncompletePage(result: QueryResult, pageLimit: number | u
return (pageOffset ?? 0) + result.rows.length; return (pageOffset ?? 0) + result.rows.length;
} }
function appendQueryResultSegment(previous: QueryResult, segment: QueryResult, maxRows: number): QueryResult { export function appendQueryResultSegment(previous: QueryResult, segment: QueryResult, maxRows: number): QueryResult {
if (segment.execution_error) throw new Error(String(segment.rows[0]?.[0] ?? "Failed to load the next result segment")); if (segment.execution_error) throw new Error(String(segment.rows[0]?.[0] ?? "Failed to load the next result segment"));
if (previous.columns.length !== segment.columns.length || previous.columns.some((column, index) => column !== segment.columns[index])) { if (previous.columns.length !== segment.columns.length || previous.columns.some((column, index) => column !== segment.columns[index])) {
throw new Error("Result columns changed while loading the next segment"); throw new Error("Result columns changed while loading the next segment");
@@ -169,12 +169,25 @@ function appendQueryResultSegment(previous: QueryResult, segment: QueryResult, m
if (existing.length !== previous.rows.length || next.length !== segment.rows.length) return undefined; if (existing.length !== previous.rows.length || next.length !== segment.rows.length) return undefined;
return [...existing, ...next.slice(0, appendedRowCount)]; return [...existing, ...next.slice(0, appendedRowCount)];
}; };
const sridByColumn = new Map<number, number | null>();
for (const column of previous.spatial_columns ?? []) {
sridByColumn.set(column.column_index, column.srid);
}
for (const column of segment.spatial_columns ?? []) {
const existing = sridByColumn.get(column.column_index) ?? null;
sridByColumn.set(column.column_index, existing ?? column.srid);
}
const spatial_columns = Array.from(sridByColumn.entries())
.map(([column_index, srid]) => ({ column_index, srid }))
.sort((a, b) => a.column_index - b.column_index);
// Keep prior row objects intact so source-index based dirty/new/deleted state // Keep prior row objects intact so source-index based dirty/new/deleted state
// remains valid, while bounding the in-memory result by the configured cap. // remains valid, while bounding the in-memory result by the configured cap.
return markQueryResultRowsRaw({ return markQueryResultRowsRaw({
...segment, ...segment,
appended_from_row_count: previous.rows.length, appended_from_row_count: previous.rows.length,
rows: [...previous.rows, ...segment.rows.slice(0, appendedRowCount)], rows: [...previous.rows, ...segment.rows.slice(0, appendedRowCount)],
spatial_columns: spatial_columns.length > 0 ? spatial_columns : undefined,
spatial_values: appendParallelValues(previous.spatial_values, segment.spatial_values),
mongo_documents: appendParallelValues(previous.mongo_documents, segment.mongo_documents), mongo_documents: appendParallelValues(previous.mongo_documents, segment.mongo_documents),
mongo_copy_documents: appendParallelValues(previous.mongo_copy_documents, segment.mongo_copy_documents), mongo_copy_documents: appendParallelValues(previous.mongo_copy_documents, segment.mongo_copy_documents),
execution_time_ms: (previous.execution_time_ms ?? 0) + (segment.execution_time_ms ?? 0), execution_time_ms: (previous.execution_time_ms ?? 0) + (segment.execution_time_ms ?? 0),
+13
View File
@@ -562,6 +562,14 @@ export interface OwnerInfo {
export interface QueryResult { export interface QueryResult {
columns: string[]; columns: string[];
/** One SRID per geometry/geography column (first non-null observed). */
spatial_columns?: SpatialColumn[];
/**
* Per-cell SRID metadata, parallel to `rows`: spatial_values[row][column] is
* that cell's geometry SRID, or null for non-spatial cells / unknown SRIDs.
* Every geometry value keeps its own SRID so mixed-SRID results stay correct.
*/
spatial_values?: (number | null)[][];
/** Internal marker for a result built by appending a page to existing rows. */ /** Internal marker for a result built by appending a page to existing rows. */
appended_from_row_count?: number; appended_from_row_count?: number;
/** Set for synthesized query execution failures. */ /** Set for synthesized query execution failures. */
@@ -636,6 +644,11 @@ export interface BatchSqlExecution {
items: BatchStatementExecutionItem[]; items: BatchStatementExecutionItem[];
} }
export interface SpatialColumn {
column_index: number;
srid: number | null;
}
export interface QueryResultRun { export interface QueryResultRun {
id: string; id: string;
title: string; title: string;
+2
View File
@@ -903,6 +903,8 @@ mod tests {
columns: Vec::new(), columns: Vec::new(),
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: Vec::new(), rows: Vec::new(),
affected_rows: 2, affected_rows: 2,
execution_time_ms: 0, execution_time_ms: 0,
+2
View File
@@ -4427,6 +4427,8 @@ mod tests {
columns: vec!["datcompatibility".to_string()], columns: vec!["datcompatibility".to_string()],
column_types: vec!["text".to_string()], column_types: vec!["text".to_string()],
column_sortables: vec![true], column_sortables: vec![true],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![vec![serde_json::json!("M")]], rows: vec![vec![serde_json::json!("M")]],
affected_rows: 0, affected_rows: 0,
execution_time_ms: 1, execution_time_ms: 1,
+1 -1
View File
@@ -880,7 +880,7 @@ fn is_export_insert_column(
) -> bool { ) -> bool {
!is_internal_export_column(database_type, column) !is_internal_export_column(database_type, column)
&& !is_postgres_tsvector_export_column(database_type, column_type) && !is_postgres_tsvector_export_column(database_type, column_type)
&& !(database_type == Some(DatabaseType::Mysql) && is_mysql_generated_column_extra(column_extra)) && (database_type != Some(DatabaseType::Mysql) || !is_mysql_generated_column_extra(column_extra))
} }
fn is_postgres_json_export_column(database_type: Option<DatabaseType>, column_type: Option<&str>) -> bool { fn is_postgres_json_export_column(database_type: Option<DatabaseType>, column_type: Option<&str>) -> bool {
@@ -487,6 +487,8 @@ fn limited_query_result(result: ChJsonResult, execution_time_ms: u128, max_rows:
columns, columns,
column_types, column_types,
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows, rows,
affected_rows: 0, affected_rows: 0,
execution_time_ms, execution_time_ms,
@@ -656,6 +658,8 @@ pub async fn execute_query_with_max_rows(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: 0, affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -349,6 +349,8 @@ fn query_result(
columns: result.columns, columns: result.columns,
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: result.rows, rows: result.rows,
affected_rows, affected_rows,
execution_time_ms, execution_time_ms,
@@ -1293,6 +1293,8 @@ fn parse_elasticsearch_response_with_sql_parser(
columns, columns,
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows, rows,
affected_rows: row_count, affected_rows: row_count,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -1316,6 +1318,8 @@ fn parse_elasticsearch_response_with_sql_parser(
columns, columns,
column_types, column_types,
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows, rows,
affected_rows: row_count, affected_rows: row_count,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -1485,6 +1489,8 @@ fn raw_json_response_result(
columns: vec!["status".to_string(), "response".to_string()], columns: vec!["status".to_string(), "response".to_string()],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![vec![serde_json::Value::Number(status.into()), serde_json::Value::String(body_text.into())]], rows: vec![vec![serde_json::Value::Number(status.into()), serde_json::Value::String(body_text.into())]],
affected_rows: 0, affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -1549,6 +1555,8 @@ fn parse_elasticsearch_rest_response_with_sql_parser(
columns: vec!["response".to_string()], columns: vec!["response".to_string()],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows, rows,
affected_rows, affected_rows,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -1980,6 +1988,8 @@ pub(crate) fn parse_tabular_sql_response(
columns: column_names, columns: column_names,
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: result_rows, rows: result_rows,
affected_rows: total_key affected_rows: total_key
.and_then(|key| body.get(key)) .and_then(|key| body.get(key))
@@ -476,6 +476,8 @@ pub async fn execute_query(client: &InfluxdbClient, database: &str, sql: &str) -
columns: s.columns.clone(), columns: s.columns.clone(),
column_types: vec![], column_types: vec![],
column_sortables: s.columns.iter().map(|_| false).collect(), column_sortables: s.columns.iter().map(|_| false).collect(),
spatial_columns: vec![],
spatial_values: vec![],
rows: s.values.clone(), rows: s.values.clone(),
affected_rows: s.values.len() as u64, affected_rows: s.values.len() as u64,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -488,6 +490,8 @@ pub async fn execute_query(client: &InfluxdbClient, database: &str, sql: &str) -
columns: vec![], columns: vec![],
column_types: vec![], column_types: vec![],
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: 0, affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -630,6 +634,8 @@ fn parse_flux_csv(text: &str, start: Instant) -> Result<QueryResult, String> {
let columns = headers.unwrap_or_default(); let columns = headers.unwrap_or_default();
Ok(QueryResult { Ok(QueryResult {
column_sortables: columns.iter().map(|_| false).collect(), column_sortables: columns.iter().map(|_| false).collect(),
spatial_columns: vec![],
spatial_values: vec![],
columns, columns,
column_types: vec![], column_types: vec![],
affected_rows: rows.len() as u64, affected_rows: rows.len() as u64,
+125 -22
View File
@@ -18,7 +18,7 @@ use crate::sql::{starts_with_executable_sql_keyword, starts_with_executable_sql_
use crate::types::{ use crate::types::{
ColumnInfo, CompletionAssistantCandidate, CompletionAssistantCandidateKind, CompletionAssistantMatchMode, ColumnInfo, CompletionAssistantCandidate, CompletionAssistantCandidateKind, CompletionAssistantMatchMode,
CompletionAssistantObjectKind, CompletionAssistantRequest, CompletionAssistantResponse, DatabaseInfo, CompletionAssistantObjectKind, CompletionAssistantRequest, CompletionAssistantResponse, DatabaseInfo,
ForeignKeyInfo, IndexInfo, ObjectInfo, ObjectStatistics, QueryResult, TableInfo, TriggerInfo, ForeignKeyInfo, IndexInfo, ObjectInfo, ObjectStatistics, QueryResult, SpatialColumnBuilder, TableInfo, TriggerInfo,
}; };
use super::file_validator::validate_file_path; use super::file_validator::validate_file_path;
@@ -456,10 +456,8 @@ pub(crate) fn mysql_value_to_json(row: &mysql_async::Row, idx: usize) -> serde_j
return row_get::<Vec<u8>, _>(row, idx) return row_get::<Vec<u8>, _>(row, idx)
.map(|bytes| { .map(|bytes| {
if matches!(column.column_type(), ColumnType::MYSQL_TYPE_GEOMETRY) { if matches!(column.column_type(), ColumnType::MYSQL_TYPE_GEOMETRY) {
// MySQL prefixes geometry WKB with a 4-byte SRID. decode_mysql_geometry(&bytes)
// Strip it before passing to the WKB parser. .map(|geometry| geometry.wkt)
let wkb = if bytes.len() >= 4 { &bytes[4..] } else { &bytes };
super::wkb::wkb_to_wkt(wkb)
.map(serde_json::Value::String) .map(serde_json::Value::String)
.unwrap_or_else(|| super::binary_value_to_json(&bytes)) .unwrap_or_else(|| super::binary_value_to_json(&bytes))
} else { } else {
@@ -504,6 +502,63 @@ pub(crate) fn mysql_value_to_json(row: &mysql_async::Row, idx: usize) -> serde_j
.unwrap_or(serde_json::Value::Null) .unwrap_or(serde_json::Value::Null)
} }
fn decode_mysql_geometry(bytes: &[u8]) -> Option<super::wkb::DecodedGeometry> {
if bytes.len() >= 5 && matches!(bytes[4], 0 | 1) {
let prefix: [u8; 4] = bytes[..4].try_into().ok()?;
if let Some(mut geometry) = super::wkb::decode_wkb_geometry(&bytes[4..]) {
if geometry.srid.is_none() {
let srid = u32::from_le_bytes(prefix);
geometry.srid = (srid != 0).then_some(srid);
}
return Some(geometry);
}
}
super::wkb::decode_wkb_geometry(bytes)
}
fn mysql_spatial_column_builder(columns: &[mysql_async::Column]) -> SpatialColumnBuilder {
SpatialColumnBuilder::new(
columns
.iter()
.enumerate()
.filter_map(|(index, column)| (column.column_type() == ColumnType::MYSQL_TYPE_GEOMETRY).then_some(index)),
)
}
fn mysql_row_to_json_with_srids(
row: &mysql_async::Row,
spatial_columns: &mut SpatialColumnBuilder,
) -> (Vec<serde_json::Value>, Vec<Option<u32>>) {
let mut srids = vec![None; row.len()];
let values = (0..row.len())
.map(|idx| {
let is_geometry = row
.columns_ref()
.get(idx)
.is_some_and(|column| column.column_type() == ColumnType::MYSQL_TYPE_GEOMETRY);
if !is_geometry {
return mysql_value_to_json(row, idx);
}
let Some(bytes) = row_get::<Vec<u8>, _>(row, idx) else {
spatial_columns.observe(idx, None);
return serde_json::Value::Null;
};
match decode_mysql_geometry(&bytes) {
Some(geometry) => {
spatial_columns.observe(idx, geometry.srid);
srids[idx] = geometry.srid;
serde_json::Value::String(geometry.wkt)
}
None => {
spatial_columns.observe(idx, None);
super::binary_value_to_json(&bytes)
}
}
})
.collect();
(values, srids)
}
fn mysql_temporal_value_to_json( fn mysql_temporal_value_to_json(
column_type: ColumnType, column_type: ColumnType,
datetime: Option<NaiveDateTime>, datetime: Option<NaiveDateTime>,
@@ -3540,6 +3595,8 @@ async fn execute_result_set_with_text_protocol_on_conn(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: result.affected_rows(), affected_rows: result.affected_rows(),
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -3551,20 +3608,28 @@ async fn execute_result_set_with_text_protocol_on_conn(
} }
let columns: Vec<String> = result.columns_ref().iter().map(|c| c.name_str().to_string()).collect(); let columns: Vec<String> = result.columns_ref().iter().map(|c| c.name_str().to_string()).collect();
let column_types: Vec<String> = result.columns_ref().iter().map(mysql_column_type_name).collect(); let column_types: Vec<String> = result.columns_ref().iter().map(mysql_column_type_name).collect();
let mut spatial_columns = mysql_spatial_column_builder(result.columns_ref());
if should_collect_text_result_set(sql, row_limit, max_rows) { if should_collect_text_result_set(sql, row_limit, max_rows) {
let rows: Vec<mysql_async::Row> = result.collect_and_drop().await.map_err(|e| e.to_string())?; let rows: Vec<mysql_async::Row> = result.collect_and_drop().await.map_err(|e| e.to_string())?;
let truncated = rows.len() > row_limit; let truncated = rows.len() > row_limit;
let mut spatial_values = Vec::new();
let result_rows = rows let result_rows = rows
.iter() .iter()
.take(row_limit) .take(row_limit)
.map(|row| (0..row.len()).map(|i| mysql_value_to_json(row, i)).collect()) .map(|row| {
let (values, srids) = mysql_row_to_json_with_srids(row, &mut spatial_columns);
spatial_values.push(srids);
values
})
.collect(); .collect();
return Ok(QueryResult { return Ok(QueryResult {
columns, columns,
column_types, column_types,
column_sortables: vec![], column_sortables: vec![],
spatial_columns: spatial_columns.finish(),
spatial_values,
rows: result_rows, rows: result_rows,
affected_rows: 0, affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -3576,6 +3641,8 @@ async fn execute_result_set_with_text_protocol_on_conn(
} }
let mut result_rows: Vec<Vec<serde_json::Value>> = Vec::new(); let mut result_rows: Vec<Vec<serde_json::Value>> = Vec::new();
let mut spatial_values: Vec<Vec<Option<u32>>> = Vec::new();
let mut truncated = false;
let mut stream = result let mut stream = result
.stream::<mysql_async::Row>() .stream::<mysql_async::Row>()
.await .await
@@ -3584,22 +3651,21 @@ async fn execute_result_set_with_text_protocol_on_conn(
while let Some(row) = stream.next().await { while let Some(row) = stream.next().await {
let row = row.map_err(|e| e.to_string())?; let row = row.map_err(|e| e.to_string())?;
let values: Vec<serde_json::Value> = (0..row.len()).map(|i| mysql_value_to_json(&row, i)).collect(); if result_rows.len() >= row_limit {
result_rows.push(values); truncated = true;
if result_rows.len() > row_limit {
break; break;
} }
} let (values, srids) = mysql_row_to_json_with_srids(&row, &mut spatial_columns);
result_rows.push(values);
let truncated = result_rows.len() > row_limit; spatial_values.push(srids);
if truncated {
result_rows.truncate(row_limit);
} }
Ok(QueryResult { Ok(QueryResult {
columns, columns,
column_types, column_types,
column_sortables: vec![], column_sortables: vec![],
spatial_columns: spatial_columns.finish(),
spatial_values,
rows: result_rows, rows: result_rows,
affected_rows: 0, affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -3631,8 +3697,11 @@ async fn execute_result_set_with_prepared_protocol_on_conn(
let mut result = conn.exec_iter(sql, ()).await.map_err(|e| e.to_string())?; let mut result = conn.exec_iter(sql, ()).await.map_err(|e| e.to_string())?;
let columns: Vec<String> = result.columns_ref().iter().map(|c| c.name_str().to_string()).collect(); let columns: Vec<String> = result.columns_ref().iter().map(|c| c.name_str().to_string()).collect();
let column_types: Vec<String> = result.columns_ref().iter().map(mysql_column_type_name).collect(); let column_types: Vec<String> = result.columns_ref().iter().map(mysql_column_type_name).collect();
let mut spatial_columns = mysql_spatial_column_builder(result.columns_ref());
let mut result_rows: Vec<Vec<serde_json::Value>> = Vec::new(); let mut result_rows: Vec<Vec<serde_json::Value>> = Vec::new();
let mut spatial_values: Vec<Vec<Option<u32>>> = Vec::new();
let mut truncated = false;
let mut stream = result let mut stream = result
.stream::<mysql_async::Row>() .stream::<mysql_async::Row>()
.await .await
@@ -3641,22 +3710,21 @@ async fn execute_result_set_with_prepared_protocol_on_conn(
while let Some(row) = stream.next().await { while let Some(row) = stream.next().await {
let row = row.map_err(|e| e.to_string())?; let row = row.map_err(|e| e.to_string())?;
let values: Vec<serde_json::Value> = (0..row.len()).map(|i| mysql_value_to_json(&row, i)).collect(); if result_rows.len() >= row_limit {
result_rows.push(values); truncated = true;
if result_rows.len() > row_limit {
break; break;
} }
} let (values, srids) = mysql_row_to_json_with_srids(&row, &mut spatial_columns);
result_rows.push(values);
let truncated = result_rows.len() > row_limit; spatial_values.push(srids);
if truncated {
result_rows.truncate(row_limit);
} }
Ok(QueryResult { Ok(QueryResult {
columns, columns,
column_types, column_types,
column_sortables: vec![], column_sortables: vec![],
spatial_columns: spatial_columns.finish(),
spatial_values,
rows: result_rows, rows: result_rows,
affected_rows: 0, affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -3916,6 +3984,8 @@ pub async fn execute_query_on_conn_with_max_rows(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows, affected_rows,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -4246,6 +4316,39 @@ mod tests {
} }
} }
#[test]
fn mysql_geometry_decoder_retains_srid_prefix() {
let mut raw = 3857_u32.to_le_bytes().to_vec();
raw.extend_from_slice(&[
0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x40,
]);
let decoded = decode_mysql_geometry(&raw).unwrap();
assert_eq!(decoded.wkt, "POINT(1 2)");
assert_eq!(decoded.srid, Some(3857));
}
#[test]
fn mysql_geometry_decoder_accepts_unprefixed_wkb() {
let raw = [
0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x40,
];
let decoded = decode_mysql_geometry(&raw).unwrap();
assert_eq!(decoded.wkt, "POINT(1 2)");
assert_eq!(decoded.srid, None);
}
#[test]
fn mysql_geometry_srid_zero_is_unknown() {
let mut raw = 0_u32.to_le_bytes().to_vec();
raw.extend_from_slice(&[
0x01, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xf0, 0x3f, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00, 0x40,
]);
assert_eq!(decode_mysql_geometry(&raw).unwrap().srid, None);
}
#[test] #[test]
fn bytes_to_string_reuses_valid_utf8_and_falls_back_lossy() { fn bytes_to_string_reuses_valid_utf8_and_falls_back_lossy() {
assert_eq!(super::bytes_to_string_lossy("héllo 世界".as_bytes().to_vec()), "héllo 世界"); assert_eq!(super::bytes_to_string_lossy("héllo 世界".as_bytes().to_vec()), "héllo 世界");
+185 -17
View File
@@ -27,7 +27,7 @@ use crate::types::{
ColumnInfo, CompletionAssistantCandidate, CompletionAssistantCandidateKind, CompletionAssistantMatchMode, ColumnInfo, CompletionAssistantCandidate, CompletionAssistantCandidateKind, CompletionAssistantMatchMode,
CompletionAssistantObjectKind, CompletionAssistantRequest, CompletionAssistantResponse, DatabaseInfo, CompletionAssistantObjectKind, CompletionAssistantRequest, CompletionAssistantResponse, DatabaseInfo,
DatabaseStorageInfo, ExtensionInfo, ForeignKeyInfo, FunctionInfo, IndexInfo, ObjectInfo, ObjectStatistics, DatabaseStorageInfo, ExtensionInfo, ForeignKeyInfo, FunctionInfo, IndexInfo, ObjectInfo, ObjectStatistics,
OwnerInfo, QueryResult, RuleInfo, SchemaInfo, SequenceInfo, TableInfo, TriggerInfo, OwnerInfo, QueryResult, RuleInfo, SchemaInfo, SequenceInfo, SpatialColumnBuilder, TableInfo, TriggerInfo,
}; };
pub(crate) const GAUSSDB_COMPATIBILITY_SQL: &str = pub(crate) const GAUSSDB_COMPATIBILITY_SQL: &str =
@@ -605,6 +605,86 @@ pub(crate) fn pg_value_to_json_classified(row: &Row, idx: usize, col_type: PgCol
} }
} }
fn pg_value_to_json_with_srid(row: &Row, idx: usize, col_type: PgColType) -> (serde_json::Value, Option<u32>) {
if col_type != PgColType::Geometry {
return (pg_value_to_json_classified(row, idx, col_type), None);
}
if let Ok(PgRawBytes(raw)) = row.try_get::<_, PgRawBytes>(idx) {
return match super::wkb::decode_wkb_geometry(&raw) {
Some(geometry) => (serde_json::Value::String(geometry.wkt), geometry.srid),
None => (super::binary_value_to_json(&raw), None),
};
}
(serde_json::Value::Null, None)
}
fn pg_text_fallback_value(value: &str, col_type: Option<PgColType>) -> (serde_json::Value, Option<u32>) {
let (value, srid, _) = pg_text_fallback_value_with_spatial(value, col_type);
(value, srid)
}
fn pg_text_fallback_value_with_spatial(
value: &str,
col_type: Option<PgColType>,
) -> (serde_json::Value, Option<u32>, bool) {
match col_type {
Some(PgColType::Geometry) => decode_pg_text_wkb(value)
.map(|geometry| (serde_json::Value::String(geometry.wkt), geometry.srid, true))
.or_else(|| split_pg_ewkt(value, false).map(|(value, srid)| (value, srid, true)))
.unwrap_or_else(|| (serde_json::Value::String(value.to_string()), None, true)),
Some(_) => (serde_json::Value::String(value.to_string()), None, false),
None => decode_pg_text_wkb(value)
.map(|geometry| (serde_json::Value::String(geometry.wkt), geometry.srid, true))
.or_else(|| split_pg_ewkt(value, true).map(|(value, srid)| (value, srid, true)))
.unwrap_or_else(|| (serde_json::Value::String(value.to_string()), None, false)),
}
}
fn decode_pg_text_wkb(value: &str) -> Option<super::wkb::DecodedGeometry> {
let trimmed = value.trim();
let hex = trimmed
.strip_prefix("0x")
.or_else(|| trimmed.strip_prefix("0X"))
.or_else(|| trimmed.strip_prefix("\\x"))
.or_else(|| trimmed.strip_prefix("\\X"))
.unwrap_or(trimmed);
if hex.len() < 10 || !hex.len().is_multiple_of(2) || !matches!(&hex[..2], "00" | "01") || !hex.is_ascii() {
return None;
}
let bytes = hex
.as_bytes()
.chunks_exact(2)
.map(|pair| {
let text = std::str::from_utf8(pair).ok()?;
u8::from_str_radix(text, 16).ok()
})
.collect::<Option<Vec<_>>>()?;
super::wkb::decode_wkb_geometry(&bytes)
}
fn split_pg_ewkt(value: &str, require_recognizable_wkt: bool) -> Option<(serde_json::Value, Option<u32>)> {
let rest = value.strip_prefix("SRID=")?;
let (srid, wkt) = rest.split_once(';')?;
let srid = srid.parse::<i64>().ok().and_then(|value| u32::try_from(value).ok())?;
if require_recognizable_wkt && !is_recognizable_wkt(wkt) {
return None;
}
Some((serde_json::Value::String(wkt.to_string()), (srid != 0).then_some(srid)))
}
fn is_recognizable_wkt(value: &str) -> bool {
let trimmed = value.trim_start();
const TYPES: [&str; 7] =
["POINT", "LINESTRING", "POLYGON", "MULTIPOINT", "MULTILINESTRING", "MULTIPOLYGON", "GEOMETRYCOLLECTION"];
TYPES.iter().any(|geometry_type| {
trimmed
.get(..geometry_type.len())
.filter(|prefix| prefix.eq_ignore_ascii_case(geometry_type))
.and_then(|_| trimmed.as_bytes().get(geometry_type.len()))
.is_some_and(|next| next.is_ascii_whitespace() || *next == b'(')
})
}
/// Serialize a pgvector `vector` component with f32 shortest round-trip decimal text. /// Serialize a pgvector `vector` component with f32 shortest round-trip decimal text.
/// ///
/// Casting through `f64` (or fixed fractional rounding) either expands binary noise or /// Casting through `f64` (or fixed fractional rounding) either expands binary noise or
@@ -883,6 +963,13 @@ async fn execute_select_prepared(
); );
tokio::pin!(stream); tokio::pin!(stream);
let mut result_rows: Vec<Vec<serde_json::Value>> = Vec::new(); let mut result_rows: Vec<Vec<serde_json::Value>> = Vec::new();
let mut spatial_values: Vec<Vec<Option<u32>>> = Vec::new();
let mut spatial_columns = SpatialColumnBuilder::new(
column_classes
.iter()
.enumerate()
.filter_map(|(index, col_type)| (*col_type == PgColType::Geometry).then_some(index)),
);
let mut truncated = false; let mut truncated = false;
let rows_start = Instant::now(); let rows_start = Instant::now();
@@ -892,13 +979,19 @@ async fn execute_select_prepared(
break; break;
} }
let row = row_result?; let row = row_result?;
result_rows.push( let mut values = Vec::with_capacity(row.columns().len());
(0..row.columns().len()) let mut row_srids = vec![None; row.columns().len()];
.map(|i| { for (i, row_srid) in row_srids.iter_mut().enumerate() {
pg_value_to_json_classified(&row, i, column_classes.get(i).copied().unwrap_or(PgColType::Other)) let col_type = column_classes.get(i).copied().unwrap_or(PgColType::Other);
}) let (value, srid) = pg_value_to_json_with_srid(&row, i, col_type);
.collect(), if col_type == PgColType::Geometry {
); spatial_columns.observe(i, srid);
*row_srid = srid;
}
values.push(value);
}
result_rows.push(values);
spatial_values.push(row_srids);
} }
log::info!( log::info!(
"[postgres][select:rows:done] elapsed_ms={} total_ms={} row_count={} truncated={}", "[postgres][select:rows:done] elapsed_ms={} total_ms={} row_count={} truncated={}",
@@ -908,10 +1001,13 @@ async fn execute_select_prepared(
truncated truncated
); );
let (spatial_columns, spatial_values) = spatial_columns.finish_with_values(spatial_values);
Ok(PreparedSelectOutcome::Complete(QueryResult { Ok(PreparedSelectOutcome::Complete(QueryResult {
columns, columns,
column_types, column_types,
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns,
spatial_values,
rows: result_rows, rows: result_rows,
affected_rows: 0, affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -937,6 +1033,15 @@ async fn execute_select_text(
tokio::pin!(stream); tokio::pin!(stream);
let mut columns: Vec<String> = Vec::new(); let mut columns: Vec<String> = Vec::new();
let mut result_rows: Vec<Vec<serde_json::Value>> = Vec::new(); let mut result_rows: Vec<Vec<serde_json::Value>> = Vec::new();
let mut spatial_values: Vec<Vec<Option<u32>>> = Vec::new();
let column_classes =
prepared_column_types.as_ref().map(|types| classify_pg_column_types(types)).unwrap_or_default();
let mut spatial_columns = SpatialColumnBuilder::new(
column_classes
.iter()
.enumerate()
.filter_map(|(index, col_type)| (*col_type == PgColType::Geometry).then_some(index)),
);
let mut truncated = false; let mut truncated = false;
while let Some(message) = stream.next().await { while let Some(message) = stream.next().await {
@@ -953,13 +1058,25 @@ async fn execute_select_text(
break; break;
} }
let mut values = Vec::with_capacity(row.len()); let mut values = Vec::with_capacity(row.len());
for i in 0..row.len() { let mut row_srids = vec![None; row.len()];
values.push(match row.try_get(i).map_err(pg_error_to_string)? { for (i, row_srid) in row_srids.iter_mut().enumerate() {
Some(value) => serde_json::Value::String(value.to_string()), match row.try_get(i).map_err(pg_error_to_string)? {
None => serde_json::Value::Null, Some(value) => {
}); let (decoded, srid, is_spatial) =
pg_text_fallback_value_with_spatial(value, column_classes.get(i).copied());
values.push(decoded);
if is_spatial {
spatial_columns.observe(i, srid);
*row_srid = srid;
}
}
None => {
values.push(serde_json::Value::Null);
}
}
} }
result_rows.push(values); result_rows.push(values);
spatial_values.push(row_srids);
} }
Err(_) if result_rows.len() >= row_limit => { Err(_) if result_rows.len() >= row_limit => {
truncated = true; truncated = true;
@@ -971,10 +1088,13 @@ async fn execute_select_text(
} }
} }
let (spatial_columns, spatial_values) = spatial_columns.finish_with_values(spatial_values);
Ok(QueryResult { Ok(QueryResult {
column_types: matching_pg_text_column_types(&columns, prepared_column_types), column_types: matching_pg_text_column_types(&columns, prepared_column_types),
columns, columns,
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns,
spatial_values,
rows: result_rows, rows: result_rows,
affected_rows: 0, affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -1112,6 +1232,8 @@ async fn stream_select_query_text(
let stream = client.simple_query_raw(sql).await.map_err(pg_error_to_string)?; let stream = client.simple_query_raw(sql).await.map_err(pg_error_to_string)?;
tokio::pin!(stream); tokio::pin!(stream);
let mut columns: Vec<String> = Vec::new(); let mut columns: Vec<String> = Vec::new();
let column_classes =
prepared_column_types.as_ref().map(|types| classify_pg_column_types(types)).unwrap_or_default();
let mut rows_streamed = 0_u64; let mut rows_streamed = 0_u64;
while let Some(message) = stream.next().await { while let Some(message) = stream.next().await {
match message.map_err(pg_error_to_string)? { match message.map_err(pg_error_to_string)? {
@@ -1132,7 +1254,7 @@ async fn stream_select_query_text(
let mut values = Vec::with_capacity(row.len()); let mut values = Vec::with_capacity(row.len());
for i in 0..row.len() { for i in 0..row.len() {
values.push(match row.try_get(i).map_err(pg_error_to_string)? { values.push(match row.try_get(i).map_err(pg_error_to_string)? {
Some(value) => serde_json::Value::String(value.to_string()), Some(value) => pg_text_fallback_value(value, column_classes.get(i).copied()).0,
None => serde_json::Value::Null, None => serde_json::Value::Null,
}); });
} }
@@ -1201,7 +1323,7 @@ pub async fn stream_query_rows(
match stream_query_rows_on_client(&client, sql, max_rows, cancelled, &mut on_row).await { match stream_query_rows_on_client(&client, sql, max_rows, cancelled, &mut on_row).await {
Ok(rows) => Ok(rows), Ok(rows) => Ok(rows),
Err(error) if should_retry_postgres_text_query_message(&error.to_ascii_lowercase()) => { Err(error) if should_retry_postgres_text_query_message(&error.to_ascii_lowercase()) => {
stream_query_rows_text_on_client(&client, sql, max_rows, cancelled, &mut on_row).await stream_query_rows_text_on_client(&client, sql, max_rows, cancelled, None, &mut on_row).await
} }
Err(error) => Err(error), Err(error) => Err(error),
} }
@@ -1221,7 +1343,7 @@ async fn stream_query_rows_on_client(
"[postgres][row_stream:text_fallback] unsupported_type={} switching_to=simple_query", "[postgres][row_stream:text_fallback] unsupported_type={} switching_to=simple_query",
unsupported_type unsupported_type
); );
return stream_query_rows_text_on_client(client, sql, max_rows, cancelled, on_row).await; return stream_query_rows_text_on_client(client, sql, max_rows, cancelled, Some(&column_classes), on_row).await;
} }
let params: Vec<&(dyn tokio_postgres::types::ToSql + Sync)> = Vec::new(); let params: Vec<&(dyn tokio_postgres::types::ToSql + Sync)> = Vec::new();
let stream = client.query_raw(&stmt, params).await.map_err(pg_error_to_string)?; let stream = client.query_raw(&stmt, params).await.map_err(pg_error_to_string)?;
@@ -1252,6 +1374,7 @@ async fn stream_query_rows_text_on_client(
sql: &str, sql: &str,
max_rows: Option<usize>, max_rows: Option<usize>,
cancelled: &AtomicBool, cancelled: &AtomicBool,
column_classes: Option<&[PgColType]>,
on_row: &mut impl FnMut(&[serde_json::Value]) -> Result<(), String>, on_row: &mut impl FnMut(&[serde_json::Value]) -> Result<(), String>,
) -> Result<u64, String> { ) -> Result<u64, String> {
let stream = client.simple_query_raw(sql).await.map_err(pg_error_to_string)?; let stream = client.simple_query_raw(sql).await.map_err(pg_error_to_string)?;
@@ -1271,7 +1394,9 @@ async fn stream_query_rows_text_on_client(
let mut values = Vec::with_capacity(row.len()); let mut values = Vec::with_capacity(row.len());
for i in 0..row.len() { for i in 0..row.len() {
values.push(match row.try_get(i).map_err(pg_error_to_string)? { values.push(match row.try_get(i).map_err(pg_error_to_string)? {
Some(value) => serde_json::Value::String(value.to_string()), Some(value) => {
pg_text_fallback_value(value, column_classes.and_then(|classes| classes.get(i)).copied()).0
}
None => serde_json::Value::Null, None => serde_json::Value::Null,
}); });
} }
@@ -2871,6 +2996,8 @@ pub async fn execute_query_with_max_rows(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: affected, affected_rows: affected,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -3379,6 +3506,8 @@ async fn execute_query_with_max_rows_inner(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: affected, affected_rows: affected,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -4347,6 +4476,45 @@ mod tests {
assert_eq!(classify_pg_type(""), PgColType::Other); assert_eq!(classify_pg_type(""), PgColType::Other);
} }
#[test]
fn postgres_text_spatial_value_separates_srid_from_wkt() {
assert_eq!(
pg_text_fallback_value("SRID=4326;POINT(1 2)", Some(PgColType::Geometry)),
(serde_json::json!("POINT(1 2)"), Some(4326))
);
assert_eq!(
pg_text_fallback_value("SRID=0;POINT(1 2)", Some(PgColType::Geometry)),
(serde_json::json!("POINT(1 2)"), None)
);
assert_eq!(
pg_text_fallback_value("POINT(1 2)", Some(PgColType::Geometry)),
(serde_json::json!("POINT(1 2)"), None)
);
}
#[test]
fn postgres_text_spatial_value_decodes_hex_ewkb() {
let ewkb = "0101000020E6100000000000000000F03F0000000000000040";
for value in [ewkb.to_string(), format!("0x{ewkb}"), format!("\\x{ewkb}")] {
assert_eq!(
pg_text_fallback_value(&value, Some(PgColType::Geometry)),
(serde_json::json!("POINT(1 2)"), Some(4326))
);
assert_eq!(pg_text_fallback_value(&value, None), (serde_json::json!("POINT(1 2)"), Some(4326)));
}
let srid_zero = "010100002000000000000000000000F03F0000000000000040";
assert_eq!(pg_text_fallback_value(srid_zero, None), (serde_json::json!("POINT(1 2)"), None));
}
#[test]
fn postgres_text_fallback_does_not_reinterpret_ordinary_text() {
for value in ["SRID=abc;POINT(1 2)", "SRID=4326;not geometry", "0101-not-hex", "POINTLESS"] {
assert_eq!(pg_text_fallback_value(value, None), (serde_json::json!(value), None));
}
assert_eq!(pg_text_fallback_value("SRID=4326;point(1 2)", None), (serde_json::json!("point(1 2)"), Some(4326)));
}
struct DockerPostgres { struct DockerPostgres {
name: String, name: String,
port: u16, port: u16,
+4
View File
@@ -297,6 +297,8 @@ pub async fn execute_query_with_max_rows(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows, affected_rows,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -347,6 +349,8 @@ fn query_result_from_rqlite_result(
columns: result.columns, columns: result.columns,
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: result.values, rows: result.values,
affected_rows: 0, affected_rows: 0,
execution_time_ms, execution_time_ms,
+4
View File
@@ -2457,6 +2457,8 @@ fn execute_query_blocking(pool: &SqliteHandle, sql: &str, max_rows: Option<usize
columns, columns,
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: result_rows, rows: result_rows,
affected_rows: 0, affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -2471,6 +2473,8 @@ fn execute_query_blocking(pool: &SqliteHandle, sql: &str, max_rows: Option<usize
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: conn.changes(), affected_rows: conn.changes(),
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
File diff suppressed because it is too large. Load diff
+8
View File
@@ -343,6 +343,8 @@ pub async fn execute_query_with_max_rows(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: 0, affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -362,6 +364,8 @@ pub async fn execute_query_with_max_rows(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows, affected_rows,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -378,6 +382,8 @@ pub async fn execute_query_with_max_rows(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: affected, affected_rows: affected,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -561,6 +567,8 @@ fn query_result_from_turso_result(
columns: result.columns, columns: result.columns,
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: result.values, rows: result.values,
affected_rows: 0, affected_rows: 0,
execution_time_ms, execution_time_ms,
+4
View File
@@ -794,6 +794,8 @@ fn json_to_query_result(status: u16, body: Value, start: Instant) -> QueryResult
columns: vec!["status".to_string(), "response".to_string()], columns: vec!["status".to_string(), "response".to_string()],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![vec![ rows: vec![vec![
Value::Number(status.into()), Value::Number(status.into()),
Value::String(serde_json::to_string_pretty(&body).unwrap_or_else(|_| body.to_string())), Value::String(serde_json::to_string_pretty(&body).unwrap_or_else(|_| body.to_string())),
@@ -828,6 +830,8 @@ fn values_to_query_result(items: Vec<Value>, start: Instant) -> QueryResult {
columns, columns,
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
affected_rows: rows.len() as u64, affected_rows: rows.len() as u64,
rows, rows,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
+84 -21
View File
@@ -1,5 +1,6 @@
/// Shared WKB (Well-Known Binary) geometry parsing shared by PostgreSQL (EWKB) /// Shared WKB (Well-Known Binary) geometry parsing shared by PostgreSQL (EWKB)
/// and MySQL (standard WKB). Parses WKB bytes into WKT (Well-Known Text) strings. /// and MySQL (standard WKB). Parses WKB bytes into WKT while retaining the
/// top-level EWKB SRID when present.
/// ///
/// Supports: POINT, LINESTRING, POLYGON, MULTIPOINT, MULTILINESTRING, /// Supports: POINT, LINESTRING, POLYGON, MULTIPOINT, MULTILINESTRING,
/// MULTIPOLYGON, GEOMETRYCOLLECTION, and their Z/M/ZM variants. /// MULTIPOLYGON, GEOMETRYCOLLECTION, and their Z/M/ZM variants.
@@ -36,6 +37,12 @@ enum WkbGeometry {
GeometryCollection { dims: WkbDimensions, geometries: Vec<WkbGeometry> }, GeometryCollection { dims: WkbDimensions, geometries: Vec<WkbGeometry> },
} }
#[derive(Debug, Clone, PartialEq)]
pub(crate) struct DecodedGeometry {
pub wkt: String,
pub srid: Option<u32>,
}
impl WkbGeometry { impl WkbGeometry {
fn to_wkt(&self) -> String { fn to_wkt(&self) -> String {
match self { match self {
@@ -211,7 +218,7 @@ fn parse_wkb_dimensions(type_word: u32) -> (u32, WkbDimensions, bool) {
(base_type, dims, has_srid) (base_type, dims, has_srid)
} }
fn read_wkb_point_coords(reader: &mut WkbReader<'_>, dims: WkbDimensions, allow_empty_point: bool) -> Option<Vec<f64>> { fn read_wkb_point_coords(reader: &mut WkbReader<'_>, dims: WkbDimensions) -> Option<Option<Vec<f64>>> {
let endian = match reader.read_u8()? { let endian = match reader.read_u8()? {
0 => WkbEndian::Big, 0 => WkbEndian::Big,
1 => WkbEndian::Little, 1 => WkbEndian::Little,
@@ -226,10 +233,7 @@ fn read_wkb_point_coords(reader: &mut WkbReader<'_>, dims: WkbDimensions, allow_
reader.read_u32(endian)?; reader.read_u32(endian)?;
} }
let coords = (0..parsed_dims.coordinate_len()).map(|_| reader.read_f64(endian)).collect::<Option<Vec<_>>>()?; let coords = (0..parsed_dims.coordinate_len()).map(|_| reader.read_f64(endian)).collect::<Option<Vec<_>>>()?;
if allow_empty_point && coords.iter().all(|value| value.is_nan()) { Some((!coords.iter().all(|value| value.is_nan())).then_some(coords))
return None;
}
Some(coords)
} }
fn parse_wkb_points(reader: &mut WkbReader<'_>, endian: WkbEndian, dims: WkbDimensions) -> Option<Vec<Vec<f64>>> { fn parse_wkb_points(reader: &mut WkbReader<'_>, endian: WkbEndian, dims: WkbDimensions) -> Option<Vec<Vec<f64>>> {
@@ -239,7 +243,7 @@ fn parse_wkb_points(reader: &mut WkbReader<'_>, endian: WkbEndian, dims: WkbDime
.collect::<Option<Vec<_>>>() .collect::<Option<Vec<_>>>()
} }
fn parse_wkb_geometry(reader: &mut WkbReader<'_>) -> Option<WkbGeometry> { fn parse_wkb_geometry(reader: &mut WkbReader<'_>) -> Option<(WkbGeometry, Option<u32>)> {
let endian = match reader.read_u8()? { let endian = match reader.read_u8()? {
0 => WkbEndian::Big, 0 => WkbEndian::Big,
1 => WkbEndian::Little, 1 => WkbEndian::Little,
@@ -247,11 +251,9 @@ fn parse_wkb_geometry(reader: &mut WkbReader<'_>) -> Option<WkbGeometry> {
}; };
let type_word = reader.read_u32(endian)?; let type_word = reader.read_u32(endian)?;
let (base_type, dims, has_srid) = parse_wkb_dimensions(type_word); let (base_type, dims, has_srid) = parse_wkb_dimensions(type_word);
if has_srid { let srid = has_srid.then(|| reader.read_u32(endian)).flatten().filter(|value| *value != 0);
reader.read_u32(endian)?;
}
match base_type { let geometry = match base_type {
1 => { 1 => {
let coords = (0..dims.coordinate_len()).map(|_| reader.read_f64(endian)).collect::<Option<Vec<_>>>()?; let coords = (0..dims.coordinate_len()).map(|_| reader.read_f64(endian)).collect::<Option<Vec<_>>>()?;
let coords = if coords.iter().all(|value| value.is_nan()) { None } else { Some(coords) }; let coords = if coords.iter().all(|value| value.is_nan()) { None } else { Some(coords) };
@@ -265,14 +267,13 @@ fn parse_wkb_geometry(reader: &mut WkbReader<'_>) -> Option<WkbGeometry> {
} }
4 => { 4 => {
let count = usize::try_from(reader.read_u32(endian)?).ok()?; let count = usize::try_from(reader.read_u32(endian)?).ok()?;
let points = let points = (0..count).map(|_| read_wkb_point_coords(reader, dims)).collect::<Option<Vec<_>>>()?;
(0..count).map(|_| Some(read_wkb_point_coords(reader, dims, true))).collect::<Option<Vec<_>>>()?;
Some(WkbGeometry::MultiPoint { dims, points }) Some(WkbGeometry::MultiPoint { dims, points })
} }
5 => { 5 => {
let count = usize::try_from(reader.read_u32(endian)?).ok()?; let count = usize::try_from(reader.read_u32(endian)?).ok()?;
let lines = (0..count) let lines = (0..count)
.map(|_| match parse_wkb_geometry(reader)? { .map(|_| match parse_wkb_geometry(reader)?.0 {
WkbGeometry::LineString { points, .. } => Some(points), WkbGeometry::LineString { points, .. } => Some(points),
_ => None, _ => None,
}) })
@@ -282,7 +283,7 @@ fn parse_wkb_geometry(reader: &mut WkbReader<'_>) -> Option<WkbGeometry> {
6 => { 6 => {
let count = usize::try_from(reader.read_u32(endian)?).ok()?; let count = usize::try_from(reader.read_u32(endian)?).ok()?;
let polygons = (0..count) let polygons = (0..count)
.map(|_| match parse_wkb_geometry(reader)? { .map(|_| match parse_wkb_geometry(reader)?.0 {
WkbGeometry::Polygon { rings, .. } => Some(rings), WkbGeometry::Polygon { rings, .. } => Some(rings),
_ => None, _ => None,
}) })
@@ -291,11 +292,22 @@ fn parse_wkb_geometry(reader: &mut WkbReader<'_>) -> Option<WkbGeometry> {
} }
7 => { 7 => {
let count = usize::try_from(reader.read_u32(endian)?).ok()?; let count = usize::try_from(reader.read_u32(endian)?).ok()?;
let geometries = (0..count).map(|_| parse_wkb_geometry(reader)).collect::<Option<Vec<_>>>()?; let geometries =
(0..count).map(|_| parse_wkb_geometry(reader).map(|parsed| parsed.0)).collect::<Option<Vec<_>>>()?;
Some(WkbGeometry::GeometryCollection { dims, geometries }) Some(WkbGeometry::GeometryCollection { dims, geometries })
} }
_ => None, _ => None,
}?;
Some((geometry, srid))
}
pub(crate) fn decode_wkb_geometry(raw: &[u8]) -> Option<DecodedGeometry> {
let mut reader = WkbReader::new(raw);
let (geometry, srid) = parse_wkb_geometry(&mut reader)?;
if reader.pos != raw.len() {
return None;
} }
Some(DecodedGeometry { wkt: geometry.to_wkt(), srid })
} }
/// Parse WKB/EWKB bytes into a WKT (Well-Known Text) string. /// Parse WKB/EWKB bytes into a WKT (Well-Known Text) string.
@@ -303,10 +315,61 @@ fn parse_wkb_geometry(reader: &mut WkbReader<'_>) -> Option<WkbGeometry> {
/// Supports both standard WKB (MySQL) and Extended WKB (PostgreSQL/PostGIS). /// Supports both standard WKB (MySQL) and Extended WKB (PostgreSQL/PostGIS).
/// Returns `None` if the bytes cannot be parsed as valid WKB. /// Returns `None` if the bytes cannot be parsed as valid WKB.
pub(crate) fn wkb_to_wkt(raw: &[u8]) -> Option<String> { pub(crate) fn wkb_to_wkt(raw: &[u8]) -> Option<String> {
let mut reader = WkbReader::new(raw); decode_wkb_geometry(raw).map(|geometry| geometry.wkt)
let geometry = parse_wkb_geometry(&mut reader)?; }
if reader.pos != raw.len() {
return None; #[cfg(test)]
mod tests {
use super::*;
fn decode_hex(value: &str) -> Vec<u8> {
value
.as_bytes()
.chunks_exact(2)
.map(|pair| {
let text = std::str::from_utf8(pair).unwrap();
u8::from_str_radix(text, 16).unwrap()
})
.collect()
} }
Some(geometry.to_wkt())
#[test]
fn ewkb_decoder_retains_top_level_srid() {
let decoded = decode_wkb_geometry(&decode_hex("0101000020E6100000C520B07268195D404E62105839F44340")).unwrap();
assert_eq!(decoded.wkt, "POINT(116.397 39.908)");
assert_eq!(decoded.srid, Some(4326));
}
#[test]
fn standard_wkb_has_no_srid() {
let decoded = decode_wkb_geometry(&decode_hex("0101000000000000000000F03F0000000000000040")).unwrap();
assert_eq!(decoded.wkt, "POINT(1 2)");
assert_eq!(decoded.srid, None);
}
#[test]
fn big_endian_ewkb_retains_srid() {
let decoded = decode_wkb_geometry(&decode_hex("002000000100000F113FF00000000000004000000000000000")).unwrap();
assert_eq!(decoded.wkt, "POINT(1 2)");
assert_eq!(decoded.srid, Some(3857));
}
#[test]
fn ewkb_srid_zero_is_unknown() {
let decoded = decode_wkb_geometry(&decode_hex("010100002000000000000000000000F03F0000000000000040")).unwrap();
assert_eq!(decoded.wkt, "POINT(1 2)");
assert_eq!(decoded.srid, None);
}
#[test]
fn multipoint_preserves_valid_empty_points() {
let decoded =
decode_wkb_geometry(&decode_hex("0104000000010000000101000000000000000000F87F000000000000F87F")).unwrap();
assert_eq!(decoded.wkt, "MULTIPOINT(EMPTY)");
}
#[test]
fn multipoint_rejects_truncated_child_points() {
assert!(decode_wkb_geometry(&decode_hex("0104000000010000000101000000")).is_none());
}
} }
+38
View File
@@ -1984,6 +1984,8 @@ fn error_query_result(message: String) -> db::QueryResult {
columns: vec!["Error".to_string()], columns: vec!["Error".to_string()],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![vec![serde_json::Value::String(message)]], rows: vec![vec![serde_json::Value::String(message)]],
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
@@ -1999,6 +2001,8 @@ fn empty_query_result(execution_time_ms: u128) -> db::QueryResult {
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: 0, affected_rows: 0,
execution_time_ms, execution_time_ms,
@@ -2031,6 +2035,8 @@ async fn execute_multi_sqlserver(
columns: vec!["Error".to_string()], columns: vec!["Error".to_string()],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![vec![serde_json::Value::String(canceled_error())]], rows: vec![vec![serde_json::Value::String(canceled_error())]],
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
@@ -2083,6 +2089,8 @@ async fn execute_multi_sqlserver(
columns: vec!["Error".to_string()], columns: vec!["Error".to_string()],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![vec![serde_json::Value::String(e)]], rows: vec![vec![serde_json::Value::String(e)]],
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
@@ -2106,6 +2114,8 @@ async fn execute_multi_sqlserver(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
@@ -2232,6 +2242,8 @@ pub async fn execute_statements(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: total_affected, affected_rows: total_affected,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -2670,6 +2682,8 @@ async fn exec_tx_pg_inner(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: total_affected, affected_rows: total_affected,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -2754,6 +2768,8 @@ async fn exec_tx_mysql_inner(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: total_affected, affected_rows: total_affected,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -2818,6 +2834,8 @@ async fn exec_tx_sqlite_inner(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: total_affected, affected_rows: total_affected,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -2908,6 +2926,8 @@ async fn exec_tx_explicit_inner(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: total_affected, affected_rows: total_affected,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -2951,6 +2971,8 @@ async fn exec_tx_none_inner(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: total_affected, affected_rows: total_affected,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -3416,6 +3438,8 @@ async fn execute_manual_txn_postgres_statement(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: affected, affected_rows: affected,
execution_time_ms: 0, execution_time_ms: 0,
@@ -3456,6 +3480,8 @@ async fn execute_manual_txn_mysql_statement(
columns, columns,
column_types, column_types,
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: data, rows: data,
affected_rows: 0, affected_rows: 0,
execution_time_ms: start.elapsed().as_millis(), execution_time_ms: start.elapsed().as_millis(),
@@ -3472,6 +3498,8 @@ async fn execute_manual_txn_mysql_statement(
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows, affected_rows,
execution_time_ms: 0, execution_time_ms: 0,
@@ -3505,6 +3533,8 @@ pub async fn commit_manual_transaction(state: &AppState, txn_session_id: &str) -
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
@@ -3530,6 +3560,8 @@ pub async fn rollback_manual_transaction(state: &AppState, txn_session_id: &str)
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
@@ -4322,6 +4354,8 @@ for line in sys.stdin:
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
@@ -4344,6 +4378,8 @@ for line in sys.stdin:
columns: vec![], columns: vec![],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![], rows: vec![],
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
@@ -4992,6 +5028,8 @@ for line in sys.stdin:
columns: vec!["id".to_string(), "nested".to_string()], columns: vec!["id".to_string(), "nested".to_string()],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![vec![ rows: vec![vec![
serde_json::json!(2_041_797_190_226_354_178_i64), serde_json::json!(2_041_797_190_226_354_178_i64),
serde_json::json!([1, 2_041_797_190_226_354_178_i64]), serde_json::json!([1, 2_041_797_190_226_354_178_i64]),
+18
View File
@@ -2773,6 +2773,8 @@ mod tests {
columns: vec!["Table".to_string(), "Extra".to_string(), "CREATE TABLE".to_string()], columns: vec!["Table".to_string(), "Extra".to_string(), "CREATE TABLE".to_string()],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![vec![ rows: vec![vec![
serde_json::json!("users"), serde_json::json!("users"),
serde_json::json!("ignored"), serde_json::json!("ignored"),
@@ -2795,6 +2797,8 @@ mod tests {
columns: vec!["name".to_string(), "definition".to_string()], columns: vec!["name".to_string(), "definition".to_string()],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![vec![serde_json::json!("users"), serde_json::json!("CREATE TABLE `users` (`id` bigint);\n")]], rows: vec![vec![serde_json::json!("users"), serde_json::json!("CREATE TABLE `users` (`id` bigint);\n")]],
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
@@ -3288,6 +3292,8 @@ mod tests {
columns: vec!["table_name".to_string(), "table_type".to_string()], columns: vec!["table_name".to_string(), "table_type".to_string()],
column_types: vec![], column_types: vec![],
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![ rows: vec![
vec![serde_json::json!("daily_revenue"), serde_json::json!("BASE TABLE")], vec![serde_json::json!("daily_revenue"), serde_json::json!("BASE TABLE")],
vec![serde_json::json!("revenue_view"), serde_json::json!("VIEW")], vec![serde_json::json!("revenue_view"), serde_json::json!("VIEW")],
@@ -3321,6 +3327,8 @@ mod tests {
], ],
column_types: vec![], column_types: vec![],
column_sortables: vec![], column_sortables: vec![],
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![ rows: vec![
vec![ vec![
serde_json::json!("amount"), serde_json::json!("amount"),
@@ -3505,6 +3513,8 @@ mod tests {
columns: vec!["COMMENTS".to_string()], columns: vec!["COMMENTS".to_string()],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![vec![serde_json::json!("Customer table")]], rows: vec![vec![serde_json::json!("Customer table")]],
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
@@ -3520,6 +3530,8 @@ mod tests {
columns: vec!["COMMENTS".to_string()], columns: vec!["COMMENTS".to_string()],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![vec![serde_json::json!(" ")]], rows: vec![vec![serde_json::json!(" ")]],
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
@@ -3550,6 +3562,8 @@ mod tests {
columns: vec!["TABLE_NAME".to_string(), "COMMENTS".to_string()], columns: vec!["TABLE_NAME".to_string(), "COMMENTS".to_string()],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![ rows: vec![
vec![serde_json::json!("ORDERS"), serde_json::json!("Orders table")], vec![serde_json::json!("ORDERS"), serde_json::json!("Orders table")],
vec![serde_json::json!("PRODUCTS"), serde_json::json!(" ")], vec![serde_json::json!("PRODUCTS"), serde_json::json!(" ")],
@@ -3648,6 +3662,8 @@ mod tests {
], ],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![ rows: vec![
vec![ vec![
serde_json::json!("id"), serde_json::json!("id"),
@@ -3762,6 +3778,8 @@ mod tests {
], ],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![ rows: vec![
vec![ vec![
serde_json::json!("ORDERS"), serde_json::json!("ORDERS"),
+2
View File
@@ -195,6 +195,8 @@ mod tests {
], ],
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: vec![vec![ rows: vec![vec![
serde_json::json!("kdb_utils"), serde_json::json!("kdb_utils"),
serde_json::json!("1.0"), serde_json::json!("1.0"),
+2
View File
@@ -418,6 +418,8 @@ async fn fetch_table_export_batch(
columns: col_names.to_vec(), columns: col_names.to_vec(),
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: Vec::new(), rows: Vec::new(),
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
@@ -679,6 +679,8 @@ fn execute_change_transaction(
columns: Vec::new(), columns: Vec::new(),
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows: Vec::new(), rows: Vec::new(),
affected_rows: 0, affected_rows: 0,
execution_time_ms: started_at.elapsed().as_millis(), execution_time_ms: started_at.elapsed().as_millis(),
+2
View File
@@ -5323,6 +5323,8 @@ mod tests {
columns: Vec::new(), columns: Vec::new(),
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows, rows,
affected_rows: 0, affected_rows: 0,
execution_time_ms: 0, execution_time_ms: 0,
+99 -1
View File
@@ -226,6 +226,55 @@ pub struct CompletionAssistantResponse {
pub fallback_used: bool, pub fallback_used: bool,
} }
#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
pub struct SpatialColumn {
/// Zero-based index into `QueryResult.columns`.
pub column_index: usize,
/// SRID shared by the column's geometry cells. `None` when unknown/absent
/// (or SRID 0). A column reports the first non-null SRID it observes.
pub srid: Option<u32>,
}
#[derive(Debug, Default)]
pub(crate) struct SpatialColumnBuilder {
// column_index -> first non-null srid seen (sticky once set)
columns: std::collections::BTreeMap<usize, Option<u32>>,
}
impl SpatialColumnBuilder {
pub(crate) fn new(column_indices: impl IntoIterator<Item = usize>) -> Self {
let mut builder = Self::default();
for column_index in column_indices {
builder.columns.entry(column_index).or_insert(None);
}
builder
}
/// Record a geometry cell's SRID. The first non-null (and non-zero) value
/// wins; later observations for the same column are ignored.
pub(crate) fn observe(&mut self, column_index: usize, srid: Option<u32>) {
let entry = self.columns.entry(column_index).or_insert(None);
if entry.is_none() {
if let Some(value) = srid.filter(|value| *value != 0) {
*entry = Some(value);
}
}
}
pub(crate) fn finish(self) -> Vec<SpatialColumn> {
self.columns.into_iter().map(|(column_index, srid)| SpatialColumn { column_index, srid }).collect()
}
pub(crate) fn finish_with_values(
self,
spatial_values: Vec<Vec<Option<u32>>>,
) -> (Vec<SpatialColumn>, Vec<Vec<Option<u32>>>) {
let spatial_columns = self.finish();
let spatial_values = if spatial_columns.is_empty() { Vec::new() } else { spatial_values };
(spatial_columns, spatial_values)
}
}
#[derive(Debug, Clone, Serialize, Deserialize)] #[derive(Debug, Clone, Serialize, Deserialize)]
pub struct QueryResult { pub struct QueryResult {
pub columns: Vec<String>, pub columns: Vec<String>,
@@ -238,6 +287,16 @@ pub struct QueryResult {
/// be shorter/empty when a driver cannot supply sortable information. /// be shorter/empty when a driver cannot supply sortable information.
#[serde(default)] #[serde(default)]
pub column_sortables: Vec<bool>, pub column_sortables: Vec<bool>,
/// Spatial reference metadata for geometry/geography cells. Kept outside
/// `rows` so displayed, copied, exported, and edited values remain WKT.
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub spatial_columns: Vec<SpatialColumn>,
/// Per-cell SRID metadata, parallel to `rows`: `spatial_values[row][column]`
/// is the SRID of that cell's geometry value (`None` for non-spatial cells
/// or unknown SRID). Unlike `spatial_columns` (a column-level hint), every
/// geometry value keeps its own SRID so mixed-SRID results stay correct.
#[serde(default, skip_serializing_if = "Vec::is_empty")]
pub spatial_values: Vec<Vec<Option<u32>>>,
pub rows: Vec<Vec<serde_json::Value>>, pub rows: Vec<Vec<serde_json::Value>>,
pub affected_rows: u64, pub affected_rows: u64,
pub execution_time_ms: u128, pub execution_time_ms: u128,
@@ -384,7 +443,7 @@ pub struct OwnerInfo {
#[cfg(test)] #[cfg(test)]
mod tests { mod tests {
use super::{ObjectInfo, ObjectSourceKind}; use super::{ObjectInfo, ObjectSourceKind, SpatialColumn, SpatialColumnBuilder};
#[test] #[test]
fn list_objects_payload_preserves_optional_validity() { fn list_objects_payload_preserves_optional_validity() {
@@ -396,6 +455,45 @@ mod tests {
assert_eq!(objects[0].object_type, "TRIGGER"); assert_eq!(objects[0].object_type, "TRIGGER");
} }
#[test]
fn spatial_builder_reports_first_non_null_srid_per_column() {
let mut builder = SpatialColumnBuilder::new([3]);
builder.observe(3, None);
builder.observe(1, Some(4326));
builder.observe(3, Some(3857));
builder.observe(3, Some(4490)); // ignored: column 3 already set
builder.observe(1, None); // ignored: column 1 already set
assert_eq!(
builder.finish(),
vec![
SpatialColumn { column_index: 1, srid: Some(4326) },
SpatialColumn { column_index: 3, srid: Some(3857) },
]
);
}
#[test]
fn spatial_builder_normalizes_zero_and_all_null() {
let mut builder = SpatialColumnBuilder::new([0]);
builder.observe(0, Some(0)); // SRID 0 -> unknown
assert_eq!(builder.finish(), vec![SpatialColumn { column_index: 0, srid: None }]);
assert!(SpatialColumnBuilder::default().finish().is_empty());
}
#[test]
fn spatial_builder_omits_values_without_spatial_columns() {
let values = vec![vec![None, None]];
let (columns, values) = SpatialColumnBuilder::default().finish_with_values(values);
assert!(columns.is_empty());
assert!(values.is_empty());
let expected_values = vec![vec![None, None]];
let (columns, values) = SpatialColumnBuilder::new([0]).finish_with_values(expected_values.clone());
assert_eq!(columns, vec![SpatialColumn { column_index: 0, srid: None }]);
assert_eq!(values, expected_values);
}
#[test] #[test]
fn object_source_kind_accepts_synonym_wire_value() { fn object_source_kind_accepts_synonym_wire_value() {
let kind: ObjectSourceKind = serde_json::from_str("\"SYNONYM\"").unwrap(); let kind: ObjectSourceKind = serde_json::from_str("\"SYNONYM\"").unwrap();
+2
View File
@@ -1314,6 +1314,8 @@ fn query_result(columns: Vec<String>, rows: Vec<Vec<Value>>, affected_rows: u64)
columns, columns,
column_types: Vec::new(), column_types: Vec::new(),
column_sortables: Vec::new(), column_sortables: Vec::new(),
spatial_columns: vec![],
spatial_values: vec![],
rows, rows,
affected_rows, affected_rows,
execution_time_ms: 0, execution_time_ms: 0,
+1 -1
View File
@@ -197,7 +197,7 @@
fetcherVersion = 4; fetcherVersion = 4;
# Update with the hash reported by a failed fixed-output build: # Update with the hash reported by a failed fixed-output build:
# nix build .#dbx-pnpm-deps 2>&1 | grep 'got:' # nix build .#dbx-pnpm-deps 2>&1 | grep 'got:'
hash = "sha256-Bt3AwBVAdA96B4UWBVDvwNBy/JX2eNn8adPpWueAjcs="; hash = "sha256-pPLJxLCIkwOZF1zxBZZ5mAftP0wiTEBpRnkpGES68yA=";
}; };
# ── Step 2: vendor Cargo dependencies ───────────────────────────── # # ── Step 2: vendor Cargo dependencies ───────────────────────────── #
+1
View File
@@ -84,6 +84,7 @@
"leaflet": "^1.9.4", "leaflet": "^1.9.4",
"marked": "^18.0.4", "marked": "^18.0.4",
"pinia": "^3.0.0", "pinia": "^3.0.0",
"proj4": "^2.20.9",
"reka-ui": "^2.10.1", "reka-ui": "^2.10.1",
"shadcn-vue": "^2.7.4", "shadcn-vue": "^2.7.4",
"shiki": "^4.2.0", "shiki": "^4.2.0",
+102 -37
View File
@@ -140,6 +140,9 @@ importers:
pinia: pinia:
specifier: ^3.0.0 specifier: ^3.0.0
version: 3.0.4(typescript@6.0.3)(vue@3.5.35(typescript@6.0.3)) version: 3.0.4(typescript@6.0.3)(vue@3.5.35(typescript@6.0.3))
proj4:
specifier: ^2.20.9
version: 2.20.9
reka-ui: reka-ui:
specifier: ^2.10.1 specifier: ^2.10.1
version: 2.10.1(vue@3.5.35(typescript@6.0.3)) version: 2.10.1(vue@3.5.35(typescript@6.0.3))
@@ -502,74 +505,78 @@ packages:
'@codemirror/view@6.43.0': '@codemirror/view@6.43.0':
resolution: {integrity: sha512-V7ZCLQO3Jus9hzh2jVCCPW3mO4IBMr43O37PqSUYautJSnnJF41YlgLw21x0fLJTYvJ+Vkm6Gp+qKGH9pltgXA==} resolution: {integrity: sha512-V7ZCLQO3Jus9hzh2jVCCPW3mO4IBMr43O37PqSUYautJSnnJF41YlgLw21x0fLJTYvJ+Vkm6Gp+qKGH9pltgXA==}
'@dbx-app/cli-darwin-arm64@0.4.36': '@dbx-app/cli-darwin-arm64@0.4.42':
resolution: {integrity: sha512-9IfZgHdA76x6D2znEMmQeZYalnVYgkgsgMDmZHBwpJsYrL/NEi7kMxfRhM9MhUoOxrNULR+K1a1oREQQqnULmA==} resolution: {integrity: sha512-phyUBRT/E5pYemgoKJOC/Io8fGK/sw4thbovYW7Z2kSn4RTm+ymMbzITf4p+1Bw0wIN5Xtce6qsp6L+rIxruVA==}
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
hasBin: true hasBin: true
'@dbx-app/cli-darwin-x64@0.4.36': '@dbx-app/cli-darwin-x64@0.4.42':
resolution: {integrity: sha512-SGIEMUPrySA9jh8uBx1AYl8wuA14f14ioynjpc3F75KbhPGHJ4kebGOjh8sVgjf4yWf1Rh9tsmffY9zLWeZQWQ==} resolution: {integrity: sha512-khDuRLH3ojiYAGsE7nkupRebZcBTQRfymIKKLeif4REdYjASGD6XoKD8aaxsiNMCTkR0T5YDzo2k6+yXMswrzw==}
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
hasBin: true hasBin: true
'@dbx-app/cli-linux-arm64-gnu@0.4.36': '@dbx-app/cli-linux-arm64-gnu@0.4.42':
resolution: {integrity: sha512-zPHHluDmdqbb37kkNBwnAWhaVaA+mw8IhryeDElahJpYrX6fVU4hAZqzR6j1T3LrCVQcSCojkoChtoJ4MFcvVw==} resolution: {integrity: sha512-KAg0gSzpAk7KetKipcXKJNkIKAH8RKsT9MabdzHucl3juFvLVNaR1c5FE+IBHSRr8atk1WLEXL8U05Rxk+zbEw==}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [glibc]
hasBin: true hasBin: true
'@dbx-app/cli-linux-x64-gnu@0.4.36': '@dbx-app/cli-linux-x64-gnu@0.4.42':
resolution: {integrity: sha512-aOn97qTOb67fLOCD1duWLsofncvGsMHFr3bKN1D0D8izfLTtzpUDwmdcbJelPwh0Xc3eu/SXq5Zc55v8AiH/Vg==} resolution: {integrity: sha512-ZNol747E+f2GK8ooeK7ow+nDlJRxxDA1L03bKTIpruS3nU5bx4oxxgJL1PiHDcJe1rUXr5+nuqVdm46AwQ3fSQ==}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [glibc]
hasBin: true hasBin: true
'@dbx-app/cli-win32-arm64@0.4.36': '@dbx-app/cli-win32-arm64@0.4.42':
resolution: {integrity: sha512-j3NGer4CcO6lBtC41MjnRIaYcwr+Q+SP7otL9jX1IW05Kj+zX3y5URL6n9VX2dI4yXSCAaf04D01PviYHUK5uw==} resolution: {integrity: sha512-WfpKaISwkpTfb4s3ZYah1E7aD20AEPcg4DkHfBOUQyaCqx5LSQhN7tt4XlOEaAEb+t1Bogp6WFW0B/EA+ypYVQ==}
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
hasBin: true hasBin: true
'@dbx-app/cli-win32-x64@0.4.36': '@dbx-app/cli-win32-x64@0.4.42':
resolution: {integrity: sha512-vgq3tWciNPi5yH4c4teQsUDV+r6XzsAOxMDz5dEpQzkQJbvUutqSvXz24hpGNX0F/jCI9EyExXsFab5g3k2qRg==} resolution: {integrity: sha512-2Hc5+7hxDHQ1tkTrrffqPsWvxNRsEKSppviSTM0i5Xh5LaqHMMbboR5gcfkBb0Vw/DdzKLZB7ORufr+FNuY+nA==}
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
hasBin: true hasBin: true
'@dbx-app/mcp-darwin-arm64@0.4.36': '@dbx-app/mcp-darwin-arm64@0.4.42':
resolution: {integrity: sha512-/B1b6DYv9eSTgMZx5qBF7Zsm8vRhba/s2tM+3jFNJanWgn/y+xJVnIZZIB5Qm3x0yhU7ONqgmeLl7HMu8y8v/w==} resolution: {integrity: sha512-E3UEBp+DwJYYxcIp60SCKTJSF3qP25xC2Jl/mW5bsERSsy58J6JiydDSwgMjtNDJ+Mj/ZVPA6Mbw1Rc40yK66A==}
cpu: [arm64] cpu: [arm64]
os: [darwin] os: [darwin]
hasBin: true hasBin: true
'@dbx-app/mcp-darwin-x64@0.4.36': '@dbx-app/mcp-darwin-x64@0.4.42':
resolution: {integrity: sha512-ED11PzL7zMLCKfk/zA1gBDLf3qy/v764jmBHut/Cy9JQvMPlZlwTmnTkuW6sJ8SdvG5WRIFDHFtEP1vzezmx3w==} resolution: {integrity: sha512-UeeCBx7QWe3vmZ3eK3ChZRAXPAL+z4MtOLBFvIAaffhftZck/p3iXL8d6u3Ki/+5pgQjQ/E1MBrK1JJ1fz2zvA==}
cpu: [x64] cpu: [x64]
os: [darwin] os: [darwin]
hasBin: true hasBin: true
'@dbx-app/mcp-linux-arm64-gnu@0.4.36': '@dbx-app/mcp-linux-arm64-gnu@0.4.42':
resolution: {integrity: sha512-jjJTH5e5Ru8o+RsUsF9PzgN+SQ4xGemBCnaDtbupPKxgOib1iX4wwgjbVt8ycK0QiNLk0ezv3Pj4RhABbv0wBw==} resolution: {integrity: sha512-qLY5mmeCRn+JquH5C5PuZxKvjDq8oPnM9lgocN/HR4Ta1sOoWoqQuLOOmiiKY1SOAuqZWAwBOcBbVi37TFX7FA==}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [glibc]
hasBin: true hasBin: true
'@dbx-app/mcp-linux-x64-gnu@0.4.36': '@dbx-app/mcp-linux-x64-gnu@0.4.42':
resolution: {integrity: sha512-qy9EyXVUSne00U4oAvRFwxn7Ed9wCj54WHZX+g+6m1uEEXAcbMC7F3lwczIdAOvQHU/qvLjeAP0rsjanVBVRmA==} resolution: {integrity: sha512-c5VneyXTHLZK1B7znI7y4VZbM77D942jMnMR1K9/d2uGTiFtpqm/Tj8mF+oWhW+we32LOhUAWdWVR4fOuf8jBQ==}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [glibc]
hasBin: true hasBin: true
'@dbx-app/mcp-win32-arm64@0.4.36': '@dbx-app/mcp-win32-arm64@0.4.42':
resolution: {integrity: sha512-drAtzSUUaU7qF2BpTxw6czFc4bciM8Q3fNLgjM/uy7ehFw1ZsS1J8qBOCOiKnZXKJHzMnUYaPAl9hIqdsxINPQ==} resolution: {integrity: sha512-sTaX2qBOZqF4wgH34RIlP95wH1YXWfj6LhGtPuOIsQC74Knq8kJGteg7oZCdXIhC8dmS+y8uhXqW+1UfMJfsdA==}
cpu: [arm64] cpu: [arm64]
os: [win32] os: [win32]
hasBin: true hasBin: true
'@dbx-app/mcp-win32-x64@0.4.36': '@dbx-app/mcp-win32-x64@0.4.42':
resolution: {integrity: sha512-6sPpFJKCGpVJgujPeQrtF+D679/5RUCMuNxU29FTvyswynoqF4KHY07k14bK+JZGHvh1UGGWvy1CfaiC35HkKA==} resolution: {integrity: sha512-KSYa1LKV2nEndrD2x7GnxV8e6KiA1zQXYYe90TmkEAZRbtSMPRTroEBVVBMQTbT8f2A7ObzfkgX1ScGyiwX0/w==}
cpu: [x64] cpu: [x64]
os: [win32] os: [win32]
hasBin: true hasBin: true
@@ -973,48 +980,56 @@ packages:
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [glibc]
'@oxfmt/binding-linux-arm64-musl@0.53.0': '@oxfmt/binding-linux-arm64-musl@0.53.0':
resolution: {integrity: sha512-I6bhOTroqc3ThrwZ89l2k3ivKuELhdPLbAcJhRNyjWvlgwb0vjRgEnVL1XLx5Jud04/ypNRZBykAWrSk6l/D+g==} resolution: {integrity: sha512-I6bhOTroqc3ThrwZ89l2k3ivKuELhdPLbAcJhRNyjWvlgwb0vjRgEnVL1XLx5Jud04/ypNRZBykAWrSk6l/D+g==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [musl]
'@oxfmt/binding-linux-ppc64-gnu@0.53.0': '@oxfmt/binding-linux-ppc64-gnu@0.53.0':
resolution: {integrity: sha512-w0p3JzB/PkkQjXALMJMqP9YfP3yq4w6zGsu5kezQmUnxRkN3b/Theg2l/nDgBsOcczxS3gL6Gam5XNAVrO6QJQ==} resolution: {integrity: sha512-w0p3JzB/PkkQjXALMJMqP9YfP3yq4w6zGsu5kezQmUnxRkN3b/Theg2l/nDgBsOcczxS3gL6Gam5XNAVrO6QJQ==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [ppc64] cpu: [ppc64]
os: [linux] os: [linux]
libc: [glibc]
'@oxfmt/binding-linux-riscv64-gnu@0.53.0': '@oxfmt/binding-linux-riscv64-gnu@0.53.0':
resolution: {integrity: sha512-mzBhF6k1Yq1K/dqDmVe/AAafnlJfEpx7yfUiksyeWXJk5iSzZqBSxcsa02zIytYgQFRZ7h6WPZfwHg/DoOE1Kw==} resolution: {integrity: sha512-mzBhF6k1Yq1K/dqDmVe/AAafnlJfEpx7yfUiksyeWXJk5iSzZqBSxcsa02zIytYgQFRZ7h6WPZfwHg/DoOE1Kw==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [riscv64] cpu: [riscv64]
os: [linux] os: [linux]
libc: [glibc]
'@oxfmt/binding-linux-riscv64-musl@0.53.0': '@oxfmt/binding-linux-riscv64-musl@0.53.0':
resolution: {integrity: sha512-AlFCpnRQhogQFzZXWbO6xB6/Udy745L+eQNmDPGg7G/OeWsYmJc4jZYfUN5pQg0reOPWSED2mOQqKZOJM1U8cA==} resolution: {integrity: sha512-AlFCpnRQhogQFzZXWbO6xB6/Udy745L+eQNmDPGg7G/OeWsYmJc4jZYfUN5pQg0reOPWSED2mOQqKZOJM1U8cA==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [riscv64] cpu: [riscv64]
os: [linux] os: [linux]
libc: [musl]
'@oxfmt/binding-linux-s390x-gnu@0.53.0': '@oxfmt/binding-linux-s390x-gnu@0.53.0':
resolution: {integrity: sha512-XD4ulY4f1DWbuuZXAqxhVn+gdPmrhnmojWtFN78ctVoupmS845fGhsUrk1HZXKQI+iymbaiz9vAjPsghHNQ7Ag==} resolution: {integrity: sha512-XD4ulY4f1DWbuuZXAqxhVn+gdPmrhnmojWtFN78ctVoupmS845fGhsUrk1HZXKQI+iymbaiz9vAjPsghHNQ7Ag==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [s390x] cpu: [s390x]
os: [linux] os: [linux]
libc: [glibc]
'@oxfmt/binding-linux-x64-gnu@0.53.0': '@oxfmt/binding-linux-x64-gnu@0.53.0':
resolution: {integrity: sha512-xg8KWX0QnxmYWRe60CgHYWXI0ZOtBbqTsXvWiWrcl2XUHJ3fht2QerOk2iWvylzX3zNT2GpvBRxGoR4d3sxPRQ==} resolution: {integrity: sha512-xg8KWX0QnxmYWRe60CgHYWXI0ZOtBbqTsXvWiWrcl2XUHJ3fht2QerOk2iWvylzX3zNT2GpvBRxGoR4d3sxPRQ==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [glibc]
'@oxfmt/binding-linux-x64-musl@0.53.0': '@oxfmt/binding-linux-x64-musl@0.53.0':
resolution: {integrity: sha512-MWExpYBGvl+pIvVB/gj/CcWlN2al8AizT7rUbtaYaWNoQkhWARM6W3qpgoCr72CYSN9PborzPmM5MIRe2BrNdA==} resolution: {integrity: sha512-MWExpYBGvl+pIvVB/gj/CcWlN2al8AizT7rUbtaYaWNoQkhWARM6W3qpgoCr72CYSN9PborzPmM5MIRe2BrNdA==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [musl]
'@oxfmt/binding-openharmony-arm64@0.53.0': '@oxfmt/binding-openharmony-arm64@0.53.0':
resolution: {integrity: sha512-u4sajgO4nxgmJIgc/y2AqPhkdbOkQH8WugXpA1+pW0ESQhvGZ1oGq61Q4xMbJHJU1hFgtO18QNrcFYDPYH0gwQ==} resolution: {integrity: sha512-u4sajgO4nxgmJIgc/y2AqPhkdbOkQH8WugXpA1+pW0ESQhvGZ1oGq61Q4xMbJHJU1hFgtO18QNrcFYDPYH0gwQ==}
@@ -1087,48 +1102,56 @@ packages:
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [glibc]
'@oxlint/binding-linux-arm64-musl@1.68.0': '@oxlint/binding-linux-arm64-musl@1.68.0':
resolution: {integrity: sha512-qVKtCZNic+OoNnOr/hCQAu22HSQzflI7Fsq/Blzkw02SnLuv163k3kfmrVpZjSBlUHgsRKj6WgQiw30d3SX02Q==} resolution: {integrity: sha512-qVKtCZNic+OoNnOr/hCQAu22HSQzflI7Fsq/Blzkw02SnLuv163k3kfmrVpZjSBlUHgsRKj6WgQiw30d3SX02Q==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [musl]
'@oxlint/binding-linux-ppc64-gnu@1.68.0': '@oxlint/binding-linux-ppc64-gnu@1.68.0':
resolution: {integrity: sha512-zExyZ8ZOUuAyQ0y9jpTcyjKUz62YY9JhKPyVxzvjTpXzZ3ujdqiVwfPWDdnA1SsIOrxdtxHn7KErDHLWskFjXg==} resolution: {integrity: sha512-zExyZ8ZOUuAyQ0y9jpTcyjKUz62YY9JhKPyVxzvjTpXzZ3ujdqiVwfPWDdnA1SsIOrxdtxHn7KErDHLWskFjXg==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [ppc64] cpu: [ppc64]
os: [linux] os: [linux]
libc: [glibc]
'@oxlint/binding-linux-riscv64-gnu@1.68.0': '@oxlint/binding-linux-riscv64-gnu@1.68.0':
resolution: {integrity: sha512-6C4MPuwewyDavA7sxM14wzgRi5GGL68HPIxRCdVyS75U4MDbpFVYzKO9WNR6KLKTMPq2pcz3THwo1sK2uiqngw==} resolution: {integrity: sha512-6C4MPuwewyDavA7sxM14wzgRi5GGL68HPIxRCdVyS75U4MDbpFVYzKO9WNR6KLKTMPq2pcz3THwo1sK2uiqngw==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [riscv64] cpu: [riscv64]
os: [linux] os: [linux]
libc: [glibc]
'@oxlint/binding-linux-riscv64-musl@1.68.0': '@oxlint/binding-linux-riscv64-musl@1.68.0':
resolution: {integrity: sha512-bnZooVeHAcvA+dH0EDLgx+7HY/DRi6e0hFszg3P+OBatuUjV6EvfIyNIzWOusmqAVh4L6r21GGTZtiKE4iqM4Q==} resolution: {integrity: sha512-bnZooVeHAcvA+dH0EDLgx+7HY/DRi6e0hFszg3P+OBatuUjV6EvfIyNIzWOusmqAVh4L6r21GGTZtiKE4iqM4Q==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [riscv64] cpu: [riscv64]
os: [linux] os: [linux]
libc: [musl]
'@oxlint/binding-linux-s390x-gnu@1.68.0': '@oxlint/binding-linux-s390x-gnu@1.68.0':
resolution: {integrity: sha512-dIqnZnJSmHCMOUpUcWQOiV14o3DDPVx1DSsMaSzvdhNjC1tB1iEPZbdiMSCIEYbkgbsYznHXWqFdKL8WUB3F8g==} resolution: {integrity: sha512-dIqnZnJSmHCMOUpUcWQOiV14o3DDPVx1DSsMaSzvdhNjC1tB1iEPZbdiMSCIEYbkgbsYznHXWqFdKL8WUB3F8g==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [s390x] cpu: [s390x]
os: [linux] os: [linux]
libc: [glibc]
'@oxlint/binding-linux-x64-gnu@1.68.0': '@oxlint/binding-linux-x64-gnu@1.68.0':
resolution: {integrity: sha512-zc9lEnfV/HreDTY6gdMlZe+irkwHSxQ4/B1pS9GyK7RVaA5LxhoZY/w6/o2vIwLLEYiXQ5ujGxOM1ZazeFAAIA==} resolution: {integrity: sha512-zc9lEnfV/HreDTY6gdMlZe+irkwHSxQ4/B1pS9GyK7RVaA5LxhoZY/w6/o2vIwLLEYiXQ5ujGxOM1ZazeFAAIA==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [glibc]
'@oxlint/binding-linux-x64-musl@1.68.0': '@oxlint/binding-linux-x64-musl@1.68.0':
resolution: {integrity: sha512-Dl5QEX0TCo/40Cdh1o1JdPS//+YiWqjC+Hrrya5OQmStZZr4svAFtdlqcpCrU9yq2Mo3vRVyO9B3h0dzD8s36Q==} resolution: {integrity: sha512-Dl5QEX0TCo/40Cdh1o1JdPS//+YiWqjC+Hrrya5OQmStZZr4svAFtdlqcpCrU9yq2Mo3vRVyO9B3h0dzD8s36Q==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [musl]
'@oxlint/binding-openharmony-arm64@1.68.0': '@oxlint/binding-openharmony-arm64@1.68.0':
resolution: {integrity: sha512-/qy6dOvi4S3/LeXq0l5BT5pRKPYA7oj3uKwJOAZOr5HRLL+HK6jdBynvWuXIA2wwfE01RzNYmbBdM7vwYx00sA==} resolution: {integrity: sha512-/qy6dOvi4S3/LeXq0l5BT5pRKPYA7oj3uKwJOAZOr5HRLL+HK6jdBynvWuXIA2wwfE01RzNYmbBdM7vwYx00sA==}
@@ -1198,36 +1221,42 @@ packages:
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [glibc]
'@rolldown/binding-linux-arm64-musl@1.0.3': '@rolldown/binding-linux-arm64-musl@1.0.3':
resolution: {integrity: sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q==} resolution: {integrity: sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [musl]
'@rolldown/binding-linux-ppc64-gnu@1.0.3': '@rolldown/binding-linux-ppc64-gnu@1.0.3':
resolution: {integrity: sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg==} resolution: {integrity: sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [ppc64] cpu: [ppc64]
os: [linux] os: [linux]
libc: [glibc]
'@rolldown/binding-linux-s390x-gnu@1.0.3': '@rolldown/binding-linux-s390x-gnu@1.0.3':
resolution: {integrity: sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg==} resolution: {integrity: sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [s390x] cpu: [s390x]
os: [linux] os: [linux]
libc: [glibc]
'@rolldown/binding-linux-x64-gnu@1.0.3': '@rolldown/binding-linux-x64-gnu@1.0.3':
resolution: {integrity: sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg==} resolution: {integrity: sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [glibc]
'@rolldown/binding-linux-x64-musl@1.0.3': '@rolldown/binding-linux-x64-musl@1.0.3':
resolution: {integrity: sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow==} resolution: {integrity: sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow==}
engines: {node: ^20.19.0 || >=22.12.0} engines: {node: ^20.19.0 || >=22.12.0}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [musl]
'@rolldown/binding-openharmony-arm64@1.0.3': '@rolldown/binding-openharmony-arm64@1.0.3':
resolution: {integrity: sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg==} resolution: {integrity: sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg==}
@@ -1330,24 +1359,28 @@ packages:
engines: {node: '>= 20'} engines: {node: '>= 20'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [glibc]
'@tailwindcss/oxide-linux-arm64-musl@4.3.0': '@tailwindcss/oxide-linux-arm64-musl@4.3.0':
resolution: {integrity: sha512-Z6sukiQsngnWO+l39X4pPbiWT81IC+PLKF+PHxIlyZbGNb9MODfYlXEVlFvej5BOZInWX01kVyzeLvHsXhfczQ==} resolution: {integrity: sha512-Z6sukiQsngnWO+l39X4pPbiWT81IC+PLKF+PHxIlyZbGNb9MODfYlXEVlFvej5BOZInWX01kVyzeLvHsXhfczQ==}
engines: {node: '>= 20'} engines: {node: '>= 20'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [musl]
'@tailwindcss/oxide-linux-x64-gnu@4.3.0': '@tailwindcss/oxide-linux-x64-gnu@4.3.0':
resolution: {integrity: sha512-DRNdQRpSGzRGfARVuVkxvM8Q12nh19l4BF/G7zGA1oe+9wcC6saFBHTISrpIcKzhiXtSrlSrluCfvMuledoCTQ==} resolution: {integrity: sha512-DRNdQRpSGzRGfARVuVkxvM8Q12nh19l4BF/G7zGA1oe+9wcC6saFBHTISrpIcKzhiXtSrlSrluCfvMuledoCTQ==}
engines: {node: '>= 20'} engines: {node: '>= 20'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [glibc]
'@tailwindcss/oxide-linux-x64-musl@4.3.0': '@tailwindcss/oxide-linux-x64-musl@4.3.0':
resolution: {integrity: sha512-Z0IADbDo8bh6I7h2IQMx601AdXBLfFpEdUotft86evd/8ZPflZe9COPO8Q1vw+pfLWIUo9zN/JGZvwuAJqduqg==} resolution: {integrity: sha512-Z0IADbDo8bh6I7h2IQMx601AdXBLfFpEdUotft86evd/8ZPflZe9COPO8Q1vw+pfLWIUo9zN/JGZvwuAJqduqg==}
engines: {node: '>= 20'} engines: {node: '>= 20'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [musl]
'@tailwindcss/oxide-wasm32-wasi@4.3.0': '@tailwindcss/oxide-wasm32-wasi@4.3.0':
resolution: {integrity: sha512-HNZGOUxEmElksYR7S6sC5jTeNGpobAsy9u7Gu0AskJ8/20FR9GqebUyB+HBcU/ax6BHuiuJi+Oda4B+YX6H1yA==} resolution: {integrity: sha512-HNZGOUxEmElksYR7S6sC5jTeNGpobAsy9u7Gu0AskJ8/20FR9GqebUyB+HBcU/ax6BHuiuJi+Oda4B+YX6H1yA==}
@@ -1416,30 +1449,35 @@ packages:
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [glibc]
'@tauri-apps/cli-linux-arm64-musl@2.11.2': '@tauri-apps/cli-linux-arm64-musl@2.11.2':
resolution: {integrity: sha512-X1rm0BERqAAggtYTESSgXrS3sz4Sb/OiPiz54UqISlXW+GkR3vNIGnsy/lejNmoXGVqri3Q53BCfQiclOIyRPw==} resolution: {integrity: sha512-X1rm0BERqAAggtYTESSgXrS3sz4Sb/OiPiz54UqISlXW+GkR3vNIGnsy/lejNmoXGVqri3Q53BCfQiclOIyRPw==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [musl]
'@tauri-apps/cli-linux-riscv64-gnu@2.11.2': '@tauri-apps/cli-linux-riscv64-gnu@2.11.2':
resolution: {integrity: sha512-usbMLJbT3KtkOrBMDVeGYNM35aTHXx38SJSzTMSqqjeUIOQ+iVPjb2yAGNAE+KqmBbAx4FOFIyMeKXx2M/JKGQ==} resolution: {integrity: sha512-usbMLJbT3KtkOrBMDVeGYNM35aTHXx38SJSzTMSqqjeUIOQ+iVPjb2yAGNAE+KqmBbAx4FOFIyMeKXx2M/JKGQ==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [riscv64] cpu: [riscv64]
os: [linux] os: [linux]
libc: [glibc]
'@tauri-apps/cli-linux-x64-gnu@2.11.2': '@tauri-apps/cli-linux-x64-gnu@2.11.2':
resolution: {integrity: sha512-Ru4gwJKPG0ctVGchRGpRup4Y4lW2SSfFnrbQcyHhCliKy4g8Qz97TrUgCur4CbWyAgKxvGh3SjrkA0LDYzDGiw==} resolution: {integrity: sha512-Ru4gwJKPG0ctVGchRGpRup4Y4lW2SSfFnrbQcyHhCliKy4g8Qz97TrUgCur4CbWyAgKxvGh3SjrkA0LDYzDGiw==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [glibc]
'@tauri-apps/cli-linux-x64-musl@2.11.2': '@tauri-apps/cli-linux-x64-musl@2.11.2':
resolution: {integrity: sha512-eUm7T6clN1MMmNSRQ9gaWsQdyehQx2Gmn5hht/QUlqZQI/qcP2OJK5dnaxqwFzCr2HdsEo9ydxaqcS1oJzMvUw==} resolution: {integrity: sha512-eUm7T6clN1MMmNSRQ9gaWsQdyehQx2Gmn5hht/QUlqZQI/qcP2OJK5dnaxqwFzCr2HdsEo9ydxaqcS1oJzMvUw==}
engines: {node: '>= 10'} engines: {node: '>= 10'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [musl]
'@tauri-apps/cli-win32-arm64-msvc@2.11.2': '@tauri-apps/cli-win32-arm64-msvc@2.11.2':
resolution: {integrity: sha512-HeeZW80jU+gVTOEX4X/hC6NVSAdDVXajwP5fxIZ/3z9WvUC7qrudX2GMTilYq6Dg0e0sk0XgsAJD1hZ5wPBXUA==} resolution: {integrity: sha512-HeeZW80jU+gVTOEX4X/hC6NVSAdDVXajwP5fxIZ/3z9WvUC7qrudX2GMTilYq6Dg0e0sk0XgsAJD1hZ5wPBXUA==}
@@ -2424,7 +2462,7 @@ packages:
glob@7.2.3: glob@7.2.3:
resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==} resolution: {integrity: sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==}
deprecated: Old versions of glob are not supported, and contain widely publicized security vulnerabilities, which have been fixed in the current version. Please update. Support for old versions may be purchased (at exorbitant rates) by contacting i@izs.me deprecated: Glob versions prior to v9 are no longer supported
gonzales-pe@4.3.0: gonzales-pe@4.3.0:
resolution: {integrity: sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==} resolution: {integrity: sha512-otgSPpUmdWJ43VXyiNgEYE4luzHCL2pz4wQ0OnDluC6Eg4Ko3Vexy/SrSynglw/eR+OhkzmqFCZa/OFa/RgAOQ==}
@@ -2693,24 +2731,28 @@ packages:
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [glibc]
lightningcss-linux-arm64-musl@1.32.0: lightningcss-linux-arm64-musl@1.32.0:
resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==} resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==}
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
cpu: [arm64] cpu: [arm64]
os: [linux] os: [linux]
libc: [musl]
lightningcss-linux-x64-gnu@1.32.0: lightningcss-linux-x64-gnu@1.32.0:
resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==} resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==}
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [glibc]
lightningcss-linux-x64-musl@1.32.0: lightningcss-linux-x64-musl@1.32.0:
resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==} resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==}
engines: {node: '>= 12.0.0'} engines: {node: '>= 12.0.0'}
cpu: [x64] cpu: [x64]
os: [linux] os: [linux]
libc: [musl]
lightningcss-win32-arm64-msvc@1.32.0: lightningcss-win32-arm64-msvc@1.32.0:
resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==} resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==}
@@ -2803,6 +2845,9 @@ packages:
resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==}
engines: {node: '>= 8'} engines: {node: '>= 8'}
mgrs@1.0.0:
resolution: {integrity: sha512-awNbTOqCxK1DBGjalK3xqWIstBZgN6fxsMSiXLs9/spqWkF2pAhb2rrYCFSsr1/tT7PhcDGjZndG8SWYn0byYA==}
micromark-util-character@2.1.1: micromark-util-character@2.1.1:
resolution: {integrity: sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==} resolution: {integrity: sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==}
@@ -3143,6 +3188,14 @@ packages:
engines: {node: '>=14'} engines: {node: '>=14'}
hasBin: true hasBin: true
proj4@2.20.9:
resolution: {integrity: sha512-GLBGqXaTcdWnppre3o1sMmy4DcMGSGq/ng+9k2MTNddarRK6SveINqlqYzi3xEXuy06ljY1TTrC6H9C4f360IQ==}
peerDependencies:
geotiff: '*'
peerDependenciesMeta:
geotiff:
optional: true
prompts@2.4.2: prompts@2.4.2:
resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==} resolution: {integrity: sha512-NxNv/kLguCA7p3jE8oL2aEBsrJWgAakBpgmgK6lpPWV+WuOmY6r2/zbAVnP+T8bQlA0nzHXSJSJW0Hq7ylaD2Q==}
engines: {node: '>= 6'} engines: {node: '>= 6'}
@@ -3756,6 +3809,9 @@ packages:
engines: {node: '>=8'} engines: {node: '>=8'}
hasBin: true hasBin: true
wkt-parser@1.5.6:
resolution: {integrity: sha512-cqHU3lzGt/gt2OqIORP0uVy5yeOX43WABmgFkmJsmcqH3HhQo9PiJG6ftytwGKmpQUbegeX7+pQc2BuNCRfcrw==}
word-wrap@1.2.5: word-wrap@1.2.5:
resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==} resolution: {integrity: sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==}
engines: {node: '>=0.10.0'} engines: {node: '>=0.10.0'}
@@ -4129,40 +4185,40 @@ snapshots:
style-mod: 4.1.3 style-mod: 4.1.3
w3c-keyname: 2.2.8 w3c-keyname: 2.2.8
'@dbx-app/cli-darwin-arm64@0.4.36': '@dbx-app/cli-darwin-arm64@0.4.42':
optional: true optional: true
'@dbx-app/cli-darwin-x64@0.4.36': '@dbx-app/cli-darwin-x64@0.4.42':
optional: true optional: true
'@dbx-app/cli-linux-arm64-gnu@0.4.36': '@dbx-app/cli-linux-arm64-gnu@0.4.42':
optional: true optional: true
'@dbx-app/cli-linux-x64-gnu@0.4.36': '@dbx-app/cli-linux-x64-gnu@0.4.42':
optional: true optional: true
'@dbx-app/cli-win32-arm64@0.4.36': '@dbx-app/cli-win32-arm64@0.4.42':
optional: true optional: true
'@dbx-app/cli-win32-x64@0.4.36': '@dbx-app/cli-win32-x64@0.4.42':
optional: true optional: true
'@dbx-app/mcp-darwin-arm64@0.4.36': '@dbx-app/mcp-darwin-arm64@0.4.42':
optional: true optional: true
'@dbx-app/mcp-darwin-x64@0.4.36': '@dbx-app/mcp-darwin-x64@0.4.42':
optional: true optional: true
'@dbx-app/mcp-linux-arm64-gnu@0.4.36': '@dbx-app/mcp-linux-arm64-gnu@0.4.42':
optional: true optional: true
'@dbx-app/mcp-linux-x64-gnu@0.4.36': '@dbx-app/mcp-linux-x64-gnu@0.4.42':
optional: true optional: true
'@dbx-app/mcp-win32-arm64@0.4.36': '@dbx-app/mcp-win32-arm64@0.4.42':
optional: true optional: true
'@dbx-app/mcp-win32-x64@0.4.36': '@dbx-app/mcp-win32-x64@0.4.42':
optional: true optional: true
'@dotenvx/dotenvx@1.75.1': '@dotenvx/dotenvx@1.75.1':
@@ -6253,6 +6309,8 @@ snapshots:
merge2@1.4.1: {} merge2@1.4.1: {}
mgrs@1.0.0: {}
micromark-util-character@2.1.1: micromark-util-character@2.1.1:
dependencies: dependencies:
micromark-util-symbol: 2.0.1 micromark-util-symbol: 2.0.1
@@ -6587,6 +6645,11 @@ snapshots:
prettier@3.9.4: {} prettier@3.9.4: {}
proj4@2.20.9:
dependencies:
mgrs: 1.0.0
wkt-parser: 1.5.6
prompts@2.4.2: prompts@2.4.2:
dependencies: dependencies:
kleur: 3.0.3 kleur: 3.0.3
@@ -7291,6 +7354,8 @@ snapshots:
siginfo: 2.0.0 siginfo: 2.0.0
stackback: 0.0.2 stackback: 0.0.2
wkt-parser@1.5.6: {}
word-wrap@1.2.5: {} word-wrap@1.2.5: {}
wrap-ansi@9.0.2: wrap-ansi@9.0.2: