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

better and faster labeling #1079

Merged
merged 62 commits into from
Mar 13, 2015
Merged

better and faster labeling #1079

merged 62 commits into from
Mar 13, 2015

Commits on Feb 18, 2015

  1. start of new labelling work

    The general idea is to generate fewer, separate boxes used for placement
    and only generate glyphs for rendering after features have been placed.
    
    This commit breaks lots of things.
    ansis committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    df4f475 View commit details
    Browse the repository at this point in the history
  2. fix boxes for horizontal labels

    ansis committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    c5a0172 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d27b179 View commit details
    Browse the repository at this point in the history
  4. fix collisions

    ansis committed Feb 18, 2015
    Configuration menu
    Copy the full SHA
    f4398b3 View commit details
    Browse the repository at this point in the history

Commits on Feb 19, 2015

  1. redo placement when map rotates

    ansis committed Feb 19, 2015
    Configuration menu
    Copy the full SHA
    7bcf880 View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2015

  1. remove old collision code

    ansis committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    0de0baa View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    5801307 View commit details
    Browse the repository at this point in the history
  3. remove more old placement code

    ansis committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    0d7badd View commit details
    Browse the repository at this point in the history
  4. fix collisions for viewport aligned line labels

    like highway shields
    ansis committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    4c3446f View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    82967e1 View commit details
    Browse the repository at this point in the history
  6. Merge branch 'master' into placement

    Conflicts:
    	js/data/create_bucket.js
    	js/source/vector_tile_source.js
    	js/source/worker.js
    	js/source/worker_tile.js
    	js/symbol/collision.js
    ansis committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    209ca2f View commit details
    Browse the repository at this point in the history
  7. eliminate line label jumping for overscaled tiles

    For overscaled tiles, line label interpolation now places labels in the
    same places it placed them in the parent tile, so that when you zoom the
    labels don't shift.
    ansis committed Feb 20, 2015
    Configuration menu
    Copy the full SHA
    110a0ac View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2015

  1. remove nan check

    kapadia committed Feb 21, 2015
    Configuration menu
    Copy the full SHA
    ce31a22 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    ed01750 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    f228934 View commit details
    Browse the repository at this point in the history
  4. no need to format bbox output

    kapadia committed Feb 21, 2015
    Configuration menu
    Copy the full SHA
    e598d78 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2015

  1. remove placement_layer

    ansis committed Feb 23, 2015
    Configuration menu
    Copy the full SHA
    4e2c209 View commit details
    Browse the repository at this point in the history

Commits on Feb 24, 2015

  1. Configuration menu
    Copy the full SHA
    4ee83cf View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    9ceb19e View commit details
    Browse the repository at this point in the history
  3. remove unused variable

    kapadia committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    8b95b58 View commit details
    Browse the repository at this point in the history
  4. js style

    kapadia committed Feb 24, 2015
    Configuration menu
    Copy the full SHA
    960babf View commit details
    Browse the repository at this point in the history

Commits on Feb 26, 2015

  1. fix angle comparison

    kapadia committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    76ecda0 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    0b26dec View commit details
    Browse the repository at this point in the history
  3. fix previous angle check

    kapadia committed Feb 26, 2015
    Configuration menu
    Copy the full SHA
    3d447de View commit details
    Browse the repository at this point in the history

Commits on Mar 4, 2015

  1. Merge pull request #1026 from mapbox/keep-upright

    Keep upright
    ansis committed Mar 4, 2015
    Configuration menu
    Copy the full SHA
    2f4b40e View commit details
    Browse the repository at this point in the history

Commits on Mar 5, 2015

  1. improve naming and fix #1016

    ansis committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    e07c041 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4c4af74 View commit details
    Browse the repository at this point in the history
  3. fix text padding

    ansis committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    fac0152 View commit details
    Browse the repository at this point in the history
  4. copy bboxify-labels into main repository

    https://github.com/mapbox/bboxify-labels/
    at e432c592f25c2a89bc87861adabd02a2a3575729
    ansis committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    84d0cdc View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    0a6ba42 View commit details
    Browse the repository at this point in the history
  6. create LabelBox type

    ansis committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    5c5888e View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    0d2b4ea View commit details
    Browse the repository at this point in the history
  8. move text-max-angle check before collisions and...

    use a window of angles instead of a single angle. fixes #551
    ansis committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    8f06055 View commit details
    Browse the repository at this point in the history
  9. use bulk rtree insertion

    ansis committed Mar 5, 2015
    Configuration menu
    Copy the full SHA
    a852e7f View commit details
    Browse the repository at this point in the history

Commits on Mar 6, 2015

  1. Configuration menu
    Copy the full SHA
    5274574 View commit details
    Browse the repository at this point in the history
  2. introduce SymbolQuad type

    ansis committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    b1c449b View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    3d46888 View commit details
    Browse the repository at this point in the history
  4. split icon shaping from icon quad making and...

    create separate AtlasImage type for images, instead of just added extra
    properties to an image rect.
    ansis committed Mar 6, 2015
    Configuration menu
    Copy the full SHA
    fe5fab1 View commit details
    Browse the repository at this point in the history

Commits on Mar 7, 2015

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

Commits on Mar 9, 2015

  1. more placement cleanup

    ansis committed Mar 9, 2015
    2 Configuration menu
    Copy the full SHA
    d744fb2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    2922aea View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    d384378 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    c3aca9e View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    432abda View commit details
    Browse the repository at this point in the history
  6. smarter throttling for redoing placement

    Start another redoPlacement request only when the previous one has
    finished.
    ansis committed Mar 9, 2015
    Configuration menu
    Copy the full SHA
    7674674 View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    f18cad3 View commit details
    Browse the repository at this point in the history
  8. Configuration menu
    Copy the full SHA
    6b70b8a View commit details
    Browse the repository at this point in the history

Commits on Mar 10, 2015

  1. fix geojson text

    ansis committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    7f0a152 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into placement

    Conflicts:
    	js/data/symbol_bucket.js
    	js/render/painter.js
    	js/source/vector_tile_source.js
    	js/source/worker.js
    	js/source/worker_tile.js
    	js/style/style.js
    	js/symbol/glyph_source.js
    	shaders/icon.vertex.glsl
    	shaders/sdf.vertex.glsl
    ansis committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    ab6e2a1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    2c4a47a View commit details
    Browse the repository at this point in the history
  4. if no line label anchors fit, try one in the middle

    See the comment in the commit for more details.
    ansis committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    c304d09 View commit details
    Browse the repository at this point in the history
  5. fix and add tests

    ansis committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    683f38b View commit details
    Browse the repository at this point in the history
  6. add tests for checkMaxAngle

    ansis committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    91a4b6d View commit details
    Browse the repository at this point in the history
  7. Configuration menu
    Copy the full SHA
    1a4fda4 View commit details
    Browse the repository at this point in the history
  8. minor labelling cleanup

    ansis committed Mar 10, 2015
    2 Configuration menu
    Copy the full SHA
    97563be View commit details
    Browse the repository at this point in the history
  9. make collision detection work in perspective view

    Labels should mostly not overlap in perspective view.
    
    The problem is that the angle from the camera to the surface is
    different at the lower edge compared to the upper edge. This means that
    labels near the upper edge cover a larger area than at the bottom edge,
    even after they have been scaled for size. The only way to really fix
    this is to redo placement when panning in the y direction.
    
    The current implementation seems like it might be ok, so let's try this
    for a while and see how it works.
    ansis committed Mar 10, 2015
    Configuration menu
    Copy the full SHA
    0dcb9e1 View commit details
    Browse the repository at this point in the history

Commits on Mar 11, 2015

  1. don't have undefined anchor scale

    Otherwise minScale is sometimes NaN and then GlyphVertexBuffer.add can't
    be optimized ("optimized too many times" warning).
    ansis committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    badcf37 View commit details
    Browse the repository at this point in the history
  2. optimize point rotation

    ansis committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    cecaf58 View commit details
    Browse the repository at this point in the history
  3. fix raster layers

    ansis committed Mar 11, 2015
    Configuration menu
    Copy the full SHA
    7ba0f62 View commit details
    Browse the repository at this point in the history
  4. Configuration menu
    Copy the full SHA
    7f94120 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    4fa768e View commit details
    Browse the repository at this point in the history
  6. Configuration menu
    Copy the full SHA
    9cc098f View commit details
    Browse the repository at this point in the history