From 80dd57eb3fec83a2edc81ae93abe801ce0da6308 Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Thu, 7 Mar 2019 18:34:45 +0200 Subject: [core] Enable text-variable-anchor property --- scripts/generate-style-code.js | 2 +- scripts/style-spec.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/generate-style-code.js b/scripts/generate-style-code.js index ae25a856a8..28d7c65af3 100755 --- a/scripts/generate-style-code.js +++ b/scripts/generate-style-code.js @@ -72,7 +72,7 @@ global.evaluatedType = function (property) { if (property.length) { return `std::array<${evaluatedType({type: property.value})}, ${property.length}>`; } else { - return `std::vector<${evaluatedType({type: property.value})}>`; + return `std::vector<${evaluatedType({type: property.value, name: property.name})}>`; } default: throw new Error(`unknown type for ${property.name}`) } diff --git a/scripts/style-spec.js b/scripts/style-spec.js index 4bbd453a86..695b5b7a59 100644 --- a/scripts/style-spec.js +++ b/scripts/style-spec.js @@ -5,7 +5,6 @@ delete spec.layout_symbol['symbol-sort-key']; delete spec.layout_symbol['symbol-z-order'].values['auto']; spec.layout_symbol['symbol-z-order'].default = 'viewport-y'; -delete spec.layout_symbol['text-variable-anchor']; delete spec.layout_symbol['text-radial-offset']; delete spec.layout_symbol['text-justify'].values['auto']; -spec.layout_symbol['text-offset'].requires.splice(1, 1); // { "!": "text-radial-offset" } \ No newline at end of file +spec.layout_symbol['text-offset'].requires.splice(1, 1); // { "!": "text-radial-offset" } -- cgit v1.2.1