city_generator2

commit d1e5fe1489fb341013b3a7a21157a3894c0cc2f3
parent 942645ffc51ca1b49ebff77b4cfd13e15a92f22c
Author: Christophe Coustet <christophe.coustet@meso-star.com>
Date:   Thu,  9 Mar 2023 17:50:24 +0100

Adapt to API changes in star-cpr

Diffstat:
M
src/cg_city.c
 | 
4
++--
M
src/cg_city.h
 | 
2
+-

2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/cg_city.c b/src/cg_city.c
@@ -73,7 +73,7 @@ error:
   ERR(htable_building_set(&(Building1)->close_buildings, &(Building2), &tmp__)); \
 }
 
-int collinear_segments
+int overlapping_segments
   (struct scpr_callback_segment* segment1,
    struct scpr_callback_segment* segment2,
    void* ctx__)
@@ -328,7 +328,7 @@ create_city
   ctx.dump_footprints_on_error = city->dump_footprints_on_error;
   ctx.keep_running_on_errors = city->keep_running_on_errors;
   callbacks.simple_intersection = simple_intersection;
-  callbacks.collinear_segments = collinear_segments;
+  callbacks.overlapping_segments = overlapping_segments;
   ERR(scpr_intersector_check(overlapping_intersector, &callbacks, &ctx));
   ctx.search_type = CLOSE_PROXIMITY;
   ctx.intersection_found = NULL; /* Not an error in this case */
diff --git a/src/cg_city.h b/src/cg_city.h
@@ -107,7 +107,7 @@ struct callback_ctx {
   int keep_running_on_errors;
 };
 
-int collinear_segments
+int overlapping_segments
   (struct scpr_callback_segment* segment1,
    struct scpr_callback_segment* segment2,
    void* ctx__);