diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-01 14:48:32 -0400 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2014-11-04 12:26:14 -0800 |
| commit | 9a3b740fcc76d9f245ec330093b2e1231656697f (patch) | |
| tree | f651f4dc951dc1fce58fba6846897a14326831c9 /include/mbgl/style | |
| parent | d964949a12b90f2bd2bcc1b490ee545377a88df9 (diff) | |
| download | qtlocation-mapboxgl-9a3b740fcc76d9f245ec330093b2e1231656697f.tar.gz | |
Render ⇢ layout, style ⇢ paint
https://github.com/mapbox/mapbox-gl-style-spec/issues/166
Diffstat (limited to 'include/mbgl/style')
| -rw-r--r-- | include/mbgl/style/style_parser.hpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/mbgl/style/style_parser.hpp b/include/mbgl/style/style_parser.hpp index a1c57cf2df..c37e856034 100644 --- a/include/mbgl/style/style_parser.hpp +++ b/include/mbgl/style/style_parser.hpp @@ -49,11 +49,11 @@ private: util::ptr<StyleLayer> createLayer(JSVal value); void parseLayers(); void parseLayer(std::pair<JSVal, util::ptr<StyleLayer>> &pair); - void parseStyles(JSVal value, std::map<ClassID, ClassProperties> &styles); - void parseStyle(JSVal, ClassProperties &properties); + void parsePaints(JSVal value, std::map<ClassID, ClassProperties> &paints); + void parsePaint(JSVal, ClassProperties &properties); void parseReference(JSVal value, util::ptr<StyleLayer> &layer); void parseBucket(JSVal value, util::ptr<StyleLayer> &layer); - void parseRender(JSVal value, util::ptr<StyleLayer> &layer); + void parseLayout(JSVal value, util::ptr<StyleLayer> &layer); void parseSprite(JSVal value); void parseGlyphURL(JSVal value); |