Skip to content
This repository has been archived by the owner on Aug 8, 2023. It is now read-only.

[core, node] Bindings for addSource and addLayer #5462

Merged
merged 5 commits into from
Jun 24, 2016
Merged

[core, node] Bindings for addSource and addLayer #5462

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
cb6a519
[core] Include what you use
jfirebaugh Jun 22, 2016
089c4e4
[core] Split up and clean up conversion.hpp
jfirebaugh Jun 22, 2016
c4e4cc5
[core] Adjust layer source properties to better reflect reality
jfirebaugh Jun 22, 2016
16c435b
[core, node] Implement bindings for addLayer
jfirebaugh Jun 22, 2016
021d419
[core, node] Implement bindings for addSource
jfirebaugh Jun 23, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion benchmark/parse/filter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#include <mbgl/style/filter_evaluator.hpp>
#include <mbgl/style/rapidjson_conversion.hpp>
#include <mbgl/style/conversion.hpp>
#include <mbgl/style/conversion/filter.hpp>
#include <mbgl/tile/geometry_tile_data.hpp>

#include <rapidjson/document.h>
Expand All @@ -17,7 +18,7 @@ typedef std::multimap<std::string, Value> Properties;
style::Filter parse(const char* expression) {
rapidjson::GenericDocument<rapidjson::UTF8<>, rapidjson::CrtAllocator> doc;
doc.Parse<0>(expression);
return style::conversion::convertFilter(doc).get<style::Filter>();
return *style::conversion::convert<style::Filter>(doc);
}

static void Parse_Filter(benchmark::State& state) {
Expand Down
Loading