60 Commits

Author SHA1 Message Date
f3b680e143 Refined 2020-08-07 18:24:19 +02:00
029d755ea1 Added landuse for bicycle and motorcycle parkings, split up some POIs and added some (to be aligned with the iconset!) 2020-08-07 15:38:32 +02:00
bcb1c905c7 Revert "Testing addition of landuse.name"
This reverts commit 3994345d
2020-07-02 15:59:18 +02:00
3994345d27 Testing addition of landuse.name 2020-07-02 15:32:22 +02:00
566f4c47d5 Merge remote-tracking branch 'github/master'
# Conflicts:
#	Makefile
2020-07-01 15:18:59 +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
27984a8722 Attempt #1 at adding more details about landuse (like parking, religious buildings, sport-centre) 2020-05-31 20:04:13 +02:00
Ludovic Delauné
924ccd6015
remove useless sql selection (#752) 2020-03-13 15:14:30 -04: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
358939e912
etl graph update, add graph test to travis (#741)
* etl graph update

re-ran `make generate-devdoc` which updated landuse graph

* Add travis test to check docs are up to date
2019-12-16 08:37:34 -05:00
golubev
7f591ffebc update the 'layers/landuse/mapping_diagram.png' 2019-12-06 19:48:56 +02:00
golubev
1247972951 merge master into add-garages 2019-12-06 19:40:12 +02:00
Eva J
b62619c00c etl_diagram update 2019-11-27 12:50:24 +01:00
Eva J
60b4a4cebc removing ne_10m source 2019-11-27 11:51:15 +01:00
Eva Jelinkova
9bfdefca31
Merge pull request #708 from eva-j/637_webmerc_area
Removing webmerc_area field from mapping.yaml
2019-11-26 15:46:28 +01:00
Eva J
fcee8571fb adding waterway=dam 2019-11-20 18:05:07 +01:00
Eva J
90c4854184 removing webmerc_area 2019-11-19 16:36:00 +01:00
golubev
05e77f6870 merge master into add-garages 2019-11-04 13:12:34 +02: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
golubev
84689f6cd1 layers/landuse/mapping.yaml: add 'garages' 2019-09-20 13:00:21 +03:00
Eva J
7b6c4752e9 add leisure=track 2019-05-15 18:05:44 +02:00
Eva J
c320b92a4b place=suburb and place=neighbourhood added 2019-04-11 11:57:07 +02:00
jirik
5c67f2769e Add st_isvalid check to imposm3 generalized tables
Fix #386
2018-01-31 17:24:05 +01:00
jirik
2f151a833d Update landuse documentation & diagram 2018-01-12 15:43:33 +01:00
Noémie Lehuby
050051bce6 Add bus_station and zoo in landuse 2018-01-12 15:40:54 +01:00
nlehuby
940f70a415 Handle theme_park as a landuse 2018-01-12 15:40:54 +01:00
jirik
8e84f419d7 Add pitches and playgrounds to landuse 2017-11-08 14:05:34 +01:00
jirik
1b01399e1d Update diagrams 2017-06-12 18:13:09 +02:00
jirik
a68ccc42ee Adjust zres values for buildings,landcover and landuse
Decrease size of Belgium Z0-12 mbtiles from 63 MB to 38 MB
2017-05-22 19:03:44 +02:00
stirringhalo
90690d2a39 Switch to ZRes (#214) 2017-04-25 18:03:29 -04:00
Jiri Kozel
3e6495a134 Import both area and webmerc_area, use area for filtering (#198) 2017-03-24 16:46:21 +01:00
stirringhalo
8273bfbb62 Switch to webmercarea 2017-01-17 09:45:58 -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
bab5c3d4b6 Switch from geom to geometry 2016-12-20 22:32:34 -05:00
ImreSamu
f5ac3def5e etldoc fixes 2016-12-04 02:52:52 +01:00
Lukas Martinelli
d53575faa3 Merge pull request #62 from openmaptiles/feature/landuse-park-layer
Landuse, Landcover, Park Layer
2016-12-01 09:32:11 +01:00
Lukas Martinelli
5ec4f0766b Add zoom level range slots to landcover diagram 2016-12-01 08:29:34 +00:00
Lukas Martinelli
c1b1913c7c Fix wrong etl docs 2016-11-30 18:38:28 +00:00
Lukas Martinelli
1ef69a9fd8 Show residential from OSM on z9 2016-11-30 14:05:15 +00:00
Lukas Martinelli
915cd2bde3 Add possible values for landcover, landuse, park doc 2016-11-30 11:21:13 +00:00
Lukas Martinelli
4a902ca273 Extend docs for park, landuse, landcover 2016-11-30 09:32:25 +00:00
Lukas Martinelli
7ca0fc6646 Remove subclass for landuse 2016-11-30 09:32:14 +00:00
Lukas Martinelli
9ba6a0bb0f Fix missing column issues with landcover and landuse 2016-11-30 09:06:40 +00:00
Lukas Martinelli
6c4ac01dfb More intermediate zoom levels for residential 2016-11-29 14:00:32 +00:00
Lukas Martinelli
a98ede7ab2 Remove generated docs from repo 2016-11-29 11:07:29 +01:00
Lukas Martinelli
327bdc7313 Remove mappings from landcover and landuse 2016-11-28 19:16:00 +00:00