Skip to content

Commit

Permalink
fix(test): lod fixes and refactoring from review
Browse files Browse the repository at this point in the history
  • Loading branch information
@nick-rv
nick-rv committed Feb 25, 2023
1 parent 7915680 commit 5657204
Show file tree
Hide file tree
Showing 4 changed files with 68 additions and 68 deletions.
11 changes: 10 additions & 1 deletion internal/api/datatype.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ import (

type PGType string
type JSONType string
type GeometryType string

// Constants
const (
Expand All @@ -38,7 +39,6 @@ const (
JSONTypeNumberArray JSONType = "number[]"
)

// Constants
const (
PGTypeBool PGType = "bool"
PGTypeBoolArray PGType = "_bool"
Expand All @@ -65,6 +65,15 @@ const (
PGTypeVarCharArray PGType = "_varchar"
)

const (
GeometryTypePoint = "Point"
GeometryTypeMultiPoint = "MultiPoint"
GeometryTypeLineString = "LineString"
GeometryTypeMultiLineString = "MultiLineString"
GeometryTypePolygon = "Polygon"
GeometryTypeMultiPolygon = "MultiPolygon"
)

// returns JSONType matching PGType
func (dbType PGType) ToJSONType() JSONType {
//fmt.Printf("ToJSONType: %v\n", pgType)
Expand Down
32 changes: 21 additions & 11 deletions internal/data/feature_mock.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ func makeFeatureMockPoint(tableName string, id int, x float64, y float64) *featu
return &feat
}

func makeFeatureMockPolygon(tableName string, val int, coords orb.Ring) *featureMock {
func makeFeatureMockPolygon(tableName string, id int, coords orb.Ring) *featureMock {

geom := geojson.NewGeometry(orb.Polygon{coords})

Expand All @@ -66,14 +66,14 @@ func makeFeatureMockPolygon(tableName string, val int, coords orb.Ring) *feature

httpDateString := api.GetCurrentHttpDate() // Last modified value

idstr := strconv.Itoa(val)
idstr := strconv.Itoa(id)

feat := featureMock{
GeojsonFeatureData: *api.MakeGeojsonFeature(
tableName,
idstr,
*geom,
map[string]interface{}{"prop_a": "propA", "prop_b": val, "prop_c": "propC", "prop_d": val % 10},
map[string]interface{}{"prop_a": "propA", "prop_b": id, "prop_c": "propC", "prop_d": id % 10},
weakEtag,
httpDateString,
),
Expand Down Expand Up @@ -156,16 +156,21 @@ func doLimit(features []*featureMock, limit int, offset int) []*featureMock {
return features[start:end]
}

// Returns a JSON representation of a Point typed feature
func MakeFeatureMockPointAsJSON(tableName string, id int, x float64, y float64, columns []string) string {
feat := makeFeatureMockPoint(tableName, id, x, y)
return feat.toJSON(columns)
}

// Returns a JSON representation of a Polygon typed feature
func MakeFeatureMockPolygonAsJSON(tableName string, id int, coords orb.Ring, columns []string) string {
feat := makeFeatureMockPolygon(tableName, id, coords)
return feat.toJSON(columns)
}

// Generates and returns a slice of Point typed features
// -> which coordinates are generated inside the provided extent
// -> which quantity depends on the nx and ny values provided as arguments (nx*ny)
func MakeFeaturesMockPoint(tableName string, extent api.Extent, nx int, ny int) []*featureMock {
basex := extent.Minx
basey := extent.Miny
Expand All @@ -188,15 +193,20 @@ func MakeFeaturesMockPoint(tableName string, extent api.Extent, nx int, ny int)
return features
}

// Returns a slice of polygon featureMocks with as many entries into the coords slice as argument
// val is an arbitraty value which is used to populate the properties values from each Feature
func MakeFeaturesMockPolygon(tableName string, val int, coords []orb.Ring) []*featureMock {
// Returns a slice of Polygon typed featureMocks
func MakeFeaturesMockPolygon(tableName string) []*featureMock {

features := make([]*featureMock, len(coords))
index := 0
for _, coord := range coords {
features[index] = makeFeatureMockPolygon(tableName, val, coord)
index++
polygons := make([]orb.Ring, 0)
polygons = append(polygons, (orb.Ring{{-0.024590485281003, 49.2918461864342}, {-0.02824214022877, 49.2902093052715}, {-0.032731597583892, 49.2940548086905}, {-0.037105514267367, 49.2982628947696}, {-0.035096222035489, 49.2991273714187}, {-0.038500457450357, 49.3032655348948}, {-0.034417965728768, 49.3047607558599}, {-0.034611922456059, 49.304982637632}, {-0.028287271276391, 49.3073904622151}, {-0.022094153540685, 49.3097046833446}, {-0.022020905508067, 49.3096240670749}, {-0.019932810088915, 49.3103884833526}, {-0.013617304476105, 49.3129751788625}, {-0.010317714854534, 49.3091925467367}, {-0.006352474569531, 49.3110873002743}, {-0.001853050940172, 49.3070612288807}, {0.002381370562776, 49.3028484930665}, {-0.000840217324783, 49.3013882187799}, {-0.00068928216257, 49.3012429006019}, {-0.003864625123604, 49.3000173218511}, {-0.003918013833785, 49.2999931219338}, {-0.010095065847337, 49.2974103246769}, {-0.010150643294152, 49.2974622610823}, {-0.013587537856462, 49.2959737733625}, {-0.01384030494609, 49.2962233671643}, {-0.017222409797967, 49.294623513139}, {-0.017308576106142, 49.2947057553981}, {-0.020709238582055, 49.2930969232562}, {-0.021034503634088, 49.2933909821512}, {-0.024481057600533, 49.2917430023163}, {-0.024590485281003, 49.2918461864342}}))
polygons = append(polygons, (orb.Ring{{0.012754827133148, 49.3067879156925}, {0.008855271114669, 49.3050781328888}, {0.004494239224312, 49.3091080209745}, {-0.000152707581678, 49.3133105602284}, {0.005720060734669, 49.3160862415579}, {0.005012790172897, 49.3167672210029}, {0.000766997696737, 49.3211596408574}, {0.007624129875227, 49.3239385018443}, {0.008367761372595, 49.3242455690107}, {0.008290411160612, 49.3243148348313}, {0.014857908580632, 49.327355944666}, {0.021563621634322, 49.330400077634}, {0.021666104647453, 49.3302974189836}, {0.024971410363691, 49.3317809883673}, {0.02492195583839, 49.3318321743075}, {0.029104098429698, 49.3336152412767}, {0.028646253682028, 49.3340827604102}, {0.035511767129074, 49.3367701742839}, {0.04198105053544, 49.3391776115466}, {0.046199095420336, 49.3352329627991}, {0.047069675744848, 49.3344290720305}, {0.048144047016136, 49.334920703514}, {0.048423560249958, 49.3346968337392}, {0.051915791431139, 49.3363621210079}, {0.056947292176151, 49.3326168697662}, {0.061993411180365, 49.3286019089077}, {0.055850651601917, 49.3253039337471}, {0.049713813923233, 49.3219158062857}, {0.049393633537099, 49.3221688494924}, {0.047471649153311, 49.3213066024438}, {0.04755106595679, 49.3212332612062}, {0.040845011450398, 49.3181905415208}, {0.040150920245632, 49.31787904142}, {0.039962885130089, 49.317782152465}, {0.04034174516319, 49.3173686114171}, {0.033626289449895, 49.3145051363955}, {0.032740557919845, 49.3141516109565}, {0.031347338613429, 49.313459605015}, {0.031235682243362, 49.3135509641281}, {0.029314267528688, 49.3127840624681}, {0.024083333873085, 49.3105820713374}, {0.02383988821816, 49.3108046457384}, {0.022989404102509, 49.3104651415232}, {0.016397609318679, 49.3078735624598}, {0.016236244414416, 49.3080276777805}, {0.013035870818624, 49.3065310213615}, {0.012754827133148, 49.3067879156925}}))
polygons = append(polygons, (orb.Ring{{0.019797816099279, 49.325229088603}, {0.013235498621243, 49.3220984135413}, {0.006679188663454, 49.3188775447307}, {0.001751478001915, 49.3231631269776}, {0.00030826510927, 49.3244180023312}, {0.000034521402383, 49.3242899085418}, {-0.004894257776504, 49.3285751953461}, {-0.009823855515987, 49.332860261738}, {-0.003845879462176, 49.3357402000546}, {-0.004376904724334, 49.336234279179}, {0.00019267127677, 49.3382699850882}, {0.00003896662097, 49.3384130063648}, {0.006882712504834, 49.3414613328914}, {0.013584586312611, 49.3445956881043}, {0.013835900545075, 49.3443662391223}, {0.018429968444473, 49.3465144456831}, {0.019007858697842, 49.3459970497808}, {0.022212104736706, 49.3477771230593}, {0.028477356337026, 49.3513495867644}, {0.033807665316216, 49.347252820989}, {0.038724697445692, 49.3431456923271}, {0.034812389120157, 49.3408267818312}, {0.036339781995501, 49.3391292768443}, {0.040721479048813, 49.3347390581568}, {0.036808655724018, 49.3329836158413}, {0.037123735821512, 49.3326718720873}, {0.030269026676719, 49.3298048842398}, {0.023282829964216, 49.3268442840858}, {0.023162342964376, 49.3269672904862}, {0.021527329925941, 49.3262612666818}, {0.019602511201379, 49.3254039935278}, {0.019797816099279, 49.325229088603}}))

id := 100 // arbitrary value used to populate the feature properties

features := make([]*featureMock, 0)
for _, coords := range polygons {
feature := makeFeatureMockPolygon(tableName, id, coords)
features = append(features, feature)
}
return features
}
20 changes: 13 additions & 7 deletions internal/service/db_test/handler_db_lod_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,26 +32,32 @@ import (
// Simple unit test case ensuring that simplification is working on a single feature
func (t *DbTests) TestGeometrySimplificationSingleFeature() {
t.Test.Run("TestGeometrySimplificationSingleFeature", func(t *testing.T) {
rr := hTest.DoRequest(t, "/collections/mock_poly/items/6?max-allowable-offset=0.01")
var v api.GeojsonFeatureData
errUnMarsh := json.Unmarshal(hTest.ReadBody(rr), &v)

rr := hTest.DoRequest(t, "/collections/mock_poly/items/1?max-allowable-offset=0.01")

var feat api.GeojsonFeatureData
errUnMarsh := json.Unmarshal(hTest.ReadBody(rr), &feat)
util.Assert(t, errUnMarsh == nil, fmt.Sprintf("%v", errUnMarsh))
util.Equals(t, 5, len(v.Geom.Geometry().(orb.Polygon)[0]), "")
util.Equals(t, 4, len(feat.Geom.Geometry().(orb.Polygon)[0]), "wrong number of simplified coordinates")

})
}

// Simple unit test case ensuring that simplification is working on several features
func (t *DbTests) TestGeometrySimplificationSeveralFeatures() {
t.Test.Run("TestGeometrySimplificationSeveralFeatures", func(t *testing.T) {

rr := hTest.DoRequest(t, "/collections/mock_poly/items?max-allowable-offset=0.01")
// Feature collection
var v api.FeatureCollection
errUnMarsh := json.Unmarshal(hTest.ReadBody(rr), &v)
util.Assert(t, errUnMarsh == nil, fmt.Sprintf("%v", errUnMarsh))
util.Equals(t, 6, len(v.Features), "wrong number of features")
feature := v.Features[0]
util.Equals(t, 4, len(feature.Geom.Geometry().(orb.Polygon)[0]), "wrong number of simplified coordinates")
util.Assert(t, len(v.Features) > 1, "no features returned after simplification")

for _, feature := range v.Features {
util.Assert(t, len(feature.Geom.Geometry().(orb.Polygon)[0]) > 1, "")
util.Assert(t, len(feature.Geom.Geometry().(orb.Polygon)[0]) < 30, "")
}

})
}
Expand Down
73 changes: 24 additions & 49 deletions internal/utiltest/test_db.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -78,17 +78,19 @@ func CreateSchema(db *pgxpool.Pool, schema string) {

func InsertSimpleDataset(db *pgxpool.Pool, schema string) {
ctx := context.Background()

// collections tables
// tables := []string{"mock_a", "mock_b", "mock_c"}
type tableContent struct {
extent api.Extent
nx int
ny int
geometryType string
extent api.Extent
nx int
ny int
}
tablesAndExtents := map[string]tableContent{
"mock_a": {api.Extent{Minx: -120, Miny: 40, Maxx: -74, Maxy: 50}, 3, 3},
"mock_b": {api.Extent{Minx: -75, Miny: 45, Maxx: -74, Maxy: 46}, 10, 10},
"mock_c": {api.Extent{Minx: -120, Miny: 40, Maxx: -74, Maxy: 60}, 100, 100},
"mock_a": {api.GeometryTypePoint, api.Extent{Minx: -120, Miny: 40, Maxx: -74, Maxy: 50}, 3, 3},
"mock_b": {api.GeometryTypePoint, api.Extent{Minx: -75, Miny: 45, Maxx: -74, Maxy: 46}, 10, 10},
"mock_c": {api.GeometryTypePoint, api.Extent{Minx: -120, Miny: 40, Maxx: -74, Maxy: 60}, 100, 100},
"mock_poly": {api.GeometryTypePolygon, api.Extent{}, 0, 0},
}

createBytes := []byte(`
Expand All @@ -102,10 +104,10 @@ func InsertSimpleDataset(db *pgxpool.Pool, schema string) {
prop_d int
);
`)
for s := range tablesAndExtents {
for tableName, tableElements := range tablesAndExtents {

tableNameWithSchema := fmt.Sprintf("%s.%s", schema, s)
createStatement := fmt.Sprintf(string(createBytes), tableNameWithSchema, tableNameWithSchema, "Point")
tableNameWithSchema := fmt.Sprintf("%s.%s", schema, tableName)
createStatement := fmt.Sprintf(string(createBytes), tableNameWithSchema, tableNameWithSchema, tableElements.geometryType)

_, errExec := db.Exec(ctx, createStatement)
if errExec != nil {
Expand All @@ -114,18 +116,9 @@ func InsertSimpleDataset(db *pgxpool.Pool, schema string) {
}
}

// Table/collection dedicated to polygons
tableNameWithSchema := fmt.Sprintf("%s.%s", schema, "mock_poly")
createStatement := fmt.Sprintf(string(createBytes), tableNameWithSchema, tableNameWithSchema, "Polygon")
_, errExec := db.Exec(ctx, createStatement)
if errExec != nil {
CloseTestDb(db)
log.Fatal(errExec)
}

// ================================================================================

// inserting point features into mock collections
// inserting features into mock collections
b := &pgx.Batch{}

insertBytes := []byte(`
Expand All @@ -135,11 +128,18 @@ func InsertSimpleDataset(db *pgxpool.Pool, schema string) {
for tableName, tableElements := range tablesAndExtents {
tableNameWithSchema := fmt.Sprintf("%s.%s", schema, tableName)
insertStatement := fmt.Sprintf(string(insertBytes), tableNameWithSchema)
featuresMock := data.MakeFeaturesMockPoint(tableName, tableElements.extent, tableElements.nx, tableElements.ny)

for _, f := range featuresMock {
geomStr, _ := f.Geom.MarshalJSON()
b.Queue(insertStatement, geomStr, f.Props["prop_a"], f.Props["prop_b"], f.Props["prop_c"], f.Props["prop_d"])
switch tableElements.geometryType {
case api.GeometryTypePoint:
for _, feat := range data.MakeFeaturesMockPoint(tableName, tableElements.extent, tableElements.nx, tableElements.ny) {
geomStr, _ := feat.Geom.MarshalJSON()
b.Queue(insertStatement, geomStr, feat.Props["prop_a"], feat.Props["prop_b"], feat.Props["prop_c"], feat.Props["prop_d"])
}
case api.GeometryTypePolygon:
for _, feat := range data.MakeFeaturesMockPolygon(tableNameWithSchema) {
geomStr, _ := feat.Geom.MarshalJSON()
b.Queue(insertStatement, geomStr, feat.Props["prop_a"], feat.Props["prop_b"], feat.Props["prop_c"], feat.Props["prop_d"])
}
}
res := db.SendBatch(ctx, b)
if res == nil {
Expand All @@ -151,32 +151,7 @@ func InsertSimpleDataset(db *pgxpool.Pool, schema string) {
CloseTestDb(db)
log.Fatal(fmt.Sprintf("Injection failed: %v", resClose.Error()))
}
}

// inserting polygon features into mock_poly collection/table
polygons := make([]orb.Ring, 3)
polygons[0] = (orb.Ring{{-0.024590485281003, 49.2918461864342}, {-0.02824214022877, 49.2902093052715}, {-0.032731597583892, 49.2940548086905}, {-0.037105514267367, 49.2982628947696}, {-0.035096222035489, 49.2991273714187}, {-0.038500457450357, 49.3032655348948}, {-0.034417965728768, 49.3047607558599}, {-0.034611922456059, 49.304982637632}, {-0.028287271276391, 49.3073904622151}, {-0.022094153540685, 49.3097046833446}, {-0.022020905508067, 49.3096240670749}, {-0.019932810088915, 49.3103884833526}, {-0.013617304476105, 49.3129751788625}, {-0.010317714854534, 49.3091925467367}, {-0.006352474569531, 49.3110873002743}, {-0.001853050940172, 49.3070612288807}, {0.002381370562776, 49.3028484930665}, {-0.000840217324783, 49.3013882187799}, {-0.00068928216257, 49.3012429006019}, {-0.003864625123604, 49.3000173218511}, {-0.003918013833785, 49.2999931219338}, {-0.010095065847337, 49.2974103246769}, {-0.010150643294152, 49.2974622610823}, {-0.013587537856462, 49.2959737733625}, {-0.01384030494609, 49.2962233671643}, {-0.017222409797967, 49.294623513139}, {-0.017308576106142, 49.2947057553981}, {-0.020709238582055, 49.2930969232562}, {-0.021034503634088, 49.2933909821512}, {-0.024481057600533, 49.2917430023163}, {-0.024590485281003, 49.2918461864342}})
polygons[1] = (orb.Ring{{0.012754827133148, 49.3067879156925}, {0.008855271114669, 49.3050781328888}, {0.004494239224312, 49.3091080209745}, {-0.000152707581678, 49.3133105602284}, {0.005720060734669, 49.3160862415579}, {0.005012790172897, 49.3167672210029}, {0.000766997696737, 49.3211596408574}, {0.007624129875227, 49.3239385018443}, {0.008367761372595, 49.3242455690107}, {0.008290411160612, 49.3243148348313}, {0.014857908580632, 49.327355944666}, {0.021563621634322, 49.330400077634}, {0.021666104647453, 49.3302974189836}, {0.024971410363691, 49.3317809883673}, {0.02492195583839, 49.3318321743075}, {0.029104098429698, 49.3336152412767}, {0.028646253682028, 49.3340827604102}, {0.035511767129074, 49.3367701742839}, {0.04198105053544, 49.3391776115466}, {0.046199095420336, 49.3352329627991}, {0.047069675744848, 49.3344290720305}, {0.048144047016136, 49.334920703514}, {0.048423560249958, 49.3346968337392}, {0.051915791431139, 49.3363621210079}, {0.056947292176151, 49.3326168697662}, {0.061993411180365, 49.3286019089077}, {0.055850651601917, 49.3253039337471}, {0.049713813923233, 49.3219158062857}, {0.049393633537099, 49.3221688494924}, {0.047471649153311, 49.3213066024438}, {0.04755106595679, 49.3212332612062}, {0.040845011450398, 49.3181905415208}, {0.040150920245632, 49.31787904142}, {0.039962885130089, 49.317782152465}, {0.04034174516319, 49.3173686114171}, {0.033626289449895, 49.3145051363955}, {0.032740557919845, 49.3141516109565}, {0.031347338613429, 49.313459605015}, {0.031235682243362, 49.3135509641281}, {0.029314267528688, 49.3127840624681}, {0.024083333873085, 49.3105820713374}, {0.02383988821816, 49.3108046457384}, {0.022989404102509, 49.3104651415232}, {0.016397609318679, 49.3078735624598}, {0.016236244414416, 49.3080276777805}, {0.013035870818624, 49.3065310213615}, {0.012754827133148, 49.3067879156925}})
polygons[2] = (orb.Ring{{0.019797816099279, 49.325229088603}, {0.013235498621243, 49.3220984135413}, {0.006679188663454, 49.3188775447307}, {0.001751478001915, 49.3231631269776}, {0.00030826510927, 49.3244180023312}, {0.000034521402383, 49.3242899085418}, {-0.004894257776504, 49.3285751953461}, {-0.009823855515987, 49.332860261738}, {-0.003845879462176, 49.3357402000546}, {-0.004376904724334, 49.336234279179}, {0.00019267127677, 49.3382699850882}, {0.00003896662097, 49.3384130063648}, {0.006882712504834, 49.3414613328914}, {0.013584586312611, 49.3445956881043}, {0.013835900545075, 49.3443662391223}, {0.018429968444473, 49.3465144456831}, {0.019007858697842, 49.3459970497808}, {0.022212104736706, 49.3477771230593}, {0.028477356337026, 49.3513495867644}, {0.033807665316216, 49.347252820989}, {0.038724697445692, 49.3431456923271}, {0.034812389120157, 49.3408267818312}, {0.036339781995501, 49.3391292768443}, {0.040721479048813, 49.3347390581568}, {0.036808655724018, 49.3329836158413}, {0.037123735821512, 49.3326718720873}, {0.030269026676719, 49.3298048842398}, {0.023282829964216, 49.3268442840858}, {0.023162342964376, 49.3269672904862}, {0.021527329925941, 49.3262612666818}, {0.019602511201379, 49.3254039935278}, {0.019797816099279, 49.325229088603}})

tableNameWithSchema = fmt.Sprintf("%s.%s", schema, "mock_poly")
insertPolyStatement := fmt.Sprintf(string(insertBytes), tableNameWithSchema)
propVal := 100
features := data.MakeFeaturesMockPolygon(tableNameWithSchema, propVal, polygons)

for _, feat := range features {
geomStr, _ := feat.Geom.MarshalJSON()
b.Queue(insertPolyStatement, geomStr, feat.Props["prop_a"], feat.Props["prop_b"], feat.Props["prop_c"], feat.Props["prop_d"])
res := db.SendBatch(ctx, b)
if res == nil {
CloseTestDb(db)
log.Fatal("Injection failed")
}
resClose := res.Close()
if resClose != nil {
CloseTestDb(db)
log.Fatal(fmt.Sprintf("Injection failed: %v", resClose.Error()))
}
}

}
Expand Down

0 comments on commit 5657204

Please sign in to comment.