Skip to content

Commit b75a2b6

Browse files
committed
Change proposed hstore flag to nocolumn
1 parent b50c6eb commit b75a2b6

4 files changed

Lines changed: 42 additions & 41 deletions

File tree

default.style

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,18 @@
1616
#
1717
# Flags: Flags that indicate what table the OSM object is moved into.
1818
#
19-
# There are 5 possible flags. These flags are used both to indicate if a column
19+
# There are 6 possible flags. These flags are used both to indicate if a column
2020
# should be created, and if ways with the tag are assumed to be areas. The area
2121
# assumptions can be overridden with an area=yes/no tag
2222
#
2323
# polygon - Create a column for this tag, and objects the tag with are areas
2424
#
2525
# linear - Create a column for this tag
2626
#
27-
# hstore - add tag to hstore only instead of its own column
27+
# nocolumn - Override the above and don't create a column for the tag, but do
28+
# include objects with this tag
2829
#
29-
# phstore - Same as polygon,hstore for backward compatibility
30+
# phstore - Same as polygon,nocolumn for backward compatibility
3031
#
3132
# delete - Drop this tag completely and don't create a column for it. This also
3233
# prevents the tag from being added to hstore columns
@@ -154,12 +155,12 @@ way way_area real # This is calculated during import
154155
# Area tags
155156
# We don't make columns for these tags, but objects with them are areas.
156157
# Mainly for use with hstore
157-
way abandoned:aeroway text polygon,hstore
158-
way abandoned:amenity text polygon,hstore
159-
way abandoned:building text polygon,hstore
160-
way abandoned:landuse text polygon,hstore
161-
way abandoned:power text polygon,hstore
162-
way area:highway text polygon,hstore
158+
way abandoned:aeroway text polygon,nocolumn
159+
way abandoned:amenity text polygon,nocolumn
160+
way abandoned:building text polygon,nocolumn
161+
way abandoned:landuse text polygon,nocolumn
162+
way abandoned:power text polygon,nocolumn
163+
way area:highway text polygon,nocolumn
163164

164165
# Deleted tags
165166
# These are tags that are generally regarded as useless for most rendering.

empty.style

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,34 +5,34 @@
55
# See default.style for documentation on all the flags
66

77
# OsmType Tag Type Flags
8-
# Insert your own columns here, or change polygon,hstore to polygon below
9-
way abandoned:aeroway text polygon,hstore
10-
way abandoned:amenity text polygon,hstore
11-
way abandoned:building text polygon,hstore
12-
way abandoned:landuse text polygon,hstore
13-
way abandoned:power text polygon,hstore
14-
way area:highway text polygon,hstore
15-
node,way aeroway text polygon,hstore
16-
node,way amenity text polygon,hstore
17-
node,way building text polygon,hstore
18-
way building:part text polygon,hstore
19-
node,way harbour text polygon,hstore
20-
node,way historic text polygon,hstore
21-
node,way landuse text polygon,hstore
22-
node,way leisure text polygon,hstore
23-
node,way man_made text polygon,hstore
24-
node,way military text polygon,hstore
25-
node,way natural text polygon,hstore
26-
node,way office text polygon,hstore
27-
node,way place text polygon,hstore
28-
node,way power text polygon,hstore
29-
node,way public_transport text polygon,hstore
30-
node,way shop text polygon,hstore
31-
node,way sport text polygon,hstore
32-
node,way tourism text polygon,hstore
33-
node,way water text polygon,hstore
34-
node,way waterway text polygon,hstore
35-
node,way wetland text polygon,hstore
8+
# Insert your own columns here, or change polygon,nocolumn to polygon below
9+
way abandoned:aeroway text polygon,nocolumn
10+
way abandoned:amenity text polygon,nocolumn
11+
way abandoned:building text polygon,nocolumn
12+
way abandoned:landuse text polygon,nocolumn
13+
way abandoned:power text polygon,nocolumn
14+
way area:highway text polygon,nocolumn
15+
node,way aeroway text polygon,nocolumn
16+
node,way amenity text polygon,nocolumn
17+
node,way building text polygon,nocolumn
18+
way building:part text polygon,nocolumn
19+
node,way harbour text polygon,nocolumn
20+
node,way historic text polygon,nocolumn
21+
node,way landuse text polygon,nocolumn
22+
node,way leisure text polygon,nocolumn
23+
node,way man_made text polygon,nocolumn
24+
node,way military text polygon,nocolumn
25+
node,way natural text polygon,nocolumn
26+
node,way office text polygon,nocolumn
27+
node,way place text polygon,nocolumn
28+
node,way power text polygon,nocolumn
29+
node,way public_transport text polygon,nocolumn
30+
node,way shop text polygon,nocolumn
31+
node,way sport text polygon,nocolumn
32+
node,way tourism text polygon,nocolumn
33+
node,way water text polygon,nocolumn
34+
node,way waterway text polygon,nocolumn
35+
node,way wetland text polygon,nocolumn
3636
node,way z_order int4 linear # This is calculated during import
3737
way way_area real # This is calculated during import
3838

taginfo.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ static const flagsname tagflags[] = {
3434
flagsname("nocache", FLAG_NOCACHE),
3535
flagsname("delete", FLAG_DELETE),
3636
flagsname("phstore", FLAG_PHSTORE),
37-
flagsname("hstore", FLAG_HSTORE)
37+
flagsname("hstore", FLAG_NOCOLUMN)
3838
};
3939
#define NUM_FLAGS ((signed)(sizeof(tagflags) / sizeof(tagflags[0])))
4040

@@ -84,7 +84,7 @@ columns_t export_list::normal_columns(enum OsmType id) const {
8484
{
8585
if( info->flags & FLAG_DELETE )
8686
continue;
87-
if( (info->flags & FLAG_HSTORE ) == FLAG_HSTORE)
87+
if( (info->flags & FLAG_NOCOLUMN ) == FLAG_NOCOLUMN)
8888
continue;
8989
columns.push_back(std::pair<std::string, std::string>(info->name, info->type));
9090
}

taginfo_impl.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
#define FLAG_LINEAR 2 /* For lines table */
1212
#define FLAG_NOCACHE 4 /* Optimisation: don't bother remembering this one */
1313
#define FLAG_DELETE 8 /* These tags should be simply deleted on sight */
14-
#define FLAG_HSTORE 16 /* objects without column but should be listed in database hstore column */
15-
#define FLAG_PHSTORE 17 /* same as FLAG_HSTORE & FLAG_POLYGON to maintain compatibility */
14+
#define FLAG_NOCOLUMN 16 /* objects without column but should be listed in database hstore column */
15+
#define FLAG_PHSTORE 17 /* same as FLAG_NOCOLUMN & FLAG_POLYGON to maintain compatibility */
1616

1717
struct taginfo {
1818
taginfo();

0 commit comments

Comments
 (0)