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

move box2.hpp and related files into geometry dir

Browse source
This commit is contained in:
artemp 2017-01-26 09:51:37 +01:00
parent 69bb8f4328
commit f13848e210
78 changed files with 77 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
benchmark/test_proj_transform1.cpp
View file

@ -1,5 +1,5 @@
#include "bench_framework.hpp" #include "bench_framework.hpp"
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/projection.hpp> #include <mapnik/projection.hpp>
#include <mapnik/proj_transform.hpp> #include <mapnik/proj_transform.hpp>

2
include/mapnik/agg_render_marker.hpp
View file

@ -29,7 +29,7 @@
#include <mapnik/svg/svg_path_attributes.hpp> #include <mapnik/svg/svg_path_attributes.hpp>
#include <mapnik/svg/svg_converter.hpp> #include <mapnik/svg/svg_converter.hpp>
#include <mapnik/vertex_converters.hpp> #include <mapnik/vertex_converters.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/safe_cast.hpp> #include <mapnik/safe_cast.hpp>
#include <mapnik/util/const_rendering_buffer.hpp> #include <mapnik/util/const_rendering_buffer.hpp>

2
include/mapnik/agg_renderer.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/feature_style_processor.hpp> #include <mapnik/feature_style_processor.hpp>
#include <mapnik/util/noncopyable.hpp> // for noncopyable #include <mapnik/util/noncopyable.hpp> // for noncopyable
#include <mapnik/rule.hpp> // for rule, symbolizers #include <mapnik/rule.hpp> // for rule, symbolizers
#include <mapnik/box2d.hpp> // for box2d #include <mapnik/geometry/box2d.hpp> // for box2d
#include <mapnik/view_transform.hpp> // for view_transform #include <mapnik/view_transform.hpp> // for view_transform
#include <mapnik/image_compositing.hpp> // for composite_mode_e #include <mapnik/image_compositing.hpp> // for composite_mode_e
#include <mapnik/pixel_position.hpp> #include <mapnik/pixel_position.hpp>

2
include/mapnik/feature.hpp
View file

@ -27,7 +27,7 @@
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#include <mapnik/value.hpp> #include <mapnik/value.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry/envelope.hpp> #include <mapnik/geometry/envelope.hpp>
// //

2
include/mapnik/feature_style_processor.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_FEATURE_STYLE_PROCESSOR_HPP #define MAPNIK_FEATURE_STYLE_PROCESSOR_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/featureset.hpp> #include <mapnik/featureset.hpp>
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/feature_style_processor_context.hpp> #include <mapnik/feature_style_processor_context.hpp>

2
include/mapnik/feature_style_processor_impl.hpp
View file

@ -33,7 +33,7 @@
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/feature_type_style.hpp> #include <mapnik/feature_type_style.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/layer.hpp> #include <mapnik/layer.hpp>
#include <mapnik/rule.hpp> #include <mapnik/rule.hpp>
#include <mapnik/rule_cache.hpp> #include <mapnik/rule_cache.hpp>

2
include/mapnik/geom_util.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_GEOM_UTIL_HPP #define MAPNIK_GEOM_UTIL_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/vertex.hpp> #include <mapnik/vertex.hpp>
#include <mapnik/geometry/geometry_types.hpp> #include <mapnik/geometry/geometry_types.hpp>

2
include/mapnik/geometry/boost_adapters.hpp
View file

@ -40,7 +40,7 @@
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <cstdint> #include <cstdint>

0
include/mapnik/box2d.hpp → include/mapnik/geometry/box2d.hpp
View file

2
include/mapnik/box2d_impl.hpp → include/mapnik/geometry/box2d_impl.hpp
View file

@ -21,7 +21,7 @@
*****************************************************************************/ *****************************************************************************/
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/safe_cast.hpp> #include <mapnik/safe_cast.hpp>
// stl // stl

2
include/mapnik/geometry/envelope.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_GEOMETRY_ENVELOPE_HPP #define MAPNIK_GEOMETRY_ENVELOPE_HPP
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
namespace mapnik { namespace mapnik {
namespace geometry { namespace geometry {

2
include/mapnik/geometry/envelope_impl.hpp
View file

@ -22,7 +22,7 @@
#include <mapnik/geometry/envelope.hpp> #include <mapnik/geometry/envelope.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
namespace mapnik { namespace geometry { namespace mapnik { namespace geometry {

2
include/mapnik/grid/grid.hpp
View file

@ -26,7 +26,7 @@
// mapnik // mapnik
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/grid/grid_view.hpp> #include <mapnik/grid/grid_view.hpp>
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/value.hpp> #include <mapnik/value.hpp>

2
include/mapnik/grid/grid_renderer.hpp
View file

@ -29,7 +29,7 @@
#include <mapnik/grid/grid.hpp> #include <mapnik/grid/grid.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/rule.hpp> // for rule, symbolizers #include <mapnik/rule.hpp> // for rule, symbolizers
#include <mapnik/box2d.hpp> // for box2d #include <mapnik/geometry/box2d.hpp> // for box2d
#include <mapnik/color.hpp> // for color #include <mapnik/color.hpp> // for color
#include <mapnik/view_transform.hpp> // for view_transform #include <mapnik/view_transform.hpp> // for view_transform
#include <mapnik/image_compositing.hpp> // for composite_mode_e #include <mapnik/image_compositing.hpp> // for composite_mode_e

2
include/mapnik/grid/grid_view.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_GRID_VIEW_HPP #define MAPNIK_GRID_VIEW_HPP
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/value.hpp> #include <mapnik/value.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>

2
include/mapnik/group/group_layout_manager.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_GROUP_LAYOUT_MANAGER_HPP #define MAPNIK_GROUP_LAYOUT_MANAGER_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/pixel_position.hpp> #include <mapnik/pixel_position.hpp>
#include <mapnik/group/group_layout.hpp> #include <mapnik/group/group_layout.hpp>

2
include/mapnik/image_reader.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/factory.hpp> #include <mapnik/factory.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>

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

@ -24,7 +24,7 @@
#define MAPNIK_JSON_EXTRACT_BOUNDING_BOXES_CONFIG_HPP #define MAPNIK_JSON_EXTRACT_BOUNDING_BOXES_CONFIG_HPP
#include <mapnik/json/json_grammar_config.hpp> #include <mapnik/json/json_grammar_config.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#pragma GCC diagnostic push #pragma GCC diagnostic push
#include <mapnik/warning_ignore.hpp> #include <mapnik/warning_ignore.hpp>

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

@ -24,7 +24,7 @@
#define MAPNIK_TOPOJSON_UTILS_HPP #define MAPNIK_TOPOJSON_UTILS_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>
#include <mapnik/json/topology.hpp> #include <mapnik/json/topology.hpp>
#include <mapnik/json/attribute_value_visitor.hpp> #include <mapnik/json/attribute_value_visitor.hpp>

2
include/mapnik/layer.hpp
View file

@ -25,7 +25,7 @@
// mapnik // mapnik
#include <mapnik/well_known_srs.hpp> #include <mapnik/well_known_srs.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
// stl // stl
#include <vector> #include <vector>

2
include/mapnik/map.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/color.hpp> #include <mapnik/color.hpp>
#include <mapnik/font_set.hpp> #include <mapnik/font_set.hpp>
#include <mapnik/enumeration.hpp> #include <mapnik/enumeration.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/well_known_srs.hpp> #include <mapnik/well_known_srs.hpp>
#include <mapnik/image_compositing.hpp> #include <mapnik/image_compositing.hpp>

2
include/mapnik/marker_helpers.hpp
View file

@ -32,7 +32,7 @@
#include <mapnik/marker.hpp> // for svg_storage_type #include <mapnik/marker.hpp> // for svg_storage_type
#include <mapnik/markers_placement.hpp> #include <mapnik/markers_placement.hpp>
#include <mapnik/attribute.hpp> #include <mapnik/attribute.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/vertex_processor.hpp> #include <mapnik/vertex_processor.hpp>
#include <mapnik/renderer_common/apply_vertex_converter.hpp> #include <mapnik/renderer_common/apply_vertex_converter.hpp>
#include <mapnik/renderer_common/render_markers_symbolizer.hpp> #include <mapnik/renderer_common/render_markers_symbolizer.hpp>

2
include/mapnik/markers_placements/basic.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_MARKERS_PLACEMENTS_BASIC_HPP #define MAPNIK_MARKERS_PLACEMENTS_BASIC_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/symbolizer_enumerations.hpp> #include <mapnik/symbolizer_enumerations.hpp>
#include <mapnik/util/math.hpp> #include <mapnik/util/math.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>

2
include/mapnik/memory_featureset.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_MEMORY_FEATURESET_HPP #define MAPNIK_MEMORY_FEATURESET_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/geometry/envelope.hpp> #include <mapnik/geometry/envelope.hpp>
#include <mapnik/featureset.hpp> #include <mapnik/featureset.hpp>

2
include/mapnik/path.hpp
View file

@ -25,7 +25,7 @@
// mapnik // mapnik
#include <mapnik/vertex_vector.hpp> #include <mapnik/vertex_vector.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
namespace mapnik { namespace detail { namespace mapnik { namespace detail {

2
include/mapnik/quad_tree.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_QUAD_TREE_HPP #define MAPNIK_QUAD_TREE_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/make_unique.hpp> #include <mapnik/make_unique.hpp>

2
include/mapnik/query.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_QUERY_HPP #define MAPNIK_QUERY_HPP
//mapnik //mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/attribute.hpp> #include <mapnik/attribute.hpp>
// stl // stl

2
include/mapnik/raster.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_RASTER_HPP #define MAPNIK_RASTER_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/image_any.hpp> #include <mapnik/image_any.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>

2
include/mapnik/renderer_common.hpp
View file

@ -25,7 +25,7 @@
#include <mapnik/config.hpp> // for MAPNIK_DECL #include <mapnik/config.hpp> // for MAPNIK_DECL
#include <mapnik/font_engine_freetype.hpp> // for face_manager, etc #include <mapnik/font_engine_freetype.hpp> // for face_manager, etc
#include <mapnik/box2d.hpp> // for box2d #include <mapnik/geometry/box2d.hpp> // for box2d
#include <mapnik/view_transform.hpp> // for view_transform #include <mapnik/view_transform.hpp> // for view_transform
#include <mapnik/attribute.hpp> #include <mapnik/attribute.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>

2
include/mapnik/renderer_common/clipping_extent.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_CLIPPING_EXTENT_HPP #define MAPNIK_CLIPPING_EXTENT_HPP
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
namespace mapnik { namespace mapnik {

2
include/mapnik/request.hpp
View file

@ -25,7 +25,7 @@
// mapnik // mapnik
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
namespace mapnik namespace mapnik
{ {

2
include/mapnik/svg/output/svg_renderer.hpp
View file

@ -30,7 +30,7 @@
#include <mapnik/svg/output/svg_output_attributes.hpp> #include <mapnik/svg/output/svg_output_attributes.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/rule.hpp> // for rule, symbolizers #include <mapnik/rule.hpp> // for rule, symbolizers
#include <mapnik/box2d.hpp> // for box2d #include <mapnik/geometry/box2d.hpp> // for box2d
#include <mapnik/color.hpp> // for color #include <mapnik/color.hpp> // for color
#include <mapnik/view_transform.hpp> // for view_transform #include <mapnik/view_transform.hpp> // for view_transform
#include <mapnik/image_compositing.hpp> // for composite_mode_e #include <mapnik/image_compositing.hpp> // for composite_mode_e

2
include/mapnik/svg/svg_path_adapter.hpp
View file

@ -25,7 +25,7 @@
// mapnik // mapnik
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/safe_cast.hpp> #include <mapnik/safe_cast.hpp>
#pragma GCC diagnostic push #pragma GCC diagnostic push

2
include/mapnik/svg/svg_renderer_agg.hpp
View file

@ -26,7 +26,7 @@
// mapnik // mapnik
#include <mapnik/svg/svg_path_attributes.hpp> #include <mapnik/svg/svg_path_attributes.hpp>
#include <mapnik/gradient.hpp> #include <mapnik/gradient.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>

2
include/mapnik/svg/svg_storage.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_SVG_STORAGE_HPP #define MAPNIK_SVG_STORAGE_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
namespace mapnik { namespace mapnik {

2
include/mapnik/text/glyph_positions.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_TEXT_GLYPH_POSITIONS_HPP #define MAPNIK_TEXT_GLYPH_POSITIONS_HPP
//mapnik //mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/pixel_position.hpp> #include <mapnik/pixel_position.hpp>
#include <mapnik/text/rotation.hpp> #include <mapnik/text/rotation.hpp>
#include <mapnik/marker_cache.hpp> #include <mapnik/marker_cache.hpp>

2
include/mapnik/text/placement_finder.hpp
View file

@ -23,7 +23,7 @@
#define MAPNIK_PLACEMENT_FINDER_HPP #define MAPNIK_PLACEMENT_FINDER_HPP
//mapnik //mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/pixel_position.hpp> #include <mapnik/pixel_position.hpp>
#include <mapnik/text/text_layout.hpp> #include <mapnik/text/text_layout.hpp>
#include <mapnik/text/glyph_positions.hpp> #include <mapnik/text/glyph_positions.hpp>

2
include/mapnik/text/text_layout.hpp
View file

@ -25,7 +25,7 @@
//mapnik //mapnik
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#include <mapnik/pixel_position.hpp> #include <mapnik/pixel_position.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/attribute.hpp> #include <mapnik/attribute.hpp>
#include <mapnik/symbolizer_enumerations.hpp> #include <mapnik/symbolizer_enumerations.hpp>
#include <mapnik/text/text_properties.hpp> #include <mapnik/text/text_properties.hpp>

2
include/mapnik/util/spatial_index.hpp
View file

@ -25,7 +25,7 @@
//mapnik //mapnik
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/geom_util.hpp> #include <mapnik/geom_util.hpp>
// stl // stl

2
include/mapnik/view_transform.hpp
View file

@ -25,7 +25,7 @@
// mapnik // mapnik
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/proj_transform.hpp> #include <mapnik/proj_transform.hpp>
namespace mapnik namespace mapnik

2
include/mapnik/warp.hpp
View file

@ -26,7 +26,7 @@
// mapnik // mapnik
#include <mapnik/image_scaling.hpp> #include <mapnik/image_scaling.hpp>
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
namespace mapnik { namespace mapnik {

2
plugins/input/csv/csv_datasource.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>

2
plugins/input/csv/csv_utils.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_CSV_UTILS_DATASOURCE_HPP #define MAPNIK_CSV_UTILS_DATASOURCE_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/geometry.hpp> #include <mapnik/geometry.hpp>
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#include <mapnik/util/conversions.hpp> #include <mapnik/util/conversions.hpp>

2
plugins/input/gdal/gdal_datasource.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>

2
plugins/input/geojson/geojson_datasource.cpp
View file

@ -40,7 +40,7 @@
#include <mapnik/feature_factory.hpp> #include <mapnik/feature_factory.hpp>
#include <mapnik/feature_kv_iterator.hpp> #include <mapnik/feature_kv_iterator.hpp>
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/debug.hpp> #include <mapnik/debug.hpp>
#include <mapnik/proj_transform.hpp> #include <mapnik/proj_transform.hpp>
#include <mapnik/projection.hpp> #include <mapnik/projection.hpp>

2
plugins/input/geojson/geojson_datasource.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>

2
plugins/input/ogr/ogr_datasource.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>

2
plugins/input/ogr/ogr_featureset.cpp
View file

@ -24,7 +24,7 @@
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#include <mapnik/debug.hpp> #include <mapnik/debug.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>
#include <mapnik/wkb.hpp> #include <mapnik/wkb.hpp>

2
plugins/input/ogr/ogr_index.hpp
View file

@ -28,7 +28,7 @@
#include <vector> #include <vector>
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
using mapnik::box2d; using mapnik::box2d;

2
plugins/input/ogr/ogr_index_featureset.cpp
View file

@ -24,7 +24,7 @@
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/debug.hpp> #include <mapnik/debug.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>
#include <mapnik/wkb.hpp> #include <mapnik/wkb.hpp>

2
plugins/input/pgraster/pgraster_datasource.hpp
View file

@ -32,7 +32,7 @@
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>

2
plugins/input/pgraster/pgraster_featureset.hpp
View file

@ -28,7 +28,7 @@
#define PGRASTER_FEATURESET_HPP #define PGRASTER_FEATURESET_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>

2
plugins/input/pgraster/pgraster_wkb_reader.cpp
View file

@ -35,7 +35,7 @@
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#include <mapnik/util/conversions.hpp> #include <mapnik/util/conversions.hpp>
#include <mapnik/util/trim.hpp> #include <mapnik/util/trim.hpp>
#include <mapnik/box2d.hpp> // for box2d #include <mapnik/geometry/box2d.hpp> // for box2d
#include <functional> #include <functional>
#include <cstdint> #include <cstdint>

2
plugins/input/pgraster/pgraster_wkb_reader.hpp
View file

@ -29,7 +29,7 @@
// mapnik // mapnik
#include <mapnik/feature.hpp> // for raster_ptr #include <mapnik/feature.hpp> // for raster_ptr
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
enum pgraster_color_interp { enum pgraster_color_interp {
// Automatic color interpretation: // Automatic color interpretation:

2
plugins/input/postgis/postgis_datasource.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>

2
plugins/input/postgis/postgis_featureset.hpp
View file

@ -24,7 +24,7 @@
#define POSTGIS_FEATURESET_HPP #define POSTGIS_FEATURESET_HPP
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>

2
plugins/input/raster/raster_datasource.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>

2
plugins/input/shape/shape_datasource.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>

2
plugins/input/shape/shape_io.hpp
View file

@ -27,7 +27,7 @@
#include <memory> #include <memory>
#include <ios> #include <ios>
// mapnik // mapnik
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
#include <mapnik/util/spatial_index.hpp> #include <mapnik/util/spatial_index.hpp>
// boost // boost

2
plugins/input/shape/shapefile.hpp
View file

@ -32,7 +32,7 @@
// mapnik // mapnik
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/util/utf_conv_win.hpp> #include <mapnik/util/utf_conv_win.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#if defined(MAPNIK_MEMORY_MAPPED_FILE) #if defined(MAPNIK_MEMORY_MAPPED_FILE)
#pragma GCC diagnostic push #pragma GCC diagnostic push

2
plugins/input/sqlite/sqlite_datasource.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>
#include <mapnik/wkb.hpp> #include <mapnik/wkb.hpp>

2
plugins/input/sqlite/sqlite_featureset.cpp
View file

@ -23,7 +23,7 @@
// mapnik // mapnik
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/debug.hpp> #include <mapnik/debug.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>
#include <mapnik/wkb.hpp> #include <mapnik/wkb.hpp>

2
plugins/input/sqlite/sqlite_prepared.hpp
View file

@ -27,7 +27,7 @@
#include <mapnik/debug.hpp> #include <mapnik/debug.hpp>
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/util/noncopyable.hpp> #include <mapnik/util/noncopyable.hpp>
// boost // boost

2
plugins/input/topojson/topojson_datasource.cpp
View file

@ -32,7 +32,7 @@
// mapnik // mapnik
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>
#include <mapnik/value/types.hpp> #include <mapnik/value/types.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/geometry/boost_adapters.hpp> #include <mapnik/geometry/boost_adapters.hpp>
#include <mapnik/json/topojson_grammar_x3.hpp> #include <mapnik/json/topojson_grammar_x3.hpp>
#include <mapnik/json/topojson_utils.hpp> #include <mapnik/json/topojson_utils.hpp>

2
plugins/input/topojson/topojson_datasource.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/params.hpp> #include <mapnik/params.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>
#include <mapnik/unicode.hpp> #include <mapnik/unicode.hpp>

2
src/agg/process_raster_symbolizer.cpp
View file

@ -31,7 +31,7 @@
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#include <mapnik/image_util.hpp> #include <mapnik/image_util.hpp>
#include <mapnik/raster.hpp> #include <mapnik/raster.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/config.hpp> #include <mapnik/config.hpp>
#include <mapnik/renderer_common/process_raster_symbolizer.hpp> #include <mapnik/renderer_common/process_raster_symbolizer.hpp>

2
src/build.py
View file

@ -166,10 +166,10 @@ source = Split(
image_copy.cpp image_copy.cpp
image_compositing.cpp image_compositing.cpp
image_scaling.cpp image_scaling.cpp
box2d.cpp
datasource_cache.cpp datasource_cache.cpp
datasource_cache_static.cpp datasource_cache_static.cpp
debug.cpp debug.cpp
geometry/box2d.cpp
geometry/reprojection.cpp geometry/reprojection.cpp
geometry/envelope.cpp geometry/envelope.cpp
expression_node.cpp expression_node.cpp

2
src/box2d.cpp → src/geometry/box2d.cpp
View file

@ -21,7 +21,7 @@
*****************************************************************************/ *****************************************************************************/
// mapnik // mapnik
#include <mapnik/box2d_impl.hpp> #include <mapnik/geometry/box2d_impl.hpp>
namespace mapnik { namespace mapnik {

2
src/image_util.cpp
View file

@ -32,7 +32,7 @@
#include <mapnik/image_view.hpp> #include <mapnik/image_view.hpp>
#include <mapnik/palette.hpp> #include <mapnik/palette.hpp>
#include <mapnik/color.hpp> #include <mapnik/color.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/util/variant.hpp> #include <mapnik/util/variant.hpp>
#include <mapnik/debug.hpp> #include <mapnik/debug.hpp>
#include <mapnik/safe_cast.hpp> #include <mapnik/safe_cast.hpp>

2
src/json/extract_bounding_boxes_x3.cpp
View file

@ -20,7 +20,7 @@
* *
*****************************************************************************/ *****************************************************************************/
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/json/extract_bounding_boxes_x3.hpp> #include <mapnik/json/extract_bounding_boxes_x3.hpp>
#include <mapnik/json/json_grammar_config.hpp> #include <mapnik/json/json_grammar_config.hpp>
#include <mapnik/json/extract_bounding_boxes_x3_config.hpp> #include <mapnik/json/extract_bounding_boxes_x3_config.hpp>

2
src/memory_datasource.cpp
View file

@ -23,7 +23,7 @@
// mapnik // mapnik
#include <mapnik/debug.hpp> #include <mapnik/debug.hpp>
#include <mapnik/query.hpp> #include <mapnik/query.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/memory_datasource.hpp> #include <mapnik/memory_datasource.hpp>
#include <mapnik/memory_featureset.hpp> #include <mapnik/memory_featureset.hpp>
#include <mapnik/boolean.hpp> #include <mapnik/boolean.hpp>

2
src/proj_transform.cpp
View file

@ -22,7 +22,7 @@
// mapnik // mapnik
#include <mapnik/global.hpp> #include <mapnik/global.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/projection.hpp> #include <mapnik/projection.hpp>
#include <mapnik/proj_transform.hpp> #include <mapnik/proj_transform.hpp>
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>

2
src/renderer_common/render_pattern.cpp
View file

@ -21,7 +21,7 @@
*****************************************************************************/ *****************************************************************************/
// mapnik // mapnik
#include <mapnik/renderer_common/render_pattern.hpp> #include <mapnik/renderer_common/render_pattern.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/marker.hpp> #include <mapnik/marker.hpp>
#include <mapnik/svg/svg_converter.hpp> #include <mapnik/svg/svg_converter.hpp>
#include <mapnik/svg/svg_renderer_agg.hpp> #include <mapnik/svg/svg_renderer_agg.hpp>

2
src/warp.cpp
View file

@ -26,7 +26,7 @@
#include <mapnik/image.hpp> #include <mapnik/image.hpp>
#include <mapnik/image_scaling_traits.hpp> #include <mapnik/image_scaling_traits.hpp>
#include <mapnik/image_util.hpp> #include <mapnik/image_util.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/view_transform.hpp> #include <mapnik/view_transform.hpp>
#include <mapnik/raster.hpp> #include <mapnik/raster.hpp>
#include <mapnik/proj_transform.hpp> #include <mapnik/proj_transform.hpp>

3
test/unit/core/box2d_test.cpp
View file

@ -1,8 +1,7 @@
#include "catch.hpp" #include "catch.hpp"
#include <mapnik/coord.hpp> #include <mapnik/coord.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include "agg_trans_affine.h" #include "agg_trans_affine.h"
TEST_CASE("box2d") { TEST_CASE("box2d") {

3
test/unit/projection/proj_transform.cpp
View file

@ -1,9 +1,8 @@
#include "catch.hpp" #include "catch.hpp"
#include <mapnik/projection.hpp> #include <mapnik/projection.hpp>
#include <mapnik/proj_transform.hpp> #include <mapnik/proj_transform.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#ifdef MAPNIK_USE_PROJ4 #ifdef MAPNIK_USE_PROJ4
// proj4 // proj4

2
utils/mapnik-index/process_csv_file.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_UTILS_PROCESS_CSV_FILE_HPP #define MAPNIK_UTILS_PROCESS_CSV_FILE_HPP
#include <utility> #include <utility>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
namespace mapnik { namespace detail { namespace mapnik { namespace detail {

2
utils/ogrindex/ogrindex.cpp
View file

@ -29,7 +29,7 @@
#include <boost/program_options.hpp> #include <boost/program_options.hpp>
#include <mapnik/datasource.hpp> #include <mapnik/datasource.hpp>
#include <mapnik/box2d.hpp> #include <mapnik/geometry/box2d.hpp>
#include <mapnik/feature.hpp> #include <mapnik/feature.hpp>
#include <mapnik/util/fs.hpp> #include <mapnik/util/fs.hpp>
#include <mapnik/feature_layer_desc.hpp> #include <mapnik/feature_layer_desc.hpp>