mirror
/
openmaptiles
kopia lustrzana https://github.com/openmaptiles/openmaptiles
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność
827 Commity
8 Gałęzie
21 Tagi
86 MiB
Wykres commitów

827 Commity (dfaf8e3cc87b9faa6b28b289d26662a45f9a5fa7)

Autor SHA1 Wiadomość Data
Eva Jelinkova dfaf8e3cc8
Merge pull request #713 from eva-j/621_landuse_dam 
Adding waterway=dam to landuse layer
 2019-11-26 15:39:21 +01:00
compSciKai 1f253c1ca0 Update README.md (#715) 
Hello! I am a university student taking a technical writing course. For one project we need to make suggested edits to repos on github. 
Please use the following suggestions at your discretion :)

- Removed use of pronouns so subject is more clear
- Rewrote flow to decrease monotony (monotony introduced by my edits)
- re-arranged words to reduce ambiguity
 2019-11-25 23:35:49 -05:00
Yuri Astrakhan 94cf9c0cc7
simplify travis-ci (#712) 2019-11-20 12:47:32 -05:00
Yuri Astrakhan 8bb3236eda
python3 qa preparations (#711) 2019-11-20 12:47:12 -05:00
Eva J fcee8571fb adding waterway=dam 2019-11-20 18:05:07 +01:00
Yuri Astrakhan 39dcfc2072
Fix missing description for the new brunnel field (#709) 2019-11-19 14:47:34 -05:00
Eva Jelinkova e7423bd2e5
Update git clone command 2019-11-18 09:41:02 +01:00
Eva Jelinkova acb54e5e50
Merge pull request #704 from eva-j/577_disputed_ne 
Adding disputed borders of NE sources
 2019-11-11 17:20:22 +01:00
Eva Jelinkova 5140b50b8a
Merge pull request #581 from zstadler/forced-clean-sql 
Fix `make 'forced-clean-sql'` failure with Docker Toolbox for Windows
 2019-11-11 11:01:22 +01:00
Eva J 062e2c89b0 adding disputed for NE sources 2019-11-07 18:07:15 +01:00
Eva Jelinkova ff47e3936a
Merge pull request #702 from eva-j/waterway_docs 
Waterway documentation
 2019-11-06 17:47:51 +01:00
Eva J 11c07bfbed waterway - edit docs 2019-11-06 16:40:37 +01:00
Eva Jelinkova 67672de287
Merge pull request #646 from osmontrouge/refactor-landcover 
Add a subclass column from the mapping_value to clean the landcover layer
 2019-11-05 19:24:55 +01:00
Eva Jelinkova c766e2ecbd
Merge pull request #645 from osmontrouge/include-pedestrian-multipolygon 
Remove the area condition on highway polygon.
 2019-11-05 14:11:02 +01:00
François de Metz cf219c1e09
Include only polygons and multipolygons highways on zoom >= 13. 2019-11-05 12:31:54 +01:00
Eva Jelinkova 6ea4cde691
Merge branch 'master' into refactor-landcover 2019-11-05 12:02:37 +01:00
Eva Jelinkova 3f65811cda
Merge pull request #663 from frodrigo/more_grass 
Map fell, heath, scrub and tundra like grassland, as 'grass'
 2019-11-05 10:00:35 +01:00
Eva Jelinkova f440fa53bc
Merge pull request #679 from QwantResearch/upstream-water 
add brunnel info for water
 2019-11-04 18:32:55 +01:00
Eva Jelinkova a1a0f3711d
Merge pull request #700 from lun/677-diagrams-update 
update mapping diagram for the `transportation_name`
 2019-11-04 13:58:40 +01:00
golubev fd120ff8ca layers/transportation_name/mapping_diagram.png: update the diagram 2019-11-04 14:25:11 +02:00
Sergii Golubev 8dcb8a3192 close #657: limit mountain_peak's 'ele' tag to 10000 (#658) 
* close #657: limit mountain_peak's 'ele' tag to 10000

* layers/mountain_peak/layer.sql: implement a more elegant 'ele' filter
 2019-11-04 06:14:55 -05:00
Eva Jelinkova ffe70c3a71
Merge pull request #699 from smellman/fix-typo-horse 
#698 fix typo: hourse -> horse
 2019-11-04 08:54:47 +01: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 d7afc6cb76
Merge pull request #604 from zstadler/bicycle-foot-horse-mtb_scale 
Add bicycle, foot, horse, and mtb_scale to the transportation layer
 2019-10-31 19:20:19 +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 e1613f23ef
Merge pull request #664 from OsmHackTW/import-sql-1.0 
Upgrade import-sql from 0.8 to 1.0
 2019-10-31 17:48:00 +01:00
Eva Jelinkova 5ea8d9ae8e
Merge pull request #697 from pathmapper/import_water 
Update import-water version
 2019-10-30 18:14:04 +01:00
pathmapper d91933273b
Update import-water version 2019-10-30 17:45:21 +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
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
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 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
Guillaume Gomez 23358f18af add brunnel info for water 2019-10-11 17:57:26 +02:00