Add trap count data to source page

It's...way too many rows, now that I have the actual data. It needs to be reworked.
2025-11-20 20:59:28 +00:00 · 2025-11-20 20:59:28 +00:00 · e7ece52c8c
commit e7ece52c8c
parent 26ee3efcc8
32 changed files with 1622 additions and 298 deletions
--- a/dbinfo/fs_mosquitoinspection.bob.go
+++ b/dbinfo/fs_mosquitoinspection.bob.go
@ -564,6 +564,15 @@ var FSMosquitoinspections = Table[
 			Generated: false,
 			AutoIncr:  false,
 		},
+		Geom: column{
+			Name:      "geom",
+			DBType:    "geometry",
+			Default:   "NULL",
+			Comment:   "",
+			Nullable:  true,
+			Generated: false,
+			AutoIncr:  false,
+		},
 	},
 	Indexes: fsMosquitoinspectionIndexes{
 		FSMosquitoinspectionPkey: index{
@ -583,6 +592,23 @@ var FSMosquitoinspections = Table[
 			Where:         "",
 			Include:       []string{},
 		},
+		IdxFSMosquitoinspectionGeom: index{
+			Type: "gist",
+			Name: "idx_fs_mosquitoinspection_geom",
+			Columns: []indexColumn{
+				{
+					Name:         "geom",
+					Desc:         null.FromCond(false, true),
+					IsExpression: false,
+				},
+			},
+			Unique:        false,
+			Comment:       "",
+			NullsFirst:    []bool{false},
+			NullsDistinct: false,
+			Where:         "",
+			Include:       []string{},
+		},
 	},
 	PrimaryKey: &constraint{
 		Name:    "fs_mosquitoinspection_pkey",
@ -666,21 +692,23 @@ type fsMosquitoinspectionColumns struct {
 	Adminaction            column
 	Ptaid                  column
 	Updated                column
+	Geom                   column
 }

 func (c fsMosquitoinspectionColumns) AsSlice() []column {
 	return []column{
-		c.OrganizationID, c.Actiontaken, c.Activity, c.Adultact, c.Avetemp, c.Avglarvae, c.Avgpupae, c.Breeding, c.Cbcount, c.Comments, c.Containercount, c.Creationdate, c.Creator, c.Domstage, c.Eggs, c.Enddatetime, c.Editdate, c.Editor, c.Fieldspecies, c.Fieldtech, c.Globalid, c.Jurisdiction, c.Larvaepresent, c.Linelocid, c.Locationname, c.Lstages, c.Numdips, c.Objectid, c.Personalcontact, c.Pointlocid, c.Polygonlocid, c.Posdips, c.Positivecontainercount, c.Pupaepresent, c.Raingauge, c.Recordstatus, c.Reviewed, c.Reviewedby, c.Revieweddate, c.Sdid, c.Sitecond, c.Srid, c.Startdatetime, c.Tirecount, c.Totlarvae, c.Totpupae, c.Visualmonitoring, c.Vmcomments, c.Winddir, c.Windspeed, c.Zone, c.Zone2, c.CreatedDate, c.CreatedUser, c.GeometryX, c.GeometryY, c.LastEditedDate, c.LastEditedUser, c.Adminaction, c.Ptaid, c.Updated,
+		c.OrganizationID, c.Actiontaken, c.Activity, c.Adultact, c.Avetemp, c.Avglarvae, c.Avgpupae, c.Breeding, c.Cbcount, c.Comments, c.Containercount, c.Creationdate, c.Creator, c.Domstage, c.Eggs, c.Enddatetime, c.Editdate, c.Editor, c.Fieldspecies, c.Fieldtech, c.Globalid, c.Jurisdiction, c.Larvaepresent, c.Linelocid, c.Locationname, c.Lstages, c.Numdips, c.Objectid, c.Personalcontact, c.Pointlocid, c.Polygonlocid, c.Posdips, c.Positivecontainercount, c.Pupaepresent, c.Raingauge, c.Recordstatus, c.Reviewed, c.Reviewedby, c.Revieweddate, c.Sdid, c.Sitecond, c.Srid, c.Startdatetime, c.Tirecount, c.Totlarvae, c.Totpupae, c.Visualmonitoring, c.Vmcomments, c.Winddir, c.Windspeed, c.Zone, c.Zone2, c.CreatedDate, c.CreatedUser, c.GeometryX, c.GeometryY, c.LastEditedDate, c.LastEditedUser, c.Adminaction, c.Ptaid, c.Updated, c.Geom,
 	}
 }

 type fsMosquitoinspectionIndexes struct {
-	FSMosquitoinspectionPkey index
+	FSMosquitoinspectionPkey    index
+	IdxFSMosquitoinspectionGeom index
 }

 func (i fsMosquitoinspectionIndexes) AsSlice() []index {
 	return []index{
-		i.FSMosquitoinspectionPkey,
+		i.FSMosquitoinspectionPkey, i.IdxFSMosquitoinspectionGeom,
 	}
 }

--- a/dbinfo/fs_pointlocation.bob.go
+++ b/dbinfo/fs_pointlocation.bob.go
@ -447,6 +447,15 @@ var FSPointlocations = Table[
 			Generated: false,
 			AutoIncr:  false,
 		},
+		Geom: column{
+			Name:      "geom",
+			DBType:    "geometry",
+			Default:   "NULL",
+			Comment:   "",
+			Nullable:  true,
+			Generated: false,
+			AutoIncr:  false,
+		},
 	},
 	Indexes: fsPointlocationIndexes{
 		FSPointlocationPkey: index{
@ -466,6 +475,23 @@ var FSPointlocations = Table[
 			Where:         "",
 			Include:       []string{},
 		},
+		IdxFSPointlocationGeom: index{
+			Type: "gist",
+			Name: "idx_fs_pointlocation_geom",
+			Columns: []indexColumn{
+				{
+					Name:         "geom",
+					Desc:         null.FromCond(false, true),
+					IsExpression: false,
+				},
+			},
+			Unique:        false,
+			Comment:       "",
+			NullsFirst:    []bool{false},
+			NullsDistinct: false,
+			Where:         "",
+			Include:       []string{},
+		},
 	},
 	PrimaryKey: &constraint{
 		Name:    "fs_pointlocation_pkey",
@ -536,21 +562,23 @@ type fsPointlocationColumns struct {
 	Scalarpriority          column
 	Sourcestatus            column
 	Updated                 column
+	Geom                    column
 }

 func (c fsPointlocationColumns) AsSlice() []column {
 	return []column{
-		c.OrganizationID, c.Accessdesc, c.Active, c.Comments, c.Creationdate, c.Creator, c.Description, c.Externalid, c.Editdate, c.Editor, c.Globalid, c.Habitat, c.Jurisdiction, c.Larvinspectinterval, c.Lastinspectactiontaken, c.Lastinspectactivity, c.Lastinspectavglarvae, c.Lastinspectavgpupae, c.Lastinspectbreeding, c.Lastinspectconditions, c.Lastinspectdate, c.Lastinspectfieldspecies, c.Lastinspectlstages, c.Lasttreatactivity, c.Lasttreatdate, c.Lasttreatproduct, c.Lasttreatqty, c.Lasttreatqtyunit, c.Locationnumber, c.Name, c.Nextactiondatescheduled, c.Objectid, c.Priority, c.Stype, c.Symbology, c.Usetype, c.Waterorigin, c.X, c.Y, c.Zone, c.Zone2, c.GeometryX, c.GeometryY, c.Assignedtech, c.DeactivateReason, c.Scalarpriority, c.Sourcestatus, c.Updated,
+		c.OrganizationID, c.Accessdesc, c.Active, c.Comments, c.Creationdate, c.Creator, c.Description, c.Externalid, c.Editdate, c.Editor, c.Globalid, c.Habitat, c.Jurisdiction, c.Larvinspectinterval, c.Lastinspectactiontaken, c.Lastinspectactivity, c.Lastinspectavglarvae, c.Lastinspectavgpupae, c.Lastinspectbreeding, c.Lastinspectconditions, c.Lastinspectdate, c.Lastinspectfieldspecies, c.Lastinspectlstages, c.Lasttreatactivity, c.Lasttreatdate, c.Lasttreatproduct, c.Lasttreatqty, c.Lasttreatqtyunit, c.Locationnumber, c.Name, c.Nextactiondatescheduled, c.Objectid, c.Priority, c.Stype, c.Symbology, c.Usetype, c.Waterorigin, c.X, c.Y, c.Zone, c.Zone2, c.GeometryX, c.GeometryY, c.Assignedtech, c.DeactivateReason, c.Scalarpriority, c.Sourcestatus, c.Updated, c.Geom,
 	}
 }

 type fsPointlocationIndexes struct {
-	FSPointlocationPkey index
+	FSPointlocationPkey    index
+	IdxFSPointlocationGeom index
 }

 func (i fsPointlocationIndexes) AsSlice() []index {
 	return []index{
-		i.FSPointlocationPkey,
+		i.FSPointlocationPkey, i.IdxFSPointlocationGeom,
 	}
 }

--- a/dbinfo/fs_traplocation.bob.go
+++ b/dbinfo/fs_traplocation.bob.go
@ -321,6 +321,15 @@ var FSTraplocations = Table[
 			Generated: false,
 			AutoIncr:  false,
 		},
+		Geom: column{
+			Name:      "geom",
+			DBType:    "geometry",
+			Default:   "NULL",
+			Comment:   "",
+			Nullable:  true,
+			Generated: false,
+			AutoIncr:  false,
+		},
 	},
 	Indexes: fsTraplocationIndexes{
 		FSTraplocationPkey: index{
@ -340,6 +349,23 @@ var FSTraplocations = Table[
 			Where:         "",
 			Include:       []string{},
 		},
+		IdxFSTraplocationGeom: index{
+			Type: "gist",
+			Name: "idx_fs_traplocation_geom",
+			Columns: []indexColumn{
+				{
+					Name:         "geom",
+					Desc:         null.FromCond(false, true),
+					IsExpression: false,
+				},
+			},
+			Unique:        false,
+			Comment:       "",
+			NullsFirst:    []bool{false},
+			NullsDistinct: false,
+			Where:         "",
+			Include:       []string{},
+		},
 	},
 	PrimaryKey: &constraint{
 		Name:    "fs_traplocation_pkey",
@ -396,21 +422,23 @@ type fsTraplocationColumns struct {
 	H3R7                    column
 	H3R8                    column
 	Updated                 column
+	Geom                    column
 }

 func (c fsTraplocationColumns) AsSlice() []column {
 	return []column{
-		c.OrganizationID, c.Accessdesc, c.Active, c.Comments, c.Creationdate, c.Creator, c.Description, c.Externalid, c.Editdate, c.Editor, c.Gatewaysync, c.Globalid, c.Habitat, c.Locationnumber, c.Name, c.Nextactiondatescheduled, c.Objectid, c.Priority, c.Usetype, c.Zone, c.Zone2, c.CreatedDate, c.CreatedUser, c.GeometryX, c.GeometryY, c.LastEditedDate, c.LastEditedUser, c.Route, c.RouteOrder, c.SetDow, c.Vectorsurvsiteid, c.H3R7, c.H3R8, c.Updated,
+		c.OrganizationID, c.Accessdesc, c.Active, c.Comments, c.Creationdate, c.Creator, c.Description, c.Externalid, c.Editdate, c.Editor, c.Gatewaysync, c.Globalid, c.Habitat, c.Locationnumber, c.Name, c.Nextactiondatescheduled, c.Objectid, c.Priority, c.Usetype, c.Zone, c.Zone2, c.CreatedDate, c.CreatedUser, c.GeometryX, c.GeometryY, c.LastEditedDate, c.LastEditedUser, c.Route, c.RouteOrder, c.SetDow, c.Vectorsurvsiteid, c.H3R7, c.H3R8, c.Updated, c.Geom,
 	}
 }

 type fsTraplocationIndexes struct {
-	FSTraplocationPkey index
+	FSTraplocationPkey    index
+	IdxFSTraplocationGeom index
 }

 func (i fsTraplocationIndexes) AsSlice() []index {
 	return []index{
-		i.FSTraplocationPkey,
+		i.FSTraplocationPkey, i.IdxFSTraplocationGeom,
 	}
 }

--- a/dbinfo/fs_treatment.bob.go
+++ b/dbinfo/fs_treatment.bob.go
@ -537,6 +537,15 @@ var FSTreatments = Table[
 			Generated: false,
 			AutoIncr:  false,
 		},
+		Geom: column{
+			Name:      "geom",
+			DBType:    "geometry",
+			Default:   "NULL",
+			Comment:   "",
+			Nullable:  true,
+			Generated: false,
+			AutoIncr:  false,
+		},
 	},
 	Indexes: fsTreatmentIndexes{
 		FSTreatmentPkey: index{
@ -556,6 +565,23 @@ var FSTreatments = Table[
 			Where:         "",
 			Include:       []string{},
 		},
+		IdxFSTreatmentGeom: index{
+			Type: "gist",
+			Name: "idx_fs_treatment_geom",
+			Columns: []indexColumn{
+				{
+					Name:         "geom",
+					Desc:         null.FromCond(false, true),
+					IsExpression: false,
+				},
+			},
+			Unique:        false,
+			Comment:       "",
+			NullsFirst:    []bool{false},
+			NullsDistinct: false,
+			Where:         "",
+			Include:       []string{},
+		},
 	},
 	PrimaryKey: &constraint{
 		Name:    "fs_treatment_pkey",
@ -636,21 +662,23 @@ type fsTreatmentColumns struct {
 	GeometryY            column
 	TempSitecond         column
 	Updated              column
+	Geom                 column
 }

 func (c fsTreatmentColumns) AsSlice() []column {
 	return []column{
-		c.OrganizationID, c.Activity, c.Areaunit, c.Avetemp, c.Barrierrouteid, c.Cbcount, c.Comments, c.Containercount, c.Creationdate, c.Creator, c.Enddatetime, c.Equiptype, c.Editdate, c.Editor, c.Fieldtech, c.Flowrate, c.Globalid, c.Habitat, c.InspID, c.Invloc, c.Linelocid, c.Locationname, c.Method, c.Objectid, c.Pointlocid, c.Polygonlocid, c.Product, c.Ptaid, c.Qty, c.Qtyunit, c.Raingauge, c.Recordstatus, c.Reviewed, c.Reviewedby, c.Revieweddate, c.Sdid, c.Sitecond, c.Srid, c.Startdatetime, c.Targetspecies, c.Tirecount, c.Treatacres, c.Treatarea, c.Treathectares, c.Treatmenthours, c.Treatmentlength, c.Treatmentlengthunits, c.Totalcostprodcut, c.Ulvrouteid, c.Warningoverride, c.Winddir, c.Windspeed, c.Zone, c.Zone2, c.GeometryX, c.GeometryY, c.TempSitecond, c.Updated,
+		c.OrganizationID, c.Activity, c.Areaunit, c.Avetemp, c.Barrierrouteid, c.Cbcount, c.Comments, c.Containercount, c.Creationdate, c.Creator, c.Enddatetime, c.Equiptype, c.Editdate, c.Editor, c.Fieldtech, c.Flowrate, c.Globalid, c.Habitat, c.InspID, c.Invloc, c.Linelocid, c.Locationname, c.Method, c.Objectid, c.Pointlocid, c.Polygonlocid, c.Product, c.Ptaid, c.Qty, c.Qtyunit, c.Raingauge, c.Recordstatus, c.Reviewed, c.Reviewedby, c.Revieweddate, c.Sdid, c.Sitecond, c.Srid, c.Startdatetime, c.Targetspecies, c.Tirecount, c.Treatacres, c.Treatarea, c.Treathectares, c.Treatmenthours, c.Treatmentlength, c.Treatmentlengthunits, c.Totalcostprodcut, c.Ulvrouteid, c.Warningoverride, c.Winddir, c.Windspeed, c.Zone, c.Zone2, c.GeometryX, c.GeometryY, c.TempSitecond, c.Updated, c.Geom,
 	}
 }

 type fsTreatmentIndexes struct {
-	FSTreatmentPkey index
+	FSTreatmentPkey    index
+	IdxFSTreatmentGeom index
 }

 func (i fsTreatmentIndexes) AsSlice() []index {
 	return []index{
-		i.FSTreatmentPkey,
+		i.FSTreatmentPkey, i.IdxFSTreatmentGeom,
 	}
 }

--- a/dbinfo/h3_aggregation.bob.go
+++ b/dbinfo/h3_aggregation.bob.go
@ -33,8 +33,8 @@ var H3Aggregations = Table[
 			Generated: false,
 			AutoIncr:  false,
 		},
-		Resolution: column{
-			Name:      "resolution",
+		Count: column{
+			Name:      "count_",
 			DBType:    "integer",
 			Default:   "",
 			Comment:   "",
@ -42,8 +42,26 @@ var H3Aggregations = Table[
 			Generated: false,
 			AutoIncr:  false,
 		},
-		Count: column{
-			Name:      "count_",
+		Geometry: column{
+			Name:      "geometry",
+			DBType:    "geometry",
+			Default:   "NULL",
+			Comment:   "",
+			Nullable:  true,
+			Generated: false,
+			AutoIncr:  false,
+		},
+		OrganizationID: column{
+			Name:      "organization_id",
+			DBType:    "integer",
+			Default:   "",
+			Comment:   "",
+			Nullable:  false,
+			Generated: false,
+			AutoIncr:  false,
+		},
+		Resolution: column{
+			Name:      "resolution",
 			DBType:    "integer",
 			Default:   "",
 			Comment:   "",
@ -60,15 +78,6 @@ var H3Aggregations = Table[
 			Generated: false,
 			AutoIncr:  false,
 		},
-		OrganizationID: column{
-			Name:      "organization_id",
-			DBType:    "integer",
-			Default:   "",
-			Comment:   "",
-			Nullable:  false,
-			Generated: false,
-			AutoIncr:  false,
-		},
 	},
 	Indexes: h3AggregationIndexes{
 		H3AggregationPkey: index{
@ -146,15 +155,16 @@ var H3Aggregations = Table[
 type h3AggregationColumns struct {
 	ID             column
 	Cell           column
-	Resolution     column
 	Count          column
-	Type           column
+	Geometry       column
 	OrganizationID column
+	Resolution     column
+	Type           column
 }

 func (c h3AggregationColumns) AsSlice() []column {
 	return []column{
-		c.ID, c.Cell, c.Resolution, c.Count, c.Type, c.OrganizationID,
+		c.ID, c.Cell, c.Count, c.Geometry, c.OrganizationID, c.Resolution, c.Type,
 	}
 }