Merge pull request #23 from Wilkins/master

Fixing issues #10 and #21

.gitignore

@@ -20,3 +20,4 @@ css/.sass-cache
 *.swp
 .grunt
 _SpecRunner.html
+TODO.md

Gruntfile.js

@@ -19,7 +19,7 @@ grunt.initConfig({
                 console: true,
                 module: true
             },
-            "-W099": true,    //ignora tabs e space warning
+            "-W099": true,    //ignora tabs and spaces warning
             "-W033": true,
             "-W044": true    //ignore regexp
         },
@@ -31,7 +31,6 @@ grunt.initConfig({
         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'],
@@ -73,7 +72,7 @@ grunt.initConfig({
                 'vendor/bootstrap-slider/dist/bootstrap-slider.min.js',
                 'vendor/jquery-autocomplete/dist/jquery.autocomplete.min.js',
                 'dist/i18next.min.js',
-                'dist/gpx-parse.min.js',
+                'dist/gpx-parse.min.js'
             ],
             dest: 'dist/libs.min.js'
         },
@@ -127,21 +126,11 @@ grunt.initConfig({
           options: {
             vendor: [
                 'http://code.jquery.com/jquery-1.8.3.min.js',
-                // Here we use the non minified source
+                // Here we use the non minified source to help debugging
                 'http://cdn.leafletjs.com/leaflet-0.7/leaflet-src.js',
-                'vendor/simplify-geometry/simplifygeometry-0.0.1.min.js',
-                'dist/jquery.cookie.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',
-                'dist/i18next.min.js',
+                'node_modules/jasmine-jquery/lib/jasmine-jquery.js',
+                'dist/libs.min.js',
                 'dist/i18n.min.js',
-                'dist/gpx-parse.min.js',
-                'node_modules/jasmine-jquery/lib/jasmine-jquery.js'
             ],
             specs: 'tests/*.js',
             keepRunner : false,

src/formats/gpx.js

@@ -60,14 +60,14 @@ function gpxParser(content, format) {
             console.log("This GPX file has no tracks. It may be a route... Can not load as true GPX file.");
             parsedGPX = convertToGeoJSON(content);
         } else {
-            //console.log('Lecture data GPX ok : '+data.tracks.length);
             for (trackNum = 0; trackNum<data.tracks.length; trackNum++) {
                 var track = data.tracks[trackNum];
                 for (segmentNum = 0; segmentNum<track.segments.length; segmentNum++) {
                     var segment = track.segments[segmentNum];
                     for (pointNum = 0; pointNum<segment.length; pointNum++) {
                         var point = segment[pointNum];
                         RAW_DATA[point.lat+','+point.lon] = point;
+                        //console.log("RAW_DATA["+point.lat+','+point.lon+"] = "+pointNum);
                     }
                 }
 

src/i18n.js

@@ -1,9 +1,9 @@
 $.i18n.init({
-    //lng: 'en',
     ns: { namespaces: [ 'ns.special'], defaultNs: 'ns.special'},
     useLocalStorage: false,
     // We load in synchronous mode to be able to build the page with i18n text
     getAsync: false,
+    lng: 'en',
     fallbackLng: 'en',
     debug: false
 }, function(t) {

src/main.js

@@ -5,7 +5,7 @@ var map = new L.Map('map', {
     zoomControl: false,
     attributionControl: false
 })
-.setView(L.latLng(40,0), 2)
+.setView(L.latLng(41.9,12.5),3)
 .on('click', hideAll);
 
 // For Debugging

tests/formatsSpec.js

@@ -39,6 +39,7 @@ describe("Testing fixtures conversion", function() {
     window.map = L.map('map');
     window.map.hasLayer = function() { return true; }
 
+    /*
     describe('Checking fixture 1 (optimization -1)', function() {
         checkFormatFixture('testcase1-classic-geojson-optimization-1.json');
     });
@@ -78,6 +79,28 @@ describe("Testing fixtures conversion", function() {
     describe('Checking fixture 4 (optimization 0.5)', function() {
         checkFormatFixture('testcase4-gpx-with-time-data-optimization0.5.json', gpxParser);
     });
+    */
+
+    /*
+    */
+    describe('Checking fixture 5 (optimization -1)', function() {
+        checkFormatFixture('testcase5-gpx-with-time-data2-optimization-1.json', gpxParser);
+    });
+    describe('Checking fixture 5 (optimization 0)', function() {
+        checkFormatFixture('testcase5-gpx-with-time-data2-optimization0.json', gpxParser);
+    });
+    describe('Checking fixture 5 (optimization 0.0005)', function() {
+        checkFormatFixture('testcase5-gpx-with-time-data2-optimization0.0005.json', gpxParser);
+    });
+    describe('Checking fixture 5 (optimization 0.001)', function() {
+        checkFormatFixture('testcase5-gpx-with-time-data2-optimization0.001.json', gpxParser);
+    });
+    describe('Checking fixture 5 (optimization 0.005)', function() {
+        checkFormatFixture('testcase5-gpx-with-time-data2-optimization0.005.json', gpxParser);
+    });
+    describe('Checking fixture 5 (optimization 0.1)', function() {
+        checkFormatFixture('testcase5-gpx-with-time-data2-optimization0.1.json', gpxParser);
+    });
 });
 
 function checkFormatFixture(file, parser) {
@@ -102,7 +125,6 @@ function checkFormatFixture(file, parser) {
   it('Converts GeoJSON to GPX with correct estimated size', function() {
     checkSizePrecision(gpx, fixture.gpx, counters, Layer);
   });
-
   it('Converts GeoJSON to Mediawiki properly', function() {
     checkExportFormat(mediawiki, Layer, fixture.mediawiki);
   });
@@ -116,13 +138,14 @@ function checkFormatFixture(file, parser) {
   it('Converts GeoJSON to KML with correct estimated size', function() {
     checkSizePrecision(kml, fixture.kml, counters, Layer);
   });
-
   it('Converts GeoJSON to GeoJSON properly', function() {
     checkExportFormat(geojson, Layer, fixture.geojson);
   });
   it('Converts GeoJSON to GeoJSON with correct estimated size', function() {
     checkSizePrecision(geojson, fixture.geojson, counters, Layer);
   });
+/*
+*/
 }
 
 /**