Fix references to service area centroid in map creation
This commit is contained in:
parent
908ac4faea
commit
a5b8a333d6
3 changed files with 17 additions and 27 deletions
|
|
@ -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 -->
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
||||
|
|
|
|||
|
|
@ -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>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue