Update styles to create unique indexes from Lua instead of PKs from SQL.

rustprooflabs · rustprooflabs · commit b4e74da5cfd4 · 2024-04-11T19:02:38.000-06:00
diff --git a/flex-config/sql/amenity.sql b/flex-config/sql/amenity.sql
@@ -3,20 +3,6 @@ COMMENT ON TABLE osm.amenity_line IS 'OpenStreetMap amenity lines - all lines wi
 COMMENT ON TABLE osm.amenity_polygon IS 'OpenStreetMap amenity polygons - all polygons with an amenity tag.  Some amenity tags are pulled into other tables (e.g. infrastructure, shop, and traffic layers) and duplicated again here. This is currently intentional but may change in the future. Generated by osm2pgsql Flex output using pgosm-flex/flex-config/amenity.lua';
 
 
-ALTER TABLE osm.amenity_point
-    ADD CONSTRAINT pk_osm_amenity_point_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.amenity_line
-    ADD CONSTRAINT pk_osm_amenity_line_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.amenity_polygon
-    ADD CONSTRAINT pk_osm_amenity_polygon_osm_id
-    PRIMARY KEY (osm_id)
-;
-
-
 COMMENT ON COLUMN osm.amenity_point.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
 COMMENT ON COLUMN osm.amenity_line.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
 COMMENT ON COLUMN osm.amenity_polygon.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
diff --git a/flex-config/sql/building.sql b/flex-config/sql/building.sql
@@ -35,12 +35,6 @@ COMMENT ON COLUMN osm.building_polygon.operator IS 'Entity in charge of operatio
 
 
 
-ALTER TABLE osm.building_polygon
-    ADD CONSTRAINT pk_osm_building_polygon_osm_id
-    PRIMARY KEY (osm_id)
-;
-
-
 COMMENT ON COLUMN osm.building_point.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
 COMMENT ON COLUMN osm.building_polygon.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
 
diff --git a/flex-config/sql/building_combined_point.sql b/flex-config/sql/building_combined_point.sql
@@ -1,9 +1,4 @@
 
-ALTER TABLE osm.building_combined_point
-    ADD CONSTRAINT pk_osm_building_combined_point_osm_id_geom_type
-    PRIMARY KEY (osm_id, geom_type)
-;
-
 
 COMMENT ON TABLE osm.building_combined_point IS 'Combined building data as points.  Building polygons are converted in osm2pgsql to points with centroid().';
 COMMENT ON COLUMN osm.building_combined_point.address IS 'Address combined from address parts in helpers.get_address().';
diff --git a/flex-config/sql/indoor.sql b/flex-config/sql/indoor.sql
@@ -46,16 +46,3 @@ COMMENT ON COLUMN osm.indoor_point.geom IS 'Geometry loaded by osm2pgsql.';
 COMMENT ON COLUMN osm.indoor_line.geom IS 'Geometry loaded by osm2pgsql.';
 COMMENT ON COLUMN osm.indoor_polygon.geom IS 'Geometry loaded by osm2pgsql.';
 
-
-ALTER TABLE osm.indoor_point
-    ADD CONSTRAINT pk_osm_indoor_point_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.indoor_line
-    ADD CONSTRAINT pk_osm_indoor_line_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.indoor_polygon
-    ADD CONSTRAINT pk_osm_indoor_polygon_osm_id
-    PRIMARY KEY (osm_id)
-;
diff --git a/flex-config/sql/infrastructure.sql b/flex-config/sql/infrastructure.sql
@@ -1,9 +1,5 @@
 COMMENT ON TABLE osm.infrastructure_point IS 'OpenStreetMap infrastructure layer.  Generated by osm2pgsql Flex output using pgosm-flex/flex-config/infrasturcture.lua';
 
-ALTER TABLE osm.infrastructure_point
-	ADD CONSTRAINT pk_osm_infrastructure_point_osm_id
-    PRIMARY KEY (osm_id)
-;
 
 COMMENT ON COLUMN osm.infrastructure_point.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
 COMMENT ON COLUMN osm.infrastructure_point.ele IS 'Elevation in meters';
diff --git a/flex-config/sql/landuse.sql b/flex-config/sql/landuse.sql
@@ -2,16 +2,6 @@ COMMENT ON TABLE osm.landuse_polygon IS 'OpenStreetMap landuse polygons - all po
 COMMENT ON TABLE osm.landuse_point IS 'OpenStreetMap landuse points - all points with a landuse tag.  Generated by osm2pgsql Flex output using pgosm-flex/flex-config/landuse.lua';
 
 
-ALTER TABLE osm.landuse_point
-    ADD CONSTRAINT pk_osm_landuse_point_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.landuse_polygon
-    ADD CONSTRAINT pk_osm_landuse_polygon_osm_id
-    PRIMARY KEY (osm_id)
-;
-
-
 COMMENT ON COLUMN osm.landuse_polygon.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
 COMMENT ON COLUMN osm.landuse_point.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
 
diff --git a/flex-config/sql/leisure.sql b/flex-config/sql/leisure.sql
@@ -1,16 +1,6 @@
 COMMENT ON TABLE osm.leisure_polygon IS 'OpenStreetMap leisure polygons - all polygons with a leisure tag.  Generated by osm2pgsql Flex output using pgosm-flex/flex-config/leisure.lua';
 COMMENT ON TABLE osm.leisure_point IS 'OpenStreetMap leisure points - all points with a leisure tag.  Generated by osm2pgsql Flex output using pgosm-flex/flex-config/leisure.lua';
 
-
-ALTER TABLE osm.leisure_point
-    ADD CONSTRAINT pk_osm_leisure_point_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.leisure_polygon
-    ADD CONSTRAINT pk_osm_leisure_polygon_osm_id
-    PRIMARY KEY (osm_id)
-;
-
 COMMENT ON COLUMN osm.leisure_polygon.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
 COMMENT ON COLUMN osm.leisure_point.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
 
diff --git a/flex-config/sql/natural.sql b/flex-config/sql/natural.sql
@@ -6,19 +6,6 @@ COMMENT ON COLUMN osm.natural_point.ele IS 'Elevation in meters';
 COMMENT ON COLUMN osm.natural_line.ele IS 'Elevation in meters';
 COMMENT ON COLUMN osm.natural_polygon.ele IS 'Elevation in meters';
 
-ALTER TABLE osm.natural_point
-    ADD CONSTRAINT pk_osm_natural_point_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.natural_line
-    ADD CONSTRAINT pk_osm_natural_line_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.natural_polygon
-    ADD CONSTRAINT pk_osm_natural_polygon_osm_id
-    PRIMARY KEY (osm_id)
-;
-
 
 COMMENT ON COLUMN osm.natural_point.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
 COMMENT ON COLUMN osm.natural_line.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
diff --git a/flex-config/sql/place.sql b/flex-config/sql/place.sql
@@ -30,21 +30,6 @@ COMMENT ON COLUMN osm.place_polygon.boundary IS 'Value from boundary tag.  https
 
 
 
-ALTER TABLE osm.place_point
-    ADD CONSTRAINT pk_osm_place_point_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.place_line
-    ADD CONSTRAINT pk_osm_place_line_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.place_polygon
-    ADD CONSTRAINT pk_osm_place_polygon_osm_id
-    PRIMARY KEY (osm_id)
-;
-
-
-
 ------------------------------------------------
 CREATE TEMP TABLE place_polygon_in_relations AS
 SELECT p_no_rel.osm_id
diff --git a/flex-config/sql/poi.sql b/flex-config/sql/poi.sql
@@ -4,21 +4,6 @@ COMMENT ON TABLE osm.poi_polygon IS 'OpenStreetMap Points of Interest (POI) (pol
 
 
 
-
-ALTER TABLE osm.poi_point
-    ADD CONSTRAINT pk_osm_poi_point_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.poi_line
-    ADD CONSTRAINT pk_osm_poi_line_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.poi_polygon
-    ADD CONSTRAINT pk_osm_poi_polygon_osm_id
-    PRIMARY KEY (osm_id)
-;
-
-
 COMMENT ON COLUMN osm.poi_point.osm_type IS 'Stores the OpenStreetMap key that included this feature in the layer. Value from key stored in osm_subtype.';
 COMMENT ON COLUMN osm.poi_line.osm_type IS 'Stores the OpenStreetMap key that included this feature in the layer. Value from key stored in osm_subtype.';
 COMMENT ON COLUMN osm.poi_polygon.osm_type IS 'Stores the OpenStreetMap key that included this feature in the layer. Value from key stored in osm_subtype.';
diff --git a/flex-config/sql/public_transport.sql b/flex-config/sql/public_transport.sql
@@ -3,19 +3,6 @@ COMMENT ON TABLE osm.public_transport_line IS 'OpenStreetMap public transport li
 COMMENT ON TABLE osm.public_transport_polygon IS 'OpenStreetMap public transport polygons - all polygons with a public_transport tag and others defined on https://wiki.openstreetmap.org/wiki/Public_transport.  Generated by osm2pgsql Flex output using pgosm-flex/flex-config/public_transport.lua';
 
 
-ALTER TABLE osm.public_transport_point
-    ADD CONSTRAINT pk_osm_public_transport_point_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.public_transport_line
-    ADD CONSTRAINT pk_osm_public_transport_line_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.public_transport_polygon
-    ADD CONSTRAINT pk_osm_public_transport_polygon_osm_id
-    PRIMARY KEY (osm_id)
-;
-
 
 COMMENT ON COLUMN osm.public_transport_point.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
 COMMENT ON COLUMN osm.public_transport_line.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
diff --git a/flex-config/sql/road.sql b/flex-config/sql/road.sql
@@ -34,17 +34,6 @@ COMMENT ON COLUMN osm.road_line.route_cycle IS 'Best guess if the segment is rou
 COMMENT ON COLUMN osm.road_line.route_motor IS 'Best guess if the segment is route-able for motorized traffic. If access is no or private, set to false. WARNING: This does not indicate that this method of travel is safe OR allowed!';
 
 
-ALTER TABLE osm.road_point
-    ADD CONSTRAINT pk_osm_road_point_osm_id
-    PRIMARY KEY (osm_id)
-;
-
-ALTER TABLE osm.road_line
-    ADD CONSTRAINT pk_osm_road_line_osm_id
-    PRIMARY KEY (osm_id)
-;
-
-
 
 ------------------------------------------------
 CREATE TEMP TABLE road_polygon_in_relations AS
diff --git a/flex-config/sql/road_major.sql b/flex-config/sql/road_major.sql
@@ -14,12 +14,6 @@ COMMENT ON COLUMN osm.road_major.geom IS 'Geometry loaded by osm2pgsql.';
 COMMENT ON COLUMN osm.road_major.ref IS 'Reference number or code. Best ref option determined by helpers.get_ref(). https://wiki.openstreetmap.org/wiki/Key:ref';
 
 
-ALTER TABLE osm.road_major
-	ADD CONSTRAINT pk_osm_road_major_osm_id
-    PRIMARY KEY (osm_id)
-;
-
-
 
 ------------------------------------------------
 
diff --git a/flex-config/sql/shop.sql b/flex-config/sql/shop.sql
@@ -21,15 +21,6 @@ COMMENT ON COLUMN osm.shop_point.website IS 'Official website for the feature.
 COMMENT ON COLUMN osm.shop_polygon.website IS 'Official website for the feature.  https://wiki.openstreetmap.org/wiki/Key:website';
 
 
-ALTER TABLE osm.shop_point
-    ADD CONSTRAINT pk_osm_shop_point_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.shop_polygon
-    ADD CONSTRAINT pk_osm_shop_polygon_osm_id
-    PRIMARY KEY (osm_id)
-;
-
 
 COMMENT ON COLUMN osm.shop_point.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
 COMMENT ON COLUMN osm.shop_polygon.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
diff --git a/flex-config/sql/traffic.sql b/flex-config/sql/traffic.sql
@@ -11,10 +11,6 @@ COMMENT ON COLUMN osm.traffic_line.osm_subtype IS 'Value of the non-main key(s)
 COMMENT ON COLUMN osm.traffic_polygon.osm_subtype IS 'Value of the non-main key(s) associated with traffic details. See osm_type column for the key associated with this value. NULL when the main key = "highway".';
 
 
-ALTER TABLE osm.traffic_point
-    ADD CONSTRAINT pk_osm_traffic_point_osm_id
-    PRIMARY KEY (osm_id)
-;
 
 
 COMMENT ON COLUMN osm.traffic_point.osm_id IS 'OpenStreetMap ID. Unique along with geometry type.';
diff --git a/flex-config/sql/water.sql b/flex-config/sql/water.sql
@@ -38,20 +38,6 @@ COMMENT ON COLUMN osm.water_point.boat IS 'Access details for boat travel.  http
 COMMENT ON COLUMN osm.water_line.boat IS 'Access details for boat travel.  https://wiki.openstreetmap.org/wiki/Key:boat';
 COMMENT ON COLUMN osm.water_polygon.boat IS 'Access details for boat travel.  https://wiki.openstreetmap.org/wiki/Key:boat';
 
-
-ALTER TABLE osm.water_point
-    ADD CONSTRAINT pk_osm_water_point_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.water_line
-    ADD CONSTRAINT pk_osm_water_line_osm_id
-    PRIMARY KEY (osm_id)
-;
-ALTER TABLE osm.water_polygon
-    ADD CONSTRAINT pk_osm_water_polygon_osm_id
-    PRIMARY KEY (osm_id)
-;
-
 ------------------------------------------------
 CREATE TEMP TABLE water_polygon_in_relations AS
 SELECT p_no_rel.osm_id
diff --git a/flex-config/style/amenity.lua b/flex-config/style/amenity.lua
@@ -10,7 +10,7 @@ local tables = {}
 tables.amenity_point = osm2pgsql.define_table({
     name = 'amenity_point',
     schema = schema_name,
-    ids = { type = 'node', id_column = 'osm_id' },
+    ids = { type = 'node', id_column = 'osm_id', create_index = 'unique' },
     columns = {
         { column = 'osm_type', type = 'text', not_null = true },
         { column = 'osm_subtype', type = 'text' },
@@ -31,7 +31,7 @@ tables.amenity_point = osm2pgsql.define_table({
 tables.amenity_line = osm2pgsql.define_table({
     name = 'amenity_line',
     schema = schema_name,
-    ids = { type = 'way', id_column = 'osm_id' },
+    ids = { type = 'way', id_column = 'osm_id', create_index = 'unique' },
     columns = {
         { column = 'osm_type', type = 'text', not_null = true },
         { column = 'osm_subtype', type = 'text' },
@@ -53,7 +53,7 @@ tables.amenity_line = osm2pgsql.define_table({
 tables.amenity_polygon = osm2pgsql.define_table({
     name = 'amenity_polygon',
     schema = schema_name,
-    ids = { type = 'area', id_column = 'osm_id' },
+    ids = { type = 'area', id_column = 'osm_id', create_index = 'unique'},
     columns = {
         { column = 'osm_type', type = 'text', not_null = true },
         { column = 'osm_subtype', type = 'text' },
diff --git a/flex-config/style/building.lua b/flex-config/style/building.lua
@@ -12,7 +12,7 @@ local tables = {}
 tables.building_point = osm2pgsql.define_table({
     name = 'building_point',
     schema = schema_name,
-    ids = { type = 'node', id_column = 'osm_id' },
+    ids = { type = 'node', id_column = 'osm_id', create_index = 'unique' },
     columns = {
         { column = 'osm_type', type = 'text' , not_null = true},
         { column = 'osm_subtype', type = 'text'},
@@ -37,7 +37,7 @@ tables.building_point = osm2pgsql.define_table({
 tables.building_polygon = osm2pgsql.define_table({
     name = 'building_polygon',
     schema = schema_name,
-    ids = { type = 'way', id_column = 'osm_id' },
+    ids = { type = 'way', id_column = 'osm_id', create_index = 'unique' },
     columns = {
         { column = 'osm_type', type = 'text', not_null = true},
         { column = 'osm_subtype', type = 'text'},
diff --git a/flex-config/style/building_combined_point.lua b/flex-config/style/building_combined_point.lua
@@ -11,7 +11,9 @@ local tables = {}
 tables.building_combined_point = osm2pgsql.define_table({
     name = 'building_combined_point',
     schema = schema_name,
-    ids = { type = 'any', id_column = 'osm_id', type_column = 'geom_type' },
+    ids = { type = 'any', id_column = 'osm_id', type_column = 'geom_type',
+            create_index = 'unique'
+    },
     columns = {
         { column = 'osm_type', type = 'text' , not_null = true},
         { column = 'osm_subtype', type = 'text'},
diff --git a/flex-config/style/indoor.lua b/flex-config/style/indoor.lua
@@ -11,7 +11,7 @@ local tables = {}
 tables.indoor_point = osm2pgsql.define_table({
     name = 'indoor_point',
     schema = schema_name,
-    ids = { type = 'node', id_column = 'osm_id' },
+    ids = { type = 'node', id_column = 'osm_id', create_index = 'unique'},
     columns = {
         { column = 'osm_type', type = 'text', not_null = true },
         { column = 'name', type = 'text' },
@@ -31,7 +31,7 @@ tables.indoor_point = osm2pgsql.define_table({
 tables.indoor_line = osm2pgsql.define_table({
     name = 'indoor_line',
     schema = schema_name,
-    ids = { type = 'way', id_column = 'osm_id' },
+    ids = { type = 'way', id_column = 'osm_id', create_index = 'unique' },
     columns = {
         { column = 'osm_type', type = 'text', not_null = true },
         { column = 'name', type = 'text' },
@@ -51,7 +51,7 @@ tables.indoor_line = osm2pgsql.define_table({
 tables.indoor_polygon = osm2pgsql.define_table({
     name = 'indoor_polygon',
     schema = schema_name,
-    ids = { type = 'way', id_column = 'osm_id' },
+    ids = { type = 'way', id_column = 'osm_id', create_index = 'unique' },
     columns = {
         { column = 'osm_type', type = 'text', not_null = true },
         { column = 'name', type = 'text' },
diff --git a/flex-config/style/infrastructure.lua b/flex-config/style/infrastructure.lua
@@ -24,7 +24,7 @@ local is_infrastructure = make_check_in_list_func(infrastructure_keys)
 tables.infrastructure_point = osm2pgsql.define_table({
     name = 'infrastructure_point',
     schema = schema_name,
-    ids = { type = 'node', id_column = 'osm_id' },
+    ids = { type = 'node', id_column = 'osm_id', create_index = 'unique' },
     columns = {
         { column = 'osm_type', type = 'text', not_null = true },
         { column = 'osm_subtype', type = 'text'},
@@ -41,7 +41,7 @@ tables.infrastructure_point = osm2pgsql.define_table({
 tables.infrastructure_line = osm2pgsql.define_table({
     name = 'infrastructure_line',
     schema = schema_name,
-    ids = { type = 'way', id_column = 'osm_id' },
+    ids = { type = 'way', id_column = 'osm_id', create_index = 'unique' },
     columns = {
         { column = 'osm_type', type = 'text', not_null = true },
         { column = 'osm_subtype', type = 'text'},
@@ -59,7 +59,7 @@ tables.infrastructure_line = osm2pgsql.define_table({
 tables.infrastructure_polygon = osm2pgsql.define_table({
     name = 'infrastructure_polygon',
     schema = schema_name,
-    ids = { type = 'way', id_column = 'osm_id' },
+    ids = { type = 'way', id_column = 'osm_id', create_index = 'unique' },
     columns = {
         { column = 'osm_type', type = 'text', not_null = true },
         { column = 'osm_subtype', type = 'text'},
diff --git a/flex-config/style/landuse.lua b/flex-config/style/landuse.lua
@@ -11,7 +11,7 @@ local tables = {}
 tables.landuse_point = osm2pgsql.define_table({
     name = 'landuse_point',
     schema = schema_name,
-    ids = { type = 'node', id_column = 'osm_id' },
+    ids = { type = 'node', id_column = 'osm_id', create_index = 'unique' },
     columns = {
         { column = 'osm_type', type = 'text' , not_null = true},
         { column = 'name', type = 'text' },
@@ -24,7 +24,7 @@ tables.landuse_point = osm2pgsql.define_table({
 tables.landuse_polygon = osm2pgsql.define_table({
     name = 'landuse_polygon',
     schema = schema_name,
-    ids = { type = 'way', id_column = 'osm_id' },
+    ids = { type = 'way', id_column = 'osm_id', create_index = 'unique' },
     columns = {
         { column = 'osm_type', type = 'text', not_null = true},
         { column = 'name', type = 'text' },
diff --git a/flex-config/style/leisure.lua b/flex-config/style/leisure.lua
diff --git a/flex-config/style/natural.lua b/flex-config/style/natural.lua
diff --git a/flex-config/style/place.lua b/flex-config/style/place.lua
diff --git a/flex-config/style/poi.lua b/flex-config/style/poi.lua
diff --git a/flex-config/style/public_transport.lua b/flex-config/style/public_transport.lua
diff --git a/flex-config/style/road.lua b/flex-config/style/road.lua
diff --git a/flex-config/style/road_major.lua b/flex-config/style/road_major.lua
diff --git a/flex-config/style/shop.lua b/flex-config/style/shop.lua
diff --git a/flex-config/style/traffic.lua b/flex-config/style/traffic.lua
diff --git a/flex-config/style/water.lua b/flex-config/style/water.lua
