respond to feedback

src/style-spec/bin/gl-style-validate

@@ -46,5 +46,5 @@ function help() {
     console.log('');
     console.log('options:');
     console.log('--json  output errors as json');
-    console.log('--mapbox-api-supported validate compatibility with Mapbox Styles API');
+    console.log('--mapbox-api-supported  validate compatibility with Mapbox Styles API');
 }

src/style-spec/read_style.js

@@ -2,14 +2,13 @@ import ParsingError from './error/parsing_error';
 import jsonlint from '@mapbox/jsonlint-lines-primitives';
 
 export default function readStyle(style) {
-    let s = style;
-    if (s instanceof String || typeof s === 'string' || s instanceof Buffer) {
+    if (style instanceof String || typeof style === 'string' || style instanceof Buffer) {
         try {
-            s = jsonlint.parse(s.toString());
+            return jsonlint.parse(style.toString());
         } catch (e) {
             throw new ParsingError(e);
         }
     }
 
-    return s;
+    return style;
 }

src/style-spec/validate_mapbox_api_supported.js

@@ -14,9 +14,9 @@ function isValid(value: ?string, regex: RegExp): boolean {
     return !!value.match(regex);
 }
 
-function getSourceCount(source: Object) {
+function getSourceCount(source: Object): number {
     if (source.url) {
-        return source.url.replace('mapbox://', '').split(',').length;
+        return source.url.split(',').length;
     } else {
         return 0;
     }
@@ -134,7 +134,7 @@ function getRootErrors(style: Object, specKeys: Array<any>): Array<?ValidationEr
      * "private"
      * "public"
      */
-    const visibilityPattern = /^(public|private)/;
+    const visibilityPattern = /^(public|private)$/;
     if (!isValid(style.visibility, visibilityPattern)) {
         errors.push(new ValidationError('visibility', style.visibility, 'Style visibility must be public or private'));
     }
@@ -160,9 +160,8 @@ export default function validateMapboxApiSupported(style: Object): Array<?Valida
         return [e];
     }
 
-    let errors = validateStyle(s, v8);
-
-    errors = errors.concat(getRootErrors(s, Object.keys(v8.$root)));
+    let errors = validateStyle(s, v8)
+        .concat(getRootErrors(s, Object.keys(v8.$root)));
 
     if (s.sources) {
         errors = errors.concat(getSourcesErrors(s.sources));

src/style-spec/validate_style.js

@@ -12,17 +12,14 @@ import readStyle from './read_style';
  *     or `Buffer` is provided, the returned errors will contain line numbers.
  * @param {Object} [styleSpec] The style specification to validate against.
  *     If omitted, the spec version is inferred from the stylesheet.
- * @param {Object} options
- * @param {boolean} [options.mapboxApiSupported] If true, assert that
- * style can be uploaded to the Mapbox Styles API.
  * @returns {Array<ValidationError|ParsingError>}
  * @example
  *   var validate = require('mapbox-gl-style-spec').validate;
  *   var style = fs.readFileSync('./style.json', 'utf8');
  *   var errors = validate(style);
  */
 
-export default function validateStyle(style, styleSpec = v8, options) {
+export default function validateStyle(style, styleSpec = v8) {
     let s = style;
 
     try {
@@ -31,7 +28,7 @@ export default function validateStyle(style, styleSpec = v8, options) {
         return [e];
     }
 
-    return validateStyleMin(s, styleSpec, options);
+    return validateStyleMin(s, styleSpec);
 }
 
 export const source = validateStyleMin.source;