diff --git a/database/database.go b/database/database.go index f81ff49..20e4d22 100644 --- a/database/database.go +++ b/database/database.go @@ -40,9 +40,9 @@ type Inserter interface { InsertPoint(element.OSMElem, interface{}) InsertLineString(element.OSMElem, interface{}) InsertPolygon(element.OSMElem, interface{}) - // FilterRelationPolygons returns a slice of all members that are already + // SelectRelationPolygons returns a slice of all members that are already // imported with a relation with tags. - FilterRelationPolygons(element.Tags, []element.Member) []element.Member + SelectRelationPolygons(element.Tags, []element.Member) []element.Member } type Deployer interface { @@ -113,7 +113,7 @@ func (n *nullDb) InsertPolygon(element.OSMElem, interface{}) func (n *nullDb) ProbePoint(element.OSMElem) (bool, interface{}) { return true, nil } func (n *nullDb) ProbeLineString(element.OSMElem) (bool, interface{}) { return true, nil } func (n *nullDb) ProbePolygon(element.OSMElem) (bool, interface{}) { return true, nil } -func (n *nullDb) FilterRelationPolygons(element.Tags, []element.Member) []element.Member { return nil } +func (n *nullDb) SelectRelationPolygons(element.Tags, []element.Member) []element.Member { return nil } func newNullDb(conf Config, m *mapping.Mapping) (DB, error) { return &nullDb{}, nil diff --git a/database/postgis/postgis.go b/database/postgis/postgis.go index 5a9df0f..965c71e 100644 --- a/database/postgis/postgis.go +++ b/database/postgis/postgis.go @@ -476,7 +476,7 @@ func (pg *PostGIS) ProbePolygon(elem element.OSMElem) (bool, interface{}) { return false, nil } -func (pg *PostGIS) FilterRelationPolygons(tags element.Tags, members []element.Member) []element.Member { +func (pg *PostGIS) SelectRelationPolygons(tags element.Tags, members []element.Member) []element.Member { relMatches := pg.polygonTagMatcher.Match(&tags) result := []element.Member{} for _, m := range members { diff --git a/database/postgis/postgis_test.go b/database/postgis/postgis_test.go index 0eb7eff..d556da4 100644 --- a/database/postgis/postgis_test.go +++ b/database/postgis/postgis_test.go @@ -34,9 +34,9 @@ func testDb(t *testing.T) *PostGIS { return db.(*PostGIS) } -func TestFilterRelationPolygonsSimple(t *testing.T) { +func TestSelectRelationPolygonsSimple(t *testing.T) { db := testDb(t) - filtered := db.FilterRelationPolygons(element.Tags{"landuse": "park"}, + filtered := db.SelectRelationPolygons(element.Tags{"landuse": "park"}, []element.Member{ makeMember(0, element.Tags{"landuse": "forest"}), makeMember(1, element.Tags{"landuse": "park"}), @@ -51,9 +51,9 @@ func TestFilterRelationPolygonsSimple(t *testing.T) { } } -func TestFilterRelationPolygonsUnrelatedTags(t *testing.T) { +func TestSelectRelationPolygonsUnrelatedTags(t *testing.T) { db := testDb(t) - filtered := db.FilterRelationPolygons(element.Tags{"landuse": "park"}, + filtered := db.SelectRelationPolygons(element.Tags{"landuse": "park"}, []element.Member{ makeMember(0, element.Tags{"landuse": "park", "layer": "2", "name": "foo"}), makeMember(1, element.Tags{"landuse": "forest"}), @@ -66,9 +66,9 @@ func TestFilterRelationPolygonsUnrelatedTags(t *testing.T) { } } -func TestFilterRelationPolygonsMultiple(t *testing.T) { +func TestSelectRelationPolygonsMultiple(t *testing.T) { db := testDb(t) - filtered := db.FilterRelationPolygons(element.Tags{"landuse": "park"}, + filtered := db.SelectRelationPolygons(element.Tags{"landuse": "park"}, []element.Member{ makeMember(0, element.Tags{"landuse": "park"}), makeMember(1, element.Tags{"natural": "forest"}), @@ -84,9 +84,9 @@ func TestFilterRelationPolygonsMultiple(t *testing.T) { } } -func TestFilterRelationPolygonsMultipleTags(t *testing.T) { +func TestSelectRelationPolygonsMultipleTags(t *testing.T) { db := testDb(t) - filtered := db.FilterRelationPolygons(element.Tags{"landuse": "forest", "natural": "scrub"}, + filtered := db.SelectRelationPolygons(element.Tags{"landuse": "forest", "natural": "scrub"}, []element.Member{ makeMember(0, element.Tags{"natural": "scrub"}), makeMember(1, element.Tags{"landuse": "forest"}), diff --git a/writer/relations.go b/writer/relations.go index 66b7d6d..e3bcaf6 100644 --- a/writer/relations.go +++ b/writer/relations.go @@ -126,7 +126,7 @@ NextRel: rw.inserter.InsertPolygon(rel.OSMElem, matches) } - for _, m := range rw.inserter.FilterRelationPolygons(r.Tags, r.Members) { + for _, m := range rw.inserter.SelectRelationPolygons(r.Tags, r.Members) { err = rw.osmCache.InsertedWays.PutWay(m.Way) if err != nil { log.Warn(err)