mirror of
https://github.com/osm-search/Nominatim.git
synced 2024-12-25 22:12:45 +03:00
Merge pull request #1277 from lonvia/osm2pgsql-import-from-json
Osm2pgsql import from json style file
This commit is contained in:
Sarah Hoffmann
GitHub
commit
7d192ace6d
@ -58,10 +58,89 @@ Nominatim can use postcodes from an external source to improve searches that inv
|
||||
cd $NOMINATIM_SOURCE_DIR/data
|
||||
wget https://www.nominatim.org/data/gb_postcode_data.sql.gz
|
||||
|
||||
## Choosing the Data to Import
|
||||
|
||||
In its default setup Nominatim is configured to import the full OSM data
|
||||
set for the entire planet. Such a setup requires a powerful machine with
|
||||
at least 32GB of RAM and around 800GB of SSD hard disks. Depending on your
|
||||
use case there are various ways to reduce the amount of data imported. This
|
||||
section discusses these methods. They can also be combined.
|
||||
|
||||
### Using an extract
|
||||
|
||||
If you only need geocoding for a smaller region, then precomputed extracts
|
||||
are a good way to reduce the database size and import time.
|
||||
[Geofabrik](https://download.geofabrik.de) offers extracts for most countries.
|
||||
They even have daily updates which can be used with the update process described
|
||||
below. There are also
|
||||
[other providers for extracts](https://wiki.openstreetmap.org/wiki/Planet.osm#Downloading).
|
||||
|
||||
Please be aware that some extracts are not cut exactly along the country
|
||||
boundaries. As a result some parts of the boundary may be missing which means
|
||||
that cannot compute the areas for some administrative areas.
|
||||
|
||||
### Dropping Data Required for Dynamic Updates
|
||||
|
||||
About half of the data in Nominatim's database is not really used for serving
|
||||
the API. It is only there to allow the data to be updated from the latest
|
||||
changes from OSM. For many uses these dynamic updates are not really required.
|
||||
If you don't plan to apply updates, the dynamic part of the database can be
|
||||
safely dropped using the following command:
|
||||
|
||||
```
|
||||
./utils/setup.php --drop
|
||||
```
|
||||
|
||||
Note that you still need to provide for sufficient disk space for the initial
|
||||
import. So this option is particularly interesting if you plan to transfer the
|
||||
database or reuse the space later.
|
||||
|
||||
### Reverse-only Imports
|
||||
|
||||
If you only want to use the Nominatim database for reverse lookups or
|
||||
if you plan to use the installation only for exports to a
|
||||
[photon](http://photon.komoot.de/) database, then you can set up a database
|
||||
without search indexes. Add `--reverse-only` to your setup command above.
|
||||
|
||||
This saves about 5% of disk space.
|
||||
|
||||
### Filtering Imported Data
|
||||
|
||||
Nominatim normally sets up a full search database containing administrative
|
||||
boundaries, places, streets, addresses and POI data. There are also other
|
||||
import styles available which only read selected data:
|
||||
|
||||
* **settings/import-admin.style**
|
||||
Only import administrative boundaries and places.
|
||||
* **settings/import-street.style**
|
||||
Like the admin style but also adds streets.
|
||||
* **settings/import-address.style**
|
||||
Import all data necessary to compute addresses down to house number level.
|
||||
* **settings/import-full.style**
|
||||
Default style that also includes points of interest.
|
||||
|
||||
The style can be changed with the configuration `CONST_Import_Style`.
|
||||
|
||||
To give you an idea of the impact of using the different style, the table
|
||||
below gives rough estimates of the final database size after import of a
|
||||
2018 planet and after using the `--drop` option. It also shows the time
|
||||
needed for the import on a machine with 32GB RAM, 4 CPUS and SSDs. Note that
|
||||
the given sizes are just an estimate meant for comparison of style requirements.
|
||||
Your planet import is likely to be larger as the OSM data grows with time.
|
||||
|
||||
style | Import time | DB size | after drop
|
||||
----------|--------------|------------|------------
|
||||
admin | 5h | 190 GB | 20 GB
|
||||
street | 42h | 400 GB | 180 GB
|
||||
address | 59h | 500 GB | 260 GB
|
||||
full | 80h | 590 GB | 320 GB
|
||||
|
||||
You can also customize the styles further. For an description of the
|
||||
style format see [the developement section](../develop/Import.md).
|
||||
|
||||
## Initial import of the data
|
||||
|
||||
**Important:** first try the import with a small excerpt, for example from
|
||||
**Important:** first try the import with a small extract, for example from
|
||||
[Geofabrik](https://download.geofabrik.de).
|
||||
|
||||
Download the data to import and load the data with the following command:
|
||||
@ -98,15 +177,6 @@ you also need to enable these key phrases like this:
|
||||
|
||||
Note that this command downloads the phrases from the wiki link above.
|
||||
|
||||
### Reverse-only Imports
|
||||
|
||||
If you only want to use the Nominatim database for reverse lookups or
|
||||
if you plan to use the installation only for exports to a
|
||||
[photon](http://photon.komoot.de/) database, then you can set up a database
|
||||
without search indexes. Add `--reverse-only` to your setup command above.
|
||||
|
||||
This saves about 5% of disk space.
|
||||
|
||||
|
||||
## Installing Tiger housenumber data for the US
|
||||
|
||||
|
||||
170
docs/develop/Import.md
Normal file
170
docs/develop/Import.md
Normal file
@ -0,0 +1,170 @@
|
||||
# OSM Data Import
|
||||
|
||||
OSM data is initially imported using osm2pgsql. Nominatim uses its own data
|
||||
output style 'gazetteer', which differs from the output style created for
|
||||
map rendering.
|
||||
|
||||
## Database Layout
|
||||
|
||||
The gazetteer style produces a single table `place` with the following rows:
|
||||
|
||||
* `osm_type` - kind of OSM object (**N** - node, **W** - way, **R** - relation)
|
||||
* `osm_id` - original OSM ID
|
||||
* `class` - key of principal tag defining the object type
|
||||
* `type` - value of principal tag defining the object type
|
||||
* `name` - collection of tags that contain a name or reference
|
||||
* `admin_level` - numerical value of the tagged administrative level
|
||||
* `address` - collection of tags defining the address of an object
|
||||
* `extratags` - collection of additional interesting tags that are not
|
||||
directly relevant for searching
|
||||
* `geometry` - geometry of the object (in WGS84)
|
||||
|
||||
A single OSM object may appear multiple times in this table when it is tagged
|
||||
with multiple tags that may constitute a principal tag. Take for example a
|
||||
motorway bridge. In OSM, this would be a way which is tagged with
|
||||
`highway=motorway` and `bridge=yes`. This way would appear in the `place` table
|
||||
once with `class` of `highway` and once with a `class` of `bridge`. Thus the
|
||||
*uique key* for `place` is (`osm_type`, `osm_id`, `class`).
|
||||
|
||||
## Configuring the Import
|
||||
|
||||
How tags are interpreted and assigned to the different `place` columns can be
|
||||
configured via the import style configuration file (`CONST_Import_style`). This
|
||||
is a JSON file which contains a list of rules which are matched against every
|
||||
tag of every object and then assign the tag its specific role.
|
||||
|
||||
### Configuration Rules
|
||||
|
||||
A single rule looks like this:
|
||||
|
||||
```json
|
||||
{
|
||||
"keys" : ["key1", "key2", ...],
|
||||
"values" : {
|
||||
"value1" : "prop",
|
||||
"value2" : "prop1,prop2"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
A rule first defines a list of keys to apply the rule to. This is always a list
|
||||
of strings. The string may have four forms. An empty string matches against
|
||||
any key. A string that ends in an asterisk `*` is a prefix match and accordingly
|
||||
matches against any key that starts with the given string (minus the `*`). A
|
||||
suffix match can be defined similarly with a string that starts with a `*`. Any
|
||||
other string constitutes an exact match.
|
||||
|
||||
The second part of the rules defines a list of values and the properties that
|
||||
apply to a successful match. Value strings may be either empty, which again
|
||||
means that thy match against any value, or describe an exact match. Prefix
|
||||
or suffix matching of values is not possible.
|
||||
|
||||
For a rule to match, it has to find a valid combination of keys and values. The
|
||||
resulting property is that of the matched values.
|
||||
|
||||
The rules in a configuration file are processed sequentially and the first
|
||||
match for each tag wins.
|
||||
|
||||
A rule where key and value are the empty string is special. This defines the
|
||||
fallback when none of the rules matches. The fallback is always used as a last
|
||||
resort when nothing else matches, no matter where the rule appears in the file.
|
||||
Defining multiple fallback rules is not allowed. What happens in this case,
|
||||
is undefined.
|
||||
|
||||
### Tag Properties
|
||||
|
||||
One or more of the following properties may be given for each tag:
|
||||
|
||||
* `main`
|
||||
|
||||
A principal tag. A new row will be added for the object with key and value
|
||||
as `class` and `type`.
|
||||
|
||||
* `with_name`
|
||||
|
||||
When the tag is a principal tag (`main` property set): only really add a new
|
||||
row, if there is any name tag found (a reference tag is not sufficient, see
|
||||
below).
|
||||
|
||||
* `with_name_key`
|
||||
|
||||
When the tag is a principal tag (`main` property set): only really add a new
|
||||
row, if there is also a name tag that matches the key of the principal tag.
|
||||
For example, if the main tag is `bridge=yes`, then it will only be added as
|
||||
an extra row, if there is a tag `bridge:name[:XXX]` for the same object.
|
||||
If this property is set, all other names that are not domain-specific are
|
||||
ignored.
|
||||
|
||||
* `fallback`
|
||||
|
||||
When the tag is a principal tag (`main` property set): only really add a new
|
||||
row, when no other principal tags for this object have been found. Only one
|
||||
fallback tag can win for an object.
|
||||
|
||||
* `operator`
|
||||
|
||||
When the tag is a principal tag (`main` property set): also include the
|
||||
`operator` tag in the list of names. This is a special construct for an
|
||||
out-dated tagging practise in OSM. Fuel stations and chain restaurants
|
||||
in particular used to have the name of the chain tagged as `operator`.
|
||||
These days the chain can be more commonly found in the `brand` tag but
|
||||
there is still enough old data around to warrant this special case.
|
||||
|
||||
* `name`
|
||||
|
||||
Add tag to the list of names.
|
||||
|
||||
* `ref`
|
||||
|
||||
Add tag to the list of names as a reference. At the moment this only means
|
||||
that the object is not considered to be named for `with_name`.
|
||||
|
||||
* `address`
|
||||
|
||||
At tag to the list of address tags. If the tag starts with `addr:` or
|
||||
`is_in:`, then this prefix is cut off before adding it to the list.
|
||||
|
||||
* `postcode`
|
||||
|
||||
At the value as a postcode to the address tags. If multiple tags are
|
||||
candidate for postcodes, one wins out and the others are dropped.
|
||||
|
||||
* `country`
|
||||
|
||||
At the value as a country code to the address tags. The value must be a
|
||||
two letter country code, otherwise it is ignored. If there are multiple
|
||||
tags that match, then one wins out and the others are dropped.
|
||||
|
||||
* `house`
|
||||
|
||||
If no principle tags can be found for the object, still add the object with
|
||||
`class`=`place` and `type`=`house`. Use this for address nodes that have no
|
||||
other function.
|
||||
|
||||
* `interpolation`
|
||||
|
||||
Add this object as an address interpolation (appears as `class`=`place` and
|
||||
`type`=`houses` in the database).
|
||||
|
||||
* `extra`
|
||||
|
||||
Add tag to the list of extra tags.
|
||||
|
||||
* `skip`
|
||||
|
||||
Skip the tag completely. Useful when a custom default fallback is defined
|
||||
or to define exceptions to rules.
|
||||
|
||||
A rule can define as many of these properties for one match as it likes. For
|
||||
example, if the property is `"main,extra"` then the tag will open a new row
|
||||
but also have the tag appear in the list of extra tags.
|
||||
|
||||
There are a number of pre-defined styles in the `settings/` directory. It is
|
||||
advisable to start from one of these styles when defining your own.
|
||||
|
||||
### Changing the Style of Existing Databases
|
||||
|
||||
There is normally no issue changing the style of a database that is already
|
||||
imported and now kept up-to-date with change files. Just be aware that any
|
||||
change in the style applies to updates only. If you want to change the data
|
||||
that is already in the database, then a reimport is necessary.
|
||||
@ -20,6 +20,7 @@ pages:
|
||||
- 'Troubleshooting' : 'admin/Faq.md'
|
||||
- 'Developers Guide':
|
||||
- 'Overview' : 'develop/overview.md'
|
||||
- 'OSM Data Import' : 'develop/Import.md'
|
||||
- 'Place Ranking' : 'develop/Ranking.md'
|
||||
- 'External Data Sources':
|
||||
- 'Overview' : 'data-sources/overview.md'
|
||||
|
||||
@ -10,7 +10,7 @@ class SetupFunctions
|
||||
protected $iInstances;
|
||||
protected $sModulePath;
|
||||
protected $aDSNInfo;
|
||||
protected $sVerbose;
|
||||
protected $bVerbose;
|
||||
protected $sIgnoreErrors;
|
||||
protected $bEnableDiffUpdates;
|
||||
protected $bEnableDebugStatements;
|
||||
@ -46,7 +46,7 @@ class SetupFunctions
|
||||
}
|
||||
|
||||
// setting member variables based on command line options stored in $aCMDResult
|
||||
$this->sVerbose = $aCMDResult['verbose'];
|
||||
$this->bVerbose = $aCMDResult['verbose'];
|
||||
|
||||
//setting default values which are not set by the update.php array
|
||||
if (isset($aCMDResult['ignore-errors'])) {
|
||||
@ -189,6 +189,8 @@ class SetupFunctions
|
||||
fail("osm2pgsql not found in '$osm2pgsql'");
|
||||
}
|
||||
|
||||
$osm2pgsql .= ' -S '.CONST_Import_Style;
|
||||
|
||||
if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
|
||||
$osm2pgsql .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
|
||||
}
|
||||
@ -405,7 +407,7 @@ class SetupFunctions
|
||||
$sSQL .= " and not (class='place' and type='houses' and osm_type='W'";
|
||||
$sSQL .= " and ST_GeometryType(geometry) = 'ST_LineString')";
|
||||
$sSQL .= ' and ST_IsValid(geometry)';
|
||||
if ($this->sVerbose) echo "$sSQL\n";
|
||||
if ($this->bVerbose) echo "$sSQL\n";
|
||||
if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) {
|
||||
fail(pg_last_error($aDBInstances[$i]->connection));
|
||||
}
|
||||
@ -417,7 +419,7 @@ class SetupFunctions
|
||||
$sSQL .= ' (osm_id, address, linegeo)';
|
||||
$sSQL .= ' SELECT osm_id, address, geometry from place where ';
|
||||
$sSQL .= "class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString'";
|
||||
if ($this->sVerbose) echo "$sSQL\n";
|
||||
if ($this->bVerbose) echo "$sSQL\n";
|
||||
if (!pg_send_query($aDBInstances[$iLoadThreads]->connection, $sSQL)) {
|
||||
fail(pg_last_error($aDBInstances[$iLoadThreads]->connection));
|
||||
}
|
||||
@ -708,7 +710,7 @@ class SetupFunctions
|
||||
if (!$bFound) array_push($aDropTables, $sTable);
|
||||
}
|
||||
foreach ($aDropTables as $sDrop) {
|
||||
if ($this->sVerbose) echo "Dropping table $sDrop\n";
|
||||
if ($this->bVerbose) echo "Dropping table $sDrop\n";
|
||||
@pg_query($this->oDB->connection, "DROP TABLE $sDrop CASCADE");
|
||||
// ignore warnings/errors as they might be caused by a table having
|
||||
// been deleted already by CASCADE
|
||||
@ -716,7 +718,7 @@ class SetupFunctions
|
||||
|
||||
if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
|
||||
if (file_exists(CONST_Osm2pgsql_Flatnode_File)) {
|
||||
if ($this->sVerbose) echo 'Deleting '.CONST_Osm2pgsql_Flatnode_File."\n";
|
||||
if ($this->bVerbose) echo 'Deleting '.CONST_Osm2pgsql_Flatnode_File."\n";
|
||||
unlink(CONST_Osm2pgsql_Flatnode_File);
|
||||
}
|
||||
}
|
||||
@ -740,7 +742,7 @@ class SetupFunctions
|
||||
runSQLScript(
|
||||
$sScript,
|
||||
$bfatal,
|
||||
$this->sVerbose,
|
||||
$this->bVerbose,
|
||||
$this->sIgnoreErrors
|
||||
);
|
||||
}
|
||||
@ -794,7 +796,7 @@ class SetupFunctions
|
||||
if (!file_exists($sFilename)) fail('unable to find '.$sFilename);
|
||||
|
||||
$sCMD = 'psql -p '.$this->aDSNInfo['port'].' -d '.$this->aDSNInfo['database'];
|
||||
if (!$this->sVerbose) {
|
||||
if (!$this->bVerbose) {
|
||||
$sCMD .= ' -q';
|
||||
}
|
||||
if (isset($this->aDSNInfo['hostspec'])) {
|
||||
@ -857,6 +859,10 @@ class SetupFunctions
|
||||
|
||||
private function runWithPgEnv($sCmd)
|
||||
{
|
||||
if ($this->bVerbose) {
|
||||
echo "Execute: $sCmd\n";
|
||||
}
|
||||
|
||||
$aProcEnv = null;
|
||||
|
||||
if (isset($this->aDSNInfo['password'])) {
|
||||
|
||||
@ -1 +1 @@
|
||||
Subproject commit 433ad388b88d74235e9fc4dd12fa608719b32904
|
||||
Subproject commit 56c8f56b43e1464361d535eeb61e2335d1d983e4
|
||||
@ -51,6 +51,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
|
||||
@define('CONST_Wikipedia_Data_Path', CONST_ExtraDataPath);
|
||||
@define('CONST_Phrase_Config', CONST_BasePath.'/settings/phrase_settings.php');
|
||||
@define('CONST_Address_Level_Config', CONST_BasePath.'/settings/address-levels.json');
|
||||
@define('CONST_Import_Style', CONST_BasePath.'/settings/import-full.style');
|
||||
|
||||
// osm2pgsql settings
|
||||
@define('CONST_Osm2pgsql_Flatnode_File', null);
|
||||
|
||||
116
settings/import-address.style
Normal file
116
settings/import-address.style
Normal file
@ -0,0 +1,116 @@
|
||||
[
|
||||
{
|
||||
"keys" : [ "" ],
|
||||
"values" : {
|
||||
"no" : "skip"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["name:prefix", "name:suffix", "name:botanical", "*wikidata"],
|
||||
"values" : {
|
||||
"" : "skip"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["ref", "int_ref", "nat_ref", "reg_ref", "loc_ref", "old_ref",
|
||||
"iata", "icao", "pcode"],
|
||||
"values" : {
|
||||
"" : "ref"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["name", "name:*", "int_name", "int_name:*", "nat_name", "nat_name:*",
|
||||
"reg_name", "reg_name:*", "loc_name", "loc_name:*",
|
||||
"old_name", "old_name:*", "alt_name", "alt_name:*", "alt_name_*",
|
||||
"official_name", "official_name:*", "place_name", "place_name:*",
|
||||
"short_name", "short_name:*", "brand"],
|
||||
"values" : {
|
||||
"" : "name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["landuse"],
|
||||
"values" : {
|
||||
"cemetry" : "skip",
|
||||
"" : "fallback,with_name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["boundary"],
|
||||
"values" : {
|
||||
"administrative" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["place"],
|
||||
"values" : {
|
||||
"" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["addr:housename"],
|
||||
"values" : {
|
||||
"" : "name,house"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["addr:housenumber", "addr:conscriptionnumber", "addr:streetnumber"],
|
||||
"values" : {
|
||||
"" : "address,house"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["addr:interpolation"],
|
||||
"values" : {
|
||||
"" : "interpolation,address"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["postal_code", "postcode", "addr:postcode",
|
||||
"tiger:zip_left", "tiger:zip_right"],
|
||||
"values" : {
|
||||
"" : "postcode,fallback"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
|
||||
"addr:country", "addr:country", "addr:country_code"],
|
||||
"values" : {
|
||||
"" : "country"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["addr:*", "is_in:*", "tiger:county"],
|
||||
"values" : {
|
||||
"" : "address"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["highway"],
|
||||
"values" : {
|
||||
"motorway" : "main",
|
||||
"trunk" : "main",
|
||||
"primary" : "main",
|
||||
"secondary" : "main",
|
||||
"tertiary" : "main",
|
||||
"unclassified" : "main",
|
||||
"residential" : "main",
|
||||
"living_street" : "main",
|
||||
"pedestrian" : "main",
|
||||
"road" : "main",
|
||||
"service" : "main,with_name",
|
||||
"cycleway" : "main,with_name",
|
||||
"path" : "main,with_name",
|
||||
"footway" : "main,with_name",
|
||||
"steps" : "main,with_name",
|
||||
"bridleway" : "main,with_name",
|
||||
"track" : "main,with_name",
|
||||
"byway": "main,with_name",
|
||||
"motorway_link" : "main,with_name",
|
||||
"trunk_link" : "main,with_name",
|
||||
"primary_link" : "main,with_name",
|
||||
"secondary_link" : "main,with_name",
|
||||
"tertiary_link" : "main,with_name"
|
||||
}
|
||||
}
|
||||
]
|
||||
70
settings/import-admin.style
Normal file
70
settings/import-admin.style
Normal file
@ -0,0 +1,70 @@
|
||||
[
|
||||
{
|
||||
"keys" : ["name:prefix", "name:suffix", "name:botanical", "*wikidata"],
|
||||
"values" : {
|
||||
"" : "skip"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["ref", "int_ref", "nat_ref", "reg_ref", "loc_ref", "old_ref",
|
||||
"iata", "icao", "pcode"],
|
||||
"values" : {
|
||||
"" : "ref"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["name", "name:*", "int_name", "int_name:*", "nat_name", "nat_name:*",
|
||||
"reg_name", "reg_name:*", "loc_name", "loc_name:*",
|
||||
"old_name", "old_name:*", "alt_name", "alt_name:*", "alt_name_*",
|
||||
"official_name", "official_name:*", "place_name", "place_name:*",
|
||||
"short_name", "short_name:*", "brand"],
|
||||
"values" : {
|
||||
"" : "name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["landuse"],
|
||||
"values" : {
|
||||
"cemetry" : "skip",
|
||||
"" : "fallback,with_name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["boundary"],
|
||||
"values" : {
|
||||
"administrative" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["place"],
|
||||
"values" : {
|
||||
"" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
|
||||
"addr:country", "addr:country", "addr:country_code"],
|
||||
"values" : {
|
||||
"" : "country"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["addr:*", "is_in:*", "tiger:county"],
|
||||
"values" : {
|
||||
"" : "address"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["postal_code", "postcode", "addr:postcode",
|
||||
"tiger:zip_left", "tiger:zip_right"],
|
||||
"values" : {
|
||||
"" : "postcode"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["capital"],
|
||||
"values" : {
|
||||
"" : "extra"
|
||||
}
|
||||
}
|
||||
]
|
||||
239
settings/import-full.style
Normal file
239
settings/import-full.style
Normal file
@ -0,0 +1,239 @@
|
||||
[
|
||||
{
|
||||
"keys" : ["*source"],
|
||||
"values" : {
|
||||
"" : "skip"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["name:prefix", "name:suffix", "name:botanical", "wikidata",
|
||||
"*:wikidata"],
|
||||
"values" : {
|
||||
"" : "extra"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["ref", "int_ref", "nat_ref", "reg_ref", "loc_ref", "old_ref",
|
||||
"iata", "icao", "pcode", "pcode:*"],
|
||||
"values" : {
|
||||
"" : "ref"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["name", "name:*", "int_name", "int_name:*", "nat_name", "nat_name:*",
|
||||
"reg_name", "reg_name:*", "loc_name", "loc_name:*",
|
||||
"old_name", "old_name:*", "alt_name", "alt_name:*", "alt_name_*",
|
||||
"official_name", "official_name:*", "place_name", "place_name:*",
|
||||
"short_name", "short_name:*", "brand"],
|
||||
"values" : {
|
||||
"" : "name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["addr:housename"],
|
||||
"values" : {
|
||||
"" : "name,house"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["emergency"],
|
||||
"values" : {
|
||||
"fire_hydrant" : "skip",
|
||||
"yes" : "skip",
|
||||
"no" : "skip",
|
||||
"" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["historic", "military"],
|
||||
"values" : {
|
||||
"no" : "skip",
|
||||
"yes" : "skip",
|
||||
"" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["natural"],
|
||||
"values" : {
|
||||
"yes" : "skip",
|
||||
"no" : "skip",
|
||||
"coastline" : "skip",
|
||||
"" : "main,with_name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["landuse"],
|
||||
"values" : {
|
||||
"cemetry" : "main,with_name",
|
||||
"" : "main,fallback,with_name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["highway"],
|
||||
"values" : {
|
||||
"no" : "skip",
|
||||
"turning_circle" : "skip",
|
||||
"mini_roundabout" : "skip",
|
||||
"noexit" : "skip",
|
||||
"crossing" : "skip",
|
||||
"traffic_signals" : "main,with_name",
|
||||
"service" : "main,with_name",
|
||||
"cycleway" : "main,with_name",
|
||||
"path" : "main,with_name",
|
||||
"footway" : "main,with_name",
|
||||
"steps" : "main,with_name",
|
||||
"bridleway" : "main,with_name",
|
||||
"track" : "main,with_name",
|
||||
"byway": "main,with_name",
|
||||
"motorway_link" : "main,with_name",
|
||||
"trunk_link" : "main,with_name",
|
||||
"primary_link" : "main,with_name",
|
||||
"secondary_link" : "main,with_name",
|
||||
"tertiary_link" : "main,with_name",
|
||||
"" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["railway"],
|
||||
"values" : {
|
||||
"level_crossing" : "skip",
|
||||
"no" : "skip",
|
||||
"" : "main,with_name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["man_made"],
|
||||
"values" : {
|
||||
"survey_point" : "skip",
|
||||
"cutline" : "skip",
|
||||
"" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["aerialway"],
|
||||
"values" : {
|
||||
"pylon" : "skip",
|
||||
"no" : "skip",
|
||||
"" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["boundary"],
|
||||
"values" : {
|
||||
"" : "main,with_name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["amenity"],
|
||||
"values" : {
|
||||
"restaurant" : "main,operator",
|
||||
"fuel" : "main,operator"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["aeroway", "amenity", "club", "craft", "leisure",
|
||||
"office", "mountain_pass"],
|
||||
"values" : {
|
||||
"no" : "skip",
|
||||
"" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["shop"],
|
||||
"values" : {
|
||||
"no" : "skip",
|
||||
"" : "main,operator"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["tourism"],
|
||||
"values" : {
|
||||
"yes" : "skip",
|
||||
"no" : "skip",
|
||||
"" : "main,operator"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["bridge", "tunnel"],
|
||||
"values" : {
|
||||
"" : "main,with_name_key"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["waterway"],
|
||||
"values" : {
|
||||
"riverbank" : "skip",
|
||||
"" : "main,with_name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["place"],
|
||||
"values" : {
|
||||
"" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["junction"],
|
||||
"values" : {
|
||||
"" : "main,fallback,with_name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["postal_code", "postcode", "addr:postcode",
|
||||
"tiger:zip_left", "tiger:zip_right"],
|
||||
"values" : {
|
||||
"" : "postcode,fallback"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
|
||||
"addr:country", "addr:country", "addr:country_code"],
|
||||
"values" : {
|
||||
"" : "country"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["addr:housenumber", "addr:conscriptionnumber", "addr:streetnumber"],
|
||||
"values" : {
|
||||
"" : "address,house"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["addr:interpolation"],
|
||||
"values" : {
|
||||
"" : "interpolation,address"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["addr:*", "is_in:*", "tiger:county", "is_in"],
|
||||
"values" : {
|
||||
"" : "address"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["building"],
|
||||
"values" : {
|
||||
"no" : "skip",
|
||||
"" : "main,fallback,with_name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["tracktype", "traffic_calming", "service", "cuisine", "capital",
|
||||
"dispensing", "religion", "denomination", "sport",
|
||||
"internet_access", "lanes", "surface", "smoothness", "width",
|
||||
"est_width", "incline", "opening_hours", "collection_times",
|
||||
"service_times", "disused", "wheelchair", "sac_scale",
|
||||
"trail_visibility", "mtb:scale", "mtb:description", "wood",
|
||||
"drive_through", "drive_in", "access", "vehicle", "bicyle",
|
||||
"foot", "goods", "hgv", "motor_vehicle", "motor_car", "oneway",
|
||||
"date_on", "date_off", "day_on", "day_off", "hour_on", "hour_off",
|
||||
"maxweight", "maxheight", "maxspeed", "fee", "toll", "charge",
|
||||
"population", "description", "image", "attribution", "fax",
|
||||
"email", "url", "website", "phone", "real_ale", "smoking",
|
||||
"food", "camera", "brewery", "locality", "wikipedia",
|
||||
"wikipedia:*", "access:*", "contact:*", "drink:*", "toll:*"],
|
||||
"values" : {
|
||||
"" : "extra"
|
||||
}
|
||||
}
|
||||
]
|
||||
85
settings/import-street.style
Normal file
85
settings/import-street.style
Normal file
@ -0,0 +1,85 @@
|
||||
[
|
||||
{
|
||||
"keys" : ["name:prefix", "name:suffix", "name:botanical", "*wikidata"],
|
||||
"values" : {
|
||||
"" : "skip"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["ref", "int_ref", "nat_ref", "reg_ref", "loc_ref", "old_ref",
|
||||
"iata", "icao", "pcode"],
|
||||
"values" : {
|
||||
"" : "ref"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["name", "name:*", "int_name", "int_name:*", "nat_name", "nat_name:*",
|
||||
"reg_name", "reg_name:*", "loc_name", "loc_name:*",
|
||||
"old_name", "old_name:*", "alt_name", "alt_name:*", "alt_name_*",
|
||||
"official_name", "official_name:*", "place_name", "place_name:*",
|
||||
"short_name", "short_name:*", "brand"],
|
||||
"values" : {
|
||||
"" : "name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["landuse"],
|
||||
"values" : {
|
||||
"cemetry" : "skip",
|
||||
"" : "fallback,with_name"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["boundary"],
|
||||
"values" : {
|
||||
"administrative" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["place"],
|
||||
"values" : {
|
||||
"" : "main"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["country_code", "ISO3166-1", "is_in:country_code", "is_in_country",
|
||||
"addr:country", "addr:country", "addr:country_code"],
|
||||
"values" : {
|
||||
"" : "country"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["addr:*", "is_in:*", "tiger:county"],
|
||||
"values" : {
|
||||
"" : "address"
|
||||
}
|
||||
},
|
||||
{
|
||||
"keys" : ["highway"],
|
||||
"values" : {
|
||||
"motorway" : "main",
|
||||
"trunk" : "main",
|
||||
"primary" : "main",
|
||||
"secondary" : "main",
|
||||
"tertiary" : "main",
|
||||
"unclassified" : "main",
|
||||
"residential" : "main",
|
||||
"living_street" : "main",
|
||||
"pedestrian" : "main",
|
||||
"road" : "main",
|
||||
"service" : "main,with_name",
|
||||
"cycleway" : "main,with_name",
|
||||
"path" : "main,with_name",
|
||||
"footway" : "main,with_name",
|
||||
"steps" : "main,with_name",
|
||||
"bridleway" : "main,with_name",
|
||||
"track" : "main,with_name",
|
||||
"byway": "main,with_name",
|
||||
"motorway_link" : "main,with_name",
|
||||
"trunk_link" : "main,with_name",
|
||||
"primary_link" : "main,with_name",
|
||||
"secondary_link" : "main,with_name",
|
||||
"tertiary_link" : "main,with_name"
|
||||
}
|
||||
}
|
||||
]
|
||||
@ -231,14 +231,6 @@ Feature: Tag evaluation
|
||||
| boundary | administrative |
|
||||
| waterway | stream |
|
||||
|
||||
Scenario: Footways are not included if they are sidewalks
|
||||
When loading osm data
|
||||
"""
|
||||
n2 Thighway=footway,name=To%20%Hell,footway=sidewalk
|
||||
n23 Thighway=footway,name=x
|
||||
"""
|
||||
Then place has no entry for N2
|
||||
|
||||
Scenario: named junctions are included if there is no other tag
|
||||
When loading osm data
|
||||
"""
|
||||
@ -538,9 +530,9 @@ Feature: Tag evaluation
|
||||
Then place contains
|
||||
| object | class | type |
|
||||
| N10 | tourism | hotel |
|
||||
| N12 | building| yes |
|
||||
| N12 | building| shed |
|
||||
| N13 | building| yes |
|
||||
| N14 | building| yes |
|
||||
| N14 | place | postcode |
|
||||
And place has no entry for N10:building
|
||||
And place has no entry for N11
|
||||
|
||||
@ -552,3 +544,20 @@ Feature: Tag evaluation
|
||||
Then place contains
|
||||
| object | class | type | address |
|
||||
| N290393920 | place | house| 'city' : 'Perpignan', 'country' : 'FR', 'housenumber' : '43\\', 'postcode' : '66000', 'street' : 'Rue Pierre Constant d`Ivry' |
|
||||
|
||||
Scenario: odd interpolation
|
||||
When loading osm data
|
||||
"""
|
||||
n4 Taddr:housenumber=3 x0 y0
|
||||
n5 Taddr:housenumber=15 x0 y0.00001
|
||||
w12 Taddr:interpolation=odd Nn4,n5
|
||||
w13 Taddr:interpolation=even Nn4,n5
|
||||
w14 Taddr:interpolation=-3 Nn4,n5
|
||||
"""
|
||||
Then place contains
|
||||
| object | class | type | address |
|
||||
| N4 | place | house | 'housenumber' : '3' |
|
||||
| N5 | place | house | 'housenumber' : '15' |
|
||||
| W12 | place | houses | 'interpolation' : 'odd' |
|
||||
| W13 | place | houses | 'interpolation' : 'even' |
|
||||
| W14 | place | houses | 'interpolation' : '-3' |
|
||||
|
||||
@ -63,7 +63,7 @@ if ($iCacheMemory + 500 > getTotalMemoryMB()) {
|
||||
$iCacheMemory = getCacheMemoryMB();
|
||||
echo "WARNING: resetting cache memory to $iCacheMemory\n";
|
||||
}
|
||||
$sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
|
||||
$sOsm2pgsqlCmd = CONST_Osm2pgsql_Binary.' -klas --number-processes 1 -C '.$iCacheMemory.' -O gazetteer -S '.CONST_Import_Style.' -d '.$aDSNInfo['database'].' -P '.$aDSNInfo['port'];
|
||||
if (isset($aDSNInfo['username']) && $aDSNInfo['username']) {
|
||||
$sOsm2pgsqlCmd .= ' -U ' . $aDSNInfo['username'];
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user