From 7a7314bfb5226a6f70b5e21f490ff855f2fc8a6c Mon Sep 17 00:00:00 2001
From: Oliver Tonnhofer <olt@bogosoft.com>
Date: Tue, 5 Jan 2016 09:40:30 +0100
Subject: [PATCH] rename option to from_member

---
 mapping/config.go               | 12 ++++++------
 mapping/fields.go               | 18 +++++++++---------
 test/route_relation_mapping.yml |  7 +++++--
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/mapping/config.go b/mapping/config.go
index 430510c..0c84d8b 100644
--- a/mapping/config.go
+++ b/mapping/config.go
@@ -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 {
diff --git a/mapping/fields.go b/mapping/fields.go
index 15a7900..31e0ba4 100644
--- a/mapping/fields.go
+++ b/mapping/fields.go
@@ -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{} {
diff --git a/test/route_relation_mapping.yml b/test/route_relation_mapping.yml
index 5a09795..d9a9773 100644
--- a/test/route_relation_mapping.yml
+++ b/test/route_relation_mapping.yml
@@ -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: