diff options
| -rw-r--r-- | docs/source/development/reference/functions.rst | 6 | ||||
| -rw-r--r-- | docs/source/operations/conversions/unitconvert.rst | 10 | ||||
| -rw-r--r-- | src/conversions/unitconvert.cpp | 19 | ||||
| -rw-r--r-- | src/proj.h | 4 | ||||
| -rw-r--r-- | test/unit/gie_self_tests.cpp | 31 |
5 files changed, 58 insertions, 12 deletions
diff --git a/docs/source/development/reference/functions.rst b/docs/source/development/reference/functions.rst index 0e3eeada..7a6b37a1 100644 --- a/docs/source/development/reference/functions.rst +++ b/docs/source/development/reference/functions.rst @@ -880,9 +880,15 @@ Setting custom I/O functions .. doxygenfunction:: proj_context_set_sqlite3_vfs_name :project: doxygen_api +.. doxygenfunction:: proj_context_set_file_finder + :project: doxygen_api + .. doxygenfunction:: proj_context_set_search_paths :project: doxygen_api +.. doxygenfunction:: proj_context_set_ca_bundle_path + :project: doxygen_api + Network related functionality ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ diff --git a/docs/source/operations/conversions/unitconvert.rst b/docs/source/operations/conversions/unitconvert.rst index f1488d9a..13ca9228 100644 --- a/docs/source/operations/conversions/unitconvert.rst +++ b/docs/source/operations/conversions/unitconvert.rst @@ -158,6 +158,16 @@ Time units In the table below all time units supported by PROJ are listed. + .. note:: + + When converting time units from a date-only format (`yyyymmdd`), PROJ + assumes a time value of 00:00 midnight. When converting time units + to a date-only format, PROJ rounds to the *nearest* date at 00:00 + midnight. That is, any time values less than 12:00 noon will round to + 00:00 on the same day. Time values greater than or equal to 12:00 noon + will round to 00:00 on the following day. + + +--------------+-----------------------------+ | Label | Name | +==============+=============================+ diff --git a/src/conversions/unitconvert.cpp b/src/conversions/unitconvert.cpp index d584d93f..991eb2e0 100644 --- a/src/conversions/unitconvert.cpp +++ b/src/conversions/unitconvert.cpp @@ -252,21 +252,22 @@ static double yyyymmdd_to_mjd(double yyyymmdd) { /***********************************************************************/ static double mjd_to_yyyymmdd(double mjd) { /************************************************************************ - Date given in YYYY-MM-DD format. + Date returned in YYYY-MM-DD format. ************************************************************************/ - double mjd_iter = 14 + 31; - int year = 1859, month=0, day=0; + unsigned int date_iter = 14 + 31; + unsigned int year = 1859, month = 0, day = 0; + unsigned int date = (int) lround(mjd); - for (; mjd >= mjd_iter; year++) { - mjd_iter += days_in_year(year); + for (; date >= date_iter; year++) { + date_iter += days_in_year(year); } year--; - mjd_iter -= days_in_year(year); + date_iter -= days_in_year(year); - for (month=1; mjd_iter + days_in_month(year, month) <= mjd; month++) - mjd_iter += days_in_month(year, month); + for (month=1; date_iter + days_in_month(year, month) <= date; month++) + date_iter += days_in_month(year, month); - day = (int)(mjd - mjd_iter + 1); + day = date - date_iter + 1; return year*10000.0 + month*100.0 + day; } @@ -379,12 +379,12 @@ PJ_CONTEXT PROJ_DLL *proj_context_clone (PJ_CONTEXT *ctx); /** Callback to resolve a filename to a full path */ typedef const char* (*proj_file_finder) (PJ_CONTEXT *ctx, const char*, void* user_data); +/*! @endcond */ void PROJ_DLL proj_context_set_file_finder(PJ_CONTEXT *ctx, proj_file_finder finder, void* user_data); -/*! @endcond */ void PROJ_DLL proj_context_set_search_paths(PJ_CONTEXT *ctx, int count_paths, const char* const* paths); -/*! @cond Doxygen_Suppress */ void PROJ_DLL proj_context_set_ca_bundle_path(PJ_CONTEXT *ctx, const char *path); +/*! @cond Doxygen_Suppress */ void PROJ_DLL proj_context_use_proj4_init_rules(PJ_CONTEXT *ctx, int enable); int PROJ_DLL proj_context_get_use_proj4_init_rules(PJ_CONTEXT *ctx, int from_legacy_code_path); diff --git a/test/unit/gie_self_tests.cpp b/test/unit/gie_self_tests.cpp index 71df8fe1..5c14d747 100644 --- a/test/unit/gie_self_tests.cpp +++ b/test/unit/gie_self_tests.cpp @@ -618,7 +618,6 @@ static void test_time(const char *args, double tol, double t_in, double t_exp) { // --------------------------------------------------------------------------- TEST(gie, unitconvert_selftest) { - char args1[] = "+proj=unitconvert +t_in=decimalyear +t_out=decimalyear"; double in1 = 2004.25; @@ -641,6 +640,36 @@ TEST(gie, unitconvert_selftest) { test_time(args5, 1e-6, in5, in5); } +static void test_date(const char *args, double tol, double t_in, double t_exp) { + PJ_COORD in, out; + PJ *P = proj_create(PJ_DEFAULT_CTX, args); + + ASSERT_TRUE(P != 0); + + in = proj_coord(0.0, 0.0, 0.0, t_in); + + out = proj_trans(P, PJ_FWD, in); + EXPECT_NEAR(out.xyzt.t, t_exp, tol); + + proj_destroy(P); + + proj_log_level(NULL, PJ_LOG_NONE); +} + +TEST(gie, unitconvert_selftest_date) { + char args[] = "+proj=unitconvert +t_in=decimalyear +t_out=yyyymmdd"; + test_date(args, 1e-6, 2022.0027, 20220102); + test_date(args, 1e-6, 1990.0, 19900101); + test_date(args, 1e-6, 2004.1612, 20040229); + test_date(args, 1e-6, 1899.999, 19000101); + + strcpy(&args[18], "+t_in=yyyymmdd +t_out=decimalyear"); + test_date(args, 1e-6, 20220102, 2022.0027397); + test_date(args, 1e-6, 19900101, 1990.0); + test_date(args, 1e-6, 20040229, 2004.1612022); + test_date(args, 1e-6, 18991231, 1899.9972603); +} + static const char tc32_utm32[] = { " +proj=horner" " +ellps=intl" |