From: <sl...@us...> - 2012-11-05 20:14:25
|
Revision: 5258 http://navit.svn.sourceforge.net/navit/?rev=5258&view=rev Author: sleske Date: 2012-11-05 20:14:18 +0000 (Mon, 05 Nov 2012) Log Message: ----------- Fix:core:Introduce constants WORLD_BOUNDINGBOX_* for size of the world. Modified Paths: -------------- trunk/navit/navit/map/binfile/binfile.c trunk/navit/navit/map.h trunk/navit/navit/maptool/misc.c Modified: trunk/navit/navit/map/binfile/binfile.c =================================================================== --- trunk/navit/navit/map/binfile/binfile.c 2012-11-05 20:13:52 UTC (rev 5257) +++ trunk/navit/navit/map/binfile/binfile.c 2012-11-05 20:14:18 UTC (rev 5258) @@ -1484,8 +1484,8 @@ int overlap=1; int xo,yo; struct coord_rect world_bbox = { - { -20000000, 20000000}, /* lu */ - { 20000000, -20000000}, /* rl */ + { WORLD_BOUNDINGBOX_MIN_X, WORLD_BOUNDINGBOX_MAX_Y}, /* left upper corner */ + { WORLD_BOUNDINGBOX_MAX_X, WORLD_BOUNDINGBOX_MIN_Y}, /* right lower corner */ }; *r=world_bbox; while (len) { Modified: trunk/navit/navit/map.h =================================================================== --- trunk/navit/navit/map.h 2012-11-05 20:13:52 UTC (rev 5257) +++ trunk/navit/navit/map.h 2012-11-05 20:14:18 UTC (rev 5258) @@ -39,6 +39,11 @@ #include "layer.h" #include "debug.h" +#define WORLD_BOUNDINGBOX_MIN_X -20000000 +#define WORLD_BOUNDINGBOX_MAX_X 20000000 +#define WORLD_BOUNDINGBOX_MIN_Y -20000000 +#define WORLD_BOUNDINGBOX_MAX_Y 20000000 + /** * @brief Used to select data from a map * Modified: trunk/navit/navit/maptool/misc.c =================================================================== --- trunk/navit/navit/maptool/misc.c 2012-11-05 20:13:52 UTC (rev 5257) +++ trunk/navit/navit/maptool/misc.c 2012-11-05 20:14:18 UTC (rev 5258) @@ -48,8 +48,8 @@ #define phase1_coord_max 16384 struct rect world_bbox = { - { -20000000, -20000000}, - { 20000000, 20000000}, + { WORLD_BOUNDINGBOX_MIN_X, WORLD_BOUNDINGBOX_MIN_Y}, + { WORLD_BOUNDINGBOX_MAX_X, WORLD_BOUNDINGBOX_MAX_Y}, }; void This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |