CMakeLists.txt

@@ -19,6 +19,6 @@ aux_source_directory(./src SRC_LIST)
 
 add_executable(${PROJECT_NAME} ${SRC_LIST} "${HEADERS}")
 
-target_link_libraries(${PROJECT_NAME} ${SOUP_LIBRARIES} ${JSON_LIBRARIES} m)
+target_link_libraries(${PROJECT_NAME} ${SOUP_LIBRARIES} ${JSON_LIBRARIES})
 
 install (TARGETS ${PROJECT_NAME} DESTINATION bin)

src/dijkstragraph.c

@@ -147,17 +147,6 @@ struct dijkstra_path *dijkstra_path_dup_shallow(struct dijkstra_path *path)
 	return dup;
 }
 
-dijkstra_cost dijkstra_get_weight_from_distance(struct dijkstra_node *node_a,
-						struct dijkstra_node *node_b)
-{
-	float dist;
-
-	dist = sqrt(pow(node_a->position.x - node_b->position.x, 2) +
-		    pow(node_a->position.y - node_b->position.y, 2));
-
-	return (dijkstra_cost) dist;
-}
-
 /*!
  * \brief dijkstra_path_new creates a new dijkstra_path between two nodes.
  * \param name the name of the path (pointer is not copied and must stay valid!)
@@ -173,11 +162,7 @@ struct dijkstra_path *dijkstra_path_new(char *name,
 	path = malloc(sizeof(*path));
 	if (path) {
 		path->name = name;
-		if (path->weight == DIJKSTRA_WEIGHT_AUTO)
+		path->weight = weight;
-			path->weight = dijkstra_get_weight_from_distance(source,
-									 destination);
-		else
-			path->weight = weight;
 
 		dijkstra_connect_nodes_to_path(source, destination, path);
 	}
@@ -219,6 +204,8 @@ int dijkstra_path_intersect(struct dijkstra_solver *solver,
 	float s1_x, s1_y, s2_x, s2_y;
 	float s, t;
 
+	int is_new;
+
 	if (!path_a || !path_b)
 		return -1;
 

src/dijkstragraph.h

@@ -3,8 +3,6 @@
 
 #include <glib.h>
 
-#define DIJKSTRA_WEIGHT_AUTO (-1)
-
 typedef int dijkstra_cost;
 
 struct dijkstra_solver {

src/geojson.c

@@ -83,8 +83,7 @@ int add_geojson_to_dijkstra(struct dijkstra_solver *solver,
 								dijkstra_path_new_to_list(solver,
 											  x_last, y_last,
 											  x, y,
-											  name,
+											  name, 1);
-											  DIJKSTRA_WEIGHT_AUTO);
 							}
 
 							x_last = x;