rtw

 1@@ -44,10 +44,13 @@ check-concurrently:
 2 	fi
 3 .PHONY: check-concurrently
 4 
 5-dev: check-concurrently
 6+dev: check-concurrently result/bin/y-sweet
 7 	@$(MAKE) -s -j 2 dev-parallel
 8 .PHONY: dev
 9 
10+result/bin/y-sweet:
11+	nix build .#y-sweet
12+
13 dev-client:
14 	@cd client && $(MAKE) -s dev
15 .PHONY: dev-client

 1@@ -30,20 +30,25 @@ function MapInstance$WaypointMarker(props) {
 2           strokeWidth: 3,
 3           className: "rounded-full bg-[#FFFFFF66]"
 4         }),
 5-        anchor: "center"
 6+        anchor: "center",
 7+        opacity: 1.0,
 8+        opacityWhenCovered: 1.0
 9       }, id),
10       State.zoom.value > 3.0 ? JsxRuntime.jsx(ReactMaplibre.Marker, {
11           longitude: lon,
12           latitude: lat,
13           children: JsxRuntime.jsx("div", {
14             children: props.label,
15-            className: "bg-[#333333dd] text-white rounded-sm px-1"
16+            className: "bg-[#333333] text-white rounded-sm px-1"
17           }),
18           anchor: "top-left",
19           offset: [
20             6,
21             6
22-          ]
23+          ],
24+          color: "#333333",
25+          opacity: 1.0,
26+          opacityWhenCovered: 1.0
27         }, id + "-text") : null
28     ]
29   });

 1@@ -164,6 +164,9 @@ module Marker = {
 2     ~onClick: mapLayerMouseHandler=?,
 3     ~style: string=?,
 4     ~className: string=?,
 5+    ~color: string=?,
 6+    ~opacity: float=?,
 7+    ~opacityWhenCovered: float=?,
 8   ) => Jsx.element = "Marker"
 9 }
10 

 1@@ -2,7 +2,14 @@ module WaypointMarker = {
 2   @jsx.component
 3   let make = (~id: string, ~lon: float, ~lat: float, ~label: string, ~error: array<string>) => {
 4     <>
 5-      <Maplibre.Marker key={id} longitude={lon} latitude={lat} anchor="center">
 6+      <Maplibre.Marker
 7+        key={id}
 8+        longitude={lon}
 9+        latitude={lat}
10+        anchor="center"
11+        opacity={1.0}
12+        opacityWhenCovered={1.0}
13+      >
14         <Icons.Waypoint
15           size={24}
16           color={error->Array.length == 0 ? "var(--color-blue)" : "var(--color-red)"}
17@@ -14,11 +21,16 @@ module WaypointMarker = {
18       // hide labels when zoomed out at world level
19       {State.zoom->Preact.Signal.get > 3.0
20         ? <Maplibre.Marker
21-            key={id ++ "-text"} longitude={lon} latitude={lat} anchor="top-left" offset=(6, 6)
22+            key={id ++ "-text"}
23+            longitude={lon}
24+            latitude={lat}
25+            anchor="top-left"
26+            offset=(6, 6)
27+            color="#333333"
28+            opacity={1.0}
29+            opacityWhenCovered={1.0}
30           >
31-            <div className="bg-[#333333dd] text-white rounded-sm px-1">
32-              {label->Preact.string}
33-            </div>
34+            <div className="bg-[#333333] text-white rounded-sm px-1"> {label->Preact.string} </div>
35           </Maplibre.Marker>
36         : Preact.null}
37     </>

1@@ -13,7 +13,7 @@ lint:
2 .PHONY: lint
3 
4 dev:
5-	@concurrently --color 6 "server" "find . -name '*.go' -o -name '*.templ' | entr -r sh -c 'go tool templ generate && go run cmd/server/server.go cmd/server/config.go -c config.toml'" \
6+	@concurrently --color 6 "server" "find . -name '*.go' -o -name '*.templ' | entr -r sh -c 'go tool templ generate && go run cmd/rtw/server.go cmd/rtw/config.go -c config.toml'" \
7 		"ysweet" "../result/bin/y-sweet serve --port 9000 --checkpoint-freq-seconds 90" \
8 		"router" "java -Xmx6g -jar $(shell dirname $(GRAPHHOPPER))/graphhopper-web-*.jar server ../osm-data/nepal-india.yml" \
9 		"geocoder" "~/projects/waldo/bin/waldo data/world.parquet" \