Rename s2s table to n2n. Add flags field to nodes table. integer -> int

diff --git a/docs/osm-tables.sql b/docs/osm-tables.sql
index 5c92e586cb58ab76a70902fed325527b6b6d7e7a..b82f47c85a287d4ae4b3d026965c8c06b9eb2741 100644 (file)
--- a/docs/osm-tables.sql
+++ b/docs/osm-tables.sql
@@ -5,7 +5,18 @@ create table nodes (
        nid     int primary key,
        lat     int not null,
        lon     int not null,
-       l       int not null default 0
+       l       int not null default 0,
+       f       int not null default 0
+);
+
+create table node_tags (
+       nid     int not null,
+       t text
+);
+
+create table way_tags (
+       wid int not null,
+       t text
 );
 
 create table way (
@@ -23,7 +34,7 @@ create table way_updates (
        notes   text
 );
 
-create table way_s2s (
+create table way_n2n (
        wsid    int not null,
        f               int not null,
        t               int not null
@@ -43,7 +54,7 @@ create table way_names (
 
 create table way_names_nls (
        wid             int not null,
-       lang    char(2) not null,
+       lang    char(4) not null,
        name    varchar(256)
 );
 
@@ -61,30 +72,30 @@ create table places (
 );
 
 create table poi (
-       poi_id  integer PRIMARY KEY,
+       poi_id  int PRIMARY KEY,
        lat             real not null,
        lon             real not null,
        elev    real default 0.0,
        label   text,
        desc    text,
        url             text,
-       public  integer default 1,
-       source  integer default 0,
-       cat_id  integer,
-       osm_id  integer default 0,
-       isin    integer default 0,
+       public  int default 1,
+       source  int default 0,
+       cat_id  int,
+       osm_id  int default 0,
+       isin    int default 0,
        priority int default 2,
-       addtime integer default 0
+       addtime int default 0
 );
 
 create table category (
-       cat_id          integer PRIMARY KEY,
-       pcat_id         integer,
-       priority        integer not null default 2,
+       cat_id          int PRIMARY KEY,
+       pcat_id         int,
+       priority        int not null default 2,
        label           text,
        desc            text,
        color           char(6) not null default '#AAAA40',
        icon            varchar(32),
-       enabled         integer not null default 1
+       enabled         int not null default 1
 );