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

Grid speedup #20

Open
wants to merge 22 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
3c0d9cf
WIP implementation for grid chunker in its own class
timlinux Feb 7, 2025
0e0643e
Update tests for chunker. Add geom checks
timlinux Feb 7, 2025
017a0a9
WIP Study Area prep performance improvements...
timlinux Feb 7, 2025
3c8a7bb
Use transactions for grid creations - massive speedup
timlinux Feb 8, 2025
72b9855
Count errors during processing
timlinux Feb 8, 2025
d1deb8a
Initialise gpkg path on grid chunker start
timlinux Feb 8, 2025
9388b23
Fix progress reporting and more grid creation optimisation
timlinux Feb 8, 2025
42adb1d
Adds study area summary report to geest
timlinux Feb 9, 2025
3c1b984
Iterate over study area layers for report
timlinux Feb 9, 2025
16ff958
Iterate over study area layers for report
timlinux Feb 9, 2025
f5c4de5
Study area report shows outputs on separate pages
timlinux Feb 9, 2025
69acd00
WIP templating for study area report
timlinux Feb 9, 2025
449f65c
Fix aspect ratio of maps in study area report
timlinux Feb 9, 2025
2813f50
Fix aspect ratio of maps in study area report
timlinux Feb 9, 2025
6e9fc2b
Added remove pycache script
timlinux Feb 10, 2025
6b72c18
Added some notes about ORS key
timlinux Feb 10, 2025
8e2ec75
More study area report descriptions and add grid to map in report
timlinux Feb 10, 2025
815b509
Fix merge conflicts
timlinux Feb 14, 2025
ec7060a
Merge remote-tracking branch 'upstream/grid-speedup' into grid-speedup
timlinux Feb 14, 2025
d741a78
Show version in start logs
timlinux Feb 14, 2025
754d01f
Fix transparency in windows
timlinux Feb 15, 2025
01e9068
Windows pdf open fix
timlinux Feb 15, 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
20 changes: 15 additions & 5 deletions admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,22 @@ def install(context: typer.Context, build_src: bool = True):
build(context, clean=True) if build_src else LOCAL_ROOT_DIR / "build" / SRC_NAME
)

root_directory = (
Path.home() / f".local/share/QGIS/QGIS3/profiles/"
f"{context.obj['qgis_profile']}"
)
# For windows root dir in in AppData
if os.name == "nt":
print("User profile:")
print(os.environ["USERPROFILE"])
plugin_path = os.path.join(

"AppData", "Roaming", "QGIS", "QGIS3", "profiles", "default",
)
root_directory = os.environ["USERPROFILE"] + "\\" + plugin_path
else:
root_directory = (
Path.home() / f".local/share/QGIS/QGIS3/profiles/"
f"{context.obj['qgis_profile']}"
)

base_target_directory = root_directory / "python/plugins" / SRC_NAME
base_target_directory = os.path.join(root_directory, "python/plugins", SRC_NAME)
_log(f"Copying built plugin to {base_target_directory}...", context=context)
shutil.copytree(built_directory, base_target_directory)
_log(
Expand Down
2 changes: 1 addition & 1 deletion config.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
"author": "Kartoza for and with The World Bank",
"email": "[email protected], [email protected]",
"description": "Gender Enabling Environments Spatial Tool",
"version": "0.5.5",
"version": "0.5.9",
"changelog": "",
"server": false
}
Expand Down
4 changes: 3 additions & 1 deletion geest/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@

# Import your plugin components here
from .core import setting # , JSONValidator
from .utilities import resources_path, log_message
from .utilities import resources_path, log_message, version
from .gui import GeestOptionsFactory, GeestDock
import datetime
import logging
Expand All @@ -61,6 +61,8 @@
date = datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S")
log_message(f"»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»", force=True)
log_message(f"Geest2 started at {date}", force=True)
version = version()
log_message(f"Geest Version: {version}")
log_message(f"Logging output to: {log_file_path}", force=True)
log_message(f"log_path_env: {log_path_env}", force=True)
log_message(f"»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»»", force=True)
Expand Down
Loading
Loading