Reproject schematisation #160
Open
+406
−18
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…ght float instead of text
* Add removing of views and combine implementation with removing triggers
…ect_schematisation
…ect_schematisation
…ns/threedi-schema into margriet_111_reproject_schematisation
margrietpalm
commented
Jan 14, 2025
| or self.get_version() < 222 | ||
| or self.get_version() > 229 | ||
| ): | ||
| raise ValueError(f"Cannot set epgs code for revision {self.get_version()}") |
| if get_schema_version() > 229: | ||
| _upgrade_database(work_db, revision="head", unsafe=True) | ||
| with work_db.get_session() as session: | ||
| session.execute(text("DELETE FROM model_settings;")) |
There was a problem hiding this comment.
don't delete all model settings!
| raise InvalidSRIDException(srid_str[0], "the epsg_code must be an integer") | ||
| unit, is_projected = get_crs_info(srid) | ||
| if unit != "metre": | ||
| raise InvalidSRIDException(srid, f"the CRS must be in meters, not {unit}") |
There was a problem hiding this comment.
use metre instead of meter
| # This gives a bunch of warnings but seems to be needed to fix spatialite stuff | ||
| op.execute(sa.text(f"SELECT RecoverGeometryColumn('{table_name}', " | ||
| f"'geom', {srid}, '{geom_type}', 'XY')")) | ||
| op.execute(sa.text(f"SELECT CreateSpatialIndex('{table_name}', 'geom')")) |
There was a problem hiding this comment.
consider skipping for columns that give warnings
| @@ -282,6 +282,7 @@ def test_columns_added_tables(self, schema_upgraded): | |||
| cols_schema = get_columns_from_schema(schema_upgraded, table) | |||
| assert cols_sqlite == cols_schema | |||
|
|
|||
| @pytest.mark.skip(reason="This test is broken by upgrade to 230") | |||
There was a problem hiding this comment.
This should be fixed
There was a problem hiding this comment.
also check test below!
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Migrate schema such that all geometries in the schematisation have the model CRS. Migrations without epsg_code are not permitted and will raise. To allow for migrations of empty schematisations, as used in tests,
custom_epsg_codeis added as an argument to the upgrade function.Added properties to retrieve the epsg_code and source object of that code from the schematisation (used by modelchecker and grid-builder).
To properly set all spatial indices the following is necessary
Unfortunately, this triggers a bunch of warnings:
I played around with the
RecoverGeometryColumn,CreateSpatialIndexandRecoverSpatialIndexbut I could not find a combination or order that resulted in valid spatial indices without these warnings. A fresh pair of eyes is highly appreciated.Note: this will eventually be merged on master, but current work is based on schema leftovers that will be merged with master before this one