* feat: meilisearch bounding box intersection and map filtering * feat: tiered clustering and polyline filtering based on bounding box diagonal Addressing review comments with optimized performance and data accuracy: - Implemented a two-tiered search strategy (Summary vs. Detailed) to provide 100% accurate cluster counts while minimizing metadata traffic. - Added a client-side ID-based cache to eliminate redundant network requests for trails already in memory. - Introduced tiered 'detail shedding' that dynamically hides small trail lines when zooming out to maintain smooth panning performance. - Fixed Svelte 5 reactivity issues to ensure clusters reappear instantly when trail detail is shed. - Consolidated zoom thresholds into centralized constants for system-wide consistency. - Updated Meilisearch configuration to support efficient ID-based filtering. * feat: implement server-side map clustering using Meilisearch and Supercluster - Implemented SvelteKit server-side clustering route at `/api/v1/search/trails/cluster` using the `supercluster` library. - Integrated backend search results with the new clustering endpoint to improve performance for large trail datasets. - Fixed Svelte 5 reactivity in `MapWithElevationMaplibre.svelte` by making `mapLoaded` reactive and fixing destructuring of `` map data. - Removed obsolete client-side zoom constraints (`minzoom`/`maxzoom`) from `TrailLayer`, `PreviewLayer`, and `ClusterLayer` to allow dynamic visibility controlled by backend attributes. - Fixed a bug where unauthenticated users generated invalid Meilisearch filters. - Optimized map page performance by caching bounding box and filter values in the route loader. - Updated `ClusterLayer` font to `Noto Sans Regular` to match available tileserver resources. * feat: implement dynamic polyline visibility based on result density - Replaced static zoom-based diagonal thresholds with a dynamic "Top N" approach for polyline visibility. - Updated `/api/v1/search/trails/cluster` to mark only the top `MAP_MAX_POLYLINES` (default 100) trails by bounding box diagonal as "large". - Modified `trails_search_bounding_box` store function to always fetch polylines for trails marked as large, regardless of zoom level. - Removed obsolete `MAP_*_ZOOM_DIAGONAL_LIMIT` constants and simplified map layer constructors by removing tier-based filtering. - Updated environment configurations and documentation to use the new `PUBLIC_MAP_MAX_POLYLINES` variable. * refactor: remove obsolete zoom-based map clustering thresholds Following the transition to dynamic server-side clustering based on result density (Top N polylines), this commit removes all remaining zoom-based thresholds and logic. - Removed PUBLIC_MAP_LOW_ZOOM_THRESHOLD, PUBLIC_MAP_MEDIUM_ZOOM_THRESHOLD, and PUBLIC_MAP_HIGH_ZOOM_THRESHOLD environment variables. - Removed the 'mapClusterMinZoom' user setting from the schema, models, and settings UI. - Simplified the map component and MapLibre layer managers by removing unused 'clusterMinZoom', 'minZoom', and 'maxZoom' parameters. - Cleaned up obsolete 'map-cluster-zoom-level' translation keys across all locales. - Updated documentation to reflect the removal of these variables. * chore: remove map clustering debug logs * docs: update changelog and fix global zoom feature disappearance * fix: address PR reviews and refine map cluster/preview visuals * feat: implement configurable map cluster zoom and trail start marker settings * feat: render single unclustered shedded trails as start markers instead of cluster circles * minor fixes * minor ui changes * fix missing entries in map list * remove redundant map clustering zoom clamp * fix merge issues * fix merge issues * fixes * hide popup for trails without details * several improvements * prevent import of client trail_store in server cluster code * update changelog --------- Co-authored-by: slothful-vassal <89943360+slothful-vassal@users.noreply.github.com>
143 lines
3.3 KiB
Go
143 lines
3.3 KiB
Go
package util
|
|
|
|
import (
|
|
"bytes"
|
|
"fmt"
|
|
"io"
|
|
|
|
"github.com/pocketbase/pocketbase/core"
|
|
"github.com/tkrajina/gpxgo/gpx"
|
|
"github.com/twpayne/go-polyline"
|
|
)
|
|
|
|
const PolylineMaxLength = 5 * 1024 * 1024
|
|
|
|
type TrailGeometry struct {
|
|
Polyline string
|
|
MinLat float64
|
|
MaxLat float64
|
|
MinLon float64
|
|
MaxLon float64
|
|
BoundingBoxDiagonal float64
|
|
}
|
|
|
|
func ComputeTrailGeometry(app core.App, r *core.Record) (*TrailGeometry, error) {
|
|
geometry := &TrailGeometry{
|
|
MinLat: r.GetFloat("lat"),
|
|
MaxLat: r.GetFloat("lat"),
|
|
MinLon: r.GetFloat("lon"),
|
|
MaxLon: r.GetFloat("lon"),
|
|
}
|
|
|
|
gpxPath := r.GetString("gpx")
|
|
if len(gpxPath) == 0 {
|
|
return geometry, nil
|
|
}
|
|
|
|
fsys, err := app.NewFilesystem()
|
|
if err != nil {
|
|
return nil, fmt.Errorf("open filesystem: %w", err)
|
|
}
|
|
defer fsys.Close()
|
|
|
|
gpxFilePath := r.BaseFilesPath() + "/" + gpxPath
|
|
gpxFile, err := fsys.GetReader(gpxFilePath)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("open gpx file %q: %w", gpxFilePath, err)
|
|
}
|
|
defer gpxFile.Close()
|
|
|
|
content := new(bytes.Buffer)
|
|
if _, err = io.Copy(content, gpxFile); err != nil {
|
|
return nil, fmt.Errorf("read gpx file %q: %w", gpxFilePath, err)
|
|
}
|
|
|
|
gpxData, err := gpx.Parse(content)
|
|
if err != nil {
|
|
return nil, fmt.Errorf("parse gpx file %q: %w", gpxFilePath, err)
|
|
}
|
|
|
|
minLat, maxLat, minLon, maxLon := 90.0, -90.0, 180.0, -180.0
|
|
hasPoints := false
|
|
|
|
addPoint := func(lat, lon float64) {
|
|
if lat < minLat {
|
|
minLat = lat
|
|
}
|
|
if lat > maxLat {
|
|
maxLat = lat
|
|
}
|
|
if lon < minLon {
|
|
minLon = lon
|
|
}
|
|
if lon > maxLon {
|
|
maxLon = lon
|
|
}
|
|
hasPoints = true
|
|
}
|
|
|
|
for _, trk := range gpxData.Tracks {
|
|
for _, seg := range trk.Segments {
|
|
for _, pt := range seg.Points {
|
|
addPoint(pt.Latitude, pt.Longitude)
|
|
}
|
|
}
|
|
}
|
|
|
|
for _, rte := range gpxData.Routes {
|
|
for _, pt := range rte.Points {
|
|
addPoint(pt.Latitude, pt.Longitude)
|
|
}
|
|
}
|
|
|
|
gpxData.SimplifyTracks(50)
|
|
coordinates := make([][]float64, 0)
|
|
for _, trk := range gpxData.Tracks {
|
|
for _, seg := range trk.Segments {
|
|
for _, pt := range seg.Points {
|
|
coordinates = append(coordinates, []float64{pt.Latitude, pt.Longitude})
|
|
}
|
|
}
|
|
}
|
|
geometry.Polyline = string(polyline.EncodeCoords(coordinates))
|
|
|
|
if hasPoints {
|
|
geometry.MinLat = minLat
|
|
geometry.MaxLat = maxLat
|
|
geometry.MinLon = minLon
|
|
geometry.MaxLon = maxLon
|
|
geometry.BoundingBoxDiagonal = HaversineDistance(minLat, minLon, maxLat, maxLon)
|
|
}
|
|
|
|
return geometry, nil
|
|
}
|
|
|
|
func ComputePolyline(app core.App, r *core.Record) (string, error) {
|
|
geometry, err := ComputeTrailGeometry(app, r)
|
|
if err != nil {
|
|
return "", err
|
|
}
|
|
return geometry.Polyline, nil
|
|
}
|
|
|
|
func SavePolyline(app core.App, r *core.Record) error {
|
|
geometry, err := ComputeTrailGeometry(app, r)
|
|
if err != nil {
|
|
return err
|
|
}
|
|
// Encoded polylines are ASCII-only, so byte length matches character length.
|
|
if len(geometry.Polyline) > PolylineMaxLength {
|
|
return fmt.Errorf("polyline exceeds maximum length of %d characters", PolylineMaxLength)
|
|
}
|
|
r.Set("polyline", geometry.Polyline)
|
|
r.Set("min_lat", geometry.MinLat)
|
|
r.Set("max_lat", geometry.MaxLat)
|
|
r.Set("min_lon", geometry.MinLon)
|
|
r.Set("max_lon", geometry.MaxLon)
|
|
r.Set("bounding_box_diagonal", geometry.BoundingBoxDiagonal)
|
|
if err := app.UnsafeWithoutHooks().Save(r); err != nil {
|
|
return fmt.Errorf("save trail geometry: %w", err)
|
|
}
|
|
return nil
|
|
}
|