diff --git a/test/route_relation_mapping.json b/test/route_relation_mapping.json deleted file mode 100644 index c81fc92..0000000 --- a/test/route_relation_mapping.json +++ /dev/null @@ -1,128 +0,0 @@ -{ - "tags": { - "load_all": true, - "exclude": [ - "created_by", - "source" - ] - }, - "tables": { - "route_members": { - "fields": [ - { - "type": "id", - "name": "osm_id" - }, - { - "type": "string", - "name": "ref", - "key": "ref" - }, - { - "type": "relation_member_id", - "name": "member" - }, - { - "type": "relation_member_index", - "name": "index" - }, - { - "type": "relation_member_role", - "name": "role" - }, - { - "type": "relation_member_type", - "name": "type" - }, - { - "type": "geometry", - "name": "geometry" - }, - { - "type": "string", - "name": "name", - "key": "name", - "from_members": true - } - ], - "type": "relation_member", - "mapping": { - "route": [ - "bus", - "tram", - "rail" - ] - } - }, - "routes": { - "fields": [ - { - "type": "id", - "name": "osm_id" - }, - { - "type": "string", - "name": "ref", - "key": "ref" - }, - { - "type": "hstore_tags", - "name": "tags" - } - ], - "type": "relation", - "mapping": { - "route": [ - "bus", - "tram", - "rail" - ] - } - }, - "master_routes": { - "fields": [ - { - "type": "id", - "name": "osm_id" - }, - { - "type": "relation_member_id", - "name": "member" - }, - { - "type": "relation_member_index", - "name": "index" - }, - { - "type": "relation_member_role", - "name": "role" - }, - { - "type": "relation_member_type", - "name": "type" - }, - { - "type": "geometry", - "name": "geometry" - }, - { - "type": "string", - "name": "subname", - "key": "name", - "from_members": true - }, - { - "type": "string", - "name": "name", - "key": "name" - } - ], - "type": "relation_member", - "mapping": { - "route_master": [ - "bus" - ] - } - } - } -} diff --git a/test/route_relation_mapping.yml b/test/route_relation_mapping.yml new file mode 100644 index 0000000..5a09795 --- /dev/null +++ b/test/route_relation_mapping.yml @@ -0,0 +1,67 @@ +tags: + load_all: true + exclude: + - created_by + - source + +tables: + master_routes: + type: relation_member + fields: + - name: osm_id + type: id + - name: member + type: relation_member_id + - name: index + type: relation_member_index + - name: role + type: relation_member_role + - name: type + type: relation_member_type + - name: geometry + type: geometry + - name: subname + key: name + type: string + from_members: true + - key: name + name: name + type: string + mapping: + route_master: [bus] + route_members: + type: relation_member + fields: + - name: osm_id + type: id + - key: ref + name: ref + type: string + - name: member + type: relation_member_id + - name: index + type: relation_member_index + - name: role + type: relation_member_role + - name: type + type: relation_member_type + - name: geometry + type: geometry + - name: name + key: name + type: string + from_members: true + mapping: + route: [bus, tram, rail] + routes: + type: relation + fields: + - name: osm_id + type: id + - key: ref + name: ref + type: string + - name: tags + type: hstore_tags + mapping: + route: [bus, tram, rail] diff --git a/test/route_relation_test.go b/test/route_relation_test.go index f71c0af..16b52a0 100644 --- a/test/route_relation_test.go +++ b/test/route_relation_test.go @@ -14,7 +14,7 @@ func TestRouteRelation_Prepare(t *testing.T) { connection: "postgis://", cacheDir: ts.dir, osmFileName: "build/route_relation.pbf", - mappingFileName: "route_relation_mapping.json", + mappingFileName: "route_relation_mapping.yml", } ts.g = geos.NewGeos()