Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added bbox parameter to @turf/interpolate #2768

Merged
merged 5 commits into from
Dec 16, 2024
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
7 changes: 5 additions & 2 deletions packages/turf-interpolate/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ Takes a set of points and estimates their 'property' values on a grid using the
* `options.property` **[string][6]** the property name in `points` from which z-values will be pulled, zValue fallbacks to 3rd coordinate if no property exists. (optional, default `'elevation'`)
* `options.units` **[string][6]** used in calculating cellSize, can be degrees, radians, miles, or kilometers (optional, default `'kilometers'`)
* `options.weight` **[number][4]** exponent regulating the distance-decay weighting (optional, default `1`)
* `options.bbox` **[BBox][7]** Bounding Box Array \[west, south, east, north] associated with the FeatureCollection. (optional, default `bbox(points)`)

### Examples

Expand All @@ -33,7 +34,7 @@ var grid = turf.interpolate(points, 100, options);
var addToMap = [grid];
```

Returns **[FeatureCollection][2]<([Point][3] | [Polygon][7])>** grid of points or polygons with interpolated 'property'
Returns **[FeatureCollection][2]<([Point][3] | [Polygon][8])>** grid of points or polygons with interpolated 'property'

[1]: https://en.wikipedia.org/wiki/Inverse_distance_weighting

Expand All @@ -47,7 +48,9 @@ Returns **[FeatureCollection][2]<([Point][3] | [Polygon][7])>** grid of points o

[6]: https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String

[7]: https://tools.ietf.org/html/rfc7946#section-3.1.6
[7]: https://tools.ietf.org/html/rfc7946#section-5

[8]: https://tools.ietf.org/html/rfc7946#section-3.1.6

<!-- This file is automatically generated. Please don't edit it directly. If you find an error, edit the source file of the module in question (likely index.js or index.ts), and re-run "yarn docs" from the root of the turf project. -->

Expand Down
4 changes: 3 additions & 1 deletion packages/turf-interpolate/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Point, Polygon, FeatureCollection } from "geojson";
import { Point, Polygon, FeatureCollection, BBox } from "geojson";
import { Units, Grid } from "@turf/helpers";

/**
Expand All @@ -12,6 +12,7 @@ declare function interpolate(
property?: string;
units?: Units;
weight?: number;
bbox?: BBox;
}
): FeatureCollection<Point>;
declare function interpolate(
Expand All @@ -22,6 +23,7 @@ declare function interpolate(
property?: string;
units?: Units;
weight?: number;
bbox?: BBox;
}
): FeatureCollection<Polygon>;

Expand Down
7 changes: 5 additions & 2 deletions packages/turf-interpolate/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import { centroid } from "@turf/centroid";
import { squareGrid } from "@turf/square-grid";
import { triangleGrid } from "@turf/triangle-grid";
import { clone } from "@turf/clone";
import { featureCollection } from "@turf/helpers";
import { featureCollection, validateBBox } from "@turf/helpers";
import { featureEach } from "@turf/meta";
import { collectionOf } from "@turf/invariant";

Expand All @@ -21,6 +21,7 @@ import { collectionOf } from "@turf/invariant";
* @param {string} [options.property='elevation'] the property name in `points` from which z-values will be pulled, zValue fallbacks to 3rd coordinate if no property exists.
* @param {string} [options.units='kilometers'] used in calculating cellSize, can be degrees, radians, miles, or kilometers
* @param {number} [options.weight=1] exponent regulating the distance-decay weighting
* @param {BBox} [options.bbox=bbox(points)] Bounding Box Array [west, south, east, north] associated with the FeatureCollection.
* @returns {FeatureCollection<Point|Polygon>} grid of points or polygons with interpolated 'property'
* @example
* var points = turf.randomPoint(30, {bbox: [50, 30, 70, 50]});
Expand All @@ -42,6 +43,7 @@ function interpolate(points, cellSize, options) {
var gridType = options.gridType;
var property = options.property;
var weight = options.weight;
var box = options.bbox;

// validation
if (!points) throw new Error("points is required");
Expand All @@ -55,7 +57,8 @@ function interpolate(points, cellSize, options) {
gridType = gridType || "square";
weight = weight || 1;

var box = bbox(points);
box = box ?? bbox(points);
validateBBox(box);
var grid;
switch (gridType) {
case "point":
Expand Down
62 changes: 62 additions & 0 deletions packages/turf-interpolate/test/in/data-1km-bbox.geojson
Original file line number Diff line number Diff line change
@@ -0,0 +1,62 @@
{
"type": "FeatureCollection",
"properties": {
"property": "value",
"gridType": "square",
"weight": 0.5,
"cellSize": 1,
"bbox": [9.416249084472656, 45.3391764115696, 9.031605529785156, 45.63689620055365]
},
"features": [
{
"type": "Feature",
"properties": {
"value": 4
},
"geometry": {
"type": "Point",
"coordinates": [9.155731201171875, 45.47216977418841]
}
},
{
"type": "Feature",
"properties": {
"value": 99
},
"geometry": {
"type": "Point",
"coordinates": [9.195213317871094, 45.53689620055365]
}
},
{
"type": "Feature",
"properties": {
"value": 10
},
"geometry": {
"type": "Point",
"coordinates": [9.175300598144531, 45.49912810913339]
}
},
{
"type": "Feature",
"properties": {
"value": 6
},
"geometry": {
"type": "Point",
"coordinates": [9.231605529785156, 45.49190839157102]
}
},
{
"type": "Feature",
"properties": {
"value": 7
},
"geometry": {
"type": "Point",
"coordinates": [9.116249084472656, 45.4391764115696]
}
}
]
}
63 changes: 63 additions & 0 deletions packages/turf-interpolate/test/in/data-500m-bbox.geojson
Original file line number Diff line number Diff line change
@@ -0,0 +1,63 @@
{
"type": "FeatureCollection",
"properties": {
"property": "value",
"weight": 0.5,
"gridType": "square",
"cellSize": 0.5,
"units": "kilometers",
"bbox": [9.416249084472656, 45.3391764115696, 9.031605529785156, 45.63689620055365]
},
"features": [
{
"type": "Feature",
"properties": {
"value": 4
},
"geometry": {
"type": "Point",
"coordinates": [9.155731201171875, 45.47216977418841]
}
},
{
"type": "Feature",
"properties": {
"value": 99
},
"geometry": {
"type": "Point",
"coordinates": [9.195213317871094, 45.53689620055365]
}
},
{
"type": "Feature",
"properties": {
"value": 10
},
"geometry": {
"type": "Point",
"coordinates": [9.175300598144531, 45.49912810913339]
}
},
{
"type": "Feature",
"properties": {
"value": 6
},
"geometry": {
"type": "Point",
"coordinates": [9.231605529785156, 45.49190839157102]
}
},
{
"type": "Feature",
"properties": {
"value": 7
},
"geometry": {
"type": "Point",
"coordinates": [9.116249084472656, 45.4391764115696]
}
}
]
}
52 changes: 52 additions & 0 deletions packages/turf-interpolate/test/in/hex-zValue-bbox.geojson
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
{
"type": "FeatureCollection",
"properties": {
"weight": 2,
"gridType": "hex",
"cellSize": 0.5,
"units": "miles",
"bbox": [-6.357258206107161, 53.39023949422162, -6.186614219650437, 53.31219701461626]
},
"features": [
{
"type": "Feature",
"properties": {},
"geometry": {
"type": "Point",
"coordinates": [-6.3288116455078125, 53.355879304922276, 2]
}
},
{
"type": "Feature",
"properties": {},
"geometry": {
"type": "Point",
"coordinates": [-6.2615203857421875, 53.38087096356977, 5]
}
},
{
"type": "Feature",
"properties": {},
"geometry": {
"type": "Point",
"coordinates": [-6.248474121093749, 53.31979992850456, 14]
}
},
{
"type": "Feature",
"properties": {},
"geometry": {
"type": "Point",
"coordinates": [-6.2697601318359375, 53.352190769802725, 9]
}
},
{
"type": "Feature",
"properties": {},
"geometry": {
"type": "Point",
"coordinates": [-6.2505340576171875, 53.3648943803576, 11]
}
}
]
}
Loading
Loading