6257ddba78
The big change is that the GeoJSON package has been completely rewritten to fix a few of geometry calculation bugs, increase performance, and to better follow the GeoJSON spec RFC 7946. GeoJSON updates - A LineString now requires at least two points. - All json members, even foreign, now persist with the object. - The bbox member persists too but is no longer used for geometry calculations. This is change in behavior. Previously Tile38 would treat the bbox as the object's physical rectangle. - Corrections to geometry intersects and within calculations. Faster spatial queries - The performance of Point-in-polygon and object intersect operations are greatly improved for complex polygons and line strings. It went from O(n) to roughly O(log n). - The same for all collection types with many children, including FeatureCollection, GeometryCollection, MultiPoint, MultiLineString, and MultiPolygon. Codebase changes - The pkg directory has been renamed to internal - The GeoJSON internal package has been moved to a seperate repo at https://github.com/tidwall/geojson. It's now vendored. Please look out for higher memory usage for datasets using complex shapes. A complex shape is one that has 64 or more points. For these shapes it's expected that there will be increase of least 54 bytes per point.
329 lines
7.3 KiB
Go
329 lines
7.3 KiB
Go
package controller
|
|
|
|
import (
|
|
"bytes"
|
|
"encoding/json"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"github.com/tidwall/geojson"
|
|
"github.com/tidwall/gjson"
|
|
"github.com/tidwall/resp"
|
|
"github.com/tidwall/sjson"
|
|
"github.com/tidwall/tile38/internal/collection"
|
|
"github.com/tidwall/tile38/internal/server"
|
|
)
|
|
|
|
func appendJSONString(b []byte, s string) []byte {
|
|
for i := 0; i < len(s); i++ {
|
|
if s[i] < ' ' || s[i] == '\\' || s[i] == '"' || s[i] > 126 {
|
|
d, _ := json.Marshal(s)
|
|
return append(b, string(d)...)
|
|
}
|
|
}
|
|
b = append(b, '"')
|
|
b = append(b, s...)
|
|
b = append(b, '"')
|
|
return b
|
|
}
|
|
|
|
func jsonString(s string) string {
|
|
for i := 0; i < len(s); i++ {
|
|
if s[i] < ' ' || s[i] == '\\' || s[i] == '"' || s[i] > 126 {
|
|
d, _ := json.Marshal(s)
|
|
return string(d)
|
|
}
|
|
}
|
|
b := make([]byte, len(s)+2)
|
|
b[0] = '"'
|
|
copy(b[1:], s)
|
|
b[len(b)-1] = '"'
|
|
return string(b)
|
|
}
|
|
func appendJSONSimpleBounds(dst []byte, o geojson.Object) []byte {
|
|
bbox := o.Rect()
|
|
dst = append(dst, `{"sw":{"lat":`...)
|
|
dst = strconv.AppendFloat(dst, bbox.Min.Y, 'f', -1, 64)
|
|
dst = append(dst, `,"lon":`...)
|
|
dst = strconv.AppendFloat(dst, bbox.Min.X, 'f', -1, 64)
|
|
dst = append(dst, `},"ne":{"lat":`...)
|
|
dst = strconv.AppendFloat(dst, bbox.Max.Y, 'f', -1, 64)
|
|
dst = append(dst, `,"lon":`...)
|
|
dst = strconv.AppendFloat(dst, bbox.Max.X, 'f', -1, 64)
|
|
dst = append(dst, `}}`...)
|
|
return dst
|
|
}
|
|
|
|
func appendJSONSimplePoint(dst []byte, o geojson.Object) []byte {
|
|
point := o.Center()
|
|
var z float64
|
|
if gPoint, ok := o.(*geojson.Point); ok {
|
|
z = gPoint.Z()
|
|
}
|
|
dst = append(dst, `{"lat":`...)
|
|
dst = strconv.AppendFloat(dst, point.Y, 'f', -1, 64)
|
|
dst = append(dst, `,"lon":`...)
|
|
dst = strconv.AppendFloat(dst, point.X, 'f', -1, 64)
|
|
if z != 0 {
|
|
dst = append(dst, `,"z":`...)
|
|
dst = strconv.AppendFloat(dst, z, 'f', -1, 64)
|
|
}
|
|
dst = append(dst, '}')
|
|
return dst
|
|
}
|
|
|
|
func appendJSONTimeFormat(b []byte, t time.Time) []byte {
|
|
b = append(b, '"')
|
|
b = t.AppendFormat(b, "2006-01-02T15:04:05.999999999Z07:00")
|
|
b = append(b, '"')
|
|
return b
|
|
}
|
|
|
|
func jsonTimeFormat(t time.Time) string {
|
|
var b []byte
|
|
b = appendJSONTimeFormat(b, t)
|
|
return string(b)
|
|
}
|
|
|
|
func (c *Controller) cmdJget(msg *server.Message) (resp.Value, error) {
|
|
start := time.Now()
|
|
|
|
if len(msg.Values) < 3 {
|
|
return server.NOMessage, errInvalidNumberOfArguments
|
|
}
|
|
if len(msg.Values) > 5 {
|
|
return server.NOMessage, errInvalidNumberOfArguments
|
|
}
|
|
key := msg.Values[1].String()
|
|
id := msg.Values[2].String()
|
|
var doget bool
|
|
var path string
|
|
var raw bool
|
|
if len(msg.Values) > 3 {
|
|
doget = true
|
|
path = msg.Values[3].String()
|
|
if len(msg.Values) == 5 {
|
|
if strings.ToLower(msg.Values[4].String()) == "raw" {
|
|
raw = true
|
|
} else {
|
|
return server.NOMessage, errInvalidArgument(msg.Values[4].String())
|
|
}
|
|
}
|
|
}
|
|
col := c.getCol(key)
|
|
if col == nil {
|
|
if msg.OutputType == server.RESP {
|
|
return resp.NullValue(), nil
|
|
}
|
|
return server.NOMessage, errKeyNotFound
|
|
}
|
|
o, _, ok := col.Get(id)
|
|
if !ok {
|
|
if msg.OutputType == server.RESP {
|
|
return resp.NullValue(), nil
|
|
}
|
|
return server.NOMessage, errIDNotFound
|
|
}
|
|
var res gjson.Result
|
|
if doget {
|
|
res = gjson.Get(o.String(), path)
|
|
} else {
|
|
res = gjson.Parse(o.String())
|
|
}
|
|
var val string
|
|
if raw {
|
|
val = res.Raw
|
|
} else {
|
|
val = res.String()
|
|
}
|
|
var buf bytes.Buffer
|
|
if msg.OutputType == server.JSON {
|
|
buf.WriteString(`{"ok":true`)
|
|
}
|
|
switch msg.OutputType {
|
|
case server.JSON:
|
|
if res.Exists() {
|
|
buf.WriteString(`,"value":` + jsonString(val))
|
|
}
|
|
buf.WriteString(`,"elapsed":"` + time.Now().Sub(start).String() + "\"}")
|
|
return resp.StringValue(buf.String()), nil
|
|
case server.RESP:
|
|
if !res.Exists() {
|
|
return resp.NullValue(), nil
|
|
}
|
|
return resp.StringValue(val), nil
|
|
}
|
|
return server.NOMessage, nil
|
|
}
|
|
|
|
func (c *Controller) cmdJset(msg *server.Message) (res resp.Value, d commandDetailsT, err error) {
|
|
// JSET key path value [RAW]
|
|
start := time.Now()
|
|
|
|
var raw, str bool
|
|
switch len(msg.Values) {
|
|
default:
|
|
return server.NOMessage, d, errInvalidNumberOfArguments
|
|
case 5:
|
|
case 6:
|
|
switch strings.ToLower(msg.Values[5].String()) {
|
|
default:
|
|
return server.NOMessage, d, errInvalidArgument(msg.Values[5].String())
|
|
case "raw":
|
|
raw = true
|
|
case "str":
|
|
str = true
|
|
}
|
|
}
|
|
|
|
key := msg.Values[1].String()
|
|
id := msg.Values[2].String()
|
|
path := msg.Values[3].String()
|
|
val := msg.Values[4].String()
|
|
if !str && !raw {
|
|
switch val {
|
|
default:
|
|
if len(val) > 0 {
|
|
if (val[0] >= '0' && val[0] <= '9') || val[0] == '-' {
|
|
if _, err := strconv.ParseFloat(val, 64); err == nil {
|
|
raw = true
|
|
}
|
|
}
|
|
}
|
|
case "true", "false", "null":
|
|
raw = true
|
|
}
|
|
}
|
|
col := c.getCol(key)
|
|
var createcol bool
|
|
if col == nil {
|
|
col = collection.New()
|
|
createcol = true
|
|
}
|
|
var json string
|
|
var geoobj bool
|
|
o, _, ok := col.Get(id)
|
|
if ok {
|
|
geoobj = objIsSpatial(o)
|
|
json = o.String()
|
|
}
|
|
if raw {
|
|
// set as raw block
|
|
json, err = sjson.SetRaw(json, path, val)
|
|
} else {
|
|
// set as a string
|
|
json, err = sjson.Set(json, path, val)
|
|
}
|
|
if err != nil {
|
|
return server.NOMessage, d, err
|
|
}
|
|
|
|
if geoobj {
|
|
nmsg := *msg
|
|
nmsg.Values = []resp.Value{
|
|
resp.StringValue("SET"),
|
|
resp.StringValue(key),
|
|
resp.StringValue(id),
|
|
resp.StringValue("OBJECT"),
|
|
resp.StringValue(json),
|
|
}
|
|
// SET key id OBJECT json
|
|
return c.cmdSet(&nmsg)
|
|
}
|
|
if createcol {
|
|
c.setCol(key, col)
|
|
}
|
|
|
|
d.key = key
|
|
d.id = id
|
|
d.obj = collection.String(json)
|
|
d.timestamp = time.Now()
|
|
d.updated = true
|
|
|
|
c.clearIDExpires(key, id)
|
|
col.Set(d.id, d.obj, nil, nil)
|
|
switch msg.OutputType {
|
|
case server.JSON:
|
|
var buf bytes.Buffer
|
|
buf.WriteString(`{"ok":true`)
|
|
buf.WriteString(`,"elapsed":"` + time.Now().Sub(start).String() + "\"}")
|
|
return resp.StringValue(buf.String()), d, nil
|
|
case server.RESP:
|
|
return resp.SimpleStringValue("OK"), d, nil
|
|
}
|
|
return server.NOMessage, d, nil
|
|
}
|
|
|
|
func (c *Controller) cmdJdel(msg *server.Message) (res resp.Value, d commandDetailsT, err error) {
|
|
start := time.Now()
|
|
|
|
if len(msg.Values) != 4 {
|
|
return server.NOMessage, d, errInvalidNumberOfArguments
|
|
}
|
|
key := msg.Values[1].String()
|
|
id := msg.Values[2].String()
|
|
path := msg.Values[3].String()
|
|
|
|
col := c.getCol(key)
|
|
if col == nil {
|
|
if msg.OutputType == server.RESP {
|
|
return resp.IntegerValue(0), d, nil
|
|
}
|
|
return server.NOMessage, d, errKeyNotFound
|
|
}
|
|
|
|
var json string
|
|
var geoobj bool
|
|
o, _, ok := col.Get(id)
|
|
if ok {
|
|
geoobj = objIsSpatial(o)
|
|
json = o.String()
|
|
}
|
|
njson, err := sjson.Delete(json, path)
|
|
if err != nil {
|
|
return server.NOMessage, d, err
|
|
}
|
|
if njson == json {
|
|
switch msg.OutputType {
|
|
case server.JSON:
|
|
return server.NOMessage, d, errPathNotFound
|
|
case server.RESP:
|
|
return resp.IntegerValue(0), d, nil
|
|
}
|
|
return server.NOMessage, d, nil
|
|
}
|
|
json = njson
|
|
if geoobj {
|
|
nmsg := *msg
|
|
nmsg.Values = []resp.Value{
|
|
resp.StringValue("SET"),
|
|
resp.StringValue(key),
|
|
resp.StringValue(id),
|
|
resp.StringValue("OBJECT"),
|
|
resp.StringValue(json),
|
|
}
|
|
// SET key id OBJECT json
|
|
return c.cmdSet(&nmsg)
|
|
}
|
|
|
|
d.key = key
|
|
d.id = id
|
|
d.obj = collection.String(json)
|
|
d.timestamp = time.Now()
|
|
d.updated = true
|
|
|
|
c.clearIDExpires(d.key, d.id)
|
|
col.Set(d.id, d.obj, nil, nil)
|
|
switch msg.OutputType {
|
|
case server.JSON:
|
|
var buf bytes.Buffer
|
|
buf.WriteString(`{"ok":true`)
|
|
buf.WriteString(`,"elapsed":"` + time.Now().Sub(start).String() + "\"}")
|
|
return resp.StringValue(buf.String()), d, nil
|
|
case server.RESP:
|
|
return resp.IntegerValue(1), d, nil
|
|
}
|
|
return server.NOMessage, d, nil
|
|
}
|