diff --git a/generator/generator_tests/source_data.cpp b/generator/generator_tests/source_data.cpp
index 3e46712..e55e841 100644
--- a/generator/generator_tests/source_data.cpp
+++ b/generator/generator_tests/source_data.cpp
@@ -43,49 +43,50 @@ unsigned char const node2_o5m_data[] = /* 93 */
 static_assert(sizeof(node2_o5m_data) == 93, "Size check failed");
 
 
-char const way_xml_data[] = "<?xml version='1.0' encoding='UTF-8'?>\
-<osm version='0.6' upload='true' generator='JOSM'>\
-<node id='-273141' action='modify' visible='true' lat='60.73662144558' lon='-135.06327391353' />\
-<node id='-273139' action='modify' visible='true' lat='60.73186582163' lon='-135.05498459176' />\
-<node id='-273137' action='modify' visible='true' lat='60.72928677326' lon='-135.05450504422' />\
-<node id='-273135' action='modify' visible='true' lat='60.72600404848' lon='-135.05101119785' />\
-<node id='-273133' action='modify' visible='true' lat='60.7207107856' lon='-135.0490245009' />\
-<node id='-273131' action='modify' visible='true' lat='60.71776226098' lon='-135.04587318849' />\
-<node id='-273129' action='modify' visible='true' lat='60.71528261036' lon='-135.04464006624' />\
-<node id='-273126' action='modify' visible='true' lat='60.71283628103' lon='-135.0465582564' />\
-<node id='-273125' action='modify' visible='true' lat='60.70931726156' lon='-135.05094269106' />\
-<way id='-273127' action='modify' visible='true'>\
-<nd ref='-273125' />\
-<nd ref='-273126' />\
-<nd ref='-273129' />\
-<nd ref='-273131' />\
-<nd ref='-273133' />\
-<nd ref='-273135' />\
-<nd ref='-273137' />\
-<nd ref='-273139' />\
-<nd ref='-273141' />\
-<tag k='name' v='Yukon River' />\
-<tag k='name:ru' v='Юкон' />\
-<tag k='waterway' v='river' />\
-</way>\
-</osm>";
+char const way_xml_data[] = R"#(<?xml version='1.0' encoding='UTF-8'?>
+<osm version='0.6'>
+<node id='273125' visible='true' lat='60.70931726156' lon='135.05094269106' />
+<node id='273126' visible='true' lat='60.71283628103' lon='135.0465582564' />
+<node id='273129' visible='true' lat='60.71528261036' lon='135.04464006624' />
+<node id='273131' visible='true' lat='60.71776226098' lon='135.04587318849' />
+<node id='273133' visible='true' lat='60.7207107856' lon='135.0490245009' />
+<node id='273135' visible='true' lat='60.72600404848' lon='135.05101119785' />
+<node id='273137' visible='true' lat='60.72928677326' lon='135.05450504422' />
+<node id='273139' visible='true' lat='60.73186582163' lon='135.05498459176' />
+<node id='273141' visible='true' lat='60.73662144558' lon='135.06327391353' />
+<way id='273127' visible='true'>
+<nd ref='273125' />
+<nd ref='273126' />
+<nd ref='273129' />
+<nd ref='273131' />
+<nd ref='273133' />
+<nd ref='273135' />
+<nd ref='273137' />
+<nd ref='273139' />
+<nd ref='273141' />
+<tag k='name' v='Yukon River' />
+<tag k='name:ru' v='Юкон' />
+<tag k='waterway' v='river' />
+</way>
+</osm>)#";
 
 
 // binary data: way.o5m
-unsigned char const way_o5m_data[] = /* 175 */
-{0xFF, 0xE0, 0x04, 0x6F, 0x35, 0x6D, 0x32, 0xFF, 0x10, 0x0E, 0xE9, 0xAB, 0x21, 0x00, 0xC5, 0x94,
-  0x88, 0x88, 0x0A, 0x8C, 0xB1, 0x9D, 0xC3, 0x04, 0x10, 0x08, 0x04, 0x00, 0x9C, 0x8F, 0x0A, 0x87,
-  0xE7, 0x05, 0x10, 0x07, 0x04, 0x00, 0xF6, 0x4A, 0xFD, 0x92, 0x03, 0x10, 0x08, 0x04, 0x00, 0xF6,
-  0xA1, 0x04, 0xF5, 0x80, 0x04, 0x10, 0x08, 0x04, 0x00, 0xB4, 0xB6, 0x02, 0x89, 0xBB, 0x06, 0x10,
-  0x08, 0x04, 0x00, 0xB4, 0xEC, 0x03, 0xD9, 0xCC, 0x03, 0x10, 0x08, 0x04, 0x00, 0xD6, 0xC0, 0x01,
-  0xB7, 0x83, 0x03, 0x10, 0x08, 0x06, 0x00, 0xDB, 0xAB, 0x02, 0x9F, 0xFE, 0x02, 0x10, 0x08, 0x02,
-  0x00, 0x87, 0xAD, 0x05, 0xEB, 0xA5, 0x04, 0xFF, 0x11, 0x44, 0xCD, 0xAB, 0x21, 0x00, 0x0B, 0xC9,
-  0xAB, 0x21, 0x01, 0x05, 0x03, 0x03, 0x03, 0x03, 0x03, 0x03, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x00,
-  0x59, 0x75, 0x6B, 0x6F, 0x6E, 0x20, 0x52, 0x69, 0x76, 0x65, 0x72, 0x00, 0x00, 0x6E, 0x61, 0x6D,
-  0x65, 0x3A, 0x72, 0x75, 0x00, 0xD0, 0xAE, 0xD0, 0xBA, 0xD0, 0xBE, 0xD0, 0xBD, 0x00, 0x00, 0x77,
-  0x61, 0x74, 0x65, 0x72, 0x77, 0x61, 0x79, 0x00, 0x72, 0x69, 0x76, 0x65, 0x72, 0x00, 0xFE};
+unsigned char const way_o5m_data[/* 175 */] = {
+    0xFF, 0xE0, 0x04, 0x6F, 0x35, 0x6D, 0x32, 0xFF, 0x10, 0x0E, 0xCA, 0xAB, 0x21, 0x00, 0xE4, 0x8D,
+    0xF9, 0x87, 0x0A, 0xE8, 0x86, 0xFC, 0xC2, 0x04, 0x10, 0x08, 0x02, 0x00, 0x87, 0xAD, 0x05, 0xEC,
+    0xA5, 0x04, 0x10, 0x08, 0x06, 0x00, 0xDB, 0xAB, 0x02, 0xA0, 0xFE, 0x02, 0x10, 0x08, 0x04, 0x00,
+    0xD6, 0xC0, 0x01, 0xB8, 0x83, 0x03, 0x10, 0x08, 0x04, 0x00, 0xB4, 0xEC, 0x03, 0xDA, 0xCC, 0x03,
+    0x10, 0x08, 0x04, 0x00, 0xB4, 0xB6, 0x02, 0x8A, 0xBB, 0x06, 0x10, 0x08, 0x04, 0x00, 0xF6, 0xA1,
+    0x04, 0xF6, 0x80, 0x04, 0x10, 0x07, 0x04, 0x00, 0xF6, 0x4A, 0xFE, 0x92, 0x03, 0x10, 0x08, 0x04,
+    0x00, 0x9C, 0x8F, 0x0A, 0x88, 0xE7, 0x05, 0xFF, 0x11, 0x44, 0xCE, 0xAB, 0x21, 0x00, 0x0B, 0xCA,
+    0xAB, 0x21, 0x02, 0x06, 0x04, 0x04, 0x04, 0x04, 0x04, 0x04, 0x00, 0x6E, 0x61, 0x6D, 0x65, 0x00,
+    0x59, 0x75, 0x6B, 0x6F, 0x6E, 0x20, 0x52, 0x69, 0x76, 0x65, 0x72, 0x00, 0x00, 0x6E, 0x61, 0x6D,
+    0x65, 0x3A, 0x72, 0x75, 0x00, 0xD0, 0xAE, 0xD0, 0xBA, 0xD0, 0xBE, 0xD0, 0xBD, 0x00, 0x00, 0x77,
+    0x61, 0x74, 0x65, 0x72, 0x77, 0x61, 0x79, 0x00, 0x72, 0x69, 0x76, 0x65, 0x72, 0x00, 0xFE};
 static_assert(sizeof(way_o5m_data) == 175, "Size check failed");
 
+
 char const relation_xml_data[] = "<?xml version='1.0' encoding='UTF-8'?>\
 <osm version='0.6' upload='true' generator='JOSM'>\
 <node id='-273196' action='modify' visible='true' lat='60.71960512058' lon='-135.0538199763'>\
@@ -120,6 +121,7 @@ char const relation_xml_data[] = "<?xml version='1.0' encoding='UTF-8'?>\
 </relation>\
 </osm>";
 
+
 // binary data: relation.o5m
 unsigned char const relation_o5m_data[] = /* 224 */
 {0xFF, 0xE0, 0x04, 0x6F, 0x35, 0x6D, 0x32, 0xFF, 0x10, 0x2B, 0xD7, 0xAC, 0x21, 0x00, 0xAD,