Skip to content

Commit

Permalink
[net] Upgrade to FlatBuffers 23.5.26
Browse files Browse the repository at this point in the history
  • Loading branch information
@bjornharrtell
bjornharrtell committed Feb 3, 2024
1 parent daec1e2 commit 65417cf
Show file tree
Hide file tree
Showing 7 changed files with 96 additions and 7 deletions.
22 changes: 21 additions & 1 deletion src/net/FlatGeobuf/Column.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public struct Column : IFlatbufferObject
{
private Table __p;
public ByteBuffer ByteBuffer { get { return __p.bb; } }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_3_3(); }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); }
public static Column GetRootAsColumn(ByteBuffer _bb) { return GetRootAsColumn(_bb, new Column()); }
public static Column GetRootAsColumn(ByteBuffer _bb, Column obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }
Expand Down Expand Up @@ -169,4 +169,24 @@ public class ColumnT
}


static public class ColumnVerify
{
static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos)
{
return verifier.VerifyTableStart(tablePos)
&& verifier.VerifyString(tablePos, 4 /*Name*/, true)
&& verifier.VerifyField(tablePos, 6 /*Type*/, 1 /*FlatGeobuf.ColumnType*/, 1, false)
&& verifier.VerifyString(tablePos, 8 /*Title*/, false)
&& verifier.VerifyString(tablePos, 10 /*Description*/, false)
&& verifier.VerifyField(tablePos, 12 /*Width*/, 4 /*int*/, 4, false)
&& verifier.VerifyField(tablePos, 14 /*Precision*/, 4 /*int*/, 4, false)
&& verifier.VerifyField(tablePos, 16 /*Scale*/, 4 /*int*/, 4, false)
&& verifier.VerifyField(tablePos, 18 /*Nullable*/, 1 /*bool*/, 1, false)
&& verifier.VerifyField(tablePos, 20 /*Unique*/, 1 /*bool*/, 1, false)
&& verifier.VerifyField(tablePos, 22 /*PrimaryKey*/, 1 /*bool*/, 1, false)
&& verifier.VerifyString(tablePos, 24 /*Metadata*/, false)
&& verifier.VerifyTableEnd(tablePos);
}
}

}
17 changes: 16 additions & 1 deletion src/net/FlatGeobuf/Crs.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public struct Crs : IFlatbufferObject
{
private Table __p;
public ByteBuffer ByteBuffer { get { return __p.bb; } }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_3_3(); }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); }
public static Crs GetRootAsCrs(ByteBuffer _bb) { return GetRootAsCrs(_bb, new Crs()); }
public static Crs GetRootAsCrs(ByteBuffer _bb, Crs obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }
Expand Down Expand Up @@ -135,4 +135,19 @@ public class CrsT
}


static public class CrsVerify
{
static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos)
{
return verifier.VerifyTableStart(tablePos)
&& verifier.VerifyString(tablePos, 4 /*Org*/, false)
&& verifier.VerifyField(tablePos, 6 /*Code*/, 4 /*int*/, 4, false)
&& verifier.VerifyString(tablePos, 8 /*Name*/, false)
&& verifier.VerifyString(tablePos, 10 /*Description*/, false)
&& verifier.VerifyString(tablePos, 12 /*Wkt*/, false)
&& verifier.VerifyString(tablePos, 14 /*CodeString*/, false)
&& verifier.VerifyTableEnd(tablePos);
}
}

}
15 changes: 14 additions & 1 deletion src/net/FlatGeobuf/Feature.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ public struct Feature : IFlatbufferObject
{
private Table __p;
public ByteBuffer ByteBuffer { get { return __p.bb; } }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_3_3(); }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); }
public static Feature GetRootAsFeature(ByteBuffer _bb) { return GetRootAsFeature(_bb, new Feature()); }
public static Feature GetRootAsFeature(ByteBuffer _bb, Feature obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
public static bool VerifyFeature(ByteBuffer _bb) {Google.FlatBuffers.Verifier verifier = new Google.FlatBuffers.Verifier(_bb); return verifier.VerifyBuffer("", false, FeatureVerify.Verify); }
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }
public Feature __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }

Expand Down Expand Up @@ -118,4 +119,16 @@ public class FeatureT
}


static public class FeatureVerify
{
static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos)
{
return verifier.VerifyTableStart(tablePos)
&& verifier.VerifyTable(tablePos, 4 /*Geometry*/, FlatGeobuf.GeometryVerify.Verify, false)
&& verifier.VerifyVectorOfData(tablePos, 6 /*Properties*/, 1 /*byte*/, false)
&& verifier.VerifyVectorOfTables(tablePos, 8 /*Columns*/, FlatGeobuf.ColumnVerify.Verify, false)
&& verifier.VerifyTableEnd(tablePos);
}
}

}
2 changes: 1 addition & 1 deletion src/net/FlatGeobuf/FlatGeobuf.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFrameworks>netstandard2.0;netstandard2.1</TargetFrameworks>
<LangVersion>8.0</LangVersion>
<VersionPrefix>3.25.1</VersionPrefix>
<DefineConstants>ENABLE_SPAN_T;UNSAFE_BYTEBUFFER</DefineConstants>
<DefineConstants>ENABLE_SPAN_T;UNSAFE_BYTEBUFFER;BYTEBUFFER_NO_BOUNDS_CHECK</DefineConstants>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
</PropertyGroup>

Expand Down
19 changes: 18 additions & 1 deletion src/net/FlatGeobuf/Geometry.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public struct Geometry : IFlatbufferObject
{
private Table __p;
public ByteBuffer ByteBuffer { get { return __p.bb; } }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_3_3(); }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); }
public static Geometry GetRootAsGeometry(ByteBuffer _bb) { return GetRootAsGeometry(_bb, new Geometry()); }
public static Geometry GetRootAsGeometry(ByteBuffer _bb, Geometry obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }
Expand Down Expand Up @@ -237,4 +237,21 @@ public class GeometryT
}


static public class GeometryVerify
{
static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos)
{
return verifier.VerifyTableStart(tablePos)
&& verifier.VerifyVectorOfData(tablePos, 4 /*Ends*/, 4 /*uint*/, false)
&& verifier.VerifyVectorOfData(tablePos, 6 /*Xy*/, 8 /*double*/, false)
&& verifier.VerifyVectorOfData(tablePos, 8 /*Z*/, 8 /*double*/, false)
&& verifier.VerifyVectorOfData(tablePos, 10 /*M*/, 8 /*double*/, false)
&& verifier.VerifyVectorOfData(tablePos, 12 /*T*/, 8 /*double*/, false)
&& verifier.VerifyVectorOfData(tablePos, 14 /*Tm*/, 8 /*ulong*/, false)
&& verifier.VerifyField(tablePos, 16 /*Type*/, 1 /*FlatGeobuf.GeometryType*/, 1, false)
&& verifier.VerifyVectorOfTables(tablePos, 18 /*Parts*/, FlatGeobuf.GeometryVerify.Verify, false)
&& verifier.VerifyTableEnd(tablePos);
}
}

}
26 changes: 25 additions & 1 deletion src/net/FlatGeobuf/Header.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,10 @@ public struct Header : IFlatbufferObject
{
private Table __p;
public ByteBuffer ByteBuffer { get { return __p.bb; } }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_3_3(); }
public static void ValidateVersion() { FlatBufferConstants.FLATBUFFERS_23_5_26(); }
public static Header GetRootAsHeader(ByteBuffer _bb) { return GetRootAsHeader(_bb, new Header()); }
public static Header GetRootAsHeader(ByteBuffer _bb, Header obj) { return (obj.__assign(_bb.GetInt(_bb.Position) + _bb.Position, _bb)); }
public static bool VerifyHeader(ByteBuffer _bb) {Google.FlatBuffers.Verifier verifier = new Google.FlatBuffers.Verifier(_bb); return verifier.VerifyBuffer("", false, HeaderVerify.Verify); }
public void __init(int _i, ByteBuffer _bb) { __p = new Table(_i, _bb); }
public Header __assign(int _i, ByteBuffer _bb) { __init(_i, _bb); return this; }

Expand Down Expand Up @@ -234,4 +235,27 @@ public class HeaderT
}


static public class HeaderVerify
{
static public bool Verify(Google.FlatBuffers.Verifier verifier, uint tablePos)
{
return verifier.VerifyTableStart(tablePos)
&& verifier.VerifyString(tablePos, 4 /*Name*/, false)
&& verifier.VerifyVectorOfData(tablePos, 6 /*Envelope*/, 8 /*double*/, false)
&& verifier.VerifyField(tablePos, 8 /*GeometryType*/, 1 /*FlatGeobuf.GeometryType*/, 1, false)
&& verifier.VerifyField(tablePos, 10 /*HasZ*/, 1 /*bool*/, 1, false)
&& verifier.VerifyField(tablePos, 12 /*HasM*/, 1 /*bool*/, 1, false)
&& verifier.VerifyField(tablePos, 14 /*HasT*/, 1 /*bool*/, 1, false)
&& verifier.VerifyField(tablePos, 16 /*HasTm*/, 1 /*bool*/, 1, false)
&& verifier.VerifyVectorOfTables(tablePos, 18 /*Columns*/, FlatGeobuf.ColumnVerify.Verify, false)
&& verifier.VerifyField(tablePos, 20 /*FeaturesCount*/, 8 /*ulong*/, 8, false)
&& verifier.VerifyField(tablePos, 22 /*IndexNodeSize*/, 2 /*ushort*/, 2, false)
&& verifier.VerifyTable(tablePos, 24 /*Crs*/, FlatGeobuf.CrsVerify.Verify, false)
&& verifier.VerifyString(tablePos, 26 /*Title*/, false)
&& verifier.VerifyString(tablePos, 28 /*Description*/, false)
&& verifier.VerifyString(tablePos, 30 /*Metadata*/, false)
&& verifier.VerifyTableEnd(tablePos);
}
}

}
2 changes: 1 addition & 1 deletion src/net/fetch.sh
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/sh
curl -L https://github.com/google/flatbuffers/archive/v23.3.3.tar.gz | tar xz --wildcards --strip-components=2 --exclude="Properties" --directory=FlatGeobuf flatbuffers-23.3.3/net/FlatBuffers/*.cs
curl -L https://github.com/google/flatbuffers/archive/v23.5.26.tar.gz | tar xz --wildcards --strip-components=2 --exclude="Properties" --directory=FlatGeobuf flatbuffers-23.5.26/net/FlatBuffers/*.cs

0 comments on commit 65417cf

Please sign in to comment.