… | |
… | |
2105 | { |
2105 | { |
2106 | struct coord c; |
2106 | struct coord c; |
2107 | |
2107 | |
2108 | if (binmap_search_by_index(map, town, &msp->mr)) |
2108 | if (binmap_search_by_index(map, town, &msp->mr)) |
2109 | { |
2109 | { |
2110 | dbg(0, "search:mode=1\n"); |
2110 | //dbg(0, "search:mode=1\n"); |
2111 | msp->mode = 1; |
2111 | msp->mode = 1; |
2112 | } |
2112 | } |
2113 | else |
2113 | else |
2114 | { |
2114 | { |
2115 | if (item_coord_get(town, &c, 1)) |
2115 | if (item_coord_get(town, &c, 1)) |
2116 | { |
2116 | { |
2117 | if ((msp->mr = binmap_search_street_by_place(map, town, &c, &msp->ms))) |
2117 | if ((msp->mr = binmap_search_street_by_place(map, town, &c, &msp->ms))) |
2118 | { |
2118 | { |
2119 | dbg(0, "search:mode=2\n"); |
2119 | //dbg(0, "search:mode=2\n"); |
2120 | msp->mode = 2; |
2120 | msp->mode = 2; |
2121 | } |
2121 | } |
2122 | else |
2122 | else |
2123 | { |
2123 | { |
2124 | msp->mr = binmap_search_street_by_estimate(map, town, &c, &msp->ms); |
2124 | msp->mr = binmap_search_street_by_estimate(map, town, &c, &msp->ms); |
2125 | dbg(0, "search:mode=3\n"); |
2125 | //dbg(0, "search:mode=3\n"); |
2126 | msp->mode = 3; |
2126 | msp->mode = 3; |
2127 | } |
2127 | } |
2128 | } |
2128 | } |
2129 | } |
2129 | } |
2130 | map_rect_destroy_binfile(map_rec); |
2130 | map_rect_destroy_binfile(map_rec); |
… | |
… | |
2866 | { |
2866 | { |
2867 | while ((item = map_rect_get_item_binfile(mr)) == &busy_item) |
2867 | while ((item = map_rect_get_item_binfile(mr)) == &busy_item) |
2868 | { |
2868 | { |
2869 | ; |
2869 | ; |
2870 | } |
2870 | } |
|
|
2871 | |
2871 | if (item && item->type == type_map_information) |
2872 | if (item && item->type == type_map_information) |
2872 | { |
2873 | { |
2873 | if (binfile_attr_get(item->priv_data, attr_version, &attr)) |
2874 | if (binfile_attr_get(item->priv_data, attr_version, &attr)) |
2874 | { |
2875 | { |
2875 | m->map_version = attr.u.num; |
2876 | m->map_version = attr.u.num; |
… | |
… | |
2880 | m->map_release = g_strdup(attr.u.str); |
2881 | m->map_release = g_strdup(attr.u.str); |
2881 | dbg(0, "map_release=%s\n", m->map_release); |
2882 | dbg(0, "map_release=%s\n", m->map_release); |
2882 | } |
2883 | } |
2883 | if (m->url && binfile_attr_get(item->priv_data, attr_url, &attr)) |
2884 | if (m->url && binfile_attr_get(item->priv_data, attr_url, &attr)) |
2884 | { |
2885 | { |
2885 | dbg(0, "url config %s map %s\n", m->url, attr.u.str); |
2886 | //dbg(0, "url config %s map %s\n", m->url, attr.u.str); |
2886 | if (strcmp(m->url, attr.u.str)) |
2887 | if (strcmp(m->url, attr.u.str)) |
2887 | { |
2888 | { |
2888 | m->update_available = 1; |
2889 | m->update_available = 1; |
2889 | } |
2890 | } |
2890 | g_free(m->url); |
2891 | g_free(m->url); |
2891 | m->url = g_strdup(attr.u.str); |
2892 | m->url = g_strdup(attr.u.str); |
2892 | } |
2893 | } |
2893 | } |
2894 | } |
|
|
2895 | |
2894 | map_rect_destroy_binfile(mr); |
2896 | map_rect_destroy_binfile(mr); |
|
|
2897 | |
2895 | if (m->map_version >= 16) |
2898 | if (m->map_version >= 16) |
2896 | { |
2899 | { |
2897 | dbg(0, "Warning: This map is incompatible with your versionof ZANavi. Please update ZANavi.\n"); |
2900 | dbg(0, "Warning: This map is incompatible with your versionof ZANavi. Please update ZANavi.\n"); |
2898 | return 0; |
2901 | return 0; |
2899 | } |
2902 | } |