Add:Core:Support for group attributes

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@3049 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/attr.h b/navit/navit/attr.h
index 6d73a61..10329e5 100644 (file)
--- a/navit/navit/attr.h
+++ b/navit/navit/attr.h
@@ -145,6 +145,7 @@ struct attr {
                enum item_type *item_types;
                enum attr_type *attr_types;
                long long *num64;
+               struct attr *attrs;
        } u;
 };
 

diff --git a/navit/navit/attr_def.h b/navit/navit/attr_def.h
index 8cfc69f..55b5b3f 100644 (file)
--- a/navit/navit/attr_def.h
+++ b/navit/navit/attr_def.h
@@ -137,6 +137,9 @@ ATTR(gamma)
 ATTR(brightness)
 ATTR(contrast)
 ATTR(height)
+ATTR(minspeed)
+ATTR(recspeed)
+ATTR(speed_cond)
 ATTR2(0x00027500,type_rel_abs_begin)
 /* These attributes are int that can either hold relative              *
  * or absolute values. A relative value is indicated by                *
@@ -283,6 +286,7 @@ ATTR(user_pass)
 ATTR(status_text)
 ATTR(log_gpx_desc)
 ATTR(map_pass)
+ATTR(validity_period)
 ATTR2(0x0003ffff,type_string_end)
 ATTR2(0x00040000,type_special_begin)
 ATTR(order)
@@ -374,3 +378,6 @@ ATTR(osm_nodeid)
 ATTR(osm_wayid)
 ATTR(osm_relationid)
 ATTR2(0x000cffff,type_int64_end)
+ATTR2(0x000d0000,type_group_begin)
+ATTR(speed_dep)
+ATTR2(0x000dffff,type_group_end)