87 Commits

Author SHA1 Message Date
Frédéric Rodrigo
9bb17792a6
Remove alignment of AS in SQL and few others (#932)
* Remove alignment of AS in SQL

* Remove alignment of CREATE TABLE in SQL
2020-07-22 13:48:25 +02:00
Yuri Astrakhan
2b95d1cffa
Fix & optimize incorrect function declarations (#918)
* All functions that access database must be declared as `STABLE`, not `IMMUTABLE` -- because database can change at any moment, e.g. during an update
* there are a few functions that could be made `STRICT` -- passing `NULL` as a parameter will always result in a `NULL`, but for some reason that causes a significant decrease in perf.
* tagged one function as parallel safe

NOTE: somehow `ST_AsMVT()` method of tile generation is showing 70-90% slowdown with this patch. I am not sure of why this is happening. If the reason is the `IMMUTABLE` -> `STABLE` change, we may have to dig deeper into PG optimization
2020-06-17 12:15:26 -04:00
Yuri Astrakhan
6457419e0d
NOOP: Format all layer's SQL code (#917)
I would like to reformat all of our SQL to have a concise coding style.
This makes it far easier to understand the code for a casual contributor,
and lets us spot errors more easily.

Most importantly, it makes it much easier to grep (search) the code because it is more likely to be in the same syntax

Some key changes:
* SQL keywords are always UPPERCASE, e.g. `SELECT WHEN AS END ...`
* types, variables, aliases, and field names (identifiers) are always lower case
* `LANGUAGE 'plpgsql'` is now `LANGUAGE plpgsql` (no quotes)
* a few minor spacing/semicolon cleanups

P.S. Per @TomPohys request, `TABLE` is spelled using upper case despite being a type for consistency with PG Docs. Same for `LANGUAGE SQL` vs `LANGUAGE plpgsql`.
2020-06-08 12:19:55 -04:00
Yuri Astrakhan
2edbbfa1a0 Updated etl diagrams from latest tools
* gets rid of duplicate connecting lines in etl graphs
2020-02-14 16:22:48 -05:00
Jorge Sanz
ace759590e
Parallel capability to layer functions (#728)
This PR allows queries to be parallelized on recent versions of Postgres. The `PARALLEL SAFE` modifier has been added to the layer functions and a PLPGSQL function to convert strings into number has been replaced.

`PARALLEL SAFE` is a modifier for `CREATE FUNCTION` available since Postgres 9.6, so this change does not break current OpenMapTiles supported database version. More details about this topic [here](https://www.postgresql.org/docs/current/parallel-safety.html) and at the reference documentation for [`CREATE FUNCTION`](https://www.postgresql.org/docs/current/sql-createfunction.html).

### Testing procedure

The procedure to test this was:

* Imported `spain.pbf` in a clean environment
* Dumped the OpenMapTiles database from the Postgres Docker image
* Created a clean Postgres 12 database using the default Docker image
* Installed `postgis` 3 from the default Debian package and `osml10n` 2.5.8 from the repository (`make`, etc.)
* Restored the dump
* Lowered the postgres planner parameters for triggering parallel plans:
```sql
set parallel_setup_cost = 5;
set parallel_tuple_cost = 0.005;
```
* Manually added the `PARALLEL SAFE` modifier to each function involved in layer queries (not on updates or inserting functions).
* For each layer, run a testing query to confirm parallel workers were created, something like this:
```sql
explain analyze 
select * from layer_aerodrome_label(tilebbox(8,128,95),10,null)
union all
select * from layer_aerodrome_label(tilebbox(8,128,97),10,null);
```
* After all the layers were processed and confirmed to start parallel executions, a more complete example was run. This example just retrieves the geometries for all the layers from the same tile but without using any MVT related function.

<details><summary>Testing query</summary>

```sql
-- Using the function layer_landuse
explain analyze 
select geometry from layer_water(tilebbox(14,8020,6178),14)
union all
select geometry from layer_waterway(tilebbox(14,8020,6178),14)
union all
select geometry from layer_landcover(tilebbox(14,8020,6178),14)
union all
select geometry from layer_landuse(tilebbox(14,8020,6178),14)
union all
select geometry from layer_mountain_peak(tilebbox(14,8020,6178),14)
union all
select geometry from layer_park(tilebbox(14,8020,6178),14)
union all
select geometry from layer_boundary(tilebbox(14,8020,6178),14)
union all
select geometry from layer_aeroway(tilebbox(14,8020,6178),14)
union all
select geometry from layer_transportation(tilebbox(14,8020,6178),14)
union all
select geometry from layer_building(tilebbox(14,8020,6178),14)
union all
select geometry from layer_water_name(tilebbox(14,8020,6178),14)
union all
select geometry from layer_transportation_name(tilebbox(14,8020,6178),14)
union all
select geometry from layer_place(tilebbox(14,8020,6178),14)
union all
select geometry from layer_housenumber(tilebbox(14,8020,6178),14)
union all
select geometry from layer_poi(tilebbox(14,8020,6178),14)
union all
select geometry from layer_aerodrome_label(tilebbox(14,8020,6178),14);
```
</details>

You can inspect the execution plan and results on [this page](https://explain.dalibo.com/plan/3z). Also [attaching](https://github.com/openmaptiles/openmaptiles/files/3951822/explain-tile-simple.tar.gz) the query and JSON output for future reference. The website gives a ton of details, but you may want to search for nodes mentioning `workers` or `parallel` like in this area referring to `osm_border` or `osm_aeroway_linestring` entities

![image](https://user-images.githubusercontent.com/188264/70647153-9cac9300-1c48-11ea-96ea-ac7a1e2f4a79.png)

### Next steps

Since the execution plan is not showing a parallel append at the top level, meaning it's not running each layer individually, I want to continue experimenting with parameters and queries to see if it's possible to even parallelize more the request.

I will post my finding here, even no change in the code should happen.


cc. @nyurik

Co-authored-by: Yuri Astrakhan <yuriastrakhan@gmail.com>
2020-01-31 19:36:02 -05:00
Yuri Astrakhan
9d6dbfc64f
Use one pass docs image generation (#751)
quicker and cleaner diagram image generation.
Remove etl-graph and mapping-graph targets - redundant

Also, the obsolete "fields" is still in Imposm's code and both names are accepted,
but "fields" is not documented anywhere (PR submitted), and could be removed at any moment.

Our docs were not supporting it until this PR, so renaming it at the same time.

Several images have been updated due to a more inclusive mapping scan
Requires https://github.com/openmaptiles/openmaptiles-tools/pull/147 (merged)
2020-01-22 21:55:22 -05:00
Yuri Astrakhan
c9e7ad90c6
Remove unneeded "else null" in conditions (#732)
Minor code cleanup:
SQL already returns NULL in the "WHEN" condition
if it is not matched by any of the cases.

Co-authored-by: Eva Jelinkova <evka.jelinkova@gmail.com>
2020-01-22 17:24:28 -05:00
Eva J
90c4854184 removing webmerc_area 2019-11-19 16:36:00 +01:00
Yuri Astrakhan
eca13f9bed
Refreshed all diagrams, fixed automation & 2 broken graphs (#692)
Seems like etl and mapping diagrams have been neglected
for a long time. Now it regenerates the files and places
them in the source dir.

This PR also fixes two broken files:
* layers/aerodrome_label/mapping_diagram.png
* layers/housenumber/mapping_diagram.png

They were generated using the newest tools version with the fix
https://github.com/openmaptiles/openmaptiles-tools/pull/65
2019-10-26 21:28:43 -04:00
jirik
00d88a103c Revert back to NE 4.0.0
See https://github.com/openmaptiles/openmaptiles/issues/365#issuecomment-442823991
2018-11-30 15:32:26 +01:00
jirik
8d591a59aa Wrap place UNIONs into one SELECT to sppeed up rendering 2018-11-30 15:32:26 +01:00
jirik
9d07350ac4 Prefer to join NE countries by Wikidata ID 2018-11-12 12:37:15 +01:00
jirik
3cee3c7f80 Update diagrams 2017-12-04 12:06:28 +01:00
jirik
919686b6c9 Fix missing cities with diacritics at Z6 2017-12-04 11:02:04 +01:00
jirik
a380f358fe Add osm_id as key of places 2017-12-04 10:53:26 +01:00
jirik
9c7a3aeb36 Add ISO 3166-1 alpha-2 country codes as iso_a2 attribute
Fix #306
2017-11-20 15:49:08 +01:00
jirik
2097b2c31b Compute rank also for tiny countries 2017-11-20 15:49:08 +01:00
jirik
b88b34c98d Set rank of countries with limited recognition to 6 2017-11-20 15:49:08 +01:00
jirik
30539e78d1 Fix rank of archipelago countries
Fix #342
2017-11-20 10:51:32 +01:00
antoine-de
2ddbc8b1c1 update the layers from natural earth latest data
Natural earth has released new data and now some sql query are invalid

should fix #352

I don't really know how natural earth data versioning is maintained
though 😕
2017-11-17 13:55:02 +01:00
jirik
741be6d921 Import additional names from Wikidata 2017-11-16 09:03:41 +01:00
Jiri Kozel
1a324aaf22
Do not load all tags, use later imposm3 (#356)
Fix #266 #267
2017-11-10 15:25:23 +01:00
jirik
893918761c Fix SQL update logic (patch from 3.6.2) 2017-08-01 09:12:15 +02:00
stirringhalo
d166baf2d2 Increase city density 2017-06-16 21:55:08 -04:00
Jiri Kozel
51bc8fad35 Multilinguality (#279)
Improve multilinguality: names in 57 languages, name:latin, name:nonlatin, name_int. Fixes #211 #252 #80.

See #279 for more info.
2017-06-12 17:53:47 +02:00
Jiri Kozel
3e6495a134 Import both area and webmerc_area, use area for filtering (#198) 2017-03-24 16:46:21 +01:00
jirik
75f76ab935 Increase buffer of place and water_name to 256 2017-03-21 15:30:44 +01:00
jirik
038d4d5224 Add name_de to documentation 2017-03-17 13:15:40 +01:00
jirik
4c6d30066d Add German names (name_de), unify English names (name_en) 2017-03-17 12:56:54 +01:00
Lukas Martinelli
a865d6c970 Merge branch 'master' into imposm3_filter_reject_require 2017-01-18 15:39:40 +01:00
Lukas Martinelli
5b430f4b83 Remove commented out code 2017-01-18 15:06:24 +01:00
Lukas Martinelli
d5350ee535 Correct rank query #123 2017-01-18 09:41:17 +01:00
Lukas Martinelli
16f9c56086 Merge pull request #137 from openmaptiles/use_webmercarea
Switch to webmercarea
2017-01-17 18:00:16 +01:00
stirringhalo
8273bfbb62 Switch to webmercarea 2017-01-17 09:45:58 -05:00
stirringhalo
153976735f ST_PointOnSurface instead of topoint 2017-01-17 09:03:40 -05:00
Lukas Martinelli
84219067cf Show countries earlier #123 2017-01-16 16:43:25 +01:00
Lukas Martinelli
2d586bb47a Merge pull request #131 from openmaptiles/trigger_tables_sql
Daily updates
2017-01-16 09:38:47 +01:00
ImreSamu
40884b9976 imposm3 mapping change to the new reject/require syntax 2017-01-07 14:55:08 +01:00
stirringhalo
cda3af9215 Change SELECT to PERFORM in function and drop triggers first 2017-01-06 20:33:43 -05:00
stirringhalo
9437a1b8d6 Make the sql rerunnable without error 2017-01-05 12:47:10 -05:00
Lukas Martinelli
f361d3d9fd Add better title to layer READMEs 2017-01-05 17:31:21 +01:00
Lukas Martinelli
8a9b1246d3 Link to openmaptiles.org for layer doc 2017-01-05 17:29:18 +01:00
Lukas Martinelli
6ff8fd7c20 Fix docs in landuse, place and poi 2017-01-05 16:46:11 +01:00
stirringhalo
c5f05e7c3a Functions and triggers for state, country and city ranks 2017-01-05 08:59:15 -05:00
stirringhalo
9573aca4f2 place island topoint function 2017-01-04 19:53:16 -05:00
ImreSamu
eb577a040a Fix #108 and #109 [ osm_city_point and natural earth merge ] 2016-12-31 18:17:24 +01:00
stirringhalo
bab5c3d4b6 Switch from geom to geometry 2016-12-20 22:32:34 -05:00
ImreSamu
eee999bba0 source code trim 2016-12-04 12:17:33 +01:00
ImreSamu
4e2d3ad8f6 fix osm_island_point zoom_level filter - for >z14 2016-12-04 12:11:08 +01:00
ImreSamu
e406537025 place etldoc enhancement 2016-12-04 12:09:10 +01:00