Add service area border to aggregate map

html/static/js/map-aggregate.js

@@ -8,7 +8,6 @@ class MapAggregate extends HTMLElement {
 		// Create a shadow DOM
 		this.attachShadow({ mode: "open" });
 
-		this._markers = [];
 		// Initial render
 		this.render();
 	}
@@ -25,70 +24,32 @@ class MapAggregate extends HTMLElement {
 		}
 	}
 
-	// Lifecycle: watch these attributes for changes
-	static get observedAttributes() {
-		return [
-			"api-key",
-			"latitude",
-			"longitude",
-			"organization-id",
-			"tegola",
-			"zoom",
-		];
-	}
-
-	// Lifecycle: respond to attribute changes
-	attributeChangedCallback(name, oldValue, newValue) {
-		// Only handle if map exists and values actually changed
-		if (!this._map || oldValue === newValue) return;
-
-		if (name === "api-key") {
-			this._apiKey = newValue;
-		}
-
-		if (name === "latitude" || name === "longitude") {
-			if (this.hasAttribute("latitude") && this.hasAttribute("longitude")) {
-				const lat = Number(this.getAttribute("latitude"));
-				const lng = Number(this.getAttribute("longitude"));
-				this._map.setCenter([lat, lng]);
-			}
-		}
-
-		if (name === "organization-id") {
-			this._organizationID = newValue;
-		}
-
-		if (name === "tegola") {
-			this._tegola = newValue;
-		}
-
-		if (name === "zoom") {
-			this._map.setZoom(Number(newValue));
-		}
-	}
-
 	_initializeMap() {
-		const lat = Number(this.getAttribute("latitude") || 36.2);
-		const lng = Number(this.getAttribute("longitude") || -119.2);
+		const centroid = JSON.parse(this.getAttribute("centroid"));
 		const organization_id = Number(this.getAttribute("organization-id") || 0);
 		const tegola = this.getAttribute("tegola");
-		const zoom = Number(this.getAttribute("zoom") || 15);
+		const xmin = parseFloat(this.getAttribute("xmin"));
+		const ymin = parseFloat(this.getAttribute("ymin"));
+		const xmax = parseFloat(this.getAttribute("xmax"));
+		const ymax = parseFloat(this.getAttribute("ymax"));
+		const bounds = [
+			[xmin, ymin],
+			[xmax, ymax],
+		];
 
 		const mapElement = this.shadowRoot.querySelector("#map");
 		this._map = new maplibregl.Map({
+			center: centroid.coordinates,
 			container: mapElement,
-			center: {
-				lat: lat,
-				lng: lng,
-			},
 			style: "https://tiles.stadiamaps.com/styles/alidade_smooth.json",
-			zoom: zoom,
+		}).fitBounds(bounds, {
+			padding: { top: 10, bottom: 10, left: 10, right: 10 },
 		});
 		this._map.on("load", () => {
 			this._map.addSource("tegola", {
 				type: "vector",
 				tiles: [
-					`${tegola}maps/nidus/{z}/{x}/{y}?organization_id=${organization_id}`,
+					`${tegola}maps/nidus/{z}/{x}/{y}?id=${organization_id}&organization_id=${organization_id}`,
 				],
 			});
 			this._map.addLayer({
@@ -136,6 +97,15 @@ class MapAggregate extends HTMLElement {
 					"fill-color": "#0dcaf0",
 				},
 			});
+			this._map.addLayer({
+				id: "service-area",
+				source: "tegola",
+				"source-layer": "service-area-bounds",
+				type: "line",
+				paint: {
+					"line-color": "#f00",
+				},
+			});
 			this._map.on("mouseenter", "mosquito_source", (e) => {
 				this._map.getCanvas().style.cursor = "pointer";
 			});
@@ -195,31 +165,6 @@ class MapAggregate extends HTMLElement {
 	jumpTo(args) {
 		this._map.jumpTo(args);
 	}
-
-	setMarker(coords) {
-		console.log("Setting map marker", coords);
-		this._map.jumpTo({
-			center: coords,
-			zoom: 14,
-		});
-		this._markers.forEach((marker) => marker.remove());
-
-		const marker = new maplibregl.Marker({
-			color: "#FF0000",
-			draggable: true,
-		})
-			.setLngLat(coords)
-			.addTo(this._map);
-		marker.on("dragend", function (e) {
-			const markerDraggedEvent = new CustomEvent("markerdragend", {
-				detail: {
-					marker: marker,
-				},
-			});
-			mapContainer.dispatchEvent(markerDraggedEvent);
-		});
-		this._markers = [marker];
-	}
 }
 
 customElements.define("map-aggregate", MapAggregate);

html/static/js/map-libre-test.js

@@ -43,8 +43,8 @@ class MapLibreTest extends HTMLElement {
 		const mapElement = this.shadowRoot.querySelector("#map");
 
 		this._map = new maplibregl.Map({
-			container: mapElement,
 			center: centroid.coordinates,
+			container: mapElement,
 			style: "https://tiles.stadiamaps.com/styles/alidade_smooth.json", // Style URL; see our documentation for more options
 		}).fitBounds(bounds, {
 			padding: { top: 10, bottom: 10, left: 10, right: 10 },

html/template/sync/dashboard.html

@@ -143,11 +143,15 @@
 	<div class="row">
 		<div class="col-12">
 			<map-aggregate
-				latitude="36.3"
-				longitude="-119.2"
-				organization-id="{{ .User.Organization.ID }}"
+				centroid="{{ if .Organization.ServiceAreaCentroidGeojson.IsValue }}
+					{{ .Organization.ServiceAreaCentroidGeojson.MustGet|json }}
+				{{ end }}"
+				organization-id="{{ .Organization.ID }}"
 				tegola="{{ .URL.Tegola }}"
-				zoom="9"
+				xmin="{{ .Organization.ServiceAreaXmin.GetOr 0 }}"
+				ymin="{{ .Organization.ServiceAreaYmin.GetOr 0 }}"
+				xmax="{{ .Organization.ServiceAreaXmax.GetOr 0 }}"
+				ymax="{{ .Organization.ServiceAreaYmax.GetOr 0 }}"
 			/>
 		</div>
 	</div>

html/template/sync/pool-by-id.html

@@ -47,7 +47,7 @@ function onLoad() {
 			}
 		});
 		map.addLayer({
-			"id": "clear-service-area",
+			"id": "service-area",
 			"source": "tegola-nidus",
 			"source-layer": "service-area-bounds",
 			"type": "line",
@@ -129,7 +129,6 @@ document.addEventListener('DOMContentLoaded', onLoad);
 				xmax="{{ .Organization.ServiceAreaXmax.GetOr 0 }}"
 				ymax="{{ .Organization.ServiceAreaYmax.GetOr 0 }}"
 			></map-libre-test>
-			const CENTROID=;
 		</div>
 		<div class="card mb-4">
 			<div

sync/dash.go

@@ -47,6 +47,7 @@ type ContentDashboard struct {
 	IsSyncOngoing        bool
 	LastSync             *time.Time
 	MapData              ComponentMap
+	Organization         *models.Organization
 	RecentRequests       []ServiceRequestSummary
 	URL                  ContentURL
 	User                 User
@@ -217,6 +218,7 @@ func dashboard(ctx context.Context, w http.ResponseWriter, user *models.User) {
 		MapData: ComponentMap{
 			MapboxToken: config.MapboxToken,
 		},
+		Organization:   org,
 		RecentRequests: requests,
 		URL:            newContentURL(),
 		User:           userContent,