Skip to content

Commit 39daf65

Browse files
daemon1024jywarrendependabot-preview[bot]dependabot[bot]
authored
Add form for new spreadsheet layer to gh-pages (#550)
* 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>
1 parent bfc5054 commit 39daf65

File tree

23,584 files changed

+1914540
-49482
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

23,584 files changed

+1914540
-49482
lines changed
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
name: New Spreadsheet Layer
3+
about: Use this template for proposing new spreadsheet layer
4+
title: "[New Spreadsheet Layer]: "
5+
labels: new layer
6+
---
7+
## New Spreadsheet Layer
8+
9+
Please describe the purpose of this layer
10+
11+
## Layer Data
12+
<!-- Enter the formatted data in the below block -->
13+
```json
14+
15+
```

.github/dependabot.yml

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
version: 2
2+
updates:
3+
- package-ecosystem: npm
4+
directory: "/"
5+
schedule:
6+
interval: daily
7+
open-pull-requests-limit: 10
8+
ignore:
9+
- dependency-name: "@babel/core"
10+
versions:
11+
- 7.13.1
12+
- 7.13.10
13+
- 7.13.13
14+
- 7.13.14
15+
- 7.13.15
16+
- 7.13.8
17+
- dependency-name: esri-leaflet
18+
versions:
19+
- 3.0.0
20+
- dependency-name: "@babel/plugin-transform-for-of"
21+
versions:
22+
- 7.12.1
23+
- 7.12.13
24+
- dependency-name: elliptic
25+
versions:
26+
- 6.5.3
27+
- 6.5.4
28+
- dependency-name: ini
29+
versions:
30+
- 1.3.7
31+
- dependency-name: grunt-contrib-uglify
32+
versions:
33+
- 5.0.0
34+
- dependency-name: stringstream
35+
versions:
36+
- 0.0.6
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
name: "New Spreadsheet Layer"
2+
on:
3+
issue_comment:
4+
types: [created, edited]
5+
issues:
6+
types: [opened]
7+
8+
jobs:
9+
main:
10+
runs-on: ubuntu-latest
11+
steps:
12+
- uses: actions/checkout@v2
13+
14+
- name: Checkout and install dependencies
15+
run: npm install @actions/core @actions/github marked
16+
17+
- name: Generate New Spreadsheet Layer
18+
run: node ./scripts/actionGenLayer
19+
env:
20+
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
### grunt ###
22
# Grunt usually compiles files inside this directory
33

4-
# Dist Files
5-
dist/*
6-
dist
7-
84
# Grunt usually preprocesses files such as coffeescript, compass... inside the .tmp directory
95
.tmp/
106

@@ -72,7 +68,6 @@ bower_components
7268
build/Release
7369

7470
# Dependency directories
75-
node_modules/
7671
jspm_packages/
7772

7873
# Typescript v1 declaration files

cypress/integration/owm.spec.js

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
describe('OpenWeatherMap layer', function() {
2+
it('adds markers on click', function() {
3+
cy.openWindow('/example/index.html#lat=41.6283&lon=-91.7235&zoom=10&layers=Standard')
4+
cy.wait(300)
5+
cy.window().then((win) => {
6+
cy.get('.leaflet-tile-pane').children().should('have.length', 1)
7+
cy.get('#map-Clouds label').click({ force: true })
8+
cy.get('.leaflet-tile-pane').children().should('have.length', 2)
9+
cy.get('div.leaflet-layer:nth-child(2) > div > img').should('have.attr', 'src').and('contains', 'openweathermap.org/map/clouds')
10+
})
11+
})
12+
13+
it('loads correct owmloading.gif with config option set', function() {
14+
cy.openWindow('/example/oneLinerCodeExample.html')
15+
cy.wait(300)
16+
let LEL;
17+
cy.window()
18+
.then((win) => {
19+
LEL = win.LEL
20+
})
21+
.then(() => {
22+
expect(LEL.overlayMaps.current.options.imageLoadingUrl).to.equal('https://raw.githubusercontent.com/buche/leaflet-openweathermap/master/owmloading.gif')
23+
})
24+
})
25+
});

cypress/integration/purpleAirMarker.spec.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ describe('Purple layer - markers', function() {
3232
const spy = cy.spy(window.top.aut.PurpleAirMarkerLayer, 'requestData')
3333
cy.get('[title="Show minimal markers"]').click().then(() => {
3434
expect(spy).to.be.called
35-
cy.get('.leaflet-overlay-pane svg g').children().should('have.length', 2)
35+
cy.get('.leaflet-overlay-pane svg g').children().should('have.length.gt', 0)
3636
cy.get('.leaflet-overlay-pane svg g path').invoke('attr', 'stroke').should('eq', '#7c7c7c')
3737
cy.get('.leaflet-overlay-pane svg g path').invoke('attr', 'fill').should('eq', '#7c22b5')
3838
cy.get('.leaflet-overlay-pane svg g path').invoke('attr', 'stroke-linecap').should('eq', 'round')
@@ -43,7 +43,7 @@ describe('Purple layer - markers', function() {
4343
it('shows popup', function() {
4444
cy.get('.leaflet-overlay-pane svg g').children().last().click({ force: true })
4545
cy.get('.leaflet-popup-pane').children().should('have.length', 1)
46-
cy.get('.leaflet-popup-content').should('contain', 'MandMnorth40')
46+
cy.get('.leaflet-popup-content').should('contain', 'www.purpleair.com')
4747
})
4848

4949
it('removes markers from the map and the layer name from the hash when clicked again', function() {

0 commit comments

Comments
 (0)