vitalif
/
imposm3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

writer: do not check for validity of simple polygons 

Skips slow GEOS IsValid calls for polygons with only 4 corners.
They can be invalid, but its more unlikely to get simple polygons
wrong and even if, it should affect only small polygons like buildings.
master
Oliver Tonnhofer 2017-11-21 09:18:44 +01:00
parent e245e01b95
commit a367850f6f
2 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
geom/geos/geos.go
View File

@ -112,6 +112,11 @@ func (this *Geos) NumGeoms(geom *Geom) int32 {
return count
}
func (this *Geos) NumCoordinates(geom *Geom) int32 {
count := int32(C.GEOSGetNumCoordinates_r(this.v, geom.v))
return count
}
func (this *Geos) Geoms(geom *Geom) []*Geom {
count := this.NumGeoms(geom)
var result []*Geom

5
writer/ways.go
View File

@ -139,7 +139,10 @@ func (ww *WayWriter) buildAndInsert(g *geos.Geos, w *element.Way, matches []mapp
if isPolygon {
geosgeom, err = geomp.Polygon(g, way.Nodes)
if err == nil {
geosgeom, err = g.MakeValid(geosgeom)
if g.NumCoordinates(geosgeom) > 5 {
// only check for valididty for non-simple geometries
geosgeom, err = g.MakeValid(geosgeom)
}
}
} else {
geosgeom, err = geomp.LineString(g, way.Nodes)