introduced force_2d for a subset of geometries #180 #183

whisk · 2023-10-30T15:02:10Z

Added force_2d function for Point, MultiPoint, LineString, Polygon and all descending classes (if any). No support for MultiLineString and MultiPolygon yet.

pep8speaks · 2023-10-30T15:02:18Z

Hello @whisk! Thanks for updating this PR. We checked the lines you've touched for PEP 8 issues, and found:

There are currently no PEP 8 issues detected in this Pull Request. Cheers! 🍻

Comment last updated at 2023-11-05 09:49:32 UTC

what-the-diff · 2023-10-30T15:02:44Z

PR Summary

Introduction of a new function called force_2d
This update includes a new function named force_2d added to the pygeoif/factories.py file. This function helps handle operations related to 2-dimensional geometries more efficiently in our application.
Incorporation of unit tests for newly added force_2d function
To ensure that this new function performs effectively and error-free, unit tests have been written and included in tests/test_factories.py. These tests will confirm the correctness of the force_2d function by checking it in various scenarios, ensuring robustness of our application.

codecov · 2023-10-30T15:03:19Z

Codecov Report

Attention: 4 lines in your changes are missing coverage. Please review.

Comparison is base (5b461c7) 100.00% compared to head (a213905) 99.83%.

Additional details and impacted files

@@             Coverage Diff             @@
##           develop     #183      +/-   ##
===========================================
- Coverage   100.00%   99.83%   -0.17%     
===========================================
  Files           21       21              
  Lines         2299     2434     +135     
===========================================
+ Hits          2299     2430     +131     
- Misses           0        4       +4

Files	Coverage Δ
pygeoif/functions.py	`100.00% <100.00%> (ø)`
tests/test_factories.py	`100.00% <100.00%> (ø)`
tests/test_functions.py	`100.00% <100.00%> (ø)`
pygeoif/factories.py	`97.27% <78.94%> (-2.73%)`	⬇️

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

cleder · 2023-10-31T09:33:57Z

Hi @whisk, thanks for your contribution.

I think that the force_2d and force_3d could be cleaner to implement by operating on the __geo_interface__ like pygeoif.functions.compare_geo_interface

def force_2d(geometry: Union[GeoType, GeoCollectionType]) -> Union[Geometry, GeometryCollection]:

For force_2d you can zip the coordinates with (0 ,0),

def force_3d(geometry: Union[GeoType, GeoCollectionType], z: float = 0) -> Union[Geometry, GeometryCollection]:

For force_3d you could use zip_longest using z as the fillvalue

To convert the resulting __geo_interface__ dictionary back into a geometry, you may use shape

I hope this makes sense.

cleder · 2023-10-31T12:41:49Z

https://realpython.com/python-zip-function/ and https://ioflood.com/blog/python-zip-function/ seem to be useful to learn more about zip

cleder · 2023-10-31T17:10:16Z

Approach I'd take:

def move_coordinate(coordinate: Sequence[float], move_by: Sequence[float]) -> Tuple[float, ...]:
    if len(coordinate) > len(move_by):
        return tuple(c + m for c, m in zip(coordinate, move_by))
    else:
        return tuple(c + m for c, m in zip_longest(coordinate, move_by, fillvalue=0.0))

>>> move_coordinate((0,0), (0,0,0))
(0, 0, 0.0)
>>> move_coordinate((0,0), (0,0,1))
(0, 0, 1.0)
>>> move_coordinate((0,0,0), (0,0,1))
(0, 0, 1)
>>> move_coordinate((0,0,0), (0,0))
(0, 0)
>>> move_coordinate((1,1,1), (0,0))
(1, 1)

def move_coordinates(coordinates, move_by):
    try:
        return tuple(move_coordinates(c, move_by) for c in coordinates)
    except TypeError:
        return move_coordinate(coordinates, move_by)

>>> move_coordinates((1,0), [0,0,5])
(1, 0, 5.0)
>>> c = ((0,0), (0,1), ((1,0), (1,1), ((2,0) , (2,1), (2,2))))
>>> move_coordinates(c, [0,0,5])
[(0, 0, 5.0), (0, 1, 5.0), [(1, 0, 5.0), (1, 1, 5.0), [(2, 0, 5.0), (2, 1, 5.0), (2, 2, 5.0)]]]
>>> c3d = ((0,0,0), (0,1,1), ((1,0,2), (1,1,3), ((2,0,4) , (2,1,5), (2,2,6))))
>>> move_coordinates(c3d, [0,0])
[(0, 0), (0, 1), [(1, 0), (1, 1), [(2, 0), (2, 1), (2, 2)]]]

This can be used by force_2d with (0, 0) as move_by and force_3d with (0, 0, z) as move_by
What do you think @whisk ?

whisk · 2023-10-31T23:30:59Z

Hi, I refactored force_2d by using __geo_interface__, like functions compare_geo_interface and shape do. This is much simpler and I think that's what you were looking for.

I also added move_coordinate and move_coordinates functions.

whisk · 2023-10-31T23:51:01Z

pygeoif/functions.py

+    >>> move_coordinates(((0, 0), (-1, 1)), (-1, 1, 0))
+    ((-1, 1, 0), (-2, 2, 0))
+    """
+    if isinstance(coordinates, (tuple, list)) and isinstance(


I preferred to check types explicitly rather what catch TypeError exception.

What happens if I try:

coords = ((i, 2*i, 3*i) for i in range(100)) move_coordinates(coords, (0,0))

Thanks for pointing this out!
As far as I see, you refactored this lines to use CoordinatesType, not Sequence[Any], so this function just can't accept generators anyway.
Not sure if generators still need to be supported in move_coordinates?

You still CAN pass in a generator, it is just that mypy will complain that you should not do that

Thanks again for your help, your work will be in the next release (1.2) 👍

You still CAN pass in a generator, it is just that mypy will complain that you should not do that

Yes, yes, you are right. I'm probably just too used to strict typing :)
Please consider PR #188 regarding it.

watermelon-copilot-for-code-review · 2023-11-04T17:42:08Z

WatermelonAI Summary

AI Summary deactivated by whisk

GitHub PRs

#183 - introduced force_2d for a subset of geometries #180 - By whisk 5 days ago
#185 - added force_2d factory and move_coordinates function #180 - By whisk 3 days ago
#177 - Geometries should be immutable and hashable #128 - By cleder 1 weeks ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶
Try us on VSCode!

watermelon-copilot-for-code-review · 2023-11-04T17:42:25Z

WatermelonAI Summary

AI Summary deactivated by whisk

GitHub PRs

#183 - introduced force_2d for a subset of geometries #180 - By whisk 5 days ago
#2 - If the number contains a three the output is "lucky - By cleder 2 years ago
#177 - Geometries should be immutable and hashable #128 - By cleder 1 weeks ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶
Try us on VSCode!

watermelon-copilot-for-code-review · 2023-11-04T17:46:42Z

WatermelonAI Summary

AI Summary deactivated by whisk

GitHub PRs

#183 - introduced force_2d for a subset of geometries #180 - By whisk 5 days ago
#177 - Geometries should be immutable and hashable #128 - By cleder 1 weeks ago
#185 - added force_2d factory and move_coordinates function #180 - By whisk 3 days ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶
Have you starred Watermelon?

watermelon-copilot-for-code-review · 2023-11-05T09:33:04Z

WatermelonAI Summary

AI Summary deactivated by whisk

No results found in GitHub PRs :(

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶
Try us on any JetBrains IDE!

watermelon-copilot-for-code-review · 2023-11-05T09:33:19Z

WatermelonAI Summary

AI Summary deactivated by whisk

GitHub PRs

#183 - introduced force_2d for a subset of geometries #180 - By whisk 5 days ago
#185 - added force_2d factory and move_coordinates function #180 - By whisk 4 days ago
#177 - Geometries should be immutable and hashable #128 - By cleder 1 weeks ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶
Have you starred Watermelon?

watermelon-copilot-for-code-review · 2023-11-05T09:34:16Z

WatermelonAI Summary

AI Summary deactivated by whisk

GitHub PRs

#183 - introduced force_2d for a subset of geometries #180 - By whisk 5 days ago
#185 - added force_2d factory and move_coordinates function #180 - By whisk 4 days ago
#176 - v 1.1.1 - By cleder 1 weeks ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶
Try us on VSCodium!

watermelon-copilot-for-code-review · 2023-11-05T09:34:31Z

WatermelonAI Summary

AI Summary deactivated by whisk

GitHub PRs

#183 - introduced force_2d for a subset of geometries #180 - By whisk 5 days ago
#185 - added force_2d factory and move_coordinates function #180 - By whisk 4 days ago
#184 - [pre-commit.ci] pre-commit autoupdate - By pre-commit-ci[bot] 5 days ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶
Try us on VSCodium!

watermelon-copilot-for-code-review · 2023-11-05T09:36:14Z

WatermelonAI Summary

AI Summary deactivated by whisk

GitHub PRs

#183 - introduced force_2d for a subset of geometries #180 - By whisk 5 days ago
#184 - [pre-commit.ci] pre-commit autoupdate - By pre-commit-ci[bot] 5 days ago
#256 - [pre-commit.ci] pre-commit autoupdate - By pre-commit-ci[bot] 5 days ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶

watermelon-copilot-for-code-review · 2023-11-05T09:36:31Z

WatermelonAI Summary

AI Summary deactivated by whisk

GitHub PRs

#183 - introduced force_2d for a subset of geometries #180 - By whisk 5 days ago
#176 - v 1.1.1 - By cleder 1 weeks ago
#185 - added force_2d factory and move_coordinates function #180 - By whisk 4 days ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶

watermelon-copilot-for-code-review · 2023-11-05T09:41:28Z

WatermelonAI Summary

AI Summary deactivated by whisk

GitHub PRs

#183 - introduced force_2d for a subset of geometries #180 - By whisk 5 days ago
#184 - [pre-commit.ci] pre-commit autoupdate - By pre-commit-ci[bot] 5 days ago
#256 - [pre-commit.ci] pre-commit autoupdate - By pre-commit-ci[bot] 5 days ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶

watermelon-copilot-for-code-review · 2023-11-05T09:41:45Z

WatermelonAI Summary

AI Summary deactivated by whisk

GitHub PRs

#1 - fetch upstream - By cleder 2 years ago
#1 - Tuple Assignment Issue in kml.py Fixed - By jeremyblalock 11 years ago
#16 - Add support for
and tags. - By IanLee1521 9 years ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶

for more information, see https://pre-commit.ci

watermelon-copilot-for-code-review · 2023-11-05T09:49:15Z

WatermelonAI Summary

AI Summary deactivated by whisk

GitHub PRs

#1 - fetch upstream - By cleder 2 years ago
#224 - [pre-commit.ci] pre-commit autoupdate - By pre-commit-ci[bot] 7 months ago
#26 - Editing ... - By jean 9 years ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶
Try us on VSCodium!

for more information, see https://pre-commit.ci

watermelon-copilot-for-code-review · 2023-11-05T09:49:32Z

WatermelonAI Summary

AI Summary deactivated by whisk

GitHub PRs

#183 - introduced force_2d for a subset of geometries #180 - By whisk 5 days ago
#185 - added force_2d factory and move_coordinates function #180 - By whisk 4 days ago
#11 - Update pygeoif to 1.1.1 - By pyup-bot 1 weeks ago

No results found in Jira Tickets :(

No results found in Confluence Docs :(

No results found in Slack Threads :(

No results found in Notion Pages :(

No results found in Linear Tickets :(

No results found in Asana Tasks :(

pygeoif is an open repo and Watermelon will serve it for free.
🍉🫶

cleder

Nice work :-) Thanks a lot!

cleder · 2023-11-01T08:52:40Z

tests/test_factories.py

+        [geometry.Point(-1, 1, 0), geometry.Point(-2, 2, 0)],
+    )
+    gc2d = factories.force_2d(gc)
+    assert list(gc2d.geoms) == [geometry.Point(-1, 1), geometry.Point(-2, 2)]


Suggested change

assert list(gc2d.geoms) == [geometry.Point(-1, 1), geometry.Point(-2, 2)]

assert gc2d.geoms == (geometry.Point(-1, 1), geometry.Point(-2, 2))

cleder · 2023-11-01T08:54:03Z

tests/test_factories.py

+    # 2d to 2d (no actual change)
+    p = geometry.MultiPoint([(-1, 1), (2, 3)])
+    p2d = factories.force_2d(p)
+    assert list(p2d.geoms) == [geometry.Point(-1, 1), geometry.Point(2, 3)]


Suggested change

assert list(p2d.geoms) == [geometry.Point(-1, 1), geometry.Point(2, 3)]

assert p2d.geoms)== (geometry.Point(-1, 1), geometry.Point(2, 3))

cleder · 2023-11-01T09:05:56Z

pygeoif/functions.py

+    coordinate: Sequence[float],
+    move_by: Sequence[float],


Suggested change

coordinate: Sequence[float],

move_by: Sequence[float],

coordinate: PointType,

move_by: PointType,

and add from pygeoif.types import PointType

cleder · 2023-11-01T09:10:30Z

pygeoif/functions.py

+    >>> move_coordinates(((0, 0), (-1, 1)), (-1, 1, 0))
+    ((-1, 1, 0), (-2, 2, 0))
+    """
+    if isinstance(coordinates, (tuple, list)) and isinstance(


What happens if I try:

coords = ((i, 2*i, 3*i) for i in range(100)) move_coordinates(coords, (0,0))

cleder · 2023-11-01T09:11:57Z

pygeoif/functions.py

+    coordinates: Sequence[Any],
+    move_by: Sequence[float],


Suggested change

coordinates: Sequence[Any],

move_by: Sequence[float],

coordinates: Union[CoordinatesType, MultiCoordinatesType],

move_by: PointType,

cleder · 2023-11-01T09:12:48Z

pygeoif/functions.py

+    coordinates: Sequence[Any],
+    move_by: Sequence[float],
+    z: float = 0,
+) -> Sequence[Any]:


Suggested change

) -> Sequence[Any]:

) -> Union[CoordinatesType, MultiCoordinatesType]:

cleder · 2023-11-01T09:21:11Z

pygeoif/factories.py

+    geometry = context if isinstance(context, dict) else mapping(context)
+    if not geometry:
+        msg = "Object does not implement __geo_interface__"
+        raise TypeError(msg)


Suggested change

raise TypeError(msg)

raise AttributeError(msg)

What happens if I call

force_2d(object())

whisk mentioned this pull request Oct 30, 2023

Add force_2d and force_3d #180

Closed

whisk force-pushed the develop branch from 8bd04e6 to b66ba12 Compare October 30, 2023 18:24

cleder added the hacktoberfest-accepted label Oct 31, 2023

whisk force-pushed the develop branch from 81dfe33 to a8ec6b6 Compare October 31, 2023 23:27

watermelon-copilot-for-code-review bot added the 🚨 Don't Merge label Oct 31, 2023

whisk closed this Oct 31, 2023

whisk force-pushed the develop branch from a8ec6b6 to 5b461c7 Compare October 31, 2023 23:34

whisk mentioned this pull request Oct 31, 2023

added force_2d factory and move_coordinates function #180 #185

Closed

whisk reopened this Oct 31, 2023

watermelon-copilot-for-code-review bot added 🍉 Safe to Merge 🚨 Don't Merge and removed 🚨 Don't Merge 🍉 Safe to Merge labels Oct 31, 2023

whisk commented Oct 31, 2023

View reviewed changes

watermelon-copilot-for-code-review bot added 👀 Take a deeper dive and removed 🚨 Don't Merge labels Nov 4, 2023

watermelon-copilot-for-code-review bot added 🍉 Safe to Merge and removed 👀 Take a deeper dive labels Nov 4, 2023

whisk force-pushed the develop branch from 6473da9 to e077f1f Compare November 4, 2023 17:46

watermelon-copilot-for-code-review bot removed the 🍉 Safe to Merge label Nov 4, 2023

watermelon-copilot-for-code-review bot added 🍉 Safe to Merge and removed 👀 Take a deeper dive labels Nov 5, 2023

watermelon-copilot-for-code-review bot added 🚨 Don't Merge and removed 🍉 Safe to Merge labels Nov 5, 2023

whisk force-pushed the develop branch from 7fd9a6f to 5bca9ba Compare November 5, 2023 09:34

watermelon-copilot-for-code-review bot added 👀 Take a deeper dive and removed 🚨 Don't Merge labels Nov 5, 2023

whisk force-pushed the develop branch from 24a6728 to 5c54fea Compare November 5, 2023 09:36

whisk force-pushed the develop branch from 66b58d3 to f705c5f Compare November 5, 2023 09:41

watermelon-copilot-for-code-review bot added 🚨 Don't Merge and removed 👀 Take a deeper dive labels Nov 5, 2023

whisk and others added 4 commits November 5, 2023 10:47

added force_2d factory and move_coordinates function cleder#180

0fdc579

[pre-commit.ci] auto fixes from pre-commit.com hooks

f28889f

for more information, see https://pre-commit.ci

introduced is_coordinate function

a654b38

added force_3d factory

8466fd9

whisk force-pushed the develop branch from 994870b to 8466fd9 Compare November 5, 2023 09:49

[pre-commit.ci] auto fixes from pre-commit.com hooks

a213905

for more information, see https://pre-commit.ci

cleder approved these changes Nov 5, 2023

View reviewed changes

cleder merged commit 216525b into cleder:develop Nov 5, 2023
19 of 24 checks passed

watermelon-copilot-for-code-review bot mentioned this pull request Nov 12, 2023

move_coordinates supports generators #188

Closed

	assert list(gc2d.geoms) == [geometry.Point(-1, 1), geometry.Point(-2, 2)]
	assert gc2d.geoms == (geometry.Point(-1, 1), geometry.Point(-2, 2))

	assert list(p2d.geoms) == [geometry.Point(-1, 1), geometry.Point(2, 3)]
	assert p2d.geoms)== (geometry.Point(-1, 1), geometry.Point(2, 3))

	) -> Sequence[Any]:
	) -> Union[CoordinatesType, MultiCoordinatesType]:

introduced force_2d for a subset of geometries #180 #183

introduced force_2d for a subset of geometries #180 #183

Conversation

whisk commented Oct 30, 2023

pep8speaks commented Oct 30, 2023 • edited Loading

Comment last updated at 2023-11-05 09:49:32 UTC

what-the-diff bot commented Oct 30, 2023

PR Summary

codecov bot commented Oct 30, 2023 • edited Loading

Codecov Report

cleder commented Oct 31, 2023

cleder commented Oct 31, 2023

cleder commented Oct 31, 2023 • edited Loading

whisk commented Oct 31, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

watermelon-copilot-for-code-review bot commented Nov 4, 2023

WatermelonAI Summary

GitHub PRs

watermelon-copilot-for-code-review bot commented Nov 4, 2023

WatermelonAI Summary

GitHub PRs

watermelon-copilot-for-code-review bot commented Nov 4, 2023

WatermelonAI Summary

GitHub PRs

watermelon-copilot-for-code-review bot commented Nov 5, 2023

WatermelonAI Summary

watermelon-copilot-for-code-review bot commented Nov 5, 2023

WatermelonAI Summary

GitHub PRs

watermelon-copilot-for-code-review bot commented Nov 5, 2023

WatermelonAI Summary

GitHub PRs

watermelon-copilot-for-code-review bot commented Nov 5, 2023

WatermelonAI Summary

GitHub PRs

watermelon-copilot-for-code-review bot commented Nov 5, 2023

WatermelonAI Summary

GitHub PRs

watermelon-copilot-for-code-review bot commented Nov 5, 2023

WatermelonAI Summary

GitHub PRs

watermelon-copilot-for-code-review bot commented Nov 5, 2023

WatermelonAI Summary

GitHub PRs

watermelon-copilot-for-code-review bot commented Nov 5, 2023

WatermelonAI Summary

GitHub PRs

watermelon-copilot-for-code-review bot commented Nov 5, 2023

WatermelonAI Summary

GitHub PRs

watermelon-copilot-for-code-review bot commented Nov 5, 2023

WatermelonAI Summary

GitHub PRs

cleder left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

pep8speaks commented Oct 30, 2023 •

edited

Loading

codecov bot commented Oct 30, 2023 •

edited

Loading

cleder commented Oct 31, 2023 •

edited

Loading