Skip to content

Commit

Permalink
remove local mvt package and vendor from geom
Browse files Browse the repository at this point in the history
  • Loading branch information
ear7h authored and gdey committed Apr 21, 2020
1 parent c84f120 commit 894182d
Show file tree
Hide file tree
Showing 38 changed files with 634 additions and 744 deletions.
4 changes: 2 additions & 2 deletions atlas/map.go
Expand Up @@ -12,14 +12,14 @@ import (
"github.com/golang/protobuf/proto"

"github.com/go-spatial/geom"
"github.com/go-spatial/geom/encoding/mvt"
"github.com/go-spatial/geom/slippy"
"github.com/go-spatial/tegola"
"github.com/go-spatial/tegola/basic"
"github.com/go-spatial/tegola/dict"
"github.com/go-spatial/tegola/internal/convert"
"github.com/go-spatial/tegola/maths/simplify"
"github.com/go-spatial/tegola/maths/validate"
"github.com/go-spatial/tegola/mvt"
"github.com/go-spatial/tegola/provider"
"github.com/go-spatial/tegola/provider/debug"
)
Expand Down Expand Up @@ -224,7 +224,7 @@ func (m Map) Encode(ctx context.Context, tile *slippy.Tile) ([]byte, error) {
// with the adoption of the new make valid routine. once implemented, the clipRegion
// calculation will need to be in the same coordinate space as the geometry the
// make valid function will be operating on.
geo = mvt.ScaleGeo(geo, tegolaTile)
geo = mvt.PrepareGeo(geo, clipRegion, float64(mvt.DefaultExtent))

// TODO: remove this geom conversion step once the validate function uses geom types
sg, err = convert.ToTegola(geo)
Expand Down
2 changes: 1 addition & 1 deletion atlas/map_test.go
Expand Up @@ -10,10 +10,10 @@ import (

"github.com/golang/protobuf/proto"

vectorTile "github.com/go-spatial/geom/encoding/mvt/vector_tile"
"github.com/go-spatial/geom/slippy"
"github.com/go-spatial/tegola/atlas"
"github.com/go-spatial/tegola/internal/p"
vectorTile "github.com/go-spatial/tegola/mvt/vector_tile"
"github.com/go-spatial/tegola/provider/test"
"github.com/go-spatial/tegola/provider/test/emptycollection"
)
Expand Down
2 changes: 1 addition & 1 deletion cache/s3/s3.go
Expand Up @@ -15,10 +15,10 @@ import (
"github.com/aws/aws-sdk-go/aws/session"
"github.com/aws/aws-sdk-go/service/s3"

"github.com/go-spatial/geom/encoding/mvt"
"github.com/go-spatial/tegola"
"github.com/go-spatial/tegola/cache"
"github.com/go-spatial/tegola/dict"
"github.com/go-spatial/tegola/mvt"
)

var (
Expand Down
1 change: 1 addition & 0 deletions cmd/tegola_lambda/main.go
Expand Up @@ -10,6 +10,7 @@ import (
"github.com/akrylysov/algnhsa"
"github.com/dimfeld/httptreemux"

"github.com/go-spatial/geom/encoding/mvt"
"github.com/go-spatial/tegola/atlas"
"github.com/go-spatial/tegola/cmd/internal/register"
"github.com/go-spatial/tegola/config"
Expand Down
2 changes: 1 addition & 1 deletion example/tile.go
Expand Up @@ -7,9 +7,9 @@ import (

"context"

"github.com/go-spatial/geom/encoding/mvt"
"github.com/go-spatial/geom/encoding/wkb"
"github.com/go-spatial/tegola/internal/convert"
"github.com/go-spatial/tegola/mvt"
"github.com/golang/protobuf/proto"
)

Expand Down
61 changes: 0 additions & 61 deletions mvt/debug.go

This file was deleted.

138 changes: 0 additions & 138 deletions mvt/feature_internal_test.go

This file was deleted.

0 comments on commit 894182d

Please sign in to comment.