Minor cleanup

Author: rustprooflabs

flex-config/road.lua

@@ -27,14 +27,14 @@ tables.road_line = osm2pgsql.define_table({
     ids = { type = 'way', id_column = 'osm_id' },
     columns = {
         { column = 'osm_type',     type = 'text', not_null = true },
-        { column = 'major',   type = 'boolean', not_null = true},
         { column = 'name',     type = 'text' },
         { column = 'ref',     type = 'text' },
         { column = 'maxspeed', type = 'int' },
         { column = 'oneway',     type = 'direction' },
         { column = 'layer',   type = 'int', not_null = true },
         { column = 'tunnel',     type = 'text' },
         { column = 'bridge',     type = 'text' },
+        { column = 'major',   type = 'boolean', not_null = true},
         { column = 'route_foot',     type = 'boolean' },
         { column = 'route_cycle',     type = 'boolean' },
         { column = 'route_motor',     type = 'boolean' },

flex-config/road_major.lua

@@ -8,13 +8,13 @@ tables.road_major = osm2pgsql.define_table({
     ids = { type = 'way', id_column = 'osm_id' },
     columns = {
         { column = 'osm_type',     type = 'text', not_null = true },
-        { column = 'major',   type = 'boolean', not_null = true},
         { column = 'name',     type = 'text' },
         { column = 'ref',     type = 'text' },
         { column = 'maxspeed', type = 'int' },
         { column = 'layer',   type = 'int', not_null = true },
         { column = 'tunnel',     type = 'text' },
         { column = 'bridge',     type = 'text' },
+        { column = 'major',   type = 'boolean', not_null = true},
         { column = 'geom',     type = 'linestring', projection = srid },
     }
 })

flex-config/run-all.lua

@@ -1,2 +1,2 @@
-require "all_tags"
+require "tags"
 require "run-no-tags"

flex-config/run-all.sql

@@ -1,2 +1,2 @@
-\i all_tags.sql
+\i tags.sql
 \i run-no-tags.sql

flex-config/run-no-tags.lua

@@ -1,13 +1,13 @@
 require "pgosm-meta"
-require "road"
+require "amenity"
 require "building"
-require "natural"
-require "traffic"
-require "place"
-require "infrastructure"
-require "water"
 require "indoor"
-require "shop"
-require "amenity"
+require "infrastructure"
 require "landuse"
 require "leisure"
+require "natural"
+require "place"
+require "road"
+require "shop"
+require "traffic"
+require "water"

flex-config/run-no-tags.sql

@@ -1,13 +1,13 @@
 \i pgosm-meta.sql
-\i road.sql
+\i amenity.sql
 \i building.sql
+\i indoor.sql
+\i infrastructure.sql
+\i landuse.sql
+\i leisure.sql
 \i natural.sql
 \i traffic.sql
 \i place.sql
-\i infrastructure.sql
-\i water.sql
-\i indoor.sql
+\i road.sql
 \i shop.sql
-\i amenity.sql
-\i landuse.sql
-\i leisure.sql
+\i water.sql

flex-config/all_tags.lua flex-config/tags.luaflex-config/all_tags.lua renamed to flex-config/tags.lua

@@ -1,4 +1,4 @@
-COMMENT ON TABLE osm.unitable IS 'ALL OpenStreetMap data in one big table.  NOT FOR PRODUCTION USE! Generated by osm2pgsql Flex output using pgosm-flex/flex-config/unitable.lua';
+COMMENT ON TABLE osm.unitable IS 'All OpenStreetMap data from the source file in one big table.  NOT FOR PRODUCTION USE! Generated by osm2pgsql Flex output using pgosm-flex/flex-config/unitable.lua';
 COMMENT ON COLUMN osm.tags.tags IS 'Stores unaltered key/value pairs from OpenStreetMap.  A few tags are dropped by Lua script though most are preserved.';
 
 ALTER TABLE osm.unitable