osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-11-23 21:54:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

update scene builder to compile with latest libosmium

Browse Source
This commit is contained in:
Sarah Hoffmann 2015-02-21 16:35:54 +01:00
parent 82e5a95f16
commit 340b9793d6
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/scenes/bin/Makefile
View File

@ -1,7 +1,7 @@
CXXFLAGS += -O3 CXXFLAGS += -O3
#CXXFLAGS += -g #CXXFLAGS += -g
CXXFLAGS += -std=c++11 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 CXXFLAGS += -std=c++11 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64
CXXFLAGS += -I../../../libosmium/include CXXFLAGS += -I../../../../libosmium/include
OS:=$(shell uname -s) OS:=$(shell uname -s)
ifeq ($(OS),Darwin) ifeq ($(OS),Darwin)

2
tests/scenes/bin/make_scenes.sh
View File

@ -5,7 +5,7 @@
datadir="$( cd "$( dirname "$0" )" && cd ../data && pwd )" datadir="$( cd "$( dirname "$0" )" && cd ../data && pwd )"
if [! -d "$datadir" ]; then if [ ! -d "$datadir" ]; then
echo "Cannot find data dir."; echo "Cannot find data dir.";
exit -1; exit -1;
fi fi

20
tests/scenes/bin/osm2wkt.cc
View File

@ -7,23 +7,23 @@
#include <unordered_map> #include <unordered_map>
#include <osmium/area/assembler.hpp> #include <osmium/area/assembler.hpp>
#include <osmium/area/collector.hpp> #include <osmium/area/multipolygon_collector.hpp>
#include <osmium/area/problem_reporter_exception.hpp> #include <osmium/area/problem_reporter_exception.hpp>
#include <osmium/geom/wkt.hpp> #include <osmium/geom/wkt.hpp>
#include <osmium/handler.hpp> #include <osmium/handler.hpp>
#include <osmium/handler/node_locations_for_ways.hpp> #include <osmium/handler/node_locations_for_ways.hpp>
#include <osmium/io/any_input.hpp> #include <osmium/io/any_input.hpp>
#include <osmium/visitor.hpp> #include <osmium/visitor.hpp>
#include <osmium/index/map/stl_map.hpp> #include <osmium/index/map/sparse_mem_array.hpp>
typedef osmium::index::map::StlMap<osmium::unsigned_object_id_type, osmium::Location> index_type; typedef osmium::index::map::SparseMemArray<osmium::unsigned_object_id_type, osmium::Location> index_type;
typedef osmium::handler::NodeLocationsForWays<index_type, index_type> location_handler_type; typedef osmium::handler::NodeLocationsForWays<index_type, index_type> location_handler_type;
class ExportToWKTHandler : public osmium::handler::Handler { class ExportToWKTHandler : public osmium::handler::Handler {
osmium::geom::WKTFactory m_factory; osmium::geom::WKTFactory<> m_factory;
std::unordered_map<std::string, std::ofstream> m_files; std::unordered_map<std::string, std::ofstream> m_files;
public: public:
@ -70,13 +70,12 @@ int main(int argc, char* argv[]) {
std::string input_filename {argv[1]}; std::string input_filename {argv[1]};
typedef osmium::area::Assembler area_assembler_type;
osmium::area::ProblemReporterException problem_reporter; osmium::area::ProblemReporterException problem_reporter;
area_assembler_type assembler(&problem_reporter); osmium::area::Assembler::config_type assembler_config(&problem_reporter);
osmium::area::Collector<area_assembler_type> collector(assembler); osmium::area::MultipolygonCollector<osmium::area::Assembler> collector(assembler_config);
std::cerr << "Pass 1...\n"; std::cerr << "Pass 1...\n";
osmium::io::Reader reader1(input_filename); osmium::io::Reader reader1(input_filename, osmium::osm_entity_bits::relation);
collector.read_relations(reader1); collector.read_relations(reader1);
std::cerr << "Pass 1 done\n"; std::cerr << "Pass 1 done\n";
@ -87,9 +86,10 @@ int main(int argc, char* argv[]) {
std::cerr << "Pass 2...\n"; std::cerr << "Pass 2...\n";
ExportToWKTHandler export_handler; ExportToWKTHandler export_handler;
osmium::io::Reader reader2(input_filename); osmium::io::Reader reader2(input_filename);
osmium::apply(reader2, location_handler, export_handler, collector.handler()); osmium::apply(reader2, location_handler, export_handler, collector.handler([&export_handler](osmium::memory::Buffer&& buffer) {
osmium::apply(buffer, export_handler);
}));
reader2.close(); reader2.close();
osmium::apply(collector, export_handler);
export_handler.close(); export_handler.close();
std::cerr << "Pass 2 done\n"; std::cerr << "Pass 2 done\n";