remove go vet warnings

omniscale · Nov 13, 2013 · 2d1c980 · 2d1c980
1 parent 9e0fd75
commit 2d1c980
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/geom/geojson/geojson.go b/geom/geojson/geojson.go
@@ -156,7 +156,6 @@ func constructPolygons(obj *object) ([]polygon, error) {
 	default:
 		return nil, errors.New("unknown type: " + obj.Type)
 	}
-	return nil, nil
 }
 
 type GeoJson struct {

diff --git a/geom/limit/limit.go b/geom/limit/limit.go
@@ -35,10 +35,10 @@ func tileBounds(bounds geos.Bounds, width float64) []geos.Bounds {
 	for x := 0; x < int(xSteps); x++ {
 		for y := 0; y < int(ySteps); y++ {
 			results = append(results, geos.Bounds{
-				minX + float64(x)*width,
-				minY + float64(y)*width,
-				minX + float64(x+1)*width,
-				minY + float64(y+1)*width,
+				MinX: minX + float64(x)*width,
+				MinY: minY + float64(y)*width,
+				MaxX: minX + float64(x+1)*width,
+				MaxY: minY + float64(y+1)*width,
 			})
 		}
 	}

diff --git a/writer/relations.go b/writer/relations.go
@@ -117,7 +117,7 @@ NextRel:
 			for _, g := range parts {
 				rel := element.Relation(*r)
 				rel.Id = -r.Id
-				rel.Geom = &element.Geometry{g, geos.AsEwkbHex(g)}
+				rel.Geom = &element.Geometry{Geom: g, Wkb: geos.AsEwkbHex(g)}
 				rw.inserter.InsertPolygon(rel.OSMElem, matches)
 			}
 		} else {

diff --git a/writer/ways.go b/writer/ways.go
@@ -116,7 +116,7 @@ func (ww *WayWriter) buildAndInsert(g *geos.Geos, w *element.Way, matches interf
 		}
 		for _, p := range parts {
 			way := element.Way(*w)
-			way.Geom = &element.Geometry{p, g.AsEwkbHex(p)}
+			way.Geom = &element.Geometry{Geom: p, Wkb: g.AsEwkbHex(p)}
 			if isPolygon {
 				ww.inserter.InsertPolygon(way.OSMElem, matches)
 			} else {