Merge pull request #266 from twpayne/lint-cleanups

Lint cleanups

.gitignore

@@ -3,8 +3,7 @@
 /build/gh-pages
 /build/check-requires-timestamp
 /build/jsdoc-*-timestamp
-/build/lint-spec-timestamp
+/build/lint-timestamp
-/build/lint-src-timestamp
 /build/ol.css
 /build/ol.js
 /build/ol-all.js

build.py

@@ -229,15 +229,15 @@ def serve_precommit(t):
     t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', 'build/ol-all.json', 'test/test.json')
 
 
-virtual('lint', 'build/lint-src-timestamp', 'build/lint-spec-timestamp', 'build/check-requires-timestamp')
+virtual('lint', 'build/lint-timestamp', 'build/check-requires-timestamp')
 
 
-@target('build/lint-src-timestamp', SRC, INTERNAL_SRC, EXTERNAL_SRC, EXAMPLES_SRC, precious=True)
+@target('build/lint-timestamp', SRC, INTERNAL_SRC, EXTERNAL_SRC, EXAMPLES_SRC, SPEC, precious=True)
 def build_lint_src_timestamp(t):
     limited_doc_files = [path
                          for path in ifind('externs', 'build/src/external/externs')
                          if path.endswith('.js')]
-    t.run('%(GJSLINT)s', '--strict', '--limited_doc_files=%s' % (','.join(limited_doc_files),), t.newer(SRC, INTERNAL_SRC, EXTERNAL_SRC, EXAMPLES_SRC))
+    t.run('%(GJSLINT)s', '--strict', '--limited_doc_files=%s' % (','.join(limited_doc_files),), t.newer(t.dependencies))
     t.touch()
 
 
@@ -331,12 +331,6 @@ def build_check_requires_timestamp(t):
     t.touch()
 
 
-@target('build/lint-spec-timestamp', SPEC, precious=True)
-def build_lint_spec_timestamp(t):
-    t.run('%(GJSLINT)s', t.newer(SPEC))
-    t.touch()
-
-
 virtual('plovr', PLOVR_JAR)
 
 

test/spec/ol/ellipsoid.test.js

@@ -331,7 +331,8 @@ describe('ol.Ellipsoid', function() {
             v = ol.ellipsoid.WGS84.vincenty(e.c1, e.c2, 1e-12, 100);
             expect(v.distance).toRoughlyEqual(e.vincentyDistance, 1e-8);
             expect(v.finalBearing).toRoughlyEqual(e.vincentyFinalBearing, 1e-9);
-        expect(v.initialBearing).toRoughlyEqual(e.vincentyInitialBearing, 1e-9);
+            expect(v.initialBearing).toRoughlyEqual(
+                e.vincentyInitialBearing, 1e-9);
           }
         });
 
@@ -375,8 +376,8 @@ describe('ol.Ellipsoid', function() {
           var e, i, vincentyInitialBearing;
           for (i = 0; i < expected.length; ++i) {
             e = expected[i];
-        vincentyInitialBearing =
+            vincentyInitialBearing = ol.ellipsoid.WGS84.vincentyInitialBearing(
-            ol.ellipsoid.WGS84.vincentyInitialBearing(e.c1, e.c2, 1e-12, 100);
+                e.c1, e.c2, 1e-12, 100);
             expect(vincentyInitialBearing).toRoughlyEqual(
                 e.vincentyInitialBearing, 1e-9);
           }

test/spec/ol/parser/ogc/wmscapabilities_v1_1_1.test.js

@@ -57,8 +57,8 @@ describe('ol.parser.ogc.wmscapabilities_v1_1_1', function() {
         expect(getfeatureinfo.post.href).toEqual(post);
         expect(capability.layers).toBeTruthy();
         expect(capability.layers.length).toEqual(22);
-        var infoFormats = ['text/plain', 'text/html',
+        var infoFormats =
-            'application/vnd.ogc.gml'];
+            ['text/plain', 'text/html', 'application/vnd.ogc.gml'];
         expect(layer.infoFormats).toEqual(infoFormats);
         expect(layer.name).toEqual('tiger:tiger_roads');
         expect(layer.prefix).toEqual('tiger');
@@ -168,8 +168,8 @@ describe('ol.parser.ogc.wmscapabilities_v1_1_1', function() {
         expect(elevation['default']).toEqual('0');
         expect(elevation.nearestVal).toBeTruthy();
         expect(elevation.multipleVal).toBeFalsy();
-        expect(elevation.values).toEqual(['0', '1000', '3000', '5000',
+        expect(elevation.values).toEqual(
-            '10000']);
+            ['0', '1000', '3000', '5000', '10000']);
       });
     });
   });

test/spec/ol/parser/ogc/wmscapabilities_v1_3_0.test.js

@@ -100,8 +100,8 @@ describe('ol.parser.ogc.wmscapabilities_v1_3_0', function() {
         expect(elevation['default']).toEqual('0');
         expect(elevation.nearestVal).toBeTruthy();
         expect(elevation.multipleVal).toBeFalsy();
-        expect(elevation.values).toEqual(['0', '1000', '3000', '5000',
+        expect(elevation.values).toEqual(
-            '10000']);
+            ['0', '1000', '3000', '5000', '10000']);
         expect(contactinfo).toBeTruthy();
         expect(personPrimary).toBeTruthy();
         expect(personPrimary.person).toEqual('Jeff Smith');

test/spec/ol/resolutionconstraint.test.js

@@ -7,8 +7,7 @@ describe('ol.ResolutionConstraint', function() {
     var resolutionConstraint;
 
     beforeEach(function() {
-      resolutionConstraint =
+      resolutionConstraint = ol.ResolutionConstraint.createSnapToResolutions(
-            ol.ResolutionConstraint.createSnapToResolutions(
           [1000, 500, 250, 100]);
     });