rename option to from_member
parent
c7705bbccf
commit
7a7314bfb5
|
@ -11,12 +11,12 @@ import (
|
|||
)
|
||||
|
||||
type Field struct {
|
||||
Name string `yaml:"name"`
|
||||
Key Key `yaml:"key"`
|
||||
Keys []Key `yaml:"keys"`
|
||||
Type string `yaml:"type"`
|
||||
Args map[string]interface{} `yaml:"args"`
|
||||
FromMembers bool `yaml:"from_members"`
|
||||
Name string `yaml:"name"`
|
||||
Key Key `yaml:"key"`
|
||||
Keys []Key `yaml:"keys"`
|
||||
Type string `yaml:"type"`
|
||||
Args map[string]interface{} `yaml:"args"`
|
||||
FromMember bool `yaml:"from_member"`
|
||||
}
|
||||
|
||||
type Table struct {
|
||||
|
|
|
@ -62,7 +62,7 @@ func (f *FieldSpec) Value(elem *element.OSMElem, geom *geom.Geometry, match Matc
|
|||
|
||||
func (f *FieldSpec) MemberValue(rel *element.Relation, member *element.Member, geom *geom.Geometry, match Match) interface{} {
|
||||
if f.Type.Func != nil {
|
||||
if f.Type.FromMembers {
|
||||
if f.Type.FromMember {
|
||||
if member.Elem == nil {
|
||||
return nil
|
||||
}
|
||||
|
@ -104,9 +104,9 @@ func (field *Field) FieldType() *FieldType {
|
|||
log.Print(err)
|
||||
return nil
|
||||
}
|
||||
fieldType = FieldType{fieldType.Name, fieldType.GoType, makeValue, nil, nil, fieldType.FromMembers}
|
||||
fieldType = FieldType{fieldType.Name, fieldType.GoType, makeValue, nil, nil, fieldType.FromMember}
|
||||
}
|
||||
fieldType.FromMembers = field.FromMembers
|
||||
fieldType.FromMember = field.FromMember
|
||||
return &fieldType
|
||||
}
|
||||
return nil
|
||||
|
@ -131,12 +131,12 @@ func (t *Table) TableFields() *TableFields {
|
|||
}
|
||||
|
||||
type FieldType struct {
|
||||
Name string
|
||||
GoType string
|
||||
Func MakeValue
|
||||
MakeFunc MakeMakeValue
|
||||
MemberFunc MakeMemberValue
|
||||
FromMembers bool
|
||||
Name string
|
||||
GoType string
|
||||
Func MakeValue
|
||||
MakeFunc MakeMakeValue
|
||||
MemberFunc MakeMemberValue
|
||||
FromMember bool
|
||||
}
|
||||
|
||||
func Bool(val string, elem *element.OSMElem, geom *geom.Geometry, match Match) interface{} {
|
||||
|
|
|
@ -23,7 +23,7 @@ tables:
|
|||
- name: subname
|
||||
key: name
|
||||
type: string
|
||||
from_members: true
|
||||
from_member: true
|
||||
- key: name
|
||||
name: name
|
||||
type: string
|
||||
|
@ -47,10 +47,13 @@ tables:
|
|||
type: relation_member_type
|
||||
- name: geometry
|
||||
type: geometry
|
||||
- name: relname
|
||||
key: name
|
||||
type: string
|
||||
- name: name
|
||||
key: name
|
||||
type: string
|
||||
from_members: true
|
||||
from_member: true
|
||||
mapping:
|
||||
route: [bus, tram, rail]
|
||||
routes:
|
||||
|
|
Loading…
Reference in New Issue