Labels on top #4286

alonsogarciapablo · 2015-07-03T09:13:58Z

No description provided.

…d` layers

…abels

…s on top

Cartofante · 2015-07-03T09:21:40Z

Frontend tests were OK 👍 (details)

Cartofante · 2015-07-03T11:53:41Z

Frontend tests were OK 👍 (details)

alonsogarciapablo · 2015-07-03T14:24:44Z

app/models/map.rb

@@ -267,9 +267,9 @@ def admits_more_torque_layers?
    torque_layers.length >= 1 && is_table_visualization? ? false : true
  end

+  # TODO: We need to allow more than one `tiled` layer now


This will be fixed in #4256. @Kartones, you can create a PR against this branch (labels-on-top).

Cartofante · 2015-07-03T14:25:21Z

Frontend tests were OK 👍 (details)

Cartofante · 2015-07-03T14:28:05Z

Frontend tests were OK 👍 (details)

Cartofante · 2015-07-06T09:10:51Z

Frontend tests were OK 👍 (details)

…on reset

alonsogarciapablo · 2015-07-06T10:52:23Z

lib/assets/javascripts/cartodb/models/map.js

@@ -466,32 +472,6 @@ cdb.admin.Layers = cdb.geo.Layers.extend({
    saveLayer(layers.at(count));
  },

-  /**


layers have an order attribute, which is updated every time a new layer is added to the collection. Unless I'm missing something, I think we can get rid of this custom reset and assume layers are ordered.

Cartofante · 2015-07-06T10:59:47Z

Frontend tests were OK 👍 (details)

Cartofante · 2015-07-06T13:45:03Z

Frontend tests were OK 👍 (details)

Cartofante · 2015-07-09T10:53:27Z

Frontend tests were OK 👍 (details)

Cartofante · 2015-07-09T16:35:06Z

Frontend tests were OK 👍 (details)

…ther than `Tiled`

Cartofante · 2015-07-10T11:15:34Z

Frontend tests were OK 👍 (details)

…dropped. This way the order of layers gets re-calculated correctly.

Cartofante · 2015-07-13T10:14:15Z

Frontend tests were OK 👍 (details)

Cartofante · 2015-07-13T13:52:31Z

Frontend tests were OK 👍 (details)

alonsogarciapablo · 2015-07-13T14:17:47Z

This should be now ready to be merged! \o/

@xavijam would you mind taking a look at it? Thanks, thanks and thanks!

xavijam · 2015-07-13T14:20:11Z

app/controllers/carto/api/users_controller.rb

@@ -69,7 +69,6 @@ def render_auth_users_data(user, referrer, subdomain, referrer_organization_user
          email: user.email,
          organization: Carto::Api::OrganizationPresenter.new(user.organization).to_poro,
          base_url: user.public_url,
-          feature_flags: user.feature_flag_names


ping @Kartones

Part of this PR is removing this temporary hack and this line was added then.

Have you checked everything is working properly? If so 👍.

xavijam · 2015-07-13T14:40:23Z

And, have you checked google basemaps (under google_maps flag) are working properly?

alonsogarciapablo · 2015-07-13T14:45:42Z

Yes! Google basemaps work 👍

xavijam · 2015-07-13T14:46:23Z

In that case 🇬🇧

alonsogarciapablo · 2015-07-13T15:06:29Z

Thanks @xavijam!

Cartofante · 2015-07-14T07:10:05Z

Frontend tests were OK 👍 (details)

Cartofante · 2015-07-14T07:19:52Z

Frontend tests were OK 👍 (details)

Cartofante · 2015-07-14T07:40:28Z

Frontend tests were OK 👍 (details)

Cartofante · 2015-07-14T07:45:24Z

Frontend tests were OK 👍 (details)

Labels on top

alonsogarciapablo added 7 commits July 1, 2015 16:25

Added tests and splitted long method

939daf6

Test setting a basemap with labels on top

7f04468

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

626acd2

…d` layers

Pass labels key when adding basemaps to the collection of baseLayers

97990b7

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

102aa92

…abels

moveToFront only moves layers on top of data layers

a15b19d

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

63410f2

…s on top

New basemaps!

4d69880

alonsogarciapablo added 4 commits July 3, 2015 16:13

Changed className of basemap

f1e1a7c

Fixed tests

91e0999

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

4ed4da8

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

921e357

alonsogarciapablo reviewed Jul 3, 2015
View reviewed changes

alonsogarciapablo added 4 commits July 3, 2015 17:38

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

d072cea

Extracted smaller methods

d8307eb

Fixed and grouped related tests

72870f4

Fixed another test and stubbed layer.save

7b0a62c

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

ad0a46b

…on reset

alonsogarciapablo reviewed Jul 6, 2015
View reviewed changes

alonsogarciapablo mentioned this pull request Jul 6, 2015

Possibility to save all map layers at the same time #4251

Merged

Labels layer needs to be saved when updated

41afd6b

alonsogarciapablo added 2 commits July 6, 2015 16:29

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

fc0a4b4

Updated cartodb.js

271ced3

Updated cartodb.js

04383b8

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

d3eccdd

…ther than `Tiled`

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

be7ceb7

…dropped. This way the order of layers gets re-calculated correctly.

Bump cartodb.js

3e41531

xavijam reviewed Jul 13, 2015
View reviewed changes

Bump cartodb.js to latest develop

54dee61

alonsogarciapablo changed the title ~~[WIP] Labels on top~~ Labels on top Jul 14, 2015

alonsogarciapablo added 3 commits July 14, 2015 09:10

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

2eef12b

Bumped version of assets

1e3e873

Updated NEWS.md

db96999

alonsogarciapablo added a commit that referenced this pull request Jul 14, 2015

Merge pull request #4286 from CartoDB/labels-on-top

83f4709

Labels on top

alonsogarciapablo merged commit 83f4709 into master Jul 14, 2015

alonsogarciapablo deleted the labels-on-top branch July 14, 2015 07:53

alonsogarciapablo mentioned this pull request Jul 14, 2015

Add labels sandwich option to the editor #4148

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Labels on top #4286

Labels on top #4286

alonsogarciapablo commented Jul 3, 2015

Cartofante commented Jul 3, 2015

Cartofante commented Jul 3, 2015

alonsogarciapablo Jul 3, 2015

Cartofante commented Jul 3, 2015

Cartofante commented Jul 3, 2015

Cartofante commented Jul 6, 2015

alonsogarciapablo Jul 6, 2015

Cartofante commented Jul 6, 2015

Cartofante commented Jul 6, 2015

Cartofante commented Jul 9, 2015

Cartofante commented Jul 9, 2015

Cartofante commented Jul 10, 2015

Cartofante commented Jul 13, 2015

Cartofante commented Jul 13, 2015

alonsogarciapablo commented Jul 13, 2015

xavijam Jul 13, 2015

xavijam Jul 13, 2015

alonsogarciapablo Jul 13, 2015

Kartones Jul 13, 2015

xavijam Jul 13, 2015

xavijam commented Jul 13, 2015

alonsogarciapablo commented Jul 13, 2015

xavijam commented Jul 13, 2015

alonsogarciapablo commented Jul 13, 2015

Cartofante commented Jul 14, 2015

Cartofante commented Jul 14, 2015

Cartofante commented Jul 14, 2015

Cartofante commented Jul 14, 2015

Labels on top #4286

Labels on top #4286

Conversation

alonsogarciapablo commented Jul 3, 2015

Cartofante commented Jul 3, 2015

Cartofante commented Jul 3, 2015

alonsogarciapablo Jul 3, 2015

Choose a reason for hiding this comment

Cartofante commented Jul 3, 2015

Cartofante commented Jul 3, 2015

Cartofante commented Jul 6, 2015

alonsogarciapablo Jul 6, 2015

Choose a reason for hiding this comment

Cartofante commented Jul 6, 2015

Cartofante commented Jul 6, 2015

Cartofante commented Jul 9, 2015

Cartofante commented Jul 9, 2015

Cartofante commented Jul 10, 2015

Cartofante commented Jul 13, 2015

Cartofante commented Jul 13, 2015

alonsogarciapablo commented Jul 13, 2015

xavijam Jul 13, 2015

Choose a reason for hiding this comment

xavijam Jul 13, 2015

Choose a reason for hiding this comment

alonsogarciapablo Jul 13, 2015

Choose a reason for hiding this comment

Kartones Jul 13, 2015

Choose a reason for hiding this comment

xavijam Jul 13, 2015

Choose a reason for hiding this comment

xavijam commented Jul 13, 2015

alonsogarciapablo commented Jul 13, 2015

xavijam commented Jul 13, 2015

alonsogarciapablo commented Jul 13, 2015

Cartofante commented Jul 14, 2015

Cartofante commented Jul 14, 2015

Cartofante commented Jul 14, 2015

Cartofante commented Jul 14, 2015