Removed unnecessary fields

haug-den-lucas · Apr 13, 2021 · b62c5d2 · b62c5d2
1 parent 7efe144
commit b62c5d2
Showing 1 changed file with 2 additions and 86 deletions.
diff --git a/osmpbf/decode_data.go b/osmpbf/decode_data.go
@@ -304,7 +304,6 @@ func (dec *dataDecoder) scanDenseNodes(data []byte) error {
 func (dec *dataDecoder) extractDenseNodes() error {
 	st := dec.primitiveBlock.GetStringtable().GetS()
 	granularity := int64(dec.primitiveBlock.GetGranularity())
-	dateGranularity := int64(dec.primitiveBlock.GetDateGranularity())
 
 	latOffset := dec.primitiveBlock.GetLatOffset()
 	lonOffset := dec.primitiveBlock.GetLonOffset()
@@ -313,12 +312,10 @@ func (dec *dataDecoder) extractDenseNodes() error {
 
 	nodes := make([]osm.Node, dec.versions.Count(protoscan.WireTypeVarint))
 
-	var id, lat, lon, timestamp, changeset int64
-	var uid, usid int32
+	var id, lat, lon int64
 	var index int
 	for dec.versions.HasNext() {
 		n := &nodes[index]
-		n.Visible = true
 		index++
 
 		// ID
@@ -329,55 +326,6 @@ func (dec *dataDecoder) extractDenseNodes() error {
 		id += v1
 		n.ID = osm.NodeID(id)
 
-		// Version
-		v2, err := dec.versions.Int32()
-		if err != nil {
-			return err
-		}
-		n.Version = int(v2)
-
-		// Timestamp
-		v3, err := dec.timestamps.Sint64()
-		if err != nil {
-			return err
-		}
-		timestamp += v3
-		millisec := time.Duration(timestamp*dateGranularity) * time.Millisecond
-		n.Timestamp = time.Unix(0, millisec.Nanoseconds()).UTC()
-
-		// Changeset
-		v4, err := dec.changesets.Sint64()
-		if err != nil {
-			return err
-		}
-		changeset += v4
-		n.ChangesetID = osm.ChangesetID(changeset)
-
-		// uid
-		v5, err := dec.uids.Sint32()
-		if err != nil {
-			return err
-		}
-		uid += v5
-		n.UserID = osm.UserID(uid)
-
-		// usid
-		v6, err := dec.usids.Sint32()
-		if err != nil {
-			return err
-		}
-		usid += v6
-		n.User = st[usid]
-
-		// Visible
-		if dec.visibles != nil {
-			v7, err := dec.visibles.Bool()
-			if err != nil {
-				return err
-			}
-			n.Visible = v7
-		}
-
 		// lat
 		v8, err := dec.lats.Sint64()
 		if err != nil {
@@ -425,14 +373,13 @@ func (dec *dataDecoder) extractDenseNodes() error {
 func (dec *dataDecoder) scanWays(data []byte) error {
 	st := dec.primitiveBlock.GetStringtable().GetS()
 	granularity := int64(dec.primitiveBlock.GetGranularity())
-	dateGranularity := int64(dec.primitiveBlock.GetDateGranularity())
 
 	latOffset := dec.primitiveBlock.GetLatOffset()
 	lonOffset := dec.primitiveBlock.GetLonOffset()
 
 	msg := protoscan.New(data)
 
-	way := &osm.Way{Visible: true}
+	way := &osm.Way{}
 	var foundKeys, foundVals bool
 	for msg.Next() {
 		var i64 int64
@@ -463,37 +410,6 @@ func (dec *dataDecoder) scanWays(data []byte) error {
 						return err
 					}
 					way.Version = int(v)
-				case 2:
-					v, err := info.Int64()
-					if err != nil {
-						return err
-					}
-					millisec := time.Duration(v*dateGranularity) * time.Millisecond
-					way.Timestamp = time.Unix(0, millisec.Nanoseconds()).UTC()
-				case 3:
-					v, err := info.Int64()
-					if err != nil {
-						return err
-					}
-					way.ChangesetID = osm.ChangesetID(v)
-				case 4:
-					v, err := info.Int32()
-					if err != nil {
-						return err
-					}
-					way.UserID = osm.UserID(v)
-				case 5:
-					v, err := info.Uint32()
-					if err != nil {
-						return err
-					}
-					way.User = st[v]
-				case 6:
-					v, err := info.Bool()
-					if err != nil {
-						return err
-					}
-					way.Visible = v
 				default:
 					info.Skip()
 				}