diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2014-05-20 14:16:53 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2014-05-21 10:53:40 +0200 |
| commit | 575491e65c5068baa072d4700a4f37e0247f7aca (patch) | |
| tree | 32f1cb422302fb0669286601daf7fd3a6c14ee46 /include | |
| parent | de149b0543d31ef339fb725f051f4cb0c151138d (diff) | |
| download | qtlocation-mapboxgl-575491e65c5068baa072d4700a4f37e0247f7aca.tar.gz | |
make sure we also parse classes for nested layers
Diffstat (limited to 'include')
| -rw-r--r-- | include/llmr/style/style_parser.hpp | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/include/llmr/style/style_parser.hpp b/include/llmr/style/style_parser.hpp index 4d6af15d90..21a16177d6 100644 --- a/include/llmr/style/style_parser.hpp +++ b/include/llmr/style/style_parser.hpp @@ -13,13 +13,23 @@ public: void parseBuckets(JSVal value, std::map<std::string, BucketDescription>& buckets); void parseLayers(JSVal value, std::vector<LayerDescription>& layers); void parseConstants(JSVal value); - void parseClasses(JSVal value, std::map<std::string, ClassDescription>& classes, std::map<std::string, BucketDescription>& buckets, std::vector<LayerDescription>& layers); + void parseClasses(JSVal value, std::map<std::string, ClassDescription> &classes, + const std::map<std::string, BucketDescription> &buckets, + const std::vector<LayerDescription> &layers); private: LayerDescription parseLayer(JSVal value); BucketDescription parseBucket(JSVal value); - std::pair<std::string, ClassDescription> parseClassDescription(JSVal value, std::map<std::string, BucketDescription>& buckets, std::vector<LayerDescription>& layers); - void parseClass(const std::string& name, JSVal value, ClassDescription& class_desc, std::map<std::string, BucketDescription>& buckets, std::vector<LayerDescription>& layers); + + std::pair<std::string, ClassDescription> + parseClassDescription(JSVal value, + const std::map<std::string, BucketDescription> &buckets, + const std::map<std::string, std::string> &layerBuckets); + + void parseClass(const std::string &name, JSVal value, ClassDescription &class_desc, + const std::map<std::string, BucketDescription> &buckets, + const std::map<std::string, std::string> &layerBuckets); + FillClass parseFillClass(JSVal value); LineClass parseLineClass(JSVal value); IconClass parseIconClass(JSVal value); |