Skip to content

Commit b47db94

Browse files
igokrigokr
committed
wkb_geometry column name simplified to geom.
1 parent 788c0a2 commit b47db94

18 files changed

Lines changed: 80 additions & 98 deletions

‎src/qc_tool/test/test_vector_check.py‎

Lines changed: 39 additions & 59 deletions
Large diffs are not rendered by default.

‎src/qc_tool/vector/gap.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ def run_check(params, status):
2727
" SELECT"
2828
" (ST_Dump(ST_Difference(boundary_union.geom, layer_union.geom))).geom AS geom"
2929
" FROM"
30-
" (SELECT ST_Union(wkb_geometry) AS geom FROM {layer_name}) AS layer_union,"
31-
" (SELECT ST_Union(wkb_geometry) AS geom FROM {boundary_name}) AS boundary_union;")
30+
" (SELECT ST_Union(geom) AS geom FROM {layer_name}) AS layer_union,"
31+
" (SELECT ST_Union(geom) AS geom FROM {boundary_name}) AS boundary_union;")
3232
sql = sql.format(**sql_params)
3333
cursor.execute(sql)
3434

‎src/qc_tool/vector/gap_unit.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,14 +32,14 @@ def run_check(params, status):
3232
" FROM"
3333
" (SELECT"
3434
" {boundary_unit_column_name},"
35-
" ST_Union(wkb_geometry) AS geom"
35+
" ST_Union(geom) AS geom"
3636
" FROM {layer_name}"
3737
" GROUP BY {boundary_unit_column_name}"
3838
" ) AS layer_union"
3939
" INNER JOIN"
4040
" (SELECT"
4141
" {boundary_unit_column_name},"
42-
" ST_Union(wkb_geometry) AS geom"
42+
" ST_Union(geom) AS geom"
4343
" FROM {boundary_name}"
4444
" WHERE {boundary_unit_column_name} IN (SELECT {boundary_unit_column_name} FROM {layer_name})"
4545
" GROUP BY {boundary_unit_column_name}"
@@ -57,7 +57,7 @@ def run_check(params, status):
5757
sql = ("CREATE TABLE {unit_warning_table} AS"
5858
" SELECT"
5959
" layer.{boundary_unit_column_name},"
60-
" layer.wkb_geometry"
60+
" layer.geom"
6161
" FROM {layer_name} AS layer"
6262
" WHERE"
6363
" layer.{boundary_unit_column_name} IS NULL"

‎src/qc_tool/vector/geometry.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ def run_check(params, status):
2323
sql = ("CREATE TABLE {error_table} AS"
2424
" SELECT {fid_name}"
2525
" FROM {layer_name}"
26-
" WHERE NOT ST_IsValid(wkb_geometry);")
26+
" WHERE NOT ST_IsValid(geom);")
2727
sql = sql.format(**sql_params)
2828
cursor.execute(sql)
2929

@@ -38,10 +38,10 @@ def run_check(params, status):
3838
sql = ("CREATE TABLE {detail_table} AS"
3939
" SELECT"
4040
" {fid_name},"
41-
" (ST_IsValidDetail(wkb_geometry)).reason AS reason,"
42-
" ST_SetSRID((ST_IsValidDetail(wkb_geometry)).location, ST_SRID(wkb_geometry)) AS location"
41+
" (ST_IsValidDetail(geom)).reason AS reason,"
42+
" ST_SetSRID((ST_IsValidDetail(geom)).location, ST_SRID(geom)) AS location"
4343
" FROM {layer_name}"
44-
" WHERE NOT ST_IsValid(wkb_geometry);")
44+
" WHERE NOT ST_IsValid(geom);")
4545
sql = sql.format(**sql_params)
4646
cursor.execute(sql)
4747

‎src/qc_tool/vector/helper.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -248,8 +248,8 @@ def collect_cluster_members(self, fid):
248248
" ) AS other"
249249
" WHERE"
250250
" last_members.{code_column_name} = other.{code_column_name}"
251-
" AND last_members.wkb_geometry && other.wkb_geometry"
252-
" AND ST_Dimension(ST_Intersection(last_members.wkb_geometry, other.wkb_geometry)) >= 1;")
251+
" AND last_members.geom && other.geom"
252+
" AND ST_Dimension(ST_Intersection(last_members.geom, other.geom)) >= 1;")
253253
sql = sql.format(**self.sql_params, cluster_id=fid, cycle_nr=cycle_nr)
254254
self.cursor.execute(sql)
255255
if self.cursor.rowcount <= 0:

‎src/qc_tool/vector/import2pg.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ def run_check(params, status):
2525
pc = run(["ogr2ogr",
2626
"-overwrite",
2727
"-f", "PostgreSQL",
28+
"-lco", "GEOMETRY_NAME=geom",
2829
"-lco", "SCHEMA={:s}".format(schema),
2930
"-lco", "PRECISION=NO",
3031
"-nlt", "MULTIPOLYGON",
@@ -36,6 +37,7 @@ def run_check(params, status):
3637
pc = run(["ogr2ogr",
3738
"-overwrite",
3839
"-f", "PostgreSQL",
40+
"-lco", "GEOMETRY_NAME=geom",
3941
"-lco", "SCHEMA={:s}".format(schema),
4042
"-lco", "PRECISION=NO",
4143
"-nlt", "MULTIPOLYGON",

‎src/qc_tool/vector/layer_area.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ def run_check(params, status):
3535
"code_column_name": params["vector_code_column_name"]}
3636

3737
# Create area sum query.
38-
sql = ("SELECT SUM(ST_Area(wkb_geometry)) FROM {layer_name}"
38+
sql = ("SELECT SUM(ST_Area(geom)) FROM {layer_name}"
3939
" WHERE {code_column_name} = ANY(%s)")
4040

4141
sql = sql.format(**sql_params)

‎src/qc_tool/vector/mmu_clc_change.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,9 @@ def run_check(params, status):
4444
" SELECT layer.{fid_name}"
4545
" FROM"
4646
" {layer_name} AS layer,"
47-
" (SELECT ST_Boundary(ST_Union(wkb_geometry)) AS geom FROM {margin_layer_name}) AS margin"
47+
" (SELECT ST_Boundary(ST_Union(geom)) AS geom FROM {margin_layer_name}) AS margin"
4848
" WHERE"
49-
" ST_Dimension(ST_Intersection(layer.wkb_geometry, margin.geom)) >= 1"
49+
" ST_Dimension(ST_Intersection(layer.geom, margin.geom)) >= 1"
5050
" AND layer.{fid_name} NOT IN (SELECT {fid_name} FROM {general_table});")
5151
sql = sql.format(**sql_params)
5252
cursor.execute(sql)

‎src/qc_tool/vector/mmu_clc_status.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ def run_check(params, status):
3737
" SELECT layer.{fid_name}"
3838
" FROM"
3939
" {layer_name} AS layer,"
40-
" (SELECT ST_Boundary(ST_Union(wkb_geometry)) AS geom FROM {layer_name}) AS margin"
40+
" (SELECT ST_Boundary(ST_Union(geom)) AS geom FROM {layer_name}) AS margin"
4141
" WHERE"
42-
" ST_Dimension(ST_Intersection(layer.wkb_geometry, margin.geom)) >= 1"
42+
" ST_Dimension(ST_Intersection(layer.geom, margin.geom)) >= 1"
4343
" AND layer.{fid_name} NOT IN (SELECT {fid_name} FROM {general_table});")
4444
sql = sql.format(**sql_params)
4545
cursor.execute(sql)

‎src/qc_tool/vector/mmu_n2k.py‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,10 @@ def run_check(params, status):
5252
" SELECT layer.{fid_name}"
5353
" FROM"
5454
" {layer_name} AS layer,"
55-
" (SELECT ST_Boundary(ST_Union(wkb_geometry)) AS geom FROM {layer_name}) AS margin"
55+
" (SELECT ST_Boundary(ST_Union(geom)) AS geom FROM {layer_name}) AS margin"
5656
" WHERE"
5757
" layer.{area_column_name} >= 0.1"
58-
" AND ST_Dimension(ST_Intersection(layer.wkb_geometry, margin.geom)) >= 1"
58+
" AND ST_Dimension(ST_Intersection(layer.geom, margin.geom)) >= 1"
5959
" AND layer.{fid_name} NOT IN (SELECT {fid_name} FROM {general_table})"
6060
" AND layer.{fid_name} NOT IN (SELECT {fid_name} FROM {exception_table});")
6161
sql = sql.format(**sql_params)
@@ -71,8 +71,8 @@ def run_check(params, status):
7171
" layer.{area_column_name} >= 0.25"
7272
" AND layer.{code_column_name}::text LIKE '1%'"
7373
" AND layer.{code_column_name}::text NOT SIMILAR TO '(10|121|122)%'"
74-
" AND layer.wkb_geometry && randr.wkb_geometry"
75-
" AND ST_Dimension(ST_Intersection(layer.wkb_geometry, randr.wkb_geometry)) >= 1"
74+
" AND layer.geom && randr.geom"
75+
" AND ST_Dimension(ST_Intersection(layer.geom, randr.geom)) >= 1"
7676
" AND layer.{fid_name} NOT IN (SELECT {fid_name} FROM {general_table})"
7777
" AND layer.{fid_name} NOT IN (SELECT {fid_name} FROM {exception_table});")
7878
sql = sql.format(**sql_params)

0 commit comments

Comments
 (0)