added: Finder is able to create a lookup-dir with nodes, as an input we use Open Street Map xml file

placefinder tool support now: --osm-file file_path, --lookup-dir dir_path, --create-lookup-dir parameters

placefinder/Makefile

@@ -24,7 +24,7 @@ progname = placefinder
 all: $(progname)
 
 
-$(progname): $(objfiles)
+$(progname): $(objfiles) ../lib/allplacefinder.a ../../pikotools/src/pikotools.a
 	$(CXX) -o $(progname) $(CXXFLAGS) $(LDFLAGS) $(objfiles) ../lib/allplacefinder.a ../../pikotools/src/pikotools.a
 
 

placefinder/main.cpp

@@ -42,15 +42,62 @@ void print_syntax()
 {
 	std::cout << "placefinder options:" << std::endl;
 	std::cout << " -h print this help" << std::endl;
+	std::cout << " --osm-file file_name - a path to osm file name" << std::endl;
+	std::cout << " --lookup-dir dir_name - a path to lookup dir" << std::endl;
+	std::cout << " --create-lookup-dir - create a lookup dir, you have to provide a path in --lookup-dir parameter" << std::endl;
+}
 
 
+
+bool parse_parametr(const pt::Space * input_par, std::wstring & param, const char * error_msg)
+{
+	if( input_par )
+	{
+		if( input_par->table_size() != 1 )
+		{
+			std::cout << error_msg << std::endl;
+			return false;
+			param = input_par->value.value_table.back()->to_wstr();
+		}
+	}
+
+	return true;
 }
 
 
 bool parse_parameters(const pt::Space & parameters, allplacefinder::Params & params)
 {
+	const pt::Space * osm_file = parameters.get_space(L"osm-file");
+	const pt::Space * lookup_dir = parameters.get_space(L"lookup-dir");
+	const pt::Space * create_lookup_dir = parameters.get_space(L"create-lookup-dir");
+	bool ok = true;
 
-	return true;
+	if( osm_file )
+	{
+		ok = ok && parse_parametr(osm_file, params.osm_file, "--osm-file parametr can be used only once");
+	}
+
+	if( lookup_dir )
+	{
+		ok = ok && parse_parametr(lookup_dir, params.lookup_dir, "--lookup-dir parametr can be used only once");
+	}
+
+	params.create_lookup_dir = (create_lookup_dir != nullptr);
+	return ok;
+}
+
+
+int make_action(allplacefinder::Params & params)
+{
+	int status = 3;
+
+	if( params.create_lookup_dir )
+	{
+		allplacefinder::Finder finder;
+		status = finder.create_lookup_dir(params) ? 0 : 4;
+	}
+
+	return status;
 }
 
 
@@ -61,8 +108,8 @@ pt::Space options, arguments;
 pt::MainOptionsParser options_parser;
 allplacefinder::Params params;
 
-	arguments.add(L"osmfile", 1);
-	arguments.add(L"lookupdir", 1);
+	arguments.add(L"osm-file", 1);
+	arguments.add(L"lookup-dir", 1);
 
 	pt::MainOptionsParser::Status status = options_parser.parse(argc, argv, options, arguments);
 
@@ -80,16 +127,22 @@ allplacefinder::Params params;
 
 	if( parse_parameters(options, params) )
 	{
+		// ------------------
+		// for debug purposes
+		//params.create_lookup_dir = true;
 
+		//params.osm_file = L"/home/tomek/data/test.xml";
+		//params.osm_file = L"/home/tomek/data/wroclaw_map.xml";
 
-		//allplacefinder::Finder finder;
+		//params.lookup_dir = L"/home/tomek/data/lookup-dir";
+		//params.lookup_dir = L"/data/lookup-dir";
+		// ------------------
 
+		return make_action(params);
 	}
 
-
-
 	//std::cout << options.serialize_to_json_str(true) << std::endl;
 
-return 0;
+return 2;
 }