546 Commits

Author SHA1 Message Date
golubev
05e77f6870 merge master into add-garages 2019-11-04 13:12:34 +02:00
Taro Matsuzawa
af7f96ac94 fix typo: hourse -> horse 2019-11-03 14:36:06 +09:00
Frédéric Rodrigo
a2917a9323 Map fell, heath, scrub and tundra like grassland, as 'grass' 2019-11-02 21:14:51 +01:00
Yuri Astrakhan
73c7290893 Updated mapping diagrams to match changes in landcover & transportation
These were forgotten to check in.  We should add validation to the tests
to make sure all values are up to date.
2019-11-01 22:40:39 -04:00
Eva Jelinkova
dff9a850a6
Merge pull request #675 from Sophox/nyurik-patch-1
Fix err in transportation update_gbr_route_members
2019-10-31 22:46:37 +01:00
Eva Jelinkova
bdeb6c8b2e
Merge branch 'master' into bicycle-foot-horse-mtb_scale 2019-10-31 18:52:12 +01:00
Eva Jelinkova
c5b58057cb
Merge pull request #677 from lun/321-highway-construction
Add roads under construction
2019-10-31 18:42:11 +01:00
Eva Jelinkova
e7aa43d91b
Merge pull request #662 from frodrigo/dune
Support natural=dune aside of beach and sand
2019-10-29 15:00:20 +01:00
Yuri Astrakhan
0374d4d047 insert non-null osm_id 2019-10-28 12:35:08 -04:00
Yuri Astrakhan
479914e4b5 Fix err in transportation update_gbr_route_members
The query was producing 3 columns - `(member, ref, network)`,
whereas osm_id is a required field (otherwise it throws null constraint).
2019-10-28 12:35:08 -04:00
Yuri Astrakhan
7426e3a924
Added missing key_field to the aerodrome_label & mountain_peak def (#686)
aerodrome_label & mountain_peak queries return `osm_id`, but they
are not declared in the data source.  I think we should either remove
the `osm_id` from the query result, or declare the data source.
2019-10-28 12:26:03 -04: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
zstadler
2738c649ca Fix typos 2019-10-26 22:52:14 +03:00
Yuri Astrakhan
bf833dcd45
Merge pull request #655 from frodrigo/chocolate
Remove duplicate POI class match on chocolate and confectionery
2019-10-25 23:43:44 -04:00
zstadler
556bfb889d
Merge branch 'master' into bicycle-foot-horse-mtb_scale 2019-10-25 16:09:44 +03:00
Yuri Astrakhan
edd1c44ac6
remove trailing space 2019-10-25 00:46:38 -04:00
Yuri Astrakhan
84daa0ea1d Merge zstadler/openmaptiles/patch-1 into master
Rebasing onto the latest changes in origin/master,
resolving merge conflict.
2019-10-23 13:24:20 -04:00
Guillaume Gomez
23358f18af add brunnel info for water 2019-10-11 17:57:26 +02:00
golubev
4251701858 layers/transportation/class.sql: fix up empty value issue (#321) 2019-10-07 14:15:45 +03:00
golubev
e74bfb67b4 update transportation layers doc (#321) 2019-10-04 15:19:56 +03:00
golubev
73307a610b layers/transportation_name/: add roads under construction, fix SQL error (#321) 2019-10-04 14:50:05 +03:00
golubev
81c90be19b layers/transportation/: fix SQL mistakes, modify indices (#321) 2019-10-04 14:00:14 +03:00
golubev
0636466cfd layers/transportation/: differentiate roads under construction (#321) 2019-10-04 13:08:49 +03:00
golubev
45a50a5bd0 layers/transportation/: add 'highway=construction' roads (#321) 2019-10-03 14:17:44 +03:00
golubev
8d9a5df48b layers/transportation/: do a tiny code styling (#321) 2019-10-03 14:10:36 +03:00
golubev
84689f6cd1 layers/landuse/mapping.yaml: add 'garages' 2019-09-20 13:00:21 +03:00
Frédéric Rodrigo
c6a13981ba Support natural=dune aside of beach and sand 2019-08-31 14:30:42 +02:00
Frédéric Rodrigo
dedc1fd91f Remove duplicate POI class match on chocolate and confectionery 2019-08-12 22:30:44 +02:00
François de Metz
f4b56d00ae
Add a subclass column from the mapping_value to clean the landcover layer. 2019-07-28 12:36:01 +02:00
zstadler
7a3ac079ae Add intermittent field to water* layers (#430 PR #585) 2019-05-24 13:21:43 +02:00
Frédéric Rodrigo
4d43ee9136 Add colour to buildings (#555) 2019-05-24 11:09:09 +02:00
Dalibor Janák
b9c8de3fbb
Merge pull request #620 from eva-j/aerialway
Adding aerialway=gondola
2019-05-20 13:42:40 +02:00
Dalibor Janák
2920ffd4da
Merge pull request #578 from nlehuby/ski_resorts
Add ski resorts to poi and landuse layers
2019-05-20 13:40:58 +02:00
Dalibor Janák
3ae8542cf9
Merge pull request #624 from zstadler/patch-3
Remove second occurance of `camp_site` subclass
2019-05-20 13:40:06 +02:00
Dalibor Janák
2ecca4b20d
Merge pull request #626 from eva-j/osmdata_url
import-water 1.0, update osmdata URL
2019-05-20 13:37:14 +02:00
Dalibor Janák
0ecfe3bd63
Merge branch 'master' into patch-3 2019-05-20 13:17:43 +02:00
Dalibor Janák
7bb810667d
Merge pull request #612 from zstadler/patch-2
Add missing subclass values to `landcover` documentation
2019-05-20 13:06:53 +02:00
Dalibor Janák
26b2fb0765
Merge pull request #622 from eva-j/poi_dormitory
Adding dormitories
2019-05-20 13:05:35 +02:00
Dalibor Janák
94b58f5f21
Merge pull request #570 from Phyks/surface
Add surface field for highways
2019-05-20 13:02:47 +02:00
Eva J
f09a2edd12 import-water 1.0, update osmdata URL 2019-05-20 11:58:34 +02:00
Eva J
3520cbec40 POI update only (removing changes in landuse) 2019-05-19 22:04:30 +02:00
zstadler
d2f78cc346
Remove second occurance of camp_site subclass
The `camp_site` subclass is assigned to the `campsite` class by an earlier statement"
```sql
WHEN subclass IN ('camp_site','caravan_site') THEN 'campsite'
```
2019-05-18 08:26:15 +03:00
Eva J
664bc7da28 adding dormitories 2019-05-17 17:28:20 +02:00
Eva J
ed0d63804c update of tag lists, documentation 2019-05-17 14:28:13 +02:00
Eva J
7a167142eb add aerialway=gondola 2019-05-16 13:44:50 +02:00
Eva J
7b6c4752e9 add leisure=track 2019-05-15 18:05:44 +02:00
Eva J
54d0fbc78c adding aerialway=chair_lift,t-bar,rope_tow 2019-05-15 16:37:58 +02:00
Dalibor Janák
bf7e160331
Merge pull request #613 from eva-j/boundaries
Boundary - changes in z4 and z5
2019-05-08 09:07:29 +02:00
Eva J
8f543c5e62 removing using scalerank 2019-05-06 18:04:29 +02:00
Eva J
aee74675eb changes in z4 and z5 - diagram update 2019-05-03 15:06:05 +02:00