Skip to content

use replace feature in go.mod instead #4

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

Merged
merged 2 commits into from
Aug 8, 2023
Merged

use replace feature in go.mod instead #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c39143
replace!
dschep Aug 8, 2023
8624a11
Revert "repo name"
dschep Aug 8, 2023
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
4 changes: 2 additions & 2 deletions annotate/change.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package annotate
import (
"context"

"github.com/onXmaps/osm"
"github.com/onXmaps/osm/annotate/internal/core"
"github.com/paulmach/osm"
"github.com/paulmach/osm/annotate/internal/core"
)

// Change will annotate a change into a diff. It will use the
Expand Down
2 changes: 1 addition & 1 deletion annotate/change_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

func TestChange_create(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions annotate/datasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ package annotate
import (
"context"

"github.com/onXmaps/osm"
"github.com/onXmaps/osm/annotate/internal/core"
"github.com/onXmaps/osm/annotate/shared"
"github.com/paulmach/osm"
"github.com/paulmach/osm/annotate/internal/core"
"github.com/paulmach/osm/annotate/shared"

"github.com/paulmach/orb"
"github.com/paulmach/orb/planar"
Expand Down
2 changes: 1 addition & 1 deletion annotate/edgecases_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"
"time"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

func TestEdgeCase_childCreatedAfterParent(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions annotate/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"fmt"
"time"

"github.com/onXmaps/osm"
"github.com/onXmaps/osm/annotate/internal/core"
"github.com/paulmach/osm"
"github.com/paulmach/osm/annotate/internal/core"
)

// NoHistoryError is returned if there is no entry in the history
Expand Down
2 changes: 1 addition & 1 deletion annotate/errors_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"errors"
"testing"

"github.com/onXmaps/osm/annotate/internal/core"
"github.com/paulmach/osm/annotate/internal/core"
)

func TestMapErrors(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions annotate/geo.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (

"github.com/paulmach/orb"
"github.com/paulmach/orb/geo"
"github.com/onXmaps/osm"
"github.com/onXmaps/osm/internal/mputil"
"github.com/paulmach/osm"
"github.com/paulmach/osm/internal/mputil"
)

func wayPointOnSurface(w *osm.Way) orb.Point {
Expand Down
2 changes: 1 addition & 1 deletion annotate/geo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"testing"

"github.com/paulmach/orb"
"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

func TestWayPointOnSurface(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions annotate/internal/core/compute.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"fmt"
"time"

"github.com/onXmaps/osm"
"github.com/onXmaps/osm/annotate/shared"
"github.com/paulmach/osm"
"github.com/paulmach/osm/annotate/shared"
)

// A Datasourcer is something that acts like a datasource allowing us to
Expand Down
4 changes: 2 additions & 2 deletions annotate/internal/core/compute_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ import (
"testing"
"time"

"github.com/onXmaps/osm"
"github.com/onXmaps/osm/annotate/shared"
"github.com/paulmach/osm"
"github.com/paulmach/osm/annotate/shared"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion annotate/internal/core/datasourcer_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"errors"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

var _ Datasourcer = &TestDS{}
Expand Down
2 changes: 1 addition & 1 deletion annotate/internal/core/errors.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

// NoHistoryError is returned if there is no entry in the history
Expand Down
4 changes: 2 additions & 2 deletions annotate/internal/core/types.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package core
import (
"time"

"github.com/onXmaps/osm"
"github.com/onXmaps/osm/annotate/shared"
"github.com/paulmach/osm"
"github.com/paulmach/osm/annotate/shared"
)

// A Parent is something that holds children. ie. ways have nodes as children
Expand Down
4 changes: 2 additions & 2 deletions annotate/internal/core/types_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"testing"
"time"

"github.com/onXmaps/osm"
"github.com/onXmaps/osm/annotate/shared"
"github.com/paulmach/osm"
"github.com/paulmach/osm/annotate/shared"
)

type findVisibleTestCase struct {
Expand Down
4 changes: 2 additions & 2 deletions annotate/options.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package annotate
import (
"time"

"github.com/onXmaps/osm"
"github.com/onXmaps/osm/annotate/internal/core"
"github.com/paulmach/osm"
"github.com/paulmach/osm/annotate/internal/core"
)

// Option is a parameter that can be used for annotating.
Expand Down
2 changes: 1 addition & 1 deletion annotate/order.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"sync"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

// RelationHistoryDatasourcer is an more strict interface for when we only need the relation history.
Expand Down
2 changes: 1 addition & 1 deletion annotate/order_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"testing"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

func TestChildFirstOrdering(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions annotate/relation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"time"

"github.com/onXmaps/osm"
"github.com/onXmaps/osm/annotate/internal/core"
"github.com/onXmaps/osm/annotate/shared"
"github.com/paulmach/osm"
"github.com/paulmach/osm/annotate/internal/core"
"github.com/paulmach/osm/annotate/shared"
)

// HistoryAsChildrenDatasourcer is an advanced data source that
Expand Down
2 changes: 1 addition & 1 deletion annotate/relation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"time"

"github.com/paulmach/orb"
"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

func TestRelation(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion annotate/shared/child.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ package shared
import (
"time"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

// A Child represents a node, way or relation that is a dependent for
Expand Down
6 changes: 3 additions & 3 deletions annotate/way.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ import (
"context"
"time"

"github.com/onXmaps/osm"
"github.com/onXmaps/osm/annotate/internal/core"
"github.com/onXmaps/osm/annotate/shared"
"github.com/paulmach/osm"
"github.com/paulmach/osm/annotate/internal/core"
"github.com/paulmach/osm/annotate/shared"
)

// NodeHistoryDatasourcer is an more strict interface for when we only need node history.
Expand Down
2 changes: 1 addition & 1 deletion annotate/way_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"reflect"
"testing"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

func TestWays(t *testing.T) {
Expand Down
6 changes: 5 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
module github.com/onXmaps/osm
module github.com/paulmach/osm

go 1.13

replace (
github.com/paulmach/osm => github.com/onXmaps/osm v0.0.0
)

require (
github.com/datadog/czlib v0.0.0-20160811164712-4bc9a24e37f2
github.com/paulmach/orb v0.1.3
Expand Down
2 changes: 1 addition & 1 deletion internal/mputil/mputil.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"time"

"github.com/paulmach/orb"
"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

// Segment is a section of a multipolygon with some extra information
Expand Down
2 changes: 1 addition & 1 deletion internal/mputil/mputil_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"time"

"github.com/paulmach/orb"
"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

func TestMultiSegment_LineString(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions json.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
//
// import (
// jsoniter "github.com/json-iterator/go"
// "github.com/onXmaps/osm"
// "github.com/paulmach/osm"
// )
//
// var c = jsoniter.Config{
Expand All @@ -36,7 +36,7 @@ var CustomJSONMarshaler interface {
//
// import (
// jsoniter "github.com/json-iterator/go"
// "github.com/onXmaps/osm"
// "github.com/paulmach/osm"
// )
//
// var c = jsoniter.Config{
Expand Down
2 changes: 1 addition & 1 deletion osmapi/changeset.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

// Changeset returns a given changeset from the osm rest api.
Expand Down
2 changes: 1 addition & 1 deletion osmapi/datasource.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"net/http"
"time"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

// BaseURL defines the api host. This can be change to hit
Expand Down
2 changes: 1 addition & 1 deletion osmapi/live_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"os"
"testing"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"

"golang.org/x/time/rate"
)
Expand Down
2 changes: 1 addition & 1 deletion osmapi/map.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

// Map returns the latest elements in the given bounding box.
Expand Down
2 changes: 1 addition & 1 deletion osmapi/map_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

func TestMap_urls(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion osmapi/node.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strconv"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

// Node returns the latest version of the node from the osm rest api.
Expand Down
2 changes: 1 addition & 1 deletion osmapi/node_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

func TestNode_urls(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion osmapi/note.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import (
"net/url"
"strings"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

// Note returns the note from the osm rest api.
Expand Down
2 changes: 1 addition & 1 deletion osmapi/note_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

func TestNote_urls(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion osmapi/relation.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strconv"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

// Relation returns the latest version of the relation from the osm rest api.
Expand Down
2 changes: 1 addition & 1 deletion osmapi/relation_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"testing"
"time"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

func TestRelation_urls(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion osmapi/user.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"context"
"fmt"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

// User returns the user from the osm rest api.
Expand Down
2 changes: 1 addition & 1 deletion osmapi/way.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"strconv"

"github.com/onXmaps/osm"
"github.com/paulmach/osm"
)

// Way returns the latest version of the way from the osm rest api.
Expand Down
Loading