diff options
| author | Fabian Guerra <fabian.guerra@mapbox.com> | 2019-04-12 16:32:38 -0700 |
|---|---|---|
| committer | Fabian Guerra <fabian.guerra@mapbox.com> | 2019-04-15 10:47:43 -0700 |
| commit | cb4dfd9521d8051bb4a364aa998abcadd2a87d32 (patch) | |
| tree | b93cdbb4f777cebdb16fc058b8dc4e88b3a4a5fd | |
| parent | 547d28b30867e6c14092e21bddac1830e0fdec40 (diff) | |
| download | qtlocation-mapboxgl-upstream/fabian-localize-14393.tar.gz | |
[ios, macos] Update MGLSymbolStyleLayer.text documentation.upstream/fabian-localize-14393
| -rwxr-xr-x | platform/darwin/scripts/generate-style-code.js | 3 | ||||
| -rw-r--r-- | platform/darwin/src/MGLSymbolStyleLayer.h | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/platform/darwin/scripts/generate-style-code.js b/platform/darwin/scripts/generate-style-code.js index 2eabd0a92b..20ad86382c 100755 --- a/platform/darwin/scripts/generate-style-code.js +++ b/platform/darwin/scripts/generate-style-code.js @@ -356,6 +356,9 @@ global.propertyDoc = function (propertyName, property, layerType, kind) { doc += '* Constant array, whose each element is any of the following constant string values:\n'; doc += Object.keys(property.values).map(value => ' * `' + value + '`: ' + property.values[value].doc).join('\n') + '\n'; } + if (property.type === 'formatted') { + doc += '* Formatted expressions.\n'; + } doc += '* Predefined functions, including mathematical and string operators\n' + '* Conditional expressions\n' + '* Variable assignments and references to assigned variables\n'; diff --git a/platform/darwin/src/MGLSymbolStyleLayer.h b/platform/darwin/src/MGLSymbolStyleLayer.h index cf2c1466e7..5c12b28544 100644 --- a/platform/darwin/src/MGLSymbolStyleLayer.h +++ b/platform/darwin/src/MGLSymbolStyleLayer.h @@ -1086,6 +1086,7 @@ MGL_EXPORT You can set this property to an expression containing any of the following: * Constant string values + * Formatted expressions. * Predefined functions, including mathematical and string operators * Conditional expressions * Variable assignments and references to assigned variables |