paulmach · dschep · Jan 18, 2023 · Jan 18, 2023 · Jul 17, 2023 · Jul 17, 2023
diff --git a/annotate/change.go b/annotate/change.go
@@ -3,8 +3,8 @@ package annotate
 import (
 	"context"
 
-	"github.com/paulmach/osm"
-	"github.com/paulmach/osm/annotate/internal/core"
+	"github.com/onXmaps/osm"
+	"github.com/onXmaps/osm/annotate/internal/core"
 )
 
 // Change will annotate a change into a diff. It will use the

diff --git a/annotate/change_test.go b/annotate/change_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 )
 
 func TestChange_create(t *testing.T) {

diff --git a/annotate/datasource.go b/annotate/datasource.go
@@ -3,9 +3,9 @@ package annotate
 import (
 	"context"
 
-	"github.com/paulmach/osm"
-	"github.com/paulmach/osm/annotate/internal/core"
-	"github.com/paulmach/osm/annotate/shared"
+	"github.com/onXmaps/osm"
+	"github.com/onXmaps/osm/annotate/internal/core"
+	"github.com/onXmaps/osm/annotate/shared"
 
 	"github.com/paulmach/orb"
 	"github.com/paulmach/orb/planar"

diff --git a/annotate/edgecases_test.go b/annotate/edgecases_test.go
@@ -5,7 +5,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 )
 
 func TestEdgeCase_childCreatedAfterParent(t *testing.T) {

diff --git a/annotate/errors.go b/annotate/errors.go
@@ -4,8 +4,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/paulmach/osm"
-	"github.com/paulmach/osm/annotate/internal/core"
+	"github.com/onXmaps/osm"
+	"github.com/onXmaps/osm/annotate/internal/core"
 )
 
 // NoHistoryError is returned if there is no entry in the history

diff --git a/annotate/errors_test.go b/annotate/errors_test.go
@@ -4,7 +4,7 @@ import (
 	"errors"
 	"testing"
 
-	"github.com/paulmach/osm/annotate/internal/core"
+	"github.com/onXmaps/osm/annotate/internal/core"
 )
 
 func TestMapErrors(t *testing.T) {

diff --git a/annotate/geo.go b/annotate/geo.go
@@ -4,10 +4,10 @@ import (
 	"math"
 	"time"
 
+	"github.com/onXmaps/osm"
+	"github.com/onXmaps/osm/internal/mputil"
 	"github.com/paulmach/orb"
 	"github.com/paulmach/orb/geo"
-	"github.com/paulmach/osm"
-	"github.com/paulmach/osm/internal/mputil"
 )
 
 func wayPointOnSurface(w *osm.Way) orb.Point {
@@ -52,7 +52,7 @@ func wayCentroid(w *osm.Way) orb.Point {
 	return point
 }
 
-// orientation will annotate the orientation of multipolygon relation members.
+// orientation will annotate the the orientation of multipolygon relation members.
 // This makes it possible to reconstruct relations with partial data in the right direction.
 // Return value indicates if the result is 'tainted', e.g. not all way members were present.
 func orientation(members osm.Members, ways map[osm.WayID]*osm.Way, at time.Time) bool {

diff --git a/annotate/geo_test.go b/annotate/geo_test.go
@@ -4,8 +4,8 @@ import (
 	"encoding/xml"
 	"testing"
 
+	"github.com/onXmaps/osm"
 	"github.com/paulmach/orb"
-	"github.com/paulmach/osm"
 )
 
 func TestWayPointOnSurface(t *testing.T) {

diff --git a/annotate/internal/core/compute.go b/annotate/internal/core/compute.go
@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/paulmach/osm"
-	"github.com/paulmach/osm/annotate/shared"
+	"github.com/onXmaps/osm"
+	"github.com/onXmaps/osm/annotate/shared"
 )
 
 // A Datasourcer is something that acts like a datasource allowing us to

diff --git a/annotate/internal/core/compute_test.go b/annotate/internal/core/compute_test.go
@@ -7,8 +7,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/paulmach/osm"
-	"github.com/paulmach/osm/annotate/shared"
+	"github.com/onXmaps/osm"
+	"github.com/onXmaps/osm/annotate/shared"
 )
 
 var (

diff --git a/annotate/internal/core/datasourcer_test.go b/annotate/internal/core/datasourcer_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"errors"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 )
 
 var _ Datasourcer = &TestDS{}

diff --git a/annotate/internal/core/errors.go b/annotate/internal/core/errors.go
@@ -4,7 +4,7 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 )
 
 // NoHistoryError is returned if there is no entry in the history

diff --git a/annotate/internal/core/types.go b/annotate/internal/core/types.go
@@ -3,8 +3,8 @@ package core
 import (
 	"time"
 
-	"github.com/paulmach/osm"
-	"github.com/paulmach/osm/annotate/shared"
+	"github.com/onXmaps/osm"
+	"github.com/onXmaps/osm/annotate/shared"
 )
 
 // A Parent is something that holds children. ie. ways have nodes as children

diff --git a/annotate/internal/core/types_test.go b/annotate/internal/core/types_test.go
@@ -4,8 +4,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/paulmach/osm"
-	"github.com/paulmach/osm/annotate/shared"
+	"github.com/onXmaps/osm"
+	"github.com/onXmaps/osm/annotate/shared"
 )
 
 type findVisibleTestCase struct {

diff --git a/annotate/options.go b/annotate/options.go
@@ -3,8 +3,8 @@ package annotate
 import (
 	"time"
 
-	"github.com/paulmach/osm"
-	"github.com/paulmach/osm/annotate/internal/core"
+	"github.com/onXmaps/osm"
+	"github.com/onXmaps/osm/annotate/internal/core"
 )
 
 // Option is a parameter that can be used for annotating.

diff --git a/annotate/order.go b/annotate/order.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"sync"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 )
 
 // RelationHistoryDatasourcer is an more strict interface for when we only need the relation history.

diff --git a/annotate/order_test.go b/annotate/order_test.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"testing"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 )
 
 func TestChildFirstOrdering(t *testing.T) {

diff --git a/annotate/relation.go b/annotate/relation.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/paulmach/osm"
-	"github.com/paulmach/osm/annotate/internal/core"
-	"github.com/paulmach/osm/annotate/shared"
+	"github.com/onXmaps/osm"
+	"github.com/onXmaps/osm/annotate/internal/core"
+	"github.com/onXmaps/osm/annotate/shared"
 )
 
 // HistoryAsChildrenDatasourcer is an advanced data source that

diff --git a/annotate/relation_test.go b/annotate/relation_test.go
@@ -9,8 +9,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/onXmaps/osm"
 	"github.com/paulmach/orb"
-	"github.com/paulmach/osm"
 )
 
 func TestRelation(t *testing.T) {

diff --git a/annotate/shared/child.go b/annotate/shared/child.go
@@ -5,7 +5,7 @@ package shared
 import (
 	"time"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 )
 
 // A Child represents a node, way or relation that is a dependent for

diff --git a/annotate/way.go b/annotate/way.go
@@ -4,9 +4,9 @@ import (
 	"context"
 	"time"
 
-	"github.com/paulmach/osm"
-	"github.com/paulmach/osm/annotate/internal/core"
-	"github.com/paulmach/osm/annotate/shared"
+	"github.com/onXmaps/osm"
+	"github.com/onXmaps/osm/annotate/internal/core"
+	"github.com/onXmaps/osm/annotate/shared"
 )
 
 // NodeHistoryDatasourcer is an more strict interface for when we only need node history.

diff --git a/annotate/way_test.go b/annotate/way_test.go
@@ -4,11 +4,12 @@ import (
 	"context"
 	"encoding/xml"
 	"fmt"
+	"io/ioutil"
 	"os"
 	"reflect"
 	"testing"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 )
 
 func TestWays(t *testing.T) {
@@ -131,7 +132,7 @@ func BenchmarkWays(b *testing.B) {
 }
 
 func loadTestdata(tb testing.TB, filename string) *osm.OSM {
-	data, err := os.ReadFile(filename)
+	data, err := ioutil.ReadFile(filename)
 	if err != nil {
 		tb.Fatalf("unable to open file: %v", err)
 	}

diff --git a/change_test.go b/change_test.go
@@ -175,7 +175,7 @@ func TestChange_MarshalXML(t *testing.T) {
 		t.Fatalf("xml marshal error: %v", err)
 	}
 
-	expected := `<osmChange version="0.6" generator="osm-go" copyright="copyright1" attribution="attribution1" license="license1"><create><node id="123" lat="0" lon="0" user="" uid="0" visible="false" version="0" changeset="0" timestamp="0001-01-01T00:00:00Z"></node></create></osmChange>`
+	expected := `<osmChange version="0.6" generator="osm-go" copyright="copyright1" attribution="attribution1" license="license1"><create><node id="123" lat="0" lon="0" user="" uid="0" visible="false" changeset="0" timestamp="0001-01-01T00:00:00Z"></node></create></osmChange>`
 	if !bytes.Equal(data, []byte(expected)) {
 		t.Errorf("incorrect marshal, got: %s", string(data))
 	}

diff --git a/go.mod b/go.mod
@@ -1,4 +1,4 @@
-module github.com/paulmach/osm
+module github.com/onXmaps/osm
 
 go 1.16
 

diff --git a/internal/mputil/mputil.go b/internal/mputil/mputil.go
@@ -3,8 +3,8 @@ package mputil
 import (
 	"time"
 
+	"github.com/onXmaps/osm"
 	"github.com/paulmach/orb"
-	"github.com/paulmach/osm"
 )
 
 // Segment is a section of a multipolygon with some extra information

diff --git a/internal/mputil/mputil_test.go b/internal/mputil/mputil_test.go
@@ -5,8 +5,8 @@ import (
 	"testing"
 	"time"
 
+	"github.com/onXmaps/osm"
 	"github.com/paulmach/orb"
-	"github.com/paulmach/osm"
 )
 
 func TestMultiSegment_LineString(t *testing.T) {

diff --git a/json.go b/json.go
@@ -12,7 +12,7 @@ import (
 //
 //	import (
 //	  jsoniter "github.com/json-iterator/go"
-//	  "github.com/paulmach/osm"
+//	  "github.com/onXmaps/osm"
 //	)
 //
 //	var c = jsoniter.Config{
@@ -36,7 +36,7 @@ var CustomJSONMarshaler interface {
 //
 //	import (
 //	  jsoniter "github.com/json-iterator/go"
-//	  "github.com/paulmach/osm"
+//	  "github.com/onXmaps/osm"
 //	)
 //
 //	var c = jsoniter.Config{

diff --git a/node.go b/node.go
@@ -35,8 +35,8 @@ type Node struct {
 	User        string              `xml:"user,attr" json:"user,omitempty"`
 	UserID      UserID              `xml:"uid,attr" json:"uid,omitempty"`
 	Visible     bool                `xml:"visible,attr" json:"visible"`
-	Version     int                 `xml:"version,attr" json:"version,omitempty"`
-	ChangesetID ChangesetID         `xml:"changeset,attr" json:"changeset,omitempty"`
+	Version     int                 `xml:"version,attr,omitempty" json:"version,omitempty"`
+	ChangesetID ChangesetID         `xml:"changeset,attr" json:"changeset"`
 	Timestamp   time.Time           `xml:"timestamp,attr" json:"timestamp"`
 	Tags        Tags                `xml:"tag" json:"tags,omitempty"`
 

diff --git a/node_test.go b/node_test.go
@@ -65,7 +65,7 @@ func TestNode_MarshalJSON(t *testing.T) {
 		t.Fatalf("marshal error: %v", err)
 	}
 
-	if !bytes.Equal(data, []byte(`{"type":"node","id":123,"lat":0,"lon":0,"visible":false,"timestamp":"0001-01-01T00:00:00Z"}`)) {
+	if !bytes.Equal(data, []byte(`{"type":"node","id":123,"lat":0,"lon":0,"visible":false,"changeset":0,"timestamp":"0001-01-01T00:00:00Z"}`)) {
 		t.Errorf("incorrect json: %v", string(data))
 	}
 }
@@ -80,7 +80,7 @@ func TestNode_MarshalXML(t *testing.T) {
 		t.Fatalf("xml marshal error: %v", err)
 	}
 
-	expected := `<node id="123" lat="0" lon="0" user="" uid="0" visible="false" version="0" changeset="0" timestamp="0001-01-01T00:00:00Z"></node>`
+	expected := `<node id="123" lat="0" lon="0" user="" uid="0" visible="false" changeset="0" timestamp="0001-01-01T00:00:00Z"></node>`
 	if !bytes.Equal(data, []byte(expected)) {
 		t.Errorf("incorrect marshal, got: %s", string(data))
 	}

diff --git a/osm_test.go b/osm_test.go
@@ -168,7 +168,7 @@ func TestOSM_MarshalJSON(t *testing.T) {
 		t.Fatalf("marshal error: %v", err)
 	}
 
-	if !bytes.Equal(data, []byte(`{"version":"0.6","generator":"osm-go","elements":[{"type":"node","id":123,"lat":0,"lon":0,"visible":false,"timestamp":"0001-01-01T00:00:00Z"},{"type":"way","id":456,"visible":false,"timestamp":"0001-01-01T00:00:00Z","nodes":[]},{"type":"relation","id":789,"visible":false,"timestamp":"0001-01-01T00:00:00Z","members":[]},{"type":"changeset","id":10,"created_at":"0001-01-01T00:00:00Z","closed_at":"0001-01-01T00:00:00Z","open":false},{"type":"user","id":16,"name":"","img":{"href":""},"changesets":{"count":0},"traces":{"count":0},"home":{"lat":0,"lon":0,"zoom":0},"languages":null,"blocks":{"received":{"count":0,"active":0}},"messages":{"received":{"count":0,"unread":0},"sent":{"count":0}},"created_at":"0001-01-01T00:00:00Z"},{"type":"note","id":15,"lat":0,"lon":0,"date_created":null,"date_closed":null,"comments":null}]}`)) {
+	if !bytes.Equal(data, []byte(`{"version":"0.6","generator":"osm-go","elements":[{"type":"node","id":123,"lat":0,"lon":0,"visible":false,"changeset":0,"timestamp":"0001-01-01T00:00:00Z"},{"type":"way","id":456,"visible":false,"changeset":0,"timestamp":"0001-01-01T00:00:00Z","nodes":[]},{"type":"relation","id":789,"visible":false,"changeset":0,"timestamp":"0001-01-01T00:00:00Z","members":[]},{"type":"changeset","id":10,"created_at":"0001-01-01T00:00:00Z","closed_at":"0001-01-01T00:00:00Z","open":false},{"type":"user","id":16,"name":"","img":{"href":""},"changesets":{"count":0},"traces":{"count":0},"home":{"lat":0,"lon":0,"zoom":0},"languages":null,"blocks":{"received":{"count":0,"active":0}},"messages":{"received":{"count":0,"unread":0},"sent":{"count":0}},"created_at":"0001-01-01T00:00:00Z"},{"type":"note","id":15,"lat":0,"lon":0,"date_created":null,"date_closed":null,"comments":null}]}`)) {
 		t.Errorf("incorrect json: %v", string(data))
 	}
 }
@@ -281,7 +281,7 @@ func TestOSM_MarshalXML(t *testing.T) {
 		t.Fatalf("xml marshal error: %v", err)
 	}
 
-	expected := `<osm version="0.7" generator="osm-go-test" copyright="copyright1" attribution="attribution1" license="license1"><node id="123" lat="0" lon="0" user="" uid="0" visible="false" version="0" changeset="0" timestamp="0001-01-01T00:00:00Z"></node></osm>`
+	expected := `<osm version="0.7" generator="osm-go-test" copyright="copyright1" attribution="attribution1" license="license1"><node id="123" lat="0" lon="0" user="" uid="0" visible="false" changeset="0" timestamp="0001-01-01T00:00:00Z"></node></osm>`
 
 	if !bytes.Equal(data, []byte(expected)) {
 		t.Errorf("incorrect marshal, got: %s", string(data))

diff --git a/osmapi/changeset.go b/osmapi/changeset.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 )
 
 // Changeset returns a given changeset from the osm rest api.

diff --git a/osmapi/datasource.go b/osmapi/datasource.go
@@ -8,7 +8,7 @@ import (
 	"net/http"
 	"time"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 )
 
 // BaseURL defines the api host. This can be change to hit

diff --git a/osmapi/live_test.go b/osmapi/live_test.go
@@ -5,7 +5,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 
 	"golang.org/x/time/rate"
 )

diff --git a/osmapi/map.go b/osmapi/map.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 )
 
 // Map returns the latest elements in the given bounding box.

diff --git a/osmapi/map_test.go b/osmapi/map_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/paulmach/osm"
+	"github.com/onXmaps/osm"
 )
 
 func TestMap_urls(t *testing.T) {
-Original file line number
+Diff line change
@@ Expand Up / @@ -4,7 +4,7 @@ import ( @@
     	"fmt"
     	"time"
-    	"github.com/paulmach/osm"
+    	"github.com/onXmaps/osm"
     )
     // NoHistoryError is returned if there is no entry in the history
@@ Expand Down @@