Skip to content

Commit

Permalink
Fixing issue stefanocudini#10 with a new GPX Parser
Browse files Browse the repository at this point in the history
  • Loading branch information
Wilkins committed Feb 1, 2016
1 parent 24d94a4 commit e1a8136
Show file tree
Hide file tree
Showing 11 changed files with 102 additions and 14,153 deletions.
16 changes: 8 additions & 8 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
url = https://github.com/seabre/simplify-geometry.git
[submodule "togpx"]
path = vendor/togpx
url = https://github.com/tyrasd/togpx.git
url = https://github.com/jwenzler/togpx.git
[submodule "geojson-to-path"]
path = vendor/geojson-to-path
url = https://github.com/Wilkins/geojson-to-path.git
Expand All @@ -34,15 +34,15 @@
[submodule "i18next"]
path = vendor/i18next
url = https://github.com/i18next/i18next
[submodule "leaflet-gpx"]
path = vendor/leaflet-gpx
url = https://github.com/mpetazzoni/leaflet-gpx
#[submodule "leaflet-gpx"]
# path = vendor/leaflet-gpx
# url = https://github.com/mpetazzoni/leaflet-gpx
[submodule "Leaflet.FileLayer"]
path = vendor/Leaflet.FileLayer
url = https://github.com/nrenner/Leaflet.FileLayer/
[submodule "vendor/gpx"]
path = vendor/gpx
url = https://github.com/Wilkins/gpx
#[submodule "vendor/gpx"]
# path = vendor/gpx
# url = https://github.com/Wilkins/gpx
[submodule "vendor/gpx-parse"]
path = vendor/gpx-parse
url = https://github.com/Wilkins/gpx-parse
url = https://github.com/elliotstokes/gpx-parse
8 changes: 3 additions & 5 deletions Gruntfile.js
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,7 @@ grunt.initConfig({
'dist/leaflet.filelayer.min.js': ['vendor/Leaflet.FileLayer/leaflet.filelayer.js'],
'dist/FileSaver.min.js': ['vendor/FileSaver.js/FileSaver.js'],
'dist/i18next.min.js': ['vendor/i18next/i18next.commonjs.withJQuery.js'],
'dist/gpx-parse.min.js': ['vendor/gpx-parse/lib/gpx-parse.js'],
'dist/gpx.min.js' : ['vendor/gpx/browserify/index.js'],
'dist/gpx-parse.min.js': ['vendor/gpx-parse/dist/gpx-parse-browser.js'],
// Repository files
'dist/i18n.min.js': ['src/i18n.js'],
'dist/formats.min.js': ['src/formats.js', 'src/formats/*'],
Expand Down Expand Up @@ -72,8 +71,7 @@ grunt.initConfig({
'vendor/bootstrap-slider/dist/bootstrap-slider.min.js',
'vendor/jquery-autocomplete/dist/jquery.autocomplete.min.js',
'dist/i18next.min.js',
'vendor/gpx-parse/dist/gpx-parse-browser.js',
'vendor/gpx/browserify/gpx.js',
'dist/gpx-parse.min.js',
],
dest: 'dist/libs.min.js'
},
Expand Down Expand Up @@ -125,7 +123,7 @@ grunt.initConfig({
},
js: {
options: { livereload: true },
files: ['src/*'],
files: ['src/*', 'src/formats/*'],
tasks: ['clean:js', 'jshint', 'uglify', 'concat']
},
i18n: {
Expand Down
4 changes: 2 additions & 2 deletions dist/app.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/formats.min.js

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

7 changes: 6 additions & 1 deletion dist/gpx-parse.min.js

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion dist/gpx.min.js

This file was deleted.

Loading

0 comments on commit e1a8136

Please sign in to comment.