CatalogueRevamping
/
spatial-d4science
14
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

More antimeridian fixes

This commit is contained in:
amercader 2022-09-05 15:05:02 +02:00
parent 07a028f06f
commit 244b2ba20f
4 changed files with 63 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ckanext/spatial/lib/__init__.py
View File

@ -112,8 +112,8 @@ def fit_linear_ring(lr):
bbox = {
"minx": lr[0][0],
"maxx": lr[2][0],
"miny": lr[1][1],
"maxy": lr[0][1],
"miny": lr[0][1],
"maxy": lr[2][1],
}
bbox = fit_bbox(bbox)

8
ckanext/spatial/plugin/__init__.py
View File

@ -252,7 +252,7 @@ class SpatialQuery(SpatialQueryMixin, p.SingletonPlugin):
lr = shapely.geometry.polygon.LinearRing(geometry['coordinates'][0])
lr_coords = (
list(lr.coords) if lr.is_ccw
else reversed(list(lr.coords))
else list(reversed(list(lr.coords)))
)
polygon = shapely.geometry.polygon.Polygon(
fit_linear_ring(lr_coords))
@ -263,6 +263,12 @@ class SpatialQuery(SpatialQueryMixin, p.SingletonPlugin):
if not shape.is_valid:
log.error('Wrong geometry, not indexing')
return pkg_dict
if shape.bounds[0] < -180 or shape.bounds[2] > 180:
import ipdb; ipdb.set_trace()
log.error("""
Geometries outside the -180, -90, 180, 90 boundaries are not supported,
you need to split the geometry in order to fit the parts. Not indexing""")
return pkg_dict
wkt = shape.wkt
pkg_dict['spatial_geom'] = wkt

1
ckanext/spatial/tests/data/chukot.geojson Normal file
View File

File diff suppressed because one or more lines are too long

73
ckanext/spatial/tests/test_spatial_search.py
View File

@ -10,10 +10,27 @@ import ckan.tests.factories as factories
from ckanext.spatial.tests.base import SpatialTestBase
extents = {
"nz": '{"type":"Polygon","coordinates":[[[174,-38],[176,-38],[176,-40],[174,-40],[174,-38]]]}',
"ohio": '{"type": "Polygon","coordinates": [[[-84,38],[-84,40],[-80,42],[-80,38],[-84,38]]]}',
"dateline": '{"type":"Polygon","coordinates":[[[169,70],[169,60],[192,60],[192,70],[169,70]]]}',
"dateline2": '{"type":"Polygon","coordinates":[[[170,60],[-170,60],[-170,70],[170,70],[170,60]]]}',
"nz": """
{"type":"Polygon",
"coordinates":[[[174,-38],[176,-38],[176,-40],[174,-40],[174,-38]]]}""",
"ohio": """
{"type": "Polygon",
"coordinates": [[[-84,38],[-84,40],[-80,42],[-80,38],[-84,38]]]}""",
"antimeridian_bbox": """
{"type":"Polygon",
"coordinates":[[[169,70],[169,60],[192,60],[192,70],[169,70]]]}""",
"antimeridian_bbox_2": """
{"type":"Polygon",
"coordinates":[[[170,60],[-170,60],[-170,70],[170,70],[170,60]]]}""",
"antimeridian_polygon": """
{ "type": "MultiPolygon",
"coordinates": [ [ [
[ 181.2, 61.7 ], [ 178.1, 61.4 ],
[ 176.9, 59.2 ], [ 178.4, 55.2 ],
[ 188.6, 54.9 ], [ 188.8, 60.2 ],
[ 181.2, 61.7 ] ] ] ]
}
"""
}
@ -175,10 +192,10 @@ class TestBBoxSearch(SpatialTestBase):
assert result["count"] == 1
assert result["results"][0]["id"] == dataset["id"]
def test_spatial_query_dateline_1(self):
def test_spatial_query_antimeridian_1(self):
dataset = factories.Dataset(
extras=[{"key": "spatial", "value": extents["dateline"]}]
extras=[{"key": "spatial", "value": extents["antimeridian_bbox"]}]
)
result = helpers.call_action(
@ -188,10 +205,10 @@ class TestBBoxSearch(SpatialTestBase):
assert result["count"] == 1
assert result["results"][0]["id"] == dataset["id"]
def test_spatial_query_dateline_2(self):
def test_spatial_query_antimeridian_2(self):
dataset = factories.Dataset(
extras=[{"key": "spatial", "value": extents["dateline"]}]
extras=[{"key": "spatial", "value": extents["antimeridian_bbox"]}]
)
result = helpers.call_action(
@ -201,10 +218,10 @@ class TestBBoxSearch(SpatialTestBase):
assert result["count"] == 1
assert result["results"][0]["id"] == dataset["id"]
def test_spatial_query_dateline_3(self):
def test_spatial_query_antimeridian_3(self):
dataset = factories.Dataset(
extras=[{"key": "spatial", "value": extents["dateline2"]}]
extras=[{"key": "spatial", "value": extents["antimeridian_bbox_2"]}]
)
result = helpers.call_action(
@ -214,10 +231,10 @@ class TestBBoxSearch(SpatialTestBase):
assert result["count"] == 1
assert result["results"][0]["id"] == dataset["id"]
def test_spatial_query_dateline_4(self):
def test_spatial_query_antimeridian_4(self):
dataset = factories.Dataset(
extras=[{"key": "spatial", "value": extents["dateline2"]}]
extras=[{"key": "spatial", "value": extents["antimeridian_bbox_2"]}]
)
result = helpers.call_action(
@ -413,10 +430,10 @@ class TestSpatialFieldSearch(SpatialTestBase):
assert result["count"] == 1
assert result["results"][0]["id"] == dataset["id"]
def test_spatial_query_dateline_1(self):
def test_spatial_query_antimeridian_1(self):
dataset = factories.Dataset(
extras=[{"key": "spatial", "value": extents["dateline"]}]
extras=[{"key": "spatial", "value": extents["antimeridian_bbox"]}]
)
result = helpers.call_action(
@ -426,10 +443,10 @@ class TestSpatialFieldSearch(SpatialTestBase):
assert result["count"] == 1
assert result["results"][0]["id"] == dataset["id"]
def test_spatial_query_dateline_2(self):
def test_spatial_query_antimeridian_2(self):
dataset = factories.Dataset(
extras=[{"key": "spatial", "value": extents["dateline"]}]
extras=[{"key": "spatial", "value": extents["antimeridian_bbox"]}]
)
result = helpers.call_action(
@ -439,10 +456,10 @@ class TestSpatialFieldSearch(SpatialTestBase):
assert result["count"] == 1
assert result["results"][0]["id"] == dataset["id"]
def test_spatial_query_dateline_3(self):
def test_spatial_query_antimeridian_3(self):
dataset = factories.Dataset(
extras=[{"key": "spatial", "value": extents["dateline2"]}]
extras=[{"key": "spatial", "value": extents["antimeridian_bbox_2"]}]
)
result = helpers.call_action(
@ -452,10 +469,10 @@ class TestSpatialFieldSearch(SpatialTestBase):
assert result["count"] == 1
assert result["results"][0]["id"] == dataset["id"]
def test_spatial_query_dateline_4(self):
def test_spatial_query_antimeridian_4(self):
dataset = factories.Dataset(
extras=[{"key": "spatial", "value": extents["dateline2"]}]
extras=[{"key": "spatial", "value": extents["antimeridian_bbox_2"]}]
)
result = helpers.call_action(
@ -497,3 +514,19 @@ class TestSpatialFieldSearch(SpatialTestBase):
)
assert result["count"] == 0
def test_spatial_polygon_across_antimeridian_not_indexed(self):
factories.Dataset(
extras=[
{
"key": "spatial",
"value": extents["antimeridian_polygon"]
}
]
)
result = helpers.call_action(
"package_search", extras={"ext_bbox": "177.9,55,178.0,59"},
)
assert result["count"] == 0