encoding/mvt: upgrade protoscan v0.1 -> v0.2

paulmach · Jan 16, 2021 · ad31566 · ad31566
1 parent c6d2869
commit ad31566
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/encoding/mvt/unmarshal.go b/encoding/mvt/unmarshal.go
@@ -55,13 +55,17 @@ func (d *decoder) Reset() {
 func unmarshalTile(data []byte) (Layers, error) {
 	d := &decoder{}
 
-	var layers Layers
-	msg := protoscan.New(data)
+	var (
+		layers Layers
+		m      *protoscan.Message
+		err    error
+	)
 
+	msg := protoscan.New(data)
 	for msg.Next() {
 		switch msg.FieldNumber() {
 		case 3:
-			m, err := msg.Message()
+			m, err = msg.Message(m)
 			if err != nil {
 				return nil, err
 			}
@@ -85,8 +89,9 @@ func unmarshalTile(data []byte) (Layers, error) {
 }
 
 func (d *decoder) Layer(msg *protoscan.Message) (*Layer, error) {
-	d.Reset()
+	var err error
 
+	d.Reset()
 	layer := &Layer{
 		Version: vectortile.Default_Tile_Layer_Version,
 		Extent:  vectortile.Default_Tile_Layer_Extent,
@@ -119,17 +124,11 @@ func (d *decoder) Layer(msg *protoscan.Message) (*Layer, error) {
 			}
 			d.keys = append(d.keys, s)
 		case 4: // values
-			data, err := msg.MessageData()
+			d.valMsg, err = msg.Message(d.valMsg)
 			if err != nil {
 				return nil, err
 			}
 
-			if d.valMsg == nil {
-				d.valMsg = protoscan.New(data)
-			} else {
-				d.valMsg.Reset(data)
-			}
-
 			v, err := decodeValueMsg(d.valMsg)
 			if err != nil {
 				return nil, err

diff --git a/go.mod b/go.mod
@@ -4,6 +4,6 @@ go 1.13
 
 require (
 	github.com/gogo/protobuf v1.3.1
-	github.com/paulmach/protoscan v0.1.0
+	github.com/paulmach/protoscan v0.2.0
 	github.com/pkg/errors v0.9.1
 )
diff --git a/go.sum b/go.sum
@@ -26,6 +26,8 @@ github.com/kisielk/gotool v1.0.0 h1:AV2c/EiW3KqPNT9ZKl07ehoAGi4C5/01Cfbblndcapg=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/paulmach/protoscan v0.1.0 h1:4nM2d0bvdr4pfBC302n1/1QL9oXkenxujFXhLA19aAg=
 github.com/paulmach/protoscan v0.1.0/go.mod h1:2c55sl1Hu6/tgRfc8Y8zADsxuSCYC2IrPh0JCqP/yrw=
+github.com/paulmach/protoscan v0.2.0 h1:NBfMeawzxQG4ynAt0f3Q2rJh/t+4PJiU6QbFg/y9Zqk=
+github.com/paulmach/protoscan v0.2.0/go.mod h1:2c55sl1Hu6/tgRfc8Y8zADsxuSCYC2IrPh0JCqP/yrw=
 github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=