Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace gogo protobuf by google protobuf #109

Closed
wants to merge 1 commit into from
Closed

replace gogo protobuf by google protobuf #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion encoding/mvt/geometry_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"github.com/paulmach/orb"
"github.com/paulmach/orb/encoding/mvt/vectortile"
"github.com/paulmach/protoscan"
"google.golang.org/protobuf/proto"
)

func TestGeometry_Point(t *testing.T) {
Expand Down Expand Up @@ -360,7 +361,7 @@ func sliceToIterator(vals []uint32) *protoscan.Iterator {
Geometry: vals,
}

data, err := feature.Marshal()
data, err := proto.Marshal(feature)
if err != nil {
panic(err)
}
Expand Down
2 changes: 1 addition & 1 deletion encoding/mvt/marshal.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"github.com/paulmach/orb/encoding/mvt/vectortile"
"github.com/paulmach/orb/geojson"

"github.com/gogo/protobuf/proto"
"google.golang.org/protobuf/proto"
)

// MarshalGzipped will marshal the layers into Mapbox Vector Tile format
Expand Down
3 changes: 1 addition & 2 deletions encoding/mvt/vectortile/generator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
package vectortile

//-----go:generate protoc --go_out=.,import_path=vectortile:. vector_tile.proto
//go:generate protoc --proto_path=../../../../..:../../../../gogo/protobuf/protobuf:. --gogofast_out=.,import_path=vectortile:. vector_tile.proto
//go:generate protoc --proto_path=../vectortile --go_opt=paths=source_relative --go_opt=Mvector_tile.proto=./vectortile --go_out=. vector_tile.proto
Loading