Gleipnir/nidus-sync
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Show pool map in planning workbench when signal is selected

Browse source
This commit is contained in:
Eli Ribble 2026-03-20 22:47:03 +00:00
parent 931ea00e22
commit ddc63bfa91
No known key found for this signature in database
4 changed files with 68 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

60
html/template/sync/planning-root.html
View file

@ -7,9 +7,37 @@
src="//unpkg.com/maplibre-gl@5.0.1/dist/maplibre-gl.js"
></script>
<script src="/static/js/map-multipoint.js"></script>
<script src="/static/js/map-proxied-arcgis-tile.js"></script>
<script src="/static/js/time-relative.js"></script>
<script>
function configureMapTile() {
const map_tile = document.querySelector("map-proxied-arcgis-tile");
map_tile.on("load", () => {
map_tile.addLayer({
id: "parcel",
minzoom: 14,
paint: {
"line-color": "#0f0",
},
source: "tegola",
"source-layer": "parcel",
type: "line",
});
map_tile.addLayer({
id: "signal-point",
paint: {
"circle-color": "#0D6EfD",
"circle-radius": 7,
"circle-stroke-width": 2,
"circle-stroke-color": "#024AB6",
},
source: "tegola",
"source-layer": "signal-point",
type: "circle",
});
});
}
// Return two points defining a bounding box for the given points
function getBoundingBox(points) {
// Handle empty or invalid input
@ -69,6 +97,7 @@
leads: [],
loading: false,
poolLocations: {}, // A mapping of signal IDs to the pool values
showMapTile: false,
selectedSignals: [],
signals: [],
@ -115,7 +144,6 @@
});
});
},
// Load all data
async loadData() {
this.loading = true;
@ -281,6 +309,18 @@
alert(`Failed to mark signals: ${err.message}`);
}
},
selectedSignalLocation() {
const first_pool = this.selectedSignals.reduce(
(accumulator, current) => {
if (accumulator == null && current.type == "flyover pool") {
return current;
}
return accumulator;
},
null,
);
return first_pool?.location;
},
toggleSignal(signal) {
const index = this.selectedSignals.findIndex(
(s) => s.id === signal.id,
@ -292,6 +332,12 @@
this.selectedSignals.push(signal);
}
updateMap(this.selectedSignals);
this.showMapTile = this.selectedSignals.reduce(
(accumulator, current) =>
accumulator || current.type == "flyover pool",
false,
);
console.log("show tile", this.showMapTile);
},
updateSignalLocation(event, signal_id) {
console.log("map click", signal_id, event.detail);
@ -584,6 +630,18 @@
</div>
</div>
</div>
<div x-show="showMapTile" class="map-container">
<map-proxied-arcgis-tile
x-init="configureMapTile()"
class="map"
organization-id="{{ .Organization.ID }}"
tegola="{{ .URL.Tegola }}"
{{ .C.URLTiles }}
:latitude="selectedSignalLocation()?.latitude ?? 0.0"
:longitude="selectedSignalLocation()?.longitude ?? 0.0"
>
</map-proxied-arcgis-tile>
</div>
</div>
</div>
</div>

2
html/template/sync/review/pool.html
View file

@ -593,11 +593,9 @@
></map-multipoint>
</div>
<!-- Aerial Image Placeholder -->
<div class="map-container">
<map-proxied-arcgis-tile
class="map"
arcgis-access-token="{{ .C.ArcgisAccessToken }}"
organization-id="{{ .Organization.ID }}"
tegola="{{ .URL.Tegola }}"
{{ .C.URLTiles }}

21
sync/planning.go
View file

@ -2,32 +2,23 @@ package sync
import (
"context"
"fmt"
"html/template"
"net/http"
"github.com/Gleipnir-Technology/nidus-sync/db/models"
"github.com/Gleipnir-Technology/nidus-sync/config"
"github.com/Gleipnir-Technology/nidus-sync/html"
nhttp "github.com/Gleipnir-Technology/nidus-sync/http"
"github.com/Gleipnir-Technology/nidus-sync/platform"
"github.com/rs/zerolog/log"
//"github.com/rs/zerolog/log"
)
type contentPlanningRoot struct {
ArcgisAccessToken string
URLTiles template.HTMLAttr
}
func getPlanningRoot(ctx context.Context, r *http.Request, user platform.User) (*html.Response[contentPlanningRoot], *nhttp.ErrorWithStatus) {
var oauth_token *models.ArcgisOauthToken
var err error
var access_token string
oauth_token, err = platform.GetOAuthForOrg(ctx, user.Organization)
if err != nil {
log.Warn().Err(err).Msg("Failed to get oauth")
oauth_token = nil
access_token = ""
} else {
access_token = oauth_token.AccessToken
}
return html.NewResponse("sync/planning-root.html", contentPlanningRoot{
ArcgisAccessToken: access_token,
URLTiles: template.HTMLAttr(fmt.Sprintf(`url-tiles="%s"`, config.MakeURLNidus("/api/tile/{z}/{y}/{x}"))),
}), nil
}

20
sync/review.go
View file

@ -7,34 +7,20 @@ import (
"net/http"
"github.com/Gleipnir-Technology/nidus-sync/config"
"github.com/Gleipnir-Technology/nidus-sync/db/models"
"github.com/Gleipnir-Technology/nidus-sync/html"
nhttp "github.com/Gleipnir-Technology/nidus-sync/http"
"github.com/Gleipnir-Technology/nidus-sync/platform"
"github.com/rs/zerolog/log"
//"github.com/rs/zerolog/log"
)
type contentReviewPool struct {
ArcgisAccessToken string
URLTiles template.HTMLAttr
URLTiles template.HTMLAttr
}
type contentReviewRoot struct{}
func getReviewPool(ctx context.Context, r *http.Request, user platform.User) (*html.Response[contentReviewPool], *nhttp.ErrorWithStatus) {
var oauth_token *models.ArcgisOauthToken
var err error
var access_token string
oauth_token, err = platform.GetOAuthForOrg(ctx, user.Organization)
if err != nil {
log.Warn().Err(err).Msg("Failed to get oauth")
oauth_token = nil
access_token = ""
} else {
access_token = oauth_token.AccessToken
}
return html.NewResponse("sync/review/pool.html", contentReviewPool{
ArcgisAccessToken: access_token,
URLTiles: template.HTMLAttr(fmt.Sprintf(`url-tiles="%s"`, config.MakeURLNidus("/api/tile/{z}/{y}/{x}"))),
URLTiles: template.HTMLAttr(fmt.Sprintf(`url-tiles="%s"`, config.MakeURLNidus("/api/tile/{z}/{y}/{x}"))),
}), nil
}
func getReviewRoot(ctx context.Context, r *http.Request, user platform.User) (*html.Response[contentReviewRoot], *nhttp.ErrorWithStatus) {