expose lanes as enums, adjusted for comments

include/storage/shared_datatype.hpp

@@ -47,9 +47,8 @@ const constexpr char *block_id_to_name[] = {"NAME_OFFSETS",
                                             "ENTRY_CLASS",
                                             "LANE_DATA_ID",
                                             "TURN_LANE_DATA",
-                                            "TURN_STRING_OFFSETS",
-                                            "TURN_STRING_BLOCKS",
-                                            "TURN_STRING_CHAR_LIST"};
+                                            "LANE_DESCRIPTION_OFFSETS",
+                                            "LANE_DESCRIPTION_MASKS"};
 
 struct SharedDataLayout
 {
@@ -86,9 +85,8 @@ struct SharedDataLayout
         ENTRY_CLASS,
         LANE_DATA_ID,
         TURN_LANE_DATA,
-        TURN_STRING_OFFSETS,
-        TURN_STRING_BLOCKS,
-        TURN_STRING_CHAR_LIST,
+        LANE_DESCRIPTION_OFFSETS,
+        LANE_DESCRIPTION_MASKS,
         NUM_BLOCKS
     };
 
@@ -184,6 +182,9 @@ struct SharedDataTimestamp
     SharedDataType data;
     unsigned timestamp;
 };
+
+static_assert(sizeof(block_id_to_name) / sizeof(*block_id_to_name) == SharedDataLayout::NUM_BLOCKS,
+              "Number of blocks needs to match the number of Block names.");
 }
 }
 

include/storage/storage_config.hpp

@@ -66,7 +66,7 @@ struct StorageConfig final
     boost::filesystem::path properties_path;
     boost::filesystem::path intersection_class_path;
     boost::filesystem::path turn_lane_data_path;
-    boost::filesystem::path turn_lane_string_path;
+    boost::filesystem::path turn_lane_description_path;
 };
 }
 }