Skip to content

use GeometryType function #73

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.

Sign up for GitHub

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

Merged
JakobMiksch merged 1 commit into from
Jun 1, 2025
Merged

use GeometryType function #73

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion data/import-theme/osm-feature-info/topics/geography_tables.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ themepark:add_table{
},
{ column = 'geom_type',
create_only = true,
sql_type = 'text GENERATED ALWAYS AS (ST_GeometryType(geog::geometry)) STORED NOT NULL'
sql_type = 'text GENERATED ALWAYS AS (GeometryType(geog::geometry)) STORED NOT NULL'
}
},
indexes = {{
Expand Down
2 changes: 1 addition & 1 deletion data/initial_subdivide.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,4 +24,4 @@ FROM
geometries
WHERE
ST_NPoints(geog::geometry) > max_vertices()
AND ST_GeometryType(geog::geometry) IN ('ST_Polygon', 'ST_MultiPolygon');
AND GeometryType(geog::geometry) IN ('POLYGON', 'MULTIPOLYGON');
6 changes: 3 additions & 3 deletions data/trigger.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ OR REPLACE FUNCTION perform_polygon_subdivide () RETURNS TRIGGER AS $$
BEGIN

IF ST_NPoints(NEW.geog::geometry) > max_vertices()
AND ST_GeometryType(NEW.geog::geometry) IN ('ST_Polygon', 'ST_MultiPolygon')
AND GeometryType(NEW.geog::geometry) IN ('POLYGON', 'MULTIPOLYGON')
THEN
INSERT INTO polygons_subdivided (osm_id, osm_type, geom)
VALUES (
Expand All @@ -25,7 +25,7 @@ CREATE
OR REPLACE FUNCTION delete_subdivided_polygon () RETURNS TRIGGER AS $$
BEGIN
-- we do not check the vertices count like in the other statements, because it does not matter in this case
IF ST_GeometryType(OLD.geog::geometry) IN ('ST_Polygon', 'ST_MultiPolygon')
IF GeometryType(OLD.geog::geometry) IN ('POLYGON', 'MULTIPOLYGON')
THEN
DELETE FROM polygons_subdivided WHERE osm_id = OLD.osm_id;
END IF;
Expand All @@ -43,7 +43,7 @@ OR REPLACE FUNCTION update_subdivided_polygon () RETURNS TRIGGER AS $$
BEGIN
IF ST_NPoints(NEW.geog::geometry) > max_vertices()
THEN
IF ST_GeometryType(NEW.geog::geometry) IN ('ST_Polygon', 'ST_MultiPolygon') THEN
IF GeometryType(NEW.geog::geometry) IN ('POLYGON', 'MULTIPOLYGON') THEN
DELETE FROM polygons_subdivided WHERE osm_id = OLD.osm_id;
INSERT INTO polygons_subdivided (osm_id, osm_type, geom)
VALUES (
Expand Down