|
@@ -14,7 +14,7 @@ double ghdg0 = 360;
|
|
#include "pos_def.h"
|
|
#include "pos_def.h"
|
|
|
|
|
|
extern std::vector<iv::pos_def> gvectorpos;
|
|
extern std::vector<iv::pos_def> gvectorpos;
|
|
-
|
|
|
|
|
|
+extern std::string gstrmode;
|
|
|
|
|
|
#include <math.h>
|
|
#include <math.h>
|
|
//高斯投影由经纬度(Unit:DD)反算大地坐标(含带号,Unit:Metres)
|
|
//高斯投影由经纬度(Unit:DD)反算大地坐标(含带号,Unit:Metres)
|
|
@@ -187,7 +187,15 @@ ivmapview::ivmapview()
|
|
#ifdef Android
|
|
#ifdef Android
|
|
LoadXODR("/storage/emulated/0//map.xodr",mxodr);
|
|
LoadXODR("/storage/emulated/0//map.xodr",mxodr);
|
|
#else
|
|
#else
|
|
- LoadXODR("./map.xodr",mxodr);
|
|
|
|
|
|
+ if(gstrmode == "false")
|
|
|
|
+ LoadXODR("./map.xodr",mxodr);
|
|
|
|
+ else
|
|
|
|
+ {
|
|
|
|
+ char * strhome = getenv("HOME");
|
|
|
|
+ char strmappath[256];
|
|
|
|
+ snprintf(strmappath,256,"%s/map/map.xodr",strhome);
|
|
|
|
+ LoadXODR(strmappath,mxodr);
|
|
|
|
+ }
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
|