Change proposed hstore flag to nocolumn

pnorman · pnorman · commit b75a2b603d97 · 2015-02-22T06:12:47.000-08:00
diff --git a/default.style b/default.style
@@ -16,17 +16,18 @@
 #
 # Flags: Flags that indicate what table the OSM object is moved into.
 #
-# There are 5 possible flags. These flags are used both to indicate if a column
+# There are 6 possible flags. These flags are used both to indicate if a column
 # should be created, and if ways with the tag are assumed to be areas. The area
 # assumptions can be overridden with an area=yes/no tag
 #
 # polygon - Create a column for this tag, and objects the tag with are areas
 #
 # linear - Create a column for this tag
 #
-# hstore - add tag to hstore only instead of its own column
+# nocolumn - Override the above and don't create a column for the tag, but do
+# include objects with this tag
 #
-# phstore - Same as polygon,hstore for backward compatibility
+# phstore - Same as polygon,nocolumn for backward compatibility
 #
 # delete - Drop this tag completely and don't create a column for it. This also
 # prevents the tag from being added to hstore columns
@@ -154,12 +155,12 @@ way        way_area     real                # This is calculated during import
 # Area tags
 # We don't make columns for these tags, but objects with them are areas.
 # Mainly for use with hstore
-way         abandoned:aeroway       text    polygon,hstore
-way         abandoned:amenity       text    polygon,hstore
-way         abandoned:building      text    polygon,hstore
-way         abandoned:landuse       text    polygon,hstore
-way         abandoned:power         text    polygon,hstore
-way         area:highway            text    polygon,hstore
+way         abandoned:aeroway       text    polygon,nocolumn
+way         abandoned:amenity       text    polygon,nocolumn
+way         abandoned:building      text    polygon,nocolumn
+way         abandoned:landuse       text    polygon,nocolumn
+way         abandoned:power         text    polygon,nocolumn
+way         area:highway            text    polygon,nocolumn
 
 # Deleted tags
 # These are tags that are generally regarded as useless for most rendering.
diff --git a/empty.style b/empty.style
@@ -5,34 +5,34 @@
 # See default.style for documentation on all the flags
 
 # OsmType   Tag                     Type    Flags
-# Insert your own columns here, or change polygon,hstore to polygon below
-way         abandoned:aeroway       text    polygon,hstore
-way         abandoned:amenity       text    polygon,hstore
-way         abandoned:building      text    polygon,hstore
-way         abandoned:landuse       text    polygon,hstore
-way         abandoned:power         text    polygon,hstore
-way         area:highway            text    polygon,hstore
-node,way    aeroway                 text    polygon,hstore
-node,way    amenity                 text    polygon,hstore
-node,way    building                text    polygon,hstore
-way         building:part           text    polygon,hstore
-node,way    harbour                 text    polygon,hstore
-node,way    historic                text    polygon,hstore
-node,way    landuse                 text    polygon,hstore
-node,way    leisure                 text    polygon,hstore
-node,way    man_made                text    polygon,hstore
-node,way    military                text    polygon,hstore
-node,way    natural                 text    polygon,hstore
-node,way    office                  text    polygon,hstore
-node,way    place                   text    polygon,hstore
-node,way    power                   text    polygon,hstore
-node,way    public_transport        text    polygon,hstore
-node,way    shop                    text    polygon,hstore
-node,way    sport                   text    polygon,hstore
-node,way    tourism                 text    polygon,hstore
-node,way    water                   text    polygon,hstore
-node,way    waterway                text    polygon,hstore
-node,way    wetland                 text    polygon,hstore
+# Insert your own columns here, or change polygon,nocolumn to polygon below
+way         abandoned:aeroway       text    polygon,nocolumn
+way         abandoned:amenity       text    polygon,nocolumn
+way         abandoned:building      text    polygon,nocolumn
+way         abandoned:landuse       text    polygon,nocolumn
+way         abandoned:power         text    polygon,nocolumn
+way         area:highway            text    polygon,nocolumn
+node,way    aeroway                 text    polygon,nocolumn
+node,way    amenity                 text    polygon,nocolumn
+node,way    building                text    polygon,nocolumn
+way         building:part           text    polygon,nocolumn
+node,way    harbour                 text    polygon,nocolumn
+node,way    historic                text    polygon,nocolumn
+node,way    landuse                 text    polygon,nocolumn
+node,way    leisure                 text    polygon,nocolumn
+node,way    man_made                text    polygon,nocolumn
+node,way    military                text    polygon,nocolumn
+node,way    natural                 text    polygon,nocolumn
+node,way    office                  text    polygon,nocolumn
+node,way    place                   text    polygon,nocolumn
+node,way    power                   text    polygon,nocolumn
+node,way    public_transport        text    polygon,nocolumn
+node,way    shop                    text    polygon,nocolumn
+node,way    sport                   text    polygon,nocolumn
+node,way    tourism                 text    polygon,nocolumn
+node,way    water                   text    polygon,nocolumn
+node,way    waterway                text    polygon,nocolumn
+node,way    wetland                 text    polygon,nocolumn
 node,way    z_order                 int4    linear  # This is calculated during import
 way         way_area                real            # This is calculated during import
 
diff --git a/taginfo.cpp b/taginfo.cpp
@@ -34,7 +34,7 @@ static const flagsname tagflags[] = {
     flagsname("nocache", FLAG_NOCACHE),
     flagsname("delete",  FLAG_DELETE),
     flagsname("phstore", FLAG_PHSTORE),
-    flagsname("hstore", FLAG_HSTORE)
+    flagsname("hstore", FLAG_NOCOLUMN)
 };
 #define NUM_FLAGS ((signed)(sizeof(tagflags) / sizeof(tagflags[0])))
 
@@ -84,7 +84,7 @@ columns_t export_list::normal_columns(enum OsmType id) const {
     {
         if( info->flags & FLAG_DELETE )
             continue;
-        if( (info->flags & FLAG_HSTORE ) == FLAG_HSTORE)
+        if( (info->flags & FLAG_NOCOLUMN ) == FLAG_NOCOLUMN)
             continue;
         columns.push_back(std::pair<std::string, std::string>(info->name, info->type));
     }
diff --git a/taginfo_impl.hpp b/taginfo_impl.hpp
@@ -11,8 +11,8 @@
 #define FLAG_LINEAR  2    /* For lines table */
 #define FLAG_NOCACHE 4    /* Optimisation: don't bother remembering this one */
 #define FLAG_DELETE  8    /* These tags should be simply deleted on sight */
-#define FLAG_HSTORE 16    /* objects without column but should be listed in database hstore column */
-#define FLAG_PHSTORE 17   /* same as FLAG_HSTORE & FLAG_POLYGON to maintain compatibility */
+#define FLAG_NOCOLUMN 16    /* objects without column but should be listed in database hstore column */
+#define FLAG_PHSTORE 17   /* same as FLAG_NOCOLUMN & FLAG_POLYGON to maintain compatibility */
 
 struct taginfo {
     taginfo();

Original file line number	Diff line number	Diff line change
`@@ -16,17 +16,18 @@`
`16`	`16`	`#`
`17`	`17`	`# Flags: Flags that indicate what table the OSM object is moved into.`
`18`	`18`	`#`
`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`
`20`	`20`	`# should be created, and if ways with the tag are assumed to be areas. The area`
`21`	`21`	`# assumptions can be overridden with an area=yes/no tag`
`22`	`22`	`#`
`23`	`23`	`# polygon - Create a column for this tag, and objects the tag with are areas`
`24`	`24`	`#`
`25`	`25`	`# linear - Create a column for this tag`
`26`	`26`	`#`
`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`
`28`	`29`	`#`
`29`		`-# phstore - Same as polygon,hstore for backward compatibility`
	`30`	`+# phstore - Same as polygon,nocolumn for backward compatibility`
`30`	`31`	`#`
`31`	`32`	`# delete - Drop this tag completely and don't create a column for it. This also`
`32`	`33`	`# prevents the tag from being added to hstore columns`
`@@ -154,12 +155,12 @@ way way_area real # This is calculated during import`
`154`	`155`	`# Area tags`
`155`	`156`	`# We don't make columns for these tags, but objects with them are areas.`
`156`	`157`	`# 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`
`163`	`164`
`164`	`165`	`# Deleted tags`
`165`	`166`	`# These are tags that are generally regarded as useless for most rendering.`