Project structure cleanup

src/map/proj/albersequal.cpp

@@ -41,7 +41,7 @@ Defense.
 
 */
 
-#include "ellipsoid.h"
+#include "map/ellipsoid.h"
 #include "albersequal.h"
 
 

src/map/proj/albersequal.h

@@ -1,7 +1,7 @@
 #ifndef ALBERSEQUAL_H
 #define ALBERSEQUAL_H
 
-#include "ct.h"
+#include "map/ct.h"
 
 class Ellipsoid;
 

src/map/proj/krovak.cpp

@@ -1,4 +1,4 @@
-#include "ellipsoid.h"
+#include "map/ellipsoid.h"
 #include "krovak.h"
 
 Krovak::Krovak(const Ellipsoid &ellipsoid, double standardParallel,

src/map/proj/krovak.h

@@ -1,7 +1,7 @@
 #ifndef KROVAK_H
 #define KROVAK_H
 
-#include "ct.h"
+#include "map/ct.h"
 
 class Ellipsoid;
 

src/map/proj/lambertazimuthal.cpp

@@ -1,5 +1,5 @@
 #include <cmath>
-#include "ellipsoid.h"
+#include "map/ellipsoid.h"
 #include "lambertazimuthal.h"
 
 #define sin2(x) (sin(x) * sin(x))

src/map/proj/lambertazimuthal.h

@@ -1,7 +1,7 @@
 #ifndef LAMBERTAZIMUTHAL_H
 #define LAMBERTAZIMUTHAL_H
 
-#include "ct.h"
+#include "map/ct.h"
 
 class Ellipsoid;
 

src/map/proj/lambertconic.cpp

@@ -42,7 +42,7 @@ Defense.
 */
 
 #include <cmath>
-#include "ellipsoid.h"
+#include "map/ellipsoid.h"
 #include "lambertconic.h"
 
 

src/map/proj/lambertconic.h

@@ -1,7 +1,7 @@
 #ifndef LAMBERTCONIC_H
 #define LAMBERTCONIC_H
 
-#include "ct.h"
+#include "map/ct.h"
 
 class Ellipsoid;
 

src/map/proj/latlon.h

@@ -1,8 +1,8 @@
 #ifndef LATLON_H
 #define LATLON_H
 
-#include "ct.h"
-#include "angularunits.h"
+#include "map/ct.h"
+#include "map/angularunits.h"
 
 class LatLon : public CT
 {

src/map/proj/mercator.cpp

@@ -41,7 +41,7 @@ Defense.
 
 */
 
-#include "ellipsoid.h"
+#include "map/ellipsoid.h"
 #include "mercator.h"
 
 Mercator::Mercator(const Ellipsoid &ellipsoid, double latitudeOrigin,

src/map/proj/mercator.h

@@ -1,7 +1,7 @@
 #ifndef MERCATOR_H
 #define MERCATOR_H
 
-#include "ct.h"
+#include "map/ct.h"
 
 class Ellipsoid;
 

src/map/proj/obliquestereographic.cpp

@@ -1,4 +1,4 @@
-#include "ellipsoid.h"
+#include "map/ellipsoid.h"
 #include "obliquestereographic.h"
 
 

src/map/proj/obliquestereographic.h

@@ -1,7 +1,7 @@
 #ifndef OBLIQUESTEREOGRAPHIC_H
 #define OBLIQUESTEREOGRAPHIC_H
 
-#include "ct.h"
+#include "map/ct.h"
 
 class Ellipsoid;
 

src/map/proj/polarstereographic.cpp

@@ -41,7 +41,7 @@ Defense.
 
 */
 
-#include "ellipsoid.h"
+#include "map/ellipsoid.h"
 #include "polarstereographic.h"
 
 

src/map/proj/polarstereographic.h

@@ -1,7 +1,7 @@
 #ifndef POLARSTEREOGRAPHIC_H
 #define POLARSTEREOGRAPHIC_H
 
-#include "ct.h"
+#include "map/ct.h"
 
 class Ellipsoid;
 

src/map/proj/polyconic.cpp

@@ -41,7 +41,7 @@ Defense.
 
 */
 
-#include "ellipsoid.h"
+#include "map/ellipsoid.h"
 #include "polyconic.h"
 
 #define POLY_COEFF_TIMES_SIN(coeff, x, latit) \

src/map/proj/polyconic.h

@@ -1,7 +1,7 @@
 #ifndef POLYCONIC_H
 #define POLYCONIC_H
 
-#include "ct.h"
+#include "map/ct.h"
 
 class Ellipsoid;
 

src/map/proj/transversemercator.cpp

@@ -42,7 +42,7 @@ Defense.
 */
 
 #include <cmath>
-#include "ellipsoid.h"
+#include "map/ellipsoid.h"
 #include "transversemercator.h"
 
 

src/map/proj/transversemercator.h

@@ -1,7 +1,7 @@
 #ifndef TRANSVERSEMERCATOR_H
 #define TRANSVERSEMERCATOR_H
 
-#include "ct.h"
+#include "map/ct.h"
 
 class Ellipsoid;
 

src/map/proj/webmercator.h

@@ -1,7 +1,7 @@
 #ifndef WEBMERCATOR_H
 #define WEBMERCATOR_H
 
-#include "ct.h"
+#include "map/ct.h"
 
 class WebMercator : public CT
 {

src/map/projection.cpp

@@ -1,15 +1,15 @@
+#include "proj/mercator.h"
+#include "proj/webmercator.h"
+#include "proj/transversemercator.h"
+#include "proj/lambertconic.h"
+#include "proj/albersequal.h"
+#include "proj/lambertazimuthal.h"
+#include "proj/krovak.h"
+#include "proj/polarstereographic.h"
+#include "proj/obliquestereographic.h"
+#include "proj/polyconic.h"
+#include "proj/latlon.h"
 #include "datum.h"
-#include "mercator.h"
-#include "webmercator.h"
-#include "transversemercator.h"
-#include "lambertconic.h"
-#include "albersequal.h"
-#include "lambertazimuthal.h"
-#include "krovak.h"
-#include "polarstereographic.h"
-#include "obliquestereographic.h"
-#include "polyconic.h"
-#include "latlon.h"
 #include "gcs.h"
 #include "pcs.h"
 #include "projection.h"