sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

reduce compiler warnings (gcc 6)

Browse source
This commit is contained in:
artemp 2016-12-01 17:17:56 +01:00
parent 410a2ce7ca
commit 2f8da6dfd5
3 changed files with 25 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/mapnik/json/feature_grammar_x3_def.hpp
View file

@ -273,7 +273,7 @@ auto const feature_part_def = feature_type
|
(lit("\"properties\"") > lit(':') > lit('{') > -properties > lit('}'))
|
omit[geojson_string] > lit(':') > omit[value]
(omit[geojson_string] > lit(':') > omit[value])
;

6
include/mapnik/json/unicode_string_grammar_x3_def.hpp
View file

@ -95,11 +95,11 @@ x3::rule<class escaped_tag, std::string> const escaped("Escaped Characted");
auto unicode_string_def = double_quoted
;
auto const escaped_def = lit('\\') >
(lit('x') > hex[push_utf8]
((lit('x') > hex[push_utf8])
|
lit('u') > hex4[push_utf8]
(lit('u') > hex4[push_utf8])
|
lit('U') > hex8[push_utf8]
(lit('U') > hex8[push_utf8])
|
char_("0abtnvfre\"/\\N_LP \t")[push_esc]
|

41
src/json/extract_bounding_boxes_x3.cpp
View file

@ -41,29 +41,29 @@ struct calculate_bounding_box
box_.init(pt.x, pt.y);
}
void operator()(mapnik::json::ring const& ring) const
void operator()(mapnik::json::ring const& r) const
{
for (auto const& pt : ring)
for (auto const& pt : r)
{
if (!box_.valid()) box_.init(pt.x, pt.y);
else box_.expand_to_include(pt.x, pt.y);
}
}
void operator()(mapnik::json::rings const& rings) const
void operator()(mapnik::json::rings const& rs) const
{
for (auto const& ring : rings)
for (auto const& r : rs)
{
operator()(ring);
operator()(r);
break; // consider first ring only
}
}
void operator()(mapnik::json::rings_array const& rings_array) const
void operator()(mapnik::json::rings_array const& rings_ar) const
{
for (auto const& rings : rings_array)
for (auto const& rs : rings_ar)
{
operator()(rings);
operator()(rs);
}
}
@ -142,18 +142,19 @@ x3::rule<struct feature_collection_tag> const feature_collection = "Feature Coll
auto const coordinates_rule_def = lit("\"coordinates\"") >> lit(':') >> positions_rule[extract_bounding_box];
auto const bounding_box_def = raw[lit('{')[open_bracket] >> *(eps[check_brackets] >>
(lit("\"FeatureCollection\"") > eps(false)
|
lit('{')[open_bracket]
|
lit('}')[close_bracket]
|
coordinates_rule[assign_bbox]
|
omit[geojson_string]
|
omit[char_]))][assign_range];
auto const bounding_box_def = raw[lit('{')[open_bracket]
>> *(eps[check_brackets] >>
((lit("\"FeatureCollection\"") > eps(false))
|
lit('{')[open_bracket]
|
lit('}')[close_bracket]
|
coordinates_rule[assign_bbox]
|
omit[geojson_string]
|
omit[char_]))][assign_range];
auto const feature = bounding_box[on_feature_callback];