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

[WIP] Use GeometryOpsCore for real #223

Open
wants to merge 33 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
d9ff60b
Add GeometryOpsCore as an explicit dependency + fix version
asinghvi17 Oct 6, 2024
f50c82a
Fix imports to work on nightly
asinghvi17 Oct 6, 2024
324fccb
Add nightly job
asinghvi17 Oct 6, 2024
36bb92c
Beautify
asinghvi17 Oct 6, 2024
e40db7d
import linearring as well
asinghvi17 Oct 6, 2024
2009463
Simplify and make imports explicit
asinghvi17 Oct 7, 2024
611a726
impex TraitTarget + make sure GO and GOC are both local
asinghvi17 Oct 7, 2024
86f3b87
Use add not dev in CI
asinghvi17 Oct 7, 2024
73f486b
Adapt segmentize to the new way of doing things
asinghvi17 Oct 7, 2024
1f5613a
try and fix ci
asinghvi17 Oct 7, 2024
b07808f
devadd in docs too
asinghvi17 Oct 7, 2024
7ea0676
linear -> planar
asinghvi17 Oct 7, 2024
50cdbef
more linear -> planar
asinghvi17 Oct 7, 2024
91ee1ca
Core: fix typos, bump version
asinghvi17 Oct 8, 2024
739c55b
Bump Core compat
asinghvi17 Oct 8, 2024
a41c257
fix default segmentize not passing on max_distance
asinghvi17 Oct 8, 2024
53936f1
fix geodesic again
asinghvi17 Oct 8, 2024
60593d6
fix all segmentizes
asinghvi17 Oct 8, 2024
3841ec8
+fix
asinghvi17 Oct 8, 2024
6177640
Fix method error with geodesic
asinghvi17 Nov 11, 2024
b281ee6
Merge branch 'main' into as/usecore
asinghvi17 Nov 11, 2024
a38f74a
change Linear to Planar
asinghvi17 Nov 11, 2024
2c79028
load booltypes
asinghvi17 Nov 12, 2024
2f29e24
Merge branch 'main' into as/usecore
asinghvi17 Nov 12, 2024
39b51f9
Remove useless functions from not_implemented_yet (#237)
asinghvi17 Nov 25, 2024
ae6c92c
Fix the inference error by removing assume_effects (#245)
asinghvi17 Jan 9, 2025
f526f54
Check the dimensions of child geoms when rebuilding + add forcexy, fo…
asinghvi17 Jan 10, 2025
c70d007
Bugfix the type of `z` in forcexyz
asinghvi17 Jan 10, 2025
1663f70
Declare compatibility with GeometryBasics v0.5 as well
asinghvi17 Jan 10, 2025
f409149
Fix doctest failure when showing GeoInterface geometry
asinghvi17 Jan 12, 2025
1f8ff94
Add a brief writeup on what manifolds are to the docs
asinghvi17 Jan 13, 2025
d0c0806
Use the GeoInterface show-fix branch
asinghvi17 Jan 13, 2025
907fac6
Merge remote-tracking branch 'origin/main' into as/usecore
asinghvi17 Jan 13, 2025
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
2 changes: 1 addition & 1 deletion .github/workflows/CI.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ jobs:
version:
- '1.9'
- '1'
# - 'nightly'
- 'nightly'
os:
- ubuntu-latest
arch:
Expand Down
2 changes: 2 additions & 0 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ DelaunayTriangulation = "927a84f5-c5f4-47a5-9785-b46e178433df"
ExactPredicates = "429591f6-91af-11e9-00e2-59fbe8cec110"
GeoInterface = "cf35fbd7-0cd7-5166-be24-54bfbe79505f"
GeometryBasics = "5c1252a2-5f33-56bf-86c9-59e7332b4326"
GeometryOpsCore = "05efe853-fabf-41c8-927e-7063c8b9f013"
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
LinearAlgebra = "37e2e46d-f89d-539d-b4ee-838fcccc9c8e"
SortTileRecursiveTree = "746ee33f-1797-42c2-866d-db2fce69d14d"
Expand All @@ -34,6 +35,7 @@ ExactPredicates = "2.2.8"
FlexiJoins = "0.1.30"
GeoInterface = "1.2"
GeometryBasics = "0.4.7"
GeometryOpsCore = "=0.1.1"
LibGEOS = "0.9.2"
LinearAlgebra = "1"
Proj = "1"
Expand Down
16 changes: 12 additions & 4 deletions src/GeometryOps.jl
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,19 @@

module GeometryOps

include("../GeometryOpsCore/src/GeometryOpsCore.jl") # TODO: replace this with `using GeometryOpsCore`
import .GeometryOpsCore
for name in setdiff(names(GeometryOpsCore, all = true), (:eval, :var"#eval", :include, :var"#include"))
import GeometryOpsCore
for name in Base.setdiff(
asinghvi17 marked this conversation as resolved.
Show resolved Hide resolved
Base.union(
names(GeometryOpsCore),
(
:flatten, :reconstruct, :rebuild, :unwrap, :_linearring,
:APPLY_KEYWORDS, :THREADED_KEYWORD, :CRS_KEYWORD, :CALC_EXTENT_KEYWORD,
)
),
(:eval, :include, :var"#eval", :var"#include"),
)
# Import all symbols from GeometryOpsCore
@eval import .GeometryOpsCore: $name
@eval import GeometryOpsCore: $name
# Re-export all exported symbols
if Base.isexported(GeometryOpsCore, name)
@eval export $name
Expand Down
Loading