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

Restructures src directory and implements RollUpJS #128

Merged
merged 57 commits into from
Aug 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
57 commits
Select commit Hold shift + click to select a range
7680b8c
Rename mapml to index
ahmadayubi Aug 11, 2020
66a41b1
indexjs
ahmadayubi Aug 11, 2020
ea79c92
Added to final location
ahmadayubi Aug 11, 2020
df8af38
rename
ahmadayubi Aug 11, 2020
cca469b
move
ahmadayubi Aug 11, 2020
c5ac748
util
ahmadayubi Aug 11, 2020
3dbd5e5
rename
ahmadayubi Aug 11, 2020
6405c9e
move
ahmadayubi Aug 11, 2020
f58f30d
queryHandler
ahmadayubi Aug 11, 2020
7fd3248
rename
ahmadayubi Aug 11, 2020
dcc560d
move
ahmadayubi Aug 11, 2020
760226b
contextmenu
ahmadayubi Aug 11, 2020
c928f66
rename
ahmadayubi Aug 11, 2020
476a685
move
ahmadayubi Aug 11, 2020
2b3d87c
mapmllayer
ahmadayubi Aug 11, 2020
4cf28ad
rename
ahmadayubi Aug 11, 2020
62d2c0c
move
ahmadayubi Aug 11, 2020
e165a31
imagelayer
ahmadayubi Aug 11, 2020
242bb51
renmae
ahmadayubi Aug 11, 2020
fcef515
rename
ahmadayubi Aug 11, 2020
21a1e85
templatedimage
ahmadayubi Aug 11, 2020
6e1015f
templatedfeaures
ahmadayubi Aug 11, 2020
6c95247
rename
ahmadayubi Aug 11, 2020
107e252
move
ahmadayubi Aug 11, 2020
65ab4f6
templatedlayer
ahmadayubi Aug 11, 2020
b246c91
rename
ahmadayubi Aug 11, 2020
c3113b6
move
ahmadayubi Aug 11, 2020
74860bb
templatedtile
ahmadayubi Aug 11, 2020
2f6ef58
rename
ahmadayubi Aug 11, 2020
da91c42
move
ahmadayubi Aug 11, 2020
c4ee52f
rename
ahmadayubi Aug 11, 2020
b59de04
move
ahmadayubi Aug 11, 2020
8452927
statictiles
ahmadayubi Aug 11, 2020
a719c83
rename
ahmadayubi Aug 11, 2020
910ba79
move
ahmadayubi Aug 11, 2020
a9c3f12
featurelayer
ahmadayubi Aug 11, 2020
85923cd
rename
ahmadayubi Aug 11, 2020
0edabd2
move
ahmadayubi Aug 11, 2020
245cf57
controllayer
ahmadayubi Aug 11, 2020
5eda32f
Grunt added
ahmadayubi Aug 11, 2020
61d6b02
Merge branch 'util' into implementRollUpJS
ahmadayubi Aug 11, 2020
508f8cb
Merge branch 'queryHandler' into implementRollUpJS
ahmadayubi Aug 11, 2020
197f425
Merge branch 'fcontextmenu' into implementRollUpJS
ahmadayubi Aug 11, 2020
9005edc
Merge branch 'fmapml' into implementRollUpJS
ahmadayubi Aug 11, 2020
7a186d6
Merge branch 'fimageoverlay' into implementRollUpJS
ahmadayubi Aug 11, 2020
959e6d9
Merge branch 'ftemplatedimage' into implementRollUpJS
ahmadayubi Aug 11, 2020
8f00bbf
Merge branch 'ftemplatedfeature' into implementRollUpJS
ahmadayubi Aug 11, 2020
7bd0fe2
Merge branch 'ftemplatedlayer' into implementRollUpJS
ahmadayubi Aug 11, 2020
2dc7210
Merge branch 'ftemplatedtile' into implementRollUpJS
ahmadayubi Aug 11, 2020
6dbb7a6
Merge branch 'fstatictiles' into implementRollUpJS
ahmadayubi Aug 11, 2020
f1baae6
Merge branch 'ffeatures' into implementRollUpJS
ahmadayubi Aug 11, 2020
9baf084
Merge branch 'fcontrols' into implementRollUpJS
ahmadayubi Aug 11, 2020
d91caf0
Fixes to work with rollup
ahmadayubi Aug 12, 2020
b49f7e4
Rebase
ahmadayubi Aug 12, 2020
8f5204a
Travis CI file updated to generate mapml.js file
ahmadayubi Aug 12, 2020
7acfa6a
Fixes JSHint errors
ahmadayubi Aug 12, 2020
011e928
Changes != to !== in Control Layer
ahmadayubi Aug 12, 2020
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
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@ dist: bionic
install:
- npm install
- npm install -g grunt-cli
- grunt clean copy
- grunt clean copy rollup
script:
- npm test
16 changes: 14 additions & 2 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,16 @@ module.exports = function(grunt) {
},
clean: {
dist: ['dist']
}
},
rollup: {
options: {
format: 'iife',
},
main: {
dest: 'dist/mapml.js',
src: 'src/mapml/index.js', // Only one source file is permitted
},
},
});

/*grunt.loadNpmTasks('grunt-html');*/
Expand All @@ -147,12 +156,15 @@ module.exports = function(grunt) {
grunt.loadNpmTasks('grunt-contrib-concat');
grunt.loadNpmTasks('grunt-contrib-copy');
grunt.loadNpmTasks('grunt-contrib-clean');
grunt.loadNpmTasks('grunt-rollup');

/* grunt.loadNpmTasks('grunt-processhtml'); */


grunt.registerTask('test', ['jshint']);

grunt.registerTask('default', ['clean:dist', 'copy', 'jshint', 'concat', 'uglify']);
grunt.registerTask('default', ['clean:dist', 'copy', 'jshint', 'concat', 'uglify', 'rollup']);
grunt.registerTask('build', ['rollup']);


};
18 changes: 18 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,12 +46,14 @@
"grunt-contrib-uglify-es": "~3.3.0",
"grunt-contrib-watch": "~1.1.0",
"grunt-html": "~9.3.0",
"grunt-rollup": "^11.3.0",
"jest": "^26.1.0",
"jest-playwright-preset": "^0.1.3",
"leaflet": "~1.6.0",
"path": "^0.12.7",
"playwright": "^1.2.1",
"proj4": "2.6.0",
"proj4leaflet": "1.0.1"
"proj4leaflet": "1.0.1",
"rollup": "^2.23.1"
}
}
7 changes: 7 additions & 0 deletions rollup.config.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
export default {
input: 'src/index.js',
output: {
file: 'bundleTest/mapml.js',
format: 'iife',
},
};
2 changes: 1 addition & 1 deletion src/mapml.css
Original file line number Diff line number Diff line change
Expand Up @@ -116,4 +116,4 @@
.mapml-contextmenu-separator {
border-bottom: 1px solid #ccc;
margin: 5px 0;
}
}
Loading