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

Map topology updates #121

Draft
wants to merge 35 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
2c79420
Added topology manager
davenquinn Jul 9, 2024
6a093fc
Started updates to handle map topology
davenquinn Jul 10, 2024
6e9c17f
Updated topology testing
davenquinn Jul 10, 2024
d7132a8
Added ability to update topology
davenquinn Jul 10, 2024
9d4eea0
Map boundary topology works at some level
davenquinn Jul 10, 2024
8c5c270
Updated procedures to improve topology handling
davenquinn Jul 16, 2024
1e9ae81
Updated topology filling procedures
davenquinn Jul 17, 2024
dc95f6e
Mostly updated topology manager
davenquinn Jan 8, 2025
8383766
Only use finalized maps for topology
davenquinn Jan 8, 2025
34ff929
Partially working commit
davenquinn Jan 8, 2025
3983678
Partial conversion to new topology functions
davenquinn Jan 8, 2025
d4af990
Updated topo creation
davenquinn Jan 8, 2025
31c71f7
Working update
davenquinn Jan 8, 2025
876d597
Update topology rows
davenquinn Jan 9, 2025
52be005
Updated topology management
davenquinn Jan 9, 2025
f70536c
Update sources
davenquinn Jan 9, 2025
e2d25ec
Basic error fixing routine
davenquinn Jan 9, 2025
c5bfd15
Error fixing routine
davenquinn Jan 9, 2025
c04d009
Improved map processing times
davenquinn Jan 9, 2025
ac32929
Allow processing of single maps by slug
davenquinn Jan 9, 2025
276d7af
Removed grid snapping to hopefully reduce errors
davenquinn Jan 9, 2025
c2d2070
Update compilations
davenquinn Jan 9, 2025
1217b90
Added ability to fix errors by densifying geometries
davenquinn Jan 9, 2025
b210595
Fixed subsystems
davenquinn Jan 9, 2025
ddd963c
Fixed map compilation adding
davenquinn Jan 9, 2025
b4852c4
Prevent use of 'obsolete' maps
davenquinn Jan 9, 2025
124ee76
Add geometry simplification, and fix name-matching error
davenquinn Jan 9, 2025
83e7a57
Add more multigeometry casting
davenquinn Jan 9, 2025
b984b0d
Added simplification
davenquinn Jan 9, 2025
b220f1b
Updated maps
davenquinn Jan 9, 2025
52102a5
New multigeometry cast
davenquinn Jan 9, 2025
c73127e
Added utility function to clean extra topogeometries
davenquinn Jan 10, 2025
418d559
Fixed broken query
davenquinn Jan 10, 2025
d6b76cd
Cast to multi
davenquinn Jan 10, 2025
605e7f1
Format code and sort imports
davenquinn Jan 10, 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
3 changes: 3 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "deps/topology-manager"]
path = submodules/topology-manager
url = https://github.com/Mapboard/topology-manager.git
[submodule "submodules/postgis-tile-utils"]
path = submodules/postgis-tile-utils
url = https://github.com/UW-Macrostrat/postgis-tile-utils
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ all:
poetry install
# Install the version of the GDAL bindings that matches the native lib.
# This is breakable and should be replaced with a more robust solution.
#poetry run pip install GDAL==$(shell gdal-config --version | sed 's/\([0-9]*\)\.\([0-9]*\).*/\1.\2/')
poetry run pip install GDAL==$(shell gdal-config --version | sed 's/\([0-9]*\)\.\([0-9]*\).*/\1.\2/')

install:
ln -sf $(shell pwd)/bin/macrostrat /usr/local/bin/macrostrat
Expand Down
9 changes: 9 additions & 0 deletions cli/macrostrat/cli/entrypoint.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,6 +133,15 @@ def environments():

main.add_typer(cfg_app)

from .subsystems.maps import cli as maps_cli

main.add_typer(
maps_cli,
name="topo",
rich_help_panel="Subsystems",
short_help="Manage the Macrostrat maps topology",
)


@main.command(
context_settings={"allow_extra_args": True, "ignore_unknown_options": True},
Expand Down
Loading