Fix:#1218

README.md

@@ -18,7 +18,7 @@ Current vehicle position from gpsd or directly from NMEA (GPS) sensors. \
 Optimal routes and directions spoken in 70+ languages. \
 Points of interest (POIs) in many formats.
 
-Help and more info available on [the wiki](https://navit.readthedocs.io/en/v0.5.6/). \
+Help and more info available on [the wiki](https://wiki.navit-project.org/index.php/Main_Page). \
 The [Reporting Bugs](http://wiki.navit-project.org/index.php/Reporting_Bugs) document helps you file issues.
 
 Maps

docs/configuration/coordinates.rst

@@ -0,0 +1,136 @@
+Coordinates in Navit
+====================
+
+Various parts of Navit will read geographical coordinates provided as
+text:
+
+-   the `textfile <https://wiki.navit-project.org/index.php/Textfile>`__
+   map format
+
+-   the "center=" attribute in the configuration file
+
+-   some Navit commands (e.g. set_position), which can be invoked via
+   the `internal
+   GUI <https://wiki.navit-project.org/index.php/Internal_GUI>`__ or the
+   `Dbus <https://wiki.navit-project.org/index.php/Dbus>`__ bindings
+
+-   the files for bookmarks and last map position (bookmarks.txt and
+   center.txt)
+
+This page documents the coordinate systems and formats that Navit will
+accept.
+
+Supported coordinate systems and formats
+========================================
+
+.. _longitude--latitude-in-decimal-degrees:
+
+Longitude / Latitude in decimal degrees
+---------------------------------------
+
+Longitude / latitude in degrees can be specified as signed decimal
+fractions:
+
+.. code:: 
+
+   -33.3553 6.334
+
+That would be about 33° West, 6° North. Note that in this format
+longitude comes first. The coordinates are assumed to be based on WGS84
+(the coordinate system used by the GPS system, and by practically all
+common navigation systems).
+
+.. _latitude--longitude-in-degrees-and-minutes:
+
+Latitude / Longitude in degrees and minutes
+-------------------------------------------
+
+Latitude / Longitude can also be specified in degress and minutes with
+compass directions (N/S, E/W):
+
+.. code:: 
+
+   4808 N 1134 E
+
+Latitude and longitude are multiplied by 100, so the position above
+corresponds to 48°8' N, 11°34' (Munich).
+
+For greater precision you can write the minutes as decimal fractions:
+
+.. code:: 
+
+   4808.2356 N 1134.5252 E
+
+That is 48°8.2356' N 11°34.5252' E, the center of the Marienplatz in
+Munich.
+
+Notes:
+
+-   This format is rather unusual (because it uses arcminutes, but not
+   arcseconds). It is probably easier to just use decimal fractions of
+   degrees.
+
+-   The spaces are relevant for parsing. Use exactly one space between
+   the number and the letter N/S/E/W.
+
+Cartesian coordinates
+---------------------
+
+Internally, Navit uses a cartesian coordinate system induced by a
+Mercator projection. Coordinates are written as hexadecimal integers:
+
+.. code:: 
+
+   0x13a3d7 0x5d6d6d
+
+or specifying a projection:
+
+.. code:: 
+
+   mg: 0x13a3d7 0x5d6d6d
+
+That is again 48°8.2356' N 11°34.5252' E. The part up to and including
+the colon is optional, it names the projection to use. Possible values:
+
+-   mg - the projection used by Map&Guide (the default)
+
+-   garmin - "Garmin" projection (TODO: When would it be useful?)
+
+This format is used internally by Navit, but is probably not very useful
+for other purposes.
+
+Google Maps Format
+------------------
+
+.. code:: 
+
+   48.137260, 11.575420
+
+That is again 48°8.2356' N 11°34.5252' E. The values are comma
+separated. You can pick such values from Google Maps with right click on
+a location and then click on the coordinate in the context menu. This is
+useful when planning a route online by creating a waypoint file.
+
+UTM coordinates
+---------------
+
+Navit can read coordinates in the `Universal Transverse Mercator
+coordinate
+system <http://en.wikipedia.org/wiki/Universal_Transverse_Mercator_coordinate_system>`__
+(UTM).
+
+.. code:: 
+
+   utm32U: 674499.306 5328063.675
+
+.. code:: 
+
+   utmref32UPU:74499.306 28063.675
+
+Development notes
+=================
+
+The coordinates are parsed in function coord_parse() in coord.c. This
+code is used everywhere where Navit parses coordinates, except for the
+manual coordinate input in the Internal GUI (which uses its own format
+and parsing function).

docs/configuration/general.rst

@@ -18,7 +18,7 @@ On Navit's very first startup, it needs a **center** to look at on the map. By d
 
 		center="11.5666 48.1333"
 
-Coordinates can be written in different formats; see [[Coordinate_format]] for the full list.
+Coordinates can be written in different formats; see :doc:`coordinates` for the full list.
 To determine a specific latitude and longitude for your location you can use http://itouchmap.com/latlong.html.
 Usually, changing the "center" setting is not necessary, since it is only used during the first start.
 On subsequent starts, Navit will remember the last map position (stored in "center.txt") and ignore the "center" setting.

navit/attr.h

@@ -28,7 +28,28 @@ extern "C" {
 
 enum item_type;
 
-#include "attr_type_def.h"
+/**
+ * Attribute type values, created using macro magic.
+ */
+enum attr_type {
+#define ATTR2(x,y) attr_##y=x,
+#define ATTR(x) attr_##x,
+
+    /* Special macro for unused attribute types. Creates a placeholder entry
+     * in the enum so the following values do not change. */
+#define ATTR_UNUSED ATTR_UNUSED_L(__LINE__)
+#define ATTR_UNUSED_L(x) ATTR_UNUSED_WITH_LINE_NUMBER(x)
+#define ATTR_UNUSED_WITH_LINE_NUMBER(x) ATTR_UNUSED_##x,
+
+#include "attr_def.h"
+
+#undef ATTR_UNUSED_WITH_LINE_NUMBER
+#undef ATTR_UNUSED_L
+#undef ATTR_UNUSED
+
+#undef ATTR2
+#undef ATTR
+};
 
 enum attr_format {
     attr_format_default=0,