Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Script to generate new spreadsheet layers #531

Merged
merged 7 commits into from
Aug 3, 2021
Merged

Script to generate new spreadsheet layers #531

merged 7 commits into from
Aug 3, 2021

Conversation

daemon1024
Copy link
Member

@daemon1024 daemon1024 commented Jun 20, 2021 •
edited
Loading

Fixes #528

TODO

  • Document Usage
  • Handle other columns other than lat and long for more informative map layer
  • use custom pop up function
  • use custom marker
  • Tests

@welcome
Copy link

welcome bot commented Jun 20, 2021

Thanks for opening this pull request! This space is protected by our Code of Conduct - and we're here to help.
Dangerbot will test out your code and reply in a bit with some pointers and requests.
There may be some errors, but don't worry! We'll work through them with you! 👍🎉😄
It would be great if you can tell us your Twitter handle so we can thank you properly?

@gitpod-io
Copy link

gitpod-io bot commented Jun 20, 2021

@daemon1024
Copy link
Member Author

Currently the script doesn't handle adding to AllLayers.js, I am still figuring out the architectural changes required for a better way to handle that.

@daemon1024 daemon1024 changed the title Initial Script to generate new spreadsheet layers Script to generate new spreadsheet layers Jun 21, 2021
@daemon1024 daemon1024 mentioned this pull request Jun 22, 2021
Open
4 tasks
@jywarren
Copy link
Member

Looks like a great start!!! One thing is if you could include tests, they could also help demonstrate how the script is supposed to be used. And the expected output! This could also make our reviewing easier.

Love the todo list in your PR description! Good organizing!!!

@daemon1024 daemon1024 mentioned this pull request Jul 1, 2021
Open
@daemon1024
Copy link
Member Author

I need some guidance as to how to add tests for this script. The jasmine test suite seems to be reliant on dist/*.js for testing function. the scripts are a seperate entity though.

I have added some documentation about the script and will add further in the trailing github actions PR.

@jywarren
Copy link
Member

jywarren commented Jul 6, 2021

OK, so we should be good to merge this once we resolve the Cypress issues, isn't that right @daemon1024 ? Thank you!

@daemon1024
Copy link
Member Author

Yes, Just noticed I didn't commit the markdown file. Will do that asap. Then it's good to go.

@daemon1024 daemon1024 mentioned this pull request Jul 13, 2021
Open
@Tlazypanda
Copy link
Contributor

Tlazypanda commented Jul 24, 2021 •
edited
Loading

Hey @daemon1024 Is this PR ready for review now?

Also Just looping in @noi5e for any guidance regarding the tests. Thank you! ✌️

@daemon1024
Copy link
Member Author

Yes @Tlazypanda.

Just noting that the script can be seen in action at daemon1024#18

Also a more complete experience at https://daemon1024.github.io/leaflet-environmental-layers/example/form.html

@jywarren jywarren merged commit 7782b57 into publiclab:main Aug 3, 2021
@jywarren
Copy link
Member

jywarren commented Aug 3, 2021

Yay! Let's not forget the other items on the checklist above!

jywarren added a commit that referenced this pull request Aug 31, 2021
@daemon1024 @jywarren
@dependabot-preview @dependabot
Add form for new spreadsheet layer to gh-pages (#550)
39daf65 
* revised fix for owmloading.gif (#508)

* revised fix for owmloading.gif

* fixed!

* bump to 2.4.3

* Bump @fortawesome/fontawesome-free from 5.11.2 to 5.15.2 (#499)

Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.11.2 to 5.15.2.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](FortAwesome/Font-Awesome@5.11.2...5.15.2)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Fix Cypress Tests (#533)

* generalise count assertion of circle markers

* update check in popup content for purpleAirMarker

* test for different map in own

* convert img from class selector to element

* extract LEL from win before checking

* test more specifically for cloud tile img

* update image selector

* Script to generate new spreadsheet layers (#531)

* initial script to generate new spreadsheet layers

* introduce base code for spreadsheet based layers

* new js based script for generating layers

* refactor code

* refactor actual script into a new file

seperated the function in the existing file so as to make it compatible with both action and manual script

* promisify the generate layer function

* Add docs

* Bump @babel/core from 7.8.4 to 7.14.6 (#529)

* Bump @babel/core from 7.8.4 to 7.14.6

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.8.4 to 7.14.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.14.6/packages/babel-core)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Update @babel/preset-env to 7.8.7

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: daemon1024 <[email protected]>

* [Security] Bump bootstrap from 4.1.1 to 4.3.1

Bumps [bootstrap](https://github.com/twbs/bootstrap) from 4.1.1 to 4.3.1. **This update includes security fixes.**
- [Release notes](https://github.com/twbs/bootstrap/releases)
- [Commits](twbs/bootstrap@v4.1.1...v4.3.1)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Bump leaflet-providers from 1.1.17 to 1.12.0

Bumps [leaflet-providers](https://github.com/leaflet-extras/leaflet-providers) from 1.1.17 to 1.12.0.
- [Release notes](https://github.com/leaflet-extras/leaflet-providers/releases)
- [Changelog](https://github.com/leaflet-extras/leaflet-providers/blob/master/CHANGELOG.md)
- [Commits](leaflet-extras/leaflet-providers@1.1.17...1.12.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* [Security] Bump grunt from 1.0.4 to 1.3.0

Bumps [grunt](https://github.com/gruntjs/grunt) from 1.0.4 to 1.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/gruntjs/grunt/releases)
- [Changelog](https://github.com/gruntjs/grunt/blob/main/CHANGELOG)
- [Commits](gruntjs/grunt@v1.0.4...v1.3.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Bump grunt-contrib-jshint from 1.1.0 to 3.0.0

Bumps [grunt-contrib-jshint](https://github.com/gruntjs/grunt-contrib-jshint) from 1.1.0 to 3.0.0.
- [Release notes](https://github.com/gruntjs/grunt-contrib-jshint/releases)
- [Changelog](https://github.com/gruntjs/grunt-contrib-jshint/blob/master/CHANGELOG)
- [Commits](https://github.com/gruntjs/grunt-contrib-jshint/commits)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Bump grunt-contrib-uglify from 2.3.0 to 5.0.1

Bumps [grunt-contrib-uglify](https://github.com/gruntjs/grunt-contrib-uglify) from 2.3.0 to 5.0.1.
- [Release notes](https://github.com/gruntjs/grunt-contrib-uglify/releases)
- [Changelog](https://github.com/gruntjs/grunt-contrib-uglify/blob/main/CHANGELOG)
- [Commits](gruntjs/grunt-contrib-uglify@v2.3.0...v5.0.1)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Upgrade to GitHub-native Dependabot (#520)

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Github Action to generate spreadsheet layers (#545)

* initial script to generate new spreadsheet layers

* introduce base code for spreadsheet based layers

* new js based script for generating layers

* refactor code

* initial gh action for generating layer

* refactor actual script into a new file

seperated the function in the existing file so as to make it compatible with both action and manual script

* update action script

* promisify the generate layer function

* wait for files to be generated

* Generate Pull Request after changes

* refinements

* Handle names with spaces and exec grunt build

* Post comment on error

* Fix name handling

* Use GITHUB_TOKEN from repository

* Add form for new spreadsheet layer (#549)

* Add form for new spreadsheet layer

* Add reference to template spreadsheet

* make textarea readonly

* Add copy button to copy the required data

* Update issue template link to publiclab repo

* Bump leaflet-blurred-location from 1.7.0 to 1.7.1 (#539)

Bumps [leaflet-blurred-location](https://github.com/publiclab/leaflet-blurred-location) from 1.7.0 to 1.7.1.
- [Release notes](https://github.com/publiclab/leaflet-blurred-location/releases)
- [Commits](https://github.com/publiclab/leaflet-blurred-location/commits)

---
updated-dependencies:
- dependency-name: leaflet-blurred-location
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump leaflet.blurred-location-display from 1.1.0 to 1.3.1 (#552)

Bumps [leaflet.blurred-location-display](https://github.com/publiclab/leaflet-blurred-location-display) from 1.1.0 to 1.3.1.
- [Release notes](https://github.com/publiclab/leaflet-blurred-location-display/releases)
- [Commits](https://github.com/publiclab/leaflet-blurred-location-display/commits)

---
updated-dependencies:
- dependency-name: leaflet.blurred-location-display
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* v2.4.4

* Require LBLD v1.3.1 (#558)

* Require LBLD v1.3.1

Fixes publiclab/plots2#10033

* force LBLD v1.3.1 and bump to v2.4.5

* Update source of truth of layers in AllLayers.js (#554)

* Update source of truth of layers in AllLayers.js

* default new spreadsheet layer to layer0

* fix purpleair

purpleair is actually a superset of purplelayer and purpleairmarker so it can't be part of a layer group

* Bump grunt-browserify from 5.3.0 to 6.0.0 (#542)

Bumps [grunt-browserify](https://github.com/jmreidy/grunt-browserify) from 5.3.0 to 6.0.0.
- [Release notes](https://github.com/jmreidy/grunt-browserify/releases)
- [Changelog](https://github.com/jmreidy/grunt-browserify/blob/master/CHANGELOG.md)
- [Commits](jmreidy/grunt-browserify@v5.3.0...v6.0.0)

---
updated-dependencies:
- dependency-name: grunt-browserify
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @fortawesome/fontawesome-free from 5.15.2 to 5.15.4 (#551)

Bumps [@fortawesome/fontawesome-free](https://github.com/FortAwesome/Font-Awesome) from 5.15.2 to 5.15.4.
- [Release notes](https://github.com/FortAwesome/Font-Awesome/releases)
- [Changelog](https://github.com/FortAwesome/Font-Awesome/blob/master/CHANGELOG.md)
- [Commits](FortAwesome/Font-Awesome@5.15.2...5.15.4)

---
updated-dependencies:
- dependency-name: "@fortawesome/fontawesome-free"
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @babel/preset-env from 7.14.7 to 7.15.0 (#547)

Bumps [@babel/preset-env](https://github.com/babel/babel/tree/HEAD/packages/babel-preset-env) from 7.14.7 to 7.15.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.15.0/packages/babel-preset-env)

---
updated-dependencies:
- dependency-name: "@babel/preset-env"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump http-server from 0.12.3 to 13.0.0 (#561)

Bumps [http-server](https://github.com/http-party/http-server) from 0.12.3 to 13.0.0.
- [Release notes](https://github.com/http-party/http-server/releases)
- [Commits](http-party/http-server@v0.12.3...v13.0.0)

---
updated-dependencies:
- dependency-name: http-server
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump eslint from 6.7.2 to 7.32.0 (#541)

Bumps [eslint](https://github.com/eslint/eslint) from 6.7.2 to 7.32.0.
- [Release notes](https://github.com/eslint/eslint/releases)
- [Changelog](https://github.com/eslint/eslint/blob/master/CHANGELOG.md)
- [Commits](eslint/eslint@v6.7.2...v7.32.0)

---
updated-dependencies:
- dependency-name: eslint
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump leaflet.blurred-location-display from 1.3.1 to 1.3.2 (#562)

Bumps [leaflet.blurred-location-display](https://github.com/publiclab/leaflet-blurred-location-display) from 1.3.1 to 1.3.2.
- [Release notes](https://github.com/publiclab/leaflet-blurred-location-display/releases)
- [Commits](https://github.com/publiclab/leaflet-blurred-location-display/commits)

---
updated-dependencies:
- dependency-name: leaflet.blurred-location-display
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump matchdep from 1.0.1 to 2.0.0 (#540)

Bumps [matchdep](https://github.com/tkellen/js-matchdep) from 1.0.1 to 2.0.0.
- [Release notes](https://github.com/tkellen/js-matchdep/releases)
- [Commits](tkellen/js-matchdep@v1.0.1...v2.0.0)

---
updated-dependencies:
- dependency-name: matchdep
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* bump v2.4.6

* Bump leaflet-google-places-autocomplete from 0.0.8 to 0.0.9 (#563)

Bumps [leaflet-google-places-autocomplete](https://github.com/Twista/leaflet-google-places-autocomplete) from 0.0.8 to 0.0.9.
- [Release notes](https://github.com/Twista/leaflet-google-places-autocomplete/releases)
- [Commits](Twista/leaflet-google-places-autocomplete@v0.0.8...v0.0.9)

---
updated-dependencies:
- dependency-name: leaflet-google-places-autocomplete
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump jasmine from 2.99.0 to 3.8.0 (#557)

Bumps [jasmine](https://github.com/jasmine/jasmine-npm) from 2.99.0 to 3.8.0.
- [Release notes](https://github.com/jasmine/jasmine-npm/releases)
- [Commits](jasmine/jasmine-npm@v2.99.0...v3.8.0)

---
updated-dependencies:
- dependency-name: jasmine
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump leaflet from 1.3.1 to 1.7.1 (#564)

Bumps [leaflet](https://github.com/Leaflet/Leaflet) from 1.3.1 to 1.7.1.
- [Release notes](https://github.com/Leaflet/Leaflet/releases)
- [Changelog](https://github.com/Leaflet/Leaflet/blob/master/CHANGELOG.md)
- [Commits](Leaflet/Leaflet@v1.3.1...v1.7.1)

---
updated-dependencies:
- dependency-name: leaflet
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump resig-class from 1.0.0 to 2.0.0 (#560)

Bumps [resig-class](https://github.com/mattinsler/resig-class) from 1.0.0 to 2.0.0.
- [Release notes](https://github.com/mattinsler/resig-class/releases)
- [Commits](mattinsler/resig-class@v1.0.0...v2.0.0)

---
updated-dependencies:
- dependency-name: resig-class
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump leaflet-spin from 1.1.0 to 1.1.2 (#535)

Bumps [leaflet-spin](https://github.com/makinacorpus/Leaflet.Spin) from 1.1.0 to 1.1.2.
- [Release notes](https://github.com/makinacorpus/Leaflet.Spin/releases)
- [Commits](makinacorpus/Leaflet.Spin@1.1.0...1.1.2)

---
updated-dependencies:
- dependency-name: leaflet-spin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump grunt from 1.3.0 to 1.4.1 (#567)

Bumps [grunt](https://github.com/gruntjs/grunt) from 1.3.0 to 1.4.1.
- [Release notes](https://github.com/gruntjs/grunt/releases)
- [Changelog](https://github.com/gruntjs/grunt/blob/main/CHANGELOG)
- [Commits](gruntjs/grunt@v1.3.0...v1.4.1)

---
updated-dependencies:
- dependency-name: grunt
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Bump @babel/core from 7.14.6 to 7.15.0 (#566)

Bumps [@babel/core](https://github.com/babel/babel/tree/HEAD/packages/babel-core) from 7.14.6 to 7.15.0.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/commits/v7.15.0/packages/babel-core)

---
updated-dependencies:
- dependency-name: "@babel/core"
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* require LBLD v1.3.2 and bump LEL to v2.4.7 (#568)

* parse title in JSONParser for LBLD (#569)

* parse title in JSONParser for LBLD

* bump to v2.4.8

* github-pages changes

* this commit should help add required files to make github pages work as intended
* removed nod_modules from gitignore
* add nojekyll file

* add node_modules for github-pages

* fix leaflet spin

Co-authored-by: Jeffrey Warren <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jywarren jywarren jywarren approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Script for generating new spreadsheet based layers
3 participants
@daemon1024 @jywarren @Tlazypanda