Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Contours #1925

Open
wants to merge 39 commits into
base: master
Choose a base branch
from
Open
Changes from 4 commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
010b764
Try add contours layer
rwrx Jul 30, 2019
e3f6290
Add contours layer
rwrx Aug 20, 2019
af927b9
Change min zoom for contours layer to 12
rwrx Aug 20, 2019
c080e56
Contours kind changed to std
rwrx Aug 21, 2019
267ce64
Add fiona module
rwrx Aug 24, 2019
a53f1ef
Add contours table to meta data computation
rwrx Aug 24, 2019
cfbbf7c
Add crop to landuse
rwrx Sep 30, 2019
a1f4643
Add historic and castle_type tags
rwrx Sep 30, 2019
695eb6e
Add man_made tag to roads layer
rwrx Sep 30, 2019
232e531
Add dyke
rwrx Sep 30, 2019
418ad3f
Add chimney to pois
rwrx Sep 30, 2019
642a9dc
Add weir to water layer
rwrx Sep 30, 2019
78dff55
Add to tilejson description
rwrx Sep 30, 2019
929a71f
Add fell
rwrx Sep 30, 2019
96b959f
Remove typo
rwrx Sep 30, 2019
491cf5e
Add dyke to tilejson description
rwrx Sep 30, 2019
adc5b80
Update according to comments
rwrx Sep 30, 2019
7ae7d2a
Update layer tests
rwrx Sep 30, 2019
7fde574
Add support for hiking colours and symbols
rwrx Jun 18, 2022
41ce83f
Change to using osmc:symbol for waymarked hiking routes
rwrx Jun 29, 2022
fa5ccd2
Merge with upstream
rwrx Jul 5, 2022
6317c98
Merge branch 'master' into contours
rwrx Jul 9, 2022
8a8e4c8
[pre-commit.ci] auto fixes from pre-commit.com hooks
pre-commit-ci[bot] Jul 9, 2022
666a1b8
Add fiona
rwrx Jun 28, 2023
5da5876
Merge v1.9.0
rwrx May 30, 2024
bb871ed
Merge pull request #1 from tilezen/master
rwrx May 31, 2024
8cc10cd
Add croquet
rwrx Jun 3, 2024
b77fc23
Revert simplification and fix missing boundary property for water layer
rwrx Jun 12, 2024
019f204
Update gitignore
rwrx Jun 12, 2024
dc274e8
Merge branch 'chimney'
rwrx Jun 12, 2024
d49abdf
Merge branch 'crop'
rwrx Jun 12, 2024
0b910e4
Merge branch 'dyke'
rwrx Jun 12, 2024
5db46fe
Merge fell
rwrx Jun 12, 2024
385cd1d
Merge branch 'historic'
rwrx Jun 12, 2024
53aeb5e
Merge branch 'man_made'
rwrx Jun 12, 2024
d5b138b
Merge weir
rwrx Jun 12, 2024
cb36bc4
Remove ogr2ogr slipsrc parameter
rwrx Jun 19, 2024
ee08f37
Add information and memorial into poi tags
rwrx Oct 2, 2024
9411f4c
Merge master
rwrx Oct 7, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions data/functions.sql
Original file line number Diff line number Diff line change
@@ -127,15 +127,16 @@ FROM (
unnest(tags) AS unnested
FROM (
SELECT
mz_modify_network(hstore(tags))->ARRAY['route','network','ref'] AS tags
mz_modify_network(hstore(tags))->ARRAY['route','network','ref','osmc:symbol'] AS tags
FROM
planet_osm_rels
WHERE
parts && ARRAY[way_id] AND
parts[way_off+1:rel_off] && ARRAY[way_id] AND
hstore(tags) ? 'route' AND
(hstore(tags) ? 'network' OR
hstore(tags) ? 'ref')
hstore(tags) ? 'ref') AND
hstore(tags) ? 'osmc:symbol'
) inner1
) inner2;
$$ LANGUAGE sql STABLE;
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -24,7 +24,7 @@ Shapely==1.6.2.post1
simplejson==3.12.0
six==1.11.0
StreetNames==0.1.5
git+https://github.com/tilezen/tilequeue@master#egg=tilequeue
git+https://github.com/tilezen/tilequeue@v2.4.1-final#egg=tilequeue
git+https://github.com/tilezen/tileserver@master#egg=tileserver
tqdm==4.31.1
urllib3==1.25.11
652 changes: 91 additions & 561 deletions vectordatasource/transform.py

Large diffs are not rendered by default.

14 changes: 7 additions & 7 deletions yaml/roads.yaml
Original file line number Diff line number Diff line change
@@ -177,31 +177,31 @@ global:
- when:
sov_a3: CAN
level: ['Federal', 'Interstate', 'State']
then: ['road', 'CA:??:primary', { col: name }]
then: ['road', 'CA:??:primary', { col: name }, { col: "osmc:symbol" }]
- when:
sov_a3: 'MEX'
level: 'Interstate'
then: ['road', 'MX', { col: name }]
then: ['road', 'MX', { col: name }, { col: "osmc:symbol" }]
- when:
sov_a3: 'MEX'
level: 'Federal'
then: ['road', 'MX:MX', { col: name }]
then: ['road', 'MX:MX', { col: name }, { col: "osmc:symbol" }]
- when:
sov_a3: 'USA'
level: 'Interstate'
then: ['road', 'US:I', { col: name }]
then: ['road', 'US:I', { col: name }, { col: "osmc:symbol" }]
- when:
sov_a3: 'USA'
level: 'Federal'
then: ['road', 'US:US', { col: name }]
then: ['road', 'US:US', { col: name }, { col: "osmc:symbol" }]
- when:
continent: 'Oceania'
level: 'Federal'
then: ['road', 'NZ:SH', { col: label}]
then: ['road', 'NZ:SH', { col: label}, { col: "osmc:symbol" }]
- when:
continent: ['Europe', 'Asia']
level: 'E'
then: ['road', 'e-road', { col: name }]
then: ['road', 'e-road', { col: name }, { col: "osmc:symbol" }]
columns: [ sov_a3, continent, label, level ]
# tolls
toll: