24 Commits

Author SHA1 Message Date
Tomas Pohanka
d709a51de6
Salt pond with class pond (#1645)
The salt pond is now under the class `lake`, this PR moves it into class `pond`.
2024-03-21 15:58:58 +01:00
Brian Sperlongano
8b5aa3273e
Add other river-like water area features to class=river (#1467)
Currently, river areas (`natural=water` + `water=river`) are rendered in the tiles as `class=river`.  However, canal, stream, ditch, and drain water areas are rendered as `class=lake`.  Since these types of objects are all flowing water, they should be grouped together into `class=river`, which allows for styles that render flowing water differently to do so on a consistent basis.
2023-01-14 13:36:02 +01:00
Brian Sperlongano
4d5fa84184
Add class=pond to the water layer (#1456)
This PR proposes to add a new class, "pond" to the water layer, which allows for a style to de-emphasize minor bodies of water (tagged `water=pond,basin,wastewater`) when compared to more significant objects tagged reservoir/lake.  This PR retains the default behavior of classifying a water body as a "lake" if more specific tagging is not added.
2023-01-06 08:44:11 +01:00
Tomas Pohanka
dae00f2604
Add missing requires NE tables to layers. (#1410)
Adding missing requires Natural Earth tables for layers.
2022-08-02 14:22:58 +02:00
Brian Sperlongano
5e51627895
Remove support for waterway=riverbank (#1405)
This PR removes support for `waterway=riverbank`.  Usage of waterway=riverbank has [declined to globally insignificant levels](https://taginfo.openstreetmap.org/tags/waterway=riverbank).

In other projects:
* Support for `waterway=riverbank` was removed from the iD editor in openstreetmap/iD#5591
* Removal of `waterway=riverbank` was tracked for JOSM in [JOSM ticket 21630](https://josm.openstreetmap.de/ticket/21630) and was completed in revision [18519](https://josm.openstreetmap.de/changeset/18519/josm)
* Removal of `waterway=riverbank` from openltmap (Lithuania vector map) occurred in [[1]](507f095b35)
2022-07-26 14:34:02 +02:00
Tomas Pohanka
5820534153
Add swimming pool to class attribute. (#1385)
This PR adds swimming pools as a class in the water layer. Until now all swimming pools were classified as `lake`.
2022-05-05 20:57:51 +02:00
Tomas Pohanka
51751b5b78
Add OSM ID to the lakes (#1383)
This PR adding OSM ID to the lakes

OSM lakes are used from zoom 6
From zoom 0 to zoom 5 are used Natural Earth lakes. 
  - There is a new joining mat. view (`match_osm_ne_id`) contains which Natural Earth ID should convert to OSM ID. This logic is used to keep a consistent ID between switching between NE (zooms 0 - 5) and OSM (zooms 6 - 12). For smaller areas (not the whole planet), where are not available OSM lakes, the NE lakes keep their NE ID.
  - There are also switch the final views to the mat. views - this should slightly increase performance (get rid of multipolygons).
  - FIX typo for zooms 0 - 3 (`lakes` instead of `lake`).
2022-05-05 14:26:57 +02:00
Brian Sperlongano
df6906b7b5
Remove unneeded waterway='' check (#1377)
This PR removes an unnecessary check in water.yml.

generated SQL before:
```
SELECT CASE
           WHEN waterway='riverbank' THEN 'river'
           WHEN "waterway" = 'dock' THEN 'dock'
           WHEN "water" = 'river'
               OR "waterway" = 'riverbank'
               THEN 'river'
           WHEN "waterway" = '' THEN 'lake'
           ELSE 'lake'
           END;
```

generated SQL after:
```
SELECT CASE
           WHEN waterway='riverbank' THEN 'river'
           WHEN "waterway" = 'dock' THEN 'dock'
           WHEN "water" = 'river'
               OR "waterway" = 'riverbank'
               THEN 'river'
           ELSE 'lake'
           END;
```

The `waterway=''` test is purely redundant because it returns the same value as the fall-through ELSE case: `lake`.
2022-04-25 13:42:01 +02:00
Falke Design
ebeafc65fa
Add requires.tables to <layer>.yaml (#1236)
**NOTE** this can only be merged after the next tools version is released.

Added required Postgres tables to the `<layer>.yaml` definition.
Close: #1220

PR of tools: https://github.com/openmaptiles/openmaptiles-tools/pull/370
2021-11-05 10:04:54 +01:00
Brian Sperlongano
d427d58e36
Water layer river mapping bug fixes (#1182)
This PR is a bugfix for the `water` layer.

* `waterway=stream`, `waterway=river`, `waterway=canal`, `waterway=ditch`, and `waterway=drain` are all linear features, not area features.  Thus, these objects are being unnecessarily mapped into the `osm_water_polygon` polygon table, and this PR removes these unneeded mappings.
* The combination `natural=water` + `water=river` is the most popular tagging for river areas.  However, the current mapping causes rivers tagged in this way to be rendered in the vector tiles as a `lake`.  This PR adds a check for the `water=river` tag and tags both variants of river areas as `class=river`.

`natural=water` + `water=river` river mapping:
![image](https://user-images.githubusercontent.com/3254090/129825551-388491de-549e-4843-80cc-01dba358c360.png)

`waterway=riverbank` river mapping:
![image](https://user-images.githubusercontent.com/3254090/129825618-4239eae7-a2bc-4a82-9931-fda2c02c2b40.png)


Lake mapping for a `natural=water` (with no other tagging):
![image](https://user-images.githubusercontent.com/3254090/129825554-9394b3d3-988a-4e92-a9f8-b198c695ec37.png)
2021-09-01 08:24:01 +02:00
zstadler
893d1df4c5
Update descritopn of the water layer's class (#1166)
Clarify that OSM water bodies that do not have a `waterway` tag are classified as `lake`.

This refers to the following tags:
9e4be3e3b0/layers/water/mapping.yaml (L86-L95)
2021-08-10 16:16:40 +02:00
Yuri Astrakhan
0b1511d60d
NOOP water - Move updating sql into separate file (#920)
Use `update_water.sql` for all queries that update db
to be consistent with the other layers.
2020-06-08 12:32:09 -04:00
Yuri Astrakhan
1614a4656c Manage field mapping in SQL declaratively
Simplify some of the OSM->OMT field value mappings using declarative syntax.

This approach is not for all cases, but in many it removes
the need of storing the same field in both the .yaml and .sql files.

TODO: support more complex AND/OR cases
2019-12-19 11:25:29 -05:00
Yuri Astrakhan
39dcfc2072
Fix missing description for the new brunnel field (#709) 2019-11-19 14:47:34 -05:00
Guillaume Gomez
23358f18af add brunnel info for water 2019-10-11 17:57:26 +02:00
zstadler
7a3ac079ae Add intermittent field to water* layers (#430 PR #585) 2019-05-24 13:21:43 +02:00
Eva J
f09a2edd12 import-water 1.0, update osmdata URL 2019-05-20 11:58:34 +02:00
Lukas Martinelli
f6a7e4ec92 Improve docs of water and water_name 2017-01-05 16:36:55 +01:00
stirringhalo
bab5c3d4b6 Switch from geom to geometry 2016-12-20 22:32:34 -05:00
lukasmartinelli
90f2203e7c Document water and remove obsolete mapping 2016-10-28 20:49:20 +02:00
lukasmartinelli
ea2530788f Filter out large rivers 2016-10-28 16:53:29 +02:00
lukasmartinelli
9c50026f16 Remove osm_id in vector tiles coz of huge size savings 2016-10-25 19:15:51 +02:00
lukasmartinelli
c86f5b9a26 Switch water layer to imposm3 2016-10-10 19:39:47 +02:00
lukasmartinelli
480d720585 Move to new modular layer structure 2016-10-09 21:27:09 +02:00