X-Git-Url: https://git.street.me.uk/andy/viking.git/blobdiff_plain/acaf7113fffde4a6a6f6c0d57a4eea27e1024a31..812909d1812d7f659f21963eda01078b57e05430:/src/garminsymbols.c diff --git a/src/garminsymbols.c b/src/garminsymbols.c index 73a0fd4e..ac2802bc 100644 --- a/src/garminsymbols.c +++ b/src/garminsymbols.c @@ -21,7 +21,7 @@ #include "viking.h" #include "garminsymbols.h" -#include "icons.h" +#include "icons/icons.h" #include #include @@ -36,69 +36,69 @@ struct { /*--------------------------------------------------------------- Marine symbols ---------------------------------------------------------------*/ - { "anchor", 0, "white anchor symbol", NULL, NULL }, - { "bell", 1, "white bell symbol", NULL, NULL }, - { "diamond_grn", 2, "green diamond symbol", NULL, NULL }, - { "diamond_red", 3, "red diamond symbol", NULL, NULL }, - { "dive1", 4, "diver down flag 1", NULL, NULL }, - { "dive2", 5, "diver down flag 2", NULL, NULL }, - { "dollar", 6, "white dollar symbol", NULL, NULL }, - { "fish", 7, "white fish symbol", NULL, NULL }, - { "fuel", 8, "white fuel symbol", NULL, NULL }, - { "horn", 9, "white horn symbol", NULL, NULL }, + { "anchor", 0, "white anchor symbol", &wp_anchor, NULL }, + { "bell", 1, "white bell symbol", &wp_bell, NULL }, + { "diamond_grn", 2, "green diamond symbol", &wp_diamond_grn, NULL }, + { "diamond_red", 3, "red diamond symbol", &wp_diamond_red, NULL }, + { "dive1", 4, "diver down flag 1", &wp_dive1, NULL }, + { "dive2", 5, "diver down flag 2", &wp_dive2, NULL }, + { "dollar", 6, "white dollar symbol", &wp_dollar, NULL }, + { "fish", 7, "white fish symbol", &wp_fish, NULL }, + { "fuel", 8, "white fuel symbol", &wp_fuel, NULL }, + { "horn", 9, "white horn symbol", &wp_horn, NULL }, { "house", 10, "white house symbol", &wp_house, NULL }, - { "knife", 11, "white knife & fork symbol", NULL, NULL }, - { "light", 12, "white light symbol", NULL, NULL }, - { "mug", 13, "white mug symbol", NULL, NULL }, - { "skull", 14, "white skull and crossbones symbol", NULL, NULL }, - { "square_grn", 15, "green square symbol", NULL, NULL }, - { "square_red", 16, "red square symbol", NULL, NULL }, - { "wbuoy", 17, "white buoy waypoint symbol", NULL, NULL }, + { "knife", 11, "white knife & fork symbol", &wp_knife, NULL }, + { "light", 12, "white light symbol", &wp_light, NULL }, + { "mug", 13, "white mug symbol", &wp_mug, NULL }, + { "skull", 14, "white skull and crossbones symbol", &wp_skull, NULL }, + { "square_grn", 15, "green square symbol", &wp_square_grn, NULL }, + { "square_red", 16, "red square symbol", &wp_square_red, NULL }, + { "wbuoy", 17, "white buoy waypoint symbol", &wp_wbuoy, NULL }, { "wpt_dot", 18, "waypoint dot", &wp_wpt_dot, NULL }, - { "wreck", 19, "white wreck symbol", NULL, NULL }, - { "null", 20, "null symbol (transparent)", NULL, NULL }, - { "mob", 21, "man overboard symbol", NULL, NULL }, - { "buoy_ambr", 22, "amber map buoy symbol", NULL, NULL }, - { "buoy_blck", 23, "black map buoy symbol", NULL, NULL }, - { "buoy_blue", 24, "blue map buoy symbol", NULL, NULL }, - { "buoy_grn", 25, "green map buoy symbol", NULL, NULL }, - { "buoy_grn_red", 26, "green/red map buoy symbol", NULL, NULL }, - { "buoy_grn_wht", 27, "green/white map buoy symbol", NULL, NULL }, - { "buoy_orng", 28, "orange map buoy symbol", NULL, NULL }, - { "buoy_red", 29, "red map buoy symbol", NULL, NULL }, - { "buoy_red_grn", 30, "red/green map buoy symbol", NULL, NULL }, - { "buoy_red_wht", 31, "red/white map buoy symbol", NULL, NULL }, - { "buoy_violet", 32, "violet map buoy symbol", NULL, NULL }, - { "buoy_wht", 33, "white map buoy symbol", NULL, NULL }, - { "buoy_wht_grn", 34, "white/green map buoy symbol", NULL, NULL }, - { "buoy_wht_red", 35, "white/red map buoy symbol", NULL, NULL }, - { "dot", 36, "white dot symbol", NULL, NULL }, - { "rbcn", 37, "radio beacon symbol", NULL, NULL }, - { "boat_ramp", 150, "boat ramp symbol", NULL, NULL }, + { "wreck", 19, "white wreck symbol", &wp_wreck, NULL }, + { "null", 20, "null symbol (transparent)", &wp_null, NULL }, + { "mob", 21, "man overboard symbol", &wp_mob, NULL }, + { "buoy_ambr", 22, "amber map buoy symbol", &wp_buoy_ambr, NULL }, + { "buoy_blck", 23, "black map buoy symbol", &wp_buoy_blck, NULL }, + { "buoy_blue", 24, "blue map buoy symbol", &wp_buoy_blue, NULL }, + { "buoy_grn", 25, "green map buoy symbol", &wp_buoy_grn, NULL }, + { "buoy_grn_red", 26, "green/red map buoy symbol", &wp_buoy_grn_red, NULL }, + { "buoy_grn_wht", 27, "green/white map buoy symbol", &wp_buoy_grn_wht, NULL }, + { "buoy_orng", 28, "orange map buoy symbol", &wp_buoy_orng, NULL }, + { "buoy_red", 29, "red map buoy symbol", &wp_buoy_red, NULL }, + { "buoy_red_grn", 30, "red/green map buoy symbol", &wp_buoy_red_grn, NULL }, + { "buoy_red_wht", 31, "red/white map buoy symbol", &wp_buoy_red_wht, NULL }, + { "buoy_violet", 32, "violet map buoy symbol", &wp_buoy_violet, NULL }, + { "buoy_wht", 33, "white map buoy symbol", &wp_buoy_wht, NULL }, + { "buoy_wht_grn", 34, "white/green map buoy symbol", &wp_buoy_wht_grn, NULL }, + { "buoy_wht_red", 35, "white/red map buoy symbol", &wp_buoy_wht_red, NULL }, + { "dot", 36, "white dot symbol", &wp_dot, NULL }, + { "rbcn", 37, "radio beacon symbol", &wp_rbcn, NULL }, + { "boat_ramp", 150, "boat ramp symbol", &wp_boat_ramp, NULL }, { "camp", 151, "campground symbol", &wp_camp, NULL }, - { "restrooms", 152, "restrooms symbol", NULL, NULL }, - { "showers", 153, "shower symbol", NULL, NULL }, - { "drinking_wtr", 154, "drinking water symbol", NULL, NULL }, - { "phone", 155, "telephone symbol", NULL, NULL }, - { "1st_aid", 156, "first aid symbol", NULL, NULL }, - { "info", 157, "information symbol", NULL, NULL }, - { "parking", 158, "parking symbol", NULL, NULL }, - { "park", 159, "park symbol", NULL, NULL }, - { "picnic", 160, "picnic symbol", NULL, NULL }, - { "scenic", 161, "scenic area symbol", NULL, NULL }, - { "skiing", 162, "skiing symbol", NULL, NULL }, - { "swimming", 163, "swimming symbol", NULL, NULL }, - { "dam", 164, "dam symbol", NULL, NULL }, - { "controlled", 165, "controlled area symbol", NULL, NULL }, - { "danger", 166, "danger symbol", NULL, NULL }, - { "restricted", 167, "restricted area symbol", NULL, NULL }, + { "restrooms", 152, "restrooms symbol", &wp_restroom, NULL }, + { "showers", 153, "shower symbol", &wp_shower, NULL }, + { "drinking_wtr", 154, "drinking water symbol", &wp_drinking_wtr, NULL }, + { "phone", 155, "telephone symbol", &wp_phone, NULL }, + { "1st_aid", 156, "first aid symbol", &wp_1st_aid, NULL }, + { "info", 157, "information symbol", &wp_info, NULL }, + { "parking", 158, "parking symbol", &wp_parking, NULL }, + { "park", 159, "park symbol", &wp_park, NULL }, + { "picnic", 160, "picnic symbol", &wp_picnic, NULL }, + { "scenic", 161, "scenic area symbol", &wp_scenic, NULL }, + { "skiing", 162, "skiing symbol", &wp_skiing, NULL }, + { "swimming", 163, "swimming symbol", &wp_swimming, NULL }, + { "dam", 164, "dam symbol", &wp_dam, NULL }, + { "controlled", 165, "controlled area symbol", &wp_controlled, NULL }, + { "danger", 166, "danger symbol", &wp_danger, NULL }, + { "restricted", 167, "restricted area symbol", &wp_restricted, NULL }, { "null_2", 168, "null symbol", NULL, NULL }, - { "ball", 169, "ball symbol", NULL, NULL }, + { "ball", 169, "ball symbol", &wp_ball, NULL }, { "car", 170, "car symbol", &wp_car, NULL }, { "deer", 171, "deer symbol", &wp_deer, NULL }, { "shpng_cart", 172, "shopping cart symbol", NULL, NULL }, { "lodging", 173, "lodging symbol", NULL, NULL }, - { "mine", 174, "mine symbol", NULL, NULL }, + { "mine", 174, "mine symbol", &wp_mine, NULL }, { "trail_head", 175, "trail head symbol", NULL, NULL }, { "truck_stop", 176, "truck stop symbol", NULL, NULL }, { "user_exit", 177, "user exit symbol", NULL, NULL }, @@ -133,13 +133,13 @@ struct { { "st_hwy", 8194, "state hwy symbol", NULL, NULL }, { "mi_mrkr", 8195, "mile marker symbol", NULL, NULL }, { "trcbck", 8196, "TracBack (feet) symbol", NULL, NULL }, - { "golf", 8197, "golf symbol", NULL, NULL }, - { "sml_cty", 8198, "small city symbol", NULL, NULL }, - { "med_cty", 8199, "medium city symbol", NULL, NULL }, - { "lrg_cty", 8200, "large city symbol", NULL, NULL }, + { "golf", 8197, "golf symbol", &wp_golf, NULL }, + { "sml_cty", 8198, "small city symbol", &wp_sml_cty, NULL }, + { "med_cty", 8199, "medium city symbol", &wp_med_cty, NULL }, + { "lrg_cty", 8200, "large city symbol", &wp_lrg_cty, NULL }, { "freeway", 8201, "intl freeway hwy symbol", NULL, NULL }, { "ntl_hwy", 8202, "intl national hwy symbol", NULL, NULL }, - { "cap_cty", 8203, "capitol city symbol (star)", NULL, NULL }, + { "cap_cty", 8203, "capitol city symbol (star)", &wp_cap_cty, NULL }, { "amuse_pk", 8204, "amusement park symbol", NULL, NULL }, { "bowling", 8205, "bowling symbol", NULL, NULL }, { "car_rental", 8206, "car rental symbol", NULL, NULL }, @@ -151,8 +151,8 @@ struct { { "pharmacy", 8212, "pharmacy symbol", NULL, NULL }, { "pizza", 8213, "pizza symbol", NULL, NULL }, { "post_ofc", 8214, "post office symbol", NULL, NULL }, - { "rv_park", 8215, "RV park symbol", NULL, NULL }, - { "school", 8216, "school symbol", NULL, NULL }, + { "rv_park", 8215, "RV park symbol", &wp_rv_park, NULL }, + { "school", 8216, "school symbol", &wp_school, NULL }, { "stadium", 8217, "stadium symbol", NULL, NULL }, { "store", 8218, "dept. store symbol", NULL, NULL }, { "zoo", 8219, "zoo symbol", NULL, NULL }, @@ -167,20 +167,20 @@ struct { { "geo_place_mm", 8230, "Geographic place name, man-made", NULL, NULL }, { "geo_place_wtr", 8231, "Geographic place name, water", NULL, NULL }, { "geo_place_lnd", 8232, "Geographic place name, land", NULL, NULL }, - { "bridge", 8233, "bridge symbol", NULL, NULL }, - { "building", 8234, "building symbol", NULL, NULL }, - { "cemetery", 8235, "cemetery symbol", NULL, NULL }, - { "church", 8236, "church symbol", NULL, NULL }, + { "bridge", 8233, "bridge symbol", &wp_bridge, NULL }, + { "building", 8234, "building symbol", &wp_building, NULL }, + { "cemetery", 8235, "cemetery symbol", &wp_cemetery, NULL }, + { "church", 8236, "church symbol", &wp_church, NULL }, { "civil", 8237, "civil location symbol", NULL, NULL }, { "crossing", 8238, "crossing symbol", NULL, NULL }, { "hist_town", 8239, "historical town symbol", NULL, NULL }, { "levee", 8240, "levee symbol", NULL, NULL }, - { "military", 8241, "military location symbol", NULL, NULL }, + { "military", 8241, "military location symbol", &wp_military, NULL }, { "oil_field", 8242, "oil field symbol", NULL, NULL }, - { "tunnel", 8243, "tunnel symbol", NULL, NULL }, - { "beach", 8244, "beach symbol", NULL, NULL }, - { "forest", 8245, "forest symbol", NULL, NULL }, - { "summit", 8246, "summit symbol", NULL, NULL }, + { "tunnel", 8243, "tunnel symbol", &wp_tunnel, NULL }, + { "beach", 8244, "beach symbol", &wp_beach, NULL }, + { "forest", 8245, "forest symbol", &wp_forest, NULL }, + { "summit", 8246, "summit symbol", &wp_summit, NULL }, { "lrg_ramp_int", 8247, "large ramp intersection symbol", NULL, NULL }, { "lrg_ex_no_srvc", 8248, "large exit without services smbl", NULL, NULL }, { "badge", 8249, "police/official badge symbol", NULL, NULL }, @@ -281,7 +281,7 @@ struct { /*--------------------------------------------------------------- Aviation symbols ---------------------------------------------------------------*/ - { "airport", 16384, "airport symbol", NULL, NULL }, + { "airport", 16384, "airport symbol", &wp_airplane, NULL }, { "int", 16385, "intersection symbol", NULL, NULL }, { "ndb", 16386, "non-directional beacon symbol", NULL, NULL }, { "vor", 16387, "VHF omni-range symbol", NULL, NULL },