[WIP] Add layers in include to map by default

[crisner]

Fixes #349 (<=== Add issue number here)

Make sure these boxes are checked before your pull request (PR) is ready to be reviewed and merged. Thanks!

• PR is descriptively titled 📑 and links the original issue above 🔗
• tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR
• code is in uniquely-named feature branch and has no merge conflicts 📁
• screenshots/GIFs are attached 📎 in case of UI updation
• ask @publiclab/reviewers for help, in a comment below

We're happy to help you get this ready -- don't be afraid to ask for help, and don't be discouraged if your tests fail at first!

If tests do fail, click on the red X to learn why by reading the logs.

Please be sure you've reviewed our contribution guidelines at https://publiclab.org/contributing-to-public-lab-software

Thanks!

[crisner]

Work done:

• Added Unearthing layer to demo
• Fixed a bug where the points from the Unearthing layer weren't removed from the map after unchecking the layer on the layers control
• Fixed code to add all layers to map upon initialization if layers are passed through the include param
  • Now all layers would be visible on the map upon initialization
  • The status of the layers cannot be tracked for embed purposes. All the layers will always will be loaded on the map even if the embed code does not have the layers in its hash

Screenshot of unearthing-pvd.html upon initialization:

[crisner]

@jywarren, It looks like all layers are passed into the include param for the map page, publiclab.org/map here:
https://github.com/publiclab/plots2/blob/46af8030c82fe8346702edbaf917bfeb9e229163/app/views/map/map.html.erb#L104

We should either remove that line or add an extra option param to indicate whether we need the included layers to be displayed upon initialization.

[crisner]

Also, it looks like all layers are not included in the map page here: https://publiclab.org/map
Was then an intended change @jywarren, @sagarpreet-chadha, @nstjean ?

[nstjean]

I didn't do anything with the layers on that page, so I think it wasn't complete yet and they need to be added.

[jywarren]

Great work!!! I'll bump the version number and publish this!

[jywarren]

Er, sorry - is this ready to be merged? Given that it's causing an issue on the live site, I'd like to prioritize the narrower fix now, and if you'd like to expand on it in a follow-up, that's great!

Thanks for responding so quickly to this!

Also, it looks like all layers are not included in the map page here: https://publiclab.org/map

I'm not sure, but that page is still new - i think it should have the new menu and all available layers!

Thank you!

[crisner]

Well, as a narrower fix it is ready to merge. This may probably need a follow up when I implement the new menu. Thanks!

[jywarren]

Thank you!!!

[crisner]

@jywarren, I see this has been published! 🎉
I bumped LEL in my forked copy of the plots2 repo to check if the changes have been reflected correctly and it indeed has! Awesome! 🎉

• checked embed code in /map
• checked if layers are displayed by default
• checked for errors from LEL in the console

[crisner]

Also, I checked the issue with the fontawesome icon not displaying on the map. Installing this package: https://www.npmjs.com/package/@fortawesome/fontawesome-free, and adding the stylesheet to the application.html.erb does the trick. If you are okay with this I could perhaps open an FTO issue on plots2.

[sagarpreet-chadha]

How did this logic got removed?

[crisner]

These lines were added. The ones that were removed are here: https://github.com/publiclab/leaflet-environmental-layers/blame/00c10f2c157a90a1d98a0254a061f9d6dd8f4c57/src/AllLayers.js#L123-L125

[jywarren]

adding the fontawesome would be great. Thanks!

…

On Fri, Jan 17, 2020 at 9:39 AM Renisha Christie. A < ***@***.***> wrote: ***@***.**** commented on this pull request. ------------------------------ In src/AllLayers.js <#352 (comment)> : > @@ -133,6 +137,14 @@ L.LayerGroup.environmentalLayers = L.LayerGroup.extend( // Update map state from hash hash.update(this.options.currentHash); } + + for (let layer of this.options.layers.include) { + if (!this.options.addLayersToMap) { These lines were added. The ones that were removed are here: https://github.com/publiclab/leaflet-environmental-layers/blame/00c10f2c157a90a1d98a0254a061f9d6dd8f4c57/src/AllLayers.js#L123-L125 — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub <#352?email_source=notifications&email_token=AAAF6JZ647P2MKVBUIR3V2DQ6G7IRA5CNFSM4KHU3FMKYY3PNVWWK3TUL52HS4DFWFIHK3DMKJSXC5LFON2FEZLWNFSXPKTDN5WW2ZLOORPWSZGOCSFHZXY#discussion_r367967445>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AAAF6J4FL46LXB3CJWB5KBLQ6G7IRANCNFSM4KHU3FMA> .