Merge branch 'master' of https://github.com/mapzen/valhalla into gdg

Author: dgearhart

Makefile.am

@@ -1,10 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 AM_LDFLAGS = @BOOST_LDFLAGS@ @LUA_LIB@ @COVERAGE_LDFLAGS@
-AM_CPPFLAGS = \
-	-Iinclude \
-	@BOOST_CPPFLAGS@
-	@LUA_INCLUDE@
-AM_CXXFLAGS = @COVERAGE_CXXFLAGS@
+AM_CPPFLAGS = -Iinclude @BOOST_CPPFLAGS@
+AM_CXXFLAGS = @COVERAGE_CXXFLAGS@ @LUA_INCLUDE@
 
 if HAVE_SQLITE3
 AM_CPPFLAGS += @SQLITE3_CFLAGS@
@@ -90,7 +87,7 @@ include_HEADERS = \
 	include/mjolnir/graphtilebuilder.h \
 	include/mjolnir/graphtileheaderbuilder.h \
 	include/mjolnir/nodeinfobuilder.h \
-	include/mjolnir/edgeinfobuilder.h
+	include/mjolnir/edgeinfobuilder.h 
 libvalhalla_la_SOURCES = \
 	src/valhalla.cc \
 	src/baldr/directededge.cc \
@@ -124,7 +121,7 @@ libvalhalla_la_SOURCES = \
 	src/mjolnir/graphtilebuilder.cc \
 	src/mjolnir/graphtileheaderbuilder.cc \
 	src/mjolnir/nodeinfobuilder.cc \
-	src/mjolnir/edgeinfobuilder.cc
+	src/mjolnir/edgeinfobuilder.cc 
 libvalhalla_la_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
 libvalhalla_la_LIBADD = $(DEPS_LIBS) @PROTOC_LIBS@ @BOOST_PROGRAM_OPTIONS_LIB@
 if HAVE_SQLITE3
@@ -140,12 +137,14 @@ valhalla_SOURCES = \
 valhalla_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
 valhalla_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ @BOOST_PROGRAM_OPTIONS_LIB@
 
+
 #pbfgraphbuilder_SOURCES = \
 #	src/mjolnir/pbfgraphbuilder/pbfgraphbuilder.cc \
-#	src/mjolnir/pbfgraphbuilder/graphbuilder.cc
+#	src/mjolnir/pbfgraphbuilder/graphbuilder.cc \
+#	src/mjolnir/pbfgraphbuilder/luatagtransform.cc 
 #pbfgraphbuilder_CPPFLAGS = $(DEPS_CFLAGS) $(BOOST_CPPFLAGS)
 #pbfgraphbuilder_LDADD = $(DEPS_LIBS) @BOOST_LDFLAGS@ @BOOST_PROGRAM_OPTIONS_LIB@ \
-#	-losmpbf -lprotobuf -lz -lpthread libvalhalla.la
+#	-losmpbf -lprotobuf -lz -lpthread -llua5.2 libvalhalla.la 
 
 # tests
 check_PROGRAMS = \

configure.ac

@@ -36,8 +36,6 @@ AX_BOOST_PROGRAM_OPTIONS
 AX_PROG_LUA([5.2],[],[
     AX_LUA_HEADERS([
         AX_LUA_LIBS([
-            AC_DEFINE([HAVE_LUA], [1], [Requirements for lua are met])
-            HAVE_LUA=yes
         ],[AC_MSG_ERROR([Cannot find Lua libs.   Please install lua5.2 liblua5.2-dev])])
     ],[AC_MSG_ERROR([Cannot find Lua includes.  Please install lua5.2 liblua5.2-dev])])
 ],[AC_MSG_ERROR([Cannot find Lua interpreter.   Please install lua5.2 liblua5.2-dev])])

src/mjolnir/pbfgraphbuilder/graphbuilder.cc

@@ -13,7 +13,15 @@ namespace valhalla {
 namespace mjolnir {
 
 void GraphBuilder::node_callback(uint64_t osmid, double lng, double lat,
-                   const Tags &/*tags*/) {
+                   const Tags &tags) {
+
+  Tags results = lua_.TransformInLua(false,tags);
+
+  if (results.size() == 0)
+    return;
+
+  //TODO::  Save the tag results to disk.
+
   nodes_.insert(std::make_pair(osmid, OSMNode((float)lat, (float)lng)));
   nodecount++;
 
@@ -24,24 +32,23 @@ void GraphBuilder::way_callback(uint64_t osmid, const Tags &tags,
                   const std::vector<uint64_t> &refs) {
   // Do not add ways with < 2 nodes. Log error or add to a problem list
   // TODO - find out if we do need these, why they exist...
-//  if (refs.size() < 2) {
-//      std::cout << "ERROR - way " << osmid << " with < 2 nodes" << std::endl;
-//    return;
-//  }
-
-  // Add the way if it has a highway tag.
-  // There are other tags that correspond to the street network,
-  // however for simplicity, we don't manage them
-  if (tags.find("highway") != tags.end()) {
-    OSMWay w(osmid);
-    w.nodelist_ = refs;
-
-    // TODO: Read more properties!!!
-
-    ways_.push_back(w);
-//      if (ways.size() % 100000 == 0)
-//        std::cout << ways.size() << " ways" << std::endl;
+  if (refs.size() < 2) {
+      std::cout << "ERROR - way " << osmid << " with < 2 nodes" << std::endl;
+    return;
   }
+
+  Tags results = lua_.TransformInLua(true,tags);
+
+  if (results.size() == 0)
+    return;
+
+  OSMWay w(osmid);
+  w.nodelist_ = refs;
+
+  //TODO::  Save the tag results to disk.
+
+  ways_.push_back(w);
+
 }
 
 void GraphBuilder::relation_callback(uint64_t /*osmid*/, const Tags &/*tags*/,

src/mjolnir/pbfgraphbuilder/graphbuilder.h

@@ -9,6 +9,7 @@
 #include "pbfgraphbuilder.h"
 #include "osmpbfreader.h"
 #include "geo/pointll.h"
+#include "luatagtransform.h"
 
 using namespace CanalTP;  // For OSM pbf reader
 //using namespace std;
@@ -34,6 +35,7 @@ class GraphBuilder {
     // Initialize counts
     relationcount = 0;
     nodecount = 0;
+    lua_.Init();
   }
 
   /**
@@ -105,6 +107,9 @@ class GraphBuilder {
   // Map of OSM node Ids to GraphIds
   node_graphid_map_type node_graphids_;
 
+  // Lua Tag Transformation class
+  LuaTagTransform lua_;
+
   // Tiled nodes
   std::vector<std::vector<uint64_t>> tilednodes_;
 };

src/mjolnir/pbfgraphbuilder/luatagtransform.cc

@@ -0,0 +1,120 @@
+#include "luatagtransform.h"
+
+#include <stdexcept>
+#include <boost/format.hpp>
+
+using namespace valhalla::mjolnir;
+
+LuaTagTransform::LuaTagTransform()
+{
+  // Create a new lua state
+  luastate_ = luaL_newstate();
+
+}
+
+LuaTagTransform::~LuaTagTransform(){
+  if (luastate_ != NULL) {
+
+    lua_close(luastate_);
+
+  }
+}
+
+void LuaTagTransform::Init() const {
+
+  luaL_openlibs(luastate_);
+
+  //TODO:add lua script to options.
+  std::string tag_transform_script = "/data/valhalla/import/osm2pgsql/edges.lua";
+  luaL_dofile(luastate_, tag_transform_script.c_str());
+  CheckLuaFuncExists("ways_proc");
+
+  tag_transform_script = "/data/valhalla/import/osm2pgsql/vertices.lua";
+  luaL_dofile(luastate_, tag_transform_script.c_str());
+  CheckLuaFuncExists("nodes_proc");
+}
+
+void LuaTagTransform::SetLuaWayFunc(std::string luawayfunc) {
+  luawayfunc_ = luawayfunc;
+}
+
+void LuaTagTransform::SetLuaNodeFunc(std::string luanodefunc) {
+  luanodefunc_ = luanodefunc;
+}
+
+std::string LuaTagTransform::GetLuaWayFunc() const {
+  return luawayfunc_;
+}
+
+std::string LuaTagTransform::GetLuaNodeFunc() const {
+  return luanodefunc_;
+}
+
+void LuaTagTransform::CheckLuaFuncExists(const std::string &func_name) const {
+
+  lua_getglobal(luastate_, func_name.c_str());
+
+  if (!lua_isfunction (luastate_, -1)) {
+    throw std::runtime_error((boost::format("Lua script does not contain a function %1%")
+    % func_name).str());
+  }
+  lua_pop(luastate_,1);
+}
+
+Tags LuaTagTransform::TransformInLua(bool isWay, const Tags &maptags) {
+
+  Tags result;
+
+  int filter;
+  int count = 0;
+  struct keyval *item;
+  const char * key, * value;
+
+  int polygon = 0;
+  int roads = 0;
+
+  //TODO::add boost options.
+  if (isWay)
+    lua_getglobal(luastate_,"ways_proc");
+  else
+    lua_getglobal(luastate_,"nodes_proc");
+
+  lua_newtable(luastate_);    /* key value table */
+
+  for (auto tag : maptags) {
+    lua_pushstring(luastate_, tag.first.c_str());
+    lua_pushstring(luastate_, tag.second.c_str());
+    lua_rawset(luastate_, -3);
+    count++;
+  }
+
+  lua_pushinteger(luastate_, count);
+
+  if (lua_pcall(luastate_,2,4,0)) {
+    fprintf(stderr, "Failed to execute lua function for basic tag processing: %s\n", lua_tostring(luastate_, -1));
+    /* lua function failed */
+  }
+
+  roads = lua_tointeger(luastate_, -1);
+  lua_pop(luastate_,1);
+  polygon = lua_tointeger(luastate_, -1);
+  lua_pop(luastate_,1);
+
+  lua_pushnil(luastate_);
+  while (lua_next(luastate_,-2) != 0) {
+    key = lua_tostring(luastate_,-2);
+    value = lua_tostring(luastate_,-1);
+
+    result[key] = value;
+
+    lua_pop(luastate_,1);
+  }
+
+  filter = lua_tointeger(luastate_, -2);
+
+  lua_pop(luastate_,2);
+
+  return result;
+
+}
+

src/mjolnir/pbfgraphbuilder/luatagtransform.h

@@ -0,0 +1,59 @@
+#ifndef VALHALLA_MJOLNIR_LUA_H
+#define VALHALLA_MJOLNIR_LUA_H
+
+extern "C" {
+#include "lua.h"
+#include <lualib.h>
+#include <lauxlib.h>
+}
+
+#include <string>
+#include <map>
+
+// Represents the key/values of an object
+typedef std::map<std::string, std::string> Tags;
+
+namespace valhalla {
+namespace mjolnir {
+
+/**
+ */
+class LuaTagTransform {
+ public:
+  /**
+   * Constructor
+   */
+  LuaTagTransform();
+
+  /**
+   * Destructor
+   */
+  ~LuaTagTransform();
+
+  void Init() const;
+
+  void SetLuaWayFunc(std::string luawayfunc);
+
+  void SetLuaNodeFunc(std::string luanodefunc);
+
+  std::string GetLuaWayFunc() const;
+
+  std::string GetLuaNodeFunc() const;
+
+  void CheckLuaFuncExists(const std::string &func_name) const;
+
+  Tags TransformInLua(bool isWay, const Tags &tags);
+
+ protected:
+
+  lua_State *luastate_;
+
+  std::string luanodefunc_;
+  std::string luawayfunc_;
+
+};
+
+}
+}
+
+#endif  // VALHALLA_MJOLNIR_LUA_H

src/mjolnir/pbfgraphbuilder/pbfgraphbuilder.cc

@@ -44,8 +44,8 @@ int main(int argc, char** argv) {
 
   // TODO - make bounding box and tilesize configurable (via properties file?)
   // Iterate through edges - tile the end nodes to create connected graph
-  std::string outputdir = "/home/dave/data/tiles/";
-  graphbuilder.BuildLocalTiles(outputdir, level);
+  std::string outputdir = "/data/valhalla/data";
+  graphbuilder.BuildLocalTiles(outputdir, tilesize);
 
   return 0;
 }