Revert "Change StaticRTree serialization constructor to static function"

This makes clang 3.4 crash on ubuntu because it can not handle lambda
expressions + binding in static member functions correctly.

This reverts commit d6dd6693b18e042c0068da579dcc64d1e5a2e002.

Contractor/Prepare.cpp

@@ -170,10 +170,7 @@ int Prepare::Process(int argc, char *argv[])
 
     TIMER_STOP(expansion);
 
-    StaticRTree<EdgeBasedNode>::Build(node_based_edge_list,
-                                      rtree_nodes_path.c_str(),
-                                      rtree_leafs_path.c_str(),
-                                      internal_to_external_node_map);
+    BuildRTree(node_based_edge_list);
 
     IteratorbasedCRC32<std::vector<EdgeBasedNode>> crc32;
     const unsigned node_based_edge_list_CRC32 =
@@ -547,3 +544,16 @@ void Prepare::WriteNodeMapping()
     internal_to_external_node_map.shrink_to_fit();
 }
 
+/**
+    \brief Building rtree-based nearest-neighbor data structure
+
+    Saves info to files: '.ramIndex' and '.fileIndex'.
+ */
+void Prepare::BuildRTree(std::vector<EdgeBasedNode> &node_based_edge_list)
+{
+    SimpleLogger().Write() << "building r-tree ...";
+    StaticRTree<EdgeBasedNode>(node_based_edge_list,
+                               rtree_nodes_path.c_str(),
+                               rtree_leafs_path.c_str(),
+                               internal_to_external_node_map);
+}

Contractor/Prepare.h

@@ -40,6 +40,7 @@ class Prepare
                                 DeallocatingVector<EdgeBasedEdge> &edgeBasedEdgeList,
                                 EdgeBasedGraphFactory::SpeedProfileProperties &speed_profile);
     void WriteNodeMapping();
+    void BuildRTree(std::vector<EdgeBasedNode> &node_based_edge_list);
 
   private:
     std::vector<NodeInfo> internal_to_external_node_map;