From aaeaad91254ca9b35bb6bbd7d3470fc661206c1a Mon Sep 17 00:00:00 2001 From: Young Hahn Date: Sun, 15 Jun 2014 00:40:10 -0400 Subject: [PATCH 1/4] Use spec-schema branch of mapbox-gl-style-spec. --- js/style/calculatedstyle.js | 2 +- js/style/styledeclaration.js | 2 +- package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/js/style/calculatedstyle.js b/js/style/calculatedstyle.js index 46a5e4acc8b..807113cb0f5 100644 --- a/js/style/calculatedstyle.js +++ b/js/style/calculatedstyle.js @@ -1,6 +1,6 @@ 'use strict'; -var reference = require('mapbox-gl-style-spec'); +var reference = require('mapbox-gl-style-spec').latest; module.exports = CalculatedStyle; diff --git a/js/style/styledeclaration.js b/js/style/styledeclaration.js index 3a57a52c62e..ae2738eac8e 100644 --- a/js/style/styledeclaration.js +++ b/js/style/styledeclaration.js @@ -1,7 +1,7 @@ 'use strict'; var util = require('../util/util.js'), - reference = require('mapbox-gl-style-spec'), + reference = require('mapbox-gl-style-spec').latest, parseCSSColor = require('csscolorparser').parseCSSColor; module.exports = StyleDeclaration; diff --git a/package.json b/package.json index ae04d8435f3..6cbd4f1ce66 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "csscolorparser": "~1.0.2", "geojson-rewind": "~0.1.0", - "mapbox-gl-style-spec": "0.0.0", + "mapbox-gl-style-spec": "https://github.com/mapbox/mapbox-gl-style-spec/tarball/spec-schema", "pbf": "0.0.1", "queue-async": "^1.0.7", "rbush": "~1.3.2", From f8dc07d72d18c20aceb964c65053050c4f765529 Mon Sep 17 00:00:00 2001 From: Young Hahn Date: Sun, 15 Jun 2014 12:51:50 -0400 Subject: [PATCH 2/4] Updates for spec v2, handle enum and default-value=>default changes. --- js/style/calculatedstyle.js | 4 ++-- js/style/styledeclaration.js | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/js/style/calculatedstyle.js b/js/style/calculatedstyle.js index 807113cb0f5..0d53cb358e5 100644 --- a/js/style/calculatedstyle.js +++ b/js/style/calculatedstyle.js @@ -1,6 +1,6 @@ 'use strict'; -var reference = require('mapbox-gl-style-spec').latest; +var reference = require('mapbox-gl-style-spec').v2; module.exports = CalculatedStyle; @@ -11,7 +11,7 @@ function CalculatedStyle() {} function addDefaultValues() { var style = reference.style; for (var prop in style) { - var value = style[prop]['default-value']; + var value = style[prop]['default']; if (value !== undefined) { CalculatedStyle.prototype[prop] = value; } diff --git a/js/style/styledeclaration.js b/js/style/styledeclaration.js index ae2738eac8e..b736083ce1b 100644 --- a/js/style/styledeclaration.js +++ b/js/style/styledeclaration.js @@ -1,7 +1,7 @@ 'use strict'; var util = require('../util/util.js'), - reference = require('mapbox-gl-style-spec').latest, + reference = require('mapbox-gl-style-spec').v2, parseCSSColor = require('csscolorparser').parseCSSColor; module.exports = StyleDeclaration; @@ -18,7 +18,7 @@ function StyleDeclaration(prop, value, constants) { value = constants[value]; } - this.value = this.parseValue(value, propReference.type); + this.value = this.parseValue(value, propReference.type, propReference.values); this.prop = prop; this.type = propReference.type; this.constants = constants; @@ -32,7 +32,7 @@ StyleDeclaration.prototype.calculate = function(z) { return typeof this.value === 'function' ? this.value(z) : this.value; }; -StyleDeclaration.prototype.parseValue = function(value, type) { +StyleDeclaration.prototype.parseValue = function(value, type, values) { if (type === 'color') { return parseColor(value); } else if (type === 'number') { @@ -43,8 +43,8 @@ StyleDeclaration.prototype.parseValue = function(value, type) { return String(value); } else if (type === 'array') { return parseNumberArray(value); - } else if (Array.isArray(type)) { - return type.indexOf(value) >= 0; + } else if (type === 'enum' && Array.isArray(values)) { + return values.indexOf(value) >= 0; } else { console.warn(type + ' is not a supported property type'); } From 75b3138bbef3d00bad921986b46ae017d5e8d7b4 Mon Sep 17 00:00:00 2001 From: Young Hahn Date: Sun, 15 Jun 2014 13:03:27 -0400 Subject: [PATCH 3/4] Use v0.0.1 of style spec. --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 6cbd4f1ce66..44ea9537540 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "csscolorparser": "~1.0.2", "geojson-rewind": "~0.1.0", - "mapbox-gl-style-spec": "https://github.com/mapbox/mapbox-gl-style-spec/tarball/spec-schema", + "mapbox-gl-style-spec": "https://github.com/mapbox/mapbox-gl-style-spec/tarball/v0.0.1", "pbf": "0.0.1", "queue-async": "^1.0.7", "rbush": "~1.3.2", From 5130a9d25ddba21b43bafcebda057bbd075c2568 Mon Sep 17 00:00:00 2001 From: Young Hahn Date: Sun, 15 Jun 2014 15:05:26 -0400 Subject: [PATCH 4/4] Update spec. --- debug/style.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debug/style.json b/debug/style.json index c9f02e1b659..7ef97eb64cf 100644 --- a/debug/style.json +++ b/debug/style.json @@ -1,5 +1,5 @@ { - "version": "1", + "version": 2, "sources": { "mapbox.mapbox-streets-v5": { "type": "vector", diff --git a/package.json b/package.json index 44ea9537540..054b46c6b25 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "csscolorparser": "~1.0.2", "geojson-rewind": "~0.1.0", - "mapbox-gl-style-spec": "https://github.com/mapbox/mapbox-gl-style-spec/tarball/v0.0.1", + "mapbox-gl-style-spec": "0.0.1", "pbf": "0.0.1", "queue-async": "^1.0.7", "rbush": "~1.3.2",