Add subitems to layers (either layers or controls or a mixture of both) by HaudinFlorence · Pull Request #1011 · jupyter-widgets/ipyleaflet

HaudinFlorence · 2022-07-01T16:14:12Z

Add subitems to layers (either layers or controls or a mixture of both).

davidbrochart

Could you rebase on master?

examples/Choropleth.ipynb

examples/Subitems.ipynb

ipyleaflet/leaflet.py

HaudinFlorence · 2022-08-10T17:31:28Z

Could you rebase on master?

Thanks for the review. Rebase has been made.

js/src/Map.js

ipyleaflet/leaflet.py

js/src/Map.js

martinRenou

It would be great to add a galata test for this :)

js/src/Map.js

ipyleaflet/leaflet.py

HaudinFlorence · 2022-09-06T15:41:30Z

It would be great to add a galata test for this :)

A notebook has been added in ui-tests/notebooks in e0b19ac, to test adding subitems in layers and check that they correctly display.

HaudinFlorence · 2022-09-07T09:49:44Z

please update galata references

HaudinFlorence · 2022-09-08T07:24:23Z

Please update galata reference

HaudinFlorence · 2022-09-12T11:46:44Z

please update galata references

HaudinFlorence · 2022-09-12T13:14:42Z

please update galata references

HaudinFlorence · 2022-09-15T09:30:55Z

The CI tests are now green. Is there other things I may add or check ?

martinRenou · 2022-09-15T09:34:36Z

Thanks! I will give the PR a try. I suspect there is a bug when you create the map in a first Notebook cell, and add the layers with sub-layers in a separate cell.

setup.py

martinRenou · 2022-09-15T09:50:00Z

I suspect there is a bug when you create the map in a first Notebook cell, and add the layers with sub-layers in a separate cell.

Indeed there is an issue when the Map is shown before adding the layers with sub-items, as seen in this screenshot (the first map view does not have the subitems visible, the second map view has them):

ipyleaflet/leaflet.py

js/src/layers/Layer.js

HaudinFlorence · 2022-09-21T16:51:28Z

please update galata references

HaudinFlorence · 2022-09-22T10:41:28Z

please update galata references

…eIcon subitem, in ui-tests/notebooks/Subitems.ipynb.

…s at the scale of the layer.

Co-authored-by: martinRenou <martin.renou@gmail.com>

…he failing rendering widgets test.

HaudinFlorence · 2022-09-22T17:52:15Z

please update galata references

martinRenou · 2022-09-23T07:39:33Z

please update galata references

martinRenou · 2022-09-23T08:23:24Z

please update galata references

martinRenou · 2022-09-23T08:46:11Z

Please update galata references, this time it should probably work :D

martinRenou · 2022-09-23T09:08:08Z

update galata references

martinRenou · 2022-09-23T09:22:53Z

Triggering CI

martinRenou

Thank you!!!

HaudinFlorence · 2022-09-23T09:42:01Z

Thank you!!!

Thanks a lot for the review and help on this PR !

HaudinFlorence force-pushed the add_subitems_to_layers branch from a8cdd1d to 3cb5d62 Compare July 1, 2022 16:40

davidbrochart changed the title ~~Add subitems to layers (either layers or controls or a mixture or both).~~ Add subitems to layers (either layers or controls or a mixture of both) Jul 4, 2022

davidbrochart reviewed Aug 9, 2022

View reviewed changes

examples/Choropleth.ipynb Outdated Show resolved Hide resolved

examples/Subitems.ipynb Outdated Show resolved Hide resolved

ipyleaflet/leaflet.py Outdated Show resolved Hide resolved

ipyleaflet/leaflet.py Outdated Show resolved Hide resolved

HaudinFlorence force-pushed the add_subitems_to_layers branch from e75220b to afd2370 Compare August 10, 2022 17:30

HaudinFlorence force-pushed the add_subitems_to_layers branch 2 times, most recently from 38dfc81 to 1aa9b8f Compare September 5, 2022 12:02

martinRenou reviewed Sep 5, 2022

View reviewed changes

js/src/Map.js Outdated Show resolved Hide resolved

js/src/Map.js Outdated Show resolved Hide resolved

js/src/Map.js Outdated Show resolved Hide resolved

ipyleaflet/leaflet.py Outdated Show resolved Hide resolved

martinRenou requested changes Sep 6, 2022

View reviewed changes

js/src/Map.js Outdated Show resolved Hide resolved

js/src/Map.js Outdated Show resolved Hide resolved

js/src/Map.js Outdated Show resolved Hide resolved

js/src/Map.js Outdated Show resolved Hide resolved

js/src/Map.js Outdated Show resolved Hide resolved

HaudinFlorence force-pushed the add_subitems_to_layers branch from e514e31 to 3bfa4c1 Compare September 6, 2022 14:30

martinRenou requested changes Sep 6, 2022

View reviewed changes

js/src/Map.js Outdated Show resolved Hide resolved

js/src/Map.js Outdated Show resolved Hide resolved

ipyleaflet/leaflet.py Outdated Show resolved Hide resolved

HaudinFlorence force-pushed the add_subitems_to_layers branch from 8f1ecfa to 6fe5c64 Compare September 12, 2022 11:24

HaudinFlorence force-pushed the add_subitems_to_layers branch from daebc35 to b077f75 Compare September 12, 2022 12:00

martinRenou requested changes Sep 15, 2022

View reviewed changes

setup.py Outdated Show resolved Hide resolved

HaudinFlorence force-pushed the add_subitems_to_layers branch from b442492 to dd8dce0 Compare September 20, 2022 14:00

martinRenou requested changes Sep 20, 2022

View reviewed changes

ipyleaflet/leaflet.py Outdated Show resolved Hide resolved

js/src/layers/Layer.js Outdated Show resolved Hide resolved

js/src/layers/Layer.js Show resolved Hide resolved

js/src/layers/Layer.js Show resolved Hide resolved

HaudinFlorence force-pushed the add_subitems_to_layers branch from 63bfb8c to 6f2aeb1 Compare September 21, 2022 15:36

HaudinFlorence added 3 commits September 22, 2022 16:32

Add subitems to a layer (either layers or controls).

f791429

Update the example notebook Subitems.ipynb.

e89f60f

Fix flake8 formatting issue.

bdd4af2

HaudinFlorence and others added 13 commits September 22, 2022 19:18

Re try CI tests.

30558c3

Update Playwright Snapshots

b62bf9a

Fix the failing ui-test by setting spin to false for the icon1 Awesom…

5c1ede7

…eIcon subitem, in ui-tests/notebooks/Subitems.ipynb.

Remove the marker with an icon and replace it by a simple one.

c992a40

Restore the marker with the icon.

e53dc31

Update Playwright Snapshots

70aa0b7

Retry CI tests after the update of the galata references.

7bedabf

Update Layer.js and Map.js to deal with the model and view of subitem…

57c8fa1

…s at the scale of the layer.

Update Layer.js and the example notebook Subitems.ipynb.

88f78fc

Update setup.py

b4f91bb

Co-authored-by: martinRenou <martin.renou@gmail.com>

Add pandas dependency in tests and fix linting in Layers.js.

e4b2804

Remove pandas version in tests dependencies.

095ff12

Change layer2 basemap in ui-tests/notebooks/Subitems, to try to fix t…

c52fc55

…he failing rendering widgets test.

HaudinFlorence force-pushed the add_subitems_to_layers branch from 3b15ce7 to c52fc55 Compare September 22, 2022 17:24

Suppress an empty cell in ui-tests/notebooks/Subitems.ipynb.

e286bf1

Remove ui-tests/tests/ipyleaflet.test.ts-snapshots/Subitems-linux.png.

6e102e8

HaudinFlorence force-pushed the add_subitems_to_layers branch from 235c73b to 6e102e8 Compare September 23, 2022 09:00

Merge branch 'master' into add_subitems_to_layers

9481f92

Update Playwright Snapshots

5552afc

martinRenou closed this Sep 23, 2022

martinRenou reopened this Sep 23, 2022

martinRenou approved these changes Sep 23, 2022

View reviewed changes

martinRenou merged commit 50dc472 into jupyter-widgets:master Sep 23, 2022

Conversation

HaudinFlorence commented Jul 1, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

davidbrochart left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

HaudinFlorence commented Aug 10, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

martinRenou left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

HaudinFlorence commented Sep 6, 2022

Uh oh!

HaudinFlorence commented Sep 7, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HaudinFlorence commented Sep 8, 2022

Uh oh!

HaudinFlorence commented Sep 12, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

HaudinFlorence commented Sep 12, 2022

Uh oh!

HaudinFlorence commented Sep 15, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

martinRenou commented Sep 15, 2022

Uh oh!

Uh oh!

martinRenou commented Sep 15, 2022

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

HaudinFlorence commented Sep 21, 2022

Uh oh!

HaudinFlorence commented Sep 22, 2022

Uh oh!

HaudinFlorence commented Sep 22, 2022

Uh oh!

martinRenou commented Sep 23, 2022

Uh oh!

martinRenou commented Sep 23, 2022

Uh oh!

martinRenou commented Sep 23, 2022

Uh oh!

martinRenou commented Sep 23, 2022

Uh oh!

martinRenou commented Sep 23, 2022

Uh oh!

martinRenou left a comment

Choose a reason for hiding this comment

Uh oh!

HaudinFlorence commented Sep 23, 2022

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

HaudinFlorence commented Jul 1, 2022 •

edited

Loading

HaudinFlorence commented Aug 10, 2022 •

edited

Loading

HaudinFlorence commented Sep 7, 2022 •

edited

Loading

HaudinFlorence commented Sep 12, 2022 •

edited

Loading

HaudinFlorence commented Sep 15, 2022 •

edited

Loading