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

Use TileCoordinates instead of LngLats for within calculation #9428

Merged
merged 4 commits into from
Mar 19, 2020
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
166 changes: 95 additions & 71 deletions src/style-spec/expression/definitions/within.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,65 +10,31 @@ import type {GeoJSON, GeoJSONPolygon, GeoJSONMultiPolygon} from '@mapbox/geojson
import MercatorCoordinate from '../../../geo/mercator_coordinate';
import EXTENT from '../../../data/extent';
import Point from '@mapbox/point-geometry';
import type {CanonicalTileID} from '../../../source/tile_id';

type GeoJSONPolygons =| GeoJSONPolygon | GeoJSONMultiPolygon;

// minX, minY, maxX, maxY
type BBox = [number, number, number, number];

function calcBBox(bbox: BBox, geom, type) {
if (type === 'Point') {
updateBBox(bbox, geom);
} else if (type === 'MultiPoint' || type === 'LineString') {
for (let i = 0; i < geom.length; ++i) {
updateBBox(bbox, geom[i]);
}
} else if (type === 'Polygon' || type === 'MultiLineString') {
for (let i = 0; i < geom.length; i++) {
for (let j = 0; j < geom[i].length; j++) {
updateBBox(bbox, geom[i][j]);
}
}
} else if (type === 'MultiPolygon') {
for (let i = 0; i < geom.length; i++) {
for (let j = 0; j < geom[i].length; j++) {
for (let k = 0; k < geom[i][j].length; k++) {
updateBBox(bbox, geom[i][j][k]);
}
}
}
}
}

function updateBBox(bbox: BBox, coord: Point) {
bbox[0] = Math.min(bbox[0], coord[0]);
bbox[1] = Math.min(bbox[1], coord[1]);
bbox[2] = Math.max(bbox[2], coord[0]);
bbox[3] = Math.max(bbox[3], coord[1]);
}

function boxWithinBox(bbox1, bbox2) {
function boxWithinBox(bbox1: BBox, bbox2: BBox) {
if (bbox1[0] <= bbox2[0]) return false;
if (bbox1[2] >= bbox2[2]) return false;
if (bbox1[1] <= bbox2[1]) return false;
if (bbox1[3] >= bbox2[3]) return false;
return true;
}

function getLngLatPoint(coord: Point, canonical) {
function getTileCoordinates(p, canonical: CanonicalTileID) {
const coord = MercatorCoordinate.fromLngLat({lng: p[0], lat: p[1]}, 0);
const tilesAtZoom = Math.pow(2, canonical.z);
const x = (coord.x / EXTENT + canonical.x) / tilesAtZoom;
const y = (coord.y / EXTENT + canonical.y) / tilesAtZoom;
const p = new MercatorCoordinate(x, y).toLngLat();

return [p.lng, p.lat];
}

function getLngLatPoints(line, canonical) {
const coords = [];
for (let i = 0; i < line.length; ++i) {
coords.push(getLngLatPoint(line[i], canonical));
}
return coords;
return [Math.round(coord.x * tilesAtZoom * EXTENT), Math.round(coord.y * tilesAtZoom * EXTENT)];
}

function onBoundary(p, p1, p2) {
Expand Down Expand Up @@ -97,13 +63,10 @@ function pointWithinPolygon(point, rings) {
}

function pointWithinPolygons(point, polygons) {
if (polygons.type === 'Polygon') {
return pointWithinPolygon(point, polygons.coordinates);
for (let i = 0; i < polygons.length; i++) {
if (pointWithinPolygon(point, polygons[i])) return true;
}
for (let i = 0; i < polygons.coordinates.length; i++) {
if (!pointWithinPolygon(point, polygons.coordinates[i])) return false;
}
return true;
return false;
}

function perp(v1, v2) {
Expand Down Expand Up @@ -168,59 +131,120 @@ function lineStringWithinPolygon(line, polygon) {
}

function lineStringWithinPolygons(line, polygons) {
if (polygons.type === 'Polygon') {
return lineStringWithinPolygon(line, polygons.coordinates);
for (let i = 0; i < polygons.length; i++) {
if (lineStringWithinPolygon(line, polygons[i])) return true;
}
for (let i = 0; i < polygons.coordinates.length; i++) {
if (!lineStringWithinPolygon(line, polygons.coordinates[i])) return false;
return false;
}

function getTilePolygon(coordinates, bbox, canonical) {
const polygon = [];
for (let i = 0; i < coordinates.length; i++) {
const ring = [];
for (let j = 0; j < coordinates[i].length; j++) {
const coord = getTileCoordinates(coordinates[i][j], canonical);
updateBBox(bbox, coord);
ring.push(coord);
}
polygon.push(ring);
}
return true;
return polygon;
}

function pointsWithinPolygons(ctx: EvaluationContext, polygonGeometry: GeoJSONPolygons, polyBBox: BBox) {
function getTilePolygons(coordinates, bbox, canonical) {
const polygons = [];
for (let i = 0; i < coordinates.length; i++) {
const polygon = getTilePolygon(coordinates[i], bbox, canonical);
polygons.push(polygon);
}
return polygons;
}

function pointsWithinPolygons(ctx: EvaluationContext, polygonGeometry: GeoJSONPolygons) {
const pointBBox = [Infinity, Infinity, -Infinity, -Infinity];
const lngLatPoints = [];
const polyBBox = [Infinity, Infinity, -Infinity, -Infinity];
const canonical = ctx.canonicalID();
const shifts = [canonical.x * EXTENT, canonical.y * EXTENT];
const tilePoints = [];

for (const points of ctx.geometry()) {
for (const point of points) {
const p = getLngLatPoint(point, ctx.canonicalID());
lngLatPoints.push(p);
const p = [point.x + shifts[0], point.y + shifts[1]];
updateBBox(pointBBox, p);
tilePoints.push(p);
}
}

if (polygonGeometry.type === 'Polygon') {
const tilePolygon = getTilePolygon(polygonGeometry.coordinates, polyBBox, canonical);
if (!boxWithinBox(pointBBox, polyBBox)) return false;

for (const point of tilePoints) {
if (!pointWithinPolygon(point, tilePolygon)) return false;
}
}
if (!boxWithinBox(pointBBox, polyBBox)) return false;
for (let i = 0; i < lngLatPoints.length; ++i) {
if (!pointWithinPolygons(lngLatPoints[i], polygonGeometry)) return false;

if (polygonGeometry.type === 'MultiPolygon') {
const tilePolygons = getTilePolygons(polygonGeometry.coordinates, polyBBox, canonical);
if (!boxWithinBox(pointBBox, polyBBox)) return false;

for (const point of tilePoints) {
if (!pointWithinPolygons(point, tilePolygons)) return false;
}
}

return true;
}

function linesWithinPolygons(ctx: EvaluationContext, polygonGeometry: GeoJSONPolygons, polyBBox: BBox) {
function linesWithinPolygons(ctx: EvaluationContext, polygonGeometry: GeoJSONPolygons) {
const lineBBox = [Infinity, Infinity, -Infinity, -Infinity];
const lineCoords = [];
const polyBBox = [Infinity, Infinity, -Infinity, -Infinity];

const canonical = ctx.canonicalID();
const shifts = [canonical.x * EXTENT, canonical.y * EXTENT];
const tileLines = [];

for (const line of ctx.geometry()) {
const lineCoord = getLngLatPoints(line, ctx.canonicalID());
lineCoords.push(lineCoord);
calcBBox(lineBBox, lineCoord, 'LineString');
const tileLine = [];
for (const point of line) {
const p = [point.x + shifts[0], point.y + shifts[1]];
updateBBox(lineBBox, p);
tileLine.push(p);
}
tileLines.push(tileLine);
}
if (!boxWithinBox(lineBBox, polyBBox)) return false;
for (let i = 0; i < lineCoords.length; ++i) {
if (!lineStringWithinPolygons(lineCoords[i], polygonGeometry)) return false;

if (polygonGeometry.type === 'Polygon') {
const tilePolygon = getTilePolygon(polygonGeometry.coordinates, polyBBox, canonical);
if (!boxWithinBox(lineBBox, polyBBox)) return false;

for (const line of tileLines) {
if (!lineStringWithinPolygon(line, tilePolygon)) return false;
}
}

if (polygonGeometry.type === 'MultiPolygon') {
const tilePolygons = getTilePolygons(polygonGeometry.coordinates, polyBBox, canonical);

if (!boxWithinBox(lineBBox, polyBBox)) return false;

for (const line of tileLines) {
if (!lineStringWithinPolygons(line, tilePolygons)) return false;
}
}
return true;

}

class Within implements Expression {
type: Type;
geojson: GeoJSON
geometries: GeoJSONPolygons;
polyBBox: BBox;

constructor(geojson: GeoJSON, geometries: GeoJSONPolygons) {
this.type = BooleanType;
this.geojson = geojson;
this.geometries = geometries;
this.polyBBox = [Infinity, Infinity, -Infinity, -Infinity];
calcBBox(this.polyBBox, this.geometries.coordinates, this.geometries.type);
}

static parse(args: $ReadOnlyArray<mixed>, context: ParsingContext) {
Expand Down Expand Up @@ -250,9 +274,9 @@ class Within implements Expression {
evaluate(ctx: EvaluationContext) {
if (ctx.geometry() != null && ctx.canonicalID() != null) {
if (ctx.geometryType() === 'Point') {
return pointsWithinPolygons(ctx, this.geometries, this.polyBBox);
return pointsWithinPolygons(ctx, this.geometries);
} else if (ctx.geometryType() === 'LineString') {
return linesWithinPolygons(ctx, this.geometries, this.polyBBox);
return linesWithinPolygons(ctx, this.geometries);
}
}
return false;
Expand Down
31 changes: 21 additions & 10 deletions test/expression.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@ import ignores from './ignores.json';
import {CanonicalTileID} from '../src/source/tile_id';
import MercatorCoordinate from '../src/geo/mercator_coordinate';

function convertPoint(coord, canonical, out) {
function getPoint(coord, canonical) {
const p = canonical.getTilePoint(MercatorCoordinate.fromLngLat({lng: coord[0], lat: coord[1]}, 0));
out.push([p]);
p.x = Math.round(p.x);
p.y = Math.round(p.y);
return p;
}

function convertPoint(coord, canonical, out) {
out.push([getPoint(coord, canonical)]);
}

function convertPoints(coords, canonical, out) {
Expand All @@ -18,14 +24,17 @@ function convertPoints(coords, canonical, out) {
}
}

function convertLine(line, canonical, out) {
const l = [];
for (let i = 0; i < line.length; i++) {
l.push(getPoint(line[i], canonical));
}
out.push(l);
}

function convertLines(lines, canonical, out) {
for (let i = 0; i < lines.length; i++) {
const geom = [];
const ring = lines[i];
for (let j = 0; j < ring.length; j++) {
convertPoint(ring[j], canonical, geom);
}
out.push(geom);
convertLine(lines[i], canonical, out);
}
}

Expand All @@ -38,15 +47,17 @@ function getGeometry(feature, geometry, canonical) {
if (type === 'Point') {
convertPoint(coords, canonical, feature.geometry);
} else if (type === 'MultiPoint') {
feature.type = 'Point';
convertPoints(coords, canonical, feature.geometry);
} else if (type === 'LineString') {
convertPoints(coords, canonical, feature.geometry);
convertLine(coords, canonical, feature.geometry);
} else if (type === 'MultiLineString') {
feature.type = 'LineString';
convertLines(coords, canonical, feature.geometry);
} else if (type === 'Polygon') {
convertLines(coords, canonical, feature.geometry);

} else if (type === 'MultiPolygon') {
feature.type = 'Polygon';
for (let i = 0; i < coords.length; i++) {
const polygon = [];
convertLines(coords[i], canonical, polygon);
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"expression": ["within", {
"type": "MultiPolygon",
"coordinates": [[[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]],
[[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]]
}],
"inputs": [[{
"zoom": 3,
"canonicalID": {
"z": 3,
"x": 3,
"y": 3
}
}, {
"geometry": {
"type": "LineString",
"coordinates": [[3, 3], [4, 1]]
}
}], [{
"zoom": 3,
"canonicalID": {
"z": 3,
"x": 3,
"y": 3
}
}, {
"geometry": {
"type": "LineString",
"coordinates": [[3, 3], [-2, -2]]
}
}], [{
"zoom": 3,
"canonicalID": {
"z": 3,
"x": 3,
"y": 3
}
}, {
"geometry": {
"type": "LineString",
"coordinates": [[0, 0], [2, 2]]
}
}], [{
"zoom": 3,
"canonicalID": {
"z": 3,
"x": 3,
"y": 3
}
}, {
"geometry": {
"type": "LineString",
"coordinates": [[1, 3], [-2, -2]]
}
}], [{
"zoom": 3,
"canonicalID": {
"z": 3,
"x": 3,
"y": 3
}
}, {
"geometry": {
"type": "LineString",
"coordinates": [[-1, -1], [-2, -2]]
}
}]],
"expected": {
"compiled": {
"type": "boolean",
"isFeatureConstant": false,
"isZoomConstant": true,
"result": "success"
},
"outputs": [true, false, false, false, true],
"serialized": ["within", {
"coordinates": [[[[0, 0], [0, 5], [5, 5], [5, 0], [0, 0]]], [[[0, 0], [-3, 0], [-3, -3], [0, -3], [0, 0]]]],
"type": "MultiPolygon"
}]
}
}
Loading