Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
52 commits
Select commit Hold shift + click to select a range
863f4ea
node_modules folder added
sagarpreet-chadha May 22, 2018
92ead6b
Create .nojekyll
jywarren May 22, 2018
05a3c0c
map size changed
sagarpreet-chadha May 22, 2018
d22d9fd
size of map increased
sagarpreet-chadha May 22, 2018
2e221ca
Layer button added in demo
sagarpreet-chadha May 24, 2018
65966e8
Justice Map layer completed
sagarpreet-chadha May 24, 2018
dafd8d8
fullscreen / precision / infinite panning
sagarpreet-chadha May 25, 2018
be12ccd
precision skytruth module corrected
sagarpreet-chadha May 25, 2018
994bf78
node_modules folder added
sagarpreet-chadha May 22, 2018
d8f01b8
Create .nojekyll
jywarren May 22, 2018
5650003
map size changed
sagarpreet-chadha May 22, 2018
80ae23c
precision skytruth module corrected
sagarpreet-chadha May 25, 2018
1824197
OpenWeather Layer completed
sagarpreet-chadha May 26, 2018
9e5627a
merge conflicts removed
sagarpreet-chadha May 26, 2018
44dcb0b
nodes module updated
sagarpreet-chadha May 26, 2018
8840ff4
nodes module updated
sagarpreet-chadha May 26, 2018
482bab0
odorReport Layer completed
sagarpreet-chadha Jun 2, 2018
e5be9c8
toxicRelease Layer completed
sagarpreet-chadha Jun 5, 2018
8cb4fb6
minor tweak
sagarpreet-chadha Jun 5, 2018
6282f6d
http changes to https in image url
sagarpreet-chadha Jun 6, 2018
eea7078
popup of toxicRelease modified
sagarpreet-chadha Jun 6, 2018
c3076b9
tweaks
sagarpreet-chadha Jun 8, 2018
9233438
node_modules folder added
sagarpreet-chadha May 22, 2018
4ddbbfe
Create .nojekyll
jywarren May 22, 2018
da02c03
map size changed
sagarpreet-chadha May 22, 2018
c960f91
Layer button added in demo
sagarpreet-chadha May 24, 2018
3023938
Justice Map layer completed
sagarpreet-chadha May 24, 2018
0902f3d
fullscreen / precision / infinite panning
sagarpreet-chadha May 25, 2018
c9805c0
precision skytruth module corrected
sagarpreet-chadha May 25, 2018
b6865bf
merge conflicts removed
sagarpreet-chadha May 26, 2018
b05d1ed
odorReport Layer completed
sagarpreet-chadha Jun 2, 2018
4c66562
minor tweak
sagarpreet-chadha Jun 5, 2018
3e5f0fa
http changes to https in image url
sagarpreet-chadha Jun 6, 2018
08e6764
popup of toxicRelease modified
sagarpreet-chadha Jun 6, 2018
3236e72
tweaks
sagarpreet-chadha Jun 8, 2018
02e9871
rebased
sagarpreet-chadha Jun 22, 2018
2718e13
conflicts resolved
sagarpreet-chadha Jun 22, 2018
9d4b5ed
dist file removed for easy merging
sagarpreet-chadha Aug 6, 2018
a2e61ab
latest layers added
sagarpreet-chadha Aug 6, 2018
4480b5b
minor tweaks
sagarpreet-chadha Aug 6, 2018
13786e4
node modules folder updated
sagarpreet-chadha Aug 6, 2018
afc8743
Merge branch 'master' into gh-pages
jywarren Oct 23, 2018
1952af4
merged
jywarren Feb 19, 2019
95a45f1
modules
jywarren Feb 19, 2019
8bf4e76
node modules
jywarren Nov 8, 2019
e07ca9b
remove acorn
jywarren Nov 8, 2019
3f4b747
remove node_modules/.bin
jywarren Nov 8, 2019
d6afe58
remove node_modules/acorn*
jywarren Nov 8, 2019
fc75adc
npm, v2.1.7
jywarren Jan 8, 2020
210b514
more modules
jywarren Jan 8, 2020
2f2b7e8
Sea level rise data (#445)
neelesh17 Mar 25, 2020
f18b83d
fixes mapbox baselayers in example too
saurabhkanswal Jan 11, 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.
9 changes: 6 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ coverage
.grunt

# Bower dependency directory (https://bower.io/)
bower_components
#bower_components

# node-waf configuration
.lock-wscript
Expand All @@ -72,8 +72,8 @@ bower_components
build/Release

# Dependency directories
node_modules/
jspm_packages/
#node_modules/
#jspm_packages/

# Typescript v1 declaration files
typings/
Expand All @@ -96,3 +96,6 @@ typings/
# dotenv environment variables file
.env

# cypress test screenshots and videos
cypress/screenshots
cypress/videos
1 change: 1 addition & 0 deletions .nojekyll
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

24 changes: 24 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,10 +1,34 @@
language: node_js
node_js:
- '10'

# if using Ubuntu 16 need this library
# https://github.com/cypress-io/cypress-documentation/pull/1647
addons:
chrome: stable
apt:
packages:
- libgconf-2-4

## Cache NPM folder and Cypress binary
## to avoid downloading Cypress again and again
cache:
directories:
- ~/.npm
- ~/.cache

before_install:
- npm install -g grunt-cli

install:
# use the new "ci" command for fastest installs on CI
- npm ci

before_script:
- grunt build

script:
- grunt transpile
- grunt jasmine
- npm run start:ci &
- npm run cy:run:chrome
54 changes: 29 additions & 25 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@ module.exports = function(grunt) {
},

browserify: {
dist: {
src: ['node_modules/jquery/dist/jquery.min.js', 'node_modules/leaflet/dist/leaflet.js', 'src/leafletEnvironmentalLayers.js', 'src/util/*.js'],
dest: 'dist/LeafletEnvironmentalLayers.js'
},
babel: {
files: {
"dist/util/layersBrowser.js": "dist/util/layersBrowser_babel.js"
}
dist: {
src: ['node_modules/leaflet/dist/leaflet.js', 'src/leafletEnvironmentalLayers.js', 'src/util/*.js'],
dest: 'dist/LeafletEnvironmentalLayers.js'
},
babel: {
files: {
"dist/util/layersBrowser.js": "dist/util/layersBrowser_babel.js"
}
},
}
},

copy: {
dist: {
Expand All @@ -33,38 +33,42 @@ module.exports = function(grunt) {

babel: {
options: {
sourceMap: true,
sourceMaps: true,
presets: ['@babel/preset-env'],
"plugins": [
"transform-object-rest-spread",
"transform-remove-strict-mode"
plugins: [
"transform-remove-strict-mode",
]
},
dist: {
files: {
"dist/LeafletEnvironmentalLayers_babel.js": "dist/LeafletEnvironmentalLayers.js",
"dist/util/layersBrowser_babel.js": "src/util/layersBrowser.js",
'dist/fracTrackerMobileLayer.js': 'src/fracTrackerMobileLayer.js'
}
}
},

jasmine: {
src: ['dist/LeafletEnvironmentalLayers.js',
'src/util/embedControl.js',
'dist/util/layersBrowser.js',
'dist/fracTrackerMobileLayer.js'
],
src: [
'src/*.js',
'src/util/*.js',
'dist/*babel.js',
'dist/util/*.js',
],
options: {
specs: "spec/javascripts/*spec.js",
vendor: [
'node_modules/jquery/dist/jquery.js',
'node_modules/jasmine-jquery/lib/jasmine-jquery.js',
'node_modules/jasmine-ajax/lib/mock-ajax.js',
'node_modules/leaflet-blurred-location/dist/Leaflet.BlurredLocation.js',
'node_modules/leaflet/dist/leaflet.js',
'node_modules/leaflet-blurred-location-display/dist/Leaflet.BlurredLocationDisplay.js'
'node_modules/jquery/dist/jquery.js',
'node_modules/jasmine-jquery/lib/jasmine-jquery.js',
'node_modules/jasmine-ajax/lib/mock-ajax.js',
'node_modules/leaflet-blurred-location/dist/Leaflet.BlurredLocation.js',
// 'node_modules/leaflet.blurred-location-display/dist/Leaflet.BlurredLocationDisplay.js',
// 'node_modules/esri-leaflet/dist/esri-leaflet.js',
],
keepRunner: true,
polyfills: [
'node_modules/jquery/dist/jquery.js',
'node_modules/core-js/client/core.js',
],
'--web-security' : false,
'--local-to-remote-url-access' : true,
'--ignore-ssl-errors' : true
Expand Down
Loading