wdevs/ResolveSpec
5
0
Fork 0
mirror of https://github.com/bitechdev/ResolveSpec.git synced 2026-08-30 04:52:35 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix(wkb): simplify loop indexing in geometry reading functions

Browse Source
This commit is contained in:
warkanum
2026-08-29 21:36:01 +02:00
parent f259df1258
commit 6f6b997f4f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/spectypes/wkb.go
+10 -10
View File
@@ -219,20 +219,20 @@ func readGeom(r *wkbReader) (geom, int, error) {
switch baseType { switch baseType {
case 4: case 4:
pts := make([][]float64, len(parts)) pts := make([][]float64, len(parts))
for i, p := range parts { for i := range parts {
pts[i] = p.coord pts[i] = parts[i].coord
} }
return geom{typ: "MultiPoint", line: pts}, srid, nil return geom{typ: "MultiPoint", line: pts}, srid, nil
case 5: case 5:
lines := make([][][]float64, len(parts)) lines := make([][][]float64, len(parts))
for i, p := range parts { for i := range parts {
lines[i] = p.line lines[i] = parts[i].line
} }
return geom{typ: "MultiLineString", poly: lines}, srid, nil return geom{typ: "MultiLineString", poly: lines}, srid, nil
default: default:
polys := make([][][][]float64, len(parts)) polys := make([][][][]float64, len(parts))
for i, p := range parts { for i := range parts {
polys[i] = p.poly polys[i] = parts[i].poly
} }
return geom{typ: "MultiPolygon", multi: polys}, srid, nil return geom{typ: "MultiPolygon", multi: polys}, srid, nil
} }
@@ -284,8 +284,8 @@ func geomToGeoJSONStruct(g geom) (geoJSON, error) {
coords = g.multi coords = g.multi
case "GeometryCollection": case "GeometryCollection":
subs := make([]geoJSON, len(g.geoms)) subs := make([]geoJSON, len(g.geoms))
for i, sub := range g.geoms { for i := range g.geoms {
s, err := geomToGeoJSONStruct(sub) s, err := geomToGeoJSONStruct(g.geoms[i])
if err != nil { if err != nil {
return geoJSON{}, err return geoJSON{}, err
} }
@@ -683,8 +683,8 @@ func geomToWKT(g geom) (string, error) {
return "MULTIPOLYGON (" + strings.Join(parts, ", ") + ")", nil return "MULTIPOLYGON (" + strings.Join(parts, ", ") + ")", nil
case "GeometryCollection": case "GeometryCollection":
parts := make([]string, len(g.geoms)) parts := make([]string, len(g.geoms))
for i, sub := range g.geoms { for i := range g.geoms {
w, err := geomToWKT(sub) w, err := geomToWKT(g.geoms[i])
if err != nil { if err != nil {
return "", err return "", err
} }