Skip to content

Improve "difference mesh" generation, triangulation, and refactor code #111

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.

Sign up for GitHub

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

Open
ansonl wants to merge 67 commits into
base: main
Choose a base branch
from
Open

Improve "difference mesh" generation, triangulation, and refactor code #111

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
67 commits
Select commit Hold shift + click to select a range
116d5c9
create vscode launch and settings
ansonl Jul 28, 2025
3f400fe
work in progress for code refactor, top and difference mesh creation …
ansonl Aug 4, 2025
0085d97
add notes for resolving hole filled strip for difference mesh+thru wa…
ansonl Aug 5, 2025
488402b
fill holes in bottom mesh in through water case
ansonl Aug 5, 2025
9263090
wip
ansonl Aug 10, 2025
08bdd8d
wip, added tileScale option
ansonl Aug 10, 2025
960d750
Created new TouchTerrainConfig class to pass config through
ansonl Aug 11, 2025
940080c
Load interp DEM. Sort config values
ansonl Aug 11, 2025
e06d5b2
Sort configs
ansonl Aug 11, 2025
77a7c66
add remove_zero_height_volumes()
ansonl Aug 18, 2025
dcf26dd
add triangulation splitting edge rotation based on splitting edge slope
ansonl Aug 18, 2025
4f1f312
turn tile_info into a class and reference the config from the new class
ansonl Aug 18, 2025
fa169c4
Add in changes from PaulKC PR #109. It's easier to add it into this m…
ansonl Aug 20, 2025
915477b
Add in changes from #106. I changed the standalone python file in thi…
ansonl Aug 20, 2025
119ebe0
Fix offset for difference mesh (non bottom-thru-base) case. Simplifie…
ansonl Aug 20, 2025
d4b8935
update setup.sh with better directions and added split_rotation config
ansonl Aug 22, 2025
d6b8c2b
Use DEM_name and config_path for ZIP/mesh/folder name in that order. …
ansonl Aug 22, 2025
614d596
Fix bugs, comment out part of interpolate for testing
ansonl Aug 23, 2025
2ca7694
add top_hint for NaN bottom locations on normal mode
ansonl Aug 25, 2025
108e211
fix up bottom_thru case to use correct raster variants
ansonl Aug 25, 2025
0f469f2
udpate raster variant comments and improve dilation function to build…
ansonl Aug 25, 2025
9600695
fix dilate_array parameter type
ansonl Aug 25, 2025
8a8df13
change config comments
ansonl Aug 25, 2025
604642c
fillHoles on all bottom rasters no matter what bottom_thru_base is. T…
ansonl Aug 26, 2025
1063543
add second param to standalone file to specifiy mesh unzip directory
ansonl Aug 28, 2025
c3b55b1
comment out debug breakpoints
ansonl Aug 28, 2025
8a60550
change second param to extract meshes directly to that directory
ansonl Sep 2, 2025
8d82cb5
Fix example_config.json creation to serialize from the new TouchTerra…
ansonl Sep 18, 2025
70b170f
add edge_fit_polygon_file config, code region markings for local rast…
ansonl Sep 19, 2025
ad6dea0
update comment for remove_zero_height_volumes
ansonl Sep 21, 2025
9297859
Fixed W/E x/y coordinate flipped bug (commented from 2021). Add CellC…
ansonl Sep 22, 2025
74c3005
clean up commented out code from last commit
ansonl Sep 22, 2025
01d9308
Add array coord to print coord functions. Rearranged imports for PEP
ansonl Sep 28, 2025
acc0bed
fix up geo to print coordinate functions and get preliminary test tha…
ansonl Oct 4, 2025
a98ca5f
add option to set_location_in_variants for RasterVariants to not set …
ansonl Oct 6, 2025
5f38324
clipping polygon work
ansonl Oct 9, 2025
aafe2b5
Add find_polygon_clipping_edges this function:
ansonl Oct 18, 2025
0fc7208
organize polygon clipping edge finding code and add debug plotting code
ansonl Oct 20, 2025
3b5b994
work in progress on marking shared edges along adjacent cells for "ma…
ansonl Nov 25, 2025
8fff366
Add flipped test case. Fix bug in mark_overlapping_edges_for_walls
ansonl Nov 25, 2025
9b302e4
fix comments on test case
ansonl Nov 25, 2025
dc18f6a
Fixed bug in mark_shared_edges_of_cell_for_walls where we did not loo…
ansonl Nov 26, 2025
30d6850
graphically show test result for wall determination for an example 3x…
ansonl Nov 26, 2025
6a74f3d
Fix mark_shared_edges_for_walls to mark all edges as walls on cell si…
ansonl Nov 26, 2025
c866231
Work in progress on non-rectangular top surface integration during ce…
ansonl Nov 27, 2025
e20c921
Work on progress. Added more surface polygon creation to create_cells…
ansonl Dec 1, 2025
a089dda
reverse vertex order of top surface polygons and define new cell prop…
ansonl Dec 5, 2025
37752d6
Add simplePolygon clipping test case. Set cells in top_hint to NaN if…
ansonl Dec 6, 2025
0ba1052
generating irregular boundaries for top and bottom surface are workin…
ansonl Dec 7, 2025
05b9bb6
Clipping boundary borders working. Refactored mark_shared_edges_of_ce…
ansonl Dec 8, 2025
0c80818
Improve remove_zero_height_volumes() to remove the two cardinal direc…
ansonl Dec 12, 2025
af41c05
Apply clipping "set to NaN" changes to bottom raster so that differen…
ansonl Dec 12, 2025
c448e84
Fix polygons_equal_3d to orient vertices in the same direction.
ansonl Dec 13, 2025
0e6673c
rename config from edge fitting to edge clipping. Work on reducing re…
ansonl Dec 14, 2025
6dd2a98
Update versions in pyproject.toml with newer versions numbers in requ…
ansonl Dec 14, 2025
3c1f8c9
update python package setup directions
ansonl Dec 18, 2025
ad32aef
Handle case of multiple polygons in the clipping vector file
ansonl Dec 20, 2025
acbfe0f
handle case where polygon > multilinestring > linestring by passing o…
ansonl Dec 20, 2025
f346ec2
Fix bug where marking walls cell2 X direction location was out of ran…
ansonl Dec 20, 2025
ccb7b5a
Round numbers to 6 decimal places and add 0.0 to reduce floating poin…
ansonl Dec 23, 2025
0b55dd9
Add notes for no more need to clean_diags if edge clipping polygon is…
ansonl Dec 24, 2025
43d7546
Handle case where elevation is NaN but included in the clipping polyg…
ansonl Dec 24, 2025
bd7a4fc
rearrange clipping functions around the raster_preparation() because …
ansonl Dec 24, 2025
5c903ef
Fix bug where the quad triangle rotation was not being applied.
ansonl Dec 24, 2025
5dd32b3
multiprocessing support for `find_polygon_clipping_edges()`
ansonl Dec 28, 2025
94e7e4a
Remove min row range for workers. Add logging to show where workers m…
ansonl Dec 29, 2025
cc23891
Possible refactor for EE initialization to prevent logging EE error f…
ansonl Dec 29, 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
224 changes: 224 additions & 0 deletions .vscode/launch.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,224 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Python Debugger: MAG TT Standalone PA-land-clip.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/../map-auto-generation/workflow/mesh_tools/touchterrain/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../map-auto-generation/",
"args": ["../templates//il-israel-linear//workspace//ttConfig/PA-land.json", "../templates/output/il-israel-linear/250/PA/"]
},
{
"name": "Python Debugger: MAG TT Standalone PA3-land-clip.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/../map-auto-generation/workflow/mesh_tools/touchterrain/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../map-auto-generation/",
"args": ["../templates//il-israel-linear//workspace//ttConfig/PA3-land.json", "../templates/output/il-israel-linear/250/PA/"]
},
{
"name": "Python Debugger: MAG TT Standalone PA3-water-clip.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/../map-auto-generation/workflow/mesh_tools/touchterrain/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../map-auto-generation/",
"args": ["../templates//il-israel-linear//workspace//ttConfig/PA3-water.json", "../templates/output/il-israel-linear/250/PA/"]
},
{
"name": "Python Debugger: TT Standalone PA-river.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "PA-river.json"
},
{
"name": "Python Debugger: TT Standalone IP-land.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "IP-land.json"
},
{
"name": "Python Debugger: TT Standalone IP-water.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "IP-water.json"
},
{
"name": "Python Debugger: TT Standalone IP-land-clip.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "IP-land-clip.json"
},
{
"name": "Python Debugger: TT Standalone IP-water-clip.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "IP-water-clip.json"
},
{
"name": "Python Debugger: TT Standalone DC-new-land-only.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "DC-new-land-only.json"
},
{
"name": "Python Debugger: TT Standalone DC-new-land.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "DC-new-land.json"
},
{
"name": "Python Debugger: TT Standalone DC-new-river.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "DC-new-river.json"
},
{
"name": "Python Debugger: TT Standalone DC-new-land-clip.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "DC-new-land-clip.json"
},
{
"name": "Python Debugger: TT Standalone DC-new-river-clip.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "DC-new-river-clip.json"
},
{
"name": "Python Debugger: TT Standalone DC-new-land-thru.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "DC-new-land-thru.json"
},
{
"name": "Python Debugger: TT Standalone DC-new-river-thru.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "DC-new-river-thru.json"
},
{
"name": "Python Debugger: TT Standalone WV-new-land-only.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "WV-new-land-only.json"
},
{
"name": "Python Debugger: TT Standalone WV-new-land.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "WV-new-land.json"
},
{
"name": "Python Debugger: TT Standalone WV-new-river.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "WV-new-river.json"
},
{
"name": "Python Debugger: TT Standalone WV-new-land-thru.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "WV-new-land-thru.json"
},
{
"name": "Python Debugger: TT Standalone WV-new-river-thru.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "WV-new-river-thru.json"
},
{
"name": "Python Debugger: TT Standalone simplePolygon-new-land.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "simplePolygon-new-land.json"
},
{
"name": "Python Debugger: TT Standalone simplePolygon-new-river.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "simplePolygon-new-river.json"
},
{
"name": "Python Debugger: TT Standalone simplePolygon-new-land-clip.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "simplePolygon-new-land-clip.json"
},
{
"name": "Python Debugger: TT Standalone simplePolygon-new-river-clip.json",
"type": "debugpy",
"request": "launch",
"program": "${workspaceFolder}/TouchTerrain_standalone.py",
"console": "integratedTerminal",
"cwd": "${workspaceFolder}/../touchterrain-dev/",
"args": "simplePolygon-new-river-clip.json"
},
]
}
14 changes: 14 additions & 0 deletions .vscode/settings.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{
"python-envs.defaultEnvManager": "ms-python.python:conda",
"python-envs.defaultPackageManager": "ms-python.python:conda",
"python-envs.pythonProjects": [],
"python.testing.unittestArgs": [
"-v",
"-s",
"./test",
"-p",
"test_*.py"
],
"python.testing.pytestEnabled": false,
"python.testing.unittestEnabled": true
}
Loading