summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-03-07 18:34:45 +0200
committerMikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>2019-04-01 20:42:09 +0300
commit80dd57eb3fec83a2edc81ae93abe801ce0da6308 (patch)
treee8eb21729c8840d47cc661105277a0536e0e4274 /scripts
parent2325271c80023e680c71db065d4639d6e3da5f5a (diff)
downloadqtlocation-mapboxgl-80dd57eb3fec83a2edc81ae93abe801ce0da6308.tar.gz
[core] Enable text-variable-anchor property
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/generate-style-code.js2
-rw-r--r--scripts/style-spec.js3
2 files changed, 2 insertions, 3 deletions
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" }