-
+
Manage District
diff --git a/sync/routes.go b/sync/routes.go
index 7c9bbcd3..22b8fedb 100644
--- a/sync/routes.go
+++ b/sync/routes.go
@@ -67,6 +67,7 @@ func Router() chi.Router {
r.Method("GET", "/pool/upload/{id}", auth.NewEnsureAuth(getPoolUploadByID))
r.Method("POST", "/pool/upload", auth.NewEnsureAuth(postPoolUpload))
r.Method("GET", "/setting", auth.NewEnsureAuth(getSetting))
+ r.Method("GET", "/setting/district", auth.NewEnsureAuth(getSettingDistrict))
r.Method("GET", "/setting/integration", auth.NewEnsureAuth(getSettingIntegration))
r.Method("GET", "/signout", auth.NewEnsureAuth(getSignout))
r.Method("GET", "/source/{globalid}", auth.NewEnsureAuth(getSource))
diff --git a/sync/setting.go b/sync/setting.go
index d972f9c7..ba796e5c 100644
--- a/sync/setting.go
+++ b/sync/setting.go
@@ -3,12 +3,32 @@ package sync
import (
"net/http"
+ "github.com/Gleipnir-Technology/bob"
+ "github.com/Gleipnir-Technology/bob/dialect/psql"
+ "github.com/Gleipnir-Technology/bob/dialect/psql/sm"
"github.com/Gleipnir-Technology/nidus-sync/arcgis"
+ "github.com/Gleipnir-Technology/nidus-sync/db"
"github.com/Gleipnir-Technology/nidus-sync/db/models"
"github.com/Gleipnir-Technology/nidus-sync/html"
+ //"github.com/rs/zerolog/log"
+ "github.com/stephenafamo/scan"
)
-type ContentSettingIntegration struct {
+type contentDistrict struct {
+ Centroid string `db:"st_asgeojson"`
+ GID int32 `db:"gid"`
+ XMin float32 `db:"st_xmin"`
+ YMin float32 `db:"st_ymin"`
+ XMax float32 `db:"st_xmax"`
+ YMax float32 `db:"st_ymax"`
+}
+type contentSettingDistrict struct {
+ District contentDistrict
+ URL ContentURL
+ User User
+}
+
+type contentSettingIntegration struct {
ArcGISOAuth *models.OauthToken
URL ContentURL
User User
@@ -26,6 +46,42 @@ func getSetting(w http.ResponseWriter, r *http.Request, u *models.User) {
}
html.RenderOrError(w, "sync/settings.html", data)
}
+func getSettingDistrict(w http.ResponseWriter, r *http.Request, u *models.User) {
+ ctx := r.Context()
+ userContent, err := contentForUser(ctx, u)
+ if err != nil {
+ respondError(w, "Failed to get user content", err, http.StatusInternalServerError)
+ return
+ }
+ org, err := u.Organization().One(ctx, db.PGInstance.BobDB)
+ var district contentDistrict
+ gid := int32(0)
+ if org.ImportDistrictGid.IsValue() {
+ gid = org.ImportDistrictGid.MustGet()
+ district, err = bob.One[contentDistrict](ctx, db.PGInstance.BobDB, psql.Select(
+ sm.From("import.district"),
+ sm.Columns(
+ "gid",
+ psql.F("ST_AsGeoJSON", "centroid_4326"),
+ psql.F("ST_XMin", "extent_4326"),
+ psql.F("ST_YMin", "extent_4326"),
+ psql.F("ST_XMax", "extent_4326"),
+ psql.F("ST_YMax", "extent_4326"),
+ ),
+ sm.Where(psql.Quote("gid").EQ(psql.Arg(gid))),
+ ), scan.StructMapper[contentDistrict]())
+ if err != nil {
+ respondError(w, "Failed to get extents", err, http.StatusInternalServerError)
+ return
+ }
+ }
+ data := contentSettingDistrict{
+ District: district,
+ URL: newContentURL(),
+ User: userContent,
+ }
+ html.RenderOrError(w, "sync/setting-district.html", data)
+}
func getSettingIntegration(w http.ResponseWriter, r *http.Request, u *models.User) {
ctx := r.Context()
userContent, err := contentForUser(ctx, u)
@@ -38,7 +94,7 @@ func getSettingIntegration(w http.ResponseWriter, r *http.Request, u *models.Use
respondError(w, "Failed to get oauth", err, http.StatusInternalServerError)
return
}
- data := ContentSettingIntegration{
+ data := contentSettingIntegration{
ArcGISOAuth: oauth,
URL: newContentURL(),
User: userContent,
diff --git a/sync/url.go b/sync/url.go
index 996a1d37..b8ebbb09 100644
--- a/sync/url.go
+++ b/sync/url.go
@@ -9,6 +9,7 @@ type ContentURL struct {
PoolCSVUpload string
SamplePoolCSV string
Setting string
+ SettingDistrict string
SettingIntegration string
SettingPesticide string
SettingPesticideAdd string
@@ -23,6 +24,7 @@ func newContentURL() ContentURL {
PoolCSVUpload: config.MakeURLNidus("/pool/upload"),
SamplePoolCSV: config.MakeURLNidus("/static/file/sample-pool.csv"),
Setting: config.MakeURLNidus("/setting"),
+ SettingDistrict: config.MakeURLNidus("/setting/district"),
SettingIntegration: config.MakeURLNidus("/setting/integration"),
SettingPesticide: config.MakeURLNidus("/setting/pesticide"),
SettingPesticideAdd: config.MakeURLNidus("/setting/pesticide/add"),
diff --git a/tools/drop-and-recreate.sql b/tools/drop-and-recreate.sql
index ebe1470f..d2c37fce 100644
--- a/tools/drop-and-recreate.sql
+++ b/tools/drop-and-recreate.sql
@@ -18,3 +18,5 @@ 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;
+ALTER TABLE import.district ADD COLUMN centroid_4326 geometry(Point,4326) GENERATED ALWAYS AS (ST_Transform(ST_Centroid(geom), 4326)) STORED;
+ALTER TABLE import.district ADD COLUMN extent_4326 geometry(Polygon,4326) GENERATED ALWAYS AS (ST_Transform(ST_Envelope(geom), 4326)) STORED;