Wykres commitów

1287 Commity (c21f70bd72b2889cd54500c90026beaffe87f8cc)

Autor SHA1 Wiadomość Data
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 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
golubev 58373dc4b4 merge master into 321-highway-construction (#321) 2019-10-15 13:51:02 +03:00
golubev 5553b94ca0 merge master into add-garages 2019-10-15 13:45:39 +03:00
Guillaume Gomez 23358f18af add brunnel info for water 2019-10-11 17:57:26 +02: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
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
typebrook 2d5f4248bd Add description about Wikidata in README 2019-09-01 15:43:28 +08:00
typebrook 7393d88a03 Upgrade import-sql to 1.0
- Do not fail if there are no matching sql files in dir

- Fixed missing table for optional wikidata import.
2019-09-01 15:43:28 +08:00
Frédéric Rodrigo c6a13981ba Support natural=dune aside of beach and sand 2019-08-31 14:30:42 +02: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
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
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