use columns instead of fields

master
Oliver Tonnhofer 2017-05-10 16:37:51 +02:00
parent adb50e2b3b
commit 79754e1f8a
7 changed files with 54 additions and 54 deletions

View File

@ -43,7 +43,7 @@
},
"tables": {
"landusages": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -209,7 +209,7 @@
}
},
"buildings": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -240,7 +240,7 @@
},
"amenity_areas": {
"_comment": "for testing duplicate inserts with __any__ and exact match",
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -270,7 +270,7 @@
}
},
"places": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -333,7 +333,7 @@
}
},
"transport_areas": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -370,7 +370,7 @@
}
},
"admin": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -405,7 +405,7 @@
}
},
"aeroways": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -436,7 +436,7 @@
}
},
"waterways": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -473,7 +473,7 @@
}
},
"barrierways": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -515,7 +515,7 @@
}
},
"transport_points": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -566,7 +566,7 @@
}
},
"amenities": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -603,7 +603,7 @@
}
},
"barrierpoints": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -648,7 +648,7 @@
}
},
"housenumbers_interpolated": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -698,7 +698,7 @@
}
},
"roads": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -818,7 +818,7 @@
}
},
"housenumbers": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",

View File

@ -35,7 +35,7 @@ generalized_tables:
tolerance: 50.0
tables:
admin:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -53,7 +53,7 @@ tables:
- administrative
type: polygon
aeroways:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -69,7 +69,7 @@ tables:
- taxiway
type: linestring
amenities:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -92,7 +92,7 @@ tables:
type: point
amenity_areas:
_comment: for testing duplicate inserts with __any__ and exact match
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -107,7 +107,7 @@ tables:
- shop
type: polygon
barrierpoints:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -137,7 +137,7 @@ tables:
- stile
type: point
barrierways:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -164,7 +164,7 @@ tables:
- wire_fence
type: linestring
buildings:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -179,7 +179,7 @@ tables:
- __any__
type: polygon
housenumbers:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -203,7 +203,7 @@ tables:
- __any__
type: point
housenumbers_interpolated:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -230,7 +230,7 @@ tables:
- __any__
type: linestring
landusages:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -363,7 +363,7 @@ tables:
- riverbank
type: polygon
places:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -404,7 +404,7 @@ tables:
- locality
type: point
roads:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -524,7 +524,7 @@ tables:
- groyne
type: linestring
transport_areas:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -545,7 +545,7 @@ tables:
- platform
type: polygon
transport_points:
fields:
columns:
- name: osm_id
type: id
- name: geometry
@ -577,7 +577,7 @@ tables:
- subway_entrance
type: point
waterways:
fields:
columns:
- name: osm_id
type: id
- name: geometry

View File

@ -8,7 +8,7 @@
},
"tables": {
"all": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id"
@ -28,7 +28,7 @@
}
},
"amenities": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id"

View File

@ -54,7 +54,7 @@
},
"tables": {
"landusages": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -191,7 +191,7 @@
}
},
"buildings": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -228,7 +228,7 @@
}
},
"places": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -290,7 +290,7 @@
}
},
"transport_areas": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -327,7 +327,7 @@
}
},
"admin": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -362,7 +362,7 @@
}
},
"aeroways": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -393,7 +393,7 @@
}
},
"waterways": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -430,7 +430,7 @@
}
},
"barrierways": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -472,7 +472,7 @@
}
},
"transport_points": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -523,7 +523,7 @@
}
},
"amenities": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -560,7 +560,7 @@
}
},
"barrierpoints": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -605,7 +605,7 @@
}
},
"housenumbers_interpolated": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -655,7 +655,7 @@
}
},
"roads": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -784,7 +784,7 @@
}
},
"housenumbers": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",
@ -829,7 +829,7 @@
}
},
"waterareas": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",

View File

@ -1,7 +1,7 @@
tables:
roads:
type: linestring
fields:
columns:
- name: osm_id
type: id
- name: type
@ -16,7 +16,7 @@ tables:
pois:
type: point
fields:
columns:
- name: osm_id
type: id
- name: type
@ -31,7 +31,7 @@ tables:
buildings:
type: polygon
fields:
columns:
- name: osm_id
type: id
- name: type

View File

@ -1,7 +1,7 @@
tables:
master_routes:
type: relation_member
fields:
columns:
- name: osm_id
type: id
- name: member
@ -26,7 +26,7 @@ tables:
route_master: [bus]
route_members:
type: relation_member
fields:
columns:
- name: osm_id
type: id
- key: ref
@ -54,7 +54,7 @@ tables:
route: [bus, tram, rail]
routes:
type: relation
fields:
columns:
- name: osm_id
type: id
- key: ref

View File

@ -9,7 +9,7 @@
"use_single_id_space": true,
"tables": {
"all": {
"fields": [
"columns": [
{
"type": "id",
"name": "osm_id",