Compare commits
4 Commits
v0.22.0
...
29228fc9ea
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
29228fc9ea | ||
| c2794fa0f9 | |||
| 7edd5ed1e6 | |||
| 934805e707 |
@@ -1,6 +1,8 @@
|
|||||||
package main
|
package main
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"fmt"
|
||||||
|
"math"
|
||||||
"math/rand"
|
"math/rand"
|
||||||
"strconv"
|
"strconv"
|
||||||
"sync"
|
"sync"
|
||||||
@@ -24,6 +26,55 @@ var (
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
// shipState tracks a ship lerping along a loop of waypoints.
|
||||||
|
type shipState struct {
|
||||||
|
lng, lat float64
|
||||||
|
waypoints [][2]float64 // [lng, lat] pairs
|
||||||
|
wpIdx int // index of next target waypoint
|
||||||
|
progress float64 // 0..1 toward next waypoint
|
||||||
|
speed float64 // progress increment per tick
|
||||||
|
}
|
||||||
|
|
||||||
|
func (s *shipState) tick() {
|
||||||
|
s.progress += s.speed
|
||||||
|
for s.progress >= 1 {
|
||||||
|
s.progress -= 1
|
||||||
|
s.wpIdx = (s.wpIdx + 1) % len(s.waypoints)
|
||||||
|
}
|
||||||
|
from := s.waypoints[(s.wpIdx-1+len(s.waypoints))%len(s.waypoints)]
|
||||||
|
to := s.waypoints[s.wpIdx]
|
||||||
|
s.lng = from[0] + (to[0]-from[0])*s.progress
|
||||||
|
s.lat = from[1] + (to[1]-from[1])*s.progress
|
||||||
|
}
|
||||||
|
|
||||||
|
// heading returns clockwise degrees from north (for SVG rotation).
|
||||||
|
func (s *shipState) heading() float64 {
|
||||||
|
from := s.waypoints[(s.wpIdx-1+len(s.waypoints))%len(s.waypoints)]
|
||||||
|
to := s.waypoints[s.wpIdx]
|
||||||
|
dx := to[0] - from[0]
|
||||||
|
dy := to[1] - from[1]
|
||||||
|
// atan2 gives angle from +X axis; convert to CW from north
|
||||||
|
return math.Mod(math.Atan2(dx, dy)*180/math.Pi+360, 360)
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
fleetOnce sync.Once
|
||||||
|
fleet struct {
|
||||||
|
mu sync.RWMutex
|
||||||
|
ships [3]shipState
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
|
const shipSVG = `<svg width="48" height="28" viewBox="0 0 80 44" xmlns="http://www.w3.org/2000/svg">` +
|
||||||
|
`<path d="M2 30 L10 42 L70 42 L78 30 Z" fill="#1b3a5c"/>` +
|
||||||
|
`<rect x="12" y="24" width="56" height="6" rx="1" fill="#2c5f8a"/>` +
|
||||||
|
`<rect x="18" y="14" width="46" height="10" rx="1" fill="#2c5f8a" stroke="#1b3a5c" stroke-width="0.5"/>` +
|
||||||
|
`<rect x="8" y="12" width="9" height="12" rx="1" fill="#d5dfe8" stroke="#2c5f8a" stroke-width="0.5"/>` +
|
||||||
|
`<rect x="9.5" y="13" width="6" height="4" rx="0.5" fill="#85c1e9"/>` +
|
||||||
|
`<rect x="10" y="4" width="5" height="8" rx="0.5" fill="#1b3a5c"/>` +
|
||||||
|
`<rect x="9.5" y="2" width="6" height="3" rx="0.5" fill="#c0392b"/>` +
|
||||||
|
`</svg>`
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
v := via.New()
|
v := via.New()
|
||||||
v.Config(via.Options{
|
v.Config(via.Options{
|
||||||
@@ -48,6 +99,50 @@ func main() {
|
|||||||
}()
|
}()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
// Fleet of ships following waypoint loops through SF Bay.
|
||||||
|
fleetOnce.Do(func() {
|
||||||
|
fleet.ships = [3]shipState{
|
||||||
|
{ // Golden Gate → Alcatraz → Pier 39 → back out
|
||||||
|
waypoints: [][2]float64{
|
||||||
|
{-122.478, 37.819}, {-122.423, 37.827},
|
||||||
|
{-122.410, 37.809}, {-122.423, 37.827},
|
||||||
|
},
|
||||||
|
speed: 0.03,
|
||||||
|
},
|
||||||
|
{ // Oakland → Treasure Island → Angel Island → loop
|
||||||
|
waypoints: [][2]float64{
|
||||||
|
{-122.330, 37.795}, {-122.370, 37.823},
|
||||||
|
{-122.432, 37.860}, {-122.370, 37.823},
|
||||||
|
},
|
||||||
|
speed: 0.02,
|
||||||
|
},
|
||||||
|
{ // Sausalito → Pier 39 ferry route
|
||||||
|
waypoints: [][2]float64{
|
||||||
|
{-122.480, 37.859}, {-122.435, 37.840},
|
||||||
|
{-122.410, 37.809}, {-122.435, 37.840},
|
||||||
|
},
|
||||||
|
speed: 0.025,
|
||||||
|
},
|
||||||
|
}
|
||||||
|
// Set initial positions.
|
||||||
|
for i := range fleet.ships {
|
||||||
|
s := &fleet.ships[i]
|
||||||
|
s.lng = s.waypoints[0][0]
|
||||||
|
s.lat = s.waypoints[0][1]
|
||||||
|
s.wpIdx = 1
|
||||||
|
}
|
||||||
|
go func() {
|
||||||
|
for {
|
||||||
|
time.Sleep(time.Second)
|
||||||
|
fleet.mu.Lock()
|
||||||
|
for i := range fleet.ships {
|
||||||
|
fleet.ships[i].tick()
|
||||||
|
}
|
||||||
|
fleet.mu.Unlock()
|
||||||
|
}
|
||||||
|
}()
|
||||||
|
})
|
||||||
|
|
||||||
v.Page("/", func(c *via.Context) {
|
v.Page("/", func(c *via.Context) {
|
||||||
m := maplibre.New(c, maplibre.Options{
|
m := maplibre.New(c, maplibre.Options{
|
||||||
Style: "https://demotiles.maplibre.org/style.json",
|
Style: "https://demotiles.maplibre.org/style.json",
|
||||||
@@ -75,14 +170,39 @@ func main() {
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
// Purple vehicle marker — reads shared Go state
|
// Animated container ships following waypoint routes
|
||||||
|
shipNames := [3]string{"MSC Adriatica", "Evergreen Harmony", "Maersk Aurora"}
|
||||||
|
type shipSignals struct{ lng, lat *via.Signal }
|
||||||
|
var ships [3]shipSignals
|
||||||
|
|
||||||
|
fleet.mu.RLock()
|
||||||
|
for i, s := range fleet.ships {
|
||||||
|
ships[i].lng = c.Signal(s.lng)
|
||||||
|
ships[i].lat = c.Signal(s.lat)
|
||||||
|
m.AddMarker(fmt.Sprintf("ship-%d", i), maplibre.Marker{
|
||||||
|
LngSignal: ships[i].lng,
|
||||||
|
LatSignal: ships[i].lat,
|
||||||
|
Element: shipSVG,
|
||||||
|
Anchor: "center",
|
||||||
|
Rotation: s.heading(),
|
||||||
|
Popup: &maplibre.Popup{
|
||||||
|
Content: fmt.Sprintf("<strong>%s</strong>", shipNames[i]),
|
||||||
|
},
|
||||||
|
})
|
||||||
|
}
|
||||||
|
fleet.mu.RUnlock()
|
||||||
|
|
||||||
|
// Custom SVG vehicle marker — reads shared Go state
|
||||||
vehicleLng := c.Signal(-122.43)
|
vehicleLng := c.Signal(-122.43)
|
||||||
vehicleLat := c.Signal(37.77)
|
vehicleLat := c.Signal(37.77)
|
||||||
|
|
||||||
m.AddMarker("vehicle", maplibre.Marker{
|
m.AddMarker("vehicle", maplibre.Marker{
|
||||||
LngSignal: vehicleLng,
|
LngSignal: vehicleLng,
|
||||||
LatSignal: vehicleLat,
|
LatSignal: vehicleLat,
|
||||||
Color: "#9b59b6",
|
Element: `<svg width="20" height="20" viewBox="0 0 20 20" xmlns="http://www.w3.org/2000/svg">` +
|
||||||
|
`<circle cx="10" cy="10" r="9" fill="#9b59b6" stroke="#fff" stroke-width="2"/>` +
|
||||||
|
`</svg>`,
|
||||||
|
Anchor: "center",
|
||||||
})
|
})
|
||||||
|
|
||||||
c.OnInterval(time.Second, func() {
|
c.OnInterval(time.Second, func() {
|
||||||
@@ -91,6 +211,14 @@ func main() {
|
|||||||
vehicle.mu.RUnlock()
|
vehicle.mu.RUnlock()
|
||||||
vehicleLng.SetValue(lng)
|
vehicleLng.SetValue(lng)
|
||||||
vehicleLat.SetValue(lat)
|
vehicleLat.SetValue(lat)
|
||||||
|
|
||||||
|
fleet.mu.RLock()
|
||||||
|
for i, s := range fleet.ships {
|
||||||
|
ships[i].lng.SetValue(s.lng)
|
||||||
|
ships[i].lat.SetValue(s.lat)
|
||||||
|
}
|
||||||
|
fleet.mu.RUnlock()
|
||||||
|
|
||||||
c.SyncSignals()
|
c.SyncSignals()
|
||||||
})
|
})
|
||||||
|
|
||||||
|
|||||||
@@ -179,10 +179,25 @@ func initScript(m *Map) string {
|
|||||||
// markerBodyJS generates JS to add a marker, assuming `map` is in scope.
|
// markerBodyJS generates JS to add a marker, assuming `map` is in scope.
|
||||||
func markerBodyJS(mapID, markerID string, mk Marker) string {
|
func markerBodyJS(mapID, markerID string, mk Marker) string {
|
||||||
var b strings.Builder
|
var b strings.Builder
|
||||||
|
|
||||||
|
if mk.Element != "" {
|
||||||
|
b.WriteString(fmt.Sprintf(
|
||||||
|
`var _mkEl=document.createElement('div');_mkEl.innerHTML=%s;`,
|
||||||
|
jsonStr(mk.Element)))
|
||||||
|
}
|
||||||
|
|
||||||
opts := "{"
|
opts := "{"
|
||||||
if mk.Color != "" {
|
if mk.Element != "" {
|
||||||
|
opts += `element:_mkEl.firstElementChild||_mkEl,`
|
||||||
|
} else if mk.Color != "" {
|
||||||
opts += fmt.Sprintf(`color:%s,`, jsonStr(mk.Color))
|
opts += fmt.Sprintf(`color:%s,`, jsonStr(mk.Color))
|
||||||
}
|
}
|
||||||
|
if mk.Anchor != "" {
|
||||||
|
opts += fmt.Sprintf(`anchor:%s,`, jsonStr(mk.Anchor))
|
||||||
|
}
|
||||||
|
if mk.Rotation != 0 {
|
||||||
|
opts += fmt.Sprintf(`rotation:%s,`, formatFloat(mk.Rotation))
|
||||||
|
}
|
||||||
if mk.Draggable {
|
if mk.Draggable {
|
||||||
opts += `draggable:true,`
|
opts += `draggable:true,`
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -302,6 +302,19 @@ type Marker struct {
|
|||||||
Draggable bool
|
Draggable bool
|
||||||
Popup *Popup
|
Popup *Popup
|
||||||
|
|
||||||
|
// Element is raw HTML/SVG used as a custom marker instead of the
|
||||||
|
// default pin. When set, Color is ignored.
|
||||||
|
// Do not pass untrusted user input without sanitizing it first.
|
||||||
|
Element string
|
||||||
|
|
||||||
|
// Anchor controls which part of the element sits at the coordinate.
|
||||||
|
// Values: "center" (default for custom elements), "bottom" (default
|
||||||
|
// for the pin), "top", "left", "right", "top-left", etc.
|
||||||
|
Anchor string
|
||||||
|
|
||||||
|
// Rotation is clockwise degrees. Useful for directional icons (ships, vehicles).
|
||||||
|
Rotation float64
|
||||||
|
|
||||||
// Signal-backed position. When set, signals drive marker position reactively.
|
// Signal-backed position. When set, signals drive marker position reactively.
|
||||||
// Initial position is read from the signal values. LngLat is ignored when signals are set.
|
// Initial position is read from the signal values. LngLat is ignored when signals are set.
|
||||||
// If Draggable is true, drag updates write back to these signals.
|
// If Draggable is true, drag updates write back to these signals.
|
||||||
|
|||||||
Reference in New Issue
Block a user