vitalif
/
imposm3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
mapping/test_mapping.json
View File

@ -43,7 +43,7 @@
}, },
"tables": { "tables": {
"landusages": { "landusages": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -209,7 +209,7 @@
} }
}, },
"buildings": { "buildings": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -240,7 +240,7 @@
}, },
"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": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -270,7 +270,7 @@
} }
}, },
"places": { "places": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -333,7 +333,7 @@
} }
}, },
"transport_areas": { "transport_areas": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -370,7 +370,7 @@
} }
}, },
"admin": { "admin": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -405,7 +405,7 @@
} }
}, },
"aeroways": { "aeroways": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -436,7 +436,7 @@
} }
}, },
"waterways": { "waterways": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -473,7 +473,7 @@
} }
}, },
"barrierways": { "barrierways": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -515,7 +515,7 @@
} }
}, },
"transport_points": { "transport_points": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -566,7 +566,7 @@
} }
}, },
"amenities": { "amenities": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -603,7 +603,7 @@
} }
}, },
"barrierpoints": { "barrierpoints": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -648,7 +648,7 @@
} }
}, },
"housenumbers_interpolated": { "housenumbers_interpolated": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -698,7 +698,7 @@
} }
}, },
"roads": { "roads": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",
@ -818,7 +818,7 @@
} }
}, },
"housenumbers": { "housenumbers": {
"fields": [ "columns": [
{ {
"type": "id", "type": "id",
"name": "osm_id", "name": "osm_id",

30
mapping/test_mapping.yml
View File

@ -35,7 +35,7 @@ generalized_tables:
tolerance: 50.0 tolerance: 50.0
tables: tables:
admin: admin:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -53,7 +53,7 @@ tables:
- administrative - administrative
type: polygon type: polygon
aeroways: aeroways:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -69,7 +69,7 @@ tables:
- taxiway - taxiway
type: linestring type: linestring
amenities: amenities:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -92,7 +92,7 @@ tables:
type: point type: point
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: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -107,7 +107,7 @@ tables:
- shop - shop
type: polygon type: polygon
barrierpoints: barrierpoints:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -137,7 +137,7 @@ tables:
- stile - stile
type: point type: point
barrierways: barrierways:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -164,7 +164,7 @@ tables:
- wire_fence - wire_fence
type: linestring type: linestring
buildings: buildings:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -179,7 +179,7 @@ tables:
- __any__ - __any__
type: polygon type: polygon
housenumbers: housenumbers:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -203,7 +203,7 @@ tables:
- __any__ - __any__
type: point type: point
housenumbers_interpolated: housenumbers_interpolated:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -230,7 +230,7 @@ tables:
- __any__ - __any__
type: linestring type: linestring
landusages: landusages:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -363,7 +363,7 @@ tables:
- riverbank - riverbank
type: polygon type: polygon
places: places:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -404,7 +404,7 @@ tables:
- locality - locality
type: point type: point
roads: roads:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -524,7 +524,7 @@ tables:
- groyne - groyne
type: linestring type: linestring
transport_areas: transport_areas:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -545,7 +545,7 @@ tables:
- platform - platform
type: polygon type: polygon
transport_points: transport_points:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry
@ -577,7 +577,7 @@ tables:
- subway_entrance - subway_entrance
type: point type: point
waterways: waterways:
fields: columns:
- name: osm_id - name: osm_id
type: id type: id
- name: geometry - name: geometry

4
test/any_any_mapping.json
View File

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

30
test/complete_db_mapping.json
View File

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

6
test/expire_tiles_mapping.yml
View File

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

6
test/route_relation_mapping.yml
View File

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

2
test/single_table_mapping.json
View File

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