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

from_geojson/to_geojson are now used in unit tests, csv plugin, and node-mapnik so move these to cpp

Browse source
This commit is contained in:
Dane Springmeyer 2016-03-02 11:26:56 -08:00
parent 72459b3140
commit d148a966c8
4 changed files with 88 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
include/mapnik/json/geometry_parser.hpp
View file

@ -24,25 +24,14 @@
#define MAPNIK_JSON_GEOMETRY_PARSER_HPP #define MAPNIK_JSON_GEOMETRY_PARSER_HPP
// mapnik // mapnik
#include <mapnik/config.hpp> // for MAPNIK_DECL
#include <mapnik/geometry.hpp>
#include <string>
#include <mapnik/json/geometry_grammar.hpp>
// boost
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
namespace mapnik { namespace json { namespace mapnik { namespace json {
inline bool from_geojson(std::string const& json, mapnik::geometry::geometry<double> & geom) MAPNIK_DECL bool from_geojson(std::string const& json, mapnik::geometry::geometry<double> & geom);
{
using namespace boost::spirit;
static const geometry_grammar<char const*> g;
standard::space_type space;
char const* start = json.c_str();
char const* end = start + json.length();
return qi::phrase_parse(start, end, g, space, geom);
}
}} }}

12
include/mapnik/util/geometry_to_geojson.hpp
View file

@ -24,18 +24,14 @@
#define MAPNIK_GEOMETRY_TO_GEOJSON_HPP #define MAPNIK_GEOMETRY_TO_GEOJSON_HPP
// mapnik // mapnik
#include <mapnik/config.hpp> // for MAPNIK_DECL
#include <mapnik/geometry.hpp>
#include <mapnik/json/geometry_generator_grammar.hpp> #include <string>
namespace mapnik { namespace util { namespace mapnik { namespace util {
inline bool to_geojson(std::string & json, mapnik::geometry::geometry<double> const& geom) MAPNIK_DECL bool to_geojson(std::string & json, mapnik::geometry::geometry<double> const& geom);
{
using sink_type = std::back_insert_iterator<std::string>;
static const mapnik::json::geometry_generator_grammar<sink_type, mapnik::geometry::geometry<double> > grammar;
sink_type sink(json);
return boost::spirit::karma::generate(sink, grammar, geom);
}
}} }}

37
src/json/mapnik_geometry_to_geojson.cpp Normal file
View file

@ -0,0 +1,37 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2015 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
*
*****************************************************************************/
// mapnik
#include <mapnik/util/geometry_to_geojson.hpp>
#include <mapnik/json/geometry_generator_grammar.hpp>
namespace mapnik { namespace util {
bool to_geojson(std::string & json, mapnik::geometry::geometry<double> const& geom)
{
using sink_type = std::back_insert_iterator<std::string>;
static const mapnik::json::geometry_generator_grammar<sink_type, mapnik::geometry::geometry<double> > grammar;
sink_type sink(json);
return boost::spirit::karma::generate(sink, grammar, geom);
}
}}

43
src/json/mapnik_json_geometry_parser.cpp Normal file
View file

@ -0,0 +1,43 @@
/*****************************************************************************
*
* This file is part of Mapnik (c++ mapping toolkit)
*
* Copyright (C) 2016 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
*
*****************************************************************************/
#include <mapnik/json/geometry_parser.hpp>
#include <mapnik/json/geometry_grammar.hpp>
// boost
#include <boost/spirit/include/qi.hpp>
#include <boost/spirit/include/phoenix_core.hpp>
namespace mapnik { namespace json {
bool from_geojson(std::string const& json, mapnik::geometry::geometry<double> & geom)
{
using namespace boost::spirit;
static const geometry_grammar<char const*> g;
standard::space_type space;
char const* start = json.c_str();
char const* end = start + json.length();
return qi::phrase_parse(start, end, g, space, geom);
}
}}