From 9ddb9993c1e8bf0ebb7fc5b74ed23a0a0c173893 Mon Sep 17 00:00:00 2001 From: SJiB Date: Sat, 10 Aug 2024 08:55:34 +0200 Subject: [PATCH 1/5] update comments, take out blocked keyword wastewater --- datamodel/app/create_app.py | 41 ++++++++++++++++++------------------- 1 file changed, 20 insertions(+), 21 deletions(-) diff --git a/datamodel/app/create_app.py b/datamodel/app/create_app.py index d3978df0..2391ad99 100755 --- a/datamodel/app/create_app.py +++ b/datamodel/app/create_app.py @@ -36,8 +36,8 @@ def create_app( srid: int = 2056, pg_service: str = "pg_tdh", drop_schema: Optional[bool] = False, - # tdh_reach_extra: Optional[Path] = None, - # tdh_wastewater_structure_extra: Optional[Path] = None, + # tdh_xxx_extra: Optional[Path] = None, + # if several tdh_xx_extra add a line for each view ): """ Creates the schema tdh_app for TEKSI Distance Heating @@ -46,8 +46,7 @@ def create_app( :param pg_service: the PostgreSQL service, if not given it will be determined from environment variable in Pirogue """ - # :param tdh_reach_extra: YAML file path of the definition of additional columns for vw_tdh_reach view - # :param tdh_wastewater_structure_extra: YAML file path of the definition of additional columns for vw_tdh_wastewater_structure_extra view + # :param tdh_xxx_extra: YAML file path of the definition of additional columns for vw_tdh_xxx view Path(__file__).parent.resolve() variables = { @@ -59,24 +58,22 @@ def create_app( run_sql("CREATE SCHEMA tdh_app;", pg_service) - # to do add symbology_function for TEKSI Distance heating + # to do add symbology_function and geometry_funcions for TEKSI Distance heating # run_sql_file("symbology_functions.sql", pg_service) - # run_sql_file("reach_direction_change.sql", pg_service, variables) # run_sql_file("14_geometry_functions.sql", pg_service, variables) # open YAML files - # if tdh_reach_extra: - # tdh_reach_extra = safe_load(open(tdh_reach_extra)) - # if tdh_wastewater_structure_extra: - # tdh_wastewater_structure_extra = safe_load(open(tdh_wastewater_structure_extra)) + # if tdh_xx_extra: + # tdh_xx_extra = safe_load(open(tdh_xx_extra)) + run_sql_file("view/vw_dictionary_value_list.sql", pg_service, variables) defaults = {"view_schema": "tdh_app", "pg_service": pg_service} SingleInheritances = { - # pipe_point (Leitungspunkt) + # subclasse of pipe_point (Leitungspunkt) "pipe_point_normal": "pipe_point", "pipe_point_feed": "pipe_point", } @@ -91,6 +88,8 @@ def create_app( **defaults, ).create() + # MultipleInheritance configuration - add a block for each MultipleInheritance + # MultipleInheritance( # safe_load(open(cwd / "view/vw_maintenance_event.yaml")), # create_joins=True, @@ -105,14 +104,12 @@ def create_app( # pg_service=pg_service, # ).create() - # vw_tdh_wastewater_structure( - # srid, pg_service=pg_service, extra_definition=tdh_wastewater_structure_extra - # ) - - # vw_tdh_reach( - # pg_service=pg_service, extra_definition=tdh_reach_extra + # vw_tdh_xxx( + # srid, pg_service=pg_service, extra_definition=tdh_xxx_extra # ) + # additional views to be created with simple sql + # run_sql_file("view/vw_file.sql", pg_service, variables) # MultipleInheritance( @@ -128,12 +125,14 @@ def create_app( # run_sql_file("view/network/vw_network_segment.sql", pg_service, variables) # Recreate extension views - # to do add extensions if necessar + # to do add extensions if necessary # run_sql_file("swmm_views/02_vw_swmm_junctions.sql", pg_service, variables) + # SimpleJoins configuration - add a block for each SimpleJoins + # SimpleJoins(safe_load(open(cwd / "view/export/vw_export_reach.yaml")), pg_service).create() # SimpleJoins( - # safe_load(open(cwd / "view/export/vw_export_wastewater_structure.yaml")), + # safe_load(open(cwd / "view/export/vw_export_xxx_structure.yaml")), # pg_service, # ).create() @@ -150,7 +149,7 @@ def create_app( ) # parser.add_argument( # "--tdh_wastewater_structure_extra", - # help="YAML definition file path for additions to vw_tdh_wastewater_structure view", + # help="YAML definition file path for additions to vw_tdh_xxx_structure view", # ) # parser.add_argument( # "--tdh_reach_extra", @@ -170,5 +169,5 @@ def create_app( args.pg_service, drop_schema=args.drop_schema, # tdh_reach_extra=args.tdh_reach_extra, - # tdh_wastewater_structure_extra=args.tdh_wastewater_structure_extra, + # tdh_xxx_structure_extra=args.tdh_wastewater_structure_extra, ) From 970d79d83bd36d68db2e991f9501421103b70281 Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Sat, 10 Aug 2024 06:56:17 +0000 Subject: [PATCH 2/5] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- datamodel/app/create_app.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/datamodel/app/create_app.py b/datamodel/app/create_app.py index 2391ad99..7b038fcd 100755 --- a/datamodel/app/create_app.py +++ b/datamodel/app/create_app.py @@ -67,7 +67,6 @@ def create_app( # if tdh_xx_extra: # tdh_xx_extra = safe_load(open(tdh_xx_extra)) - run_sql_file("view/vw_dictionary_value_list.sql", pg_service, variables) defaults = {"view_schema": "tdh_app", "pg_service": pg_service} @@ -109,7 +108,7 @@ def create_app( # ) # additional views to be created with simple sql - + # run_sql_file("view/vw_file.sql", pg_service, variables) # MultipleInheritance( From b6811d3f1f0e03b9735720dac484cc6021d9abb3 Mon Sep 17 00:00:00 2001 From: SJiB Date: Sat, 10 Aug 2024 08:58:16 +0200 Subject: [PATCH 3/5] more --- datamodel/app/create_app.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/datamodel/app/create_app.py b/datamodel/app/create_app.py index 2391ad99..e2e31f92 100755 --- a/datamodel/app/create_app.py +++ b/datamodel/app/create_app.py @@ -12,7 +12,7 @@ from pirogue import SingleInheritance # from view.vw_tdh_reach import vw_tdh_reach -# from view.vw_tdh_wastewater_structure import vw_tdh_wastewater_structure +# from view.vw_tdh_xxx_structure import vw_tdh_xxx_structure def run_sql_file(file_path: str, pg_service: str, variables: dict = None): @@ -148,7 +148,7 @@ def create_app( "-s", "--srid", help="SRID EPSG code, defaults to 2056", type=int, default=2056 ) # parser.add_argument( - # "--tdh_wastewater_structure_extra", + # "--tdh_xxx_structure_extra", # help="YAML definition file path for additions to vw_tdh_xxx_structure view", # ) # parser.add_argument( @@ -169,5 +169,5 @@ def create_app( args.pg_service, drop_schema=args.drop_schema, # tdh_reach_extra=args.tdh_reach_extra, - # tdh_xxx_structure_extra=args.tdh_wastewater_structure_extra, + # tdh_xxx_structure_extra=args.tdh_xxx_structure_extra, ) From 68c912be842462e49bc000cca2d0b15c2aa7c943 Mon Sep 17 00:00:00 2001 From: SJiB Date: Sat, 10 Aug 2024 09:04:18 +0200 Subject: [PATCH 4/5] replace in post-all.py --- datamodel/update/post-all.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datamodel/update/post-all.py b/datamodel/update/post-all.py index 5cb9798d..f37f44f8 100644 --- a/datamodel/update/post-all.py +++ b/datamodel/update/post-all.py @@ -14,7 +14,7 @@ class CreateViews(DeltaPy): def run(self): - # tdh_wastewater_structure_extra = self.variables.get("tdh_wastewater_structure_extra", None) + # tdh_xxx_structure_extra = self.variables.get("tdh_xxx_structure_extra", None) # tdh_reach_extra = self.variables.get("tdh_reach_extra", None) if not self.variables.get("SRID"): @@ -24,7 +24,7 @@ def run(self): create_views( srid=self.variables.get("SRID"), pg_service=self.pg_service, - # tdh_wastewater_structure_extra=tdh_wastewater_structure_extra, + # tdh_xxx_structure_extra=tdh_xxx_structure_extra, # tdh_reach_extra=tdh_reach_extra, ) From bbbeaf1c24060bd8753ef9e620de9e2d812f86a3 Mon Sep 17 00:00:00 2001 From: SJiB Date: Sat, 10 Aug 2024 09:06:06 +0200 Subject: [PATCH 5/5] replace with xxx in test_geometry.py --- datamodel/test/test_geometry.py | 122 ++++++++++++++++---------------- 1 file changed, 61 insertions(+), 61 deletions(-) diff --git a/datamodel/test/test_geometry.py b/datamodel/test/test_geometry.py index e746f7f5..16ca08c8 100755 --- a/datamodel/test/test_geometry.py +++ b/datamodel/test/test_geometry.py @@ -220,36 +220,36 @@ def setUpClass(cls): # new_row = self.select("reach_point", "CCC 1337_1010", schema="tdh_od") # assert new_row["level"] is None -# def test_vw_tdh_wastewater_structure_geometry_insert(self): +# def test_vw_tdh_xxx_structure_geometry_insert(self): # # 1. insert geometry and no co_level and no wn_bottom_level -# # INSERT INTO tdh_app.vw_tdh_wastewater_structure (situation3d_geometry, wn_obj_id, co_obj_id) VALUES (ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056), '1337_1001', '1337_1001'); +# # INSERT INTO tdh_app.vw_tdh_xxx_structure (situation3d_geometry, wn_obj_id, co_obj_id) VALUES (ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056), '1337_1001', '1337_1001'); # row = { # "situation3d_geometry": "0101000020080800000000000020D6434100000000804F3241", # "wn_obj_id": "1337_1001", # "co_obj_id": "1337_1001", # } # expected_row = copy.deepcopy(row) -# # wastewaterstructure has the geometry but NaN as Z because of no co_level (geometry of cover): ST_SetSRID(ST_Collect(ST_MakePoint(2600000, 1200000, 'NaN')), 2056) +# # xxxstructure has the geometry but NaN as Z because of no co_level (geometry of cover): ST_SetSRID(ST_Collect(ST_MakePoint(2600000, 1200000, 'NaN')), 2056) # expected_row["situation3d_geometry"] = "0101000020080800000000000020D6434100000000804F3241" # # co_level is NULL # expected_row["co_level"] = None # # wn_bottom_level NULL # expected_row["wn_bottom_level"] = None -# self.insert_check("vw_tdh_wastewater_structure", row, expected_row) +# self.insert_check("vw_tdh_xxx_structure", row, expected_row) # # cover geometry has the geometry but NaN as Z: ST_SetSRID(ST_MakePoint(2600000, 1200000, 'NaN'), 2056) # row = self.select("cover", "1337_1001", schema="tdh_od") # assert ( # row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F3241000000000000F87F" # ) -# # wastewater_node has the geometry but not 3d: ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056) -# row = self.select("wastewater_node", "1337_1001", schema="tdh_od") +# # xxx_node has the geometry but not 3d: ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056) +# row = self.select("xxx_node", "1337_1001", schema="tdh_od") # assert row["situation3d_geometry"] == self.execute( # "ST_SetSRID( ST_MakePoint(2600000, 1200000, 'NaN'), 2056)" # ) # # 2. insert geometry with no co_level and WITH wn_bottom_level -# # INSERT INTO tdh_app.vw_tdh_wastewater_structure (situation3d_geometry, wn_obj_id, co_obj_id, wn_bottom_level) VALUES (ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056), '1337_1002', '1337_1002', 200.000); +# # INSERT INTO tdh_app.vw_tdh_xxx_structure (situation3d_geometry, wn_obj_id, co_obj_id, wn_bottom_level) VALUES (ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056), '1337_1002', '1337_1002', 200.000); # row = { # "situation3d_geometry": "0101000020080800000000000020D6434100000000804F3241", # "wn_obj_id": "1337_1002", @@ -257,28 +257,28 @@ def setUpClass(cls): # "wn_bottom_level": "200.000", # } # expected_row = copy.deepcopy(row) -# # wastewaterstructure has the 2D geometry: ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056) +# # xxxstructure has the 2D geometry: ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056) # expected_row["situation3d_geometry"] = "0101000020080800000000000020D6434100000000804F3241" # # co_level is NULL # expected_row["co_level"] = None # # wn_bottom_level is new wn_bottom_level # expected_row["wn_bottom_level"] = "200.000" -# self.insert_check("vw_tdh_wastewater_structure", row, expected_row) +# self.insert_check("vw_tdh_xxx_structure", row, expected_row) # # cover geometry has the geometry but NaN as Z: ST_SetSRID(ST_MakePoint(2600000, 1200000, 'NaN'), 2056) # row = self.select("cover", "1337_1002", schema="tdh_od") # assert ( # row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F3241000000000000F87F" # ) -# # wastewater_node has the geometry and wn_buttom_level as Z: ST_SetSRID(ST_MakePoint(2600000, 1200000, 200), 2056) -# row = self.select("wastewater_node", "1337_1002", schema="tdh_od") +# # xxx_node has the geometry and wn_buttom_level as Z: ST_SetSRID(ST_MakePoint(2600000, 1200000, 200), 2056) +# row = self.select("xxx_node", "1337_1002", schema="tdh_od") # assert ( # row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F32410000000000006940" # ) # # 3. insert geometry with Z and WITH co_level and WITH wn_bottom_level -# # INSERT INTO tdh_app.vw_tdh_wastewater_structure (situation3d_geometry, wn_obj_id, co_obj_id, wn_bottom_level, co_level) VALUES (ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056), '1337_1003', '1337_1003', 200.000, 500.000); +# # INSERT INTO tdh_app.vw_tdh_xxx_structure (situation3d_geometry, wn_obj_id, co_obj_id, wn_bottom_level, co_level) VALUES (ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056), '1337_1003', '1337_1003', 200.000, 500.000); # row = { # "situation3d_geometry": "0101000020080800000000000020D6434100000000804F3241", # "wn_obj_id": "1337_1003", @@ -287,44 +287,44 @@ def setUpClass(cls): # "co_level": "500.000", # } # expected_row = copy.deepcopy(row) -# # wastewaterstructure has 2D geometry: ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056) +# # xxxstructure has 2D geometry: ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056) # expected_row["situation3d_geometry"] = "0101000020080800000000000020D6434100000000804F3241" # # co_level is new co_level # expected_row["co_level"] = "500.000" # # wn_bottom_level is new wn_bottom_level # expected_row["wn_bottom_level"] = "200.000" -# self.insert_check("vw_tdh_wastewater_structure", row, expected_row) +# self.insert_check("vw_tdh_xxx_structure", row, expected_row) # # cover geometry has the geometry and co_level as Z: ST_SetSRID(ST_MakePoint(2600000, 1200000, 500), 2056) # row = self.select("cover", "1337_1003", schema="tdh_od") # assert ( # row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F32410000000000407F40" # ) -# # wastewater_node has the geometry and wn_buttom_level as Z: ST_SetSRID(ST_MakePoint(2600000, 1200000, 200), 2056) -# row = self.select("wastewater_node", "1337_1003", schema="tdh_od") +# # xxx_node has the geometry and wn_buttom_level as Z: ST_SetSRID(ST_MakePoint(2600000, 1200000, 200), 2056) +# row = self.select("xxx_node", "1337_1003", schema="tdh_od") # assert ( # row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F32410000000000006940" # ) -# def test_vw_tdh_wastewater_structure_geometry_update(self): +# def test_vw_tdh_xxx_structure_geometry_update(self): # # first insert # # insert geometry with no co_level and no wn_bottom_level -# # INSERT INTO tdh_app.vw_tdh_wastewater_structure (situation3d_geometry, wn_obj_id, co_obj_id) VALUES (ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056), '1337_1010', '1337_1010'); +# # INSERT INTO tdh_app.vw_tdh_xxx_structure (situation3d_geometry, wn_obj_id, co_obj_id) VALUES (ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056), '1337_1010', '1337_1010'); # row = { # "situation3d_geometry": "0101000020080800000000000020D6434100000000804F3241", # "ws_type": "manhole", # "wn_obj_id": "1337_1010", # "co_obj_id": "1337_1010", # } -# obj_id = self.insert("vw_tdh_wastewater_structure", row) +# obj_id = self.insert("vw_tdh_xxx_structure", row) # # 1. update no change on geometry with Z but WITH wn_bottom_level -# # UPDATE INTO tdh_app.vw_wastewater_node SET wn_bottom_level=200.000 WHERE obj_id = obj_id +# # UPDATE INTO tdh_app.vw_xxx_node SET wn_bottom_level=200.000 WHERE obj_id = obj_id # row = {"wn_bottom_level": "200.000"} -# self.update("vw_tdh_wastewater_structure", row, obj_id) -# new_row = self.select("vw_tdh_wastewater_structure", obj_id) -# # no change on geometry of wastewaterstructure (because it's geometry of cover that does not change) +# self.update("vw_tdh_xxx_structure", row, obj_id) +# new_row = self.select("vw_tdh_xxx_structure", obj_id) +# # no change on geometry of xxxstructure (because it's geometry of cover that does not change) # self.assertEqual( # new_row["situation3d_geometry"], "0101000020080800000000000020D6434100000000804F3241" # ) @@ -338,19 +338,19 @@ def setUpClass(cls): # new_row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F3241000000000000F87F" # ) -# # wastewater_node geometry has Z from new wn_bottom_level: ST_SetSRID(ST_MakePoint(2600000, 1200000, 200), 2056) -# new_row = self.select("wastewater_node", "1337_1010", schema="tdh_od") +# # xxx_node geometry has Z from new wn_bottom_level: ST_SetSRID(ST_MakePoint(2600000, 1200000, 200), 2056) +# new_row = self.select("xxx_node", "1337_1010", schema="tdh_od") # assert ( # new_row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F32410000000000006940" # ) # # 2. update change co_level -# # UPDATE INTO tdh_app.vw_wastewater_node SET level=500.000 WHERE obj_id = obj_id +# # UPDATE INTO tdh_app.vw_xxx_node SET level=500.000 WHERE obj_id = obj_id # row = {"co_level": "500.000"} -# self.update("vw_tdh_wastewater_structure", row, obj_id) -# new_row = self.select("vw_tdh_wastewater_structure", obj_id) -# # geometry of wastewaterstructure has 2D geometry: ST_SetSRID(ST_MakePoint(2600000, 1200000, 500), 2056) +# self.update("vw_tdh_xxx_structure", row, obj_id) +# new_row = self.select("vw_tdh_xxx_structure", obj_id) +# # geometry of xxxstructure has 2D geometry: ST_SetSRID(ST_MakePoint(2600000, 1200000, 500), 2056) # assert ( # new_row["situation3d_geometry"] == "0101000020080800000000000020D6434100000000804F3241" # ) @@ -364,19 +364,19 @@ def setUpClass(cls): # new_row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F32410000000000407F40" # ) -# # no change on wastewater_node geometry: ST_SetSRID(ST_MakePoint(2600000, 1200000, 200), 2056) -# new_row = self.select("wastewater_node", "1337_1010", schema="tdh_od") +# # no change on xxx_node geometry: ST_SetSRID(ST_MakePoint(2600000, 1200000, 200), 2056) +# new_row = self.select("xxx_node", "1337_1010", schema="tdh_od") # assert ( # new_row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F32410000000000006940" # ) # # 3. update change WITH co_level and WITH wn_bottom_level -# # UPDATE INTO tdh_app.vw_wastewater_node SET co_level=600.000, wn_bottom_level=300.000 WHERE obj_id = obj_id +# # UPDATE INTO tdh_app.vw_xxx_node SET co_level=600.000, wn_bottom_level=300.000 WHERE obj_id = obj_id # row = {"co_level": "600.000", "wn_bottom_level": "300.000"} -# self.update("vw_tdh_wastewater_structure", row, obj_id) -# new_row = self.select("vw_tdh_wastewater_structure", obj_id) -# # geometry of wastewaterstructure unchanged: ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056) +# self.update("vw_tdh_xxx_structure", row, obj_id) +# new_row = self.select("vw_tdh_xxx_structure", obj_id) +# # geometry of xxxstructure unchanged: ST_SetSRID(ST_MakePoint(2600000, 1200000), 2056) # assert ( # new_row["situation3d_geometry"] == "0101000020080800000000000020D6434100000000804F3241" # ) @@ -390,16 +390,16 @@ def setUpClass(cls): # new_row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F32410000000000C08240" # ) -# # no change on wastewater_node geometry: ST_SetSRID(ST_MakePoint(2600000, 1200000, 300), 2056) -# new_row = self.select("wastewater_node", "1337_1010", schema="tdh_od") +# # no change on xxx_node geometry: ST_SetSRID(ST_MakePoint(2600000, 1200000, 300), 2056) +# new_row = self.select("xxx_node", "1337_1010", schema="tdh_od") # assert ( # new_row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F32410000000000C07240" # ) -# def test_wastewater_node_geometry_sync_on_insert(self): +# def test_xxx_node_geometry_sync_on_insert(self): # # 1. bottom level 200 and no Z -# # INSERT INTO tdh_app.vw_wastewater_node (bottom_level, situation3d_geometry) VALUES (200, ST_SetSRID(ST_MakePoint(2600000, 1200000, 'NaN'), 2056) ); +# # INSERT INTO tdh_app.vw_xxx_node (bottom_level, situation3d_geometry) VALUES (200, ST_SetSRID(ST_MakePoint(2600000, 1200000, 'NaN'), 2056) ); # row = { # "bottom_level": "200.000", # "situation3d_geometry": "01010000A0080800000000000020D6434100000000804F3241000000000000F87F", @@ -410,10 +410,10 @@ def setUpClass(cls): # expected_row["situation3d_geometry"] = ( # "01010000A0080800000000000020D6434100000000804F32410000000000006940" # ) -# self.insert_check("vw_wastewater_node", row, expected_row) +# self.insert_check("vw_xxx_node", row, expected_row) # # 2. bottom level 200 and 555 Z -# # INSERT INTO tdh_app.vw_wastewater_node (bottom_level, situation3d_geometry) VALUES (200, ST_SetSRID(ST_MakePoint(2600000, 1200000, 555), 2056) ); +# # INSERT INTO tdh_app.vw_xxx_node (bottom_level, situation3d_geometry) VALUES (200, ST_SetSRID(ST_MakePoint(2600000, 1200000, 555), 2056) ); # row = { # "bottom_level": "200.000", # "situation3d_geometry": "01010000A0080800000000000020D6434100000000804F32410000000000588140", @@ -424,10 +424,10 @@ def setUpClass(cls): # expected_row["situation3d_geometry"] = ( # "01010000A0080800000000000020D6434100000000804F32410000000000006940" # ) -# self.insert_check("vw_wastewater_node", row, expected_row) +# self.insert_check("vw_xxx_node", row, expected_row) # # 3. bottom level NULL and 555 Z -# # INSERT INTO tdh_app.vw_wastewater_node (bottom_level, situation3d_geometry) VALUES (NULL, ST_SetSRID(ST_MakePoint(2600000, 1200000, 555), 2056) ); +# # INSERT INTO tdh_app.vw_xxx_node (bottom_level, situation3d_geometry) VALUES (NULL, ST_SetSRID(ST_MakePoint(2600000, 1200000, 555), 2056) ); # row = { # "bottom_level": None, # "situation3d_geometry": "01010000A0080800000000000020D6434100000000804F32410000000000588140", @@ -438,10 +438,10 @@ def setUpClass(cls): # expected_row["situation3d_geometry"] = ( # "01010000A0080800000000000020D6434100000000804F3241000000000000F87F" # ) -# self.insert_check("vw_wastewater_node", row, expected_row) +# self.insert_check("vw_xxx_node", row, expected_row) # # 4. no bottom level and 555 Z -# # INSERT INTO tdh_app.vw_wastewater_node (situation3d_geometry) VALUES (ST_SetSRID(ST_MakePoint(2600000, 1200000, 555), 2056) ); +# # INSERT INTO tdh_app.vw_xxx_node (situation3d_geometry) VALUES (ST_SetSRID(ST_MakePoint(2600000, 1200000, 555), 2056) ); # row = { # "situation3d_geometry": "01010000A0080800000000000020D6434100000000804F32410000000000588140", # } @@ -451,25 +451,25 @@ def setUpClass(cls): # expected_row["situation3d_geometry"] = ( # "01010000A0080800000000000020D6434100000000804F3241000000000000F87F" # ) -# self.insert_check("vw_wastewater_node", row, expected_row) +# self.insert_check("vw_xxx_node", row, expected_row) -# def test_wastewater_node_geometry_sync_on_update(self): +# def test_xxx_node_geometry_sync_on_update(self): # # first insert # # no bottom level and no Z -# # INSERT INTO tdh_app.vw_wastewater_node (bottom_level, situation3d_geometry) VALUES (200, ST_SetSRID(ST_MakePoint(2600000, 1200000, 'NaN'), 2056) ); +# # INSERT INTO tdh_app.vw_xxx_node (bottom_level, situation3d_geometry) VALUES (200, ST_SetSRID(ST_MakePoint(2600000, 1200000, 'NaN'), 2056) ); # row = { # "situation3d_geometry": "01010000A0080800000000000020D6434100000000804F3241000000000000F87F", # } -# obj_id = self.insert("vw_wastewater_node", row) +# obj_id = self.insert("vw_xxx_node", row) # # 1. change Z to 555 (don't change bottom_level) -# # UPDATE INTO tdh_app.vw_wastewater_node SET situation3d_geometry=ST_SetSRID(ST_MakePoint(2600000, 1200000, 555), 2056) WHERE obj_id = obj_id; +# # UPDATE INTO tdh_app.vw_xxx_node SET situation3d_geometry=ST_SetSRID(ST_MakePoint(2600000, 1200000, 555), 2056) WHERE obj_id = obj_id; # row = { # "situation3d_geometry": "01010000A0080800000000000020D6434100000000804F32410000000000588140", # } -# self.update("vw_wastewater_node", row, obj_id) +# self.update("vw_xxx_node", row, obj_id) # # Z (555) overwrites bottom_level results in: 555.000 -# new_row = self.select("vw_wastewater_node", obj_id) +# new_row = self.select("vw_xxx_node", obj_id) # assert ( # new_row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F32410000000000588140" @@ -477,11 +477,11 @@ def setUpClass(cls): # assert new_row["bottom_level"] == 555.000 # # 2. change bottom_level to 200 (don't change Z) -# # UPDATE INTO tdh_app.vw_wastewater_node SET bottom_level=200 WHERE obj_id = obj_id; +# # UPDATE INTO tdh_app.vw_xxx_node SET bottom_level=200 WHERE obj_id = obj_id; # row = {"bottom_level": "200.000"} -# self.update("vw_wastewater_node", row, obj_id) +# self.update("vw_xxx_node", row, obj_id) # # bottom_level 200 overwrites Z results in: ST_SetSRID(ST_MakePoint(2600000, 1200000, 200), 2056) -# new_row = self.select("vw_wastewater_node", obj_id) +# new_row = self.select("vw_xxx_node", obj_id) # assert ( # new_row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F32410000000000006940" @@ -489,14 +489,14 @@ def setUpClass(cls): # assert new_row["bottom_level"] == 200.000 # # 3. change bottom_level to 555 and Z to 666 -# # UPDATE INTO tdh_app.vw_wastewater_node SET bottom_level=200 WHERE obj_id = obj_id; +# # UPDATE INTO tdh_app.vw_xxx_node SET bottom_level=200 WHERE obj_id = obj_id; # row = { # "bottom_level": "555.000", # "situation3d_geometry": "01010000A0080800000000000020D6434100000000804F32410000000000D08440", # } -# self.update("vw_wastewater_node", row, obj_id) +# self.update("vw_xxx_node", row, obj_id) # # bottom_level 555 overwrites Z (666) results in: ST_SetSRID(ST_MakePoint(2600000, 1200000, 555), 2056) -# new_row = self.select("vw_wastewater_node", obj_id) +# new_row = self.select("vw_xxx_node", obj_id) # assert ( # new_row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F32410000000000588140" @@ -504,13 +504,13 @@ def setUpClass(cls): # assert new_row["bottom_level"] == 555.000 # # 4. change Z to NaN (don't change bottom_level) -# # UPDATE INTO tdh_app.vw_wastewater_node SET situation3d_geometry=ST_SetSRID(ST_MakePoint(2600000, 1200000, 'NaN'), 2056) WHERE obj_id = obj_id; +# # UPDATE INTO tdh_app.vw_xxx_node SET situation3d_geometry=ST_SetSRID(ST_MakePoint(2600000, 1200000, 'NaN'), 2056) WHERE obj_id = obj_id; # row = { # "situation3d_geometry": "01010000A0080800000000000020D6434100000000804F3241000000000000F87F", # } -# self.update("vw_wastewater_node", row, obj_id) +# self.update("vw_xxx_node", row, obj_id) # # Z (NaN) overwrites bottom_level results in: NULL -# new_row = self.select("vw_wastewater_node", obj_id) +# new_row = self.select("vw_xxx_node", obj_id) # assert ( # new_row["situation3d_geometry"] # == "01010000A0080800000000000020D6434100000000804F3241000000000000F87F"