Add JSONB column support

database/postgis/columns.go

@@ -74,6 +74,7 @@ func init() {
 		"int64":              &simpleColumnType{"BIGINT"},
 		"float32":            &simpleColumnType{"REAL"},
 		"hstore_string":      &simpleColumnType{"HSTORE"},
+		"jsonb_string":       &simpleColumnType{"JSONB"},
 		"geometry":           &geometryType{"GEOMETRY"},
 		"validated_geometry": &validatedGeometryType{geometryType{"GEOMETRY"}},
 	}

mapping/columns.go

@@ -1,6 +1,7 @@
 package mapping
 
 import (
+	"encoding/json"
 	"math"
 	"regexp"
 	"strconv"
@@ -33,6 +34,7 @@ func init() {
 		"geometry":             {"geometry", "geometry", Geometry, nil, nil, false},
 		"validated_geometry":   {"validated_geometry", "validated_geometry", Geometry, nil, nil, false},
 		"hstore_tags":          {"hstore_tags", "hstore_string", nil, MakeHStoreString, nil, false},
+		"jsonb_tags":          {"jsonb_tags", "jsonb_string", nil, MakeJSONBString, nil, false},
 		"wayzorder":            {"wayzorder", "int32", nil, MakeWayZOrder, nil, false},
 		"pseudoarea":           {"pseudoarea", "float32", nil, MakePseudoArea, nil, false},
 		"area":                 {"area", "float32", Area, nil, nil, false},
@@ -195,6 +197,34 @@ func MakeHStoreString(columnName string, columnType ColumnType, column config.Co
 	return hstoreString, nil
 }
 
+
+func MakeJSONBString(columnName string, columnType ColumnType, column config.Column) (MakeValue, error) {
+	var includeAll bool
+	var err error
+	var include map[string]int
+	if _, ok := column.Args["include"]; !ok {
+		includeAll = true
+	} else {
+		include, err = decodeEnumArg(column, "include")
+		if err != nil {
+			return nil, err
+		}
+
+	}
+
+	jsonbString := func(val string, elem *osm.Element, geom *geom.Geometry, match Match) interface{} {
+		tags := make(map[string]string)
+		for k, v := range elem.Tags {
+			if includeAll || include[k] != 0 {
+				tags[k] = v
+			}
+		}
+		json, _ := json.Marshal(tags)
+		return string(json);
+	}
+	return jsonbString, nil
+}
+
 func MakeWayZOrder(columnName string, columnType ColumnType, column config.Column) (MakeValue, error) {
 	if _, ok := column.Args["ranks"]; !ok {
 		return DefaultWayZOrder, nil

mapping/columns_test.go

@@ -352,3 +352,51 @@ func TestHstoreString(t *testing.T) {
 	}
 
 }
+
+func TestJSONBString(t *testing.T) {
+	column := config.Column{
+		Name: "tags",
+		Type: "jsonb_tags",
+	}
+	jsonbAll, err := MakeJSONBString("tags", ColumnType{}, column)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	column = config.Column{
+		Name: "tags",
+		Type: "jsonb_tags",
+		Args: map[string]interface{}{"include": []interface{}{"key1", "key2"}},
+	}
+	jsonbInclude, err := MakeJSONBString("tags", ColumnType{}, column)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	for _, test := range []struct {
+		column   MakeValue
+		tags     osm.Tags
+		expected interface{}
+	}{
+		{jsonbAll, osm.Tags{}, `{}`},
+		{jsonbAll, osm.Tags{"key": "value"}, `{"key":"value"}`},
+		{jsonbAll, osm.Tags{`"key"`: `'"value"'`}, `{"\"key\"":"'\"value\"'"}`},
+		{jsonbAll, osm.Tags{`\`: `\\\\`}, `{"\\":"\\\\\\\\"}`},
+		{jsonbAll, osm.Tags{"Ümlåütê:": ""}, `{"Ümlåütê:":""}`},
+		{jsonbInclude, osm.Tags{"key": "value"}, `{}`},
+		{jsonbInclude, osm.Tags{"key1": "value"}, `{"key1":"value"}`},
+		{jsonbInclude, osm.Tags{"key": "value", "key2": "value"}, `{"key2":"value"}`},
+	} {
+		actual := test.column("", &osm.Element{Tags: test.tags}, nil, Match{})
+		if actual.(string) != test.expected {
+			t.Errorf("%#v != %#v for %#v", actual, test.expected, test.tags)
+		}
+	}
+
+	actual := jsonbAll("{}", &osm.Element{Tags: osm.Tags{"key1": "value", "key2": "value"}}, nil, Match{})
+	// check mutliple tags, can be in any order
+	if actual.(string) != `{"key1":"value","key2":"value"}` && actual.(string) != `{"key2":"value","key1":"value"}` {
+		t.Error("unexpected value", actual)
+	}
+
+}