rebuild .pb.go files

master
Oliver Tonnhofer 2015-05-15 10:47:29 +02:00
parent cd5b89c119
commit 593f252504
4 changed files with 499 additions and 229 deletions

View File

@ -23,7 +23,7 @@ update_version:
revert_version:
@perl -p -i -e 's/buildVersion = ".*"/buildVersion = ""/' cmd/version.go
imposm3: $(GOFILES) $(PROTOFILES)
imposm3: $(PBGOFILES)
$(MAKE) update_version
$(GO) build $(GOLDFLAGS)
$(MAKE) revert_version

View File

@ -2,15 +2,25 @@
// source: cache/binary/messages.proto
// DO NOT EDIT!
/*
Package binary is a generated protocol buffer package.
It is generated from these files:
cache/binary/messages.proto
It has these top-level messages:
Node
Way
Relation
DeltaCoords
*/
package binary
import proto "github.com/golang/protobuf/proto"
import json "encoding/json"
import math "math"
// Reference proto, json, and math imports to suppress error if they are not otherwise used.
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = &json.SyntaxError{}
var _ = math.Inf
type Relation_MemberType int32
@ -40,9 +50,6 @@ func (x Relation_MemberType) Enum() *Relation_MemberType {
func (x Relation_MemberType) String() string {
return proto.EnumName(Relation_MemberType_name, int32(x))
}
func (x Relation_MemberType) MarshalJSON() ([]byte, error) {
return json.Marshal(x.String())
}
func (x *Relation_MemberType) UnmarshalJSON(data []byte) error {
value, err := proto.UnmarshalJSONEnum(Relation_MemberType_value, data, "Relation_MemberType")
if err != nil {

View File

@ -1,62 +1,73 @@
// Code generated by protoc-gen-go.
// source: fileformat.proto
// source: parser/pbf/osmpbf/fileformat.proto
// DO NOT EDIT!
/*
Package osmpbf is a generated protocol buffer package.
It is generated from these files:
parser/pbf/osmpbf/fileformat.proto
It has these top-level messages:
Blob
BlobHeader
*/
package osmpbf
import proto "github.com/golang/protobuf/proto"
import json "encoding/json"
import math "math"
// Reference proto, json, and math imports to suppress error if they are not otherwise used.
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = &json.SyntaxError{}
var _ = math.Inf
type Blob struct {
Raw []byte `protobuf:"bytes,1,opt,name=raw" json:"raw,omitempty"`
RawSize *int32 `protobuf:"varint,2,opt,name=raw_size" json:"raw_size,omitempty"`
ZlibData []byte `protobuf:"bytes,3,opt,name=zlib_data" json:"zlib_data,omitempty"`
LzmaData []byte `protobuf:"bytes,4,opt,name=lzma_data" json:"lzma_data,omitempty"`
Raw []byte `protobuf:"bytes,1,opt,name=raw" json:"raw,omitempty"`
RawSize *int32 `protobuf:"varint,2,opt,name=raw_size" json:"raw_size,omitempty"`
// Possible compressed versions of the data.
ZlibData []byte `protobuf:"bytes,3,opt,name=zlib_data" json:"zlib_data,omitempty"`
// PROPOSED feature for LZMA compressed data. SUPPORT IS NOT REQUIRED.
LzmaData []byte `protobuf:"bytes,4,opt,name=lzma_data" json:"lzma_data,omitempty"`
// Formerly used for bzip2 compressed data. Depreciated in 2010.
OBSOLETEBzip2Data []byte `protobuf:"bytes,5,opt,name=OBSOLETE_bzip2_data" json:"OBSOLETE_bzip2_data,omitempty"`
XXX_unrecognized []byte `json:"-"`
}
func (this *Blob) Reset() { *this = Blob{} }
func (this *Blob) String() string { return proto.CompactTextString(this) }
func (*Blob) ProtoMessage() {}
func (m *Blob) Reset() { *m = Blob{} }
func (m *Blob) String() string { return proto.CompactTextString(m) }
func (*Blob) ProtoMessage() {}
func (this *Blob) GetRaw() []byte {
if this != nil {
return this.Raw
func (m *Blob) GetRaw() []byte {
if m != nil {
return m.Raw
}
return nil
}
func (this *Blob) GetRawSize() int32 {
if this != nil && this.RawSize != nil {
return *this.RawSize
func (m *Blob) GetRawSize() int32 {
if m != nil && m.RawSize != nil {
return *m.RawSize
}
return 0
}
func (this *Blob) GetZlibData() []byte {
if this != nil {
return this.ZlibData
func (m *Blob) GetZlibData() []byte {
if m != nil {
return m.ZlibData
}
return nil
}
func (this *Blob) GetLzmaData() []byte {
if this != nil {
return this.LzmaData
func (m *Blob) GetLzmaData() []byte {
if m != nil {
return m.LzmaData
}
return nil
}
func (this *Blob) GetOBSOLETEBzip2Data() []byte {
if this != nil {
return this.OBSOLETEBzip2Data
func (m *Blob) GetOBSOLETEBzip2Data() []byte {
if m != nil {
return m.OBSOLETEBzip2Data
}
return nil
}
@ -68,27 +79,27 @@ type BlobHeader struct {
XXX_unrecognized []byte `json:"-"`
}
func (this *BlobHeader) Reset() { *this = BlobHeader{} }
func (this *BlobHeader) String() string { return proto.CompactTextString(this) }
func (*BlobHeader) ProtoMessage() {}
func (m *BlobHeader) Reset() { *m = BlobHeader{} }
func (m *BlobHeader) String() string { return proto.CompactTextString(m) }
func (*BlobHeader) ProtoMessage() {}
func (this *BlobHeader) GetType() string {
if this != nil && this.Type != nil {
return *this.Type
func (m *BlobHeader) GetType() string {
if m != nil && m.Type != nil {
return *m.Type
}
return ""
}
func (this *BlobHeader) GetIndexdata() []byte {
if this != nil {
return this.Indexdata
func (m *BlobHeader) GetIndexdata() []byte {
if m != nil {
return m.Indexdata
}
return nil
}
func (this *BlobHeader) GetDatasize() int32 {
if this != nil && this.Datasize != nil {
return *this.Datasize
func (m *BlobHeader) GetDatasize() int32 {
if m != nil && m.Datasize != nil {
return *m.Datasize
}
return 0
}

View File

@ -1,16 +1,34 @@
// Code generated by protoc-gen-go.
// source: osmformat.proto
// source: parser/pbf/osmpbf/osmformat.proto
// DO NOT EDIT!
/*
Package osmpbf is a generated protocol buffer package.
It is generated from these files:
parser/pbf/osmpbf/osmformat.proto
It has these top-level messages:
HeaderBlock
HeaderBBox
PrimitiveBlock
PrimitiveGroup
StringTable
Info
DenseInfo
ChangeSet
Node
DenseNodes
Way
Relation
*/
package osmpbf
import proto "github.com/golang/protobuf/proto"
import json "encoding/json"
import math "math"
// Reference proto, json, and math imports to suppress error if they are not otherwise used.
// Reference imports to suppress errors if they are not otherwise used.
var _ = proto.Marshal
var _ = &json.SyntaxError{}
var _ = math.Inf
type Relation_MemberType int32
@ -40,9 +58,6 @@ func (x Relation_MemberType) Enum() *Relation_MemberType {
func (x Relation_MemberType) String() string {
return proto.EnumName(Relation_MemberType_name, int32(x))
}
func (x Relation_MemberType) MarshalJSON() ([]byte, error) {
return json.Marshal(x.String())
}
func (x *Relation_MemberType) UnmarshalJSON(data []byte) error {
value, err := proto.UnmarshalJSONEnum(Relation_MemberType_value, data, "Relation_MemberType")
if err != nil {
@ -53,59 +68,79 @@ func (x *Relation_MemberType) UnmarshalJSON(data []byte) error {
}
type HeaderBlock struct {
Bbox *HeaderBBox `protobuf:"bytes,1,opt,name=bbox" json:"bbox,omitempty"`
RequiredFeatures []string `protobuf:"bytes,4,rep,name=required_features" json:"required_features,omitempty"`
OptionalFeatures []string `protobuf:"bytes,5,rep,name=optional_features" json:"optional_features,omitempty"`
Writingprogram *string `protobuf:"bytes,16,opt,name=writingprogram" json:"writingprogram,omitempty"`
Source *string `protobuf:"bytes,17,opt,name=source" json:"source,omitempty"`
OsmosisReplicationTimestamp *int64 `protobuf:"varint,32,opt,name=osmosis_replication_timestamp" json:"osmosis_replication_timestamp,omitempty"`
OsmosisReplicationSequenceNumber *int64 `protobuf:"varint,33,opt,name=osmosis_replication_sequence_number" json:"osmosis_replication_sequence_number,omitempty"`
OsmosisReplicationBaseUrl *string `protobuf:"bytes,34,opt,name=osmosis_replication_base_url" json:"osmosis_replication_base_url,omitempty"`
XXX_unrecognized []byte `json:"-"`
Bbox *HeaderBBox `protobuf:"bytes,1,opt,name=bbox" json:"bbox,omitempty"`
// Additional tags to aid in parsing this dataset
RequiredFeatures []string `protobuf:"bytes,4,rep,name=required_features" json:"required_features,omitempty"`
OptionalFeatures []string `protobuf:"bytes,5,rep,name=optional_features" json:"optional_features,omitempty"`
Writingprogram *string `protobuf:"bytes,16,opt,name=writingprogram" json:"writingprogram,omitempty"`
Source *string `protobuf:"bytes,17,opt,name=source" json:"source,omitempty"`
// replication timestamp, expressed in seconds since the epoch,
// otherwise the same value as in the "timestamp=..." field
// in the state.txt file used by Osmosis
OsmosisReplicationTimestamp *int64 `protobuf:"varint,32,opt,name=osmosis_replication_timestamp" json:"osmosis_replication_timestamp,omitempty"`
// replication sequence number (sequenceNumber in state.txt)
OsmosisReplicationSequenceNumber *int64 `protobuf:"varint,33,opt,name=osmosis_replication_sequence_number" json:"osmosis_replication_sequence_number,omitempty"`
// replication base URL (from Osmosis' configuration.txt file)
OsmosisReplicationBaseUrl *string `protobuf:"bytes,34,opt,name=osmosis_replication_base_url" json:"osmosis_replication_base_url,omitempty"`
XXX_unrecognized []byte `json:"-"`
}
func (this *HeaderBlock) Reset() { *this = HeaderBlock{} }
func (this *HeaderBlock) String() string { return proto.CompactTextString(this) }
func (*HeaderBlock) ProtoMessage() {}
func (m *HeaderBlock) Reset() { *m = HeaderBlock{} }
func (m *HeaderBlock) String() string { return proto.CompactTextString(m) }
func (*HeaderBlock) ProtoMessage() {}
func (this *HeaderBlock) GetBbox() *HeaderBBox {
if this != nil {
return this.Bbox
func (m *HeaderBlock) GetBbox() *HeaderBBox {
if m != nil {
return m.Bbox
}
return nil
}
func (this *HeaderBlock) GetWritingprogram() string {
if this != nil && this.Writingprogram != nil {
return *this.Writingprogram
func (m *HeaderBlock) GetRequiredFeatures() []string {
if m != nil {
return m.RequiredFeatures
}
return nil
}
func (m *HeaderBlock) GetOptionalFeatures() []string {
if m != nil {
return m.OptionalFeatures
}
return nil
}
func (m *HeaderBlock) GetWritingprogram() string {
if m != nil && m.Writingprogram != nil {
return *m.Writingprogram
}
return ""
}
func (this *HeaderBlock) GetSource() string {
if this != nil && this.Source != nil {
return *this.Source
func (m *HeaderBlock) GetSource() string {
if m != nil && m.Source != nil {
return *m.Source
}
return ""
}
func (this *HeaderBlock) GetOsmosisReplicationTimestamp() int64 {
if this != nil && this.OsmosisReplicationTimestamp != nil {
return *this.OsmosisReplicationTimestamp
func (m *HeaderBlock) GetOsmosisReplicationTimestamp() int64 {
if m != nil && m.OsmosisReplicationTimestamp != nil {
return *m.OsmosisReplicationTimestamp
}
return 0
}
func (this *HeaderBlock) GetOsmosisReplicationSequenceNumber() int64 {
if this != nil && this.OsmosisReplicationSequenceNumber != nil {
return *this.OsmosisReplicationSequenceNumber
func (m *HeaderBlock) GetOsmosisReplicationSequenceNumber() int64 {
if m != nil && m.OsmosisReplicationSequenceNumber != nil {
return *m.OsmosisReplicationSequenceNumber
}
return 0
}
func (this *HeaderBlock) GetOsmosisReplicationBaseUrl() string {
if this != nil && this.OsmosisReplicationBaseUrl != nil {
return *this.OsmosisReplicationBaseUrl
func (m *HeaderBlock) GetOsmosisReplicationBaseUrl() string {
if m != nil && m.OsmosisReplicationBaseUrl != nil {
return *m.OsmosisReplicationBaseUrl
}
return ""
}
@ -118,92 +153,103 @@ type HeaderBBox struct {
XXX_unrecognized []byte `json:"-"`
}
func (this *HeaderBBox) Reset() { *this = HeaderBBox{} }
func (this *HeaderBBox) String() string { return proto.CompactTextString(this) }
func (*HeaderBBox) ProtoMessage() {}
func (m *HeaderBBox) Reset() { *m = HeaderBBox{} }
func (m *HeaderBBox) String() string { return proto.CompactTextString(m) }
func (*HeaderBBox) ProtoMessage() {}
func (this *HeaderBBox) GetLeft() int64 {
if this != nil && this.Left != nil {
return *this.Left
func (m *HeaderBBox) GetLeft() int64 {
if m != nil && m.Left != nil {
return *m.Left
}
return 0
}
func (this *HeaderBBox) GetRight() int64 {
if this != nil && this.Right != nil {
return *this.Right
func (m *HeaderBBox) GetRight() int64 {
if m != nil && m.Right != nil {
return *m.Right
}
return 0
}
func (this *HeaderBBox) GetTop() int64 {
if this != nil && this.Top != nil {
return *this.Top
func (m *HeaderBBox) GetTop() int64 {
if m != nil && m.Top != nil {
return *m.Top
}
return 0
}
func (this *HeaderBBox) GetBottom() int64 {
if this != nil && this.Bottom != nil {
return *this.Bottom
func (m *HeaderBBox) GetBottom() int64 {
if m != nil && m.Bottom != nil {
return *m.Bottom
}
return 0
}
type PrimitiveBlock struct {
Stringtable *StringTable `protobuf:"bytes,1,req,name=stringtable" json:"stringtable,omitempty"`
Primitivegroup []*PrimitiveGroup `protobuf:"bytes,2,rep,name=primitivegroup" json:"primitivegroup,omitempty"`
Granularity *int32 `protobuf:"varint,17,opt,name=granularity,def=100" json:"granularity,omitempty"`
LatOffset *int64 `protobuf:"varint,19,opt,name=lat_offset,def=0" json:"lat_offset,omitempty"`
LonOffset *int64 `protobuf:"varint,20,opt,name=lon_offset,def=0" json:"lon_offset,omitempty"`
DateGranularity *int32 `protobuf:"varint,18,opt,name=date_granularity,def=1000" json:"date_granularity,omitempty"`
XXX_unrecognized []byte `json:"-"`
Stringtable *StringTable `protobuf:"bytes,1,req,name=stringtable" json:"stringtable,omitempty"`
Primitivegroup []*PrimitiveGroup `protobuf:"bytes,2,rep,name=primitivegroup" json:"primitivegroup,omitempty"`
// Granularity, units of nanodegrees, used to store coordinates in this block
Granularity *int32 `protobuf:"varint,17,opt,name=granularity,def=100" json:"granularity,omitempty"`
// Offset value between the output coordinates coordinates and the granularity grid in unites of nanodegrees.
LatOffset *int64 `protobuf:"varint,19,opt,name=lat_offset,def=0" json:"lat_offset,omitempty"`
LonOffset *int64 `protobuf:"varint,20,opt,name=lon_offset,def=0" json:"lon_offset,omitempty"`
// Granularity of dates, normally represented in units of milliseconds since the 1970 epoch.
DateGranularity *int32 `protobuf:"varint,18,opt,name=date_granularity,def=1000" json:"date_granularity,omitempty"`
XXX_unrecognized []byte `json:"-"`
}
func (this *PrimitiveBlock) Reset() { *this = PrimitiveBlock{} }
func (this *PrimitiveBlock) String() string { return proto.CompactTextString(this) }
func (*PrimitiveBlock) ProtoMessage() {}
func (m *PrimitiveBlock) Reset() { *m = PrimitiveBlock{} }
func (m *PrimitiveBlock) String() string { return proto.CompactTextString(m) }
func (*PrimitiveBlock) ProtoMessage() {}
const Default_PrimitiveBlock_Granularity int32 = 100
const Default_PrimitiveBlock_LatOffset int64 = 0
const Default_PrimitiveBlock_LonOffset int64 = 0
const Default_PrimitiveBlock_DateGranularity int32 = 1000
func (this *PrimitiveBlock) GetStringtable() *StringTable {
if this != nil {
return this.Stringtable
func (m *PrimitiveBlock) GetStringtable() *StringTable {
if m != nil {
return m.Stringtable
}
return nil
}
func (this *PrimitiveBlock) GetGranularity() int32 {
if this != nil && this.Granularity != nil {
return *this.Granularity
func (m *PrimitiveBlock) GetPrimitivegroup() []*PrimitiveGroup {
if m != nil {
return m.Primitivegroup
}
return nil
}
func (m *PrimitiveBlock) GetGranularity() int32 {
if m != nil && m.Granularity != nil {
return *m.Granularity
}
return Default_PrimitiveBlock_Granularity
}
func (this *PrimitiveBlock) GetLatOffset() int64 {
if this != nil && this.LatOffset != nil {
return *this.LatOffset
func (m *PrimitiveBlock) GetLatOffset() int64 {
if m != nil && m.LatOffset != nil {
return *m.LatOffset
}
return Default_PrimitiveBlock_LatOffset
}
func (this *PrimitiveBlock) GetLonOffset() int64 {
if this != nil && this.LonOffset != nil {
return *this.LonOffset
func (m *PrimitiveBlock) GetLonOffset() int64 {
if m != nil && m.LonOffset != nil {
return *m.LonOffset
}
return Default_PrimitiveBlock_LonOffset
}
func (this *PrimitiveBlock) GetDateGranularity() int32 {
if this != nil && this.DateGranularity != nil {
return *this.DateGranularity
func (m *PrimitiveBlock) GetDateGranularity() int32 {
if m != nil && m.DateGranularity != nil {
return *m.DateGranularity
}
return Default_PrimitiveBlock_DateGranularity
}
// Group of OSMPrimitives. All primitives in a group must be the same type.
type PrimitiveGroup struct {
Nodes []*Node `protobuf:"bytes,1,rep,name=nodes" json:"nodes,omitempty"`
Dense *DenseNodes `protobuf:"bytes,2,opt,name=dense" json:"dense,omitempty"`
@ -213,116 +259,219 @@ type PrimitiveGroup struct {
XXX_unrecognized []byte `json:"-"`
}
func (this *PrimitiveGroup) Reset() { *this = PrimitiveGroup{} }
func (this *PrimitiveGroup) String() string { return proto.CompactTextString(this) }
func (*PrimitiveGroup) ProtoMessage() {}
func (m *PrimitiveGroup) Reset() { *m = PrimitiveGroup{} }
func (m *PrimitiveGroup) String() string { return proto.CompactTextString(m) }
func (*PrimitiveGroup) ProtoMessage() {}
func (this *PrimitiveGroup) GetDense() *DenseNodes {
if this != nil {
return this.Dense
func (m *PrimitiveGroup) GetNodes() []*Node {
if m != nil {
return m.Nodes
}
return nil
}
func (m *PrimitiveGroup) GetDense() *DenseNodes {
if m != nil {
return m.Dense
}
return nil
}
func (m *PrimitiveGroup) GetWays() []*Way {
if m != nil {
return m.Ways
}
return nil
}
func (m *PrimitiveGroup) GetRelations() []*Relation {
if m != nil {
return m.Relations
}
return nil
}
func (m *PrimitiveGroup) GetChangesets() []*ChangeSet {
if m != nil {
return m.Changesets
}
return nil
}
// * String table, contains the common strings in each block.
//
// Note that we reserve index '0' as a delimiter, so the entry at that
// index in the table is ALWAYS blank and unused.
//
type StringTable struct {
S [][]byte `protobuf:"bytes,1,rep,name=s" json:"s,omitempty"`
XXX_unrecognized []byte `json:"-"`
}
func (this *StringTable) Reset() { *this = StringTable{} }
func (this *StringTable) String() string { return proto.CompactTextString(this) }
func (*StringTable) ProtoMessage() {}
func (m *StringTable) Reset() { *m = StringTable{} }
func (m *StringTable) String() string { return proto.CompactTextString(m) }
func (*StringTable) ProtoMessage() {}
type Info struct {
Version *int32 `protobuf:"varint,1,opt,name=version,def=-1" json:"version,omitempty"`
Timestamp *int64 `protobuf:"varint,2,opt,name=timestamp" json:"timestamp,omitempty"`
Changeset *int64 `protobuf:"varint,3,opt,name=changeset" json:"changeset,omitempty"`
Uid *int32 `protobuf:"varint,4,opt,name=uid" json:"uid,omitempty"`
UserSid *uint32 `protobuf:"varint,5,opt,name=user_sid" json:"user_sid,omitempty"`
Visible *bool `protobuf:"varint,6,opt,name=visible" json:"visible,omitempty"`
XXX_unrecognized []byte `json:"-"`
func (m *StringTable) GetS() [][]byte {
if m != nil {
return m.S
}
return nil
}
func (this *Info) Reset() { *this = Info{} }
func (this *Info) String() string { return proto.CompactTextString(this) }
func (*Info) ProtoMessage() {}
// Optional metadata that may be included into each primitive.
type Info struct {
Version *int32 `protobuf:"varint,1,opt,name=version,def=-1" json:"version,omitempty"`
Timestamp *int64 `protobuf:"varint,2,opt,name=timestamp" json:"timestamp,omitempty"`
Changeset *int64 `protobuf:"varint,3,opt,name=changeset" json:"changeset,omitempty"`
Uid *int32 `protobuf:"varint,4,opt,name=uid" json:"uid,omitempty"`
UserSid *uint32 `protobuf:"varint,5,opt,name=user_sid" json:"user_sid,omitempty"`
// The visible flag is used to store history information. It indicates that
// the current object version has been created by a delete operation on the
// OSM API.
// When a writer sets this flag, it MUST add a required_features tag with
// value "HistoricalInformation" to the HeaderBlock.
// If this flag is not available for some object it MUST be assumed to be
// true if the file has the required_features tag "HistoricalInformation"
// set.
Visible *bool `protobuf:"varint,6,opt,name=visible" json:"visible,omitempty"`
XXX_unrecognized []byte `json:"-"`
}
func (m *Info) Reset() { *m = Info{} }
func (m *Info) String() string { return proto.CompactTextString(m) }
func (*Info) ProtoMessage() {}
const Default_Info_Version int32 = -1
func (this *Info) GetVersion() int32 {
if this != nil && this.Version != nil {
return *this.Version
func (m *Info) GetVersion() int32 {
if m != nil && m.Version != nil {
return *m.Version
}
return Default_Info_Version
}
func (this *Info) GetTimestamp() int64 {
if this != nil && this.Timestamp != nil {
return *this.Timestamp
func (m *Info) GetTimestamp() int64 {
if m != nil && m.Timestamp != nil {
return *m.Timestamp
}
return 0
}
func (this *Info) GetChangeset() int64 {
if this != nil && this.Changeset != nil {
return *this.Changeset
func (m *Info) GetChangeset() int64 {
if m != nil && m.Changeset != nil {
return *m.Changeset
}
return 0
}
func (this *Info) GetUid() int32 {
if this != nil && this.Uid != nil {
return *this.Uid
func (m *Info) GetUid() int32 {
if m != nil && m.Uid != nil {
return *m.Uid
}
return 0
}
func (this *Info) GetUserSid() uint32 {
if this != nil && this.UserSid != nil {
return *this.UserSid
func (m *Info) GetUserSid() uint32 {
if m != nil && m.UserSid != nil {
return *m.UserSid
}
return 0
}
func (this *Info) GetVisible() bool {
if this != nil && this.Visible != nil {
return *this.Visible
func (m *Info) GetVisible() bool {
if m != nil && m.Visible != nil {
return *m.Visible
}
return false
}
// * Optional metadata that may be included into each primitive. Special dense format used in DenseNodes.
type DenseInfo struct {
Version []int32 `protobuf:"varint,1,rep,packed,name=version" json:"version,omitempty"`
Timestamp []int64 `protobuf:"zigzag64,2,rep,packed,name=timestamp" json:"timestamp,omitempty"`
Changeset []int64 `protobuf:"zigzag64,3,rep,packed,name=changeset" json:"changeset,omitempty"`
Uid []int32 `protobuf:"zigzag32,4,rep,packed,name=uid" json:"uid,omitempty"`
UserSid []int32 `protobuf:"zigzag32,5,rep,packed,name=user_sid" json:"user_sid,omitempty"`
Visible []bool `protobuf:"varint,6,rep,packed,name=visible" json:"visible,omitempty"`
XXX_unrecognized []byte `json:"-"`
Version []int32 `protobuf:"varint,1,rep,packed,name=version" json:"version,omitempty"`
Timestamp []int64 `protobuf:"zigzag64,2,rep,packed,name=timestamp" json:"timestamp,omitempty"`
Changeset []int64 `protobuf:"zigzag64,3,rep,packed,name=changeset" json:"changeset,omitempty"`
Uid []int32 `protobuf:"zigzag32,4,rep,packed,name=uid" json:"uid,omitempty"`
UserSid []int32 `protobuf:"zigzag32,5,rep,packed,name=user_sid" json:"user_sid,omitempty"`
// The visible flag is used to store history information. It indicates that
// the current object version has been created by a delete operation on the
// OSM API.
// When a writer sets this flag, it MUST add a required_features tag with
// value "HistoricalInformation" to the HeaderBlock.
// If this flag is not available for some object it MUST be assumed to be
// true if the file has the required_features tag "HistoricalInformation"
// set.
Visible []bool `protobuf:"varint,6,rep,packed,name=visible" json:"visible,omitempty"`
XXX_unrecognized []byte `json:"-"`
}
func (this *DenseInfo) Reset() { *this = DenseInfo{} }
func (this *DenseInfo) String() string { return proto.CompactTextString(this) }
func (*DenseInfo) ProtoMessage() {}
func (m *DenseInfo) Reset() { *m = DenseInfo{} }
func (m *DenseInfo) String() string { return proto.CompactTextString(m) }
func (*DenseInfo) ProtoMessage() {}
func (m *DenseInfo) GetVersion() []int32 {
if m != nil {
return m.Version
}
return nil
}
func (m *DenseInfo) GetTimestamp() []int64 {
if m != nil {
return m.Timestamp
}
return nil
}
func (m *DenseInfo) GetChangeset() []int64 {
if m != nil {
return m.Changeset
}
return nil
}
func (m *DenseInfo) GetUid() []int32 {
if m != nil {
return m.Uid
}
return nil
}
func (m *DenseInfo) GetUserSid() []int32 {
if m != nil {
return m.UserSid
}
return nil
}
func (m *DenseInfo) GetVisible() []bool {
if m != nil {
return m.Visible
}
return nil
}
// THIS IS STUB DESIGN FOR CHANGESETS. NOT USED RIGHT NOW.
// TODO: REMOVE THIS?
type ChangeSet struct {
Id *int64 `protobuf:"varint,1,req,name=id" json:"id,omitempty"`
XXX_unrecognized []byte `json:"-"`
}
func (this *ChangeSet) Reset() { *this = ChangeSet{} }
func (this *ChangeSet) String() string { return proto.CompactTextString(this) }
func (*ChangeSet) ProtoMessage() {}
func (m *ChangeSet) Reset() { *m = ChangeSet{} }
func (m *ChangeSet) String() string { return proto.CompactTextString(m) }
func (*ChangeSet) ProtoMessage() {}
func (this *ChangeSet) GetId() int64 {
if this != nil && this.Id != nil {
return *this.Id
func (m *ChangeSet) GetId() int64 {
if m != nil && m.Id != nil {
return *m.Id
}
return 0
}
type Node struct {
Id *int64 `protobuf:"zigzag64,1,req,name=id" json:"id,omitempty"`
Id *int64 `protobuf:"zigzag64,1,req,name=id" json:"id,omitempty"`
// Parallel arrays.
Keys []uint32 `protobuf:"varint,2,rep,packed,name=keys" json:"keys,omitempty"`
Vals []uint32 `protobuf:"varint,3,rep,packed,name=vals" json:"vals,omitempty"`
Info *Info `protobuf:"bytes,4,opt,name=info" json:"info,omitempty"`
@ -331,60 +480,105 @@ type Node struct {
XXX_unrecognized []byte `json:"-"`
}
func (this *Node) Reset() { *this = Node{} }
func (this *Node) String() string { return proto.CompactTextString(this) }
func (*Node) ProtoMessage() {}
func (m *Node) Reset() { *m = Node{} }
func (m *Node) String() string { return proto.CompactTextString(m) }
func (*Node) ProtoMessage() {}
func (this *Node) GetId() int64 {
if this != nil && this.Id != nil {
return *this.Id
func (m *Node) GetId() int64 {
if m != nil && m.Id != nil {
return *m.Id
}
return 0
}
func (this *Node) GetInfo() *Info {
if this != nil {
return this.Info
func (m *Node) GetKeys() []uint32 {
if m != nil {
return m.Keys
}
return nil
}
func (this *Node) GetLat() int64 {
if this != nil && this.Lat != nil {
return *this.Lat
func (m *Node) GetVals() []uint32 {
if m != nil {
return m.Vals
}
return nil
}
func (m *Node) GetInfo() *Info {
if m != nil {
return m.Info
}
return nil
}
func (m *Node) GetLat() int64 {
if m != nil && m.Lat != nil {
return *m.Lat
}
return 0
}
func (this *Node) GetLon() int64 {
if this != nil && this.Lon != nil {
return *this.Lon
func (m *Node) GetLon() int64 {
if m != nil && m.Lon != nil {
return *m.Lon
}
return 0
}
type DenseNodes struct {
Id []int64 `protobuf:"zigzag64,1,rep,packed,name=id" json:"id,omitempty"`
Denseinfo *DenseInfo `protobuf:"bytes,5,opt,name=denseinfo" json:"denseinfo,omitempty"`
Lat []int64 `protobuf:"zigzag64,8,rep,packed,name=lat" json:"lat,omitempty"`
Lon []int64 `protobuf:"zigzag64,9,rep,packed,name=lon" json:"lon,omitempty"`
KeysVals []int32 `protobuf:"varint,10,rep,packed,name=keys_vals" json:"keys_vals,omitempty"`
XXX_unrecognized []byte `json:"-"`
Id []int64 `protobuf:"zigzag64,1,rep,packed,name=id" json:"id,omitempty"`
// repeated Info info = 4;
Denseinfo *DenseInfo `protobuf:"bytes,5,opt,name=denseinfo" json:"denseinfo,omitempty"`
Lat []int64 `protobuf:"zigzag64,8,rep,packed,name=lat" json:"lat,omitempty"`
Lon []int64 `protobuf:"zigzag64,9,rep,packed,name=lon" json:"lon,omitempty"`
// Special packing of keys and vals into one array. May be empty if all nodes in this block are tagless.
KeysVals []int32 `protobuf:"varint,10,rep,packed,name=keys_vals" json:"keys_vals,omitempty"`
XXX_unrecognized []byte `json:"-"`
}
func (this *DenseNodes) Reset() { *this = DenseNodes{} }
func (this *DenseNodes) String() string { return proto.CompactTextString(this) }
func (*DenseNodes) ProtoMessage() {}
func (m *DenseNodes) Reset() { *m = DenseNodes{} }
func (m *DenseNodes) String() string { return proto.CompactTextString(m) }
func (*DenseNodes) ProtoMessage() {}
func (this *DenseNodes) GetDenseinfo() *DenseInfo {
if this != nil {
return this.Denseinfo
func (m *DenseNodes) GetId() []int64 {
if m != nil {
return m.Id
}
return nil
}
func (m *DenseNodes) GetDenseinfo() *DenseInfo {
if m != nil {
return m.Denseinfo
}
return nil
}
func (m *DenseNodes) GetLat() []int64 {
if m != nil {
return m.Lat
}
return nil
}
func (m *DenseNodes) GetLon() []int64 {
if m != nil {
return m.Lon
}
return nil
}
func (m *DenseNodes) GetKeysVals() []int32 {
if m != nil {
return m.KeysVals
}
return nil
}
type Way struct {
Id *int64 `protobuf:"varint,1,req,name=id" json:"id,omitempty"`
Id *int64 `protobuf:"varint,1,req,name=id" json:"id,omitempty"`
// Parallel arrays.
Keys []uint32 `protobuf:"varint,2,rep,packed,name=keys" json:"keys,omitempty"`
Vals []uint32 `protobuf:"varint,3,rep,packed,name=vals" json:"vals,omitempty"`
Info *Info `protobuf:"bytes,4,opt,name=info" json:"info,omitempty"`
@ -392,53 +586,111 @@ type Way struct {
XXX_unrecognized []byte `json:"-"`
}
func (this *Way) Reset() { *this = Way{} }
func (this *Way) String() string { return proto.CompactTextString(this) }
func (*Way) ProtoMessage() {}
func (m *Way) Reset() { *m = Way{} }
func (m *Way) String() string { return proto.CompactTextString(m) }
func (*Way) ProtoMessage() {}
func (this *Way) GetId() int64 {
if this != nil && this.Id != nil {
return *this.Id
func (m *Way) GetId() int64 {
if m != nil && m.Id != nil {
return *m.Id
}
return 0
}
func (this *Way) GetInfo() *Info {
if this != nil {
return this.Info
func (m *Way) GetKeys() []uint32 {
if m != nil {
return m.Keys
}
return nil
}
func (m *Way) GetVals() []uint32 {
if m != nil {
return m.Vals
}
return nil
}
func (m *Way) GetInfo() *Info {
if m != nil {
return m.Info
}
return nil
}
func (m *Way) GetRefs() []int64 {
if m != nil {
return m.Refs
}
return nil
}
type Relation struct {
Id *int64 `protobuf:"varint,1,req,name=id" json:"id,omitempty"`
Keys []uint32 `protobuf:"varint,2,rep,packed,name=keys" json:"keys,omitempty"`
Vals []uint32 `protobuf:"varint,3,rep,packed,name=vals" json:"vals,omitempty"`
Info *Info `protobuf:"bytes,4,opt,name=info" json:"info,omitempty"`
Id *int64 `protobuf:"varint,1,req,name=id" json:"id,omitempty"`
// Parallel arrays.
Keys []uint32 `protobuf:"varint,2,rep,packed,name=keys" json:"keys,omitempty"`
Vals []uint32 `protobuf:"varint,3,rep,packed,name=vals" json:"vals,omitempty"`
Info *Info `protobuf:"bytes,4,opt,name=info" json:"info,omitempty"`
// Parallel arrays
RolesSid []int32 `protobuf:"varint,8,rep,packed,name=roles_sid" json:"roles_sid,omitempty"`
Memids []int64 `protobuf:"zigzag64,9,rep,packed,name=memids" json:"memids,omitempty"`
Types []Relation_MemberType `protobuf:"varint,10,rep,packed,name=types,enum=imposm3.Relation_MemberType" json:"types,omitempty"`
Types []Relation_MemberType `protobuf:"varint,10,rep,packed,name=types,enum=osmpbf.Relation_MemberType" json:"types,omitempty"`
XXX_unrecognized []byte `json:"-"`
}
func (this *Relation) Reset() { *this = Relation{} }
func (this *Relation) String() string { return proto.CompactTextString(this) }
func (*Relation) ProtoMessage() {}
func (m *Relation) Reset() { *m = Relation{} }
func (m *Relation) String() string { return proto.CompactTextString(m) }
func (*Relation) ProtoMessage() {}
func (this *Relation) GetId() int64 {
if this != nil && this.Id != nil {
return *this.Id
func (m *Relation) GetId() int64 {
if m != nil && m.Id != nil {
return *m.Id
}
return 0
}
func (this *Relation) GetInfo() *Info {
if this != nil {
return this.Info
func (m *Relation) GetKeys() []uint32 {
if m != nil {
return m.Keys
}
return nil
}
func (m *Relation) GetVals() []uint32 {
if m != nil {
return m.Vals
}
return nil
}
func (m *Relation) GetInfo() *Info {
if m != nil {
return m.Info
}
return nil
}
func (m *Relation) GetRolesSid() []int32 {
if m != nil {
return m.RolesSid
}
return nil
}
func (m *Relation) GetMemids() []int64 {
if m != nil {
return m.Memids
}
return nil
}
func (m *Relation) GetTypes() []Relation_MemberType {
if m != nil {
return m.Types
}
return nil
}
func init() {
proto.RegisterEnum("imposm3.Relation_MemberType", Relation_MemberType_name, Relation_MemberType_value)
proto.RegisterEnum("osmpbf.Relation_MemberType", Relation_MemberType_name, Relation_MemberType_value)
}