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

Handling multiple layers #7

Merged
merged 12 commits into from
Apr 8, 2015
Merged

Handling multiple layers #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
639c095
Planes - Adding the possibility to draw a plane track. Need styling !
Wilkins Mar 29, 2015
a2609ca
Planes - ignore vendors / adding submodule jquery autocomplete
Wilkins Mar 29, 2015
094835b
Planes - Using Sass, refactoring. Still buggy.
Wilkins Mar 30, 2015
11faec0
Creating a LayerOptimizer class to avoid global variables and allow
Wilkins Mar 30, 2015
5694da1
JS - Moving JS files into js/ directory, and gruntify
Wilkins Mar 30, 2015
433f8af
Layers - handling multiple layers, with a layer switcher and controllers
Wilkins Mar 31, 2015
5eca6c0
CSS - Cleanup du SCSS
Wilkins Apr 1, 2015
276eefc
Layers - Refactoring
Wilkins Apr 2, 2015
7bd62c0
Layers - Cleaning up controllers
Wilkins Apr 3, 2015
28f01c0
Layers - correcting last bug before pull request.
Wilkins Apr 3, 2015
5fb8666
CSS - SCSS Syntax cleanup
Wilkins Apr 4, 2015
24b3261
JS - Cleanup
Wilkins Apr 4, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 16 additions & 13 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
npm-debug.log
node_modules
bootstrap-slider/*
crumble/*
FileSaver.js/*
Font-Awesome/*
jquery-cookie/*
Leaflet.FileLayer/*
leaflet-sidebar/*
simplify-geometry/*
togeojson/*
togpx/*
tokml/*
geojson-to-path/*
pretty-data/*
vendor/bootstrap-slider/*
vendor/crumble/*
vendor/FileSaver.js/*
vendor/Font-Awesome/*
vendor/jquery-cookie/*
vendor/Leaflet.FileLayer/*
vendor/leaflet-sidebar/*
vendor/simplify-geometry/*
vendor/togeojson/*
vendor/togpx/*
vendor/tokml/*
vendor/geojson-to-path/*
vendor/pretty-data/*
vendor/jquery-autocomplete/*
css/.sass-cache
*.swp
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,3 +31,6 @@
[submodule "pretty-data"]
path = vendor/pretty-data
url = https://github.com/Wilkins/pretty-data.git
[submodule "vendor/jquery-autocomplete"]
path = vendor/jquery-autocomplete
url = https://github.com/devbridge/jQuery-Autocomplete
241 changes: 136 additions & 105 deletions Gruntfile.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,120 +3,151 @@
module.exports = function(grunt) {

grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),
clean: {
dist: {
src: ['dist/*']
}
},
jshint: {
options: {
globals: {
console: true,
module: true
},
"-W099": true, //ignora tabs e space warning
"-W033": true,
"-W044": true //ignore regexp
},
files: ['main.js', 'formats.js', 'formats/*.js']
},
uglify: {
dist: {
files: {
'dist/jquery.cookie.min.js': ['vendor/jquery-cookie/jquery.cookie.js'],
'dist/L.Control.Sidebar.min.js': ['vendor/leaflet-sidebar/src/L.Control.Sidebar.js'],
'dist/togeojson.min.js': ['vendor/togeojson/togeojson.js'],
'dist/togpx.min.js': ['vendor/togpx/togpx.js'],
'dist/pretty-data.min.js': ['vendor/pretty-data/index.js'],
'dist/tokml.min.js': ['vendor/tokml/tokml.js'],
'dist/geojson-to-path.min.js': ['vendor/geojson-to-path/geojson-to-path.js'],
'dist/leaflet.filelayer.min.js': ['vendor/Leaflet.FileLayer/leaflet.filelayer.js'],
'dist/FileSaver.min.js': ['vendor/FileSaver.js/FileSaver.js'],
'dist/formats.min.js': ['formats.js', 'formats/*'],
'dist/main.min.js': ['main.js']
}
}
},
concat: {
//TODO cut out SearchMarker
options: {
separator: ';\n',
stripBanners: {
block: true
}
},
dist: {
src: [
'dist/jquery.cookie.min.js',
'dist/L.Control.Sidebar.min.js',
'dist/togeojson.min.js',
'dist/togpx.min.js',
'dist/pretty-data.min.js',
'dist/tokml.min.js',
'dist/geojson-to-path.min.js',
'dist/leaflet.filelayer.min.js',
'dist/FileSaver.min.js',
'vendor/simplify-geometry/simplifygeometry-0.0.1.min.js',
'vendor/bootstrap-slider/dist/bootstrap-slider.min.js',
//'crumble/js/jquery.grumble.min.js',
//'crumble/js/jquery.crumble.min.js',
'social.js',
'dist/formats.min.js',
'dist/main.min.js'
],
dest: 'dist/app.min.js'
}
},
cssmin: {
combine: {
src: [
'vendor/bootstrap-slider/dist/css/bootstrap-slider.min.css',
'vendor/leaflet-sidebar/src/L.Control.Sidebar.css',
//'crumble/css/grumble.min.css',
//'crumble/css/crumble.css',
'style.css'
],
dest: 'dist/style.min.css'
},
minify: {
expand: true,
cwd: 'dist/',
src: '<%= cssmin.combine.dest %>'
//,dest: 'dist/<%= pkg.name %>-<%= pkg.version %>.min.css'
}
},
// copy: {
// crumble: {
// expand: true,
// nonull: true,
// flatten: true,
// src: 'crumble/images/*',
// dest: 'images/'
// }
// },
watch: {
dist: {
options: { livereload: true },
files: ['main.js','index.html','style.css'],
tasks: ['clean','jshint','uglify','concat','cssmin']
}
}
pkg: grunt.file.readJSON('package.json'),
clean: {
css: {
src: ['dist/*.css']
},
js: {
src: ['dist/*.js']
}
},
jshint: {
options: {
globals: {
console: true,
module: true
},
"-W099": true, //ignora tabs e space warning
"-W033": true,
"-W044": true //ignore regexp
},
files: ['js/main.js', 'js/formats.js', 'js/formats/*.js', 'js/layers.js',]
},
uglify: {
dist: {
files: {
'dist/jquery.cookie.min.js': ['vendor/jquery-cookie/jquery.cookie.js'],
'dist/L.Control.Sidebar.min.js': ['vendor/leaflet-sidebar/src/L.Control.Sidebar.js'],
'dist/togeojson.min.js': ['vendor/togeojson/togeojson.js'],
'dist/togpx.min.js': ['vendor/togpx/togpx.js'],
'dist/pretty-data.min.js': ['vendor/pretty-data/index.js'],
'dist/tokml.min.js': ['vendor/tokml/tokml.js'],
'dist/geojson-to-path.min.js': ['vendor/geojson-to-path/geojson-to-path.js'],
'dist/leaflet.filelayer.min.js': ['vendor/Leaflet.FileLayer/leaflet.filelayer.js'],
'dist/FileSaver.min.js': ['vendor/FileSaver.js/FileSaver.js'],
// Repository files
'dist/formats.min.js': ['js/formats.js', 'js/formats/*'],
'dist/layers.min.js': ['js/layers.js'],
'dist/planes.min.js': ['js/planes.js'],
'dist/main.min.js': ['js/main.js']
}
}
},
concat: {
//TODO cut out SearchMarker
options: {
separator: ';\n',
stripBanners: {
block: true
}
},
dist: {
src: [
'dist/jquery.cookie.min.js',
'dist/L.Control.Sidebar.min.js',
'dist/togeojson.min.js',
'dist/togpx.min.js',
'dist/pretty-data.min.js',
'dist/tokml.min.js',
'dist/geojson-to-path.min.js',
'dist/leaflet.filelayer.min.js',
'dist/FileSaver.min.js',
'vendor/simplify-geometry/simplifygeometry-0.0.1.min.js',
'vendor/bootstrap-slider/dist/bootstrap-slider.min.js',
'vendor/jquery-autocomplete/dist/jquery.autocomplete.min.js',
//'crumble/js/jquery.grumble.min.js',
//'crumble/js/jquery.crumble.min.js',

// Repository files
'js/social.js',
'dist/formats.min.js',
//'dist/planes.min.js',
'dist/layers.min.js',
'dist/main.min.js'
],
dest: 'dist/app.min.js'
}
},
sass: {
dist: {
options: {
style: 'nested',
sourcemap: 'none',
cacheLocation: 'css/.sass-cache'
},
files: {
'dist/style.css': 'css/style.scss'
}
}
},

cssmin: {
combine: {
src: [
'vendor/bootstrap-slider/dist/css/bootstrap-slider.min.css',
'vendor/leaflet-sidebar/src/L.Control.Sidebar.css',
//'crumble/css/grumble.min.css',
//'crumble/css/crumble.css',
'dist/style.css'
],
dest: 'dist/style.min.css'
},
minify: {
expand: true,
cwd: 'dist/',
src: '<%= cssmin.combine.dest %>'
//,dest: 'dist/<%= pkg.name %>-<%= pkg.version %>.min.css'
}
},
// copy: {
// crumble: {
// expand: true,
// nonull: true,
// flatten: true,
// src: 'crumble/images/*',
// dest: 'images/'
// }
// },
watch: {
css: {
options: { livereload: true },
files: ['css/style.scss'],
tasks: ['clean:css', 'sass', 'cssmin']
},
js: {
options: { livereload: true },
files: ['js/*'],
tasks: ['clean:js', 'jshint', 'uglify', 'concat']
}
}
});

grunt.registerTask('default', [
'clean',
'jshint',
'uglify',
'concat',
'cssmin',
//'copy'
'clean',
'jshint',
'uglify',
'concat',
'sass',
'cssmin',
//'copy'
]);


grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-contrib-sass');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.loadNpmTasks('grunt-contrib-jshint');
grunt.loadNpmTasks('grunt-contrib-watch');
Expand Down
Loading