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.

Sign up for GitHub

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

Jump to bottom

Merge upstream 2.40.0 changes #5

Closed
wants to merge 20 commits into from
Closed

Merge upstream 2.40.0 changes #5

wants to merge 20 commits into from

Conversation

pnorman
Copy link

@pnorman pnorman commented Jul 2, 2016

Main changes

This is all untested since I can't get this style running.

pnorman and others added 20 commits February 16, 2016 23:47
@pnorman
Reformat road SQL
3eaf7c4
@matkoniecz
placenames-medium is not used on z3
1710ea6
@matkoniecz
Merge pull request gravitystorm#2168 from pnorman/road_reformat
7b0ea93 
Reformat road SQL
@matthijsmelissen
Revert "Merge remote-tracking branch 'pnorman/water_polygons'"
7b492e6 
This reverts commit 759b486, reversing
changes made to 2294a2e.

Conflicts:
	INSTALL.md
	project.mml
@matthijsmelissen
Merge pull request gravitystorm#2173 from matkoniecz/faster_z3
723b869 
placenames-medium is not used on z3
@matkoniecz
rewrite low priority layer to make it like main amenity layer
77b3010 
also, removes combinatorial explosion in generated .xml file
@matkoniecz
stop displaying highway=mini_roundabout and highway=level_crossing ma…
2af08b0 
…pped as areas
@matkoniecz
larger labels for placenames
cb69b80 
fixes gravitystorm#2175
@pnorman
Filter placenames-large based on way_area
eb5f783 
The style only shows large placenames, and this allows partial index
usage
@pnorman
Add name IS NOT NULL check to medium placenames
c573c8d
@pnorman
Merge pull request gravitystorm#2181 from matkoniecz/placename_withou…
d34fe46 
…t_dots

larger labels for placenames
@matkoniecz
Merge pull request gravitystorm#2186 from pnorman/placenames_medium_name
0975e13 
Add name IS NOT NULL check to medium placenames
@matkoniecz
synchronise description in Github repo and project file
e2ab3a1
@matthijsmelissen
Merge pull request gravitystorm#2188 from matkoniecz/synch
d789bda 
synchronise description in Github repo and project file
@matkoniecz
it is not necessary to query buildings for z12, as buildings are not …
dbb4d94 
…displayed on z12
@matthijsmelissen
Merge pull request gravitystorm#2190 from matkoniecz/buildingless_z12
7f5624d 
it is not necessary to query buildings for z12, as buildings are not displayed on z12
@matthijsmelissen
Merge pull request gravitystorm#2185 from pnorman/placename_large_way…
e7dc874 
…_area

Filter placenames-large based on way_area
@matkoniecz
show bus_guideway tunnels
51da5e2 
no special rendering as this case is extremely rare (one known place where this is valid tagging)

fixes gravitystorm#2187
@matthijsmelissen
Merge pull request gravitystorm#2191 from matkoniecz/show_guideway_tu…
2e3802c 
…nnel

show bus_guideway tunnels
@pnorman
Merge tag 'v2.40.0' into de_2.40.0_update
f995a5e 
v2.40.0

Conflicts:
	project.yaml
@pnorman pnorman force-pushed the de_2.40.0_update branch from 0980b8d to f995a5e Compare July 2, 2016 08:47
@giggls
Copy link
Owner

giggls commented Jul 21, 2016

Just merged upstream/master
Do you think it would be better to pull tagged relases only?

@pnorman
Copy link
Author

pnorman commented Jul 21, 2016

Do you think it would be better to pull tagged relases only?

yes

@giggls
Copy link
Owner

giggls commented Sep 27, 2016

Just merged v2.44.0

@giggls giggls closed this Sep 27, 2016
@pnorman pnorman deleted the de_2.40.0_update branch April 7, 2020 01:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@pnorman @giggls @matkoniecz @matthijsmelissen