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

Merge remote branch 'origin/master'

Browse source
This commit is contained in:
Robert Coup 2011-10-31 10:53:35 +13:00
commit a5e8e70a39
358 changed files with 4663 additions and 3524 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG
View file

@ -18,6 +18,7 @@ Mapnik 2.1.0
- Fixed bug in shield line placement when dx/dy are used to shift the label relative to the placement point (Matt Amos) (#908)
- Added <layer_by_sql> parameter in OGR plugin to select a layer by SQL query (besides name or index): see http://www.gdal.org/ogr/ogr_sql.html for specifications (kunitoki) (#472)
Mapnik 2.0.0

13
SConstruct
View file

@ -425,7 +425,6 @@ pickle_store = [# Scons internal variables
'PYTHON_INSTALL_LOCATION',
'PYTHON_SYS_PREFIX',
'COLOR_PRINT',
'HAS_BOOST_SYSTEM',
'SVN_REVISION',
'HAS_CAIRO',
'HAS_PYCAIRO',
@ -1070,15 +1069,17 @@ if not preconfigured:
env.AppendUnique(CPPPATH = os.path.realpath(inc_path))
env.AppendUnique(LIBPATH = os.path.realpath(lib_path))
conf.parse_config('FREETYPE_CONFIG')
if conf.parse_config('FREETYPE_CONFIG'):
# check if freetype links to bz2
if env['RUNTIME_LINK'] == 'static':
temp_env = env.Clone()
temp_env['LIBS'] = []
try:
temp_env.ParseConfig('%s --libs' % env['FREETYPE_CONFIG'])
if 'bz2' in temp_env['LIBS']:
env['EXTRA_FREETYPE_LIBS'].append('bz2')
except OSError,e:
pass
# libxml2 should be optional but is currently not
# https://github.com/mapnik/mapnik/issues/913
@ -1126,18 +1127,14 @@ if not preconfigured:
conf.FindBoost(BOOST_SEARCH_PREFIXES,thread_flag)
# boost system is used in boost 1.35 and greater
env['HAS_BOOST_SYSTEM'] = False
boost_lib_version_from_header = conf.GetBoostLibVersion()
if boost_lib_version_from_header:
boost_version_from_header = int(boost_lib_version_from_header.split('_')[1])
if boost_version_from_header >= 35:
env['HAS_BOOST_SYSTEM'] = True
# The other required boost headers.
BOOST_LIBSHEADERS = [
['system', 'boost/system/system_error.hpp', env['HAS_BOOST_SYSTEM']],
['system', 'boost/system/system_error.hpp', True],
['filesystem', 'boost/filesystem/operations.hpp', True],
['regex', 'boost/regex.hpp', True],
['program_options', 'boost/program_options.hpp', False]

5
bindings/python/mapnik/__init__.py
View file

@ -485,10 +485,11 @@ def Ogr(**keywords):
Required keyword arguments:
file -- path to OGR supported dataset
layer -- name of layer to use within datasource (optional if layer_by_index is used)
layer -- name of layer to use within datasource (optional if layer_by_index or layer_by_sql is used)
Optional keyword arguments:
layer_by_index -- choose layer by index number instead of by layer name.
layer_by_index -- choose layer by index number instead of by layer name or sql.
layer_by_sql -- choose layer by sql query number instead of by layer name or index.
base -- path prefix (default None)
encoding -- file encoding (default 'utf-8')
multiple_geometries -- boolean, direct the Mapnik wkb reader to interpret as multigeometries (default False)

2
demo/c++/rundemo.cpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public

3
demo/viewer/about_dialog.cpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/about_dialog.hpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/info_dialog.cpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/info_dialog.hpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/layer_info_dialog.cpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/layer_info_dialog.hpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/layerdelegate.cpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/layerdelegate.hpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/layerlistmodel.cpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/layerlistmodel.hpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/layerwidget.cpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/layerwidget.hpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2006 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/main.cpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2006 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/mainwindow.cpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2006 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/mainwindow.hpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2006 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/mapwidget.cpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2006 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/mapwidget.hpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/styles_model.cpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

3
demo/viewer/styles_model.hpp
View file

@ -1,5 +1,6 @@
/* This file is part of Mapnik (c++ mapping toolkit)
* Copyright (C) 2007 Artem Pavlenko
*
* Copyright (C) 2011 Artem Pavlenko
*
* Mapnik is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License

2
deps/agg/include/agg_path_storage.h vendored
View file

@ -736,7 +736,7 @@ namespace agg
template<class VertexSource>
void join_path(VertexSource& vs, unsigned path_id = 0)
{
double x, y;
double x=0.0, y=0.0;
unsigned cmd;
vs.rewind(path_id);
cmd = vs.vertex(&x, &y);

5
deps/agg/include/agg_rasterizer_outline_aa.h vendored
View file

@ -323,9 +323,7 @@ namespace agg
int y2;
int lprev;
if(close_polygon)
{
if(m_src_vertices.size() >= 3)
if(close_polygon && (m_src_vertices.size() >= 3))
{
dv.idx = 2;
@ -385,7 +383,6 @@ namespace agg
}
draw(dv, 0, m_src_vertices.size());
}
}
else
{
switch(m_src_vertices.size())

4
deps/agg/src/agg_rounded_rect.cpp vendored
View file

@ -78,8 +78,8 @@ namespace agg
//--------------------------------------------------------------------
void rounded_rect::normalize_radius()
{
double dx = fabs(m_y2 - m_y1);
double dy = fabs(m_x2 - m_x1);
double dx = fabs(m_x2 - m_x1);
double dy = fabs(m_y2 - m_y1);
double k = 1.0;
double t;

45
docs/contributing.markdown
View file

@ -15,11 +15,33 @@ Look through the code to get an idea, and do not hesitate to ask questions.
Also read the design philosophy page for the motivations that lead to code decisions.
Templates are good, within reason. We seek to use templates were possible for flexible code, but not in cases where functional
patterns would be just as concise and clear.
In general we use Boost, it makes more possible in C++. It is a big build time dependency (as in time to compile against and # of headers) but ultimately compiles to small object code and is very fast (particularly spirit). It also has no dependencies itself (it's really an extension to the C++ language) so requiring it is much easier than requiring a hard dependency that itself has other dependencies. This is a big reason that we prefer AGG to Cairo as our primary renderer. Also AGG, besides producing the best visual output, strikes an excellent balance between speed and thread safety by using very lightweight objects. Cairo not so much.
You will also notice that we don't use many of the standard geo libraries when we could. For instance we don't use GDAL, OGR, or GEOS anywhere in core, and only leverage them in optional plugins. We feel we can often write code that is faster and more thread safe than these libraries but that still does the job. If this ever changes we can adapt and start using these libraries or others as dependencies - nothing is nicer than standing on the shoulders of giants when it makes sense.
## Code commits best practices.
#### Big changes - awesome as pull requests
We love big, aggressive refactoring - but ideally in branches. Even if the changes should go directly into the mainline code and are stable, very big changes are useful to see as a group and branches are cheap. So, branch and commit then create a pull request against master so that other developers can take a quick look. This is a great way for informal code review when a full issue is not warrented.
#### Commits that fix issues should note the issue #
git commit plugins/input/ogr/ -m "implemented sql query in OGR plugin (closes #472)"
#### Commits that relate to issues should reference them:
git commit tests/python_tests/sqlite_test.py -m "more robust sqlite tests - refs #928"
#### Commits that add a new feature or fix should be added to the CHANGELOG
Ideally the CHANGELOG can be a very concise place to look for the most important recent development and should not read like a full commit log. So, some developers may prefer to weekly or monthly look back over their commits and summarize all at once with additions to the CHANGELOG. Other developers may prefer to add as they go.
## License
Mapnik is licensed LGPL, which means that you are a free to use the code in any of your applications whether they be open source or not. It also means that if you contribute code to Mapnik that others are free to continue using Mapnik in the same way, even with your new additions. If you choose to redistribute an application using Mapnik just make sure to provide any source code modifications you make back to the community. For the actual details see the full LGPL license in the COPYING doc.
@ -67,13 +89,19 @@ If you see bits of code around that do not follow these please don't hesitate to
#### Indentation is four spaces
#### Use C++ style casts
static_cast<int>(value); // yes
(int)value; // no
#### Shared pointers should be created with [boost::make_shared](http://www.boost.org/doc/libs/1_47_0/libs/smart_ptr/make_shared.html) where possible
#### Function definitions should not be separated from their arguments:
void foo(int a) { ... } // please
void foo(int a) // please
void foo (int a) { ... } // no
void foo (int a) // no
#### Separate arguments by a single space:
@ -87,7 +115,18 @@ If you see bits of code around that do not follow these please don't hesitate to
if(a==b) // no
#### Braces should ideally be on a separate line:
#### Braces should always be used:
if (!file)
{
throw mapnik::datasource_exception("not found"); // please
}
if (!file)
throw mapnik::datasource_exception("not found"); // no
#### Braces should be on a separate line:
if (a == b)
{

5
include/mapnik/agg_pattern_source.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2010 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,15 +19,16 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_AGG_PATTERN_SOURCE_HPP
#define MAPNIK_AGG_PATTERN_SOURCE_HPP
// mapnik
#include <mapnik/image_data.hpp>
// boost
#include <boost/utility.hpp>
// agg
#include "agg_color_rgba.h"

6
include/mapnik/agg_rasterizer.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2010 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,12 +19,14 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_AGG_RASTERIZER_HPP
#define MAPNIK_AGG_RASTERIZER_HPP
// boost
#include <boost/utility.hpp>
// agg
#include "agg_rasterizer_scanline_aa.h"
namespace mapnik {

10
include/mapnik/agg_renderer.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,8 @@
*
*****************************************************************************/
//$Id$
#ifndef AGG_RENDERER_HPP
#define AGG_RENDERER_HPP
#ifndef MAPNIK_AGG_RENDERER_HPP
#define MAPNIK_AGG_RENDERER_HPP
// mapnik
#include <mapnik/config.hpp>
@ -134,4 +132,4 @@ private:
};
}
#endif //AGG_RENDERER_HPP
#endif // MAPNIK_AGG_RENDERER_HPP

10
include/mapnik/arrow.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,8 @@
*
*****************************************************************************/
//$Id$
#ifndef ARROW_HPP
#define ARROW_HPP
#ifndef MAPNIK_ARROW_HPP
#define MAPNIK_ARROW_HPP
#include <mapnik/box2d.hpp>
@ -44,4 +42,4 @@ private:
};
}
#endif // ARROW_HPP
#endif // MAPNIK_ARROW_HPP

17
include/mapnik/attribute.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2010 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,15 +20,18 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_ATTRIBUTE_HPP
#define MAPNIK_ATTRIBUTE_HPP
// mapnik
#include <mapnik/value.hpp>
// stl
#include <string>
namespace mapnik {
static mapnik::value _null_value;
struct attribute
{
std::string name_;
@ -38,7 +41,13 @@ struct attribute
template <typename V ,typename F>
V value(F const& f) const
{
return f[name_];
typedef typename F::const_iterator const_iterator;
const_iterator itr = f.find(name_);
if (itr != f.end())
{
return itr->second;
}
return _null_value;
}
std::string const& name() const { return name_;}
};

12
include/mapnik/attribute_collector.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,20 +20,20 @@
*
*****************************************************************************/
//$Id$
#ifndef ATTRIBUTE_COLLECTOR_HPP
#define ATTRIBUTE_COLLECTOR_HPP
#ifndef MAPNIK_ATTRIBUTE_COLLECTOR_HPP
#define MAPNIK_ATTRIBUTE_COLLECTOR_HPP
// mapnik
#include <mapnik/feature_layer_desc.hpp>
#include <mapnik/rule.hpp>
#include <mapnik/path_expression_grammar.hpp>
#include <mapnik/parse_path.hpp>
// boost
#include <boost/utility.hpp>
#include <boost/variant.hpp>
#include <boost/concept_check.hpp>
// stl
#include <set>
#include <iostream>
@ -271,4 +271,4 @@ private:
} // namespace mapnik
#endif //ATTRIBUTE_COLLECTOR_HPP
#endif // MAPNIK_ATTRIBUTE_COLLECTOR_HPP

10
include/mapnik/attribute_descriptor.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,8 @@
*
*****************************************************************************/
//$Id$
#ifndef ATTRIBUTE_DESCRIPTOR
#define ATTRIBUTE_DESCRIPTOR
#ifndef MAPNIK_ATTRIBUTE_DESCRIPTOR_HPP
#define MAPNIK_ATTRIBUTE_DESCRIPTOR_HPP
#include <string>
@ -118,4 +116,4 @@ operator << (std::basic_ostream<charT,traits>& out,
}
#endif // ATTRIBUTE_DESCRIPTOR_HPP
#endif // MAPNIK_ATTRIBUTE_DESCRIPTOR_HPP

6
include/mapnik/box2d.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2010 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,16 +20,16 @@
*
*****************************************************************************/
//$Id: box2d.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef MAPNIK_BOX2D_HPP
#define MAPNIK_BOX2D_HPP
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/coord.hpp>
// boost
#include <boost/operators.hpp>
// stl
#include <iomanip>

14
include/mapnik/cairo_renderer.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2008 Tom Hughes
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,14 +20,10 @@
*
*****************************************************************************/
//$Id$
#if defined(HAVE_CAIRO)
#ifndef CAIRO_RENDERER_HPP
#define CAIRO_RENDERER_HPP
#ifndef MAPNIK_CAIRO_RENDERER_HPP
#define MAPNIK_CAIRO_RENDERER_HPP
// mapnik
#include <mapnik/config.hpp>
@ -152,6 +148,6 @@ public:
};
}
#endif
#endif // MAPNIK_CAIRO_RENDERER_HPP
#endif //CAIRO_RENDERER_HPP
#endif

11
include/mapnik/color.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,8 @@
*
*****************************************************************************/
//$Id: color.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef COLOR_HPP
#define COLOR_HPP
#ifndef MAPNIK_COLOR_HPP
#define MAPNIK_COLOR_HPP
// mapnik
#include <mapnik/config.hpp>
@ -32,6 +30,7 @@
//boost
#include <boost/cstdint.hpp>
#include <boost/operators.hpp>
// stl
#include <sstream>
@ -141,4 +140,4 @@ public:
}
#endif //COLOR_HPP
#endif // MAPNIK_COLOR_HPP

2
include/mapnik/color_factory.hpp
View file

@ -20,8 +20,6 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_COLOR_FACTORY_HPP
#define MAPNIK_COLOR_FACTORY_HPP

9
include/mapnik/config.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,8 +20,8 @@
*
*****************************************************************************/
#ifndef CONFIG_HPP
#define CONFIG_HPP
#ifndef MAPNIK_CONFIG_HPP
#define MAPNIK_CONFIG_HPP
// Windows DLL support
@ -47,4 +47,5 @@
#endif
#define PROJ_ENVELOPE_POINTS 20
#endif // CONFIG_HPP
#endif // MAPNIK_CONFIG_HPP

8
include/mapnik/config_error.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,8 +20,8 @@
*
*****************************************************************************/
#ifndef MAPNIK_CONFIG_ERROR_INCLUDED
#define MAPNIK_CONFIG_ERROR_INCLUDED
#ifndef MAPNIK_CONFIG_ERROR_HPP
#define MAPNIK_CONFIG_ERROR_HPP
#include <iostream>
#include <sstream>
@ -54,4 +54,4 @@ protected:
};
}
#endif // MAPNIK_CONFIG_ERROR_INCLUDED
#endif // MAPNIK_CONFIG_ERROR_HPP

13
include/mapnik/coord.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,12 +20,13 @@
*
*****************************************************************************/
//$Id: coord.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef COORD_HPP
#define COORD_HPP
#ifndef MAPNIK_COORD_HPP
#define MAPNIK_COORD_HPP
// boost
#include <boost/operators.hpp>
// stl
#include <iomanip>
#include <sstream>
@ -187,4 +188,4 @@ operator << (std::basic_ostream<charT,traits>& out,
}
}
#endif // COORD_HPP
#endif // MAPNIK_COORD_HPP

11
include/mapnik/coord_array.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,13 +20,12 @@
*
*****************************************************************************/
//$Id: coord_array.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef COORD_ARRAY_HPP
#define COORD_ARRAY_HPP
#ifndef MAPNIK_COORD_ARRAY_HPP
#define MAPNIK_COORD_ARRAY_HPP
//mapnik
#include <mapnik/coord.hpp>
// stl
#include <cassert>
@ -89,4 +88,4 @@ private:
}
#endif //COORD_ARRAY_HPP
#endif // MAPNIK_COORD_ARRAY_HPP

5
include/mapnik/css_color_grammar.hpp
View file

@ -20,22 +20,23 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_CSS_COLOR_GRAMMAR_HPP
#define MAPNIK_CSS_COLOR_GRAMMAR_HPP
// mapnik
#include <mapnik/color.hpp>
// spirit2
#include <boost/config/warning_disable.hpp>
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/qi_action.hpp>
// phoenix
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
// fusion
#include <boost/fusion/include/adapt_struct.hpp>
#include <boost/fusion/include/adapt_adt.hpp>

14
include/mapnik/css_color_grammar_deprecated.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2009 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,22 +20,23 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_CSS_COLOR_GRAMMAR_HPP
#define MAPNIK_CSS_COLOR_GRAMMAR_HPP
#ifndef MAPNIK_CSS_COLOR_GRAMMAR_DEPRECATED_HPP
#define MAPNIK_CSS_COLOR_GRAMMAR_DEPRECATED_HPP
// mapnik
#include <mapnik/color.hpp>
// spirit2
#include <boost/config/warning_disable.hpp>
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/qi_action.hpp>
// phoenix
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_operator.hpp>
#include <boost/spirit/include/phoenix_fusion.hpp>
#include <boost/spirit/include/phoenix_function.hpp>
// fusion
#include <boost/fusion/include/adapt_struct.hpp>
@ -45,7 +46,6 @@
// stl
#include <string>
//BOOST_FUSION_ADAPT_CLASS(
// mapnik::color,
// (unsigned, unsigned, obj.red(), obj.set_red(val))
@ -417,4 +417,4 @@ struct css_color_grammar : qi::grammar<Iterator, css(), ascii_space_type>
}
#endif //MAPNIK_CSS_COLOR_GRAMMAR_HPP
#endif // MAPNIK_CSS_COLOR_GRAMMAR_DEPRECATED_HPP

9
include/mapnik/ctrans.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,10 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
//$Id$
#ifndef CTRANS_HPP
#define CTRANS_HPP
#ifndef MAPNIK_CTRANS_HPP
#define MAPNIK_CTRANS_HPP
// mapnik
#include <mapnik/box2d.hpp>
@ -518,4 +517,4 @@ public:
};
}
#endif //CTRANS_HPP
#endif // MAPNIK_CTRANS_HPP

12
include/mapnik/datasource.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,9 @@
*
*****************************************************************************/
//$Id: datasource.hpp 43 2005-04-22 18:52:47Z pavlenko $
#ifndef MAPNIK_DATASOURCE_HPP
#define MAPNIK_DATASOURCE_HPP
#ifndef DATASOURCE_HPP
#define DATASOURCE_HPP
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/ctrans.hpp>
@ -31,9 +30,11 @@
#include <mapnik/feature.hpp>
#include <mapnik/query.hpp>
#include <mapnik/feature_layer_desc.hpp>
// boost
#include <boost/utility.hpp>
#include <boost/shared_ptr.hpp>
// stl
#include <map>
#include <string>
@ -142,6 +143,7 @@ typedef boost::shared_ptr<datasource> datasource_ptr;
delete ds; \
} \
//
}
#endif //DATASOURCE_HPP
#endif // MAPNIK_DATASOURCE_HPP

12
include/mapnik/datasource_cache.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,18 +20,18 @@
*
*****************************************************************************/
//$Id: datasource_cache.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef DATASOURCE_CACHE_HPP
#define DATASOURCE_CACHE_HPP
#ifndef MAPNIK_DATASOURCE_CACHE_HPP
#define MAPNIK_DATASOURCE_CACHE_HPP
// mapnik
#include <mapnik/utils.hpp>
#include <mapnik/params.hpp>
#include <mapnik/plugin.hpp>
#include <mapnik/datasource.hpp>
// boost
#include <boost/shared_ptr.hpp>
// stl
#include <map>
@ -57,4 +57,4 @@ public:
};
}
#endif //DATASOURCE_CACHE_HPP
#endif // MAPNIK_DATASOURCE_CACHE_HPP

10
include/mapnik/distance.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,8 @@
*
*****************************************************************************/
//$Id$
#ifndef DISTANCE_HPP
#define DISTANCE_HPP
#ifndef MAPNIK_DISTANCE_HPP
#define MAPNIK_DISTANCE_HPP
#include <mapnik/coord.hpp>
@ -52,4 +50,4 @@ public:
*/
}
#endif // GEO_UTILS_HPP
#endif // MAPNIK_DISTANCE_HPP

4
include/mapnik/ellipsoid.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,8 +20,6 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_ELLIPSOID_HPP
#define MAPNIK_ELLIPSOID_HPP

10
include/mapnik/enumeration.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,11 +20,13 @@
*
*****************************************************************************/
#ifndef MAPNIK_ENUMERATION_INCLUDED
#define MAPNIK_ENUMERATION_INCLUDED
#ifndef MAPNIK_ENUMERATION_HPP
#define MAPNIK_ENUMERATION_HPP
// mapnik
#include <mapnik/config.hpp>
// stl
#include <vector>
#include <bitset>
#include <iostream>
@ -325,4 +327,4 @@ operator>>(std::istream & is, mapnik::enumeration<ENUM, THE_MAX> & e)
template <> std::string name ::our_name_ = #name; \
template <> bool name ::our_verified_flag_( name ::verify(__FILE__, __LINE__));
#endif // MAPNIK_ENUMERATION_INCLUDED
#endif // MAPNIK_ENUMERATION_HPP

10
include/mapnik/expression_evaluator.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2009 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,8 +20,6 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_EXPRESSION_EVALUATOR_HPP
#define MAPNIK_EXPRESSION_EVALUATOR_HPP
@ -43,7 +41,11 @@ struct evaluate : boost::static_visitor<T1>
explicit evaluate(feature_type const& f)
: feature_(f) {}
value_type operator() (value_type x) const { return x; }
value_type operator() (value_type x) const
{
return x;
}
value_type operator() (attribute const& attr) const
{
return attr.value<value_type,feature_type>(feature_);

11
include/mapnik/expression_grammar.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2009 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,8 +20,6 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_EXPRESSIONS_GRAMMAR_HPP
#define MAPNIK_EXPRESSIONS_GRAMMAR_HPP
@ -34,11 +32,14 @@
#include <boost/variant.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/concept_check.hpp>
// spirit2
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/qi_action.hpp>
// fusion
#include <boost/fusion/include/adapt_struct.hpp>
// phoenix
#include <boost/spirit/include/phoenix_core.hpp>
#include <boost/spirit/include/phoenix_object.hpp>
@ -222,11 +223,13 @@ struct expression_grammar : qi::grammar<Iterator, expr_node(), space_type>
| '(' >> expr [_val = _1 ] >> ')'
;
attr %= '[' >> +(char_ - ']') >> ']';
#if BOOST_VERSION > 104200
ustring %= '\'' >> no_skip[*~char_('\'')] >> '\'';
attr %= '[' >> no_skip[+~char_(']')] >> ']';
#else
ustring %= '\'' >> lexeme[*(char_-'\'')] >> '\'';
attr %= '[' >> lexeme[+(char_ - ']')] >> ']';
#endif
}

3
include/mapnik/expression_node.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2009 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -26,6 +26,7 @@
// mapnik
#include <mapnik/value.hpp>
#include <mapnik/attribute.hpp>
// boost
#include <boost/variant.hpp>
#include <boost/shared_ptr.hpp>

5
include/mapnik/expression_string.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2009 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,14 +20,13 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_EXPRESSION_STRING_HPP
#define MAPNIK_EXPRESSION_STRING_HPP
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/expression_node.hpp>
// stl
#include <string>

11
include/mapnik/factory.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,13 +20,12 @@
*
*****************************************************************************/
//$Id: factory.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef FACTORY_HPP
#define FACTORY_HPP
#ifndef MAPNIK_FACTORY_HPP
#define MAPNIK_FACTORY_HPP
// mapnik
#include <mapnik/utils.hpp>
// stl
#include <stdexcept>
#include <map>
@ -89,4 +88,4 @@ public:
};
}
#endif //FACTORY_HPP
#endif // MAPNIK_FACTORY_HPP

6
include/mapnik/fastmath.hpp
View file

@ -20,8 +20,8 @@
*
*****************************************************************************/
#ifndef FASTMATH_HPP
#define FASTMATH_HPP
#ifndef MAPNIK_FASTMATH_HPP
#define MAPNIK_FASTMATH_HPP
/* Timings:
* fast_sin(not inlined) 8.95s
@ -109,4 +109,4 @@ static inline double fast_atan2(double y, double x)
return result;
}
#endif // FASTMATH_HPP
#endif // MAPNIK_FASTMATH_HPP

31
include/mapnik/feature.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,9 @@
*
*****************************************************************************/
//$Id: feature.hpp 40 2005-04-13 20:20:46Z pavlenko $
#ifndef MAPNIK_FEATURE_HPP
#define MAPNIK_FEATURE_HPP
#ifndef FEATURE_HPP
#define FEATURE_HPP
// mapnik
#include <mapnik/value.hpp>
#include <mapnik/geometry.hpp>
@ -36,9 +35,9 @@
#else
#include <boost/property_map.hpp>
#endif
#include <boost/utility.hpp>
#include <boost/shared_ptr.hpp>
// stl
#include <map>
@ -66,6 +65,7 @@ private:
std::map<std::string,value> props_;
public:
typedef std::map<std::string,value>::iterator iterator;
typedef std::map<std::string,value>::const_iterator const_iterator;
explicit feature(int id)
: properties(props_),
id_(id),
@ -157,11 +157,26 @@ public:
return props_.end();
}
const_iterator begin() const
{
return props_.begin();
}
const_iterator end() const
{
return props_.end();
}
const_iterator find(std::string const& key) const
{
return props_.find(key);
}
std::string to_string() const
{
std::stringstream ss;
ss << "feature (" << std::endl;
ss << " id:" << id_ << std::endl;
ss << "feature "
<< id_ << " (" << std::endl;
for (std::map<std::string,value>::const_iterator itr=props_.begin();
itr != props_.end();++itr)
{
@ -181,4 +196,4 @@ inline std::ostream& operator<< (std::ostream & out,Feature const& f)
}
}
#endif //FEATURE_HPP
#endif // MAPNIK_FEATURE_HPP

14
include/mapnik/feature_factory.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,12 +20,13 @@
*
*****************************************************************************/
//$Id$
#ifndef FEATURE_FACTORY_HPP
#define FEATURE_FACTORY_HPP
#ifndef MAPNIK_FEATURE_FACTORY_HPP
#define MAPNIK_FEATURE_FACTORY_HPP
// mapnik
#include <mapnik/feature.hpp>
// boost
#include <boost/make_shared.hpp>
//#include <boost/pool/pool_alloc.hpp>
@ -39,8 +40,7 @@ struct feature_factory
//return boost::allocate_shared<Feature>(boost::fast_pool_allocator<Feature>(),fid);
return boost::make_shared<Feature>(fid);
}
};
}
#endif //FEATURE_FACTORY_HPP
#endif // MAPNIK_FEATURE_FACTORY_HPP

11
include/mapnik/feature_layer_desc.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,14 +20,13 @@
*
*****************************************************************************/
//$Id$
#ifndef FEATURE_LAYER_DESC_HPP
#define FEATURE_LAYER_DESC_HPP
#ifndef MAPNIK_FEATURE_LAYER_DESC_HPP
#define MAPNIK_FEATURE_LAYER_DESC_HPP
// mapnik
#include <mapnik/attribute_descriptor.hpp>
// stl
#include <string>
#include <vector>
#include <iostream>
@ -106,4 +105,4 @@ operator << (std::basic_ostream<charT,traits>& out,
}
}
#endif //FEATURE_LAYER_DESC_HPP
#endif // MAPNIK_FEATURE_LAYER_DESC_HPP

10
include/mapnik/feature_style_processor.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,8 @@
*
*****************************************************************************/
//$Id$
#ifndef FEATURE_STYLE_PROCESSOR_HPP
#define FEATURE_STYLE_PROCESSOR_HPP
#ifndef MAPNIK_FEATURE_STYLE_PROCESSOR_HPP
#define MAPNIK_FEATURE_STYLE_PROCESSOR_HPP
#include <set>
#include <string>
@ -74,4 +72,4 @@ private:
};
}
#endif //FEATURE_STYLE_PROCESSOR_HPP
#endif // MAPNIK_FEATURE_STYLE_PROCESSOR_HPP

10
include/mapnik/feature_type_style.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,14 +20,14 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_FEATURE_TYPE_STYLE_HPP
#define MAPNIK_FEATURE_TYPE_STYLE_HPP
#ifndef FEATURE_TYPE_STYLE_HPP
#define FEATURE_TYPE_STYLE_HPP
// mapnik
#include <mapnik/rule.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/enumeration.hpp>
// stl
#include <vector>
@ -69,4 +69,4 @@ public:
};
}
#endif //FEATURE_TYPE_STYLE_HPP
#endif // MAPNIK_FEATURE_TYPE_STYLE_HPP

13
include/mapnik/fill.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,17 +20,16 @@
*
*****************************************************************************/
//$Id$
#ifndef FILL_HPP
#define FILL_HPP
#ifndef MAPNIK_FILL_HPP
#define MAPNIK_FILL_HPP
namespace mapnik
{
class fill
{
};
}
#endif //FILL_HPP
#endif // MAPNIK_FILL_HPP

5
include/mapnik/filter_factory.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006-2009 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,14 +20,13 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_FILTER_FACTORY_HPP
#define MAPNIK_FILTER_FACTORY_HPP
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/expression_node.hpp>
// stl
#include <string>

5
include/mapnik/filter_featureset.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,11 +20,10 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_FILTER_FEATURESET_HPP
#define MAPNIK_FILTER_FEATURESET_HPP
// mapnik
#include <mapnik/datasource.hpp>
namespace mapnik {

32
include/mapnik/font_engine_freetype.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,9 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_FONT_ENGINE_FREETYPE_HPP
#define MAPNIK_FONT_ENGINE_FREETYPE_HPP
#ifndef FONT_ENGINE_FREETYPE_HPP
#define FONT_ENGINE_FREETYPE_HPP
// mapnik
#include <mapnik/color.hpp>
#include <mapnik/utils.hpp>
@ -50,7 +49,6 @@ extern "C"
#include <boost/thread/mutex.hpp>
#endif
// stl
#include <string>
#include <vector>
@ -121,7 +119,13 @@ public:
{
if (! FT_Set_Pixel_Sizes( face_, 0, size ))
return true;
return false;
}
bool set_character_sizes(float size)
{
if ( !FT_Set_Char_Size(face_,0,(FT_F26Dot6)(size * (1<<6)),0,0))
return true;
return false;
}
@ -186,6 +190,14 @@ public:
(*face)->set_pixel_sizes(size);
}
}
void set_character_sizes(float size)
{
for (std::vector<face_ptr>::iterator face = faces_.begin(); face != faces_.end(); ++face)
{
(*face)->set_character_sizes(size);
}
}
private:
std::vector<face_ptr> faces_;
std::map<unsigned, dimension_t> dimension_cache_;
@ -200,7 +212,7 @@ public:
void init(double radius)
{
FT_Stroker_Set(s_, (FT_Fixed) radius * (1<<6),
FT_Stroker_Set(s_, (FT_Fixed) (radius * (1<<6)),
FT_STROKER_LINECAP_ROUND,
FT_STROKER_LINEJOIN_ROUND,
0);
@ -334,11 +346,17 @@ struct text_renderer : private boost::noncopyable
halo_radius_(0.0),
opacity_(1.0) {}
void set_pixel_size(unsigned size)
{
faces_->set_pixel_sizes(size);
}
void set_character_size(float size)
{
faces_->set_character_sizes(size);
}
void set_fill(mapnik::color const& fill)
{
fill_=fill;
@ -602,4 +620,4 @@ private:
};
}
#endif // FONT_ENGINE_FREETYPE_HPP
#endif // MAPNIK_FONT_ENGINE_FREETYPE_HPP

10
include/mapnik/font_set.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,8 @@
*
*****************************************************************************/
//$Id$
#ifndef FONT_SET_HPP
#define FONT_SET_HPP
#ifndef MAPNIK_FONT_SET_HPP
#define MAPNIK_FONT_SET_HPP
// mapnik
#include <mapnik/config.hpp>
@ -52,4 +50,4 @@ private:
};
}
#endif //FONT_SET_HPP
#endif // MAPNIK_FONT_SET_HPP

10
include/mapnik/gamma.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,8 @@
*
*****************************************************************************/
//$Id: gamma.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef GAMMA_HPP
#define GAMMA_HPP
#ifndef MAPNIK_GAMMA_HPP
#define MAPNIK_GAMMA_HPP
#include <cmath>
@ -50,4 +48,4 @@ struct MAPNIK_DECL gamma
};
}
#endif //GAMMA_HPP
#endif // MAPNIK_GAMMA_HPP

11
include/mapnik/geom_util.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,15 +20,16 @@
*
*****************************************************************************/
//$Id: geom_util.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef MAPNIK_GEOM_UTIL_HPP
#define MAPNIK_GEOM_UTIL_HPP
#ifndef GEOM_UTIL_HPP
#define GEOM_UTIL_HPP
// mapnik
#include <mapnik/box2d.hpp>
#include <mapnik/vertex.hpp>
// boost
#include <boost/tuple/tuple.hpp>
// stl
#include <cmath>
@ -217,4 +218,4 @@ struct filter_at_point
};
}
#endif //GEOM_UTIL_HPP
#endif // MAPNIK_GEOM_UTIL_HPP

11
include/mapnik/geometry.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,15 +20,14 @@
*
*****************************************************************************/
//$Id: geometry.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef GEOMETRY_HPP
#define GEOMETRY_HPP
#ifndef MAPNIK_GEOMETRY_HPP
#define MAPNIK_GEOMETRY_HPP
// mapnik
#include <mapnik/vertex_vector.hpp>
#include <mapnik/ctrans.hpp>
#include <mapnik/geom_util.hpp>
// boost
#include <boost/shared_ptr.hpp>
#include <boost/utility.hpp>
@ -392,4 +391,4 @@ typedef boost::ptr_vector<geometry_type> geometry_containter;
}
#endif //GEOMETRY_HPP
#endif // MAPNIK_GEOMETRY_HPP

11
include/mapnik/global.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,14 +20,13 @@
*
*****************************************************************************/
//$Id$
#ifndef GLOBAL_HPP
#define GLOBAL_HPP
#ifndef MAPNIK_GLOBAL_HPP
#define MAPNIK_GLOBAL_HPP
// boost
#include <boost/cstdint.hpp>
#include <boost/detail/endian.hpp>
// stl
#include <cstring>
@ -183,4 +182,4 @@ inline double round (double val)
#endif //GLOBAL_HPP
#endif // MAPNIK_GLOBAL_HPP

28
include/mapnik/glyph_symbolizer.hpp
View file

@ -1,5 +1,27 @@
#ifndef GLYPH_SYMBOLIZER_HPP
#define GLYPH_SYMBOLIZER_HPP
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2.1 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the Free Software
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
#ifndef MAPNIK_GLYPH_SYMBOLIZER_HPP
#define MAPNIK_GLYPH_SYMBOLIZER_HPP
// mapnik
#include <mapnik/enumeration.hpp>
@ -190,4 +212,4 @@ private:
} // end mapnik namespace
#endif
#endif // MAPNIK_GLYPH_SYMBOLIZER_HPP

10
include/mapnik/gradient.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2010 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
//$Id$
#ifndef GRADIENT_HPP
#define GRADIENT_HPP
#ifndef MAPNIK_GRADIENT_HPP
#define MAPNIK_GRADIENT_HPP
// agg
#include <agg_trans_affine.h>
// mapnik
@ -104,4 +104,4 @@ private:
};
}
#endif //GRADIENT_HPP
#endif // MAPNIK_GRADIENT_HPP

11
include/mapnik/graphics.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,8 @@
*
*****************************************************************************/
//$Id: graphics.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef GRAPHICS_HPP
#define GRAPHICS_HPP
#ifndef MAPNIK_GRAPHICS_HPP
#define MAPNIK_GRAPHICS_HPP
// mapnik
#include <mapnik/color.hpp>
@ -520,4 +518,5 @@ public:
}
};
}
#endif //GRAPHICS_HPP
#endif // MAPNIK_GRAPHICS_HPP

9
include/mapnik/hextree.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,10 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
//$Id$
#ifndef _HEXTREE_HPP_
#define _HEXTREE_HPP_
#ifndef MAPNIK_HEXTREE_HPP
#define MAPNIK_HEXTREE_HPP
// mapnik
#include <mapnik/global.hpp>
@ -455,4 +454,4 @@ private:
};
} // namespace mapnik
#endif // _HEXTREE_HPP_
#endif // MAPNIK_HEXTREE_HPP

11
include/mapnik/hit_test_filter.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,11 +20,10 @@
*
*****************************************************************************/
//$Id$
#ifndef HIT_TEST_FILTER_HPP
#define HIT_TEST_FILTER_HPP
#ifndef MAPNIK_HIT_TEST_FILTER_HPP
#define MAPNIK_HIT_TEST_FILTER_HPP
// mapnik
#include <mapnik/feature.hpp>
namespace mapnik {
@ -54,4 +53,4 @@ private:
};
}
#endif // HIT_TEST_FILTER_HPP
#endif // MAPNIK_HIT_TEST_FILTER_HPP

8
include/mapnik/image_compositing.hpp
View file

@ -20,10 +20,8 @@
*
*****************************************************************************/
//$Id$
#ifndef IMAGE_COMPOSITING_HPP
#define IMAGE_COMPOSITING_HPP
#ifndef MAPNIK_IMAGE_COMPOSITING_HPP
#define MAPNIK_IMAGE_COMPOSITING_HPP
// agg
#include "agg_rendering_buffer.h"
@ -186,4 +184,4 @@ void composite(T1 & im, T2 & im2, composite_mode_e mode)
}
#endif // IMAGE_COMPOSITING_HPP
#endif // MAPNIK_IMAGE_COMPOSITING_HPP

13
include/mapnik/image_data.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,12 +20,13 @@
*
*****************************************************************************/
//$Id: image_data.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef IMAGE_DATA_HPP
#define IMAGE_DATA_HPP
#ifndef MAPNIK_IMAGE_DATA_HPP
#define MAPNIK_IMAGE_DATA_HPP
// mapnik
#include <mapnik/global.hpp>
// stl
#include <cassert>
#include <cstring>
@ -139,4 +140,4 @@ typedef ImageData<unsigned> image_data_32;
typedef ImageData<byte> image_data_8;
}
#endif //IMAGE_DATA_HPP
#endif // MAPNIK_IMAGE_DATA_HPP

10
include/mapnik/image_reader.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,13 +20,13 @@
*
*****************************************************************************/
//$Id: image_reader.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef MAPNIK_IMAGE_READER_HPP
#define MAPNIK_IMAGE_READER_HPP
#ifndef IMAGE_READER_HPP
#define IMAGE_READER_HPP
// mapnik
#include <mapnik/image_data.hpp>
#include <mapnik/config.hpp>
// stl
#include <stdexcept>
#include <string>
@ -63,4 +63,4 @@ MAPNIK_DECL image_reader* get_image_reader(const std::string& file);
}
#endif //IMAGE_READER_HPP
#endif // MAPNIK_IMAGE_READER_HPP

13
include/mapnik/image_util.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,8 @@
*
*****************************************************************************/
//$Id: image_util.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef IMAGE_UTIL_HPP
#define IMAGE_UTIL_HPP
#ifndef MAPNIK_IMAGE_UTIL_HPP
#define MAPNIK_IMAGE_UTIL_HPP
// mapnik
#include <mapnik/config.hpp>
@ -291,6 +289,9 @@ template MAPNIK_DECL std::string save_to_string<image_data_32>(image_data_32 con
std::string const&,
rgba_palette const&);
template MAPNIK_DECL std::string save_to_string<image_view<image_data_32> > (image_view<image_data_32> const&,
std::string const&);
template MAPNIK_DECL std::string save_to_string<image_view<image_data_32> > (image_view<image_data_32> const&,
std::string const&,
rgba_palette const&);
@ -298,4 +299,4 @@ template MAPNIK_DECL std::string save_to_string<image_view<image_data_32> > (ima
}
#endif //IMAGE_UTIL_HPP
#endif // MAPNIK_IMAGE_UTIL_HPP

11
include/mapnik/image_view.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,11 +20,8 @@
*
*****************************************************************************/
//$Id$
#ifndef IMAGE_VIEW_HPP
#define IMAGE_VIEW_HPP
#ifndef MAPNIK_IMAGE_VIEW_HPP
#define MAPNIK_IMAGE_VIEW_HPP
namespace mapnik {
@ -107,5 +104,5 @@ private:
};
}
#endif // IMAGE_VIEW_HPP
#endif // MAPNIK_IMAGE_VIEW_HPP

4
include/mapnik/jpeg_io.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,8 +20,6 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_JPEG_IO_HPP
#define MAPNIK_JPEG_IO_HPP

11
include/mapnik/label_collision_detector.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,13 +20,12 @@
*
*****************************************************************************/
//$Id$
#ifndef LABEL_COLLISION_DETECTOR_HPP
#define LABEL_COLLISION_DETECTOR_HPP
#ifndef MAPNIK_LABEL_COLLISION_DETECTOR_HPP
#define MAPNIK_LABEL_COLLISION_DETECTOR_HPP
// mapnik
#include <mapnik/quad_tree.hpp>
// stl
#include <vector>
#include <unicode/unistr.h>
@ -233,4 +232,4 @@ public:
};
}
#endif // LABEL_COLLISION_DETECTOR_HPP
#endif // MAPNIK_LABEL_COLLISION_DETECTOR_HPP

9
include/mapnik/label_placement.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,10 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
//$Id$
#ifndef LABEL_PLACEMENT_HPP
#define LABEL_PLACEMENT_HPP
#ifndef MAPNIK_LABEL_PLACEMENT_HPP
#define MAPNIK_LABEL_PLACEMENT_HPP
namespace mapnik
{
@ -51,4 +50,4 @@ public:
};
}
#endif //LABEL_PLACEMENT_HPP
#endif // MAPNIK_LABEL_PLACEMENT_HPP

10
include/mapnik/layer.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,10 +19,10 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
//$Id: layer.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef LAYER_HPP
#define LAYER_HPP
#ifndef MAPNIK_LAYER_HPP
#define MAPNIK_LAYER_HPP
// mapnik
#include <mapnik/feature.hpp>
#include <mapnik/datasource.hpp>
@ -217,4 +217,4 @@ private:
};
}
#endif //LAYER_HPP
#endif // MAPNIK_LAYER_HPP

10
include/mapnik/libxml2_loader.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,11 +20,13 @@
*
*****************************************************************************/
#ifndef LIBXML2_LOADER_INCLUDED
#define LIBXML2_LOADER_INCLUDED
#ifndef MAPNIK_LIBXML2_LOADER_HPP
#define MAPNIK_LIBXML2_LOADER_HPP
// boost
#include <boost/property_tree/ptree.hpp>
// stl
#include <string>
namespace mapnik
@ -33,4 +35,4 @@ void read_xml2( std::string const & filename, boost::property_tree::ptree & pt);
void read_xml2_string( std::string const & str, boost::property_tree::ptree & pt, std::string const & base_path="");
}
#endif // LIBXML2_LOADER_INCLUDED
#endif // MAPNIK_LIBXML2_LOADER_HPP

9
include/mapnik/line_pattern_symbolizer.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,10 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
//$Id: polygon_symbolizer.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef LINE_PATTERN_SYMBOLIZER_HPP
#define LINE_PATTERN_SYMBOLIZER_HPP
#ifndef MAPNIK_LINE_PATTERN_SYMBOLIZER_HPP
#define MAPNIK_LINE_PATTERN_SYMBOLIZER_HPP
// mapnik
#include <mapnik/symbolizer.hpp>
@ -38,4 +37,4 @@ struct MAPNIK_DECL line_pattern_symbolizer :
};
}
#endif // LINE_PATTERN_SYMBOLIZER_HPP
#endif // MAPNIK_LINE_PATTERN_SYMBOLIZER_HPP

10
include/mapnik/line_symbolizer.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
//$Id: line_symbolizer.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef LINE_SYMBOLIZER_HPP
#define LINE_SYMBOLIZER_HPP
#ifndef MAPNIK_LINE_SYMBOLIZER_HPP
#define MAPNIK_LINE_SYMBOLIZER_HPP
// mapnik
#include <mapnik/stroke.hpp>
#include <mapnik/symbolizer.hpp>
#include <mapnik/enumeration.hpp>
@ -82,4 +82,4 @@ private:
};
}
#endif //LINE_SYMBOLIZER_HPP
#endif // MAPNIK_LINE_SYMBOLIZER_HPP

12
include/mapnik/load_map.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,16 +19,18 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
// $Id$
#ifndef MAP_LOADER_HPP
#define MAP_LOADER_HPP
#ifndef MAPNIK_LOAD_MAP_HPP
#define MAPNIK_LOAD_MAP_HPP
#ifdef HAVE_CONFIG_H
#include <config.h>
#endif
// mapnik
#include <mapnik/map.hpp>
// stl
#include <string>
namespace mapnik
@ -37,4 +39,4 @@ MAPNIK_DECL void load_map(Map & map, std::string const& filename, bool strict =
MAPNIK_DECL void load_map_string(Map & map, std::string const& str, bool strict = false, std::string const& base_path="");
}
#endif // LOAD_MAP_HPP
#endif // MAPNIK_LOAD_MAP_HPP

9
include/mapnik/map.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,10 +19,9 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
//$Id: map.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef MAP_HPP
#define MAP_HPP
#ifndef MAPNIK_MAP_HPP
#define MAPNIK_MAP_HPP
#ifdef HAVE_CONFIG_H
#include <config.h>
@ -461,4 +460,4 @@ private:
DEFINE_ENUM(aspect_fix_mode_e,Map::aspect_fix_mode);
}
#endif //MAP_HPP
#endif // MAPNIK_MAP_HPP

10
include/mapnik/mapped_memory_cache.hpp
View file

@ -20,21 +20,19 @@
*
*****************************************************************************/
//$Id$
#ifndef MEMORY_REGION_CACHE_HPP
#define MEMORY_REGION_CACHE_HPP
#ifndef MAPNIK_MAPPED_MEMORY_CACHE_HPP
#define MAPNIK_MAPPED_MEMORY_CACHE_HPP
// mapnik
#include <mapnik/config.hpp>
#include <mapnik/utils.hpp>
// boost
#include <boost/utility.hpp>
#include <boost/unordered_map.hpp>
#include <boost/interprocess/mapped_region.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
#ifdef MAPNIK_THREADSAFE
#include <boost/thread/mutex.hpp>
#endif
@ -61,5 +59,5 @@ struct MAPNIK_DECL mapped_memory_cache :
}
#endif // MAPNIK_MARKER_CACHE_HPP
#endif // MAPNIK_MAPPED_MEMORY_CACHE_HPP

14
include/mapnik/marker.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,18 +20,19 @@
*
*****************************************************************************/
//$Id: image_data.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef MARKER_HPP
#define MARKER_HPP
#ifndef MAPNIK_MARKER_HPP
#define MAPNIK_MARKER_HPP
// mapnik
#include <mapnik/global.hpp>
#include <mapnik/image_data.hpp>
#include <mapnik/svg/svg_path_attributes.hpp>
#include <mapnik/svg/svg_storage.hpp>
#include <mapnik/svg/svg_path_adapter.hpp>
// agg
#include "agg_path_storage.h"
// boost
#include <boost/utility.hpp>
#include <boost/unordered_map.hpp>
@ -39,6 +40,7 @@
#include <boost/optional.hpp>
#include <boost/make_shared.hpp>
// stl
#include <cassert>
#include <cstring>
@ -125,4 +127,4 @@ private:
}
#endif //MARKER_HPP
#endif // MAPNIK_MARKER_HPP

6
include/mapnik/marker_cache.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2009 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,8 +20,6 @@
*
*****************************************************************************/
//$Id$
#ifndef MAPNIK_MARKER_CACHE_HPP
#define MAPNIK_MARKER_CACHE_HPP
@ -32,8 +30,10 @@
#include <mapnik/svg/svg_path_attributes.hpp>
#include <mapnik/svg/svg_storage.hpp>
#include <mapnik/svg/svg_path_adapter.hpp>
// agg
#include "agg_path_storage.h"
// boost
#include <boost/utility.hpp>
#include <boost/unordered_map.hpp>

18
include/mapnik/markers_placement.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2010 Hermann Kraus
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,13 +20,19 @@
*
*****************************************************************************/
#ifndef MARKERS_PLACEMENT_HPP
#define MARKERS_PLACEMENT_HPP
#ifndef MAPNIK_MARKERS_PLACEMENT_HPP
#define MAPNIK_MARKERS_PLACEMENT_HPP
// agg
#include "agg_basics.h"
// mapnik
#include <mapnik/box2d.hpp>
// boost
#include <boost/utility.hpp>
// stl
#include <cmath>
namespace mapnik {
@ -242,5 +248,7 @@ template <typename Locator, typename Detector> box2d<double> markers_placement<L
return box2d<double>(x1_, y1_, x2_, y2_);
}
} /* end namespace */
#endif // MARKERS_PLACEMENT_HPP
}
#endif // MAPNIK_MARKERS_PLACEMENT_HPP

10
include/mapnik/markers_symbolizer.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,10 +20,8 @@
*
*****************************************************************************/
//$Id$
#ifndef MARKERS_SYMBOLIZER_HPP
#define MARKERS_SYMBOLIZER_HPP
#ifndef MAPNIK_MARKERS_SYMBOLIZER_HPP
#define MAPNIK_MARKERS_SYMBOLIZER_HPP
//mapnik
#include <mapnik/symbolizer.hpp>
@ -92,4 +90,4 @@ private:
}
#endif // MARKERS_SYMBOLIZER_HPP
#endif // MAPNIK_MARKERS_SYMBOLIZER_HPP

10
include/mapnik/memory.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -19,11 +19,11 @@
* Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*
*****************************************************************************/
//$Id: memory.hpp 39 2005-04-10 20:39:53Z pavlenko $
#ifndef MEMORY_HPP
#define MEMORY_HPP
#ifndef MAPNIK_MEMORY_HPP
#define MAPNIK_MEMORY_HPP
// stl
#include <iostream>
#include <cassert>
@ -85,4 +85,4 @@ public:
};
}
#endif //MEMORY_HPP
#endif // MAPNIK_MEMORY_HPP

13
include/mapnik/memory_datasource.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,13 +20,14 @@
*
*****************************************************************************/
//$Id$
#ifndef MEMORY_DATASOURCE_HPP
#define MEMORY_DATASOURCE_HPP
#ifndef MAPNIK_MEMORY_DATASOURCE_HPP
#define MAPNIK_MEMORY_DATASOURCE_HPP
// mapnik
#include <mapnik/datasource.hpp>
#include <mapnik/feature_layer_desc.hpp>
// stl
#include <vector>
namespace mapnik {
@ -65,4 +66,4 @@ private:
};
}
#endif // MEMORY_DATASOURCE_HPP
#endif // MAPNIK_MEMORY_DATASOURCE_HPP

12
include/mapnik/memory_featureset.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2006 Artem Pavlenko
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,11 +20,13 @@
*
*****************************************************************************/
//$Id$
#ifndef MEMORY_FEATURESET_HPP
#define MEMORY_FEATURESET_HPP
#ifndef MAPNIK_MEMORY_FEATURESET_HPP
#define MAPNIK_MEMORY_FEATURESET_HPP
// mapnik
#include <mapnik/memory_datasource.hpp>
// boost
#include <boost/utility.hpp>
namespace mapnik {
@ -73,4 +75,4 @@ private:
};
}
#endif // MEMORY_FEATURESET_HPP
#endif // MAPNIK_MEMORY_FEATURESET_HPP

29
include/mapnik/metawriter.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2010 Hermann Kraus
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,21 +20,21 @@
*
*****************************************************************************/
#ifndef MAPNIK_METAWRITER_HPP
#define MAPNIK_METAWRITER_HPP
#ifndef METAWRITER_HPP
#define METAWRITER_HPP
// Mapnik
// mapnik
#include <mapnik/box2d.hpp>
#include <mapnik/feature.hpp>
#include <mapnik/font_engine_freetype.hpp>
// Boost
// boost
#include <boost/utility.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/optional.hpp>
#include <boost/concept_check.hpp>
// STL
// stl
#include <set>
#include <string>
@ -47,11 +47,22 @@ struct placement;
class metawriter_property_map
{
public:
typedef std::map<std::string, UnicodeString> property_map;
typedef property_map::const_iterator const_iterator;
metawriter_property_map() {}
UnicodeString const& operator[](std::string const& key) const;
UnicodeString& operator[](std::string const& key) {return m_[key];}
std::map<std::string, UnicodeString>::const_iterator find(std::string const& key) const
{
return m_.find(key);
}
std::map<std::string, UnicodeString>::const_iterator end() const
{
return m_.end();
}
private:
std::map<std::string, UnicodeString> m_;
property_map m_;
UnicodeString not_found_;
};
@ -139,4 +150,4 @@ typedef std::pair<metawriter_ptr, metawriter_properties> metawriter_with_propert
}
#endif
#endif // MAPNIK_METAWRITER_HPP

9
include/mapnik/metawriter_factory.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2011 MapQuest
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,9 +20,8 @@
*
*****************************************************************************/
#ifndef METAWRITER_FACTORY_HPP
#define METAWRITER_FACTORY_HPP
#ifndef MAPNIK_METAWRITER_FACTORY_HPP
#define MAPNIK_METAWRITER_FACTORY_HPP
// mapnik
#include <mapnik/metawriter.hpp>
@ -51,5 +50,5 @@ void metawriter_save(
}
#endif /* METAWRITER_FACTORY_HPP */
#endif // MAPNIK_METAWRITER_FACTORY_HPP

9
include/mapnik/metawriter_inmem.hpp
View file

@ -2,7 +2,7 @@
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2011 MapQuest
* Copyright (C) 2011 Artem Pavlenko
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@ -20,9 +20,8 @@
*
*****************************************************************************/
#ifndef METAWRITER_INMEM_HPP
#define METAWRITER_INMEM_HPP
#ifndef MAPNIK_METAWRITER_INMEM_HPP
#define MAPNIK_METAWRITER_INMEM_HPP
// mapnik
#include <mapnik/config.hpp>
@ -117,4 +116,4 @@ typedef boost::shared_ptr<metawriter_inmem> metawriter_inmem_ptr;
}
#endif /* METAWRITER_INMEM_HPP */
#endif // MAPNIK_METAWRITER_INMEM_HPP

Some files were not shown because too many files have changed in this diff Show more