… | |
… | |
114 | return 80; |
114 | return 80; |
115 | case type_street_n_lanes: |
115 | case type_street_n_lanes: |
116 | return 120; |
116 | return 120; |
117 | case type_highway_land: |
117 | case type_highway_land: |
118 | return 120; |
118 | return 120; |
|
|
119 | #if 0 |
119 | case type_ramp: |
120 | case type_ramp: |
120 | return 40; |
121 | return 40; |
|
|
122 | #endif |
121 | case type_roundabout: |
123 | case type_roundabout: |
122 | return 10; |
124 | return 10; |
123 | case type_ferry: |
125 | case type_ferry: |
124 | return 40; |
126 | return 40; |
125 | default: |
127 | default: |
… | |
… | |
175 | const struct edge_hash_item *itm_b = b; |
177 | const struct edge_hash_item *itm_b = b; |
176 | return (itm_a->first == itm_b->first && itm_a->last == itm_b->last); |
178 | return (itm_a->first == itm_b->first && itm_a->last == itm_b->last); |
177 | } |
179 | } |
178 | |
180 | |
179 | static void ch_generate_ddsg(FILE *in, FILE *ref, FILE *idx, FILE *ddsg) |
181 | static void ch_generate_ddsg(FILE *in, FILE *ref, FILE *idx, FILE *ddsg) |
|
|
182 | { |
|
|
183 | } |
|
|
184 | |
|
|
185 | static void ch_generate_ddsg_XX(FILE *in, FILE *ref, FILE *idx, FILE *ddsg) |
180 | { |
186 | { |
181 | GHashTable *hash = coord_hash_new(); |
187 | GHashTable *hash = coord_hash_new(); |
182 | struct item_bin *ib; |
188 | struct item_bin *ib; |
183 | int nodes = 0, edges = 0; |
189 | int nodes = 0, edges = 0; |
184 | |
190 | |
… | |
… | |
493 | FILE **graphfiles = g_alloca(sizeof(FILE*) * (ch_levels + 1)); |
499 | FILE **graphfiles = g_alloca(sizeof(FILE*) * (ch_levels + 1)); |
494 | FILE *ref; |
500 | FILE *ref; |
495 | struct item_id id; |
501 | struct item_id id; |
496 | int nodeid = 0; |
502 | int nodeid = 0; |
497 | |
503 | |
|
|
504 | fprintf(stderr, "-----:ch_assemble_map:-----\n"); |
|
|
505 | |
498 | info.write = 1; |
506 | info.write = 1; |
499 | info.maxlen = zip_get_maxnamelen(zip_info); |
507 | info.maxlen = zip_get_maxnamelen(zip_info); |
500 | info.suffix = suffix; |
508 | info.suffix = suffix; |
501 | info.tiles_list = NULL; |
509 | info.tiles_list = NULL; |
502 | info.tilesdir_out = NULL; |
510 | info.tilesdir_out = NULL; |