21 Commits

Author SHA1 Message Date
c38c7af17d feat: pre-2025 state 2025-06-10 20:34:00 +02:00
88dd860053 Merge github 2023-04-10 02:06:42 +02:00
91ec87bb49 Merge branch 'master' of https://github.com/openmaptiles/openmaptiles into merge-github
# Conflicts:
#	Makefile
#	QUICKSTART.md
#	docker-compose.yml
#	layers/boundary/mapping.yaml
#	layers/landuse/landuse.sql
#	layers/landuse/landuse.yaml
#	layers/landuse/mapping.yaml
#	layers/poi/mapping.yaml
#	layers/poi/poi.sql
#	layers/poi/poi.yaml
2023-04-09 20:39:41 +02:00
d5e05f07d4 Uncomitted changes 2023-04-09 20:01:38 +02:00
Brian Sperlongano
b4b897999d
Replace osmborder with imposm/SQL (#1213)
Fixes #1156
Fixes #810
Fixes #1228

This PR replaces `osmborder`, which is no longer maintained, with `imposm` mappings and SQL code to generate borders.  Key features that were moved into the imposm/SQL layer:
1. Grouping by `osm_id` and aggregating by lowest `admin_level` value so that there's only one copy of ways that are members of multiple relations.
2. Filtering out of point features in boundary relations (typically `admin_centre` and `label` roles).
3. Move disputed boundary detection logic into SQL.

This will increase the database size slightly because of the limits of what imposm can do, as some of the filtering is done in the SQL layer after importing, rather than being done in `osmborder`.
2021-09-29 11:08:55 +02:00
7a239b66cf [WIP] NUTS layer:
Municipalities, Provinces, Regions etc as linestrings (with polygons used in intermediate step) representing what is left/right of the border
2021-06-16 21:12:35 +02:00
Adam Laža
77f5d76e37
Refactor schema, one _gen_z view per zoom. (#1045)
* Refactor layer aeroway.

* Refactor layer boundary.

* Refactor layer landcover.

* Refactor layer landuse.

* Refactor layer park.

* Refactor layer transportation.

* Refactor layer water.

* Refactor layer waterway.

* Re-generate water* layers etl_diagrams.

* Regenerate etl_diagrams for waterway.

* Cast NULL to text.
2020-11-26 13:54:00 +01: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
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
Eva J
fee22d4eb9 adding disp. relations into z1-4 2019-12-11 12:05:42 +01:00
Eva J
0181513b1a 2 attributes, generalization in mapping, edit unions 2019-12-10 19:48:24 +01:00
Eva J
fd940684eb relation member values, diagrams 2019-12-10 08:49:54 +01:00
Eva J
a05228381a add relations with claimed_by 2019-12-07 12:18:06 +01:00
Adrien Matissart
6521981af8 Remove unused osm_boundary_linestring and boundary mapping 2018-01-12 15:11:14 +01:00
Adrien Matissart
756a848a5d Remove unused boundary generalized_tables 2018-01-12 15:11:14 +01:00
stirringhalo
90690d2a39 Switch to ZRes (#214) 2017-04-25 18:03:29 -04:00
Lukas Martinelli
5b430f4b83 Remove commented out code 2017-01-18 15:06:24 +01:00
ImreSamu
40884b9976 imposm3 mapping change to the new reject/require syntax 2017-01-07 14:55:08 +01:00
Lukas Martinelli
128d5a3adc Correct scaling of generalization for boundaries 2016-11-29 12:59:55 +00:00
ImreSamu
598c931e17 boundary ETL graph comments - only sql tables and views 2016-11-09 22:06:24 +01:00
lukasmartinelli
28fedcc021 Add imposm3 mapping for boundary 2016-10-10 19:29:50 +02:00