refactor relation writing

writer/relations.go

@@ -80,7 +80,7 @@ NextRel:
 			if err != cache.NotFound {
 				log.Warn(err)
 			}
-			continue NextRel
+			continue
 		}
 		for i, m := range r.Members {
 			if m.Way == nil {
@@ -97,79 +97,42 @@ NextRel:
 			r.Members[i].Elem = &m.Way.OSMElem
 		}
 
-		relMemberMatches := rw.relationMemberMatcher.MatchRelation(r)
+		// handleRelation updates r.Members but we need all of them
-		if len(relMemberMatches) > 0 {
-			for i, m := range r.Members {
-				if m.Type == element.RELATION {
-					mrel, err := rw.osmCache.Relations.GetRelation(m.Id)
-					if err != nil {
-						if err == cache.NotFound {
-							log.Warn(err)
-							continue NextRel
-						}
-					}
-					r.Members[i].Elem = &mrel.OSMElem
-				} else if m.Type == element.NODE {
-					nd, err := rw.osmCache.Nodes.GetNode(m.Id)
-					if err != nil {
-						if err == cache.NotFound {
-							nd, err = rw.osmCache.Coords.GetCoord(m.Id)
-							if err != nil {
-								if err != cache.NotFound {
-									log.Warn(err)
-								}
-								continue NextRel
-							}
-						} else {
-							log.Warn(err)
-							continue NextRel
-						}
-					}
-					rw.NodeToSrid(nd)
-					r.Members[i].Node = nd
-					r.Members[i].Elem = &nd.OSMElem
-				}
-			}
-
-			for _, m := range r.Members {
-				var g *geosp.Geom
-				var err error
-				if m.Node != nil {
-					g, err = geomp.Point(geos, *m.Node)
-				} else if m.Way != nil {
-					g, err = geomp.LineString(geos, m.Way.Nodes)
-				}
-
-				if err != nil {
-					log.Warn(err)
-					continue
-				}
-
-				var gelem geomp.Geometry
-				if g == nil {
-					g = geos.FromWkt("POLYGON EMPTY")
-					gelem = geomp.Geometry{Geom: g, Wkb: geos.AsEwkbHex(g)}
-				} else {
-					gelem, err = geomp.AsGeomElement(geos, g)
-					if err != nil {
-						log.Warn(err)
-						continue
-					}
-				}
-
-				rw.inserter.InsertRelationMember(*r, m, gelem, relMemberMatches)
-			}
-		}
-
-		relMatches := rw.relationMatcher.MatchRelation(r)
-		if len(relMatches) > 0 {
-			rw.inserter.InsertPolygon(r.OSMElem, geomp.Geometry{}, relMatches)
-		}
-
-		// BuildRelation updates r.Members but we need all of them
 		// for the diffCache
 		allMembers := r.Members
 
+		inserted := false
+
+		if handleRelationMembers(rw, r, geos) {
+			inserted = true
+		}
+		if handleRelation(rw, r, geos) {
+			inserted = true
+		}
+		if handleMultiPolygon(rw, r, geos) {
+			inserted = true
+		}
+
+		if inserted && rw.diffCache != nil {
+			rw.diffCache.Ways.AddFromMembers(r.Id, allMembers)
+			for _, member := range allMembers {
+				if member.Way != nil {
+					rw.diffCache.Coords.AddFromWay(member.Way)
+				}
+			}
+		}
+		if inserted && rw.expireor != nil {
+			for _, m := range allMembers {
+				if m.Way != nil {
+					expire.ExpireNodes(rw.expireor, m.Way.Nodes)
+				}
+			}
+		}
+	}
+	rw.wg.Done()
+}
+
+func handleMultiPolygon(rw *RelationWriter, r *element.Relation, geos *geosp.Geos) bool {
 	// prepare relation first (build rings and compute actual
 	// relation tags)
 	prepedRel, err := geomp.PrepareRelation(r, rw.srid, rw.maxGap)
@@ -177,25 +140,25 @@ NextRel:
 		if errl, ok := err.(ErrorLevel); !ok || errl.Level() > 0 {
 			log.Warn(err)
 		}
-			continue NextRel
+		return false
 	}
 
 	// check for matches befor building the geometry
 	matches := rw.polygonMatcher.MatchRelation(r)
-		if len(matches) == 0 {
+	if matches == nil {
-			continue NextRel
+		return false
 	}
 
 	// build the multipolygon
 	geom, err := prepedRel.Build()
-		if err != nil {
 	if geom.Geom != nil {
-				geos.Destroy(geom.Geom)
+		defer geos.Destroy(geom.Geom)
 	}
+	if err != nil {
 		if errl, ok := err.(ErrorLevel); !ok || errl.Level() > 0 {
 			log.Warn(err)
 		}
-			continue NextRel
+		return false
 	}
 
 	if rw.limiter != nil {
@@ -203,7 +166,7 @@ NextRel:
 		parts, err := rw.limiter.Clip(geom.Geom)
 		if err != nil {
 			log.Warn(err)
-				continue NextRel
+			return false
 		}
 		if duration := time.Now().Sub(start); duration > time.Minute {
 			log.Warnf("clipping relation %d to -limitto took %s", r.Id, duration)
@@ -228,7 +191,7 @@ NextRel:
 			if errl, ok := err.(ErrorLevel); !ok || errl.Level() > 0 {
 				log.Warn(err)
 			}
-				continue
+			return false
 		}
 	}
 
@@ -238,22 +201,85 @@ NextRel:
 			log.Warn(err)
 		}
 	}
-		if rw.diffCache != nil {
+	return true
-			rw.diffCache.Ways.AddFromMembers(r.Id, allMembers)
+}
-			for _, member := range allMembers {
+
-				if member.Way != nil {
+func handleRelation(rw *RelationWriter, r *element.Relation, geos *geosp.Geos) bool {
-					rw.diffCache.Coords.AddFromWay(member.Way)
+	relMatches := rw.relationMatcher.MatchRelation(r)
-				}
+	if relMatches == nil {
-			}
+		return false
-		}
+	}
-		if rw.expireor != nil {
+	rel := element.Relation(*r)
-			for _, m := range allMembers {
+	rel.Id = rw.relId(r.Id)
-				if m.Way != nil {
+	rw.inserter.InsertPolygon(rel.OSMElem, geomp.Geometry{}, relMatches)
-					expire.ExpireNodes(rw.expireor, m.Way.Nodes)
+	return true
-				}
+}
-			}
+
-		}
+func handleRelationMembers(rw *RelationWriter, r *element.Relation, geos *geosp.Geos) bool {
-		geos.Destroy(geom.Geom)
+	relMemberMatches := rw.relationMemberMatcher.MatchRelation(r)
-	}
+	if relMemberMatches == nil {
-	rw.wg.Done()
+		return false
+	}
+	for i, m := range r.Members {
+		if m.Type == element.RELATION {
+			mrel, err := rw.osmCache.Relations.GetRelation(m.Id)
+			if err != nil {
+				if err == cache.NotFound {
+					log.Warn(err)
+					return false
+				}
+			}
+			r.Members[i].Elem = &mrel.OSMElem
+		} else if m.Type == element.NODE {
+			nd, err := rw.osmCache.Nodes.GetNode(m.Id)
+			if err != nil {
+				if err == cache.NotFound {
+					nd, err = rw.osmCache.Coords.GetCoord(m.Id)
+					if err != nil {
+						if err != cache.NotFound {
+							log.Warn(err)
+						}
+						return false
+					}
+				} else {
+					log.Warn(err)
+					return false
+				}
+			}
+			rw.NodeToSrid(nd)
+			r.Members[i].Node = nd
+			r.Members[i].Elem = &nd.OSMElem
+		}
+	}
+
+	for _, m := range r.Members {
+		var g *geosp.Geom
+		var err error
+		if m.Node != nil {
+			g, err = geomp.Point(geos, *m.Node)
+		} else if m.Way != nil {
+			g, err = geomp.LineString(geos, m.Way.Nodes)
+		}
+
+		if err != nil {
+			log.Warn(err)
+			return false
+		}
+
+		var gelem geomp.Geometry
+		if g == nil {
+			g = geos.FromWkt("POLYGON EMPTY")
+			gelem = geomp.Geometry{Geom: g, Wkb: geos.AsEwkbHex(g)}
+		} else {
+			gelem, err = geomp.AsGeomElement(geos, g)
+			if err != nil {
+				log.Warn(err)
+				return false
+			}
+		}
+		rel := element.Relation(*r)
+		rel.Id = rw.relId(r.Id)
+		rw.inserter.InsertRelationMember(rel, m, gelem, relMemberMatches)
+	}
+	return true
 }