From 0c62bfd7b071a96130b5381263b47b731793185b Mon Sep 17 00:00:00 2001 From: Oliver Tonnhofer Date: Sat, 27 Apr 2013 16:02:16 +0200 Subject: [PATCH] make BlockPosition fields public --- parser/lowlevel.go | 6 +++--- parser/pbf.go | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/parser/lowlevel.go b/parser/lowlevel.go index 0ef48b6..6f569a8 100644 --- a/parser/lowlevel.go +++ b/parser/lowlevel.go @@ -12,7 +12,7 @@ import ( ) func ReadPrimitiveBlock(pos BlockPosition) *osmpbf.PrimitiveBlock { - file, err := os.Open(pos.filename) + file, err := os.Open(pos.Filename) if err != nil { log.Panic(err) } @@ -21,8 +21,8 @@ func ReadPrimitiveBlock(pos BlockPosition) *osmpbf.PrimitiveBlock { var block = &osmpbf.PrimitiveBlock{} var blob = &osmpbf.Blob{} - blobData := make([]byte, pos.size) - file.Seek(pos.offset, 0) + blobData := make([]byte, pos.Size) + file.Seek(pos.Offset, 0) io.ReadFull(file, blobData) err = proto.Unmarshal(blobData, blob) if err != nil { diff --git a/parser/pbf.go b/parser/pbf.go index ea55f25..4472ac3 100644 --- a/parser/pbf.go +++ b/parser/pbf.go @@ -15,9 +15,9 @@ type PBF struct { } type BlockPosition struct { - filename string - offset int64 - size int32 + Filename string + Offset int64 + Size int32 } func Open(filename string) (f *PBF, err error) {