Reformat older code

Author: rinigus

demo/geocoder-nlp.cpp

@@ -1,84 +1,88 @@
-#include "postal.h"
 #include "geocoder.h"
+#include "postal.h"
 
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 
 using namespace GeoNLP;
 
 int main(int argc, char *argv[])
 {
   Postal postal;
-  //postal.set_initialize_every_call(true);
+  // postal.set_initialize_every_call(true);
 
   if (argc < 5)
     {
       std::cout << "Use: " << argv[0] << " dbase postal_global postal_country address\n"
-		<< "where\n"
-		<< " dbase - path to Geocoder-NLP database folder\n"
-		<< " postal_global - path to libpostal database with language classifier\n"
-		<< " postal_country - path to libpostal  database covering country\n"
-		<< " address - address to be parsed (please enclose it in \" \" to ensure that its a singe argument)\n";
+                << "where\n"
+                << " dbase - path to Geocoder-NLP database folder\n"
+                << " postal_global - path to libpostal database with language classifier\n"
+                << " postal_country - path to libpostal  database covering country\n"
+                << " address - address to be parsed (please enclose it in \" \" to ensure that its "
+                   "a singe argument)\n";
       return -1;
     }
 
-  char *query = argv[4];
-  std::vector< Postal::ParseResult > parsed_query;
-  Postal::ParseResult nonorm;
+  char                            *query = argv[4];
+  std::vector<Postal::ParseResult> parsed_query;
+  Postal::ParseResult              nonorm;
 
   postal.set_postal_datadir(argv[2], argv[3]);
   // postal.add_language("da");
   // postal.add_language("et");
   // postal.add_language("en");
   postal.set_initialize_every_call(true);
-  
+
   postal.parse(query, parsed_query, nonorm);
 
   std::cout << "\nAddress parsing before full normalization:\n\n";
-  for (auto v: nonorm)
+  for (auto v : nonorm)
     {
       std::cout << v.first << " ";
-      for (auto k: v.second) std::cout << k << " ";
+      for (auto k : v.second)
+        std::cout << k << " ";
       std::cout << "\n";
     }
   std::cout << "\n";
 
   std::cout << "Normalization:\n\n";
-  for (auto r: parsed_query)
+  for (auto r : parsed_query)
     {
-      for (auto v: r)
+      for (auto v : r)
         {
           std::cout << v.first << " ";
-          for (auto k: v.second) std::cout << k << " ";
+          for (auto k : v.second)
+            std::cout << k << " ";
           std::cout << "\n";
         }
       std::cout << "\n";
     }
 
   std::cout << std::endl;
-  
+
   Geocoder geo(argv[1]);
   geo.set_max_queries_per_hierarchy(30);
   geo.set_max_results(25);
-  //geo.set_result_language("en");
+  // geo.set_result_language("en");
 
   std::vector<Geocoder::GeoResult> result;
 
   std::cout << "Geocoder loaded" << std::endl;
-  
+
   geo.search(parsed_query, result);
 
   std::cout << std::setprecision(8);
   std::cout << "Search results: \n\n";
   size_t counter = 0;
-  for (const Geocoder::GeoResult &r: result)
+  for (const Geocoder::GeoResult &r : result)
     {
       std::cout << r.title << "\n"
-		<< r.address << "\n"
+                << r.address << "\n"
                 << "Postal code: " << r.postal_code << "\n"
-                << "Phone: " << r.phone << " / URL: " << r.website << "\n" 
+                << "Phone: " << r.phone << " / URL: " << r.website << "\n"
                 << r.latitude << ", " << r.longitude << "\n"
-		<< r.type << " / " << r.id << " / " << r.admin_levels << " / " << r.levels_resolved << "\n\n";
+                << r.type << " / " << r.id << " / " << r.admin_levels << " / " << r.levels_resolved
+                << "\n\n";
       counter++;
     }
 

demo/nearby-line.cpp

@@ -1,9 +1,9 @@
-#include "postal.h"
 #include "geocoder.h"
+#include "postal.h"
 
 #include <fstream>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <stdlib.h>
 
 using namespace GeoNLP;
@@ -15,11 +15,11 @@ int main(int argc, char *argv[])
   if (argc < 8)
     {
       std::cout << "Use: " << argv[0] << " dbase postal_global postal_country address\n"
-		<< "where\n"
-		<< " dbase - path to Geocoder-NLP database folder\n"
-		<< " postal_global - path to libpostal database with language classifier\n"
-		<< " postal_country - path to libpostal  database covering country\n"
-		<< " line - text file containing lat lon coordinates, one per line\n"
+                << "where\n"
+                << " dbase - path to Geocoder-NLP database folder\n"
+                << " postal_global - path to libpostal database with language classifier\n"
+                << " postal_country - path to libpostal  database covering country\n"
+                << " line - text file containing lat lon coordinates, one per line\n"
                 << " radius - distance in meters\n"
                 << " type - type of POI\n"
                 << " name - name of POI\n";
@@ -32,64 +32,60 @@ int main(int argc, char *argv[])
   std::vector<double> latitude, longitude;
   {
     std::ifstream fin(argv[4]);
-    double lat, lon;
-    while ( fin >> lat >> lon )
+    double        lat, lon;
+    while (fin >> lat >> lon)
       {
         latitude.push_back(lat);
         longitude.push_back(lon);
       }
   }
   std::cout << "Loaded " << latitude.size() << " coordinates from " << argv[4] << "\n";
-  
-  char *name_query = argv[7];
-  std::vector< std::string > parsed_name;
+
+  char                    *name_query = argv[7];
+  std::vector<std::string> parsed_name;
 
   if (strlen(name_query) > 0)
     {
       postal.set_postal_datadir(argv[2], argv[3]);
       postal.set_initialize_every_call(true);
       postal.expand_string(name_query, parsed_name);
-  
+
       std::cout << "Normalization of name:\n\n";
-      for (auto r: parsed_name)
+      for (auto r : parsed_name)
         std::cout << r << "\n";
     }
 
   std::cout << std::endl;
 
   std::vector<std::string> type_query;
-  if (strlen(argv[6])>0)
+  if (strlen(argv[6]) > 0)
     {
       type_query.push_back(argv[6]);
       std::cout << "Searching for type: " << argv[6] << "\n";
     }
-  
+
   Geocoder geo(argv[1]);
   geo.set_max_queries_per_hierarchy(30);
   geo.set_max_results(25);
 
   std::vector<Geocoder::GeoResult> result;
 
   std::cout << "Geocoder loaded" << std::endl;
-  
-  if ( !geo.search_nearby(parsed_name,
-                          type_query,
-                          latitude, longitude,
-                          radius,
-                          result,
-                          postal) )
+
+  if (!geo.search_nearby(parsed_name, type_query, latitude, longitude, radius, result, postal))
     std::cout << "Failed to search\n";
   else
     {
       std::cout << std::setprecision(8);
       std::cout << "Search results: \n\n";
       size_t counter = 0;
-      for (const Geocoder::GeoResult &r: result)
+      for (const Geocoder::GeoResult &r : result)
         {
           std::cout << r.title << "\n"
                     << r.address << "\n"
                     << r.latitude << ", " << r.longitude << ": distance - " << r.distance << "\n"
-                    << r.type << " / " << r.id << " / " << r.admin_levels << " / " << r.levels_resolved << "\n\n";
+                    << r.type << " / " << r.id << " / " << r.admin_levels << " / "
+                    << r.levels_resolved << "\n\n";
           counter++;
         }
 

demo/nearby-point.cpp

@@ -1,9 +1,9 @@
-#include "postal.h"
 #include "geocoder.h"
+#include "postal.h"
 
 #include <fstream>
-#include <iostream>
 #include <iomanip>
+#include <iostream>
 #include <stdlib.h>
 
 using namespace GeoNLP;
@@ -15,11 +15,11 @@ int main(int argc, char *argv[])
   if (argc < 8)
     {
       std::cout << "Use: " << argv[0] << " dbase postal_global postal_country address\n"
-		<< "where\n"
-		<< " dbase - path to Geocoder-NLP database folder\n"
-		<< " postal_global - path to libpostal database with language classifier\n"
-		<< " postal_country - path to libpostal  database covering country\n"
-		<< " point - text file containing lat lon coordinate, the first pair is read only\n"
+                << "where\n"
+                << " dbase - path to Geocoder-NLP database folder\n"
+                << " postal_global - path to libpostal database with language classifier\n"
+                << " postal_country - path to libpostal  database covering country\n"
+                << " point - text file containing lat lon coordinate, the first pair is read only\n"
                 << " radius - distance in meters\n"
                 << " type - type of POI\n"
                 << " name - name of POI\n";
@@ -32,65 +32,62 @@ int main(int argc, char *argv[])
   std::vector<double> latitude, longitude;
   {
     std::ifstream fin(argv[4]);
-    double lat, lon;
-    while ( fin >> lat >> lon )
+    double        lat, lon;
+    while (fin >> lat >> lon)
       {
         latitude.push_back(lat);
         longitude.push_back(lon);
         break;
       }
   }
   std::cout << "Loaded " << latitude.size() << " coordinates from " << argv[4] << "\n";
-  
-  char *name_query = argv[7];
-  std::vector< std::string > parsed_name;
+
+  char                    *name_query = argv[7];
+  std::vector<std::string> parsed_name;
 
   if (strlen(name_query) > 0)
     {
       postal.set_postal_datadir(argv[2], argv[3]);
       postal.set_initialize_every_call(true);
       postal.expand_string(name_query, parsed_name);
-  
+
       std::cout << "Normalization of name:\n\n";
-      for (auto r: parsed_name)
+      for (auto r : parsed_name)
         std::cout << r << "\n";
     }
 
   std::cout << std::endl;
 
   std::vector<std::string> type_query;
-  if (strlen(argv[6])>0)
+  if (strlen(argv[6]) > 0)
     {
       type_query.push_back(argv[6]);
       std::cout << "Searching for type: " << argv[6] << "\n";
     }
-  
+
   Geocoder geo(argv[1]);
   geo.set_max_queries_per_hierarchy(30);
   geo.set_max_results(25);
 
   std::vector<Geocoder::GeoResult> result;
 
   std::cout << "Geocoder loaded" << std::endl;
-  
-  if ( !geo.search_nearby(parsed_name,
-                          type_query,
-                          latitude[0], longitude[0],
-                          radius,
-                          result,
-                          postal) )
+
+  if (!geo.search_nearby(parsed_name, type_query, latitude[0], longitude[0], radius, result,
+                         postal))
     std::cout << "Failed to search\n";
   else
     {
       std::cout << std::setprecision(8);
       std::cout << "Search results: \n\n";
       size_t counter = 0;
-      for (const Geocoder::GeoResult &r: result)
+      for (const Geocoder::GeoResult &r : result)
         {
           std::cout << r.title << "\n"
                     << r.address << "\n"
                     << r.latitude << ", " << r.longitude << ": distance - " << r.distance << "\n"
-                    << r.type << " / " << r.id << " / " << r.admin_levels << " / " << r.levels_resolved << "\n\n";
+                    << r.type << " / " << r.id << " / " << r.admin_levels << " / "
+                    << r.levels_resolved << "\n\n";
           counter++;
         }