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

Labels on top #4286

Merged
merged 47 commits into from
Jul 14, 2015
Merged

Labels on top #4286

merged 47 commits into from
Jul 14, 2015

Commits on Jul 1, 2015

  1. Added tests and splitted long method

    @alonsogarciapablo
    alonsogarciapablo committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    939daf6 View commit details
    Browse the repository at this point in the history

  2. Test setting a basemap with labels on top

    @alonsogarciapablo
    alonsogarciapablo committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    7f04468 View commit details
    Browse the repository at this point in the history

  3. Hack the API (temporarily) so that we can add more than several `tile… 

    …d` layers
    @alonsogarciapablo
    alonsogarciapablo committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    626acd2 View commit details
    Browse the repository at this point in the history

  4. Pass labels key when adding basemaps to the collection of baseLayers

    @alonsogarciapablo
    alonsogarciapablo committed Jul 1, 2015
    Configuration menu
    Copy the full SHA
    97990b7 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2015

  1. Remove/update the layer with labels if there's already a layer with l… 

    …abels
    @alonsogarciapablo
    alonsogarciapablo committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    102aa92 View commit details
    Browse the repository at this point in the history

  2. moveToFront only moves layers on top of data layers

    @alonsogarciapablo
    alonsogarciapablo committed Jul 2, 2015
    Configuration menu
    Copy the full SHA
    a15b19d View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2015

  1. Torque wizards only consider data layers to determine if it's layer i… 

    …s on top
    @alonsogarciapablo
    alonsogarciapablo committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    63410f2 View commit details
    Browse the repository at this point in the history

  2. New basemaps!

    @alonsogarciapablo
    alonsogarciapablo committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    4d69880 View commit details
    Browse the repository at this point in the history

  3. Changed className of basemap

    @alonsogarciapablo
    alonsogarciapablo committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    f1e1a7c View commit details
    Browse the repository at this point in the history

  4. Fixed tests

    @alonsogarciapablo
    alonsogarciapablo committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    91e0999 View commit details
    Browse the repository at this point in the history

  5. Point cartodb.js to labels-on-top branch for testing purposes

    @alonsogarciapablo
    alonsogarciapablo committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    4ed4da8 View commit details
    Browse the repository at this point in the history

  6. Reverts hack to display labels on top in the public map view

    @alonsogarciapablo
    alonsogarciapablo committed Jul 3, 2015
    2 Configuration menu
    Copy the full SHA
    921e357 View commit details
    Browse the repository at this point in the history

  7. Updated cartodb.js to latest commit in labels-on-top branch

    @alonsogarciapablo
    alonsogarciapablo committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    d072cea View commit details
    Browse the repository at this point in the history

  8. Extracted smaller methods

    @alonsogarciapablo
    alonsogarciapablo committed Jul 3, 2015
    Configuration menu
    Copy the full SHA
    d8307eb View commit details
    Browse the repository at this point in the history

Commits on Jul 6, 2015

  1. Fixed and grouped related tests

    @alonsogarciapablo
    alonsogarciapablo committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    72870f4 View commit details
    Browse the repository at this point in the history

  2. Fixed another test and stubbed layer.save

    @alonsogarciapablo
    alonsogarciapablo committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    7b0a62c View commit details
    Browse the repository at this point in the history

  3. Layers should be already ordered so there's no need to re-order them … 

    …on reset
    @alonsogarciapablo
    alonsogarciapablo committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    ad0a46b View commit details
    Browse the repository at this point in the history

  4. Labels layer needs to be saved when updated

    @alonsogarciapablo
    alonsogarciapablo committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    41afd6b View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' into labels-on-top

    @alonsogarciapablo
    alonsogarciapablo committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    fc0a4b4 View commit details
    Browse the repository at this point in the history

  6. Updated cartodb.js

    @alonsogarciapablo
    alonsogarciapablo committed Jul 6, 2015
    Configuration menu
    Copy the full SHA
    271ced3 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2015

  1. #4256 revisit of layer logic, new clean branch

    Kartones committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    271a074 View commit details
    Browse the repository at this point in the history

  2. #4256 adapted spec to new logic

    Kartones committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    c589af2 View commit details
    Browse the repository at this point in the history

  3. Updated lib/sql submodule

    @alonsogarciapablo
    alonsogarciapablo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    c83c45f View commit details
    Browse the repository at this point in the history

  4. Table#create_default_map_and_layers adds a layer with labels if basel… 

    …ayer has that option
    @alonsogarciapablo
    alonsogarciapablo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    3733af4 View commit details
    Browse the repository at this point in the history

  5. Merge remote-tracking branch 'origin/master' into labels-on-top

    @alonsogarciapablo
    alonsogarciapablo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    c5992be View commit details
    Browse the repository at this point in the history

  6. Merge branch 'labels-on-top' into 4287-add-labels-layer-to-maps

    @alonsogarciapablo
    alonsogarciapablo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    4846949 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #4323 from CartoDB/4256-labels-on-top-be 

    4256 labels on top be
    @Kartones
    Kartones committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    909e78d View commit details
    Browse the repository at this point in the history

  8. Merge remote-tracking branch 'origin/labels-on-top' into 4287-add-lab… 

    …els-layer-to-maps
    @alonsogarciapablo
    alonsogarciapablo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    efe6fb4 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #4330 from CartoDB/4287-add-labels-layer-to-maps 

    Adds a layer with labels to new tables if default basemap has labels on top
    @alonsogarciapablo
    alonsogarciapablo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    16899de View commit details
    Browse the repository at this point in the history

  10. Merge remote-tracking branch 'origin/master' into labels-on-top

    @alonsogarciapablo
    alonsogarciapablo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    b9756d7 View commit details
    Browse the repository at this point in the history

  11. Updated cartodb.js

    @alonsogarciapablo
    alonsogarciapablo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    9cdbb5d View commit details
    Browse the repository at this point in the history

  12. Fixed specs

    @alonsogarciapablo
    alonsogarciapablo committed Jul 7, 2015
    Configuration menu
    Copy the full SHA
    7286233 View commit details
    Browse the repository at this point in the history

Commits on Jul 8, 2015

  1. Changed how we move a layer to front so that orders are re-calculated… 

    … correctly (taking into account the different types of layers)
    @alonsogarciapablo
    alonsogarciapablo committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    14ac935 View commit details
    Browse the repository at this point in the history

  2. Layer with labels needs type in options.type and doesn't need to ha… 

    …ve `options.labels`
    @alonsogarciapablo
    alonsogarciapablo committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    c829829 View commit details
    Browse the repository at this point in the history

  3. Give layer with labels a generated name

    @alonsogarciapablo
    alonsogarciapablo committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    92a5657 View commit details
    Browse the repository at this point in the history

  4. Merge remote-tracking branch 'origin/master' into labels-on-top

    @alonsogarciapablo
    alonsogarciapablo committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    1078c08 View commit details
    Browse the repository at this point in the history

  5. Updated cartodb.js

    @alonsogarciapablo
    alonsogarciapablo committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    d21602b View commit details
    Browse the repository at this point in the history

  6. Updated cartodb.js

    @alonsogarciapablo
    alonsogarciapablo committed Jul 8, 2015
    Configuration menu
    Copy the full SHA
    098acc0 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2015

  1. Updated cartodb.js

    @alonsogarciapablo
    alonsogarciapablo committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    98e5aff View commit details
    Browse the repository at this point in the history

  2. Updated cartodb.js

    @alonsogarciapablo
    alonsogarciapablo committed Jul 9, 2015
    Configuration menu
    Copy the full SHA
    04383b8 View commit details
    Browse the repository at this point in the history

Commits on Jul 10, 2015

  1. Layer with labels was not being removed when switching to a basemap o… 

    …ther than `Tiled`
    @alonsogarciapablo
    alonsogarciapablo committed Jul 10, 2015
    Configuration menu
    Copy the full SHA
    d3eccdd View commit details
    Browse the repository at this point in the history

Commits on Jul 13, 2015

  1. Remove and re-add layer to collection of layers when layer is drag & … 

    …dropped.

This way the order of layers gets re-calculated correctly.
    @alonsogarciapablo
    alonsogarciapablo committed Jul 13, 2015
    Configuration menu
    Copy the full SHA
    be7ceb7 View commit details
    Browse the repository at this point in the history

  2. Bump cartodb.js

    @alonsogarciapablo
    alonsogarciapablo committed Jul 13, 2015
    Configuration menu
    Copy the full SHA
    3e41531 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2015

  1. Bump cartodb.js to latest develop

    @alonsogarciapablo
    alonsogarciapablo committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    54dee61 View commit details
    Browse the repository at this point in the history

  2. Merge remote-tracking branch 'origin/master' into labels-on-top

    @alonsogarciapablo
    alonsogarciapablo committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    2eef12b View commit details
    Browse the repository at this point in the history

  3. Bumped version of assets

    @alonsogarciapablo
    alonsogarciapablo committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    1e3e873 View commit details
    Browse the repository at this point in the history

  4. Updated NEWS.md

    @alonsogarciapablo
    alonsogarciapablo committed Jul 14, 2015
    Configuration menu
    Copy the full SHA
    db96999 View commit details
    Browse the repository at this point in the history