-
Notifications
You must be signed in to change notification settings - Fork 822
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
Major rewrite landcover labelling #941
Merged
gravitystorm
merged 10 commits into
gravitystorm:master
from
matthijsmelissen:landcover-labels
Oct 6, 2014
Merged
Major rewrite landcover labelling #941
gravitystorm
merged 10 commits into
gravitystorm:master
from
matthijsmelissen:landcover-labels
Oct 6, 2014
Commits on Sep 21, 2014
-
Configuration menu - View commit details
-
Copy full SHA for a66e5d8 - Browse repository at this point
Copy the full SHA a66e5d8View commit details
Commits on Sep 22, 2014
-
Configuration menu - View commit details
-
Copy full SHA for 9478a1a - Browse repository at this point
Copy the full SHA 9478a1aView commit details -
Major rewrite landcover labelling
This commit changes the rendering of landcover labels. For the purpose of this commit, with 'landcover label' we mean text connected to a background colour or pattern rendering, and not connected to an icon. * All rendered landcover tags now have their name rendered (resolves gravitystorm#537). We add labels to the following tags: * natural=beach,scrub,grassland,heath,sand,desert (partially resolves gravitystorm#788) * highway=services,rest_area (resolves gravitystorm#575) * aeroway=apron * power=station,generator,substation,sub_station * tourism=zoo * military=barracks * The minimum zoom level of labels is now defined based on the number of pixels rendered (resolves partially gravitystorm#703, resolves gravitystorm#861, resolves gravitystorm#913). Labels are rendered from 3000 pixels (but never earlier than the corresponding landuse is rendered). * Font size now also depends on way_pixels. In other words, larger objects get a larger label, in three steps (resolves gravitystorm#308). * Landuse labels are now rendered oblique, to easier visually tell them apart from village and POI labels. * All labels are rendered in a colour similar to the landuse they belong to (using landuse color variables, resolves gravitystorm#56). Also some existing colours are changed, in order to make them clearly colourful but still readable. * The text-halo-radius and text-wrap-width properties are made consistent across landuse types. * Font-size, wrap-width an face-name are now defined by easy to change variables.
Configuration menu - View commit details
-
Copy full SHA for c0e1a2e - Browse repository at this point
Copy the full SHA c0e1a2eView commit details -
Configuration menu - View commit details
-
Copy full SHA for 1c07fe6 - Browse repository at this point
Copy the full SHA 1c07fe6View commit details
Commits on Sep 24, 2014
-
Configuration menu - View commit details
-
Copy full SHA for d0e654b - Browse repository at this point
Copy the full SHA d0e654bView commit details -
Don't label landuse when that landuse is a building
Also correcting text-wrap for swimming pools.
Configuration menu - View commit details
-
Copy full SHA for 0dd1b2c - Browse repository at this point
Copy the full SHA 0dd1b2cView commit details -
Configuration menu - View commit details
-
Copy full SHA for db42f88 - Browse repository at this point
Copy the full SHA db42f88View commit details -
Configuration menu - View commit details
-
Copy full SHA for 967386c - Browse repository at this point
Copy the full SHA 967386cView commit details -
Configuration menu - View commit details
-
Copy full SHA for 88597a4 - Browse repository at this point
Copy the full SHA 88597a4View commit details
Commits on Sep 25, 2014
-
Configuration menu - View commit details
-
Copy full SHA for 74e9a68 - Browse repository at this point
Copy the full SHA 74e9a68View commit details
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.