From a5b8a333d62819bbba2184ede6119500ecf7bfe8 Mon Sep 17 00:00:00 2001
From: Eli Ribble <eli@gleipnir.technology>
Date: Thu, 19 Mar 2026 18:08:41 +0000
Subject: [PATCH] Fix references to service area centroid in map creation

---
 .../sync/configuration/organization.html      | 20 ++++++++-----------
 html/template/sync/planning-root.html         | 11 ++++------
 html/template/sync/radar.html                 | 13 +++++-------
 3 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/html/template/sync/configuration/organization.html b/html/template/sync/configuration/organization.html
index 184537fc..bed60b18 100644
--- a/html/template/sync/configuration/organization.html
+++ b/html/template/sync/configuration/organization.html
@@ -28,18 +28,14 @@
 					</button>
 				</div>
 
-				{{ if .Organization.ServiceAreaCentroidGeojson.IsValue }}
-					<map-service-area
-						organization-id="{{ .Organization.ID }}"
-						centroid="{{ .Organization.ServiceAreaCentroidGeojson.MustGet|json }}"
-						xmin="{{ .Organization.ServiceAreaXmin.GetOr 0 }}"
-						ymin="{{ .Organization.ServiceAreaYmin.GetOr 0 }}"
-						xmax="{{ .Organization.ServiceAreaXmax.GetOr 0 }}"
-						ymax="{{ .Organization.ServiceAreaYmax.GetOr 0 }}"
-						tegola="{{ .URL.Tegola }}"
-					></map-service-area>
-				{{ end }}
-
+				<map-service-area
+					organization-id="{{ .Organization.ID }}"
+					tegola="{{ .URL.Tegola }}"
+					xmin="{{ .Organization.ServiceArea.Min.X }}"
+					ymin="{{ .Organization.ServiceArea.Min.Y }}"
+					xmax="{{ .Organization.ServiceArea.Max.X }}"
+					ymax="{{ .Organization.ServiceArea.Max.Y }}"
+				></map-service-area>
 
 				<div class="row">
 					<!-- Basic Information -->
diff --git a/html/template/sync/planning-root.html b/html/template/sync/planning-root.html
index 632c5bc1..ceaf33d3 100644
--- a/html/template/sync/planning-root.html
+++ b/html/template/sync/planning-root.html
@@ -486,15 +486,12 @@
 						<div class="map-container">
 							<map-multipoint
 								id="map"
-								centroid="{{ if .Organization.ServiceAreaCentroidGeojson.IsValue }}
-									{{ .Organization.ServiceAreaCentroidGeojson.MustGet|json }}
-								{{ end }}"
 								organization-id="{{ .Organization.ID }}"
 								tegola="{{ .URL.Tegola }}"
-								xmin="{{ .Organization.ServiceAreaXmin.GetOr 0 }}"
-								ymin="{{ .Organization.ServiceAreaYmin.GetOr 0 }}"
-								xmax="{{ .Organization.ServiceAreaXmax.GetOr 0 }}"
-								ymax="{{ .Organization.ServiceAreaYmax.GetOr 0 }}"
+								xmin="{{ .Organization.ServiceArea.Min.X }}"
+								ymin="{{ .Organization.ServiceArea.Min.Y }}"
+								xmax="{{ .Organization.ServiceArea.Max.X }}"
+								ymax="{{ .Organization.ServiceArea.Max.Y }}"
 							></map-multipoint>
 						</div>
 
diff --git a/html/template/sync/radar.html b/html/template/sync/radar.html
index e7a58140..c9bc0afb 100644
--- a/html/template/sync/radar.html
+++ b/html/template/sync/radar.html
@@ -89,15 +89,12 @@
 		</div>
 		<div class="card-body p-2">
 			<map-routing
-				centroid="{{ if .C.Organization.ServiceAreaCentroidGeojson.IsValue }}
-					{{ .C.Organization.ServiceAreaCentroidGeojson.MustGet|json }}
-				{{ end }}"
-				organization-id="{{ .C.Organization.ID }}"
+				organization-id="{{ .Organization.ID }}"
 				tegola="{{ .URL.Tegola }}"
-				xmin="{{ .C.Organization.ServiceAreaXmin.GetOr 0 }}"
-				ymin="{{ .C.Organization.ServiceAreaYmin.GetOr 0 }}"
-				xmax="{{ .C.Organization.ServiceAreaXmax.GetOr 0 }}"
-				ymax="{{ .C.Organization.ServiceAreaYmax.GetOr 0 }}"
+				xmin="{{ .Organization.ServiceArea.Min.X }}"
+				ymin="{{ .Organization.ServiceArea.Min.Y }}"
+				xmax="{{ .Organization.ServiceArea.Max.X }}"
+				ymax="{{ .Organization.ServiceArea.Max.Y }}"
 			/>
 		</div>
 	</div>