Skip to content

Commit 5a93533

Browse files
artempartemp
committed
getting ready for mapnik (develop/master)
1 parent ea5fd11 commit 5a93533

10 files changed

Lines changed: 21 additions & 21 deletions

‎src/mapnik_datasource_cache.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
#include <boost/noncopyable.hpp>
2929
#pragma GCC diagnostic pop
3030

31-
#include <mapnik/value_types.hpp>
31+
#include <mapnik/value/types.hpp>
3232
#include <mapnik/params.hpp>
3333
#include <mapnik/datasource.hpp>
3434
#include <mapnik/datasource_cache.hpp>

‎src/mapnik_envelope.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
// mapnik
3333
#include <mapnik/box2d.hpp>
34-
#include <mapnik/value_error.hpp>
34+
#include <mapnik/value/error.hpp>
3535

3636
using mapnik::coord;
3737
using mapnik::box2d;

‎src/mapnik_feature.cpp‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,15 +34,14 @@
3434
#pragma GCC diagnostic pop
3535

3636
// mapnik
37-
#include <mapnik/value_types.hpp>
37+
#include <mapnik/value/types.hpp>
3838
#include <mapnik/feature.hpp>
3939
#include <mapnik/feature_factory.hpp>
4040
#include <mapnik/feature_kv_iterator.hpp>
4141
#include <mapnik/datasource.hpp>
4242
#include <mapnik/wkb.hpp>
43-
//#include <mapnik/wkt/wkt_factory.hpp>
4443
#include <mapnik/json/feature_parser.hpp>
45-
#include <mapnik/json/feature_generator.hpp>
44+
#include <mapnik/util/feature_to_geojson.hpp>
4645

4746
// stl
4847
#include <stdexcept>
@@ -67,7 +66,7 @@ mapnik::feature_ptr from_geojson_impl(std::string const& json, mapnik::context_p
6766
std::string feature_to_geojson(mapnik::feature_impl const& feature)
6867
{
6968
std::string json;
70-
if (!mapnik::json::to_geojson(json,feature))
69+
if (!mapnik::util::to_geojson(json,feature))
7170
{
7271
throw std::runtime_error("Failed to generate GeoJSON");
7372
}

‎src/mapnik_geometry.cpp‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,13 +35,13 @@
3535

3636
// mapnik
3737
#include <mapnik/geometry.hpp>
38-
#include <mapnik/geometry_type.hpp>
39-
#include <mapnik/geometry_envelope.hpp>
40-
#include <mapnik/geometry_is_valid.hpp>
41-
#include <mapnik/geometry_is_simple.hpp>
42-
#include <mapnik/geometry_is_empty.hpp>
43-
#include <mapnik/geometry_correct.hpp>
44-
#include <mapnik/geometry_centroid.hpp>
38+
#include <mapnik/geometry/geometry_type.hpp>
39+
#include <mapnik/geometry/envelope.hpp>
40+
#include <mapnik/geometry/is_valid.hpp>
41+
#include <mapnik/geometry/is_simple.hpp>
42+
#include <mapnik/geometry/is_empty.hpp>
43+
#include <mapnik/geometry/correct.hpp>
44+
#include <mapnik/geometry/centroid.hpp>
4545

4646
#include <mapnik/wkt/wkt_factory.hpp> // from_wkt
4747
#include <mapnik/json/geometry_parser.hpp> // from_geojson

‎src/mapnik_parameters.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
#include <mapnik/debug.hpp>
3333
#include <mapnik/params.hpp>
3434
#include <mapnik/unicode.hpp>
35-
#include <mapnik/value_types.hpp>
3635
#include <mapnik/value.hpp>
36+
#include <mapnik/value/types.hpp>
3737
// stl
3838
#include <iterator>
3939

‎src/mapnik_python.cpp‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ void export_logger();
100100
#include <mapnik/image_util.hpp>
101101
#include <mapnik/image_any.hpp>
102102
#include <mapnik/load_map.hpp>
103-
#include <mapnik/value_error.hpp>
103+
#include <mapnik/value/error.hpp>
104+
#include <mapnik/value.hpp>
104105
#include <mapnik/save_map.hpp>
105106
#include <mapnik/scale_denominator.hpp>
106107
#if defined(GRID_RENDERER)

‎src/mapnik_style.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
#pragma GCC diagnostic pop
3131

3232
// mapnik
33-
#include <mapnik/value_error.hpp>
33+
#include <mapnik/value/error.hpp>
3434
#include <mapnik/rule.hpp>
3535
#include "mapnik_enumeration.hpp"
3636
#include <mapnik/feature_type_style.hpp>

‎src/mapnik_svg.hpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
// mapnik
2626
#include <mapnik/parse_transform.hpp>
2727
#include <mapnik/symbolizer.hpp>
28-
#include <mapnik/value_error.hpp>
28+
#include <mapnik/value/error.hpp>
2929

3030
#pragma GCC diagnostic push
3131
#include <mapnik/warning_ignore.hpp>
@@ -48,8 +48,8 @@ void set_svg_transform(T& symbolizer, std::string const& transform_wkt)
4848
if (!trans_expr)
4949
{
5050
std::stringstream ss;
51-
ss << "Could not parse transform from '"
52-
<< transform_wkt
51+
ss << "Could not parse transform from '"
52+
<< transform_wkt
5353
<< "', expected SVG transform attribute";
5454
throw mapnik::value_error(ss.str());
5555
}

‎src/mapnik_symbolizer.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
#include "mapnik_enumeration.hpp"
4141
#include "mapnik_svg.hpp"
4242
#include <mapnik/expression_node.hpp>
43-
#include <mapnik/value_error.hpp>
43+
#include <mapnik/value/error.hpp>
4444
#include <mapnik/marker_cache.hpp> // for known_svg_prefix_
4545
#include <mapnik/group/group_layout.hpp>
4646
#include <mapnik/group/group_rule.hpp>

‎src/python_grid_utils.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
#include <mapnik/grid/grid_renderer.hpp>
3737
#include <mapnik/grid/grid.hpp>
3838
#include <mapnik/grid/grid_view.hpp>
39-
#include <mapnik/value_error.hpp>
39+
#include <mapnik/value/error.hpp>
4040
#include <mapnik/feature.hpp>
4141
#include <mapnik/feature_kv_iterator.hpp>
4242
#include "python_grid_utils.hpp"

0 commit comments

Comments
 (0)