Skip to content

Commit e90c913

Browse files
tomkralidistomkralidis
authored
Merge pull request #56 from drnextgis/pygeoif
pygeoif 1.0.0
2 parents 3dbcccc + 5ebe1e5 commit e90c913

File tree

7 files changed

+35
-41
lines changed

7 files changed

+35
-41
lines changed

‎pygeofilter/backends/sqlalchemy/filters.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
from typing import Callable, Dict
66

77
from sqlalchemy import and_, func, not_, or_
8-
from pygeoif.geometry import as_shape
8+
from pygeoif import shape
99

1010

1111
def parse_bbox(box, srid: int = None):
@@ -19,7 +19,7 @@ def parse_bbox(box, srid: int = None):
1919

2020

2121
def parse_geometry(geom):
22-
wkt = as_shape(geom).to_wkt()
22+
wkt = shape(geom).wkt
2323
search = re.search(r"SRID=(\d+);", wkt)
2424
sridtxt = "" if search else "SRID=4326;"
2525
return func.ST_GeomFromEWKT(f"{sridtxt}{wkt}")

‎pygeofilter/values.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
from datetime import date, time, datetime, timedelta
3131
from typing import Any, List, Union, Optional
3232

33-
from pygeoif.geometry import as_shape
33+
from pygeoif import shape
3434

3535

3636
@dataclass
@@ -43,7 +43,7 @@ def __geo_interface__(self):
4343

4444
def __eq__(self, o: object) -> bool:
4545
return (
46-
as_shape(self).__geo_interface__ == as_shape(o).__geo_interface__
46+
shape(self).__geo_interface__ == shape(o).__geo_interface__
4747
)
4848

4949

@@ -73,7 +73,7 @@ def __geo_interface__(self):
7373

7474
def __eq__(self, o: object) -> bool:
7575
return (
76-
as_shape(self).__geo_interface__ == as_shape(o).__geo_interface__
76+
shape(self).__geo_interface__ == shape(o).__geo_interface__
7777
)
7878

7979

‎setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
install_requires=[
6464
"dateparser",
6565
"lark<1.0",
66-
"pygeoif",
66+
"pygeoif>=1.0.0",
6767
"dataclasses;python_version<'3.7'",
6868
] if not on_rtd else [],
6969
extras_require={

‎tests/parsers/cql2_json/test_parser.py

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -408,8 +408,8 @@ def test_within_multipolygon_attr():
408408
assert result == ast.GeometryWithin(
409409
values.Geometry(
410410
normalize_geom(
411-
geometry.MultiPolygon(
412-
[geometry.Polygon([(1, 1), (2, 2), (0, 3), (1, 1)])]
411+
geometry.MultiPolygon.from_polygons(
412+
geometry.Polygon([(1, 1), (2, 2), (0, 3), (1, 1)])
413413
).__geo_interface__
414414
),
415415
),
@@ -435,11 +435,9 @@ def test_touches_attr_multilinestring():
435435
ast.Attribute("geometry"),
436436
values.Geometry(
437437
normalize_geom(
438-
geometry.MultiLineString(
439-
[
440-
geometry.LineString([(1, 1), (2, 2)]),
441-
geometry.LineString([(0, 3), (1, 1)]),
442-
]
438+
geometry.MultiLineString.from_linestrings(
439+
geometry.LineString([(1, 1), (2, 2)]),
440+
geometry.LineString([(0, 3), (1, 1)]),
443441
).__geo_interface__
444442
),
445443
),
@@ -464,11 +462,9 @@ def test_crosses_attr_multilinestring():
464462
ast.Attribute("geometry"),
465463
values.Geometry(
466464
normalize_geom(
467-
geometry.MultiLineString(
468-
[
469-
geometry.LineString([(1, 1), (2, 2)]),
470-
geometry.LineString([(0, 3), (1, 1)]),
471-
]
465+
geometry.MultiLineString.from_linestrings(
466+
geometry.LineString([(1, 1), (2, 2)]),
467+
geometry.LineString([(0, 3), (1, 1)]),
472468
).__geo_interface__
473469
)
474470
),
@@ -493,11 +489,9 @@ def test_overlaps_attr_multilinestring():
493489
ast.Attribute("geometry"),
494490
values.Geometry(
495491
normalize_geom(
496-
geometry.MultiLineString(
497-
[
498-
geometry.LineString([(1, 1), (2, 2)]),
499-
geometry.LineString([(0, 3), (1, 1)]),
500-
]
492+
geometry.MultiLineString.from_linestrings(
493+
geometry.LineString([(1, 1), (2, 2)]),
494+
geometry.LineString([(0, 3), (1, 1)]),
501495
).__geo_interface__
502496
),
503497
),

‎tests/parsers/cql_json/test_parser.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -509,9 +509,9 @@ def test_within_multipolygon_attr():
509509
assert result == ast.GeometryWithin(
510510
values.Geometry(
511511
normalize_geom(
512-
geometry.MultiPolygon([
512+
geometry.MultiPolygon.from_polygons(
513513
geometry.Polygon([(1, 1), (2, 2), (0, 3), (1, 1)])
514-
]).__geo_interface__
514+
).__geo_interface__
515515
),
516516
),
517517
ast.Attribute('geometry'),
@@ -533,10 +533,10 @@ def test_touches_attr_multilinestring():
533533
ast.Attribute('geometry'),
534534
values.Geometry(
535535
normalize_geom(
536-
geometry.MultiLineString([
536+
geometry.MultiLineString.from_linestrings(
537537
geometry.LineString([(1, 1), (2, 2)]),
538538
geometry.LineString([(0, 3), (1, 1)]),
539-
]).__geo_interface__
539+
).__geo_interface__
540540
),
541541
),
542542
)
@@ -557,10 +557,10 @@ def test_crosses_attr_multilinestring():
557557
ast.Attribute('geometry'),
558558
values.Geometry(
559559
normalize_geom(
560-
geometry.MultiLineString([
560+
geometry.MultiLineString.from_linestrings(
561561
geometry.LineString([(1, 1), (2, 2)]),
562562
geometry.LineString([(0, 3), (1, 1)]),
563-
]).__geo_interface__
563+
).__geo_interface__
564564
)
565565
),
566566
)
@@ -581,10 +581,10 @@ def test_overlaps_attr_multilinestring():
581581
ast.Attribute('geometry'),
582582
values.Geometry(
583583
normalize_geom(
584-
geometry.MultiLineString([
584+
geometry.MultiLineString.from_linestrings(
585585
geometry.LineString([(1, 1), (2, 2)]),
586586
geometry.LineString([(0, 3), (1, 1)]),
587-
]).__geo_interface__
587+
).__geo_interface__
588588
),
589589
),
590590
)

‎tests/parsers/ecql/test_parser.py

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -328,9 +328,9 @@ def test_within_multipolygon_attr():
328328
result = parse('WITHIN(MULTIPOLYGON(((1 1,2 2,0 3,1 1))), geometry)')
329329
assert result == ast.GeometryWithin(
330330
values.Geometry(
331-
geometry.MultiPolygon([
331+
geometry.MultiPolygon.from_polygons(
332332
geometry.Polygon([(1, 1), (2, 2), (0, 3), (1, 1)])
333-
]).__geo_interface__,
333+
).__geo_interface__,
334334
),
335335
ast.Attribute('geometry'),
336336
)
@@ -341,10 +341,10 @@ def test_touches_attr_multilinestring():
341341
assert result == ast.GeometryTouches(
342342
ast.Attribute('geometry'),
343343
values.Geometry(
344-
geometry.MultiLineString([
344+
geometry.MultiLineString.from_linestrings(
345345
geometry.LineString([(1, 1), (2, 2)]),
346346
geometry.LineString([(0, 3), (1, 1)]),
347-
]).__geo_interface__,
347+
).__geo_interface__,
348348
),
349349
)
350350

@@ -354,10 +354,10 @@ def test_crosses_attr_multilinestring():
354354
assert result == ast.GeometryCrosses(
355355
ast.Attribute('geometry'),
356356
values.Geometry(
357-
geometry.MultiLineString([
357+
geometry.MultiLineString.from_linestrings(
358358
geometry.LineString([(1, 1), (2, 2)]),
359359
geometry.LineString([(0, 3), (1, 1)]),
360-
]).__geo_interface__,
360+
).__geo_interface__,
361361
),
362362
)
363363

@@ -367,10 +367,10 @@ def test_overlaps_attr_multilinestring():
367367
assert result == ast.GeometryOverlaps(
368368
ast.Attribute('geometry'),
369369
values.Geometry(
370-
geometry.MultiLineString([
370+
geometry.MultiLineString.from_linestrings(
371371
geometry.LineString([(1, 1), (2, 2)]),
372372
geometry.LineString([(0, 3), (1, 1)]),
373-
]).__geo_interface__,
373+
).__geo_interface__,
374374
),
375375
)
376376

‎tests/parsers/jfe/test_parser.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,9 @@ def test_within_multipolygon_attr():
227227
assert result == ast.GeometryWithin(
228228
values.Geometry(
229229
normalize_geom(
230-
geometry.MultiPolygon([
230+
geometry.MultiPolygon.from_polygons(
231231
geometry.Polygon([(1, 1), (2, 2), (0, 3), (1, 1)])
232-
]).__geo_interface__
232+
).__geo_interface__
233233
),
234234
),
235235
ast.Attribute('geometry'),

0 commit comments

Comments
 (0)