777 Commits

Author SHA1 Message Date
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
pathmapper
68a4067c73 Add OSM Liberty style (#694) 2019-10-28 12:23:29 -04:00
Eva Jelinkova
695a2e03d8
Merge pull request #649 from amenk/patch-1
Add Amharic, Official Language of Ethiopia
2019-10-28 17:01:38 +01:00
Eva Jelinkova
340c4ef83e
Merge pull request #640 from Ghybu/master
Add Kurdish language (ku)  to the "openmaptiles.yaml"
2019-10-28 16:58:42 +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
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
Yuri Astrakhan
edd1c44ac6
remove trailing space 2019-10-25 00:46:38 -04:00
Yuri Astrakhan
7678fefe43
Merge pull request #689 from openmaptiles/zstadler-patch-1
Avoid long repeated text in poi mapping file (from zstadler)

This patch was manually merged from https://github.com/openmaptiles/openmaptiles/pull/611
Submitted by @zstadler

The `fields` and `mapping` sections for `poi_point` and `poi_polygon` are the same, and must be the same for the SQL to work properly.

Using definitions avoids repetition and the need to make each change in these sections twice, as was already done for the subsections of `mapping`.
2019-10-23 14:07:54 -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
Mike Scheurwater
18455147ba Add .vscode folder to gitignore (#681) 2019-10-21 22:32:00 -04:00
Mike Scheurwater
630d07de49 Fix typo in pull_request_template (#682) 2019-10-21 22:31:24 -04:00
Yuri Astrakhan
9b2596df78
Ignore IDEA files (#676)
selfmerging - too simple of a change and non-consequential as there are no files like that checked in.
2019-10-09 15:13:13 -04:00
Eva Jelinkova
c42943dc0c
Update import-water version 2019-08-14 11:41:11 +02:00
Frédéric Rodrigo
dedc1fd91f Remove duplicate POI class match on chocolate and confectionery 2019-08-12 22:30:44 +02:00
Alexander Menk
50cf8db735
Add Amharic, Official Language of Ethiopia 2019-08-04 13:41:12 +02:00
Ghybu
41acf78481
Add Kurdish language (ku) 2019-06-13 17:42:37 +02:00
Dalibor Janák
c45e75542b
Set version to 3.10.0 2019-06-13 15:42:07 +02:00
Petr Pridal
dca81130d8
Merge pull request #627 from daliborjanak/master
Update contributing spec
2019-05-27 13:23:05 +02:00
zstadler
7a3ac079ae Add intermittent field to water* layers (#430 PR #585) 2019-05-24 13:21:43 +02:00
Eva Jelinkova
8424f01be9 add indonesian language (#631) 2019-05-24 11:10:03 +02:00
Frédéric Rodrigo
4d43ee9136 Add colour to buildings (#555) 2019-05-24 11:09:09 +02:00
Dalibor Janák
b6fd4e3afd
Merge pull request #543 from nlehuby/french_regional_languages
Add Euskara, Occitan and Corsican languages
2019-05-23 11:53:03 +02:00
Dalibor Janák
118e5551a9 Update contributing spec with list of spec 2019-05-20 14:14:25 +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
Dalibor Janák
71a6f21abb
Merge pull request #619 from eva-j/landuse_track
Adding leisure=track to landuse layer
2019-05-20 12:59:28 +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
Martin Mikita
75ebb80e4c
Fixed link to skiing, https 2019-05-07 13:36:07 +02:00
Eva J
8f543c5e62 removing using scalerank 2019-05-06 18:04:29 +02:00
Dalibor Janák
0df18e47f5
Reorder links and update text in readme 2019-05-06 14:41:37 +02:00
Eva J
aee74675eb changes in z4 and z5 - diagram update 2019-05-03 15:06:05 +02:00
Eva J
9146fc74b0 changes in z4 and z5 2019-05-03 14:47:30 +02:00
zstadler
bf062d4731
Add missing landcover subclass values
Subclass values were extracted from `mapping.yaml`
2019-05-01 08:45:57 +03:00
zstadler
53976b154d
Avoid long repeated text in poi mapping file
The `fields` and `mapping` sections for `poi_point` and `poi_polygon` are the same, and must be the same for the SQL to work properly.

Using definitions avoids repetition and the need to make each change in these sections twice, as was already done for the subsections of `mapping`
2019-04-18 01:04:07 +03:00