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

rename geometry_impl.hpp to geometry.hpp

Browse source
This commit is contained in:
artemp 2015-03-24 13:32:05 +01:00
parent 323fdd5212
commit 7e03d41606
43 changed files with 49 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bindings/python/mapnik_geometry.cpp
View file

@ -39,7 +39,7 @@
#pragma GCC diagnostic pop
// mapnik
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_type.hpp>
#include <mapnik/geometry_envelope.hpp>
#include <mapnik/geometry_is_valid.hpp>

2
include/mapnik/feature.hpp
View file

@ -28,7 +28,7 @@
#include <mapnik/value_types.hpp>
#include <mapnik/value.hpp>
#include <mapnik/box2d.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_envelope.hpp>
//
#include <mapnik/feature_kv_iterator.hpp>

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

2
include/mapnik/geometry_centroid.hpp
View file

@ -23,7 +23,7 @@
#ifndef MAPNIK_GEOMETRY_CENTROID_HPP
#define MAPNIK_GEOMETRY_CENTROID_HPP
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_adapters.hpp>
#include <boost/geometry/algorithms/centroid.hpp>

2
include/mapnik/geometry_correct.hpp
View file

@ -23,7 +23,7 @@
#ifndef MAPNIK_GEOMETRY_CORRECT_HPP
#define MAPNIK_GEOMETRY_CORRECT_HPP
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_adapters.hpp>
#include <boost/geometry/algorithms/correct.hpp>

2
include/mapnik/geometry_empty.hpp
View file

@ -23,7 +23,7 @@
#ifndef MAPNIK_GEOMETRY_EMPTY_HPP
#define MAPNIK_GEOMETRY_EMPTY_HPP
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
namespace mapnik { namespace new_geometry {

2
include/mapnik/geometry_envelope.hpp
View file

@ -23,7 +23,7 @@
#ifndef MAPNIK_GEOMETRY_ENVELOPE_HPP
#define MAPNIK_GEOMETRY_ENVELOPE_HPP
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/box2d.hpp>
namespace mapnik { namespace new_geometry {

2
include/mapnik/geometry_is_simple.hpp
View file

@ -23,7 +23,7 @@
#ifndef MAPNIK_GEOMETRY_IS_SIMPLE_HPP
#define MAPNIK_GEOMETRY_IS_SIMPLE_HPP
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_adapters.hpp>
#include <boost/geometry/algorithms/is_simple.hpp>

2
include/mapnik/geometry_is_valid.hpp
View file

@ -23,7 +23,7 @@
#ifndef MAPNIK_GEOMETRY_IS_VALID_HPP
#define MAPNIK_GEOMETRY_IS_VALID_HPP
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_adapters.hpp>
#include <boost/geometry/algorithms/is_valid.hpp>

2
include/mapnik/geometry_type.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_GEOMETRY_TYPE_HPP
// mapnik
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_types.hpp>
namespace mapnik { namespace new_geometry { namespace detail {

2
include/mapnik/hit_test_filter.hpp
View file

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/feature.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geom_util.hpp>
namespace mapnik {

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

@ -27,7 +27,7 @@
#include <mapnik/json/generic_json.hpp>
#include <mapnik/json/error_handler.hpp>
#include <mapnik/box2d.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
// boost
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wunused-parameter"

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

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/global.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_type.hpp>
#include <mapnik/geometry_fusion_adapted.hpp>
// boost

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

@ -24,7 +24,7 @@
#define MAPNIK_GEOMETRY_GRAMMAR_HPP
// mapnik
#include <mapnik/geometry_impl.hpp> // for geometry_type
#include <mapnik/geometry.hpp> // for geometry_type
#include <mapnik/make_unique.hpp>
#include <mapnik/json/generic_json.hpp>
#include <mapnik/json/positions_grammar.hpp>

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

@ -23,7 +23,7 @@
#ifndef MAPNIK_JSON_GEOMETRY_UTIL_HPP
#define MAPNIK_JSON_GEOMETRY_UTIL_HPP
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_adapters.hpp>
// boost.geometry
#include <boost/geometry/algorithms/correct.hpp>

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

@ -27,7 +27,7 @@
#include <mapnik/util/variant.hpp>
#include <mapnik/json/generic_json.hpp>
#include <mapnik/json/error_handler.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_fusion_adapted.hpp>
// boost
#pragma GCC diagnostic push

2
include/mapnik/marker_helpers.hpp
View file

@ -25,7 +25,7 @@
#include <mapnik/color.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_type.hpp>
#include <mapnik/geometry_centroid.hpp>
#include <mapnik/symbolizer.hpp>

2
include/mapnik/memory_featureset.hpp
View file

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/box2d.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_envelope.hpp>
#include <mapnik/featureset.hpp>
#include <mapnik/datasource.hpp>

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

@ -24,7 +24,7 @@
#ifndef MAPNIK_PATTERN_ALIGNMENT_HPP
#define MAPNIK_PATTERN_ALIGNMENT_HPP
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
namespace mapnik { namespace detail {

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

@ -25,7 +25,7 @@
#include <mapnik/segment.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/path.hpp>
#include <algorithm>

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

@ -27,7 +27,7 @@
// mapnik
#include <mapnik/global.hpp>
// for container stuff
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/view_transform.hpp> // for container stuff
#include <mapnik/transform_path_adapter.hpp>
#include <mapnik/util/path_iterator.hpp>

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

@ -25,7 +25,7 @@
//mapnik
#include <mapnik/text/placement_finder.hpp>
#include <mapnik/vertex_converters.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
namespace mapnik {

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

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/global.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/datasource_geometry_type.hpp>
#include <mapnik/util/variant.hpp>
// boost

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

@ -27,7 +27,7 @@
#include <mapnik/config.hpp>
#include <mapnik/make_unique.hpp>
#include <mapnik/wkb.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_type.hpp>
// stl

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

@ -23,7 +23,7 @@
#ifndef MAPNIK_UTIL_SPIRIT_TRANSFORM_ATTRIBUTE_HPP
#define MAPNIK_UTIL_SPIRIT_TRANSFORM_ATTRIBUTE_HPP
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
namespace boost { namespace spirit { namespace traits {

2
include/mapnik/vertex_processor.hpp
View file

@ -23,7 +23,7 @@
#ifndef MAPNIK_VERTEX_PROCESSOR_HPP
#define MAPNIK_VERTEX_PROCESSOR_HPP
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
namespace mapnik { namespace new_geometry {

2
include/mapnik/wkb.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_WKB_HPP
// mapnik
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/util/noncopyable.hpp>
namespace mapnik

2
include/mapnik/wkt/wkt_factory.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_WKT_FACTORY_HPP
// mapnik
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/wkt/wkt_grammar.hpp>
#include <mapnik/wkt/wkt_generator_grammar.hpp>

2
include/mapnik/wkt/wkt_generator_grammar.hpp
View file

@ -25,7 +25,7 @@
// mapnik
#include <mapnik/global.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_type.hpp>
#include <mapnik/geometry_fusion_adapted.hpp>

2
include/mapnik/wkt/wkt_generator_grammar_impl.hpp
View file

@ -20,7 +20,7 @@
*
*****************************************************************************/
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/wkt/wkt_generator_grammar.hpp>
#include <mapnik/util/spirit_transform_attribute.hpp>
// boost

2
include/mapnik/wkt/wkt_grammar.hpp
View file

@ -24,7 +24,7 @@
#define MAPNIK_WKT_GRAMMAR_HPP
// mapnik
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_adapters.hpp>
#include <mapnik/geometry_fusion_adapted.hpp>
#pragma GCC diagnostic push

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

@ -33,7 +33,7 @@
#include <mapnik/unicode.hpp>
#include <mapnik/feature_layer_desc.hpp>
#include <mapnik/feature_factory.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_correct.hpp>
#include <mapnik/memory_featureset.hpp>
#include <mapnik/wkt/wkt_factory.hpp>

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

@ -22,7 +22,7 @@
// mapnik
#include <mapnik/debug.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
// ogr
#include "ogr_converter.hpp"

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

@ -24,7 +24,7 @@
#define OGR_CONVERTER_HPP
// mapnik
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
class OGRGeometry;
class OGRGeometryCollection;

2
plugins/input/osm/osm_featureset.cpp
View file

@ -22,7 +22,7 @@
// mapnik
#include <mapnik/make_unique.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/feature_factory.hpp>
#include <mapnik/debug.hpp>

2
src/group/group_symbolizer_helper.cpp
View file

@ -24,7 +24,7 @@
#include <mapnik/group/group_symbolizer_helper.hpp>
#include <mapnik/label_collision_detector.hpp>
//#include <mapnik/geom_util.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/vertex_processor.hpp>
#include <mapnik/debug.hpp>
#include <mapnik/symbolizer.hpp>

2
src/json/mapnik_json_generator_grammar.cpp
View file

@ -20,7 +20,7 @@
*
*****************************************************************************/
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/json/geometry_generator_grammar_impl.hpp>
#include <mapnik/json/properties_generator_grammar_impl.hpp>

2
src/text/symbolizer_helpers.cpp
View file

@ -28,7 +28,7 @@
#include <mapnik/feature.hpp>
#include <mapnik/marker.hpp>
#include <mapnik/marker_cache.hpp>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_type.hpp>
#include <mapnik/geometry_centroid.hpp>
#include <mapnik/vertex_processor.hpp>

2
src/wkt/mapnik_wkt_generator_grammar.cpp
View file

@ -20,7 +20,7 @@
*
*****************************************************************************/
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/wkt/wkt_generator_grammar_impl.hpp>
#include <string>

2
tests/cpp_tests/label_algo_test.cpp
View file

@ -1,6 +1,6 @@
#include <boost/detail/lightweight_test.hpp>
#include <iostream>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/geometry_adapters.hpp>
#include <mapnik/geometry_centroid.hpp>
#include <vector>

2
tests/cxx/geometry.cpp
View file

@ -1,6 +1,6 @@
#include "catch.hpp"
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/util/fs.hpp>
#include <mapnik/util/file_io.hpp>
#include <mapnik/json/geometry_parser.hpp>

17
tests/cxx/geometry_hit_test.cpp
View file

@ -1,7 +1,6 @@
#include "catch.hpp"
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/hit_test_filter.hpp>
#include <mapnik/geometry_correct.hpp>
@ -11,19 +10,19 @@ SECTION("hit_test_filter") {
using namespace mapnik::new_geometry;
{
geometry geom(point(0,0));
REQUIRE( mapnik::hit_test(geom,0,0,0) );
REQUIRE( mapnik::hit_test(geom,0,0,0) );
}
{
geometry geom(point(0,0));
REQUIRE( mapnik::hit_test(geom,1,0,1) );
REQUIRE( mapnik::hit_test(geom,1,0,1) );
}
{
geometry geom(point(0,0));
REQUIRE( mapnik::hit_test(geom,0,1,1) );
REQUIRE( mapnik::hit_test(geom,0,1,1) );
}
{
geometry geom(point(0,0));
REQUIRE( mapnik::hit_test(geom,1,1,1.5) );
REQUIRE( mapnik::hit_test(geom,1,1,1.5) );
}
{
line_string line;
@ -31,17 +30,17 @@ SECTION("hit_test_filter") {
line.add_coord(1,1);
line.add_coord(2,2);
geometry geom(line);
REQUIRE( mapnik::hit_test(geom,0,0,1.5) );
REQUIRE( mapnik::hit_test(geom,0,0,1.5) );
}
{
line_string line;
line_string line;
line.add_coord(0,0);
line.add_coord(1,1);
line.add_coord(2,2);
multi_line_string multi_line;
multi_line.emplace_back(std::move(line));
geometry geom(multi_line);
REQUIRE( mapnik::hit_test(geom,0,0,1.5) );
REQUIRE( mapnik::hit_test(geom,0,0,1.5) );
}
{
polygon poly;

2
utils/geometry_to_wkb/main.cpp
View file

@ -24,7 +24,7 @@
#include <iostream>
#include <string>
#include <mapnik/geometry_impl.hpp>
#include <mapnik/geometry.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/params.hpp>
#include <mapnik/datasource.hpp>