diff --git a/GAP-LEDGER.md b/GAP-LEDGER.md index aaf4dfd..8c16085 100644 --- a/GAP-LEDGER.md +++ b/GAP-LEDGER.md @@ -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 `af8640985336c41cf98467783f7eb4e9e0d1e0f0` by `tools/codegen.py` +Generated from `meos-idl.json` at MobilityDB `eb4454101301017dc26c4ec00ca1ac7a72f53910` by `tools/codegen.py` and `tools/objectgen.py`. Do not edit. ## The flat surface — `tools/codegen.py` -### parameter nullability — 4401 +### parameter nullability — 4446 `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. @@ -346,8 +346,12 @@ and `tools/objectgen.py`. Do not edit. | always_overlaps_tposechain_stbox | temp, box | | always_overlaps_trgeometry_stbox | temp, box | | always_overlaps_tstzspan_temporal | s, temp | +| araster_tile_value | traj, rq, vspan | +| araster_tile_value_array | traj, rqarr, vspan | +| araster_tile_value_series | traj, rqarr, spans, vspan | | araster_value | traj, rast, vspan | | araster_value_gdal | traj, path, vspan | +| araster_value_series | traj, rasts, spans, vspan | | atouches_cbuffer_tcbuffer | cb, temp | | atouches_geo_tcbuffer | gs, temp | | atouches_geo_tgeo | gs, temp | @@ -792,8 +796,12 @@ and `tools/objectgen.py`. Do not edit. | eintersects_trgeometry_trgeometry | temp1, temp2 | | ensure_bbox_temporal_compatible | temp | | ensure_index_result | result | +| eraster_tile_value | traj, rq, vspan | +| eraster_tile_value_array | traj, rqarr, vspan | +| eraster_tile_value_series | traj, rqarr, spans, vspan | | eraster_value | traj, rast, vspan | | eraster_value_gdal | traj, path, vspan | +| eraster_value_series | traj, rasts, spans, vspan | | etouches_cbuffer_tcbuffer | cb, temp | | etouches_geo_tcbuffer | gs, temp | | etouches_geo_tgeo | gs, temp | @@ -1045,7 +1053,9 @@ and `tools/objectgen.py`. Do not edit. | geo_as_ewkt | gs, size_out | | geo_as_geojson | gs, size_out | | geo_as_hexewkb | gs, size_out | +| geo_as_hexwkb | gs, size_out | | geo_as_text | gs, size_out | +| geo_as_wkb | gs, size | | geo_centroid | gs | | geo_clip_linear_geom | line, gs | | geo_clip_subject | gs | @@ -1078,6 +1088,7 @@ and `tools/objectgen.py`. Do not edit. | geo_meos_coverage | gs | | geo_merge_each_n_stboxes | gs, count | | geo_merge_n_stboxes | gs, count | +| geo_merge_query_stboxes | gs, query, count | | geo_num_geos | gs | | geo_num_points | gs | | geo_out | gs, size_out | @@ -1127,6 +1138,9 @@ and `tools/objectgen.py`. Do not edit. | geog_disjoint | gs1, gs2 | | geog_distance | g1, g2 | | geog_dwithin | g1, g2 | +| geog_from_ewkb | wkb | +| geog_from_ewkt | ewkt | +| geog_from_geojson | geojson | | geog_from_hexewkb | hexwkb | | geog_in | str | | geog_intersects | gs1, gs2 | @@ -1154,6 +1168,7 @@ and `tools/objectgen.py`. Do not edit. | geom_dwithin | gs1, gs2 | | geom_dwithin2d | gs1, gs2 | | geom_dwithin3d | gs1, gs2 | +| geom_from_ewkt | ewkt | | geom_from_hexewkb | hexwkb | | geom_in | str | | geom_intersection2d | gs1, gs2 | @@ -2012,10 +2027,12 @@ and `tools/objectgen.py`. Do not edit. | overright_value_span | s | | overright_value_spanset | ss | | pcpatch_as_hexwkb | pa, size_out | +| pcpatch_as_wkb | pa, size_out | | pcpatch_cmp | pa1, pa2 | | pcpatch_copy | pa | | pcpatch_eq | pa1, pa2 | | pcpatch_from_hexwkb | hexwkb | +| pcpatch_from_wkb | wkb | | pcpatch_ge | pa1, pa2 | | pcpatch_get_pcid | pa | | pcpatch_gt | pa1, pa2 | @@ -2044,10 +2061,12 @@ and `tools/objectgen.py`. Do not edit. | pcpatchset_value_n | s, result | | pcpatchset_values | s, count | | pcpoint_as_hexwkb | pt, size_out | +| pcpoint_as_wkb | pt, size_out | | pcpoint_cmp | pt1, pt2 | | pcpoint_copy | pt | | pcpoint_eq | pt1, pt2 | | pcpoint_from_hexwkb | hexwkb | +| pcpoint_from_wkb | wkb | | pcpoint_ge | pt1, pt2 | | pcpoint_get_dim | pt, name, out | | pcpoint_get_pcid | pt | @@ -2206,6 +2225,7 @@ and `tools/objectgen.py`. Do not edit. | quadbinset_uncompact_cells | cells | | quadbinset_value_n | s, result | | quadbinset_values | s, count | +| raquet_as_coveragejson | rq, size_out | | raquet_as_hexwkb | rq, size_out | | raquet_as_wkb | rq, size_out | | raquet_band_has_nodata_value | rq | @@ -2215,6 +2235,7 @@ and `tools/objectgen.py`. Do not edit. | raquet_copy | rq | | raquet_eq | rq1, rq2 | | raquet_from_hexwkb | hexwkb | +| raquet_from_row | data, metadata | | raquet_from_wkb | wkb | | raquet_ge | rq1, rq2 | | raquet_gt | rq1, rq2 | @@ -2236,10 +2257,16 @@ and `tools/objectgen.py`. Do not edit. | raquet_width | rq | | raster_add_band | rast, pixeltype | | raster_add_band_raster | torast, fromrast | +| raster_as_coveragejson | rast, size_out | +| raster_as_gdal | rast, format, size_out | | raster_as_hexwkb | rast, size_out | +| raster_as_jpeg | rast, size_out | +| raster_as_png | rast, size_out | +| raster_as_tiff | rast, size_out | | raster_as_wkb | rast, size_out | | raster_at_value | traj, rast, vspan | | raster_at_value_gdal | traj, path, vspan | +| raster_at_value_series | traj, rasts, spans, vspan | | raster_band_has_nodata_value | rast | | raster_band_nodata_value | rast, result | | raster_band_pixel_type | rast, size_out | @@ -2248,6 +2275,7 @@ and `tools/objectgen.py`. Do not edit. | raster_copy | rast | | raster_dump_as_polygons | rast, count | | raster_dump_values | rast, nodata, count | +| raster_from_gdal | data | | raster_from_hexwkb | hexwkb | | raster_from_wkb | wkb | | raster_height | rast | @@ -2256,6 +2284,7 @@ and `tools/objectgen.py`. Do not edit. | raster_mem_size | rast | | raster_minus_value | traj, rast, vspan | | raster_minus_value_gdal | traj, path, vspan | +| raster_minus_value_series | traj, rasts, spans, vspan | | raster_not_same_alignment_reason | rast1, rast2, size_out | | raster_num_bands | rast | | raster_pixel_as_points | rast, count | @@ -2270,9 +2299,16 @@ and `tools/objectgen.py`. Do not edit. | raster_slope | rast, pixeltype, units | | raster_srid | rast | | raster_summary_stats | rast | +| raster_tile_at_value | traj, rq, vspan | +| raster_tile_at_value_array | traj, rqarr, vspan | +| raster_tile_at_value_series | traj, rqarr, spans, vspan | +| raster_tile_minus_value | traj, rq, vspan | +| raster_tile_minus_value_array | traj, rqarr, vspan | +| raster_tile_minus_value_series | traj, rqarr, spans, vspan | | raster_tile_value | traj, rq | | raster_tile_value_array | traj, rqarr | | raster_tile_value_quadbin | traj, pixels | +| raster_tile_value_series | traj, rqarr, spans | | raster_to_stbox | rast | | raster_tpi | rast, pixeltype | | raster_transform | rast, algorithm | @@ -2284,6 +2320,7 @@ and `tools/objectgen.py`. Do not edit. | raster_value | traj, rast, resample | | raster_value_count | rast, count | | raster_value_gdal | traj, path | +| raster_value_series | traj, rasts, spans | | raster_width | rast | | rasteralignstate_deserialize | bytes | | rasteralignstate_serialize | state, size_out | @@ -2431,6 +2468,7 @@ and `tools/objectgen.py`. Do not edit. | set_mem_size | s | | set_merge_each_n_spans | s, count | | set_merge_n_spans | s, count | +| set_merge_query_spans | s, query, count | | set_ne | s1, s2 | | set_num_values | s | | set_out | s, size_out | @@ -2535,6 +2573,7 @@ and `tools/objectgen.py`. Do not edit. | spanset_mem_size | ss | | spanset_merge_each_n_spans | ss, count | | spanset_merge_n_spans | ss, count | +| spanset_merge_query_spans | ss, query, count | | spanset_ne | ss1, ss2 | | spanset_num_spans | ss | | spanset_out | ss, size_out | @@ -3008,6 +3047,7 @@ and `tools/objectgen.py`. Do not edit. | temporal_merge_combinefn | state1, state2 | | temporal_merge_each_n_spans | temp, count | | temporal_merge_n_spans | temp, count | +| temporal_merge_query_spans | temp, query, count | | temporal_min_inst_p | temp | | temporal_min_instant | temp | | temporal_min_value | temp | @@ -3185,6 +3225,7 @@ and `tools/objectgen.py`. Do not edit. | textset_upper | s | | textset_value_n | s, result | | textset_values | s, count | +| tfloat_as_coveragejson | temp, traj, size_out | | tfloat_at_value | temp | | tfloat_ceil | temp | | tfloat_cos | temp | @@ -3260,6 +3301,7 @@ and `tools/objectgen.py`. Do not edit. | tgeo_from_base_temp | gs, temp | | tgeo_merge_each_n_stboxes | temp, count | | tgeo_merge_n_stboxes | temp, count | +| tgeo_merge_query_stboxes | temp, query, count | | tgeo_minus_geom | temp, gs | | tgeo_minus_stbox | temp, box | | tgeo_minus_value | temp, gs | @@ -3736,6 +3778,7 @@ and `tools/objectgen.py`. Do not edit. | tnumber_integral | temp | | tnumber_merge_each_n_tboxes | temp, count | | tnumber_merge_n_tboxes | temp, count | +| tnumber_merge_query_tboxes | temp, query, count | | tnumber_minus_span | temp, span | | tnumber_minus_spanset | temp, ss | | tnumber_minus_tbox | temp, box | @@ -3917,6 +3960,7 @@ and `tools/objectgen.py`. Do not edit. | tpoint_twcentroid | temp | | tpointcloud_merge_each_n_tpcboxes | temp, count | | tpointcloud_merge_n_tpcboxes | temp, count | +| tpointcloud_merge_query_tpcboxes | temp, query, count | | tpointcloud_split_each_n_tpcboxes | temp, count | | tpointcloud_split_n_tpcboxes | temp, count | | tpointcloud_to_tpcbox | temp | @@ -4062,6 +4106,7 @@ and `tools/objectgen.py`. Do not edit. | trgeometry_length | temp | | trgeometry_merge_each_n_stboxes | temp, count | | trgeometry_merge_n_stboxes | temp, count | +| trgeometry_merge_query_stboxes | temp, query, count | | trgeometry_minus_geom | temp, gs | | trgeometry_minus_stbox | temp, box | | trgeometry_minus_value | temp, pose | @@ -4462,13 +4507,12 @@ An `outputArrays` parameter with no length source, so the count of what the call None in this run. -### value text I/O — 5 +### value text I/O — 4 A struct the binding carries as a value and the catalog names no complete text reader and writer for, so the value states itself in no form a caller can read or write. | struct | what is missing | | --- | --- | -| BandStats | serialization names in=None out=None | | Match | serialization names in=None out=None | | RasterStatsState | serialization names in=None out=None | | ValueCount | serialization names in=None out=None | @@ -4498,11 +4542,23 @@ The function answers a type no class stands for and no scalar, value struct or a None in this run. -### argument needs a class — 0 +### argument needs a class — 11 The function takes a type no class stands for and no marshalling rule reads, so there is nothing for a caller to pass. -None in this run. +| class | member | what is missing | +| --- | --- | --- | +| Raster | aTileValueSeries | argument rqarr of type Raquet ** needs marshalling | +| Raster | aValueSeries | argument rasts of type Raster ** needs marshalling | +| Raster | atValueSeries | argument rasts of type Raster ** needs marshalling | +| Raster | eTileValueSeries | argument rqarr of type Raquet ** needs marshalling | +| Raster | eValueSeries | argument rasts of type Raster ** needs marshalling | +| Raster | minusValueSeries | argument rasts of type Raster ** needs marshalling | +| Raster | setValues | argument noset of type bool * needs marshalling | +| Raster | tileAtValueSeries | argument rqarr of type Raquet ** needs marshalling | +| Raster | tileMinusValueSeries | argument rqarr of type Raquet ** needs marshalling | +| Raster | tileValueSeries | argument rqarr of type Raquet ** needs marshalling | +| Raster | valueSeries | argument rasts of type Raster ** needs marshalling | ### overloads of one C# signature — 0 diff --git a/MEOS.NET/Enums/MeosType.g.cs b/MEOS.NET/Enums/MeosType.g.cs index 42748e6..3ad2916 100644 --- a/MEOS.NET/Enums/MeosType.g.cs +++ b/MEOS.NET/Enums/MeosType.g.cs @@ -270,8 +270,11 @@ public enum MeosType /// T_TS2CELL TTs2cell = 87, + /// T_RASTER + TRaster = 88, + /// NUM_MEOS_TYPES - NumMeosTypes = 88, + NumMeosTypes = 89, } } diff --git a/MEOS.NET/Functions/Meos.Native.g.cs b/MEOS.NET/Functions/Meos.Native.g.cs index ed6476f..370e723 100644 --- a/MEOS.NET/Functions/Meos.Native.g.cs +++ b/MEOS.NET/Functions/Meos.Native.g.cs @@ -1133,6 +1133,9 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "set_merge_n_spans", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr SetMergeNSpans(IntPtr s, int span_count, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "set_merge_query_spans", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr SetMergeQuerySpans(IntPtr s, IntPtr query, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "set_split_each_n_spans", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr SetSplitEachNSpans(IntPtr s, int elems_per_span, IntPtr count); @@ -1148,6 +1151,9 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "spanset_merge_n_spans", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr SpansetMergeNSpans(IntPtr ss, int span_count, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "spanset_merge_query_spans", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr SpansetMergeQuerySpans(IntPtr ss, IntPtr query, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "spanset_split_each_n_spans", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr SpansetSplitEachNSpans(IntPtr ss, int elems_per_span, IntPtr count); @@ -4239,6 +4245,9 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "temporal_merge_n_spans", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TemporalMergeNSpans(IntPtr temp, int span_count, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "temporal_merge_query_spans", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr TemporalMergeQuerySpans(IntPtr temp, IntPtr query, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "temporal_split_each_n_spans", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TemporalSplitEachNSpans(IntPtr temp, int elem_count, IntPtr count); @@ -4251,6 +4260,9 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "tnumber_merge_n_tboxes", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TnumberMergeNTboxes(IntPtr temp, int box_count, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "tnumber_merge_query_tboxes", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr TnumberMergeQueryTboxes(IntPtr temp, IntPtr query, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "tnumber_split_each_n_tboxes", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TnumberSplitEachNTboxes(IntPtr temp, int elem_count, IntPtr count); @@ -5505,9 +5517,15 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "geo_as_hexewkb", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr GeoAsHexewkb(IntPtr gs, string endian, out nuint size_out); + [LibraryImport(DllPath, EntryPoint = "geo_as_hexwkb", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr GeoAsHexwkb(IntPtr gs, string endian, out nuint size_out); + [LibraryImport(DllPath, EntryPoint = "geo_as_text", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr GeoAsText(IntPtr gs, int precision, out nuint size_out); + [LibraryImport(DllPath, EntryPoint = "geo_as_wkb", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr GeoAsWkb(IntPtr gs, string endian, IntPtr size); + [LibraryImport(DllPath, EntryPoint = "geo_from_ewkb", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr GeoFromEwkb(IntPtr wkb, ulong wkb_size, int srid); @@ -5520,12 +5538,24 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "geo_out", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr GeoOut(IntPtr gs, out nuint size_out); + [LibraryImport(DllPath, EntryPoint = "geog_from_ewkb", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr GeogFromEwkb(IntPtr wkb, ulong wkb_size); + + [LibraryImport(DllPath, EntryPoint = "geog_from_ewkt", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr GeogFromEwkt(string ewkt); + + [LibraryImport(DllPath, EntryPoint = "geog_from_geojson", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr GeogFromGeojson(string geojson); + [LibraryImport(DllPath, EntryPoint = "geog_from_hexewkb", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr GeogFromHexewkb(string hexwkb); [LibraryImport(DllPath, EntryPoint = "geog_in", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr GeogIn(string str, int typmod); + [LibraryImport(DllPath, EntryPoint = "geom_from_ewkt", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr GeomFromEwkt(string ewkt); + [LibraryImport(DllPath, EntryPoint = "geom_from_hexewkb", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr GeomFromHexewkb(string hexwkb); @@ -5778,6 +5808,9 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "geo_merge_n_stboxes", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr GeoMergeNStboxes(IntPtr gs, int box_count, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "geo_merge_query_stboxes", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr GeoMergeQueryStboxes(IntPtr gs, IntPtr query, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "geo_split_each_n_stboxes", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr GeoSplitEachNStboxes(IntPtr gs, int elem_count, IntPtr count); @@ -6570,6 +6603,9 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "tgeo_merge_n_stboxes", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TgeoMergeNStboxes(IntPtr temp, int box_count, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "tgeo_merge_query_stboxes", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr TgeoMergeQueryStboxes(IntPtr temp, IntPtr query, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "tgeo_split_each_n_stboxes", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TgeoSplitEachNStboxes(IntPtr temp, int elem_count, IntPtr count); @@ -11664,11 +11700,17 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "pcpoint_hex_out", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr PcpointHexOut(IntPtr pt, int maxdd, out nuint size_out); + [LibraryImport(DllPath, EntryPoint = "pcpoint_as_hexwkb", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr PcpointAsHexwkb(IntPtr pt, byte variant, out nuint size_out); + + [LibraryImport(DllPath, EntryPoint = "pcpoint_as_wkb", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr PcpointAsWkb(IntPtr pt, byte variant, IntPtr size_out); + [LibraryImport(DllPath, EntryPoint = "pcpoint_from_hexwkb", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr PcpointFromHexwkb(string hexwkb); - [LibraryImport(DllPath, EntryPoint = "pcpoint_as_hexwkb", StringMarshalling = StringMarshalling.Utf8)] - internal static partial IntPtr PcpointAsHexwkb(IntPtr pt, out nuint size_out); + [LibraryImport(DllPath, EntryPoint = "pcpoint_from_wkb", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr PcpointFromWkb(IntPtr wkb, ulong size); [LibraryImport(DllPath, EntryPoint = "pcpoint_make", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr PcpointMake(uint pcid, IntPtr values, int count); @@ -11783,11 +11825,17 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "pcpatch_hex_out", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr PcpatchHexOut(IntPtr pa, int maxdd, out nuint size_out); + [LibraryImport(DllPath, EntryPoint = "pcpatch_as_hexwkb", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr PcpatchAsHexwkb(IntPtr pa, byte variant, out nuint size_out); + + [LibraryImport(DllPath, EntryPoint = "pcpatch_as_wkb", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr PcpatchAsWkb(IntPtr pa, byte variant, IntPtr size_out); + [LibraryImport(DllPath, EntryPoint = "pcpatch_from_hexwkb", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr PcpatchFromHexwkb(string hexwkb); - [LibraryImport(DllPath, EntryPoint = "pcpatch_as_hexwkb", StringMarshalling = StringMarshalling.Utf8)] - internal static partial IntPtr PcpatchAsHexwkb(IntPtr pa, out nuint size_out); + [LibraryImport(DllPath, EntryPoint = "pcpatch_from_wkb", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr PcpatchFromWkb(IntPtr wkb, ulong size); [LibraryImport(DllPath, EntryPoint = "pcpatch_make", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr PcpatchMake(IntPtr points, int count); @@ -12005,6 +12053,9 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "tpointcloud_merge_n_tpcboxes", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TpointcloudMergeNTpcboxes(IntPtr temp, int box_count, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "tpointcloud_merge_query_tpcboxes", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr TpointcloudMergeQueryTpcboxes(IntPtr temp, IntPtr query, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "tpointcloud_merge_each_n_tpcboxes", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TpointcloudMergeEachNTpcboxes(IntPtr temp, int elem_count, IntPtr count); @@ -14011,6 +14062,9 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "raquet_as_hexwkb", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr RaquetAsHexwkb(IntPtr rq, byte variant, out nuint size_out); + [LibraryImport(DllPath, EntryPoint = "raquet_as_coveragejson", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RaquetAsCoveragejson(IntPtr rq, out nuint size_out); + [LibraryImport(DllPath, EntryPoint = "raquet_make", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr RaquetMake(ulong quadbin, int width, int height, int pixtype, double nodata, [MarshalAs(UnmanagedType.U1)] bool has_nodata, IntPtr pixels, ulong pixels_size); @@ -14023,6 +14077,9 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "raquet_read_bytes", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr RaquetReadBytes(IntPtr data, ulong size, ulong quadbin); + [LibraryImport(DllPath, EntryPoint = "raquet_from_row", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RaquetFromRow(ulong block, IntPtr data, ulong size, string metadata, int band); + [LibraryImport(DllPath, EntryPoint = "raquet_quadbin", StringMarshalling = StringMarshalling.Utf8)] internal static partial ulong RaquetQuadbin(IntPtr rq); @@ -14058,6 +14115,24 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "raster_from_wkb", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr RasterFromWkb(IntPtr wkb, ulong size); + [LibraryImport(DllPath, EntryPoint = "raster_as_coveragejson", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterAsCoveragejson(IntPtr rast, out nuint size_out); + + [LibraryImport(DllPath, EntryPoint = "raster_as_gdal", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterAsGdal(IntPtr rast, string format, IntPtr options, int count, int srid, IntPtr size_out); + + [LibraryImport(DllPath, EntryPoint = "raster_as_tiff", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterAsTiff(IntPtr rast, IntPtr options, int count, int srid, IntPtr size_out); + + [LibraryImport(DllPath, EntryPoint = "raster_as_png", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterAsPng(IntPtr rast, IntPtr options, int count, IntPtr size_out); + + [LibraryImport(DllPath, EntryPoint = "raster_as_jpeg", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterAsJpeg(IntPtr rast, IntPtr options, int count, IntPtr size_out); + + [LibraryImport(DllPath, EntryPoint = "raster_from_gdal", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterFromGdal(IntPtr data, ulong size, int srid); + [LibraryImport(DllPath, EntryPoint = "raster_from_hexwkb", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr RasterFromHexwkb(string hexwkb); @@ -14361,12 +14436,69 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "raster_tile_value_quadbin", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr RasterTileValueQuadbin(IntPtr traj, IntPtr pixels, ulong pixels_size, int width, int height, ulong quadbin, int pixtype, double nodata, [MarshalAs(UnmanagedType.U1)] bool has_nodata); + [LibraryImport(DllPath, EntryPoint = "tfloat_as_coveragejson", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr TfloatAsCoveragejson(IntPtr temp, IntPtr traj, out nuint size_out); + [LibraryImport(DllPath, EntryPoint = "raster_tile_value", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr RasterTileValue(IntPtr traj, IntPtr rq); [LibraryImport(DllPath, EntryPoint = "raster_tile_value_array", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr RasterTileValueArray(IntPtr traj, IntPtr rqarr, int count); + [LibraryImport(DllPath, EntryPoint = "raster_tile_at_value", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterTileAtValue(IntPtr traj, IntPtr rq, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "raster_tile_minus_value", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterTileMinusValue(IntPtr traj, IntPtr rq, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "eraster_tile_value", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int ErasterTileValue(IntPtr traj, IntPtr rq, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "araster_tile_value", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int ArasterTileValue(IntPtr traj, IntPtr rq, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "raster_tile_at_value_array", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterTileAtValueArray(IntPtr traj, IntPtr rqarr, int count, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "raster_tile_minus_value_array", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterTileMinusValueArray(IntPtr traj, IntPtr rqarr, int count, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "eraster_tile_value_array", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int ErasterTileValueArray(IntPtr traj, IntPtr rqarr, int count, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "araster_tile_value_array", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int ArasterTileValueArray(IntPtr traj, IntPtr rqarr, int count, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "raster_value_series", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterValueSeries(IntPtr traj, IntPtr rasts, IntPtr spans, int count, int band); + + [LibraryImport(DllPath, EntryPoint = "raster_at_value_series", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterAtValueSeries(IntPtr traj, IntPtr rasts, IntPtr spans, int count, int band, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "raster_minus_value_series", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterMinusValueSeries(IntPtr traj, IntPtr rasts, IntPtr spans, int count, int band, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "eraster_value_series", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int ErasterValueSeries(IntPtr traj, IntPtr rasts, IntPtr spans, int count, int band, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "araster_value_series", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int ArasterValueSeries(IntPtr traj, IntPtr rasts, IntPtr spans, int count, int band, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "raster_tile_value_series", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterTileValueSeries(IntPtr traj, IntPtr rqarr, IntPtr spans, int count); + + [LibraryImport(DllPath, EntryPoint = "raster_tile_at_value_series", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterTileAtValueSeries(IntPtr traj, IntPtr rqarr, IntPtr spans, int count, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "raster_tile_minus_value_series", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr RasterTileMinusValueSeries(IntPtr traj, IntPtr rqarr, IntPtr spans, int count, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "eraster_tile_value_series", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int ErasterTileValueSeries(IntPtr traj, IntPtr rqarr, IntPtr spans, int count, IntPtr vspan); + + [LibraryImport(DllPath, EntryPoint = "araster_tile_value_series", StringMarshalling = StringMarshalling.Utf8)] + internal static partial int ArasterTileValueSeries(IntPtr traj, IntPtr rqarr, IntPtr spans, int count, IntPtr vspan); + [LibraryImport(DllPath, EntryPoint = "trgeometry_in", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TrgeometryIn(string str); @@ -14483,6 +14615,9 @@ private static partial class Native [LibraryImport(DllPath, EntryPoint = "trgeometry_merge_n_stboxes", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TrgeometryMergeNStboxes(IntPtr temp, int box_count, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "trgeometry_merge_query_stboxes", StringMarshalling = StringMarshalling.Utf8)] + internal static partial IntPtr TrgeometryMergeQueryStboxes(IntPtr temp, IntPtr query, IntPtr count); + [LibraryImport(DllPath, EntryPoint = "trgeometry_split_each_n_stboxes", StringMarshalling = StringMarshalling.Utf8)] internal static partial IntPtr TrgeometrySplitEachNStboxes(IntPtr temp, int elem_count, IntPtr count); diff --git a/MEOS.NET/Functions/Meos.meos.g.cs b/MEOS.NET/Functions/Meos.meos.g.cs index 09fc08e..34c40ef 100644 --- a/MEOS.NET/Functions/Meos.meos.g.cs +++ b/MEOS.NET/Functions/Meos.meos.g.cs @@ -1518,6 +1518,21 @@ public static IntPtr[] SetMergeNSpans(IntPtr s, int span_count) finally { Marshal.FreeHGlobal(_cnt); } } + public static IntPtr[] SetMergeQuerySpans(IntPtr s, IntPtr query) + { + IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); + try + { + IntPtr _p = SafeExecution(() => Native.SetMergeQuerySpans(s, query, _cnt)); + int _n = Marshal.ReadInt32(_cnt); + IntPtr[] _out = new IntPtr[_n]; + for (int _i = 0; _i < _n; _i++) + { _out[_i] = IntPtr.Add(_p, _i * 24); } + return _out; + } + finally { Marshal.FreeHGlobal(_cnt); } + } + public static IntPtr[] SetSplitEachNSpans(IntPtr s, int elems_per_span) { IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); @@ -1593,6 +1608,21 @@ public static IntPtr[] SpansetMergeNSpans(IntPtr ss, int span_count) finally { Marshal.FreeHGlobal(_cnt); } } + public static IntPtr[] SpansetMergeQuerySpans(IntPtr ss, IntPtr query) + { + IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); + try + { + IntPtr _p = SafeExecution(() => Native.SpansetMergeQuerySpans(ss, query, _cnt)); + int _n = Marshal.ReadInt32(_cnt); + IntPtr[] _out = new IntPtr[_n]; + for (int _i = 0; _i < _n; _i++) + { _out[_i] = IntPtr.Add(_p, _i * 24); } + return _out; + } + finally { Marshal.FreeHGlobal(_cnt); } + } + public static IntPtr[] SpansetSplitEachNSpans(IntPtr ss, int elems_per_span) { IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); @@ -4844,6 +4874,21 @@ public static IntPtr[] TemporalMergeNSpans(IntPtr temp, int span_count) finally { Marshal.FreeHGlobal(_cnt); } } + public static IntPtr[] TemporalMergeQuerySpans(IntPtr temp, IntPtr query) + { + IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); + try + { + IntPtr _p = SafeExecution(() => Native.TemporalMergeQuerySpans(temp, query, _cnt)); + int _n = Marshal.ReadInt32(_cnt); + IntPtr[] _out = new IntPtr[_n]; + for (int _i = 0; _i < _n; _i++) + { _out[_i] = IntPtr.Add(_p, _i * 24); } + return _out; + } + finally { Marshal.FreeHGlobal(_cnt); } + } + public static IntPtr[] TemporalSplitEachNSpans(IntPtr temp, int elem_count) { IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); @@ -4904,6 +4949,21 @@ public static IntPtr[] TnumberMergeNTboxes(IntPtr temp, int box_count) finally { Marshal.FreeHGlobal(_cnt); } } + public static IntPtr[] TnumberMergeQueryTboxes(IntPtr temp, IntPtr query) + { + IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); + try + { + IntPtr _p = SafeExecution(() => Native.TnumberMergeQueryTboxes(temp, query, _cnt)); + int _n = Marshal.ReadInt32(_cnt); + IntPtr[] _out = new IntPtr[_n]; + for (int _i = 0; _i < _n; _i++) + { _out[_i] = IntPtr.Add(_p, _i * 56); } + return _out; + } + finally { Marshal.FreeHGlobal(_cnt); } + } + public static IntPtr[] TnumberSplitEachNTboxes(IntPtr temp, int elem_count) { IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); diff --git a/MEOS.NET/Functions/Meos.meos_geo.g.cs b/MEOS.NET/Functions/Meos.meos_geo.g.cs index bdefbbc..dafc93a 100644 --- a/MEOS.NET/Functions/Meos.meos_geo.g.cs +++ b/MEOS.NET/Functions/Meos.meos_geo.g.cs @@ -119,6 +119,25 @@ public static string GeoAsHexewkb(IntPtr gs, string endian) } } + public static string GeoAsHexwkb(IntPtr gs, string endian) + { + nuint _size = 0; + IntPtr _p = SafeExecution(() => Native.GeoAsHexwkb(gs, endian, out _size)); + if (_p == IntPtr.Zero) + { + return null!; + } + + try + { + return Marshal.PtrToStringUTF8(_p, (int)_size - 1); + } + finally + { + Marshal.FreeCoTaskMem(_p); + } + } + public static string GeoAsText(IntPtr gs, int precision) { nuint _size = 0; @@ -138,6 +157,9 @@ public static string GeoAsText(IntPtr gs, int precision) } } + public static IntPtr GeoAsWkb(IntPtr gs, string endian, IntPtr size) + => SafeExecution(() => Native.GeoAsWkb(gs, endian, size)); + public static IntPtr GeoFromEwkb(IntPtr wkb, ulong wkb_size, int srid) => SafeExecution(() => Native.GeoFromEwkb(wkb, wkb_size, srid)); @@ -166,12 +188,24 @@ public static string GeoOut(IntPtr gs) } } + public static IntPtr GeogFromEwkb(IntPtr wkb, ulong wkb_size) + => SafeExecution(() => Native.GeogFromEwkb(wkb, wkb_size)); + + public static IntPtr GeogFromEwkt(string ewkt) + => SafeExecution(() => Native.GeogFromEwkt(ewkt)); + + public static IntPtr GeogFromGeojson(string geojson) + => SafeExecution(() => Native.GeogFromGeojson(geojson)); + public static IntPtr GeogFromHexewkb(string hexwkb) => SafeExecution(() => Native.GeogFromHexewkb(hexwkb)); public static IntPtr GeogIn(string str, int typmod) => SafeExecution(() => Native.GeogIn(str, typmod)); + public static IntPtr GeomFromEwkt(string ewkt) + => SafeExecution(() => Native.GeomFromEwkt(ewkt)); + public static IntPtr GeomFromHexewkb(string hexwkb) => SafeExecution(() => Native.GeomFromHexewkb(hexwkb)); @@ -473,6 +507,21 @@ public static IntPtr[] GeoMergeNStboxes(IntPtr gs, int box_count) finally { Marshal.FreeHGlobal(_cnt); } } + public static IntPtr[] GeoMergeQueryStboxes(IntPtr gs, IntPtr query) + { + IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); + try + { + IntPtr _p = SafeExecution(() => Native.GeoMergeQueryStboxes(gs, query, _cnt)); + int _n = Marshal.ReadInt32(_cnt); + IntPtr[] _out = new IntPtr[_n]; + for (int _i = 0; _i < _n; _i++) + { _out[_i] = IntPtr.Add(_p, _i * 80); } + return _out; + } + finally { Marshal.FreeHGlobal(_cnt); } + } + public static IntPtr[] GeoSplitEachNStboxes(IntPtr gs, int elem_count) { IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); @@ -1568,6 +1617,21 @@ public static IntPtr[] TgeoMergeNStboxes(IntPtr temp, int box_count) finally { Marshal.FreeHGlobal(_cnt); } } + public static IntPtr[] TgeoMergeQueryStboxes(IntPtr temp, IntPtr query) + { + IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); + try + { + IntPtr _p = SafeExecution(() => Native.TgeoMergeQueryStboxes(temp, query, _cnt)); + int _n = Marshal.ReadInt32(_cnt); + IntPtr[] _out = new IntPtr[_n]; + for (int _i = 0; _i < _n; _i++) + { _out[_i] = IntPtr.Add(_p, _i * 80); } + return _out; + } + finally { Marshal.FreeHGlobal(_cnt); } + } + public static IntPtr[] TgeoSplitEachNStboxes(IntPtr temp, int elem_count) { IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); diff --git a/MEOS.NET/Functions/Meos.meos_pointcloud.g.cs b/MEOS.NET/Functions/Meos.meos_pointcloud.g.cs index 29fcedc..b20b19f 100644 --- a/MEOS.NET/Functions/Meos.meos_pointcloud.g.cs +++ b/MEOS.NET/Functions/Meos.meos_pointcloud.g.cs @@ -31,13 +31,10 @@ public static string PcpointHexOut(IntPtr pt, int maxdd) } } - public static IntPtr PcpointFromHexwkb(string hexwkb) - => SafeExecution(() => Native.PcpointFromHexwkb(hexwkb)); - - public static string PcpointAsHexwkb(IntPtr pt) + public static string PcpointAsHexwkb(IntPtr pt, byte variant) { nuint _size = 0; - IntPtr _p = SafeExecution(() => Native.PcpointAsHexwkb(pt, out _size)); + IntPtr _p = SafeExecution(() => Native.PcpointAsHexwkb(pt, variant, out _size)); if (_p == IntPtr.Zero) { return null!; @@ -53,6 +50,15 @@ public static string PcpointAsHexwkb(IntPtr pt) } } + public static IntPtr PcpointAsWkb(IntPtr pt, byte variant, IntPtr size_out) + => SafeExecution(() => Native.PcpointAsWkb(pt, variant, size_out)); + + public static IntPtr PcpointFromHexwkb(string hexwkb) + => SafeExecution(() => Native.PcpointFromHexwkb(hexwkb)); + + public static IntPtr PcpointFromWkb(IntPtr wkb, ulong size) + => SafeExecution(() => Native.PcpointFromWkb(wkb, size)); + public static IntPtr PcpointMake(uint pcid, IntPtr values, int count) => SafeExecution(() => Native.PcpointMake(pcid, values, count)); @@ -171,13 +177,10 @@ public static string PcpatchHexOut(IntPtr pa, int maxdd) } } - public static IntPtr PcpatchFromHexwkb(string hexwkb) - => SafeExecution(() => Native.PcpatchFromHexwkb(hexwkb)); - - public static string PcpatchAsHexwkb(IntPtr pa) + public static string PcpatchAsHexwkb(IntPtr pa, byte variant) { nuint _size = 0; - IntPtr _p = SafeExecution(() => Native.PcpatchAsHexwkb(pa, out _size)); + IntPtr _p = SafeExecution(() => Native.PcpatchAsHexwkb(pa, variant, out _size)); if (_p == IntPtr.Zero) { return null!; @@ -193,6 +196,15 @@ public static string PcpatchAsHexwkb(IntPtr pa) } } + public static IntPtr PcpatchAsWkb(IntPtr pa, byte variant, IntPtr size_out) + => SafeExecution(() => Native.PcpatchAsWkb(pa, variant, size_out)); + + public static IntPtr PcpatchFromHexwkb(string hexwkb) + => SafeExecution(() => Native.PcpatchFromHexwkb(hexwkb)); + + public static IntPtr PcpatchFromWkb(IntPtr wkb, ulong size) + => SafeExecution(() => Native.PcpatchFromWkb(wkb, size)); + public static IntPtr PcpatchMake(IntPtr points, int count) => SafeExecution(() => Native.PcpatchMake(points, count)); @@ -545,6 +557,21 @@ public static IntPtr[] TpointcloudMergeNTpcboxes(IntPtr temp, int box_count) finally { Marshal.FreeHGlobal(_cnt); } } + public static IntPtr[] TpointcloudMergeQueryTpcboxes(IntPtr temp, IntPtr query) + { + IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); + try + { + IntPtr _p = SafeExecution(() => Native.TpointcloudMergeQueryTpcboxes(temp, query, _cnt)); + int _n = Marshal.ReadInt32(_cnt); + IntPtr[] _out = new IntPtr[_n]; + for (int _i = 0; _i < _n; _i++) + { _out[_i] = IntPtr.Add(_p, _i * 88); } + return _out; + } + finally { Marshal.FreeHGlobal(_cnt); } + } + public static IntPtr[] TpointcloudMergeEachNTpcboxes(IntPtr temp, int elem_count) { IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); diff --git a/MEOS.NET/Functions/Meos.meos_raster.g.cs b/MEOS.NET/Functions/Meos.meos_raster.g.cs index aaf5d11..141255b 100644 --- a/MEOS.NET/Functions/Meos.meos_raster.g.cs +++ b/MEOS.NET/Functions/Meos.meos_raster.g.cs @@ -68,6 +68,25 @@ public static string RaquetAsHexwkb(IntPtr rq, byte variant) } } + public static string RaquetAsCoveragejson(IntPtr rq) + { + nuint _size = 0; + IntPtr _p = SafeExecution(() => Native.RaquetAsCoveragejson(rq, out _size)); + if (_p == IntPtr.Zero) + { + return null!; + } + + try + { + return Marshal.PtrToStringUTF8(_p, (int)_size - 1); + } + finally + { + Marshal.FreeCoTaskMem(_p); + } + } + public static IntPtr RaquetMake(ulong quadbin, int width, int height, int pixtype, double nodata, bool has_nodata, IntPtr pixels, ulong pixels_size) => SafeExecution(() => Native.RaquetMake(quadbin, width, height, pixtype, nodata, has_nodata, pixels, pixels_size)); @@ -80,6 +99,9 @@ public static IntPtr RaquetRead(string path, ulong quadbin) public static IntPtr RaquetReadBytes(IntPtr data, ulong size, ulong quadbin) => SafeExecution(() => Native.RaquetReadBytes(data, size, quadbin)); + public static IntPtr RaquetFromRow(ulong block, IntPtr data, ulong size, string metadata, int band) + => SafeExecution(() => Native.RaquetFromRow(block, data, size, metadata, band)); + public static ulong RaquetQuadbin(IntPtr rq) => SafeExecution(() => Native.RaquetQuadbin(rq)); @@ -129,6 +151,40 @@ public static int RaquetMemSize(IntPtr rq) public static IntPtr RasterFromWkb(IntPtr wkb, ulong size) => SafeExecution(() => Native.RasterFromWkb(wkb, size)); + public static string RasterAsCoveragejson(IntPtr rast) + { + nuint _size = 0; + IntPtr _p = SafeExecution(() => Native.RasterAsCoveragejson(rast, out _size)); + if (_p == IntPtr.Zero) + { + return null!; + } + + try + { + return Marshal.PtrToStringUTF8(_p, (int)_size - 1); + } + finally + { + Marshal.FreeCoTaskMem(_p); + } + } + + public static IntPtr RasterAsGdal(IntPtr rast, string format, IntPtr options, int count, int srid, IntPtr size_out) + => SafeExecution(() => Native.RasterAsGdal(rast, format, options, count, srid, size_out)); + + public static IntPtr RasterAsTiff(IntPtr rast, IntPtr options, int count, int srid, IntPtr size_out) + => SafeExecution(() => Native.RasterAsTiff(rast, options, count, srid, size_out)); + + public static IntPtr RasterAsPng(IntPtr rast, IntPtr options, int count, IntPtr size_out) + => SafeExecution(() => Native.RasterAsPng(rast, options, count, size_out)); + + public static IntPtr RasterAsJpeg(IntPtr rast, IntPtr options, int count, IntPtr size_out) + => SafeExecution(() => Native.RasterAsJpeg(rast, options, count, size_out)); + + public static IntPtr RasterFromGdal(IntPtr data, ulong size, int srid) + => SafeExecution(() => Native.RasterFromGdal(data, size, srid)); + public static IntPtr RasterFromHexwkb(string hexwkb) => SafeExecution(() => Native.RasterFromHexwkb(hexwkb)); @@ -521,11 +577,84 @@ public static int ArasterValueGdal(IntPtr traj, string path, int band, IntPtr vs public static IntPtr RasterTileValueQuadbin(IntPtr traj, IntPtr pixels, ulong pixels_size, int width, int height, ulong quadbin, int pixtype, double nodata, bool has_nodata) => SafeExecution(() => Native.RasterTileValueQuadbin(traj, pixels, pixels_size, width, height, quadbin, pixtype, nodata, has_nodata)); + public static string TfloatAsCoveragejson(IntPtr temp, IntPtr traj) + { + nuint _size = 0; + IntPtr _p = SafeExecution(() => Native.TfloatAsCoveragejson(temp, traj, out _size)); + if (_p == IntPtr.Zero) + { + return null!; + } + + try + { + return Marshal.PtrToStringUTF8(_p, (int)_size - 1); + } + finally + { + Marshal.FreeCoTaskMem(_p); + } + } + public static IntPtr RasterTileValue(IntPtr traj, IntPtr rq) => SafeExecution(() => Native.RasterTileValue(traj, rq)); public static IntPtr RasterTileValueArray(IntPtr traj, IntPtr rqarr, int count) => SafeExecution(() => Native.RasterTileValueArray(traj, rqarr, count)); + public static IntPtr RasterTileAtValue(IntPtr traj, IntPtr rq, IntPtr vspan) + => SafeExecution(() => Native.RasterTileAtValue(traj, rq, vspan)); + + public static IntPtr RasterTileMinusValue(IntPtr traj, IntPtr rq, IntPtr vspan) + => SafeExecution(() => Native.RasterTileMinusValue(traj, rq, vspan)); + + public static int ErasterTileValue(IntPtr traj, IntPtr rq, IntPtr vspan) + => SafeExecution(() => Native.ErasterTileValue(traj, rq, vspan)); + + public static int ArasterTileValue(IntPtr traj, IntPtr rq, IntPtr vspan) + => SafeExecution(() => Native.ArasterTileValue(traj, rq, vspan)); + + public static IntPtr RasterTileAtValueArray(IntPtr traj, IntPtr rqarr, int count, IntPtr vspan) + => SafeExecution(() => Native.RasterTileAtValueArray(traj, rqarr, count, vspan)); + + public static IntPtr RasterTileMinusValueArray(IntPtr traj, IntPtr rqarr, int count, IntPtr vspan) + => SafeExecution(() => Native.RasterTileMinusValueArray(traj, rqarr, count, vspan)); + + public static int ErasterTileValueArray(IntPtr traj, IntPtr rqarr, int count, IntPtr vspan) + => SafeExecution(() => Native.ErasterTileValueArray(traj, rqarr, count, vspan)); + + public static int ArasterTileValueArray(IntPtr traj, IntPtr rqarr, int count, IntPtr vspan) + => SafeExecution(() => Native.ArasterTileValueArray(traj, rqarr, count, vspan)); + + public static IntPtr RasterValueSeries(IntPtr traj, IntPtr rasts, IntPtr spans, int count, int band) + => SafeExecution(() => Native.RasterValueSeries(traj, rasts, spans, count, band)); + + public static IntPtr RasterAtValueSeries(IntPtr traj, IntPtr rasts, IntPtr spans, int count, int band, IntPtr vspan) + => SafeExecution(() => Native.RasterAtValueSeries(traj, rasts, spans, count, band, vspan)); + + public static IntPtr RasterMinusValueSeries(IntPtr traj, IntPtr rasts, IntPtr spans, int count, int band, IntPtr vspan) + => SafeExecution(() => Native.RasterMinusValueSeries(traj, rasts, spans, count, band, vspan)); + + public static int ErasterValueSeries(IntPtr traj, IntPtr rasts, IntPtr spans, int count, int band, IntPtr vspan) + => SafeExecution(() => Native.ErasterValueSeries(traj, rasts, spans, count, band, vspan)); + + public static int ArasterValueSeries(IntPtr traj, IntPtr rasts, IntPtr spans, int count, int band, IntPtr vspan) + => SafeExecution(() => Native.ArasterValueSeries(traj, rasts, spans, count, band, vspan)); + + public static IntPtr RasterTileValueSeries(IntPtr traj, IntPtr rqarr, IntPtr spans, int count) + => SafeExecution(() => Native.RasterTileValueSeries(traj, rqarr, spans, count)); + + public static IntPtr RasterTileAtValueSeries(IntPtr traj, IntPtr rqarr, IntPtr spans, int count, IntPtr vspan) + => SafeExecution(() => Native.RasterTileAtValueSeries(traj, rqarr, spans, count, vspan)); + + public static IntPtr RasterTileMinusValueSeries(IntPtr traj, IntPtr rqarr, IntPtr spans, int count, IntPtr vspan) + => SafeExecution(() => Native.RasterTileMinusValueSeries(traj, rqarr, spans, count, vspan)); + + public static int ErasterTileValueSeries(IntPtr traj, IntPtr rqarr, IntPtr spans, int count, IntPtr vspan) + => SafeExecution(() => Native.ErasterTileValueSeries(traj, rqarr, spans, count, vspan)); + + public static int ArasterTileValueSeries(IntPtr traj, IntPtr rqarr, IntPtr spans, int count, IntPtr vspan) + => SafeExecution(() => Native.ArasterTileValueSeries(traj, rqarr, spans, count, vspan)); + } } diff --git a/MEOS.NET/Functions/Meos.meos_rgeo.g.cs b/MEOS.NET/Functions/Meos.meos_rgeo.g.cs index d5caac1..4c1a08e 100644 --- a/MEOS.NET/Functions/Meos.meos_rgeo.g.cs +++ b/MEOS.NET/Functions/Meos.meos_rgeo.g.cs @@ -288,6 +288,21 @@ public static IntPtr[] TrgeometryMergeNStboxes(IntPtr temp, int box_count) finally { Marshal.FreeHGlobal(_cnt); } } + public static IntPtr[] TrgeometryMergeQueryStboxes(IntPtr temp, IntPtr query) + { + IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); + try + { + IntPtr _p = SafeExecution(() => Native.TrgeometryMergeQueryStboxes(temp, query, _cnt)); + int _n = Marshal.ReadInt32(_cnt); + IntPtr[] _out = new IntPtr[_n]; + for (int _i = 0; _i < _n; _i++) + { _out[_i] = IntPtr.Add(_p, _i * 80); } + return _out; + } + finally { Marshal.FreeHGlobal(_cnt); } + } + public static IntPtr[] TrgeometrySplitEachNStboxes(IntPtr temp, int elem_count) { IntPtr _cnt = Marshal.AllocHGlobal(sizeof(int)); diff --git a/MEOS.NET/Structures/MeosStructs.g.cs b/MEOS.NET/Structures/MeosStructs.g.cs index 38492e9..8f1bc25 100644 --- a/MEOS.NET/Structures/MeosStructs.g.cs +++ b/MEOS.NET/Structures/MeosStructs.g.cs @@ -43,19 +43,6 @@ public override string ToString() } } - /// The MEOS BandStats struct, as MEOS returns it. - [GeneratedCode("MEOS.NET.Codegen", "0.1.0")] - [StructLayout(LayoutKind.Sequential)] - public struct BandStats - { - public uint count; - public double sum; - public double mean; - public double stddev; - public double min; - public double max; - } - /// The MEOS GBOX struct, as MEOS returns it. [GeneratedCode("MEOS.NET.Codegen", "0.1.0")] [StructLayout(LayoutKind.Sequential)] diff --git a/MEOS.NET/Types/BandStats.g.cs b/MEOS.NET/Types/BandStats.g.cs new file mode 100644 index 0000000..f5bd42c --- /dev/null +++ b/MEOS.NET/Types/BandStats.g.cs @@ -0,0 +1,111 @@ +#nullable enable + +using System.Runtime.InteropServices; + +using MEOS.NET.Enums; +using MEOS.NET.Functions; +using MEOS.NET.Structures; + +namespace MEOS.NET.Types +{ + /// What a raster band's pixels amount to, taken in one pass: how many pixels hold a value and their sum, mean, standard deviation, least and greatest, the record PostGIS's ST_SummaryStats states. Raster.summaryStats answers one and the summaryStats aggregate gathers one over rasters; MEOS registers it in no enum, so it names no temptype. + [System.CodeDom.Compiler.GeneratedCode("MEOS.NET.ObjectGen", "0.1.0")] + public class BandStats : Value + { + internal BandStats(IntPtr ptr) : base(ptr) { } + + public long Count() + => Meos.BandstatsCount(this.Ptr); + + public double? Max() + { + IntPtr _result = Marshal.AllocHGlobal(8); + try + { + if (!Meos.BandstatsMax(this.Ptr, _result)) + { + return null; + } + + return Marshal.PtrToStructure(_result); + } + finally + { + Marshal.FreeHGlobal(_result); + } + } + + public double? Mean() + { + IntPtr _result = Marshal.AllocHGlobal(8); + try + { + if (!Meos.BandstatsMean(this.Ptr, _result)) + { + return null; + } + + return Marshal.PtrToStructure(_result); + } + finally + { + Marshal.FreeHGlobal(_result); + } + } + + public double? Min() + { + IntPtr _result = Marshal.AllocHGlobal(8); + try + { + if (!Meos.BandstatsMin(this.Ptr, _result)) + { + return null; + } + + return Marshal.PtrToStructure(_result); + } + finally + { + Marshal.FreeHGlobal(_result); + } + } + + public double? Stddev() + { + IntPtr _result = Marshal.AllocHGlobal(8); + try + { + if (!Meos.BandstatsStddev(this.Ptr, _result)) + { + return null; + } + + return Marshal.PtrToStructure(_result); + } + finally + { + Marshal.FreeHGlobal(_result); + } + } + + public double? Sum() + { + IntPtr _result = Marshal.AllocHGlobal(8); + try + { + if (!Meos.BandstatsSum(this.Ptr, _result)) + { + return null; + } + + return Marshal.PtrToStructure(_result); + } + finally + { + Marshal.FreeHGlobal(_result); + } + } + + } +} diff --git a/MEOS.NET/Types/Geo.g.cs b/MEOS.NET/Types/Geo.g.cs index e48888b..936871b 100644 --- a/MEOS.NET/Types/Geo.g.cs +++ b/MEOS.NET/Types/Geo.g.cs @@ -69,9 +69,33 @@ public string AsGeoJSON(int option, int precision, string srs) public string AsHexEWKB(string endian) => Meos.GeoAsHexewkb(this.Ptr, endian); + public string AsHexWKB(string endian) + => Meos.GeoAsHexwkb(this.Ptr, endian); + public string AsText(int precision) => Meos.GeoAsText(this.Ptr, precision); + public byte[]? AsWKB(string endian) + { + IntPtr _size = Marshal.AllocHGlobal(sizeof(long)); + try + { + IntPtr _bytes = Meos.GeoAsWkb(this.Ptr, endian, _size); + if (_bytes == IntPtr.Zero) + { + return null; + } + + byte[] _wkb = new byte[Marshal.ReadInt64(_size)]; + Marshal.Copy(_bytes, _wkb, 0, _wkb.Length); + return _wkb; + } + finally + { + Marshal.FreeHGlobal(_size); + } + } + public double? Bearing(Geo gs2) { IntPtr _result = Marshal.AllocHGlobal(8); @@ -147,6 +171,9 @@ public int MemSize() public STBox?[] MergeNStboxes(int box_count) => MEOSFactory.WrapSTBoxArray(Meos.GeoMergeNStboxes(this.Ptr, box_count)); + public STBox?[] MergeQueryStboxes(STBox query) + => MEOSFactory.WrapSTBoxArray(Meos.GeoMergeQueryStboxes(this.Ptr, query.Ptr)); + public Set? Minus(GeoSet s) => MEOSFactory.WrapSet(Meos.MinusGeoSet(this.Ptr, s.Ptr)); diff --git a/MEOS.NET/Types/Geography.g.cs b/MEOS.NET/Types/Geography.g.cs index d67d862..d335da8 100644 --- a/MEOS.NET/Types/Geography.g.cs +++ b/MEOS.NET/Types/Geography.g.cs @@ -186,11 +186,36 @@ public bool Intersects(Geo gs2, bool use_spheroid) } } + public static Geo? FromEWKB(byte[] wkb) + { + GCHandle _wkb = GCHandle.Alloc(wkb, GCHandleType.Pinned); + try + { + return MEOSFactory.WrapGeo(Meos.GeogFromEwkb(_wkb.AddrOfPinnedObject(), (ulong) wkb.Length)); + } + finally + { + _wkb.Free(); + } + } + + public static Geo? FromEWKT(string ewkt) + => MEOSFactory.WrapGeo(Meos.GeogFromEwkt(ewkt)); + + public new static Geo? FromGeoJSON(string geojson) + => MEOSFactory.WrapGeo(Meos.GeogFromGeojson(geojson)); + public static Geo? FromHexEWKB(string hexwkb) => MEOSFactory.WrapGeo(Meos.GeogFromHexewkb(hexwkb)); + public static Geo? FromHexWKB(string hexwkb) + => Geography.FromHexEWKB(hexwkb); + public static Geo? FromMFJSON(string geojson) - => Geo.FromGeoJSON(geojson); + => Geography.FromGeoJSON(geojson); + + public static Geo? FromWKB(byte[] wkb) + => Geography.FromEWKB(wkb); } } diff --git a/MEOS.NET/Types/Geometry.g.cs b/MEOS.NET/Types/Geometry.g.cs index 5d54d9f..82aeae1 100644 --- a/MEOS.NET/Types/Geometry.g.cs +++ b/MEOS.NET/Types/Geometry.g.cs @@ -493,11 +493,20 @@ public bool Touches(Geo gs2) } } + public static Geo? FromEWKT(string ewkt) + => MEOSFactory.WrapGeo(Meos.GeomFromEwkt(ewkt)); + public static Geo? FromHexEWKB(string hexwkb) => MEOSFactory.WrapGeo(Meos.GeomFromHexewkb(hexwkb)); + public static Geo? FromHexWKB(string hexwkb) + => Geometry.FromHexEWKB(hexwkb); + public static Geo? FromMFJSON(string geojson) => Geo.FromGeoJSON(geojson); + public static Geo? FromWKB(byte[] wkb, int srid) + => Geo.FromEWKB(wkb, srid); + } } diff --git a/MEOS.NET/Types/MEOSFactory.g.cs b/MEOS.NET/Types/MEOSFactory.g.cs index 945253f..bf39ae0 100644 --- a/MEOS.NET/Types/MEOSFactory.g.cs +++ b/MEOS.NET/Types/MEOSFactory.g.cs @@ -17,6 +17,30 @@ namespace MEOS.NET.Types [System.CodeDom.Compiler.GeneratedCode("MEOS.NET.ObjectGen", "0.1.0")] public static class MEOSFactory { + /// The value at as the BandStats + /// class the model gives its runtime type. + public static BandStats? WrapBandStats(IntPtr ptr) + { + if (ptr == IntPtr.Zero) + { + return null; + } + + return new BandStats(ptr); + } + + /// Every element of a C array of BandStats pointers, wrapped. + public static BandStats?[] WrapBandStatsArray(IntPtr[] ptrs) + { + BandStats?[] wrapped = new BandStats?[ptrs.Length]; + for (int i = 0; i < ptrs.Length; i++) + { + wrapped[i] = WrapBandStats(ptrs[i]); + } + + return wrapped; + } + /// The value at as the CBuffer /// class the model gives its runtime type. public static CBuffer? WrapCBuffer(IntPtr ptr) diff --git a/MEOS.NET/Types/PCPatch.g.cs b/MEOS.NET/Types/PCPatch.g.cs index 43201eb..f1a7316 100644 --- a/MEOS.NET/Types/PCPatch.g.cs +++ b/MEOS.NET/Types/PCPatch.g.cs @@ -24,12 +24,33 @@ public int AlwaysEq(TPCPatch temp) public int AlwaysNe(TPCPatch temp) => Meos.AlwaysNePcpatchTpcpatch(this.Ptr, temp.Ptr); - public string AsHexWKB() - => Meos.PcpatchAsHexwkb(this.Ptr); + public string AsHexWKB(byte variant) + => Meos.PcpatchAsHexwkb(this.Ptr, variant); public string AsText(int maxdd) => Meos.PcpatchHexOut(this.Ptr, maxdd); + public byte[]? AsWKB(byte variant) + { + IntPtr _size_out = Marshal.AllocHGlobal(sizeof(long)); + try + { + IntPtr _bytes = Meos.PcpatchAsWkb(this.Ptr, variant, _size_out); + if (_bytes == IntPtr.Zero) + { + return null; + } + + byte[] _wkb = new byte[Marshal.ReadInt64(_size_out)]; + Marshal.Copy(_bytes, _wkb, 0, _wkb.Length); + return _wkb; + } + finally + { + Marshal.FreeHGlobal(_size_out); + } + } + public int Cmp(PCPatch pa2) => Meos.PcpatchCmp(this.Ptr, pa2.Ptr); @@ -117,6 +138,19 @@ public uint Npoints() public static PCPatch? FromText(string str) => MEOSFactory.WrapPCPatch(Meos.PcpatchHexIn(str)); + public static PCPatch? FromWKB(byte[] wkb) + { + GCHandle _wkb = GCHandle.Alloc(wkb, GCHandleType.Pinned); + try + { + return MEOSFactory.WrapPCPatch(Meos.PcpatchFromWkb(_wkb.AddrOfPinnedObject(), (ulong) wkb.Length)); + } + finally + { + _wkb.Free(); + } + } + public static PCPatch? Make(PCPoint[] points) { IntPtr[] _pointsValues = new IntPtr[points.Length]; diff --git a/MEOS.NET/Types/PCPoint.g.cs b/MEOS.NET/Types/PCPoint.g.cs index 4943239..f91cabc 100644 --- a/MEOS.NET/Types/PCPoint.g.cs +++ b/MEOS.NET/Types/PCPoint.g.cs @@ -24,12 +24,33 @@ public int AlwaysEq(TPCPoint temp) public int AlwaysNe(TPCPoint temp) => Meos.AlwaysNePcpointTpcpoint(this.Ptr, temp.Ptr); - public string AsHexWKB() - => Meos.PcpointAsHexwkb(this.Ptr); + public string AsHexWKB(byte variant) + => Meos.PcpointAsHexwkb(this.Ptr, variant); public string AsText(int maxdd) => Meos.PcpointHexOut(this.Ptr, maxdd); + public byte[]? AsWKB(byte variant) + { + IntPtr _size_out = Marshal.AllocHGlobal(sizeof(long)); + try + { + IntPtr _bytes = Meos.PcpointAsWkb(this.Ptr, variant, _size_out); + if (_bytes == IntPtr.Zero) + { + return null; + } + + byte[] _wkb = new byte[Marshal.ReadInt64(_size_out)]; + Marshal.Copy(_bytes, _wkb, 0, _wkb.Length); + return _wkb; + } + finally + { + Marshal.FreeHGlobal(_size_out); + } + } + public int Cmp(PCPoint pt2) => Meos.PcpointCmp(this.Ptr, pt2.Ptr); @@ -174,6 +195,19 @@ public bool Ne(PCPoint pt2) public static PCPoint? FromText(string str) => MEOSFactory.WrapPCPoint(Meos.PcpointHexIn(str)); + public static PCPoint? FromWKB(byte[] wkb) + { + GCHandle _wkb = GCHandle.Alloc(wkb, GCHandleType.Pinned); + try + { + return MEOSFactory.WrapPCPoint(Meos.PcpointFromWkb(_wkb.AddrOfPinnedObject(), (ulong) wkb.Length)); + } + finally + { + _wkb.Free(); + } + } + public static PCPoint? Make(uint pcid, double[] values) { GCHandle _values = GCHandle.Alloc(values, GCHandleType.Pinned); diff --git a/MEOS.NET/Types/RaQuet.g.cs b/MEOS.NET/Types/RaQuet.g.cs index faa5332..406c725 100644 --- a/MEOS.NET/Types/RaQuet.g.cs +++ b/MEOS.NET/Types/RaQuet.g.cs @@ -14,6 +14,9 @@ public class RaQuet : Value { internal RaQuet(IntPtr ptr) : base(ptr) { } + public string AsCoveragejson() + => Meos.RaquetAsCoveragejson(this.Ptr); + public string AsHexWKB(byte variant) => Meos.RaquetAsHexwkb(this.Ptr, variant); @@ -131,6 +134,19 @@ public int Width() public static RaQuet? FromHexWKB(string hexwkb) => MEOSFactory.WrapRaQuet(Meos.RaquetFromHexwkb(hexwkb)); + public static RaQuet? FromRow(Quadbin block, byte[] data, string metadata, int band) + { + GCHandle _data = GCHandle.Alloc(data, GCHandleType.Pinned); + try + { + return MEOSFactory.WrapRaQuet(Meos.RaquetFromRow(block.value, _data.AddrOfPinnedObject(), (ulong) data.Length, metadata, band)); + } + finally + { + _data.Free(); + } + } + public static RaQuet? FromWKB(byte[] wkb) { GCHandle _wkb = GCHandle.Alloc(wkb, GCHandleType.Pinned); diff --git a/MEOS.NET/Types/Raster.g.cs b/MEOS.NET/Types/Raster.g.cs index 17b667e..ef166bd 100644 --- a/MEOS.NET/Types/Raster.g.cs +++ b/MEOS.NET/Types/Raster.g.cs @@ -26,9 +26,128 @@ internal Raster(IntPtr ptr) : base(ptr) { } public Raster? AddBandRaster(Raster fromrast, int fromband, int toindex) => MEOSFactory.WrapRaster(Meos.RasterAddBandRaster(this.Ptr, fromrast.Ptr, fromband, toindex)); + public string AsCoveragejson() + => Meos.RasterAsCoveragejson(this.Ptr); + + public byte[]? AsGdal(string format, Text[] options, int srid) + { + IntPtr[] _optionsValues = new IntPtr[options.Length]; + for (int i = 0; i < options.Length; i++) + { + _optionsValues[i] = options[i].Ptr; + } + + GCHandle _options = GCHandle.Alloc(_optionsValues, GCHandleType.Pinned); + IntPtr _size_out = Marshal.AllocHGlobal(sizeof(long)); + try + { + IntPtr _bytes = Meos.RasterAsGdal(this.Ptr, format, _options.AddrOfPinnedObject(), options.Length, srid, _size_out); + if (_bytes == IntPtr.Zero) + { + return null; + } + + byte[] _wkb = new byte[Marshal.ReadInt64(_size_out)]; + Marshal.Copy(_bytes, _wkb, 0, _wkb.Length); + return _wkb; + } + finally + { + _options.Free(); + Marshal.FreeHGlobal(_size_out); + } + } + public string AsHexWKB(byte variant) => Meos.RasterAsHexwkb(this.Ptr, variant); + public byte[]? AsJpeg(Text[] options) + { + IntPtr[] _optionsValues = new IntPtr[options.Length]; + for (int i = 0; i < options.Length; i++) + { + _optionsValues[i] = options[i].Ptr; + } + + GCHandle _options = GCHandle.Alloc(_optionsValues, GCHandleType.Pinned); + IntPtr _size_out = Marshal.AllocHGlobal(sizeof(long)); + try + { + IntPtr _bytes = Meos.RasterAsJpeg(this.Ptr, _options.AddrOfPinnedObject(), options.Length, _size_out); + if (_bytes == IntPtr.Zero) + { + return null; + } + + byte[] _wkb = new byte[Marshal.ReadInt64(_size_out)]; + Marshal.Copy(_bytes, _wkb, 0, _wkb.Length); + return _wkb; + } + finally + { + _options.Free(); + Marshal.FreeHGlobal(_size_out); + } + } + + public byte[]? AsPng(Text[] options) + { + IntPtr[] _optionsValues = new IntPtr[options.Length]; + for (int i = 0; i < options.Length; i++) + { + _optionsValues[i] = options[i].Ptr; + } + + GCHandle _options = GCHandle.Alloc(_optionsValues, GCHandleType.Pinned); + IntPtr _size_out = Marshal.AllocHGlobal(sizeof(long)); + try + { + IntPtr _bytes = Meos.RasterAsPng(this.Ptr, _options.AddrOfPinnedObject(), options.Length, _size_out); + if (_bytes == IntPtr.Zero) + { + return null; + } + + byte[] _wkb = new byte[Marshal.ReadInt64(_size_out)]; + Marshal.Copy(_bytes, _wkb, 0, _wkb.Length); + return _wkb; + } + finally + { + _options.Free(); + Marshal.FreeHGlobal(_size_out); + } + } + + public byte[]? AsTiff(Text[] options, int srid) + { + IntPtr[] _optionsValues = new IntPtr[options.Length]; + for (int i = 0; i < options.Length; i++) + { + _optionsValues[i] = options[i].Ptr; + } + + GCHandle _options = GCHandle.Alloc(_optionsValues, GCHandleType.Pinned); + IntPtr _size_out = Marshal.AllocHGlobal(sizeof(long)); + try + { + IntPtr _bytes = Meos.RasterAsTiff(this.Ptr, _options.AddrOfPinnedObject(), options.Length, srid, _size_out); + if (_bytes == IntPtr.Zero) + { + return null; + } + + byte[] _wkb = new byte[Marshal.ReadInt64(_size_out)]; + Marshal.Copy(_bytes, _wkb, 0, _wkb.Length); + return _wkb; + } + finally + { + _options.Free(); + Marshal.FreeHGlobal(_size_out); + } + } + public byte[]? AsWKB(byte variant) { IntPtr _size_out = Marshal.AllocHGlobal(sizeof(long)); @@ -183,29 +302,6 @@ public double ScaleX() public double ScaleY() => Meos.RasterScaleY(this.Ptr); - public Raster? SetValues(int band, int x, int y, int width, int height, double[] values, bool[] nodata, bool[] noset, int nosetheight, int count, bool keepnodata) - { - if (values.Length != nodata.Length || values.Length != noset.Length) - { - throw new ArgumentException( - "values, nodata and noset are read in step, so they hold the same number of elements."); - } - - GCHandle _values = GCHandle.Alloc(values, GCHandleType.Pinned); - GCHandle _nodata = GCHandle.Alloc(nodata, GCHandleType.Pinned); - GCHandle _noset = GCHandle.Alloc(noset, GCHandleType.Pinned); - try - { - return MEOSFactory.WrapRaster(Meos.RasterSetValues(this.Ptr, band, x, y, width, height, _values.AddrOfPinnedObject(), _nodata.AddrOfPinnedObject(), _noset.AddrOfPinnedObject(), values.Length, nosetheight, count, keepnodata)); - } - finally - { - _values.Free(); - _nodata.Free(); - _noset.Free(); - } - } - public double SkewX() => Meos.RasterSkewX(this.Ptr); @@ -222,7 +318,7 @@ public double SkewY() => MEOSFactory.WrapRaster(Meos.SubRasterRaster(this.Ptr, rast2.Ptr)); public BandStats? SummaryStats(int band, bool exclude_nodata) - => MEOSConvert.ToStruct(Meos.RasterSummaryStats(this.Ptr, band, exclude_nodata)); + => MEOSFactory.WrapBandStats(Meos.RasterSummaryStats(this.Ptr, band, exclude_nodata)); public STBox? ToStbox() => MEOSFactory.WrapSTBox(Meos.RasterToStbox(this.Ptr)); @@ -264,12 +360,81 @@ public ValueCount[] ValueCount(int band, bool exclude_nodata, double[] searchval public int Width() => Meos.RasterWidth(this.Ptr); + public static int ATileValue(Temporal traj, RaQuet rq, Span vspan) + => Meos.ArasterTileValue(traj.Ptr, rq.Ptr, vspan.Ptr); + + public static int ATileValueArray(Temporal traj, RaQuet[] rqarr, Span vspan) + { + IntPtr[] _rqarrValues = new IntPtr[rqarr.Length]; + for (int i = 0; i < rqarr.Length; i++) + { + _rqarrValues[i] = rqarr[i].Ptr; + } + + GCHandle _rqarr = GCHandle.Alloc(_rqarrValues, GCHandleType.Pinned); + try + { + return Meos.ArasterTileValueArray(traj.Ptr, _rqarr.AddrOfPinnedObject(), rqarr.Length, vspan.Ptr); + } + finally + { + _rqarr.Free(); + } + } + + public static int AValue(Temporal traj, Raster rast, int band, Span vspan) + => Meos.ArasterValue(traj.Ptr, rast.Ptr, band, vspan.Ptr); + + public static int AValueGdal(Temporal traj, string path, int band, Span vspan) + => Meos.ArasterValueGdal(traj.Ptr, path, band, vspan.Ptr); + public static Temporal? AtValue(Temporal traj, Raster rast, int band, Span vspan) => MEOSFactory.WrapTemporal(Meos.RasterAtValue(traj.Ptr, rast.Ptr, band, vspan.Ptr)); public static Temporal? AtValueGdal(Temporal traj, string path, int band, Span vspan) => MEOSFactory.WrapTemporal(Meos.RasterAtValueGdal(traj.Ptr, path, band, vspan.Ptr)); + public static int ETileValue(Temporal traj, RaQuet rq, Span vspan) + => Meos.ErasterTileValue(traj.Ptr, rq.Ptr, vspan.Ptr); + + public static int ETileValueArray(Temporal traj, RaQuet[] rqarr, Span vspan) + { + IntPtr[] _rqarrValues = new IntPtr[rqarr.Length]; + for (int i = 0; i < rqarr.Length; i++) + { + _rqarrValues[i] = rqarr[i].Ptr; + } + + GCHandle _rqarr = GCHandle.Alloc(_rqarrValues, GCHandleType.Pinned); + try + { + return Meos.ErasterTileValueArray(traj.Ptr, _rqarr.AddrOfPinnedObject(), rqarr.Length, vspan.Ptr); + } + finally + { + _rqarr.Free(); + } + } + + public static int EValue(Temporal traj, Raster rast, int band, Span vspan) + => Meos.ErasterValue(traj.Ptr, rast.Ptr, band, vspan.Ptr); + + public static int EValueGdal(Temporal traj, string path, int band, Span vspan) + => Meos.ErasterValueGdal(traj.Ptr, path, band, vspan.Ptr); + + public static Raster? FromGdal(byte[] data, int srid) + { + GCHandle _data = GCHandle.Alloc(data, GCHandleType.Pinned); + try + { + return MEOSFactory.WrapRaster(Meos.RasterFromGdal(_data.AddrOfPinnedObject(), (ulong) data.Length, srid)); + } + finally + { + _data.Free(); + } + } + public static Raster? FromHexWKB(string hexwkb) => MEOSFactory.WrapRaster(Meos.RasterFromHexwkb(hexwkb)); @@ -308,6 +473,50 @@ public int Width() public static Temporal? MinusValueGdal(Temporal traj, string path, int band, Span vspan) => MEOSFactory.WrapTemporal(Meos.RasterMinusValueGdal(traj.Ptr, path, band, vspan.Ptr)); + public static Temporal? TileAtValue(Temporal traj, RaQuet rq, Span vspan) + => MEOSFactory.WrapTemporal(Meos.RasterTileAtValue(traj.Ptr, rq.Ptr, vspan.Ptr)); + + public static Temporal? TileAtValueArray(Temporal traj, RaQuet[] rqarr, Span vspan) + { + IntPtr[] _rqarrValues = new IntPtr[rqarr.Length]; + for (int i = 0; i < rqarr.Length; i++) + { + _rqarrValues[i] = rqarr[i].Ptr; + } + + GCHandle _rqarr = GCHandle.Alloc(_rqarrValues, GCHandleType.Pinned); + try + { + return MEOSFactory.WrapTemporal(Meos.RasterTileAtValueArray(traj.Ptr, _rqarr.AddrOfPinnedObject(), rqarr.Length, vspan.Ptr)); + } + finally + { + _rqarr.Free(); + } + } + + public static Temporal? TileMinusValue(Temporal traj, RaQuet rq, Span vspan) + => MEOSFactory.WrapTemporal(Meos.RasterTileMinusValue(traj.Ptr, rq.Ptr, vspan.Ptr)); + + public static Temporal? TileMinusValueArray(Temporal traj, RaQuet[] rqarr, Span vspan) + { + IntPtr[] _rqarrValues = new IntPtr[rqarr.Length]; + for (int i = 0; i < rqarr.Length; i++) + { + _rqarrValues[i] = rqarr[i].Ptr; + } + + GCHandle _rqarr = GCHandle.Alloc(_rqarrValues, GCHandleType.Pinned); + try + { + return MEOSFactory.WrapTemporal(Meos.RasterTileMinusValueArray(traj.Ptr, _rqarr.AddrOfPinnedObject(), rqarr.Length, vspan.Ptr)); + } + finally + { + _rqarr.Free(); + } + } + public static Temporal? TileValue(Temporal traj, RaQuet rq) => MEOSFactory.WrapTemporal(Meos.RasterTileValue(traj.Ptr, rq.Ptr)); diff --git a/MEOS.NET/Types/Set.g.cs b/MEOS.NET/Types/Set.g.cs index 90e2915..581d47b 100644 --- a/MEOS.NET/Types/Set.g.cs +++ b/MEOS.NET/Types/Set.g.cs @@ -89,6 +89,9 @@ public int MemSize() public Span?[] MergeNSpans(int span_count) => MEOSFactory.WrapSpanArray(Meos.SetMergeNSpans(this.Ptr, span_count)); + public Span?[] MergeQuerySpans(Span query) + => MEOSFactory.WrapSpanArray(Meos.SetMergeQuerySpans(this.Ptr, query.Ptr)); + public Set? Minus(Set s2) => MEOSFactory.WrapSet(Meos.MinusSetSet(this.Ptr, s2.Ptr)); diff --git a/MEOS.NET/Types/SpanSet.g.cs b/MEOS.NET/Types/SpanSet.g.cs index 0fa713f..f4da7f2 100644 --- a/MEOS.NET/Types/SpanSet.g.cs +++ b/MEOS.NET/Types/SpanSet.g.cs @@ -117,6 +117,9 @@ public int MemSize() public Span?[] MergeNSpans(int span_count) => MEOSFactory.WrapSpanArray(Meos.SpansetMergeNSpans(this.Ptr, span_count)); + public Span?[] MergeQuerySpans(Span query) + => MEOSFactory.WrapSpanArray(Meos.SpansetMergeQuerySpans(this.Ptr, query.Ptr)); + public SpanSet? Minus(Span s) => MEOSFactory.WrapSpanSet(Meos.MinusSpansetSpan(this.Ptr, s.Ptr)); diff --git a/MEOS.NET/Types/TFloat.g.cs b/MEOS.NET/Types/TFloat.g.cs index 01b8e70..9991d9e 100644 --- a/MEOS.NET/Types/TFloat.g.cs +++ b/MEOS.NET/Types/TFloat.g.cs @@ -72,6 +72,9 @@ public int AlwaysNe(TFloat temp2) public int AlwaysOverlaps(TFloat temp2) => Meos.AlwaysOverlapsTemporalTemporal(this.Ptr, temp2.Ptr); + public string AsCoveragejson(Temporal traj) + => Meos.TfloatAsCoveragejson(this.Ptr, traj.Ptr); + public Temporal? AtValue(double d) => MEOSFactory.WrapTemporal(Meos.TfloatAtValue(this.Ptr, d)); diff --git a/MEOS.NET/Types/TGeo.g.cs b/MEOS.NET/Types/TGeo.g.cs index 56eaa9e..2933486 100644 --- a/MEOS.NET/Types/TGeo.g.cs +++ b/MEOS.NET/Types/TGeo.g.cs @@ -119,6 +119,9 @@ public int EverOverlaps(TGeo temp2) public STBox?[] MergeNStboxes(int box_count) => MEOSFactory.WrapSTBoxArray(Meos.TgeoMergeNStboxes(this.Ptr, box_count)); + public STBox?[] MergeQueryStboxes(STBox query) + => MEOSFactory.WrapSTBoxArray(Meos.TgeoMergeQueryStboxes(this.Ptr, query.Ptr)); + public Temporal? MinusGeom(Geo gs) => MEOSFactory.WrapTemporal(Meos.TgeoMinusGeom(this.Ptr, gs.Ptr)); diff --git a/MEOS.NET/Types/TNumber.g.cs b/MEOS.NET/Types/TNumber.g.cs index ac4aa03..e729c1b 100644 --- a/MEOS.NET/Types/TNumber.g.cs +++ b/MEOS.NET/Types/TNumber.g.cs @@ -113,6 +113,9 @@ public bool Left(TNumber temp2) public TBox?[] MergeNTboxes(int box_count) => MEOSFactory.WrapTBoxArray(Meos.TnumberMergeNTboxes(this.Ptr, box_count)); + public TBox?[] MergeQueryTboxes(TBox query) + => MEOSFactory.WrapTBoxArray(Meos.TnumberMergeQueryTboxes(this.Ptr, query.Ptr)); + public Temporal? MinusSpan(Span span) => MEOSFactory.WrapTemporal(Meos.TnumberMinusSpan(this.Ptr, span.Ptr)); diff --git a/MEOS.NET/Types/TRGeometry.g.cs b/MEOS.NET/Types/TRGeometry.g.cs index 0d614bd..32c8bd4 100644 --- a/MEOS.NET/Types/TRGeometry.g.cs +++ b/MEOS.NET/Types/TRGeometry.g.cs @@ -183,6 +183,9 @@ public double Length() public STBox?[] MergeNStboxes(int box_count) => MEOSFactory.WrapSTBoxArray(Meos.TrgeometryMergeNStboxes(this.Ptr, box_count)); + public STBox?[] MergeQueryStboxes(STBox query) + => MEOSFactory.WrapSTBoxArray(Meos.TrgeometryMergeQueryStboxes(this.Ptr, query.Ptr)); + public Temporal? MinusGeom(Geo gs) => MEOSFactory.WrapTemporal(Meos.TrgeometryMinusGeom(this.Ptr, gs.Ptr)); diff --git a/MEOS.NET/Types/Temporal.g.cs b/MEOS.NET/Types/Temporal.g.cs index f39c1e2..cd4ec8b 100644 --- a/MEOS.NET/Types/Temporal.g.cs +++ b/MEOS.NET/Types/Temporal.g.cs @@ -265,6 +265,9 @@ public int MemSize() public Span?[] MergeNSpans(int span_count) => MEOSFactory.WrapSpanArray(Meos.TemporalMergeNSpans(this.Ptr, span_count)); + public Span?[] MergeQuerySpans(Span query) + => MEOSFactory.WrapSpanArray(Meos.TemporalMergeQuerySpans(this.Ptr, query.Ptr)); + public Temporal? MinInstant() => MEOSFactory.WrapTemporal(Meos.TemporalMinInstant(this.Ptr));