diff options
author | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2007-07-05 16:15:43 +0000 |
---|---|---|
committer | martin-s <martin-s@ffa7fe5e-494d-0410-b361-a75ebd5db220> | 2007-07-05 16:15:43 +0000 |
commit | 70b4ed500fce07e4e875b88710eed66f515fe2c0 (patch) | |
tree | afc8e6dac9078e9406d5a14ecd9f19c2d6b987f2 | |
parent | e102e63ce324cb3b38e0036a25e9c5d251ebb463 (diff) | |
download | navit-svn-70b4ed500fce07e4e875b88710eed66f515fe2c0.tar.gz |
Changed zoom to order in layout to avoid confusion
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@259 ffa7fe5e-494d-0410-b361-a75ebd5db220
-rw-r--r-- | src/graphics.c | 2 | ||||
-rw-r--r-- | src/layout.c | 6 | ||||
-rw-r--r-- | src/layout.h | 4 | ||||
-rw-r--r-- | src/navit.xml | 240 | ||||
-rw-r--r-- | src/xmlconfig.c | 6 |
5 files changed, 129 insertions, 129 deletions
diff --git a/src/graphics.c b/src/graphics.c index b9222990..ad8a2237 100644 --- a/src/graphics.c +++ b/src/graphics.c @@ -391,7 +391,7 @@ xdisplay_draw_layer(GHashTable *display_list, struct graphics *gra, struct layer itms=lay->itemtypes; while (itms) { itm=itms->data; - if (order >= itm->zoom_min && order <= itm->zoom_max) + if (order >= itm->order_min && order <= itm->order_max) xdisplay_draw_elements(gra, display_list, itm); itms=g_list_next(itms); } diff --git a/src/layout.c b/src/layout.c index 0ca33599..249989cc 100644 --- a/src/layout.c +++ b/src/layout.c @@ -27,13 +27,13 @@ void layout_add_layer(struct layout *layout, struct layer *layer) layout->layers = g_list_append(layout->layers, layer); } -struct itemtype * itemtype_new(int zoom_min, int zoom_max) +struct itemtype * itemtype_new(int order_min, int order_max) { struct itemtype *itm; itm = g_new0(struct itemtype, 1); - itm->zoom_min=zoom_min; - itm->zoom_max=zoom_max; + itm->order_min=order_min; + itm->order_max=order_max; return itm; } diff --git a/src/layout.h b/src/layout.h index ed96838e..91bfe27c 100644 --- a/src/layout.h +++ b/src/layout.h @@ -28,7 +28,7 @@ struct element { struct itemtype { - int zoom_min, zoom_max; + int order_min, order_max; GList *type; GList *elements; }; @@ -47,7 +47,7 @@ struct layout; struct layout *layout_new(const char *name); struct layer *layer_new(const char *name, int details); void layout_add_layer(struct layout *layout, struct layer *layer); -struct itemtype *itemtype_new(int zoom_min, int zoom_max); +struct itemtype *itemtype_new(int order_min, int order_max); void itemtype_add_type(struct itemtype *this, enum item_type type); void layer_add_itemtype(struct layer *layer, struct itemtype *itemtype); void itemtype_add_element(struct itemtype *itemtype, struct element *element); diff --git a/src/navit.xml b/src/navit.xml index 2339d15f..ba1ad414 100644 --- a/src/navit.xml +++ b/src/navit.xml @@ -15,446 +15,446 @@ </mapset> <layout name="Tag"> <layer name="sea" details="0"> - <item type="wood" zoom="0-"> + <item type="wood" order="0-"> <polygon color="#8ec78d" /> </item> - <item type="town_poly" zoom="0-"> + <item type="town_poly" order="0-"> <polygon color="#ffc895" /> <polyline color="#ebb481" /> </item> - <item type="water_poly" zoom="0-"> + <item type="water_poly" order="0-"> <polygon color="#82c8ea" /> <polyline color="#5096b8" /> </item> - <item type="park_poly" zoom="0-"> + <item type="park_poly" order="0-"> <polygon color="#7cc334" /> </item> - <item type="airport_poly" zoom="0-"> + <item type="airport_poly" order="0-"> <polygon color="#a0a0a0" /> </item> - <item type="sport_poly" zoom="0-"> + <item type="sport_poly" order="0-"> <polygon color="#4af04f" /> </item> - <item type="industry_poly" zoom="0-"> + <item type="industry_poly" order="0-"> <polygon color="#e6e6e6" /> </item> - <item type="water_line" zoom="0-"> + <item type="water_line" order="0-"> <polyline color="#5096b8" width="1" /> </item> - <item type="rail" zoom="6-"> + <item type="rail" order="6-"> <polyline color="#808080" width="3" /> </item> - <item type="ferry" zoom="5-"> + <item type="ferry" order="5-"> <polyline color="#000000" width="1" /> </item> - <item type="border_country" zoom="0-"> + <item type="border_country" order="0-"> <polyline color="#b8434e" width="1" /> </item> - <item type="border_state" zoom="0-"> + <item type="border_state" order="0-"> <polyline color="#808080" width="1" /> </item> - <item type="height_line_1" zoom="0-"> + <item type="height_line_1" order="0-"> <polyline color="#000000" width="1" /> </item> - <item type="height_line_2" zoom="0-"> + <item type="height_line_2" order="0-"> <polyline color="#000000" width="2" /> </item> - <item type="street_route" zoom="2"> + <item type="street_route" order="2"> <polyline color="#0000a0" width="4" /> </item> - <item type="street_route" zoom="3-5"> + <item type="street_route" order="3-5"> <polyline color="#0000a0" width="8" /> </item> - <item type="street_route" zoom="6"> + <item type="street_route" order="6"> <polyline color="#0000a0" width="10" /> </item> - <item type="street_route" zoom="7-8"> + <item type="street_route" order="7-8"> <polyline color="#0000a0" width="16" /> </item> - <item type="street_route" zoom="9-10"> + <item type="street_route" order="9-10"> <polyline color="#0000a0" width="20" /> </item> - <item type="street_route" zoom="11"> + <item type="street_route" order="11"> <polyline color="#0000a0" width="28" /> </item> - <item type="street_route" zoom="12"> + <item type="street_route" order="12"> <polyline color="#0000a0" width="32" /> </item> - <item type="street_route" zoom="13"> + <item type="street_route" order="13"> <polyline color="#0000a0" width="52" /> </item> - <item type="street_route" zoom="14"> + <item type="street_route" order="14"> <polyline color="#0000a0" width="64" /> </item> - <item type="street_route" zoom="15"> + <item type="street_route" order="15"> <polyline color="#0000a0" width="68" /> </item> - <item type="street_route" zoom="16"> + <item type="street_route" order="16"> <polyline color="#0000a0" width="132" /> </item> - <item type="street_route" zoom="17"> + <item type="street_route" order="17"> <polyline color="#0000a0" width="268" /> </item> - <item type="street_route" zoom="18"> + <item type="street_route" order="18"> <polyline color="#0000a0" width="530" /> </item> - <item type="street_nopass" zoom="10-"> + <item type="street_nopass" order="10-"> <polyline color="#000000" width="1" /> </item> - <item type="street_0,street_1_city,street_1_land" zoom="10"> + <item type="street_0,street_1_city,street_1_land" order="10"> <polyline color="#d2d2d2" width="4" /> <polyline color="#ffffff" width="2" /> </item> - <item type="street_0,street_1_city,street_1_land" zoom="11"> + <item type="street_0,street_1_city,street_1_land" order="11"> <polyline color="#d2d2d2" width="6" /> <polyline color="#ffffff" width="4" /> </item> - <item type="street_0,street_1_city,street_1_land" zoom="12"> + <item type="street_0,street_1_city,street_1_land" order="12"> <polyline color="#d2d2d2" width="10" /> <polyline color="#ffffff" width="8" /> </item> - <item type="street_0,street_1_city,street_1_land" zoom="13"> + <item type="street_0,street_1_city,street_1_land" order="13"> <polyline color="#d2d2d2" width="12" /> <polyline color="#ffffff" width="9" /> </item> - <item type="street_0,street_1_city,street_1_land" zoom="14"> + <item type="street_0,street_1_city,street_1_land" order="14"> <polyline color="#d2d2d2" width="15" /> <polyline color="#ffffff" width="13" /> </item> - <item type="street_0,street_1_city,street_1_land" zoom="15"> + <item type="street_0,street_1_city,street_1_land" order="15"> <polyline color="#d2d2d2" width="17" /> <polyline color="#ffffff" width="14" /> </item> - <item type="street_0,street_1_city,street_1_land" zoom="16"> + <item type="street_0,street_1_city,street_1_land" order="16"> <polyline color="#d2d2d2" width="33" /> <polyline color="#ffffff" width="26" /> </item> - <item type="street_0,street_1_city,street_1_land" zoom="17"> + <item type="street_0,street_1_city,street_1_land" order="17"> <polyline color="#d2d2d2" width="69" /> <polyline color="#ffffff" width="61" /> </item> - <item type="street_0,street_1_city,street_1_land" zoom="18"> + <item type="street_0,street_1_city,street_1_land" order="18"> <polyline color="#d2d2d2" width="132" /> <polyline color="#ffffff" width="126" /> </item> - <item type="street_2_city,street_2_land" zoom="7-8"> + <item type="street_2_city,street_2_land" order="7-8"> <polyline color="#c0c0c0" width="2" /> </item> - <item type="street_2_city,street_2_land" zoom="9"> + <item type="street_2_city,street_2_land" order="9"> <polyline color="#c0c0c0" width="4" /> <polyline color="#ffff00" width="2" /> </item> - <item type="street_2_city,street_2_land" zoom="10"> + <item type="street_2_city,street_2_land" order="10"> <polyline color="#c0c0c0" width="6" /> <polyline color="#ffff00" width="4" /> </item> - <item type="street_2_city,street_2_land" zoom="11"> + <item type="street_2_city,street_2_land" order="11"> <polyline color="#c0c0c0" width="8" /> <polyline color="#ffff00" width="6" /> </item> - <item type="street_2_city,street_2_land" zoom="12"> + <item type="street_2_city,street_2_land" order="12"> <polyline color="#c0c0c0" width="12" /> <polyline color="#ffff00" width="9" /> </item> - <item type="street_2_city,street_2_land" zoom="13"> + <item type="street_2_city,street_2_land" order="13"> <polyline color="#c0c0c0" width="15" /> <polyline color="#ffff00" width="11" /> </item> - <item type="street_2_city,street_2_land" zoom="14"> + <item type="street_2_city,street_2_land" order="14"> <polyline color="#c0c0c0" width="18" /> <polyline color="#ffff00" width="14" /> </item> - <item type="street_2_city,street_2_land" zoom="15"> + <item type="street_2_city,street_2_land" order="15"> <polyline color="#c0c0c0" width="21" /> <polyline color="#ffff00" width="17" /> </item> - <item type="street_2_city,street_2_land" zoom="16"> + <item type="street_2_city,street_2_land" order="16"> <polyline color="#c0c0c0" width="35" /> <polyline color="#ffff00" width="30" /> </item> - <item type="street_2_city,street_2_land" zoom="17"> + <item type="street_2_city,street_2_land" order="17"> <polyline color="#c0c0c0" width="73" /> <polyline color="#ffff00" width="67" /> </item> - <item type="street_2_city,street_2_land" zoom="18"> + <item type="street_2_city,street_2_land" order="18"> <polyline color="#c0c0c0" width="144" /> <polyline color="#ffff00" width="138" /> </item> - <item type="street_3_city,street_3_land,ramp" zoom="7-8"> + <item type="street_3_city,street_3_land,ramp" order="7-8"> <polyline color="#a0a0a0" width="3" /> <polyline color="#ffff00" width="1" /> </item> - <item type="street_3_city,street_3_land,ramp" zoom="9"> + <item type="street_3_city,street_3_land,ramp" order="9"> <polyline color="#a0a0a0" width="5" /> <polyline color="#ffff00" width="3" /> </item> - <item type="street_3_city,street_3_land,ramp" zoom="10"> + <item type="street_3_city,street_3_land,ramp" order="10"> <polyline color="#a0a0a0" width="8" /> <polyline color="#ffff00" width="6" /> </item> - <item type="street_3_city,street_3_land,ramp" zoom="11"> + <item type="street_3_city,street_3_land,ramp" order="11"> <polyline color="#a0a0a0" width="9" /> <polyline color="#ffff00" width="7" /> </item> - <item type="street_3_city,street_3_land,ramp" zoom="12"> + <item type="street_3_city,street_3_land,ramp" order="12"> <polyline color="#a0a0a0" width="13" /> <polyline color="#ffff00" width="9" /> </item> - <item type="street_3_city,street_3_land,ramp" zoom="13"> + <item type="street_3_city,street_3_land,ramp" order="13"> <polyline color="#a0a0a0" width="18" /> <polyline color="#ffff00" width="14" /> </item> - <item type="street_3_city,street_3_land,ramp" zoom="14"> + <item type="street_3_city,street_3_land,ramp" order="14"> <polyline color="#a0a0a0" width="21" /> <polyline color="#ffff00" width="17" /> </item> - <item type="street_3_city,street_3_land,ramp" zoom="15"> + <item type="street_3_city,street_3_land,ramp" order="15"> <polyline color="#a0a0a0" width="25" /> <polyline color="#ffff00" width="21" /> </item> - <item type="street_3_city,street_3_land,ramp" zoom="16"> + <item type="street_3_city,street_3_land,ramp" order="16"> <polyline color="#a0a0a0" width="40" /> <polyline color="#ffff00" width="34" /> </item> - <item type="street_3_city,street_3_land,ramp" zoom="17"> + <item type="street_3_city,street_3_land,ramp" order="17"> <polyline color="#a0a0a0" width="79" /> <polyline color="#ffff00" width="73" /> </item> - <item type="street_3_city,street_3_land,ramp" zoom="18"> + <item type="street_3_city,street_3_land,ramp" order="18"> <polyline color="#a0a0a0" width="156" /> <polyline color="#ffff00" width="150" /> </item> - <item type="street_4_city,street_4_land,street_n_lanes" zoom="2-6"> + <item type="street_4_city,street_4_land,street_n_lanes" order="2-6"> <polyline color="#404040" width="1" /> </item> - <item type="street_4_city,street_4_land,street_n_lanes" zoom="7-8"> + <item type="street_4_city,street_4_land,street_n_lanes" order="7-8"> <polyline color="#404040" width="3" /> <polyline color="#ff0000" width="1" /> </item> - <item type="street_4_city,street_4_land,street_n_lanes" zoom="9"> + <item type="street_4_city,street_4_land,street_n_lanes" order="9"> <polyline color="#000000" width="5" /> <polyline color="#ff0000" width="3" /> </item> - <item type="street_4_city,street_4_land,street_n_lanes" zoom="10"> + <item type="street_4_city,street_4_land,street_n_lanes" order="10"> <polyline color="#000000" width="6" /> <polyline color="#ff0000" width="4" /> </item> - <item type="street_4_city,street_4_land,street_n_lanes" zoom="11"> + <item type="street_4_city,street_4_land,street_n_lanes" order="11"> <polyline color="#000000" width="9" /> <polyline color="#ff0000" width="7" /> </item> - <item type="street_4_city,street_4_land,street_n_lanes" zoom="12"> + <item type="street_4_city,street_4_land,street_n_lanes" order="12"> <polyline color="#000000" width="13" /> <polyline color="#ff0000" width="9" /> </item> - <item type="street_4_city,street_4_land,street_n_lanes" zoom="13"> + <item type="street_4_city,street_4_land,street_n_lanes" order="13"> <polyline color="#000000" width="18" /> <polyline color="#ff0000" width="14" /> </item> - <item type="street_4_city,street_4_land,street_n_lanes" zoom="14"> + <item type="street_4_city,street_4_land,street_n_lanes" order="14"> <polyline color="#000000" width="21" /> <polyline color="#ff0000" width="17" /> </item> - <item type="street_4_city,street_4_land,street_n_lanes" zoom="15"> + <item type="street_4_city,street_4_land,street_n_lanes" order="15"> <polyline color="#000000" width="24" /> <polyline color="#ff0000" width="20" /> </item> - <item type="street_4_city,street_4_land,street_n_lanes" zoom="16"> + <item type="street_4_city,street_4_land,street_n_lanes" order="16"> <polyline color="#000000" width="39" /> <polyline color="#ff0000" width="33" /> </item> - <item type="street_4_city,street_4_land,street_n_lanes" zoom="17"> + <item type="street_4_city,street_4_land,street_n_lanes" order="17"> <polyline color="#000000" width="78" /> <polyline color="#ff0000" width="72" /> </item> - <item type="street_4_city,street_4_land,street_n_lanes" zoom="18"> + <item type="street_4_city,street_4_land,street_n_lanes" order="18"> <polyline color="#000000" width="156" /> <polyline color="#ff0000" width="150" /> </item> - <item type="highway_city,highway_land" zoom="2"> + <item type="highway_city,highway_land" order="2"> <polyline color="#ff0000" width="1" /> </item> - <item type="highway_city,highway_land" zoom="3-5"> + <item type="highway_city,highway_land" order="3-5"> <polyline color="#ff0000" width="3" /> <polyline color="#ffff00" width="1" /> </item> - <item type="highway_city,highway_land" zoom="6"> + <item type="highway_city,highway_land" order="6"> <polyline color="#ff0000" width="4" /> <polyline color="#ffff00" width="2" /> </item> - <item type="highway_city,highway_land" zoom="7-8"> + <item type="highway_city,highway_land" order="7-8"> <polyline color="#ff0000" width="7" /> <polyline color="#ffff00" width="5" /> <polyline color="#ff0000" width="1" /> </item> - <item type="highway_city,highway_land" zoom="9-10"> + <item type="highway_city,highway_land" order="9-10"> <polyline color="#ff0000" width="9" /> <polyline color="#ffff00" width="5" /> <polyline color="#ff0000" width="1" /> </item> - <item type="highway_city,highway_land" zoom="11"> + <item type="highway_city,highway_land" order="11"> <polyline color="#ff0000" width="13" /> <polyline color="#ffff00" width="9" /> <polyline color="#ff0000" width="1" /> </item> - <item type="highway_city,highway_land" zoom="12"> + <item type="highway_city,highway_land" order="12"> <polyline color="#ff0000" width="15" /> <polyline color="#ffff00" width="10" /> <polyline color="#ff0000" width="1" /> </item> - <item type="highway_city,highway_land" zoom="13"> + <item type="highway_city,highway_land" order="13"> <polyline color="#ff0000" width="25" /> <polyline color="#ffff00" width="17" /> <polyline color="#ff0000" width="1" /> </item> - <item type="highway_city,highway_land" zoom="14"> + <item type="highway_city,highway_land" order="14"> <polyline color="#ff0000" width="31" /> <polyline color="#ffff00" width="24" /> <polyline color="#ff0000" width="1" /> </item> - <item type="highway_city,highway_land" zoom="15"> + <item type="highway_city,highway_land" order="15"> <polyline color="#ff0000" width="33" /> <polyline color="#ffff00" width="27" /> <polyline color="#ff0000" width="1" /> </item> - <item type="highway_city,highway_land" zoom="16"> + <item type="highway_city,highway_land" order="16"> <polyline color="#ff0000" width="65" /> <polyline color="#ffff00" width="59" /> <polyline color="#ff0000" width="1" /> </item> - <item type="highway_city,highway_land" zoom="17"> + <item type="highway_city,highway_land" order="17"> <polyline color="#ff0000" width="133" /> <polyline color="#ffff00" width="127" /> <polyline color="#ff0000" width="1" /> </item> - <item type="highway_city,highway_land" zoom="18"> + <item type="highway_city,highway_land" order="18"> <polyline color="#ff0000" width="264" /> <polyline color="#ffff00" width="258" /> <polyline color="#ff0000" width="1" /> </item> - <item type="street_unkn" zoom="0-"> + <item type="street_unkn" order="0-"> <polyline color="#8080ff" width="3" /> </item> - <item type="highway_exit_label" zoom="10-"> + <item type="highway_exit_label" order="10-"> <circle color="#000000" radius="3" label_size="7" /> </item> - <item type="district_label_1e3,district_label_2e3" zoom="10-11"> + <item type="district_label_1e3,district_label_2e3" order="10-11"> <circle color="#000000" radius="3" label_size="7" /> </item> - <item type="district_label_5e3" zoom="10-"> + <item type="district_label_5e3" order="10-"> <circle color="#000000" radius="3" label_size="10" /> </item> - <item type="town_label_5e1" zoom="10-"> + <item type="town_label_5e1" order="10-"> <circle color="#000000" radius="3" label_size="10" /> </item> - <item type="town_label_1e3" zoom="10-"> + <item type="town_label_1e3" order="10-"> <circle color="#000000" radius="3" label_size="10" /> </item> - <item type="town_label_5e3" zoom="6-7"> + <item type="town_label_5e3" order="6-7"> <circle color="#000000" radius="3" label_size="7" /> </item> - <item type="town_label_5e3" zoom="8-10"> + <item type="town_label_5e3" order="8-10"> <circle color="#000000" radius="3" label_size="10" /> </item> - <item type="town_label_5e3" zoom="11"> + <item type="town_label_5e3" order="11"> <circle color="#000000" radius="3" label_size="15" /> </item> - <item type="town_label_1e4" zoom="5-6"> + <item type="town_label_1e4" order="5-6"> <circle color="#000000" radius="5" label_size="7" /> </item> - <item type="town_label_1e4" zoom="7-10"> + <item type="town_label_1e4" order="7-10"> <circle color="#000000" radius="5" label_size="10" /> </item> - <item type="town_label_1e4" zoom="11"> + <item type="town_label_1e4" order="11"> <circle color="#000000" radius="5" label_size="15" /> </item> - <item type="town_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,town_label_1e3,town_label_2e3,town_label_5e3,town_label_1e4,town_label_2e4,town_label_5e4,town_label_1e5,town_label_2e5,town_label_5e5,town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7,district_label,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2,district_label_1e3,district_label_2e3,district_label_5e3,district_label_1e4,district_label_2e4,district_label_5e4,district_label_1e5,district_label_2e5,district_label_5e5,district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7" zoom="2-"> + <item type="town_label,town_label_0e0,town_label_1e0,town_label_2e0,town_label_5e0,town_label_1e1,town_label_2e1,town_label_5e1,town_label_1e2,town_label_2e2,town_label_5e2,town_label_1e3,town_label_2e3,town_label_5e3,town_label_1e4,town_label_2e4,town_label_5e4,town_label_1e5,town_label_2e5,town_label_5e5,town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7,district_label,district_label_0e0,district_label_1e0,district_label_2e0,district_label_5e0,district_label_1e1,district_label_2e1,district_label_5e1,district_label_1e2,district_label_2e2,district_label_5e2,district_label_1e3,district_label_2e3,district_label_5e3,district_label_1e4,district_label_2e4,district_label_5e4,district_label_1e5,district_label_2e5,district_label_5e5,district_label_1e6,district_label_2e6,district_label_5e6,district_label_1e7" order="2-"> <circle color="#000000" radius="3" label_size="15" /> </item> - <item type="town_label_1e5,town_label_2e5" zoom="2-"> + <item type="town_label_1e5,town_label_2e5" order="2-"> <circle color="#000000" radius="3" label_size="10" /> </item> - <item type="town_label_1e5,town_label_5e5,town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" zoom="0-"> + <item type="town_label_1e5,town_label_5e5,town_label_1e6,town_label_2e6,town_label_5e6,town_label_1e7" order="0-"> <circle color="#000000" radius="3" label_size="10" /> </item> - <item type="poi_airport" zoom="0-"> + <item type="poi_airport" order="0-"> <icon src="airport.xpm" /> </item> - <item type="town_ghost" zoom="0-"> + <item type="town_ghost" order="0-"> <icon src="ghost_town.xpm" /> </item> - <item type="poi_hotel" zoom="0-"> + <item type="poi_hotel" order="0-"> <icon src="hotel.xpm" /> </item> - <item type="poi_car_parking" zoom="0-"> + <item type="poi_car_parking" order="0-"> <icon src="parking.xpm" /> </item> - <item type="poi_car_dealer_parts" zoom="0-"> + <item type="poi_car_dealer_parts" order="0-"> <icon src="car_dealer.xpm" /> </item> - <item type="poi_fuel" zoom="0-"> + <item type="poi_fuel" order="0-"> <icon src="fuel.xpm" /> </item> - <item type="poi_shopping" zoom="0-"> + <item type="poi_shopping" order="0-"> <icon src="shopping.xpm" /> </item> - <item type="poi_attraction" zoom="0-"> + <item type="poi_attraction" order="0-"> <icon src="attraction.xpm" /> </item> - <item type="poi_bar" zoom="0-"> + <item type="poi_bar" order="0-"> <icon src="bar.xpm" /> </item> - <item type="poi_bridge" zoom="0-"> + <item type="poi_bridge" order="0-"> <icon src="bridge.xpm" /> </item> - <item type="highway_exit" zoom="0-"> + <item type="highway_exit" order="0-"> <icon src="exit.xpm" /> </item> - <item type="poi_camp_rv" zoom="0-"> + <item type="poi_camp_rv" order="0-"> <icon src="camping.xpm" /> </item> - <item type="poi_museum_history" zoom="0-"> + <item type="poi_museum_history" order="0-"> <icon src="museum.xpm" /> </item> - <item type="poi_hospital" zoom="0-"> + <item type="poi_hospital" order="0-"> <icon src="hospital.xpm" /> </item> </layer> <!-- <layer name="sea" details="0"> - <item type="sea" zoom="0-"> + <item type="sea" order="0-"> <polygon color="#82c8ea" /> </item> </layer> <layer name="wood" details="0"> - <item type="wood" zoom="0-"> + <item type="wood" order="0-"> <polygon color="#8ec78d" /> </item> </layer> <layer name="highway" details="0"> - <item type="highway" zoom="0-"> + <item type="highway" order="0-"> <line color="#ff0000" width="3" /> <line color="#ffff0a" width="1" /> </item> - <item type="highway" zoom="2-5"> + <item type="highway" order="2-5"> <line color="#ff0000" width="5" /> <line color="#ffff0a" width="3" /> <text color="#000000" font="arial" size="12"> </item> </layer> <layer name="label" details="0"> - <item type="town0" zoom="3-"> + <item type="town0" order="3-"> <circle radius="3" /> <text color="#000000" font="arial" size="12"> </item> </layer> <layer name="poi" details="0"> - <item type="mcdonalds" zoom="3-"> + <item type="mcdonalds" order="3-"> <icon src="mcdonalds.xpm" /> </item> </layer> <layer name="wood" details="0"> - <item type="wood" zoom="1-"> + <item type="wood" order="1-"> <polygon color="#8ec78d" /> <polyline color="#8ec78d" /> </item> diff --git a/src/xmlconfig.c b/src/xmlconfig.c index dadbb4d0..3137fce5 100644 --- a/src/xmlconfig.c +++ b/src/xmlconfig.c @@ -56,14 +56,14 @@ find_color(struct xmlstate *state, int required, struct color *color) } static int -find_zoom(struct xmlstate *state, int required, int *min, int *max) +find_order(struct xmlstate *state, int required, int *min, int *max) { const char *value, *pos; int ret; *min=0; *max=18; - value=find_attribute(state, "zoom", required); + value=find_attribute(state, "order", required); if (! value) return 0; pos=index(value, '-'); @@ -240,7 +240,7 @@ xmlconfig_item(struct xmlstate *state) if (! type) return 0; - if (! find_zoom(state, 1, &min, &max)) + if (! find_order(state, 1, &min, &max)) return 0; state->element_object=itemtype_new(min, max); if (! state->element_object) |