Skip to content

Commit

Permalink
Do not bother with wkt versions
Browse files Browse the repository at this point in the history
  • Loading branch information
@bjornharrtell
bjornharrtell committed Aug 6, 2019
1 parent 24dd524 commit c1e9f89
Show file tree
Hide file tree
Showing 6 changed files with 43 additions and 105 deletions.
38 changes: 12 additions & 26 deletions src/cpp/header_generated.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,8 +197,7 @@ struct Crs FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
VT_CODE = 6,
VT_NAME = 8,
VT_DESCRIPTION = 10,
VT_DEFINITION = 12,
VT_DEFINITION_12_063 = 14
VT_WKT = 12
};
const flatbuffers::String *org() const {
return GetPointer<const flatbuffers::String *>(VT_ORG);
Expand All @@ -212,11 +211,8 @@ struct Crs FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
const flatbuffers::String *description() const {
return GetPointer<const flatbuffers::String *>(VT_DESCRIPTION);
}
const flatbuffers::String *definition() const {
return GetPointer<const flatbuffers::String *>(VT_DEFINITION);
}
const flatbuffers::String *definition_12_063() const {
return GetPointer<const flatbuffers::String *>(VT_DEFINITION_12_063);
const flatbuffers::String *wkt() const {
return GetPointer<const flatbuffers::String *>(VT_WKT);
}
bool Verify(flatbuffers::Verifier &verifier) const {
return VerifyTableStart(verifier) &&
Expand All @@ -227,10 +223,8 @@ struct Crs FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
verifier.VerifyString(name()) &&
VerifyOffset(verifier, VT_DESCRIPTION) &&
verifier.VerifyString(description()) &&
VerifyOffset(verifier, VT_DEFINITION) &&
verifier.VerifyString(definition()) &&
VerifyOffset(verifier, VT_DEFINITION_12_063) &&
verifier.VerifyString(definition_12_063()) &&
VerifyOffset(verifier, VT_WKT) &&
verifier.VerifyString(wkt()) &&
verifier.EndTable();
}
};
Expand All @@ -250,11 +244,8 @@ struct CrsBuilder {
void add_description(flatbuffers::Offset<flatbuffers::String> description) {
fbb_.AddOffset(Crs::VT_DESCRIPTION, description);
}
void add_definition(flatbuffers::Offset<flatbuffers::String> definition) {
fbb_.AddOffset(Crs::VT_DEFINITION, definition);
}
void add_definition_12_063(flatbuffers::Offset<flatbuffers::String> definition_12_063) {
fbb_.AddOffset(Crs::VT_DEFINITION_12_063, definition_12_063);
void add_wkt(flatbuffers::Offset<flatbuffers::String> wkt) {
fbb_.AddOffset(Crs::VT_WKT, wkt);
}
explicit CrsBuilder(flatbuffers::FlatBufferBuilder &_fbb)
: fbb_(_fbb) {
Expand All @@ -274,11 +265,9 @@ inline flatbuffers::Offset<Crs> CreateCrs(
int32_t code = 0,
flatbuffers::Offset<flatbuffers::String> name = 0,
flatbuffers::Offset<flatbuffers::String> description = 0,
flatbuffers::Offset<flatbuffers::String> definition = 0,
flatbuffers::Offset<flatbuffers::String> definition_12_063 = 0) {
flatbuffers::Offset<flatbuffers::String> wkt = 0) {
CrsBuilder builder_(_fbb);
builder_.add_definition_12_063(definition_12_063);
builder_.add_definition(definition);
builder_.add_wkt(wkt);
builder_.add_description(description);
builder_.add_name(name);
builder_.add_code(code);
Expand All @@ -292,21 +281,18 @@ inline flatbuffers::Offset<Crs> CreateCrsDirect(
int32_t code = 0,
const char *name = nullptr,
const char *description = nullptr,
const char *definition = nullptr,
const char *definition_12_063 = nullptr) {
const char *wkt = nullptr) {
auto org__ = org ? _fbb.CreateString(org) : 0;
auto name__ = name ? _fbb.CreateString(name) : 0;
auto description__ = description ? _fbb.CreateString(description) : 0;
auto definition__ = definition ? _fbb.CreateString(definition) : 0;
auto definition_12_063__ = definition_12_063 ? _fbb.CreateString(definition_12_063) : 0;
auto wkt__ = wkt ? _fbb.CreateString(wkt) : 0;
return FlatGeobuf::CreateCrs(
_fbb,
org__,
code,
name__,
description__,
definition__,
definition_12_063__);
wkt__);
}

struct Header FLATBUFFERS_FINAL_CLASS : private flatbuffers::Table {
Expand Down
3 changes: 1 addition & 2 deletions src/fbs/header.fbs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ table Crs {
code: int; // Numeric ID of the Spatial Reference System assigned by the organization (0 = unknown)
name: string; // Human readable name of this SRS (optional)
description: string; // Human readable description of this SRS (optional)
definition: string; // Well-known Text Representation of the Spatial Reference System (OpenGIS® 01-009 Implementation Specification: Coordinate Transformation Services Revision 1.0)
definition_12_063: string; // Well-known Text Representation of the Spatial Reference System (OGC® 12-063r5 Geographic information - Well-known text representation of coordinate reference systems)
wkt: string; // Well-known Text Representation of the Spatial Reference System (optional)
}

table Header {
Expand Down
19 changes: 4 additions & 15 deletions src/go/FlatGeobuf/Crs.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 8 additions & 14 deletions src/java/src/main/java/org/wololo/flatgeobuf/generated/Crs.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,37 +23,31 @@ public final class Crs extends Table {
public String description() { int o = __offset(10); return o != 0 ? __string(o + bb_pos) : null; }
public ByteBuffer descriptionAsByteBuffer() { return __vector_as_bytebuffer(10, 1); }
public ByteBuffer descriptionInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 10, 1); }
public String definition() { int o = __offset(12); return o != 0 ? __string(o + bb_pos) : null; }
public ByteBuffer definitionAsByteBuffer() { return __vector_as_bytebuffer(12, 1); }
public ByteBuffer definitionInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 12, 1); }
public String definition12063() { int o = __offset(14); return o != 0 ? __string(o + bb_pos) : null; }
public ByteBuffer definition12063AsByteBuffer() { return __vector_as_bytebuffer(14, 1); }
public ByteBuffer definition12063InByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 14, 1); }
public String wkt() { int o = __offset(12); return o != 0 ? __string(o + bb_pos) : null; }
public ByteBuffer wktAsByteBuffer() { return __vector_as_bytebuffer(12, 1); }
public ByteBuffer wktInByteBuffer(ByteBuffer _bb) { return __vector_in_bytebuffer(_bb, 12, 1); }

public static int createCrs(FlatBufferBuilder builder,
int orgOffset,
int code,
int nameOffset,
int descriptionOffset,
int definitionOffset,
int definition_12_063Offset) {
builder.startObject(6);
Crs.addDefinition12063(builder, definition_12_063Offset);
Crs.addDefinition(builder, definitionOffset);
int wktOffset) {
builder.startObject(5);
Crs.addWkt(builder, wktOffset);
Crs.addDescription(builder, descriptionOffset);
Crs.addName(builder, nameOffset);
Crs.addCode(builder, code);
Crs.addOrg(builder, orgOffset);
return Crs.endCrs(builder);
}

public static void startCrs(FlatBufferBuilder builder) { builder.startObject(6); }
public static void startCrs(FlatBufferBuilder builder) { builder.startObject(5); }
public static void addOrg(FlatBufferBuilder builder, int orgOffset) { builder.addOffset(0, orgOffset, 0); }
public static void addCode(FlatBufferBuilder builder, int code) { builder.addInt(1, code, 0); }
public static void addName(FlatBufferBuilder builder, int nameOffset) { builder.addOffset(2, nameOffset, 0); }
public static void addDescription(FlatBufferBuilder builder, int descriptionOffset) { builder.addOffset(3, descriptionOffset, 0); }
public static void addDefinition(FlatBufferBuilder builder, int definitionOffset) { builder.addOffset(4, definitionOffset, 0); }
public static void addDefinition12063(FlatBufferBuilder builder, int definition12063Offset) { builder.addOffset(5, definition12063Offset, 0); }
public static void addWkt(FlatBufferBuilder builder, int wktOffset) { builder.addOffset(4, wktOffset, 0); }
public static int endCrs(FlatBufferBuilder builder) {
int o = builder.endObject();
return o;
Expand Down
28 changes: 9 additions & 19 deletions src/net/FlatGeobuf/Crs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,45 +36,35 @@ public struct Crs : IFlatbufferObject
public ArraySegment<byte>? GetDescriptionBytes() { return __p.__vector_as_arraysegment(10); }
#endif
public byte[] GetDescriptionArray() { return __p.__vector_as_array<byte>(10); }
public string Definition { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } }
public string Wkt { get { int o = __p.__offset(12); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } }
#if ENABLE_SPAN_T
public Span<byte> GetDefinitionBytes() { return __p.__vector_as_span(12); }
public Span<byte> GetWktBytes() { return __p.__vector_as_span(12); }
#else
public ArraySegment<byte>? GetDefinitionBytes() { return __p.__vector_as_arraysegment(12); }
public ArraySegment<byte>? GetWktBytes() { return __p.__vector_as_arraysegment(12); }
#endif
public byte[] GetDefinitionArray() { return __p.__vector_as_array<byte>(12); }
public string Definition12063 { get { int o = __p.__offset(14); return o != 0 ? __p.__string(o + __p.bb_pos) : null; } }
#if ENABLE_SPAN_T
public Span<byte> GetDefinition12063Bytes() { return __p.__vector_as_span(14); }
#else
public ArraySegment<byte>? GetDefinition12063Bytes() { return __p.__vector_as_arraysegment(14); }
#endif
public byte[] GetDefinition12063Array() { return __p.__vector_as_array<byte>(14); }
public byte[] GetWktArray() { return __p.__vector_as_array<byte>(12); }

public static Offset<Crs> CreateCrs(FlatBufferBuilder builder,
StringOffset orgOffset = default(StringOffset),
int code = 0,
StringOffset nameOffset = default(StringOffset),
StringOffset descriptionOffset = default(StringOffset),
StringOffset definitionOffset = default(StringOffset),
StringOffset definition_12_063Offset = default(StringOffset)) {
builder.StartObject(6);
Crs.AddDefinition12063(builder, definition_12_063Offset);
Crs.AddDefinition(builder, definitionOffset);
StringOffset wktOffset = default(StringOffset)) {
builder.StartObject(5);
Crs.AddWkt(builder, wktOffset);
Crs.AddDescription(builder, descriptionOffset);
Crs.AddName(builder, nameOffset);
Crs.AddCode(builder, code);
Crs.AddOrg(builder, orgOffset);
return Crs.EndCrs(builder);
}

public static void StartCrs(FlatBufferBuilder builder) { builder.StartObject(6); }
public static void StartCrs(FlatBufferBuilder builder) { builder.StartObject(5); }
public static void AddOrg(FlatBufferBuilder builder, StringOffset orgOffset) { builder.AddOffset(0, orgOffset.Value, 0); }
public static void AddCode(FlatBufferBuilder builder, int code) { builder.AddInt(1, code, 0); }
public static void AddName(FlatBufferBuilder builder, StringOffset nameOffset) { builder.AddOffset(2, nameOffset.Value, 0); }
public static void AddDescription(FlatBufferBuilder builder, StringOffset descriptionOffset) { builder.AddOffset(3, descriptionOffset.Value, 0); }
public static void AddDefinition(FlatBufferBuilder builder, StringOffset definitionOffset) { builder.AddOffset(4, definitionOffset.Value, 0); }
public static void AddDefinition12063(FlatBufferBuilder builder, StringOffset definition12063Offset) { builder.AddOffset(5, definition12063Offset.Value, 0); }
public static void AddWkt(FlatBufferBuilder builder, StringOffset wktOffset) { builder.AddOffset(4, wktOffset.Value, 0); }
public static Offset<Crs> EndCrs(FlatBufferBuilder builder) {
int o = builder.EndObject();
return new Offset<Crs>(o);
Expand Down
38 changes: 9 additions & 29 deletions src/ts/header_generated.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -209,29 +209,18 @@ description(optionalEncoding?:any):string|Uint8Array|null {
* @param flatbuffers.Encoding= optionalEncoding
* @returns string|Uint8Array|null
*/
definition():string|null
definition(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
definition(optionalEncoding?:any):string|Uint8Array|null {
wkt():string|null
wkt(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
wkt(optionalEncoding?:any):string|Uint8Array|null {
var offset = this.bb!.__offset(this.bb_pos, 12);
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
};

/**
* @param flatbuffers.Encoding= optionalEncoding
* @returns string|Uint8Array|null
*/
definition12063():string|null
definition12063(optionalEncoding:flatbuffers.Encoding):string|Uint8Array|null
definition12063(optionalEncoding?:any):string|Uint8Array|null {
var offset = this.bb!.__offset(this.bb_pos, 14);
return offset ? this.bb!.__string(this.bb_pos + offset, optionalEncoding) : null;
};

/**
* @param flatbuffers.Builder builder
*/
static start(builder:flatbuffers.Builder) {
builder.startObject(6);
builder.startObject(5);
};

/**
Expand Down Expand Up @@ -268,18 +257,10 @@ static addDescription(builder:flatbuffers.Builder, descriptionOffset:flatbuffers

/**
* @param flatbuffers.Builder builder
* @param flatbuffers.Offset definitionOffset
*/
static addDefinition(builder:flatbuffers.Builder, definitionOffset:flatbuffers.Offset) {
builder.addFieldOffset(4, definitionOffset, 0);
};

/**
* @param flatbuffers.Builder builder
* @param flatbuffers.Offset definition12063Offset
* @param flatbuffers.Offset wktOffset
*/
static addDefinition12063(builder:flatbuffers.Builder, definition12063Offset:flatbuffers.Offset) {
builder.addFieldOffset(5, definition12063Offset, 0);
static addWkt(builder:flatbuffers.Builder, wktOffset:flatbuffers.Offset) {
builder.addFieldOffset(4, wktOffset, 0);
};

/**
Expand All @@ -291,14 +272,13 @@ static end(builder:flatbuffers.Builder):flatbuffers.Offset {
return offset;
};

static create(builder:flatbuffers.Builder, orgOffset:flatbuffers.Offset, code:number, nameOffset:flatbuffers.Offset, descriptionOffset:flatbuffers.Offset, definitionOffset:flatbuffers.Offset, definition12063Offset:flatbuffers.Offset):flatbuffers.Offset {
static create(builder:flatbuffers.Builder, orgOffset:flatbuffers.Offset, code:number, nameOffset:flatbuffers.Offset, descriptionOffset:flatbuffers.Offset, wktOffset:flatbuffers.Offset):flatbuffers.Offset {
Crs.start(builder);
Crs.addOrg(builder, orgOffset);
Crs.addCode(builder, code);
Crs.addName(builder, nameOffset);
Crs.addDescription(builder, descriptionOffset);
Crs.addDefinition(builder, definitionOffset);
Crs.addDefinition12063(builder, definition12063Offset);
Crs.addWkt(builder, wktOffset);
return Crs.end(builder);
}
}
Expand Down

0 comments on commit c1e9f89

Please sign in to comment.