Add map to pool import overview

For my own debugging really

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

@@ -0,0 +1,166 @@
+// A test of maplibre-gl in a custom element
+class MapLibreTest extends HTMLElement {
+	constructor() {
+		super();
+
+		// Create a shadow DOM
+		this.attachShadow({ mode: "open" });
+
+		// Initial render
+		this.render();
+
+		this._map = null;
+
+		// markers shown on the map
+		this._markers = [];
+	}
+
+	// Lifecycle: when element is added to the DOM
+	connectedCallback() {
+		// Initialize the map when the element is added to the DOM
+		setTimeout(() => this._initializeMap(), 0);
+	}
+
+	disconnectedCallback() {
+		if (this._map) {
+			this._map.remove();
+		}
+	}
+
+	// Lifecycle: watch these attributes for changes
+	static get observedAttributes() {
+		return ["latitude", "longitude", "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 === "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 === "zoom") {
+			this._map.setZoom(Number(newValue));
+		}
+	}
+
+	_initializeMap() {
+		const apiKey = this.getAttribute("api-key");
+		const lat = Number(this.getAttribute("latitude") || 36.2);
+		const lng = Number(this.getAttribute("longitude") || -119.2);
+		const mapElement = this.shadowRoot.querySelector("#map");
+		const tegola = this.getAttribute("tegola");
+		const zoom = Number(this.getAttribute("zoom") || 15);
+
+		this._map = new maplibregl.Map({
+			container: mapElement,
+			center: {
+				lat: lat,
+				lng: lng,
+			},
+			style: "https://tiles.stadiamaps.com/styles/alidade_smooth.json", // Style URL; see our documentation for more options
+			zoom: zoom,
+		});
+		this._map.on("load", () => {
+			this.dispatchEvent(new CustomEvent("load"), {
+				bubbles: true,
+				composed: true, // Allows event to cross shadow DOM boundary
+				detail: {
+					map: this,
+				},
+			});
+		});
+	}
+
+	// Initial render of component
+	render() {
+		this.shadowRoot.innerHTML = `
+			<style>
+				@import url('//unpkg.com/maplibre-gl@5.0.1/dist/maplibre-gl.css');
+				.mapboxgl-ctrl-bottom-right {
+					display: none;
+				}
+				.map-container {
+					background-color: #e9ecef;
+					border-radius: 10px;
+					box-shadow: 0 4px 6px rgba(0,0,0,0.05);
+					height: 500px;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					margin-top: 20px;
+				}
+				#map {
+					height: 500px;
+					width:100%;
+					margin-bottom: 10px;
+				}
+				#map img {
+					max-width: none;
+					min-width: 0px;
+					height: auto;
+				}
+			</style>
+			
+			<div id="map-container" class="map-container">
+				<div id="map"></div>
+			</div>
+		`;
+	}
+
+	addLayer(a) {
+		return this._map.addLayer(a);
+	}
+	addSource(a, b) {
+		return this._map.addSource(a, b);
+	}
+	jumpTo(args) {
+		return this._map.jumpTo(args);
+	}
+	on(a, b) {
+		return this._map.on(a, b);
+	}
+	once(a, b) {
+		return this._map.once(a, b);
+	}
+	queryRenderedFeatures(a) {
+		return this._map.queryRenderedFeatures(a);
+	}
+
+	setMarker(coords) {
+		console.log("Setting map marker", coords);
+		this._map.jumpTo({
+			center: coords,
+			zoom: 14,
+		});
+		this._markers.forEach((marker) => marker.remove());
+
+		const marker = new mapboxgl.Marker({
+			color: "#FF0000",
+			draggable: true,
+		})
+			.setLngLat(coords)
+			.addTo(map);
+		marker.on("dragend", function (e) {
+			const markerDraggedEvent = new CustomEvent("markerdragend", {
+				detail: {
+					marker: marker,
+				},
+			});
+			mapContainer.dispatchEvent(markerDraggedEvent);
+		});
+		this._markers = [marker];
+	}
+
+	SetLayoutProperty(layout, property, value) {
+		return this._map.setLayoutProperty(layout, property, value);
+	}
+}
+
+customElements.define("map-libre-test", MapLibreTest);

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

@@ -2,6 +2,39 @@
 {{ define "title" }}Pool Upload{{ end }}
 
 {{ define "extraheader" }}
+	<script
+		type="text/javascript"
+		src="//unpkg.com/maplibre-gl@5.0.1/dist/maplibre-gl.js"
+	></script>
+	<script src="/static/js/map-libre-test.js"></script>
+	<script>
+const CSV_FILE_ID={{ .CSVFileID }};
+const ORG_ID={{ .User.Organization.ID }}
+function onLoad() {
+	const map = document.querySelector("map-libre-test");
+	map.addEventListener("load", (event) => {
+		map.addSource('tegola-nidus', {
+			'type': 'vector',
+			'tiles': [
+				`{{.URL.Tegola}}maps/nidus/{z}/{x}/{y}?csv_file=${CSV_FILE_ID}&organization_id=${ORG_ID}`
+			]
+		});
+		map.addLayer({
+			'id': 'pool',
+			'source': 'tegola-nidus',
+			'source-layer': 'fileupload_pool',
+			'type': 'circle',
+			'paint': {
+				'circle-color': "#DC4535",
+				'circle-radius': 7,
+				'circle-stroke-width': 2,
+				'circle-stroke-color': "#9C1C28"
+			}
+		});
+	});
+}
+document.addEventListener('DOMContentLoaded', onLoad);
+	</script>
 {{ end }}
 {{ define "content" }}
 	<div class="container mt-4 results-container">
@@ -56,6 +89,9 @@
 			</div>
 		</div>
 
+		<div class="card mb-4">
+			<map-libre-test></map-libre-test>
+		</div>
 		<div class="card mb-4">
 			<div
 				class="card-header bg-light d-flex justify-content-between align-items-center"

sync/pool.go

@@ -13,9 +13,10 @@ import (
 )
 
 type ContentPoolDetail struct {
-	Upload platform.UploadPoolDetail
-	URL    ContentURL
-	User   User
+	CSVFileID int32
+	Upload    platform.UploadPoolDetail
+	URL       ContentURL
+	User      User
 }
 type ContentPoolList struct {
 	Uploads []platform.PoolUpload
@@ -78,9 +79,10 @@ func getPoolUploadByID(w http.ResponseWriter, r *http.Request, u *models.User) {
 		return
 	}
 	data := ContentPoolDetail{
-		Upload: detail,
-		URL:    newContentURL(),
-		User:   userContent,
+		CSVFileID: int32(file_id),
+		Upload:    detail,
+		URL:       newContentURL(),
+		User:      userContent,
 	}
 	html.RenderOrError(w, "sync/pool-by-id.html", data)
 }

tools/drop-and-recreate.sql

@@ -8,11 +8,13 @@ CREATE EXTENSION h3_postgis CASCADE;
 CREATE EXTENSION hstore;
 CREATE SCHEMA import;
 ALTER SCHEMA import OWNER TO $1;
+GRANT USAGE ON SCHEMA fileupload TO "tegola";
 GRANT USAGE ON SCHEMA import TO "tegola";
 GRANT USAGE ON SCHEMA publicreport TO "tegola";
-GRANT SELECT ON publicreport.report_location TO "tegola";
+GRANT SELECT ON fileupload.pool TO "tegola";
 GRANT SELECT ON h3_aggregation to "tegola";
 GRANT SELECT ON import.district TO "tegola";
+GRANT SELECT ON publicreport.report_location TO "tegola";
 GRANT ALL PRIVILEGES ON SCHEMA public TO $1;
 -- do import of district data
 ALTER TABLE import.district ADD COLUMN geom_4326 geometry(MultiPolygon,4326) GENERATED ALWAYS AS (ST_Transform(geom, 4326)) STORED;