Changeset 655 for trunk

Timestamp:

02/20/08 07:44:34 (9 months ago)

Author:

artem

Message:

convert to degrees if projection is geographic

Files:

• trunk/src/projection.cpp (modified) (2 diffs)

trunk/src/projection.cpp

@@ -83 +83 @@
         x = p.u;
         y = p.v;
+        if (pj_is_latlong(proj_))
+        {
+           x *=RAD_TO_DEG;
+           y *=RAD_TO_DEG;
+        }           
     }
     
@@ -90 +95 @@
        mutex::scoped_lock lock(mutex_);
 #endif
-        projUV p;
-        p.u = x;
-        p.v = y;
-        p = pj_inv(p,proj_);
-        x = RAD_TO_DEG * p.u;
-        y = RAD_TO_DEG * p.v;
+       if (pj_is_latlong(proj_))
+       {
+          x *=DEG_TO_RAD;
+          y *=DEG_TO_RAD;
+       }  
+       projUV p;
+       p.u = x;
+       p.v = y;
+       p = pj_inv(p,proj_);
+       x = RAD_TO_DEG * p.u;
+       y = RAD_TO_DEG * p.v;
     }