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.

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

Add form for new spreadsheet layer to gh-pages #550

Merged
merged 39 commits into from
Aug 31, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
42db74c
revised fix for owmloading.gif (#508)
jywarren Feb 17, 2021
2f3723a
Bump @fortawesome/fontawesome-free from 5.11.2 to 5.15.2 (#499)
dependabot-preview[bot] Feb 23, 2021
b8e0162
Fix Cypress Tests (#533)
daemon1024 Jul 23, 2021
7782b57
Script to generate new spreadsheet layers (#531)
daemon1024 Aug 3, 2021
be1d8c4
Bump @babel/core from 7.8.4 to 7.14.6 (#529)
dependabot-preview[bot] Aug 3, 2021
2534486
[Security] Bump bootstrap from 4.1.1 to 4.3.1
dependabot-preview[bot] Jul 27, 2021
a364e34
Bump leaflet-providers from 1.1.17 to 1.12.0
dependabot-preview[bot] Jul 28, 2021
458c733
[Security] Bump grunt from 1.0.4 to 1.3.0
dependabot-preview[bot] Aug 3, 2021
d5f83e6
Bump grunt-contrib-jshint from 1.1.0 to 3.0.0
dependabot-preview[bot] Jul 27, 2021
b406af3
Bump grunt-contrib-uglify from 2.3.0 to 5.0.1
dependabot-preview[bot] Aug 3, 2021
f165350
Upgrade to GitHub-native Dependabot (#520)
dependabot-preview[bot] Aug 3, 2021
edd0e44
Github Action to generate spreadsheet layers (#545)
daemon1024 Aug 10, 2021
0ceb0bd
Add form for new spreadsheet layer (#549)
daemon1024 Aug 10, 2021
c09d70e
Bump leaflet-blurred-location from 1.7.0 to 1.7.1 (#539)
dependabot[bot] Aug 14, 2021
2b16e96
Bump leaflet.blurred-location-display from 1.1.0 to 1.3.1 (#552)
dependabot[bot] Aug 17, 2021
ec32fba
v2.4.4
jywarren Aug 17, 2021
0e87264
Require LBLD v1.3.1 (#558)
jywarren Aug 17, 2021
a73bb7c
Update source of truth of layers in AllLayers.js (#554)
daemon1024 Aug 17, 2021
b4fc36f
Bump grunt-browserify from 5.3.0 to 6.0.0 (#542)
dependabot[bot] Aug 17, 2021
a7648af
Bump @fortawesome/fontawesome-free from 5.15.2 to 5.15.4 (#551)
dependabot[bot] Aug 17, 2021
fd80380
Bump @babel/preset-env from 7.14.7 to 7.15.0 (#547)
dependabot[bot] Aug 17, 2021
ca8840f
Bump http-server from 0.12.3 to 13.0.0 (#561)
dependabot[bot] Aug 17, 2021
f697f4b
Bump eslint from 6.7.2 to 7.32.0 (#541)
dependabot[bot] Aug 17, 2021
218176e
Bump leaflet.blurred-location-display from 1.3.1 to 1.3.2 (#562)
dependabot[bot] Aug 17, 2021
3eb44f9
Bump matchdep from 1.0.1 to 2.0.0 (#540)
dependabot[bot] Aug 17, 2021
3905a64
bump v2.4.6
jywarren Aug 17, 2021
2b51caf
Bump leaflet-google-places-autocomplete from 0.0.8 to 0.0.9 (#563)
dependabot[bot] Aug 17, 2021
db1f3e0
Bump jasmine from 2.99.0 to 3.8.0 (#557)
dependabot[bot] Aug 17, 2021
a09ee24
Bump leaflet from 1.3.1 to 1.7.1 (#564)
dependabot[bot] Aug 18, 2021
b3d2b3c
Bump resig-class from 1.0.0 to 2.0.0 (#560)
dependabot[bot] Aug 18, 2021
ff76893
Bump leaflet-spin from 1.1.0 to 1.1.2 (#535)
dependabot[bot] Aug 18, 2021
9881c0b
Bump grunt from 1.3.0 to 1.4.1 (#567)
dependabot[bot] Aug 18, 2021
f42d5ea
Bump @babel/core from 7.14.6 to 7.15.0 (#566)
dependabot[bot] Aug 18, 2021
702ebe1
require LBLD v1.3.2 and bump LEL to v2.4.7 (#568)
daemon1024 Aug 18, 2021
32e6897
parse title in JSONParser for LBLD (#569)
daemon1024 Aug 18, 2021
b3f5d1b
github-pages changes
daemon1024 Aug 23, 2021
8151219
add node_modules for github-pages
daemon1024 Aug 23, 2021
ad9b0d9
fix leaflet spin
daemon1024 Aug 23, 2021
3415ebc
Merge branch 'gh-pages' into gh-pages-add-form
daemon1024 Aug 23, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
15 changes: 15 additions & 0 deletions .github/ISSUE_TEMPLATE/new-spreadsheet-layer.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
---
name: New Spreadsheet Layer
about: Use this template for proposing new spreadsheet layer
title: "[New Spreadsheet Layer]: "
labels: new layer
---
## New Spreadsheet Layer

Please describe the purpose of this layer

## Layer Data
<!-- Enter the formatted data in the below block -->
```json

```
36 changes: 36 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
version: 2
updates:
- package-ecosystem: npm
directory: "/"
schedule:
interval: daily
open-pull-requests-limit: 10
ignore:
- dependency-name: "@babel/core"
versions:
- 7.13.1
- 7.13.10
- 7.13.13
- 7.13.14
- 7.13.15
- 7.13.8
- dependency-name: esri-leaflet
versions:
- 3.0.0
- dependency-name: "@babel/plugin-transform-for-of"
versions:
- 7.12.1
- 7.12.13
- dependency-name: elliptic
versions:
- 6.5.3
- 6.5.4
- dependency-name: ini
versions:
- 1.3.7
- dependency-name: grunt-contrib-uglify
versions:
- 5.0.0
- dependency-name: stringstream
versions:
- 0.0.6
20 changes: 20 additions & 0 deletions .github/workflows/generate-layer.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
name: "New Spreadsheet Layer"
on:
issue_comment:
types: [created, edited]
issues:
types: [opened]

jobs:
main:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2

- name: Checkout and install dependencies
run: npm install @actions/core @actions/github marked

- name: Generate New Spreadsheet Layer
run: node ./scripts/actionGenLayer
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
5 changes: 0 additions & 5 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,10 +1,6 @@
### grunt ###
# Grunt usually compiles files inside this directory

# Dist Files
dist/*
dist

# Grunt usually preprocesses files such as coffeescript, compass... inside the .tmp directory
.tmp/

Expand Down Expand Up @@ -72,7 +68,6 @@ bower_components
build/Release

# Dependency directories
node_modules/
jspm_packages/

# Typescript v1 declaration files
Expand Down
25 changes: 25 additions & 0 deletions cypress/integration/owm.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
describe('OpenWeatherMap layer', function() {
it('adds markers on click', function() {
cy.openWindow('/example/index.html#lat=41.6283&lon=-91.7235&zoom=10&layers=Standard')
cy.wait(300)
cy.window().then((win) => {
cy.get('.leaflet-tile-pane').children().should('have.length', 1)
cy.get('#map-Clouds label').click({ force: true })
cy.get('.leaflet-tile-pane').children().should('have.length', 2)
cy.get('div.leaflet-layer:nth-child(2) > div > img').should('have.attr', 'src').and('contains', 'openweathermap.org/map/clouds')
})
})

it('loads correct owmloading.gif with config option set', function() {
cy.openWindow('/example/oneLinerCodeExample.html')
cy.wait(300)
let LEL;
cy.window()
.then((win) => {
LEL = win.LEL
})
.then(() => {
expect(LEL.overlayMaps.current.options.imageLoadingUrl).to.equal('https://raw.githubusercontent.com/buche/leaflet-openweathermap/master/owmloading.gif')
})
})
});
4 changes: 2 additions & 2 deletions cypress/integration/purpleAirMarker.spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ describe('Purple layer - markers', function() {
const spy = cy.spy(window.top.aut.PurpleAirMarkerLayer, 'requestData')
cy.get('[title="Show minimal markers"]').click().then(() => {
expect(spy).to.be.called
cy.get('.leaflet-overlay-pane svg g').children().should('have.length', 2)
cy.get('.leaflet-overlay-pane svg g').children().should('have.length.gt', 0)
cy.get('.leaflet-overlay-pane svg g path').invoke('attr', 'stroke').should('eq', '#7c7c7c')
cy.get('.leaflet-overlay-pane svg g path').invoke('attr', 'fill').should('eq', '#7c22b5')
cy.get('.leaflet-overlay-pane svg g path').invoke('attr', 'stroke-linecap').should('eq', 'round')
Expand All @@ -43,7 +43,7 @@ describe('Purple layer - markers', function() {
it('shows popup', function() {
cy.get('.leaflet-overlay-pane svg g').children().last().click({ force: true })
cy.get('.leaflet-popup-pane').children().should('have.length', 1)
cy.get('.leaflet-popup-content').should('contain', 'MandMnorth40')
cy.get('.leaflet-popup-content').should('contain', 'www.purpleair.com')
})

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