update example mappings: null values and enumerate

master
Oliver Tonnhofer 2015-08-27 09:59:08 +02:00
parent 4f78cf8a8f
commit 5ff5311f41
2 changed files with 215 additions and 318 deletions

View File

@ -9,12 +9,13 @@ generalized_tables:
tolerance: 50.0 tolerance: 50.0
roads_gen0: roads_gen0:
source: roads_gen1 source: roads_gen1
sql_filter: null
tolerance: 200.0 tolerance: 200.0
roads_gen1: roads_gen1:
source: roads source: roads
sql_filter: type IN ('motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary', sql_filter:
'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link') type IN (
'motorway', 'motorway_link', 'trunk', 'trunk_link', 'primary',
'primary_link', 'secondary', 'secondary_link', 'tertiary', 'tertiary_link')
OR class IN('railway') OR class IN('railway')
tolerance: 50.0 tolerance: 50.0
waterareas_gen0: waterareas_gen0:
@ -27,26 +28,21 @@ generalized_tables:
tolerance: 50.0 tolerance: 50.0
waterways_gen0: waterways_gen0:
source: waterways_gen1 source: waterways_gen1
sql_filter: null
tolerance: 200 tolerance: 200
waterways_gen1: waterways_gen1:
source: waterways source: waterways
sql_filter: null
tolerance: 50.0 tolerance: 50.0
tables: tables:
admin: admin:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: admin_level - key: admin_level
name: admin_level name: admin_level
@ -57,17 +53,14 @@ tables:
type: polygon type: polygon
aeroways: aeroways:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
aeroway: aeroway:
@ -76,17 +69,14 @@ tables:
type: linestring type: linestring
amenities: amenities:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
amenity: amenity:
@ -101,17 +91,14 @@ tables:
type: point type: point
barrierpoints: barrierpoints:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
barrier: barrier:
@ -134,17 +121,14 @@ tables:
type: point type: point
barrierways: barrierways:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
barrier: barrier:
@ -164,17 +148,14 @@ tables:
type: linestring type: linestring
buildings: buildings:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
building: building:
@ -182,17 +163,14 @@ tables:
type: polygon type: polygon
housenumbers: housenumbers:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: addr:street - key: addr:street
name: addr:street name: addr:street
@ -209,17 +187,14 @@ tables:
type: point type: point
housenumbers_interpolated: housenumbers_interpolated:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: addr:street - key: addr:street
name: addr:street name: addr:street
@ -239,72 +214,67 @@ tables:
type: linestring type: linestring
landusages: landusages:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: null - name: area
name: area
type: pseudoarea type: pseudoarea
- args: - args:
ranks: values:
- pedestrian
- footway
- playground
- park
- forest
- cemetery
- farmyard
- farm
- farmland
- wood
- meadow
- grass
- wetland
- village_green
- recreation_ground
- garden
- sports_centre
- pitch
- common
- allotments
- golf_course
- university
- school
- college
- library
- baracks
- fuel
- parking
- nature_reserve
- cinema
- theatre
- place_of_worship
- hospital
- scrub
- orchard
- vineyard
- zoo
- quarry
- residential
- retail
- commercial
- industrial
- railway
- heath
- island
- land - land
key: z_order - island
- heath
- railway
- industrial
- commercial
- retail
- residential
- quarry
- zoo
- vineyard
- orchard
- scrub
- hospital
- place_of_worship
- theatre
- cinema
- nature_reserve
- parking
- fuel
- baracks
- library
- college
- school
- university
- golf_course
- allotments
- common
- pitch
- sports_centre
- garden
- recreation_ground
- village_green
- wetland
- grass
- meadow
- wood
- farmland
- farm
- farmyard
- cemetery
- forest
- park
- playground
- footway
- pedestrian
name: z_order name: z_order
type: zorder type: enumerate
mapping: mapping:
aeroway: aeroway:
- runway - runway
@ -373,33 +343,29 @@ tables:
type: polygon type: polygon
places: places:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- args: - args:
ranks: values:
- country
- state
- region
- county
- city
- town
- village
- hamlet
- suburb
- locality - locality
key: z_order - suburb
- hamlet
- village
- town
- city
- county
- region
- state
- country
name: z_order name: z_order
type: zorder type: enumerate
- key: population - key: population
name: population name: population
type: integer type: integer
@ -418,14 +384,11 @@ tables:
type: point type: point
roads: roads:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: name - key: name
name: name name: name
@ -451,8 +414,7 @@ tables:
- key: service - key: service
name: service name: service
type: string type: string
- key: null - name: class
name: class
type: mapping_key type: mapping_key
filters: filters:
exclude_tags: exclude_tags:
@ -503,17 +465,14 @@ tables:
type: linestring type: linestring
transport_areas: transport_areas:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
aeroway: aeroway:
@ -527,17 +486,14 @@ tables:
type: polygon type: polygon
transport_points: transport_points:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: ref - key: ref
name: ref name: ref
@ -562,20 +518,16 @@ tables:
type: point type: point
waterareas: waterareas:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: null - name: area
name: area
type: pseudoarea type: pseudoarea
mapping: mapping:
amenity: amenity:
@ -592,17 +544,14 @@ tables:
type: polygon type: polygon
waterways: waterways:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
barrier: barrier:

View File

@ -9,7 +9,6 @@ generalized_tables:
tolerance: 50.0 tolerance: 50.0
roads_gen0: roads_gen0:
source: roads_gen1 source: roads_gen1
sql_filter: null
tolerance: 200.0 tolerance: 200.0
roads_gen1: roads_gen1:
source: roads source: roads
@ -27,26 +26,21 @@ generalized_tables:
tolerance: 50.0 tolerance: 50.0
waterways_gen0: waterways_gen0:
source: waterways_gen1 source: waterways_gen1
sql_filter: null
tolerance: 200 tolerance: 200
waterways_gen1: waterways_gen1:
source: waterways source: waterways
sql_filter: null
tolerance: 50.0 tolerance: 50.0
tables: tables:
admin: admin:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: admin_level - key: admin_level
name: admin_level name: admin_level
@ -57,17 +51,14 @@ tables:
type: polygon type: polygon
aeroways: aeroways:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
aeroway: aeroway:
@ -76,17 +67,14 @@ tables:
type: linestring type: linestring
amenities: amenities:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
amenity: amenity:
@ -102,17 +90,14 @@ tables:
amenity_areas: amenity_areas:
_comment: for testing duplicate inserts with __any__ and exact match _comment: for testing duplicate inserts with __any__ and exact match
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
building: building:
@ -120,17 +105,14 @@ tables:
type: polygon type: polygon
barrierpoints: barrierpoints:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
barrier: barrier:
@ -153,17 +135,14 @@ tables:
type: point type: point
barrierways: barrierways:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
barrier: barrier:
@ -183,17 +162,14 @@ tables:
type: linestring type: linestring
buildings: buildings:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
building: building:
@ -201,17 +177,14 @@ tables:
type: polygon type: polygon
housenumbers: housenumbers:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: addr:street - key: addr:street
name: addr:street name: addr:street
@ -228,17 +201,14 @@ tables:
type: point type: point
housenumbers_interpolated: housenumbers_interpolated:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: addr:street - key: addr:street
name: addr:street name: addr:street
@ -258,72 +228,67 @@ tables:
type: linestring type: linestring
landusages: landusages:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: null - name: area
name: area
type: pseudoarea type: pseudoarea
- args: - args:
ranks: values:
- pedestrian
- footway
- playground
- park
- forest
- cemetery
- farmyard
- farm
- farmland
- wood
- meadow
- grass
- wetland
- village_green
- recreation_ground
- garden
- sports_centre
- pitch
- common
- allotments
- golf_course
- university
- school
- college
- library
- baracks
- fuel
- parking
- nature_reserve
- cinema
- theatre
- place_of_worship
- hospital
- scrub
- orchard
- vineyard
- zoo
- quarry
- residential
- retail
- commercial
- industrial
- railway
- heath
- island
- land - land
key: z_order - island
- heath
- railway
- industrial
- commercial
- retail
- residential
- quarry
- zoo
- vineyard
- orchard
- scrub
- hospital
- place_of_worship
- theatre
- cinema
- nature_reserve
- parking
- fuel
- baracks
- library
- college
- school
- university
- golf_course
- allotments
- common
- pitch
- sports_centre
- garden
- recreation_ground
- village_green
- wetland
- grass
- meadow
- wood
- farmland
- farm
- farmyard
- cemetery
- forest
- park
- playground
- footway
- pedestrian
name: z_order name: z_order
type: zorder type: eumerate
mapping: mapping:
aeroway: aeroway:
- runway - runway
@ -395,33 +360,29 @@ tables:
type: polygon type: polygon
places: places:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- args: - args:
ranks: values:
- country
- state
- region
- county
- city
- town
- village
- hamlet
- suburb
- locality - locality
key: z_order - suburb
- hamlet
- village
- town
- city
- county
- region
- state
- country
name: z_order name: z_order
type: zorder type: enumerate
- key: population - key: population
name: population name: population
type: integer type: integer
@ -440,14 +401,11 @@ tables:
type: point type: point
roads: roads:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: name - key: name
name: name name: name
@ -473,8 +431,7 @@ tables:
- key: service - key: service
name: service name: service
type: string type: string
- key: null - name: class
name: class
type: mapping_key type: mapping_key
filters: filters:
exclude_tags: exclude_tags:
@ -524,17 +481,14 @@ tables:
type: linestring type: linestring
transport_areas: transport_areas:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
aeroway: aeroway:
@ -548,17 +502,14 @@ tables:
type: polygon type: polygon
transport_points: transport_points:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
- key: ref - key: ref
name: ref name: ref
@ -583,17 +534,14 @@ tables:
type: point type: point
waterways: waterways:
fields: fields:
- key: null - name: osm_id
name: osm_id
type: id type: id
- key: null - name: geometry
name: geometry
type: geometry type: geometry
- key: name - key: name
name: name name: name
type: string type: string
- key: null - name: type
name: type
type: mapping_value type: mapping_value
mapping: mapping:
barrier: barrier: