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

Major rewrite landcover labelling #941

Merged
merged 10 commits into from
Oct 6, 2014

Commits on Sep 21, 2014

  1. Layout changes SQL

    matthijsmelissen committed Sep 21, 2014
    Configuration menu
    Copy the full SHA
    a66e5d8 View commit details
    Browse the repository at this point in the history

Commits on Sep 22, 2014

  1. Configuration menu
    Copy the full SHA
    9478a1a View commit details
    Browse the repository at this point in the history
  2. 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.
    matthijsmelissen committed Sep 22, 2014
    Configuration menu
    Copy the full SHA
    c0e1a2e View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    1c07fe6 View commit details
    Browse the repository at this point in the history

Commits on Sep 24, 2014

  1. Configuration menu
    Copy the full SHA
    d0e654b View commit details
    Browse the repository at this point in the history
  2. Don't label landuse when that landuse is a building

    Also correcting text-wrap for swimming pools.
    matthijsmelissen committed Sep 24, 2014
    Configuration menu
    Copy the full SHA
    0dd1b2c View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    db42f88 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    967386c View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    88597a4 View commit details
    Browse the repository at this point in the history

Commits on Sep 25, 2014

  1. Configuration menu
    Copy the full SHA
    74e9a68 View commit details
    Browse the repository at this point in the history