rerwite projection interrface to not break the current implementation

2 files changed, 128 insertions, 43 deletions

diff --git a/src/lib/geo/geo.c b/src/lib/geo/geo.c
index 6cbf74e46..53e601fad 100644
--- a/src/lib/geo/geo.c
+++ b/src/lib/geo/geo.c
@@ -57,50 +57,77 @@
 
 static struct map_projection_reference_s mp_ref = {0};
 
-__EXPORT bool map_projection_initialized()
+__EXPORT bool map_projection_global_initialized()
 {
-	return mp_ref.init_done;
+	return map_projection_initialized(&mp_ref);
 }
 
-__EXPORT uint64_t map_projection_timestamp()
+__EXPORT bool map_projection_initialized(const struct map_projection_reference_s *ref)
 {
-	return mp_ref.timestamp;
+	return ref->init_done;
 }
 
-__EXPORT int map_projection_init(double lat_0, double lon_0, uint64_t timestamp) //lat_0, lon_0 are expected to be in correct format: -> 47.1234567 and not 471234567
+__EXPORT uint64_t map_projection_global_timestamp()
 {
-	if (strcmp("navigator", getprogname() == 0)) {
-
-		mp_ref.lat = lat_0 / 180.0 * M_PI;
-		mp_ref.lon = lon_0 / 180.0 * M_PI;
+	return map_projection_timestamp(&mp_ref);
+}
 
-		mp_ref.sin_lat = sin(mp_ref.lat);
-		mp_ref.cos_lat = cos(mp_ref.lat);
+__EXPORT uint64_t map_projection_timestamp(const struct map_projection_reference_s *ref)
+{
+	return ref->timestamp;
+}
 
-		mp_ref.timestamp = timestamp;
-		mp_ref.init_done = true;
+__EXPORT int map_projection_global_init(double lat_0, double lon_0, uint64_t timestamp) //lat_0, lon_0 are expected to be in correct format: -> 47.1234567 and not 471234567
+{
+	if (strcmp("navigator", getprogname() == 0)) {
 
-		return 0;
+		return map_projection_init(&mp_ref, lat_0, lon_0, timestamp);
 	} else {
 		return -1;
 	}
 }
 
-__EXPORT int map_projection_reference(double *ref_lat, double *ref_lon)
+__EXPORT int map_projection_init(struct map_projection_reference_s *ref, double lat_0, double lon_0, uint64_t timestamp) //lat_0, lon_0 are expected to be in correct format: -> 47.1234567 and not 471234567
 {
-	if (!map_projection_initialized()) {
+
+	ref->lat = lat_0 / 180.0 * M_PI;
+	ref->lon = lon_0 / 180.0 * M_PI;
+
+	ref->sin_lat = sin(ref->lat);
+	ref->cos_lat = cos(ref->lat);
+
+	ref->timestamp = timestamp;
+	ref->init_done = true;
+
+	return 0;
+}
+
+__EXPORT int map_projection_global_reference(double *ref_lat, double *ref_lon)
+{
+	return map_projection_reference_s(&mp_ref, ref_lat, ref_lon);
+}
+
+__EXPORT int map_projection_reference(const struct map_projection_reference_s *ref, double *ref_lat, double *ref_lon)
+{
+	if (!map_projection_initialized(ref)) {
 		return -1;
 	}
 
-	*ref_lat = mp_ref.lat;
-	*ref_lon = mp_ref.lon;
+	*ref_lat = ref->lat;
+	*ref_lon = ref->lon;
 
 	return 0;
 }
 
-__EXPORT int map_projection_project(double lat, double lon, float *x, float *y)
+__EXPORT int map_projection_global_project(double lat, double lon, float *x, float *y)
+{
+	return map_projection_project(&mp_ref, lat, lon, x, y);
+
+}
+
+__EXPORT int map_projection_project(const struct map_projection_reference_s *ref, double lat, double lon, float *x, float *y)
 {
-	if (!map_projection_initialized()) {
+	if (!map_projection_initialized(ref)) {
 		return -1;
 	}
 
@@ -109,20 +136,25 @@ __EXPORT int map_projection_project(double lat, double lon, float *x, float *y)
 
 	double sin_lat = sin(lat_rad);
 	double cos_lat = cos(lat_rad);
-	double cos_d_lon = cos(lon_rad - mp_ref.lon);
+	double cos_d_lon = cos(lon_rad - ref->lon);
 
-	double c = acos(mp_ref.sin_lat * sin_lat + mp_ref.cos_lat * cos_lat * cos_d_lon);
+	double c = acos(ref->sin_lat * sin_lat + ref->cos_lat * cos_lat * cos_d_lon);
 	double k = (c == 0.0) ? 1.0 : (c / sin(c));
 
-	*x = k * (mp_ref.cos_lat * sin_lat - mp_ref.sin_lat * cos_lat * cos_d_lon) * CONSTANTS_RADIUS_OF_EARTH;
-	*y = k * cos_lat * sin(lon_rad - mp_ref.lon) * CONSTANTS_RADIUS_OF_EARTH;
+	*x = k * (ref->cos_lat * sin_lat - ref->sin_lat * cos_lat * cos_d_lon) * CONSTANTS_RADIUS_OF_EARTH;
+	*y = k * cos_lat * sin(lon_rad - ref->lon) * CONSTANTS_RADIUS_OF_EARTH;
 
 	return 0;
 }
 
-__EXPORT int map_projection_reproject(float x, float y, double *lat, double *lon)
+__EXPORT int map_projection_global_reproject(float x, float y, double *lat, double *lon)
+{
+	map_projection_project(&mp_ref, x, y, lat, lon);
+}
+
+__EXPORT int map_projection_reproject(const struct map_projection_reference_s *ref, float x, float y, double *lat, double *lon)
 {
-	if (!map_projection_initialized()) {
+	if (!map_projection_initialized(ref)) {
 		return -1;
 	}
 
@@ -136,12 +168,12 @@ __EXPORT int map_projection_reproject(float x, float y, double *lat, double *lon
 	double lon_rad;
 
 	if (c != 0.0) {
-		lat_rad = asin(cos_c * mp_ref.sin_lat + (x_rad * sin_c * mp_ref.cos_lat) / c);
-		lon_rad = (mp_ref.lon + atan2(y_rad * sin_c, c * mp_ref.cos_lat * cos_c - x_rad * mp_ref.sin_lat * sin_c));
+		lat_rad = asin(cos_c * ref->sin_lat + (x_rad * sin_c * ref->cos_lat) / c);
+		lon_rad = (ref->lon + atan2(y_rad * sin_c, c * ref->cos_lat * cos_c - x_rad * ref->sin_lat * sin_c));
 
 	} else {
-		lat_rad = mp_ref.lat;
-		lon_rad = mp_ref.lon;
+		lat_rad = ref->lat;
+		lon_rad = ref->lon;
 	}
 
 	*lat = lat_rad * 180.0 / M_PI;
diff --git a/src/lib/geo/geo.h b/src/lib/geo/geo.h
index b0f8d6bc4..990f79194 100644
--- a/src/lib/geo/geo.h
+++ b/src/lib/geo/geo.h
@@ -76,45 +76,98 @@ struct map_projection_reference_s {
 };
 
 /**
- * Initializes the map transformation.
+ * Checks if global projection was initialized
  * @return true if map was initialized before, false else
  */
-__EXPORT bool map_projection_initialized();
+__EXPORT bool map_projection_global_initialized();
 
+/**
+ * Checks if projection given as argument was initialized
+ * @return true if map was initialized before, false else
+ */
+__EXPORT bool map_projection_initialized(const struct map_projection_reference_s *ref);
 
 /**
- * Initializes the map transformation.
+ * Get the timestamp of the global map projection
  * @return the timestamp of the map_projection
  */
-__EXPORT uint64_t map_projection_timestamp();
+__EXPORT uint64_t map_projection_global_timestamp();
 
 /**
- * Writes the reference values to ref_lat and ref_lon
+ * Get the timestamp of the map projection given by the argument
+ * @return the timestamp of the map_projection
+ */
+__EXPORT uint64_t map_projection_timestamp(const struct map_projection_reference_s *ref);
+
+/**
+ * Writes the reference values of the global projection to ref_lat and ref_lon
  * @return 0 if map_projection_init was called before, -1 else
  */
-__EXPORT int map_projection_reference(double *ref_lat, double *ref_lon);
+__EXPORT int map_projection_global_reference(double *ref_lat, double *ref_lon);
+
+/**
+ * Writes the reference values of the projection given by the argument to ref_lat and ref_lon
+ * @return 0 if map_projection_init was called before, -1 else
+ */
+__EXPORT int map_projection_reference(const struct map_projection_reference_s *ref, double *ref_lat, double *ref_lon);
+
+/**
+ * Initializes the global map transformation.
+ *
+ * Initializes the transformation between the geographic coordinate system and
+ * the azimuthal equidistant plane
+ * @param lat in degrees (47.1234567°, not 471234567°)
+ * @param lon in degrees (8.1234567°, not 81234567°)
+ */
+__EXPORT int map_projection_global_init(double lat_0, double lon_0, uint64_t timestamp);
 
 /**
- * Initializes the map transformation.
+ * Initializes the map transformation given by the argument.
  *
- * Initializes the transformation between the geographic coordinate system and the azimuthal equidistant plane
+ * Initializes the transformation between the geographic coordinate system and
+ * the azimuthal equidistant plane
  * @param lat in degrees (47.1234567°, not 471234567°)
  * @param lon in degrees (8.1234567°, not 81234567°)
  */
-__EXPORT int map_projection_init(double lat_0, double lon_0, uint64_t timestamp);
+__EXPORT int map_projection_init(struct map_projection_reference_s *ref, double lat_0, double lon_0, uint64_t timestamp);
 
 /**
- * Transforms a point in the geographic coordinate system to the local azimuthal equidistant plane
+ * Transforms a point in the geographic coordinate system to the local
+ * azimuthal equidistant plane using the global projection
+ * @param x north
+ * @param y east
+ * @param lat in degrees (47.1234567°, not 471234567°)
+ * @param lon in degrees (8.1234567°, not 81234567°)
+ * @return 0 if map_projection_init was called before, -1 else
+ */
+__EXPORT int map_projection_global_project(double lat, double lon, float *x, float *y);
+
+
+ /* Transforms a point in the geographic coordinate system to the local
+  * azimuthal equidistant plane using the projection given by the argument
+ * @param x north
+ * @param y east
+ * @param lat in degrees (47.1234567°, not 471234567°)
+ * @param lon in degrees (8.1234567°, not 81234567°)
+ * @return 0 if map_projection_init was called before, -1 else
+ */
+__EXPORT int map_projection_project(const struct map_projection_reference_s *ref, double lat, double lon, float *x, float *y);
+
+/**
+ * Transforms a point in the local azimuthal equidistant plane to the
+ * geographic coordinate system using the global projection
+ *
  * @param x north
  * @param y east
  * @param lat in degrees (47.1234567°, not 471234567°)
  * @param lon in degrees (8.1234567°, not 81234567°)
  * @return 0 if map_projection_init was called before, -1 else
  */
-__EXPORT int map_projection_project(double lat, double lon, float *x, float *y);
+__EXPORT int map_projection_global_reproject(float x, float y, double *lat, double *lon);
 
 /**
- * Transforms a point in the local azimuthal equidistant plane to the geographic coordinate system
+ * Transforms a point in the local azimuthal equidistant plane to the
+ * geographic coordinate system using the projection given by the argument
  *
  * @param x north
  * @param y east
@@ -122,7 +175,7 @@ __EXPORT int map_projection_project(double lat, double lon, float *x, float *y);
  * @param lon in degrees (8.1234567°, not 81234567°)
  * @return 0 if map_projection_init was called before, -1 else
  */
-__EXPORT int map_projection_reproject(float x, float y, double *lat, double *lon);
+__EXPORT int map_projection_reproject(const struct map_projection_reference_s *ref, float x, float y, double *lat, double *lon);
 
 /**
  * Returns the distance to the next waypoint in meters.