Skip to content

Commit

Permalink
replace with xxx in test_geometry.py
Browse files Browse the repository at this point in the history
  • Loading branch information
sjib committed Aug 10, 2024
1 parent 68c912b commit bbbeaf1
Showing 1 changed file with 61 additions and 61 deletions.
122 changes: 61 additions & 61 deletions datamodel/test/test_geometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -220,65 +220,65 @@ 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",
# "co_obj_id": "1337_1002",
# "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",
Expand All @@ -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"
# )
Expand All @@ -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"
# )
Expand All @@ -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"
# )
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -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",
# }
Expand All @@ -451,66 +451,66 @@ 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"
# )
# 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"
# )
# 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"
# )
# 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"
Expand Down

0 comments on commit bbbeaf1

Please sign in to comment.