Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ jobs:
uses: MobilityDB/MEOS-API/.github/actions/check-test-outcome@master
with:
log: test.log
min-tests: "99"
min-tests: "103"

- name: Smoke-test the FFI
run: dotnet run --project ExampleApp/ExampleApp.csproj -c Release --no-build
Expand Down
81 changes: 41 additions & 40 deletions GAP-LEDGER.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ A kind with no rows is a site the generators watch and that nothing reached in
this run. It prints so that an empty class reads as a measurement rather than
as a class nobody looked at.

Generated from `meos-idl.json` at MobilityDB `78ebe3b7fe401f25dc4c0372ef6b8a294abd579c` by `tools/codegen.py`
Generated from `meos-idl.json` at MobilityDB `c5174b8af15d3ef3f38c77ba60cbf5a5d99dd54c` by `tools/codegen.py`
and `tools/objectgen.py`. Do not edit.

<!-- gap-ledger:begin flat surface -->

## The flat surface — `tools/codegen.py`

### parameter nullability — 4335
### parameter nullability — 4336

`shape.nullable` names the parameters a function accepts NULL for, and the catalog carries no field saying a parameter is required. A pointer parameter named in neither reaches the surface with its contract unstated: the wrapper takes it, and nothing says whether zero is an argument or a fault.

Expand Down Expand Up @@ -319,6 +319,23 @@ and `tools/objectgen.py`. Do not edit.
| always_ne_ts2cell_s2cell | temp |
| always_ne_ts2cell_ts2cell | temp1, temp2 |
| always_ne_ttext_text | temp, txt |
| always_overlaps_stbox_tcbuffer | box, temp |
| always_overlaps_stbox_tgeo | box, temp |
| always_overlaps_stbox_tnpoint | box, temp |
| always_overlaps_stbox_tpose | box, temp |
| always_overlaps_stbox_trgeometry | box, temp |
| always_overlaps_tbox_tnumber | box, temp |
| always_overlaps_tcbuffer_stbox | temp, box |
| always_overlaps_temporal_temporal | temp1, temp2 |
| always_overlaps_temporal_tstzspan | temp, s |
| always_overlaps_tgeo_stbox | temp, box |
| always_overlaps_tgeo_tgeo | temp1, temp2 |
| always_overlaps_tnpoint_stbox | temp, box |
| always_overlaps_tnumber_tbox | temp, box |
| always_overlaps_tpose_stbox | temp, box |
| always_overlaps_tpose_tpose | temp1, temp2 |
| always_overlaps_trgeometry_stbox | temp, box |
| always_overlaps_tstzspan_temporal | s, temp |
| araster_value | traj, rast, vspan |
| araster_value_gdal | traj, path, vspan |
| atouches_cbuffer_tcbuffer | cb, temp |
Expand Down Expand Up @@ -927,6 +944,23 @@ and `tools/objectgen.py`. Do not edit.
| ever_ne_ts2cell_s2cell | temp |
| ever_ne_ts2cell_ts2cell | temp1, temp2 |
| ever_ne_ttext_text | temp, txt |
| ever_overlaps_stbox_tcbuffer | box, temp |
| ever_overlaps_stbox_tgeo | box, temp |
| ever_overlaps_stbox_tnpoint | box, temp |
| ever_overlaps_stbox_tpose | box, temp |
| ever_overlaps_stbox_trgeometry | box, temp |
| ever_overlaps_tbox_tnumber | box, temp |
| ever_overlaps_tcbuffer_stbox | temp, box |
| ever_overlaps_temporal_temporal | temp1, temp2 |
| ever_overlaps_temporal_tstzspan | temp, s |
| ever_overlaps_tgeo_stbox | temp, box |
| ever_overlaps_tgeo_tgeo | temp1, temp2 |
| ever_overlaps_tnpoint_stbox | temp, box |
| ever_overlaps_tnumber_tbox | temp, box |
| ever_overlaps_tpose_stbox | temp, box |
| ever_overlaps_tpose_tpose | temp1, temp2 |
| ever_overlaps_trgeometry_stbox | temp, box |
| ever_overlaps_tstzspan_temporal | s, temp |
| float4_in | num |
| float8_in | str |
| float8_out | size_out |
Expand Down Expand Up @@ -1603,9 +1637,7 @@ and `tools/objectgen.py`. Do not edit.
| nad_tbigint_tbigint | temp1, temp2 |
| nad_tbigint_tbox | temp, box |
| nad_tbox_tbox | box1, box2 |
| nad_tboxbigint_tboxbigint | box1, box2 |
| nad_tboxfloat_tboxfloat | box1, box2 |
| nad_tboxint_tboxint | box1, box2 |
| nad_tbox_tbox_intl | box1, box2 |
| nad_tcbuffer_cbuffer | temp, cb |
| nad_tcbuffer_geo | temp, gs |
| nad_tcbuffer_stbox | temp, box |
Expand Down Expand Up @@ -3754,12 +3786,14 @@ and `tools/objectgen.py`. Do not edit.
| tpcbox_ymin | box, result |
| tpcbox_zmax | box, result |
| tpcbox_zmin | box, result |
| tpcpatch_at_tpcbox | temp, box |
| tpcpatch_at_value | temp, pa |
| tpcpatch_end_npoints | temp |
| tpcpatch_end_value | temp |
| tpcpatch_from_base_temp | pa, temp |
| tpcpatch_from_mfjson | mfjson |
| tpcpatch_in | str |
| tpcpatch_minus_tpcbox | temp, box |
| tpcpatch_minus_value | temp, pa |
| tpcpatch_npoints | temp |
| tpcpatch_pcid | temp |
Expand All @@ -3780,11 +3814,13 @@ and `tools/objectgen.py`. Do not edit.
| tpcpatchseq_in | str |
| tpcpatchseqset_from_base_tstzspanset | pa, ss |
| tpcpatchseqset_in | str |
| tpcpoint_at_tpcbox | temp, box |
| tpcpoint_at_value | temp, pt |
| tpcpoint_end_value | temp |
| tpcpoint_from_base_temp | pt, temp |
| tpcpoint_from_mfjson | mfjson |
| tpcpoint_in | str |
| tpcpoint_minus_tpcbox | temp, box |
| tpcpoint_minus_value | temp, pt |
| tpcpoint_pcid | temp |
| tpcpoint_start_value | temp |
Expand Down Expand Up @@ -3948,76 +3984,41 @@ and `tools/objectgen.py`. Do not edit.
| tquadbinseqset_from_base_tstzspanset | ss |
| tquadbinseqset_in | str |
| tquadbinseqset_make | sequences |
| trgeometry_after_timestamptz | temp |
| trgeometry_angular_speed | temp |
| trgeometry_append_tinstant | temp, inst |
| trgeometry_append_tsequence | temp, seq |
| trgeometry_as_ewkt | temp, size_out |
| trgeometry_as_text | temp, size_out |
| trgeometry_as_tinstant | temp |
| trgeometry_as_tsequence | temp |
| trgeometry_as_tsequenceset | temp |
| trgeometry_at_geom | temp, gs |
| trgeometry_at_stbox | temp, box |
| trgeometry_at_timestamptz | temp |
| trgeometry_at_tstzset | temp, s |
| trgeometry_at_tstzspan | temp, s |
| trgeometry_at_tstzspanset | temp, ss |
| trgeometry_at_value | temp, pose |
| trgeometry_at_values | temp, s |
| trgeometry_before_timestamptz | temp |
| trgeometry_body_point_trajectory | temp, gs |
| trgeometry_centroid | temp |
| trgeometry_convex_hull | temp |
| trgeometry_cumulative_length | temp |
| trgeometry_delete_timestamptz | temp |
| trgeometry_delete_tstzset | temp, s |
| trgeometry_delete_tstzspan | temp, s |
| trgeometry_delete_tstzspanset | temp, ss |
| trgeometry_end_instant | temp |
| trgeometry_end_sequence | temp |
| trgeometry_end_value | temp |
| trgeometry_force2d | temp |
| trgeometry_from_mfjson | mfjson |
| trgeometry_geom | temp |
| trgeometry_in | str |
| trgeometry_instant_n | temp |
| trgeometry_instants | temp, count |
| trgeometry_length | temp |
| trgeometry_merge_array | temparr |
| trgeometry_minus_geom | temp, gs |
| trgeometry_minus_stbox | temp, box |
| trgeometry_minus_timestamptz | temp |
| trgeometry_minus_tstzset | temp, s |
| trgeometry_minus_tstzspan | temp, s |
| trgeometry_minus_tstzspanset | temp, ss |
| trgeometry_minus_value | temp, pose |
| trgeometry_minus_values | temp, s |
| trgeometry_out | temp, size_out |
| trgeometry_pitch | temp |
| trgeometry_points | temp |
| trgeometry_restrict_timestamptz | temp |
| trgeometry_restrict_tstzset | temp, s |
| trgeometry_restrict_tstzspan | temp, s |
| trgeometry_restrict_tstzspanset | temp, ss |
| trgeometry_restrict_values | temp, s |
| trgeometry_roll | temp |
| trgeometry_rotate | temp |
| trgeometry_rotate_x | temp |
| trgeometry_rotate_y | temp |
| trgeometry_rotate_z | temp |
| trgeometry_round | temp |
| trgeometry_segments | temp, count |
| trgeometry_sequence_n | temp |
| trgeometry_sequences | temp, count |
| trgeometry_set_interp | temp |
| trgeometry_space_boxes | temp, sorigin, count |
| trgeometry_space_time_boxes | temp, duration, sorigin, count |
| trgeometry_speed | temp |
| trgeometry_split_each_n_stboxes | temp, count |
| trgeometry_split_n_stboxes | temp, count |
| trgeometry_start_instant | temp |
| trgeometry_start_sequence | temp |
| trgeometry_start_value | temp |
| trgeometry_stboxes | temp, count |
| trgeometry_time_boxes | temp, duration, count |
Expand Down
12 changes: 7 additions & 5 deletions MEOS.NET.Tests/CatalogValueTypeTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,9 @@ namespace MEOS.NET.Tests
{
/// <summary>
/// Whatever the wrapper already states as a C# value — an enum the catalog
/// names, a scalar behind a MEOS typedef, a struct carried by value — the
/// object layer hands on as that value.
/// names, a struct carried by value — the object layer hands on as that
/// value, and a scalar behind a typedef the catalog gives a class held by
/// value comes back as that class.
/// </summary>
[TestClass]
public class CatalogValueTypeTests : MeosTest
Expand All @@ -25,13 +26,14 @@ public void AnEnumArgumentIsTheTextMeosReadsThroughItsPair()
}

[TestMethod]
public void AScalarBehindATypedefComesBackAsThatScalar()
public void AScalarBehindACellTypedefComesBackAsItsClass()
{
Geo point = Geo.FromText("POINT(1 1)", 4326)!;

ulong cell = point.ToS2cellCell(10);
S2Cell cell = point.ToS2cellCell(10);

Assert.AreNotEqual(0UL, cell);
Assert.AreNotEqual(0UL, (ulong)cell);
Assert.AreEqual(10u, cell.GetResolution());
}
}
}
14 changes: 8 additions & 6 deletions MEOS.NET.Tests/OutParameterTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -23,15 +23,17 @@ public void ABoxAnswersTheBoundsItHas()
public void ATemporalH3IndexAnswersTheCellsItHolds()
{
// th3index_value_n and th3index_value_at_timestamptz write an
// H3Index, a uint64_t, through their result pointer.
// H3Index, a uint64_t, through their result pointer, and the
// method answers it as the H3Index it is.
TH3Index cells = (TH3Index)TH3Index.In(
"[831c02fffffffff@2001-01-01, 831c00fffffffff@2001-01-02]")!;
DateTime second = new DateTime(2001, 1, 2, 0, 0, 0, DateTimeKind.Utc);

Assert.AreEqual(0x831c02fffffffffUL, cells.ValueN(1));
Assert.AreEqual(0x831c00fffffffffUL, cells.ValueN(2));
Assert.AreEqual<H3Index?>(new H3Index(0x831c02fffffffffUL), cells.ValueN(1));
Assert.AreEqual<H3Index?>(new H3Index(0x831c00fffffffffUL), cells.ValueN(2));
Assert.IsNull(cells.ValueN(3));
Assert.AreEqual(0x831c00fffffffffUL, cells.ValueAtTimestamptz(second, true));
Assert.AreEqual<H3Index?>(new H3Index(0x831c00fffffffffUL),
cells.ValueAtTimestamptz(second, true));
}

[TestMethod]
Expand All @@ -40,8 +42,8 @@ public void AnH3IndexSetAnswersTheCellsItHolds()
// h3indexset_value_n, over a set MEOS keeps in ascending order.
H3IndexSet set = (H3IndexSet)H3IndexSet.In("{831c02fffffffff, 831c00fffffffff}")!;

Assert.AreEqual(0x831c00fffffffffUL, set.ValueN(1));
Assert.AreEqual(0x831c02fffffffffUL, set.ValueN(2));
Assert.AreEqual<H3Index?>(new H3Index(0x831c00fffffffffUL), set.ValueN(1));
Assert.AreEqual<H3Index?>(new H3Index(0x831c02fffffffffUL), set.ValueN(2));
}

[TestMethod]
Expand Down
44 changes: 44 additions & 0 deletions MEOS.NET.Tests/PortableIoTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,50 @@ public void ATemporalCellIndexAndItsSetHaveTheirClasses()
Assert.AreEqual("{\"8a2a1072b59ffff\"}", set.ToString());
}

[TestMethod]
public void AQuadbinCellRoundTripsThroughItsTextAndWkb()
{
Quadbin cell = Quadbin.FromText("48427fffffffffff");

Assert.AreEqual("48427fffffffffff", cell.AsText());
Assert.AreEqual("48427fffffffffff", cell.ToString());
Assert.AreEqual("01470000FFFFFFFFFF7F4248", cell.AsHexWKB(0));
Assert.AreEqual(cell, Quadbin.FromHexWKB("01470000FFFFFFFFFF7F4248"));
Assert.AreEqual(cell, Quadbin.FromWKB(cell.AsWKB(0)!));
}

[TestMethod]
public void AnS2CellRoundTripsThroughItsTextAndWkb()
{
S2Cell cell = S2Cell.FromText("47c3c444c");

Assert.AreEqual("47c3c444c", cell.AsText());
Assert.AreEqual("47c3c444c", cell.ToString());
Assert.AreEqual("01550000000000C044C4C347", cell.AsHexWKB(0));
Assert.AreEqual(cell, S2Cell.FromHexWKB("01550000000000C044C4C347"));
Assert.AreEqual(cell, S2Cell.FromWKB(cell.AsWKB(0)!));
}

[TestMethod]
public void AnH3CellRoundTripsThroughItsTextAndWkb()
{
H3Index cell = H3Index.FromText("8a2a1072b59ffff");

Assert.AreEqual("8a2a1072b59ffff", cell.AsText());
Assert.AreEqual("8a2a1072b59ffff", cell.ToString());
Assert.AreEqual(cell, H3Index.FromHexWKB(cell.AsHexWKB(0)));
Assert.AreEqual(cell, H3Index.FromWKB(cell.AsWKB(0)!));
}

[TestMethod]
public void ATemporalCellAnswersItsValueAsTheCellClass()
{
TH3Index temp = (TH3Index)TH3Index.FromText("8a2a1072b59ffff@2024-12-06")!;

Assert.AreEqual(H3Index.FromText("8a2a1072b59ffff"), temp.StartValue());
Assert.AreEqual("8a2a1072b59ffff", temp.StartValue().ToString());
}

[TestMethod]
public void AJsonbSetAndATemporalPoseChainHaveTheirClasses()
{
Expand Down
6 changes: 6 additions & 0 deletions MEOS.NET/Enums/MeosOper.g.cs
Original file line number Diff line number Diff line change
Expand Up @@ -141,5 +141,11 @@ public enum MeosOper
/// <summary><c>TEMPCONTAINED_OP</c></summary>
TempcontainedOp = 44,

/// <summary><c>EVEROVERLAPS_OP</c></summary>
EveroverlapsOp = 45,

/// <summary><c>ALWAYSOVERLAPS_OP</c></summary>
AlwaysoverlapsOp = 46,

}
}
Loading
Loading