Remove use of hardcoded extents for displaying layers #332

crisner · 2020-01-08T11:40:04Z

Fixes #331 (<=== 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!

jywarren · 2020-01-08T16:24:34Z

src/layerData.json

-      "minZoom": 3,
-      "maxZoom": 15
-    }
+    "icon": "#096"


OK great! Did you manually check these to ensure they should work outside the previously created bounds? Forgive me, i forget - did we figure out how these bounds were originally established? They're huge!

I got the bounds for the initial map view and added it to the json file for those layers that didn't have bounds. And yes, I manually checked every layer added to the demo page and it works.

It didn't occur to me that I could code it to work when there were no bounds given at the time I wrote it. 😅

I got the bounds for JusticeMap layer by running map.getBounds(). Bounds and zoom for other layers were taken from the info.json file. I am not sure how they were established.

Yes they were figured the same way you did 😄

jywarren

wow this is a huge fix. Thanks!!

jywarren · 2020-01-08T16:26:30Z

Otherwise is this good to merge? Thank you!!!

crisner · 2020-01-08T16:36:13Z

Yes. Good for a merge. Thanks!

jywarren · 2020-01-08T19:10:11Z

Hi @crisner I noticed some possible duplication between https://github.com/publiclab/leaflet-environmental-layers/blob/master/src/layerData.json and https://github.com/publiclab/leaflet-environmental-layers/blob/master/src/info.json -- are these files redundant? Thank you!

crisner · 2020-01-09T05:56:17Z

info.json is used to pull in api url and extents data when creating layers. It is used when creating layers such as Wisconson, ToxicRelease, and other layers in layercode.js.

layerData.json is used to pull in data for the layer control menu. I created this file to add layer data that I collected and to avoid corrupting the layers in the process of working on the layer control. This reminds me that I should add some documentation for the control.

We could combine them so that the layer control and the layer files that use them can share the same json file and avoid duplication of data. I could take this up if you think it is better to merge them into a single file.

* Remove use of hardcoded extents for displaying layers (#332) * Fix embed code with duplicated text (#340) * Fix duplication of text in embed code * Update build file * Update README.md (#335) * Update README.md * Update README.md * Add check that layers group is not undefined when creating layers-sub-list (#339) Fixes #333 * Display new items mark in layers menu (#341) * Create function to check for available layers * Display badge to show new items * Save map instance in a variable * Update readme * Add contribute button to open infra map * Add media queries for size 235x300 (#346) * Add default basemap when undefined (#351) * Add default basemap when undefined * Update version number indicating bug-fix * [WIP] Add layers in include to map by default (#352) * Add unearthing layer to demo * Fix bug with removing points from the map on removeLayer * Add all layers in include param upon map initialization * bump to v2.1.9 * Implement new menu * Add new menu dependancies * Fix styles from overriding default leaflet classes * Refactor code * Fix styles for layer group name and layer description * Add option to disable layer visibility when param.include is true * Add option to use default layer control * Fix errors when trying to display layer when out of bounds * Add missing viewport meta tag * Move styles to LeafletEnvironmentalLayers.css * Update documentation * Add missing dependencies and update build * Fix error from unearthing layer on page reload * Set addLayersToMap options from param * Update documentation * Update AllLayers.js (#366) Fixed: Prevent use of the same default tile layer for multiple maps * Add PLpeopleLayer (#361) * add PLpeopleLayer to maps * fix function name to PLpeopleLayer * fix capital in function name * make naming consistent for both map examples * change layer name to PLpeople * version 2.2.0 and bump LBL to 1.7.0 (#368) * Feature/minimal mode (#356) * Create toggle mode control * Add marker for minimal mode * Change markers on mode change * Add condition and marker styles for eonet fires layer * Add minimal mode content to layers in layercode * Add minimal mode content to aqicn layer * Add minimal mode option * Refactor minimalMode control * Add mode control to one liner code * Add documentation to readme * Fix duplication of layers control, set simple layer control for demo * Add basic tests * Update build * 2.2.0 * Change button names and title * Update tests for mode control * Update build * Add demo with multiple maps in a single page * Add a check for jQuery and update build * Bug/fix missing layers in layer menu on refresh (#375) * Fix 'moveend' event check to affect only when removing layers from map * Add a check when adding minimal markers to confirm this._map exists * Update build * fix conflict * add parameter display to turn on layers * check if layer exists before turning it on * Remove conditions and code responsible for jquery duplication * Update link to jquery 3.3.1 and remove references to older versions * Move info.json outside iife and update build * Install cypress * published * Bug/fix layers not removed from map when hash false (#380) * Add error handling on removing unearthing from map * Remove redundant code * Comment out unused baselayer instantiation and update build * Uncomment baselayers * Reformat init defaults (#396) * rewrite init defaults * remove console.log * use L.Util.setOptions to set defaults * Add Cypress * Add tests to check leaflet left controls * Add tests for embed prompt and layers menu * Add child window to prevent iframe conflict on hash change * Add test to check hash update on map movement * Move hash test to a seperate file and increase delay * Set up http server for localhost * Ignore cypress screenshot and video folders * Set up cypress in travis * Oneliner/basic implementation tests (#397) * testing all the specs * using babel * add layer name id to broswer menu * leaflet not fully loading * recent tests * testing error in multiple maps * rewrite init defaults * basic one liner tests work * test shorter transpile files * emove jquery from gruntfile browserify dist * use L.Util.setOptions to set defaults * turn on basic tests again * disable babel-plugin-transform-object-rest-spread * clean up * rebase * add wisconsin layer back in and fix error * remove text-table files * add css file back in * fix merge errors * Edit and update documentation for more clarity (#367) * Add dependencies to documentation * Add updated documentation to readme * Add more information * Edit usage example for layer menu * Added links to more information * Update minimal mode documentation * Add files via upload * added a layerData folder containing the json file for sea level rise data Co-authored-by: Renisha Christie. A <29401459+crisner@users.noreply.github.com> Co-authored-by: Suyash Choudhary <57896905+sssash18@users.noreply.github.com> Co-authored-by: llabake <lemboyelabake@gmail.com> Co-authored-by: crisner <christie.reni@gmail.com> Co-authored-by: Sagarpreet Chadha <chadha.sagarpreet97@gmail.com> Co-authored-by: jywarren <jeff@unterbahn.com> Co-authored-by: z-arnott <50159450+z-arnott@users.noreply.github.com> Co-authored-by: Natalie St Jean <49460529+nstjean@users.noreply.github.com> Co-authored-by: Natalie <natalie.stjean@gmail.com> Co-authored-by: Cess <cessmbuguar@gmail.com>

Remove use of hardcoded extents for displaying layers

a10a180

crisner mentioned this pull request Jan 8, 2020

Track the bounding box of each layer, and display only those which intersect with current view #117

Open

crisner requested a review from sagarpreet-chadha January 8, 2020 15:03

crisner mentioned this pull request Jan 8, 2020

Outreachy project planning publiclab/plots2#6887

Closed

jywarren reviewed Jan 8, 2020

View reviewed changes

jywarren approved these changes Jan 8, 2020

View reviewed changes

jywarren merged commit d2fe214 into publiclab:master Jan 8, 2020

sssash18 mentioned this pull request Jan 8, 2020

Update README.md #335

Merged

5 tasks

crisner mentioned this pull request Feb 4, 2020

Outreachy Project Recap: summary, planning & discussion publiclab/plots2#7432

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Remove use of hardcoded extents for displaying layers #332

Remove use of hardcoded extents for displaying layers #332

crisner commented Jan 8, 2020 •

edited

Loading

jywarren Jan 8, 2020

crisner Jan 8, 2020

crisner Jan 8, 2020

crisner Jan 8, 2020

sagarpreet-chadha Jan 12, 2020

jywarren left a comment

jywarren commented Jan 8, 2020

crisner commented Jan 8, 2020

jywarren commented Jan 8, 2020

crisner commented Jan 9, 2020

Remove use of hardcoded extents for displaying layers #332

Remove use of hardcoded extents for displaying layers #332

Conversation

crisner commented Jan 8, 2020 • edited Loading

jywarren Jan 8, 2020

Choose a reason for hiding this comment

crisner Jan 8, 2020

Choose a reason for hiding this comment

crisner Jan 8, 2020

Choose a reason for hiding this comment

crisner Jan 8, 2020

Choose a reason for hiding this comment

sagarpreet-chadha Jan 12, 2020

Choose a reason for hiding this comment

jywarren left a comment

Choose a reason for hiding this comment

jywarren commented Jan 8, 2020

crisner commented Jan 8, 2020

jywarren commented Jan 8, 2020

crisner commented Jan 9, 2020

crisner commented Jan 8, 2020 •

edited

Loading