hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

update osm2pgsql (nameless landuses) and add tests for it

Browse Source
This commit is contained in:
Sarah Hoffmann
2014-09-10 20:55:17 +02:00
parent 75cb02a497
commit 4498c84d48
2 changed files with 23 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
osm2pgsql

Submodule osm2pgsql updated: 13c11f8842...8fc89648fa

25
tests/features/osm2pgsql/import/simple.feature
View File

@@ -1,6 +1,6 @@
@DB @DB
Feature: Import of simple objects by osm2pgsql Feature: Import of simple objects by osm2pgsql
Testing basic functions of osm2pgsql. Testing basic tagging in osm2pgsql imports.
Scenario: Import simple objects Scenario: Import simple objects
Given the osm nodes: Given the osm nodes:
@@ -15,11 +15,11 @@ Feature: Import of simple objects by osm2pgsql
| 201 | 0 1 | 201 | 0 1
| 202 | 1 1 | 202 | 1 1
| 203 | 1 0 | 203 | 1 0
Given the osm ways: And the osm ways:
| id | tags | nodes | id | tags | nodes
| 1 | 'shop' : 'toys', 'name' : 'tata' | 100 101 102 | 1 | 'shop' : 'toys', 'name' : 'tata' | 100 101 102
| 2 | 'ref' : '45' | 200 201 202 203 200 | 2 | 'ref' : '45' | 200 201 202 203 200
Given the osm relations: And the osm relations:
| id | tags | members | id | tags | members
| 1 | 'type' : 'multipolygon', 'tourism' : 'hotel', 'name' : 'XZ' | N1,W2 | 1 | 'type' : 'multipolygon', 'tourism' : 'hotel', 'name' : 'XZ' | N1,W2
When loading osm data When loading osm data
@@ -47,3 +47,22 @@ Feature: Import of simple objects by osm2pgsql
Then table place contains Then table place contains
| object | class | type | object | class | type
| N1 | place | house | N1 | place | house
Scenario: Landuses are only imported when named
Given the osm nodes:
| id | geometry
| 100 | 0 0
| 101 | 0 0.1
| 102 | 0.1 0.1
| 200 | 0 0
| 202 | 1 1
| 203 | 1 0
And the osm ways:
| id | tags | nodes
| 1 | 'landuse' : 'residential', 'name' : 'rainbow' | 100 101 102 100
| 2 | 'landuse' : 'residential' | 200 202 203 200
When loading osm data
Then table place contains
| object | class | type
| W1 | landuse | residential
And table place has no entry for W2