Merge lp:~jindallo/nearby-scope/convergence-ui-support into lp:nearby-scope

Proposed by Jin on 2016-07-12
Status: Merged
Approved by: Jin on 2016-08-03
Approved revision: 100
Merged at revision: 102
Proposed branch: lp:~jindallo/nearby-scope/convergence-ui-support
Merge into: lp:nearby-scope
Diff against target: 257 lines (+28/-28) (has conflicts)
1 file modified
click-src/aggregator/child_scopes.json (+28/-28)
Contents conflict in click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so
To merge this branch: bzr merge lp:~jindallo/nearby-scope/convergence-ui-support
Reviewer Review Type Date Requested Status
Kyle Nitzsche 2016-07-12 Approve on 2016-08-02
NearBy Scope Team 2016-07-12 Pending
Review via email: mp+299778@code.launchpad.net
To post a comment you must log in.
100. By Jin on 2016-07-19

Library rebased to 4.9 for NearBy aggregator

Kyle Nitzsche (knitzsche) wrote :

Hi Jin,

I assume you tested:
* in a fake location (like London) that has full results
* on tablet landscape & portrait
* on something small (like krillin)

Kyle Nitzsche (knitzsche) wrote :

Hi Jin,

The general approach we discussed is to:
* use high cardinalities to ensure their are enough results to fill in the rows
* limit vertical space in different layouts with collapsed-rows

It seems that this often takes a different approach:
* set collapsed-rows to 0 (which IIRC means show them all without limit)
* limit the number of results with cardinality

Is there a reason you did it this way? Or would you consider doing it the way we discussed?

cheers

Jin (jindallo) wrote :

Hello Kyle,

I used the way we discussed/agreed to implement this patch,
which means:
    1. set collapsed-rows to 0 -> 1
    2. set cardinality to big enough -> 10

Please kindly have a look on below diff,
it followed the approach we discussed.

Many thanks!

Kyle Nitzsche (knitzsche) wrote :

Looks good Jin. Thanks.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'click-src/aggregator/child_scopes.json'
--- click-src/aggregator/child_scopes.json 2015-12-24 05:43:05 +0000
+++ click-src/aggregator/child_scopes.json 2016-07-19 01:18:48 +0000
@@ -14,7 +14,7 @@
14 "card-layout": "vertical",14 "card-layout": "vertical",
15 "card-size": "medium",15 "card-size": "medium",
16 "category-layout": "grid",16 "category-layout": "grid",
17 "collapsed-rows": 017 "collapsed-rows": 1
18 }18 }
19 }19 }
20 },20 },
@@ -29,7 +29,7 @@
29 "template": {29 "template": {
30 "card-size": "small",30 "card-size": "small",
31 "category-layout": "grid",31 "category-layout": "grid",
32 "collapsed-rows": 032 "collapsed-rows": 1
33 }33 }
34 }34 }
35 },35 },
@@ -44,7 +44,7 @@
44 "template": {44 "template": {
45 "card-size": "small",45 "card-size": "small",
46 "category-layout": "grid",46 "category-layout": "grid",
47 "collapsed-rows": 047 "collapsed-rows": 1
48 }48 }
49 }49 }
50 },50 },
@@ -91,7 +91,7 @@
91 "template": {91 "template": {
92 "card-size": "small",92 "card-size": "small",
93 "category-layout": "grid",93 "category-layout": "grid",
94 "collapsed-rows": 094 "collapsed-rows": 1
95 }95 }
96 }96 }
97 },97 },
@@ -108,7 +108,7 @@
108 "template": {108 "template": {
109 "card-size": "small",109 "card-size": "small",
110 "category-layout": "grid",110 "category-layout": "grid",
111 "collapsed-rows": 0111 "collapsed-rows": 1
112 }112 }
113 }113 }
114 },114 },
@@ -174,7 +174,7 @@
174 "template": {174 "template": {
175 "card-size": "small",175 "card-size": "small",
176 "category-layout": "grid",176 "category-layout": "grid",
177 "collapsed-rows": 0177 "collapsed-rows": 1
178 }178 }
179 }179 }
180 }180 }
@@ -230,7 +230,7 @@
230 "scope": {230 "scope": {
231 "_category_title": "Weather from The Weather Channel",231 "_category_title": "Weather from The Weather Channel",
232 "department": "dept-how",232 "department": "dept-how",
233 "cardinality": 3,233 "cardinality": 10,
234 "id": "com.canonical.scopes.weatherchannel",234 "id": "com.canonical.scopes.weatherchannel",
235 "link_to_child": "true",235 "link_to_child": "true",
236 "local_id": "twc1",236 "local_id": "twc1",
@@ -252,7 +252,7 @@
252 {252 {
253 "scope": {253 "scope": {
254 "_category_title": "Landmarks around you from Yelp",254 "_category_title": "Landmarks around you from Yelp",
255 "cardinality": 6,255 "cardinality": 10,
256 "child_department": "landmarks",256 "child_department": "landmarks",
257 "department": "dept-how",257 "department": "dept-how",
258 "id": "com.canonical.scopes.yelp_yelp",258 "id": "com.canonical.scopes.yelp_yelp",
@@ -264,7 +264,7 @@
264 {264 {
265 "scope": {265 "scope": {
266 "_category_title": "Closest from Yelp",266 "_category_title": "Closest from Yelp",
267 "cardinality": 4,267 "cardinality": 10,
268 "department": "dept-how",268 "department": "dept-how",
269 "id": "com.canonical.scopes.yelp_yelp",269 "id": "com.canonical.scopes.yelp_yelp",
270 "link_to_child": "true",270 "link_to_child": "true",
@@ -281,7 +281,7 @@
281 {281 {
282 "scope": {282 "scope": {
283 "_category_title": "NearBy from Flickr",283 "_category_title": "NearBy from Flickr",
284 "cardinality": 9,284 "cardinality": 10,
285 "department": "dept-how",285 "department": "dept-how",
286 "id": "com.canonical.scopes.flickr_nearby",286 "id": "com.canonical.scopes.flickr_nearby",
287 "link_to_child": "true",287 "link_to_child": "true",
@@ -330,7 +330,7 @@
330 {330 {
331 "scope": {331 "scope": {
332 "_category_title": "Weather from The Weather Channel",332 "_category_title": "Weather from The Weather Channel",
333 "cardinality": 3,333 "cardinality": 10,
334 "department": "dept-bored",334 "department": "dept-bored",
335 "id": "com.canonical.scopes.weatherchannel",335 "id": "com.canonical.scopes.weatherchannel",
336 "link_to_child": "true",336 "link_to_child": "true",
@@ -353,7 +353,7 @@
353 {353 {
354 "scope": {354 "scope": {
355 "_category_title": "Landmarks around you from Yelp",355 "_category_title": "Landmarks around you from Yelp",
356 "cardinality": 6,356 "cardinality": 10,
357 "child_department": "landmarks",357 "child_department": "landmarks",
358 "department": "dept-bored",358 "department": "dept-bored",
359 "id": "com.canonical.scopes.yelp_yelp",359 "id": "com.canonical.scopes.yelp_yelp",
@@ -365,7 +365,7 @@
365 {365 {
366 "scope": {366 "scope": {
367 "_category_title": "Closest from Yelp",367 "_category_title": "Closest from Yelp",
368 "cardinality": 4,368 "cardinality": 10,
369 "department": "dept-bored",369 "department": "dept-bored",
370 "id": "com.canonical.scopes.yelp_yelp",370 "id": "com.canonical.scopes.yelp_yelp",
371 "link_to_child": "true",371 "link_to_child": "true",
@@ -382,7 +382,7 @@
382 {382 {
383 "scope": {383 "scope": {
384 "_category_title": "NearBy from Flickr",384 "_category_title": "NearBy from Flickr",
385 "cardinality": 9,385 "cardinality": 10,
386 "department": "dept-bored",386 "department": "dept-bored",
387 "id": "com.canonical.scopes.flickr_nearby",387 "id": "com.canonical.scopes.flickr_nearby",
388 "link_to_child": "true",388 "link_to_child": "true",
@@ -431,7 +431,7 @@
431 {431 {
432 "scope": {432 "scope": {
433 "_category_title": "Weather from The Weather Channel",433 "_category_title": "Weather from The Weather Channel",
434 "cardinality": 3,434 "cardinality": 10,
435 "department": "dept-onthemove",435 "department": "dept-onthemove",
436 "id": "com.canonical.scopes.weatherchannel",436 "id": "com.canonical.scopes.weatherchannel",
437 "link_to_child": "true",437 "link_to_child": "true",
@@ -510,14 +510,14 @@
510 "id": "com.canonical.scopes.poi_poi",510 "id": "com.canonical.scopes.poi_poi",
511 "link_to_child": "true",511 "link_to_child": "true",
512 "local_id": "poi-atm",512 "local_id": "poi-atm",
513 "cardinality": 6,513 "cardinality": 10,
514 "renderer_common_id": "point-of-interest"514 "renderer_common_id": "point-of-interest"
515 }515 }
516 },516 },
517 {517 {
518 "scope": {518 "scope": {
519 "_category_title": "Traffic cameras around you",519 "_category_title": "Traffic cameras around you",
520 "cardinality": 3,520 "cardinality": 10,
521 "child_department": "Cameras",521 "child_department": "Cameras",
522 "department": "dept-onthemove",522 "department": "dept-onthemove",
523 "id": "com.canonical.scopes.inrix_inrix",523 "id": "com.canonical.scopes.inrix_inrix",
@@ -534,7 +534,7 @@
534 "template": {534 "template": {
535 "card-size": "small",535 "card-size": "small",
536 "category-layout": "grid",536 "category-layout": "grid",
537 "collapsed-rows": 0537 "collapsed-rows": 1
538 }538 }
539 }539 }
540 }540 }
@@ -579,7 +579,7 @@
579 {579 {
580 "scope": {580 "scope": {
581 "_category_title": "ATMs near you",581 "_category_title": "ATMs near you",
582 "cardinality": 3,582 "cardinality": 10,
583 "child_department": "atm",583 "child_department": "atm",
584 "department": "dept-hungry",584 "department": "dept-hungry",
585 "id": "com.canonical.scopes.poi_poi",585 "id": "com.canonical.scopes.poi_poi",
@@ -610,7 +610,7 @@
610 {610 {
611 "scope": {611 "scope": {
612 "_category_title": "Bars from Yelp",612 "_category_title": "Bars from Yelp",
613 "cardinality": 4,613 "cardinality": 10,
614 "child_department": "bars",614 "child_department": "bars",
615 "department": "dept-thirsty",615 "department": "dept-thirsty",
616 "id": "com.canonical.scopes.yelp_yelp",616 "id": "com.canonical.scopes.yelp_yelp",
@@ -628,7 +628,7 @@
628 {628 {
629 "scope": {629 "scope": {
630 "_category_title": "Coffee and Tea from Yelp",630 "_category_title": "Coffee and Tea from Yelp",
631 "cardinality": 4,631 "cardinality": 10,
632 "child_department": "coffee",632 "child_department": "coffee",
633 "department": "dept-thirsty",633 "department": "dept-thirsty",
634 "id": "com.canonical.scopes.yelp_yelp",634 "id": "com.canonical.scopes.yelp_yelp",
@@ -646,7 +646,7 @@
646 {646 {
647 "scope": {647 "scope": {
648 "_category_title": "ATMs near you",648 "_category_title": "ATMs near you",
649 "cardinality": 3,649 "cardinality": 10,
650 "child_department": "atm",650 "child_department": "atm",
651 "department": "dept-thirsty",651 "department": "dept-thirsty",
652 "id": "com.canonical.scopes.poi_poi",652 "id": "com.canonical.scopes.poi_poi",
@@ -665,7 +665,7 @@
665 {665 {
666 "scope": {666 "scope": {
667 "_category_title": "Weather from The Weather Channel",667 "_category_title": "Weather from The Weather Channel",
668 "cardinality": 3,668 "cardinality": 10,
669 "department": "dept-stressed",669 "department": "dept-stressed",
670 "id": "com.canonical.scopes.weatherchannel",670 "id": "com.canonical.scopes.weatherchannel",
671 "link_to_child": "true",671 "link_to_child": "true",
@@ -688,7 +688,7 @@
688 {688 {
689 "scope": {689 "scope": {
690 "_category_title": "Spas from Yelp",690 "_category_title": "Spas from Yelp",
691 "cardinality": 4,691 "cardinality": 10,
692 "child_department": "beautysvc",692 "child_department": "beautysvc",
693 "department": "dept-stressed",693 "department": "dept-stressed",
694 "id": "com.canonical.scopes.yelp_yelp",694 "id": "com.canonical.scopes.yelp_yelp",
@@ -706,7 +706,7 @@
706 {706 {
707 "scope": {707 "scope": {
708 "_category_title": "Fashion from Yelp",708 "_category_title": "Fashion from Yelp",
709 "cardinality": 4,709 "cardinality": 10,
710 "child_department": "fashion",710 "child_department": "fashion",
711 "department": "dept-stressed",711 "department": "dept-stressed",
712 "id": "com.canonical.scopes.yelp_yelp",712 "id": "com.canonical.scopes.yelp_yelp",
@@ -724,7 +724,7 @@
724 {724 {
725 "scope": {725 "scope": {
726 "_category_title": "ATMs near you",726 "_category_title": "ATMs near you",
727 "cardinality": 3,727 "cardinality": 10,
728 "child_department": "atm",728 "child_department": "atm",
729 "department": "dept-stressed",729 "department": "dept-stressed",
730 "id": "com.canonical.scopes.poi_poi",730 "id": "com.canonical.scopes.poi_poi",
@@ -736,7 +736,7 @@
736 {736 {
737 "scope": {737 "scope": {
738 "_category_title": "Games to let off some steam",738 "_category_title": "Games to let off some steam",
739 "cardinality": 3,739 "cardinality": 10,
740 "child_department": "games",740 "child_department": "games",
741 "department": "dept-stressed",741 "department": "dept-stressed",
742 "id": "com.canonical.scopes.clickstore",742 "id": "com.canonical.scopes.clickstore",
@@ -748,7 +748,7 @@
748 {748 {
749 "scope": {749 "scope": {
750 "_category_title": "Relax with some music",750 "_category_title": "Relax with some music",
751 "cardinality": 3,751 "cardinality": 10,
752 "child_department": "genre-ambient",752 "child_department": "genre-ambient",
753 "department": "dept-stressed",753 "department": "dept-stressed",
754 "id": "com.canonical.scopes.sevendigital",754 "id": "com.canonical.scopes.sevendigital",
755755
=== renamed file 'click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so' => 'click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so.OTHER' (properties changed: +x to -x)
756Binary files click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so 2016-07-13 15:33:23 +0000 and click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so.OTHER 2016-07-19 01:18:48 +0000 differ756Binary files click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so 2016-07-13 15:33:23 +0000 and click-src/aggregator/libcom.canonical.scopes.aggregator_aggregator.so.OTHER 2016-07-19 01:18:48 +0000 differ

Subscribers

People subscribed via source and target branches

to all changes: