simplify configuration

Author: beasteers

API.md

@@ -76,7 +76,7 @@ Path: `/collections/{cid}/items`
   Multiple property filters are ANDed together.
 * `filter=cql-expr` - filters features via a CQL expression
 * `filter-crs=SRID` - specifies the CRS for geometry values in the CQL filter
-* `datetime=INSTANT | INTERVAL` - specify a time range to filter the data by (must have a datetime column configured. see [Temporal](config/pg_featureserv.toml.example) section of config)
+* `datetime=INSTANT | INTERVAL` - specify a time range to filter the data by (must have a datetime column configured. see [Database](config/pg_featureserv.toml.example) section of config)
    * exact match: `datetime=2025-01-02T00:00:00Z`
    * between: `datetime=2025-01-02T00:00:00Z/2025-02-02T00:00:00Z`
    * before: `datetime=../2025-01-02T00:00:00Z`

config/pg_featureserv.toml.example

@@ -68,16 +68,13 @@ WriteTimeoutSec = 30
 # Publish functions from these schemas (default is publish postgisftw)
 # FunctionIncludes = [ "postgisftw", "schema2" ]
 
-
-[Temporal]
 # Assign time columns for tables with temporal data
 # These should be timestamp or timestamptz columns in the table
 # Columns to be used for feature start and end of time intervals
-StartColumns = [ "start_time" ]
-EndColumns = [ "end_time" ]
-
+StartTimeColumns = [ "start_time" ]
+EndTimeColumns = [ "end_time" ]
 # Columns to be used for (instantaneous) feature timestamps
-InstantColumns = [ "time" ]
+TimeColumns = [ "time" ]
 
 [Paging]
 # The default number of features in a response

internal/conf/config.go

@@ -44,10 +44,9 @@ func setDefaultConfig() {
 	viper.SetDefault("Database.TableIncludes", []string{})
 	viper.SetDefault("Database.TableExcludes", []string{})
 	viper.SetDefault("Database.FunctionIncludes", []string{"postgisftw"})
-
-	viper.SetDefault("Temporal.InstantColumns", []string{"time"})
-	viper.SetDefault("Temporal.StartColumns", []string{"start_time"})
-	viper.SetDefault("Temporal.EndColumns", []string{"end_time"})
+	viper.SetDefault("Database.TimeColumns", []string{"time"})
+	viper.SetDefault("Database.StartTimeColumns", []string{"start_time"})
+	viper.SetDefault("Database.EndTimeColumns", []string{"end_time"})
 
 	viper.SetDefault("Paging.LimitDefault", 10)
 	viper.SetDefault("Paging.LimitMax", 1000)
@@ -65,7 +64,6 @@ type Config struct {
 	Metadata Metadata
 	Database Database
 	Website  Website
-	Temporal Temporal
 }
 
 // Server config
@@ -99,6 +97,9 @@ type Database struct {
 	TableIncludes         []string
 	TableExcludes         []string
 	FunctionIncludes      []string
+	TimeColumns           []string
+	StartTimeColumns      []string
+	EndTimeColumns        []string
 }
 
 // Metadata config
@@ -111,12 +112,6 @@ type Website struct {
 	BasemapUrl string
 }
 
-type Temporal struct {
-	InstantColumns []string
-	StartColumns   []string
-	EndColumns     []string
-}
-
 // IsHTTPSEnabled tests whether HTTPS is enabled
 func (conf *Config) IsTLSEnabled() bool {
 	return conf.Server.TlsServerCertificateFile != "" && conf.Server.TlsServerPrivateKeyFile != ""
@@ -191,7 +186,7 @@ func DumpConfig() {
 	log.Debugf("  TableExcludes = %v", Configuration.Database.TableExcludes)
 	log.Debugf("  FunctionIncludes = %v", Configuration.Database.FunctionIncludes)
 	log.Debugf("  TransformFunctions = %v", Configuration.Server.TransformFunctions)
-	log.Debugf("  Temporal.InstantColumns = %v", Configuration.Temporal.InstantColumns)
-	log.Debugf("  Temporal.StartColumns = %v", Configuration.Temporal.StartColumns)
-	log.Debugf("  Temporal.EndColumns = %v", Configuration.Temporal.EndColumns)
+	log.Debugf("  TimeColumns = %v", Configuration.Database.TimeColumns)
+	log.Debugf("  StartTimeColumns = %v", Configuration.Database.StartTimeColumns)
+	log.Debugf("  EndTimeColumns = %v", Configuration.Database.EndTimeColumns)
 }

internal/data/catalog_db.go

@@ -742,9 +742,9 @@ func temporalColumns(names []string, types map[string]string) (string, string) {
 		return ""
 	}
 	// QUESTION: preference of time columns? instant vs start/end?
-	instant := lookup(conf.Configuration.Temporal.InstantColumns)
-	start := lookup(conf.Configuration.Temporal.StartColumns)
-	end := lookup(conf.Configuration.Temporal.EndColumns)
+	instant := lookup(conf.Configuration.Database.TimeColumns)
+	start := lookup(conf.Configuration.Database.StartTimeColumns)
+	end := lookup(conf.Configuration.Database.EndTimeColumns)
 	if instant != "" && (start == "" || end == "") {
 		start = instant
 		end = instant

internal/service/param_datetime_test.go

@@ -3,18 +3,9 @@ package service
 import (
 	"testing"
 	"time"
-
-	"github.com/CrunchyData/pg_featureserv/internal/conf"
 )
 
-func setTemporalConfig() {
-	conf.Configuration.Temporal.InstantColumns = []string{"observed_at"}
-	conf.Configuration.Temporal.StartColumns = []string{"start_time"}
-	conf.Configuration.Temporal.EndColumns = []string{"end_time"}
-}
-
 func TestParseDateTimeRangeInstant(t *testing.T) {
-	setTemporalConfig()
 	rng, err := parseDateTimeRange("2018-02-12T23:20:52Z")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -34,7 +25,6 @@ func TestParseDateTimeRangeInstant(t *testing.T) {
 }
 
 func TestParseDateTimeRangeDate(t *testing.T) {
-	setTemporalConfig()
 	rng, err := parseDateTimeRange("2018-02-12")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -59,7 +49,6 @@ func TestParseDateTimeRangeDate(t *testing.T) {
 }
 
 func TestParseDateTimeRangeInterval(t *testing.T) {
-	setTemporalConfig()
 	rng, err := parseDateTimeRange("2018-02-12T00:00:00Z/2018-03-18T12:31:12Z")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -73,7 +62,6 @@ func TestParseDateTimeRangeInterval(t *testing.T) {
 }
 
 func TestParseDateTimeRangeOpen(t *testing.T) {
-	setTemporalConfig()
 	rng, err := parseDateTimeRange("../2018-03-18T12:31:12Z")
 	if err != nil {
 		t.Fatalf("unexpected error: %v", err)
@@ -90,7 +78,6 @@ func TestParseDateTimeRangeOpen(t *testing.T) {
 }
 
 func TestParseDateTimeRangeInvalid(t *testing.T) {
-	setTemporalConfig()
 	if _, err := parseDateTimeRange("not-a-date"); err == nil {
 		t.Fatalf("expected error for invalid input")
 	}