Fix:#1218 #1219

OLFDB · 2023-01-14T18:29:17Z

Fixing the bookmark issue and making UTM coordinates working.

Examples:
utm32U: 674499.306 5328063.675
utmref32UPU:74499.306 28063.675

Added coordinates.rst taking over the wiki page and adding description for UTM coordinates.

Merge trunk

Missing opening bracket.

Needs AND not OR when combining if clauses.

This reverts commit fd91e40.

This reverts commit be87cd3.

Fix for navit-gps#1218 Crash when setting first destination Changes to make UTM coordinates working

Allow capital letters in UTM coordinates.

OLFDB · 2023-01-14T18:37:13Z

@jkoan: Could you link the coordinates.rst from configuration.rst? Don't know how to do that.

jkoan · 2023-01-17T05:33:05Z

navit/projection.c

+                printf("invalid zone field '%c' in '%s'",zone_field,name);
                return projection_none;
            }
            i-=12;
-            dbg(lvl_debug,"zone_field %d",i);
+            printf("zone_field %d",i);
            baserow=i*887.6/100;
            utm_offset->x=zone*1000000;
            i=utmref_letter(square_x);
            utm_offset->x+=((i%8)+1)*100000;
            i=utmref_letter(square_y);
-            dbg(lvl_debug,"baserow %d",baserow);
+            printf("baserow %d",baserow);
            if (!(zone % 2))
                i-=5;
-            dbg(lvl_debug,"i=%d",i);
+            printf("i=%d",i);


why printf instead of dbg?

This was a leftover from the standalone test app I did. Changed to dbg.

jkoan · 2023-01-17T05:33:53Z

navit/coord.c

+		else {
+			str_pro = projection_from_name(proj, &offset);
+			if (str_pro == projection_none) {
+				dbg(lvl_debug, "Unknown projection: %s\n", proj);


why change from error to debug? error seems to be fitting here

Changed to error again.

jkoan · 2023-01-17T05:37:30Z

navit/coord.c

@@ -39,6 +39,9 @@
 * @returns the coordinate
 */

+int projection_enum_size[projection_enumsize];


jkoan · 2023-01-17T05:38:19Z

navit/projection.h

+    projection_garmin,    /*!< Garmin projection */
+    projection_screen,    /*!< Screen projection */
+    projection_utm,        /*!< UTM projection */
+	projection_enumsize


as the above is unused this isn't needed as well?

Removed projection_enumsize.

jkoan · 2023-01-17T05:42:10Z

navit/coord.c

+#define PROJASSTRING(x) (x==0?"projection_none":x==1?"projection_mg":x==2?"projection_garmin":x==3?"projection_screen":x==4?"projection_utm":"UNKNOWN")
+


Isn't this what projection_to_name is doing already?

Yes. Removed the macro and used projection_to_name.

jkoan · 2023-01-17T15:34:35Z

navit/coord.c

+		dbg(lvl_debug, "str='%s' x=%f y=%f  c=%d\n", str, lng, lat, ret);
+		dbg(lvl_debug, "rest='%s'\n", str + ret);


Why all the line returns? dbg should add those itself?

This is original code. It is shown here as there were spaces inserted by eclipse formatter.

jkoan · 2023-01-20T10:37:38Z

@jkoan: Could you link the coordinates.rst from configuration.rst? Don't know how to do that.

Yep, that's possible like here with :doc:`path/file_without_suffix`

OLFDB · 2023-01-21T13:46:07Z

There was an issue with using the format '4808.2356 N 1134.5252 E' I have made testcases for the coordinate formats listed below. 65535 means the struct coord *result has not changed, so no coordinates have been set.

Testing all allowed coordinate types and conversions:

Testcases

Longitude / Latitude in decimal degrees to projection_none

enter('-33.355300,6.334000',none,0x7ff7bfefef90)
str='-33.355300,6.334000' x=6.334000 y=-33.355300 c=19
rest=''
ret=19 delta=0 ret_str=''

length: 19

X: 65535
Y: 65535

Longitude / Latitude in decimal degrees to projection_mg

enter('-33.355300,6.334000',mg,0x7ff7bfefef90)
str='-33.355300,6.334000' x=6.334000 y=-33.355300 c=19
rest=''
ret=19 delta=0 ret_str=''

length: 19

X: 704308
Y: -3938147

Longitude / Latitude in decimal degrees to projection_garmin

enter('-33.355300,6.334000',garmin,0x7ff7bfefef90)
str='-33.355300,6.334000' x=6.334000 y=-33.355300 c=19
rest=''
ret=19 delta=0 ret_str=''

length: 19

X: 295185
Y: -1554469

Longitude / Latitude in decimal degrees to projection_utm

enter('-33.355300,6.334000',utm,0x7ff7bfefef90)
str='-33.355300,6.334000' x=6.334000 y=-33.355300 c=19
rest=''
ret=19 delta=0 ret_str=''

length: 19

X: 65535
Y: 65535

Latitude / Longitude from Google Maps to projection_none

enter('52.678595, 13.572752',none,0x7ff7bfefef90)
str='52.678595, 13.572752' x=13.572752 y=52.678595 c=20
rest=''
ret=20 delta=0 ret_str=''

length: 20

X: 65535
Y: 65535

Latitude / Longitude from Google Maps to projection_mg

enter('52.678595, 13.572752',mg,0x7ff7bfefef90)
str='52.678595, 13.572752' x=13.572752 y=52.678595 c=20
rest=''
ret=20 delta=0 ret_str=''

length: 20

X: 1509221
Y: 6916019

Latitude / Longitude from Google Maps to projection_garmin

enter('52.678595, 13.572752',garmin,0x7ff7bfefef90)
str='52.678595, 13.572752' x=13.572752 y=52.678595 c=20
rest=''
ret=20 delta=0 ret_str=''

length: 20

X: 632536
Y: 2455000

Latitude / Longitude from Google Maps to projection_utm

enter('52.678595, 13.572752',utm,0x7ff7bfefef90)
str='52.678595, 13.572752' x=13.572752 y=52.678595 c=20
rest=''
ret=20 delta=0 ret_str=''

length: 20

X: 65535
Y: 65535

Latitude / Longitude in degrees and minutes to projection_none

enter('4808.2356 N 1134.5252 E',none,0x7ff7bfefef90)
str='4808.2356 N 1134.5252 E'
args=4
lat=4808.235600 N lon=1134.525200 E
projection=none str_pro=0 projection_none=0
transform_from_geo(48.137260,11.575420)
result 0xffff,0xffff
str='4808.2356 N 1134.5252 E' x=34.525200 ns=N y=8.235600 ew=E c=23
rest=''
ret=23 delta=0 ret_str=''

length: 23

X: 65535
Y: 65535

Latitude / Longitude in degrees and minutes to projection_mg

enter('4808.2356 N 1134.5252 E',mg,0x7ff7bfefef90)
str='4808.2356 N 1134.5252 E'
args=4
lat=4808.235600 N lon=1134.525200 E
projection=mg str_pro=0 projection_none=0
transform_from_geo(48.137260,11.575420)
result 0x13a3d7,0x5d6d6d
str='4808.2356 N 1134.5252 E' x=34.525200 ns=N y=8.235600 ew=E c=23
rest=''
ret=23 delta=0 ret_str=''

length: 23

X: 1287127
Y: 6122861

Latitude / Longitude in degrees and minutes to projection_garmin

enter('4808.2356 N 1134.5252 E',garmin,0x7ff7bfefef90)
str='4808.2356 N 1134.5252 E'
args=4
lat=4808.235600 N lon=1134.525200 E
projection=garmin str_pro=0 projection_none=0
transform_from_geo(48.137260,11.575420)
result 0x83b3d,0x223b1e
str='4808.2356 N 1134.5252 E' x=34.525200 ns=N y=8.235600 ew=E c=23
rest=''
ret=23 delta=0 ret_str=''

length: 23

X: 539453
Y: 2243358

Latitude / Longitude in degrees and minutes to projection_utm

enter('4808.2356 N 1134.5252 E',utm,0x7ff7bfefef90)
str='4808.2356 N 1134.5252 E'
args=4
lat=4808.235600 N lon=1134.525200 E
projection=utm str_pro=0 projection_none=0
transform_from_geo(48.137260,11.575420)
result 0xffff,0xffff
str='4808.2356 N 1134.5252 E' x=34.525200 ns=N y=8.235600 ew=E c=23
rest=''
ret=23 delta=0 ret_str=''

length: 23

X: 65535
Y: 65535

Mercator coordinates to projection_none

enter('0x13a3d7 0x5d6d6d',none,0x7ff7bfefef90)
str='0x13a3d7 0x5d6d6d' x=0x13a3d7 y=0x5d6d6d c=17
rest=''
ret=17 delta=0 ret_str=''

length: 17

X: 1287127
Y: 6122861

Mercator coordinates to projection_mg

enter('0x13a3d7 0x5d6d6d',mg,0x7ff7bfefef90)
str='0x13a3d7 0x5d6d6d' x=0x13a3d7 y=0x5d6d6d c=17
rest=''
ret=17 delta=0 ret_str=''

length: 17

X: 1287127
Y: 6122861

Mercator coordinates to projection_garmin

enter('0x13a3d7 0x5d6d6d',garmin,0x7ff7bfefef90)
str='0x13a3d7 0x5d6d6d' x=0x13a3d7 y=0x5d6d6d c=17
rest=''
ret=17 delta=0 ret_str=''

length: 17

X: 539453
Y: 2243358

Mercator coordinates to projection_utm

enter('0x13a3d7 0x5d6d6d',utm,0x7ff7bfefef90)
str='0x13a3d7 0x5d6d6d' x=0x13a3d7 y=0x5d6d6d c=17
rest=''
ret=17 delta=0 ret_str=''

length: 17

X: 1287127
Y: 6122861

Mercator coordinates with 'mg:' to projection_none

enter('mg: 0x13a3d7 0x5d6d6d',none,0x7ff7bfefef90)
projection=mg
str='0x13a3d7 0x5d6d6d' x=0x13a3d7 y=0x5d6d6d c=17
rest=''
ret=21 delta=4 ret_str=''

length: 21

X: 1287127
Y: 6122861

Mercator coordinates with 'mg:' to projection_mg

enter('mg: 0x13a3d7 0x5d6d6d',mg,0x7ff7bfefef90)
projection=mg
str='0x13a3d7 0x5d6d6d' x=0x13a3d7 y=0x5d6d6d c=17
rest=''
ret=21 delta=4 ret_str=''

length: 21

X: 1287127
Y: 6122861

Mercator coordinates with 'mg:' to projection_garmin

enter('mg: 0x13a3d7 0x5d6d6d',garmin,0x7ff7bfefef90)
projection=mg
str='0x13a3d7 0x5d6d6d' x=0x13a3d7 y=0x5d6d6d c=17
rest=''
ret=21 delta=4 ret_str=''

length: 21

X: 539453
Y: 2243358

Mercator coordinates with 'mg:' to projection_utm

enter('mg: 0x13a3d7 0x5d6d6d',utm,0x7ff7bfefef90)
projection=mg
str='0x13a3d7 0x5d6d6d' x=0x13a3d7 y=0x5d6d6d c=17
rest=''
ret=21 delta=4 ret_str=''

length: 21

X: 1287127
Y: 6122861

UTM coordinates to projection_none

enter('utm32N: 674661 5328114',none,0x7ff7bfefef90)
projection=utm32N
ret=23 delta=8 ret_str=''

length: 23

X: 32674661
Y: 5328114

UTM coordinates to projection_mg

enter('utm32N: 674661 5328114',mg,0x7ff7bfefef90)
projection=utm32N
ret=23 delta=8 ret_str=''

length: 23

X: 1261533
Y: 6113717

UTM coordinates to projection_garmin

enter('utm32N: 674661 5328114',garmin,0x7ff7bfefef90)
projection=utm32N
ret=23 delta=8 ret_str=''

length: 23

X: 528726
Y: 2240800

UTM coordinates to projection_utm

enter('utm32N: 674661 5328114',utm,0x7ff7bfefef90)
projection=utm32N
ret=23 delta=8 ret_str=''

length: 23

X: 32674661
Y: 5328114

UTMRef coordinates to projection_none

enter('utmref32UMD:74 03',none,0x7ff7bfefef90)
projection=utmref32UMD
zone_field 6baserow 53i=-2ret=17 delta=12 ret_str=''

length: 17

X: 32400074
Y: 5800003

UTMRef coordinates to projection_mg

enter('utmref32UMD:74 03',mg,0x7ff7bfefef90)
projection=utmref32UMD
zone_field 6baserow 53i=-2ret=17 delta=12 ret_str=''

length: 17

X: 837654
Y: 6854379

UTMRef coordinates to projection_garmin

enter('utmref32UMD:74 03',garmin,0x7ff7bfefef90)
projection=utmref32UMD
zone_field 6baserow 53i=-2ret=17 delta=12 ret_str=''

length: 17

X: 351072
Y: 2439277

UTMRef coordinates to projection_utm

enter('utmref32UMD:74 03',utm,0x7ff7bfefef90)
projection=utmref32UMD
zone_field 6baserow 53i=-2ret=17 delta=12 ret_str=''

length: 17

X: 32400074
Y: 5800003

jkoan · 2023-01-31T16:04:33Z

docs/configuration/coordinates.rst

@@ -0,0 +1,84 @@
+## Coordinates in Navit


I just happen now to see that you used markdown instead of reStructuredText which results in no headline found here and not format here

Just updated coordinates.rst to be in rst format (at least I choose export reStructuredText in Typora to create it). Added some lines for Google Maps coordinates as well.

jkoan · 2023-01-31T16:06:15Z

There was an issue with using the format '4808.2356 N 1134.5252 E' I have made testcases for the coordinate formats listed below. 65535 means the struct coord *result has not changed, so no coordinates have been set.

Testing all allowed coordinate types and conversions:

[...]

I will take you tests, convert them into unittests and check the before and after. Afterwards i will merge this. The code itself looks valid :-) thx

AgentSmith0 · 2023-03-23T14:38:04Z

Any updates on merging this?

mvglasow · 2023-03-24T12:24:39Z

docs/configuration/coordinates.rst

+This format is used internally by Navit, but is probably not very useful
+for other purposes.
+
+Google Maps Format


That makes it sound like Google invented this format. Can’t we put this more nicely (e.g. decimal WGS84 lat/lon)? Also, since this is closely related to the other WGS84 formats, why not move it closer to them?

mvglasow · 2023-03-24T12:26:40Z

docs/configuration/coordinates.rst

+
+.. code:: 
+
+   48.137260, 11.575420


Since there is another WGS84 decimal format, albeit with longitude before latitude, how does Navit know which of the two is meant (i.e. order of coordinates)? Or, what do I need to pay attention to when supplying these coordinates so Navit interprets them correctly (avoiding coordinates being swapped)?

mvglasow · 2023-03-24T12:29:30Z

docs/configuration/coordinates.rst

+
+-   mg - the projection used by Map&Guide (the default)
+
+-   garmin - "Garmin" projection (TODO: When would it be useful?)


AFAIK this is for legacy reasons: Navit was started around 2002 (source code was released later). Note that this predates OSM – the first versions used commercial map data, including Garmin. Hence there would have been a need to support their coordinate system. This probably also explains why Navit internally uses mg rather than WGS84.

jkoan · 2023-03-27T06:27:59Z

Any updates on merging this?

This PR conflicts with the changes in #1221 and if i throw together the tests from you and the other PR both PR's have failing cases.
I haven't found the time to look into it more deeply, sorry for the delay.

This reverts commit 1167d94, reversing changes made to c3dba1b.

OLFDB added 18 commits May 23, 2022 06:21

Initial commit

68afffb

Merge branch 'navit-gps:trunk' into navitori

5a0288b

Merge pull request #18 from navit-gps/trunk

e3cb9c2

Merge trunk

Fix:navit-gps#1185

fd91e40

Fix:navit-gps#1185

be87cd3

Update after further tests

a2ffdea

Update navit.c

31c48d4

Missing opening bracket.

Update navit.c

90ff624

Needs AND not OR when combining if clauses.

Revert "Fix:navit-gps#1185"

ae572cc

This reverts commit fd91e40.

Revert "Fix:navit-gps#1185"

57cba4e

This reverts commit be87cd3.

Merge trunk.

381e544

merge trunk

64c5eab

Merge branch 'navit-gps-trunk' into navitori

be53f3d

Taken from wiki and added UTM coordinate description

34fcdb9

Convinience Macro to get projection names in text

ca0fd3c

Fix for navit-gps#1218 Crash when setting first destination Changes to make UTM coordinates working

Added SIZE enum member to calculate size of enum

7620dc4

Changes to fix handling of UTM coordinates.

5d0bfe0

Allow capital letters in UTM coordinates.

Changed SIZE to projection_enumsize

223b8b3

jkoan requested changes Jan 20, 2023

View reviewed changes

OLFDB added 6 commits January 21, 2023 08:42

Removed unneccessary macro PROJASSTRING

fb0afeb

Removed unneccessary enum value projection_enumsize

90d36d7

Use dbg instead of printf again

7c2492a

Linked new file coordinates.rst

c187fda

astyle

d9c0f97

Update after testing with all coordinate formats. Google Maps included.

4f64b74

OLFDB requested a review from jkoan January 28, 2023 04:24

jkoan reviewed Jan 31, 2023

View reviewed changes

Changed to rst format and added Google Maps coordinates description

c3dba1b

jkoan added a commit that referenced this pull request Feb 4, 2023

add:test:core:Added all test from #1219 and my own tests for #1221

38e18e7

jkoan linked an issue Feb 25, 2023 that may be closed by this pull request

Crash when setting first destination #1218

Open

mvglasow reviewed Mar 24, 2023

View reviewed changes

OLFDB added 4 commits December 25, 2023 13:44

Merge branch 'trunk' into bookmarkissue

1167d94

Revert "Merge branch 'trunk' into bookmarkissue"

55f0c86

This reverts commit 1167d94, reversing changes made to c3dba1b.

Fixes for testcases

8a3fa0d

Fix for testcases

cf5587b

		#define PROJASSTRING(x) (x==0?"projection_none":x==1?"projection_mg":x==2?"projection_garmin":x==3?"projection_screen":x==4?"projection_utm":"UNKNOWN")

		dbg(lvl_debug, "str='%s' x=%f y=%f c=%d\n", str, lng, lat, ret);
		dbg(lvl_debug, "rest='%s'\n", str + ret);


		- mg - the projection used by Map&Guide (the default)

		- garmin - "Garmin" projection (TODO: When would it be useful?)

Fix:#1218 #1219

Are you sure you want to change the base?

Fix:#1218 #1219

Conversation

OLFDB commented Jan 14, 2023

OLFDB commented Jan 14, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkoan commented Jan 20, 2023

OLFDB commented Jan 21, 2023 • edited by jkoan Loading

X: 65535 Y: 65535

X: 704308 Y: -3938147

X: 295185 Y: -1554469

X: 65535 Y: 65535

X: 65535 Y: 65535

X: 1509221 Y: 6916019

X: 632536 Y: 2455000

X: 65535 Y: 65535

X: 65535 Y: 65535

X: 1287127 Y: 6122861

X: 539453 Y: 2243358

X: 65535 Y: 65535

X: 1287127 Y: 6122861

X: 1287127 Y: 6122861

X: 539453 Y: 2243358

X: 1287127 Y: 6122861

X: 1287127 Y: 6122861

X: 1287127 Y: 6122861

X: 539453 Y: 2243358

X: 1287127 Y: 6122861

X: 32674661 Y: 5328114

X: 1261533 Y: 6113717

X: 528726 Y: 2240800

X: 32674661 Y: 5328114

X: 32400074 Y: 5800003

X: 837654 Y: 6854379

X: 351072 Y: 2439277

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkoan commented Jan 31, 2023

AgentSmith0 commented Mar 23, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

jkoan commented Mar 27, 2023

OLFDB commented Jan 21, 2023 •

edited by jkoan

Loading

X: 65535
Y: 65535

X: 704308
Y: -3938147

X: 295185
Y: -1554469

X: 65535
Y: 65535

X: 65535
Y: 65535

X: 1509221
Y: 6916019

X: 632536
Y: 2455000

X: 65535
Y: 65535

X: 65535
Y: 65535

X: 1287127
Y: 6122861

X: 539453
Y: 2243358

X: 65535
Y: 65535

X: 1287127
Y: 6122861

X: 1287127
Y: 6122861

X: 539453
Y: 2243358

X: 1287127
Y: 6122861

X: 1287127
Y: 6122861

X: 1287127
Y: 6122861

X: 539453
Y: 2243358

X: 1287127
Y: 6122861

X: 32674661
Y: 5328114

X: 1261533
Y: 6113717

X: 528726
Y: 2240800

X: 32674661
Y: 5328114

X: 32400074
Y: 5800003

X: 837654
Y: 6854379

X: 351072
Y: 2439277