Issue Framstag#1045 - Update projection

- MOve TileProjection and MercatorProjection to their own headers - Move Projections to projection package/directory - Adapt includes - Fixed builds
DerKleinePunk · Jul 16, 2023 · 38b2f4c · 38b2f4c
1 parent a7538fd
commit 38b2f4c
Show file tree

Hide file tree

Showing 38 changed files with 746 additions and 568 deletions.
diff --git a/Android/OsmScoutLib/jni/src/jniMercatorProjection.cpp b/Android/OsmScoutLib/jni/src/jniMercatorProjection.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <android/log.h>
 
-#include <osmscout/util/Projection.h>
+#include <osmscout/projection/Projection.h>
 
 #include <jniObjectArray.h>
 
@@ -109,15 +109,15 @@ jobject Java_osm_scout_MercatorProjection_jniPixelToGeo(JNIEnv *env,
   }
 
   double lon, lat;
-  
+
   if (!nativeProjection->PixelToGeo(x, y, lon, lat))
     return NULL;
 
   jclass javaClass = env->FindClass("osm/scout/GeoPos");
   jmethodID methodId = env->GetMethodID(javaClass,"<init>","(DD)V");
   jobject geoPos=env->NewObject(javaClass, methodId, lon, lat);
-  
-  return geoPos;	
+
+  return geoPos;
 }
 
 jobject Java_osm_scout_MercatorProjection_jniGeoToPixel(JNIEnv *env,
@@ -133,15 +133,15 @@ jobject Java_osm_scout_MercatorProjection_jniGeoToPixel(JNIEnv *env,
   }
 
   double x, y;
-  
+
   if (!nativeProjection->GeoToPixel(lon, lat, x, y))
     return NULL;
-    
+
   jclass javaClass = env->FindClass("android/graphics/PointF");
   jmethodID methodId = env->GetMethodID(javaClass,"<init>","(FF)V");
   jobject point=env->NewObject(javaClass, methodId, (float)x, (float)y);
-  
-  return point;	
+
+  return point;
 }
 
 #ifdef __cplusplus

diff --git a/Android/OsmScoutLib/jni/src/jniOnLoad.cpp b/Android/OsmScoutLib/jni/src/jniOnLoad.cpp
@@ -22,7 +22,7 @@
 #include <android/log.h>
 
 #include <osmscout/Database.h>
-#include <osmscout/util/Projection.h>
+#include <osmscout/projection/Projection.h>
 #include <osmscout/StyleConfig.h>
 
 #include <jniMapPainterCanvas.h>
@@ -51,7 +51,7 @@ JNIEXPORT jint JNICALL JNI_OnLoad(JavaVM *vm, void *reserved)
   gObjectTypeSetsArray=new JniObjectArray<ObjectTypeSets>();
   gStyleConfigArray=new JniObjectArray<StyleConfig>();
   gTypeConfigArray=new JniObjectArray<TypeConfig>();
-  
+
   return JNI_VERSION_1_6;
 }
 
diff --git a/BasemapImport/src/BasemapImport.cpp b/BasemapImport/src/BasemapImport.cpp
@@ -27,6 +27,8 @@
 #include <vector>
 #include <algorithm>
 
+#include <osmscout/projection/MercatorProjection.h>
+
 #include <osmscout/util/CmdLineParsing.h>
 #include <osmscout/util/File.h>
 

diff --git a/Demos/include/DrawMap.h b/Demos/include/DrawMap.h
@@ -21,11 +21,14 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+#include <osmscout/Database.h>
+#include <osmscout/BasemapDatabase.h>
+
+#include <osmscout/projection/MercatorProjection.h>
+
 #include <osmscout/util/CmdLineParsing.h>
 
-#include <osmscout/Database.h>
 #include <osmscoutmap/MapService.h>
-#include <osmscout/BasemapDatabase.h>
 
 #include <iostream>
 

diff --git a/Demos/src/ResourceConsumption.cpp b/Demos/src/ResourceConsumption.cpp
@@ -22,13 +22,14 @@
 
 
 #include <osmscout/Database.h>
-#include <osmscoutmap/MapService.h>
 
-#include <osmscoutmap/MapPainter.h>
+#include <osmscout/projection/MercatorProjection.h>
 
-#include <osmscout/util/Projection.h>
 #include <osmscout/util/StopClock.h>
 
+#include <osmscoutmap/MapService.h>
+#include <osmscoutmap/MapPainter.h>
+
 /*
   Example for the germany.osm, show germany overview, then zooms into Bonn city
   and then zoom into Dortmund city and then zomm into München overview.

diff --git a/Demos/src/ResourceConsumptionQt.cpp b/Demos/src/ResourceConsumptionQt.cpp
@@ -24,11 +24,15 @@
 #include <QApplication>
 
 #include <osmscout/Database.h>
+
+#include <osmscout/projection/MercatorProjection.h>
+
+#include <osmscout/util/StopClock.h>
+
 #include <osmscoutmap/MapService.h>
 
 #include <osmscoutmapqt/MapPainterQt.h>
 
-#include <osmscout/util/StopClock.h>
 
 /*
   Example for the germany.osm, show germany overview, then zooms into Bonn city

diff --git a/Demos/src/RoutingAnimation.cpp b/Demos/src/RoutingAnimation.cpp
@@ -28,18 +28,19 @@
 #include <list>
 
 #include <osmscout/Database.h>
-#include <osmscoutmap/MapService.h>
-
-#include <osmscout/util/Projection.h>
-#include <osmscout/util/Geometry.h>
-#include <osmscout/util/CmdLineParsing.h>
 
-#include <osmscoutmapqt/MapPainterQt.h>
+#include <osmscout/projection/MercatorProjection.h>
 
 #include <osmscout/routing/SimpleRoutingService.h>
 #include <osmscout/routing/RoutePostprocessor.h>
 #include <osmscout/routing/RoutingService.h>
 
+#include <osmscout/util/Geometry.h>
+#include <osmscout/util/CmdLineParsing.h>
+
+#include <osmscoutmap/MapService.h>
+
+#include <osmscoutmapqt/MapPainterQt.h>
 
 //#define ROUTE_DEBUG
 //#define NODE_DEBUG

diff --git a/Demos/src/Tiler.cpp b/Demos/src/Tiler.cpp
@@ -23,6 +23,8 @@
 
 #include <osmscout/Database.h>
 
+#include <osmscout/projection/TileProjection.h>
+
 #include <osmscout/util/StopClock.h>
 #include <osmscout/util/Tiling.h>
 #include <osmscout/util/CmdLineParsing.h>

diff --git a/Tests/src/MapRotate.cpp b/Tests/src/MapRotate.cpp
@@ -19,6 +19,8 @@
 
 #include <iostream>
 
+#include <osmscout/projection/MercatorProjection.h>
+
 #include <osmscoutmap/MapPainterNoOp.h>
 
 #include <TestMain.h>

diff --git a/Tests/src/MercatorProjection.cpp b/Tests/src/MercatorProjection.cpp
@@ -17,7 +17,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <osmscout/util/Projection.h>
+#include "osmscout/projection/MercatorProjection.h"
 
 #include <TestMain.h>
 

diff --git a/Tests/src/PerformanceTest.cpp b/Tests/src/PerformanceTest.cpp
@@ -25,6 +25,9 @@
 #include "config.h"
 
 #include <osmscout/Database.h>
+
+#include <osmscout/projection/TileProjection.h>
+
 #include <osmscoutmap/MapService.h>
 
 #if defined(HAVE_LIB_OSMSCOUTMAPCAIRO)

diff --git a/Tests/src/TransPolygon.cpp b/Tests/src/TransPolygon.cpp
@@ -22,6 +22,8 @@
 
 #include <TestWay.h>
 
+#include <osmscout/projection/MercatorProjection.h>
+
 #include <osmscout/util/Geometry.h>
 #include <osmscout/util/Transformation.h>
 

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/DBJob.h b/libosmscout-client-qt/include/osmscoutclientqt/DBJob.h
@@ -27,9 +27,12 @@
 #include <QReadWriteLock>
 
 #include <osmscout/BasemapDatabase.h>
-#include <osmscoutclientqt/DBInstance.h>
+
+#include <osmscout/projection/MercatorProjection.h>
+
 #include <osmscoutmap/DataTileCache.h>
 
+#include <osmscoutclientqt/DBInstance.h>
 #include <osmscoutclientqt/ClientQtImportExport.h>
 
 namespace osmscout {

diff --git a/libosmscout-client-qt/include/osmscoutclientqt/IconAnimation.h b/libosmscout-client-qt/include/osmscoutclientqt/IconAnimation.h
@@ -22,7 +22,8 @@
 
 #include <osmscoutclientqt/ClientQtImportExport.h>
 
-#include <osmscout/util/Projection.h>
+#include <osmscout/projection/Projection.h>
+
 #include <osmscoutclientqt/IconLookup.h>
 
 #include <QObject>

diff --git a/libosmscout-client-qt/src/osmscoutclientqt/InputHandler.cpp b/libosmscout-client-qt/src/osmscoutclientqt/InputHandler.cpp
@@ -27,7 +27,7 @@
 #include <osmscoutclientqt/InputHandler.h>
 #include <osmscoutclientqt/OSMTile.h>
 
-#include <osmscout/util/Projection.h>
+#include <osmscout/projection/MercatorProjection.h>
 
 #include <osmscout/system/Math.h>
 

diff --git a/libosmscout-import/include/osmscoutimport/WaterIndexProcessor.h b/libosmscout-import/include/osmscoutimport/WaterIndexProcessor.h
@@ -32,10 +32,11 @@
 
 #include <osmscout/GroundTile.h>
 
+#include <osmscout/projection/Projection.h>
+
 #include <osmscout/util/FileWriter.h>
 #include <osmscout/util/Geometry.h>
 #include <osmscout/util/Progress.h>
-#include <osmscout/util/Projection.h>
 #include <osmscout/util/Transformation.h>
 
 #include <osmscout/system/Compiler.h>

diff --git a/libosmscout-import/src/osmscoutimport/GenOptimizeAreasLowZoom.cpp b/libosmscout-import/src/osmscoutimport/GenOptimizeAreasLowZoom.cpp
@@ -28,11 +28,12 @@
 #include <osmscout/system/Assert.h>
 #include <osmscout/system/Math.h>
 
+#include <osmscout/projection/MercatorProjection.h>
+
 #include <osmscout/util/File.h>
 #include <osmscout/util/GeoBox.h>
 #include <osmscout/util/Geometry.h>
 #include <osmscout/util/Number.h>
-#include <osmscout/util/Projection.h>
 #include <osmscout/util/TileId.h>
 #include <osmscout/util/Transformation.h>
 

diff --git a/libosmscout-import/src/osmscoutimport/GenOptimizeWaysLowZoom.cpp b/libosmscout-import/src/osmscoutimport/GenOptimizeWaysLowZoom.cpp
@@ -31,11 +31,12 @@
 #include <osmscout/system/Assert.h>
 #include <osmscout/system/Math.h>
 
+#include <osmscout/projection/MercatorProjection.h>
+
 #include <osmscout/util/File.h>
 #include <osmscout/util/Geometry.h>
 #include <osmscout/util/GeoBox.h>
 #include <osmscout/util/Number.h>
-#include <osmscout/util/Projection.h>
 #include <osmscout/util/TileId.h>
 #include <osmscout/util/Transformation.h>
 

diff --git a/libosmscout-import/src/osmscoutimport/GenWaterIndex.cpp b/libosmscout-import/src/osmscoutimport/GenWaterIndex.cpp
@@ -29,7 +29,7 @@
 #include <osmscout/WaterIndex.h>
 #include <osmscout/WayDataFile.h>
 
-#include <osmscout/system/Math.h>
+#include <osmscout/projection/MercatorProjection.h>
 
 #include <osmscout/util/File.h>
 #include <osmscout/util/FileScanner.h>

diff --git a/libosmscout-map-gdi/src/osmscoutmapgdi/MapPainterGDI.cpp b/libosmscout-map-gdi/src/osmscoutmapgdi/MapPainterGDI.cpp
@@ -349,8 +349,7 @@ namespace osmscout {
 
       result.emplace_back();
       result.back().glyph.character = WStringToUTF8String(buffer.data());
-      result.back().position.SetX(horizontalOffset);
-      result.back().position.SetY(0);
+      result.back().position=Vertex2D(horizontalOffset,0);
 
       Gdiplus::RectF bb;
 

diff --git a/libosmscout-map-iosx/src/osmscout/MapPainterIOS.mm b/libosmscout-map-iosx/src/osmscout/MapPainterIOS.mm
@@ -313,7 +313,7 @@ static void DrawPattern (void * info,CGContextRef cg){
                 glyph.glyph.line = label.line[i];
                 glyph.glyph.run = run;
                 glyph.glyph.index = index;
-                glyph.position.Set(glyphPositions[index].x, glyphPositions[index].y);
+                glyph.position=Vertex2D(glyphPositions[index].x, glyphPositions[index].y);
                 result.push_back(std::move(glyph));
             }
             i++;
@@ -586,7 +586,7 @@ static void DrawPattern (void * info,CGContextRef cg){
             hnd.transEnd = transStart;
         }
         hnd.direction = (hnd.transStart < hnd.transEnd) ? 1 : -1;
-        origin.Set(coordBuffer.buffer[hnd.transStart].GetX(), coordBuffer.buffer[hnd.transStart].GetY());
+        origin=Vertex2D(coordBuffer.buffer[hnd.transStart].GetX(), coordBuffer.buffer[hnd.transStart].GetY());
     }
 
     bool MapPainterIOS::followPath(FollowPathHandle &hnd, double l, Vertex2D &origin) {
@@ -609,7 +609,7 @@ static void DrawPattern (void * info,CGContextRef cg){
 
             fracToGo = l/len;
             if(fracToGo <= 1.0) {
-                origin.Set(x + deltaX*fracToGo,y + deltaY*fracToGo);
+                origin=Vertex2D(x + deltaX*fracToGo,y + deltaY*fracToGo);
                 return true;
             }
 

diff --git a/libosmscout-map-opengl/include/osmscoutmapopengl/OpenGLProjection.h b/libosmscout-map-opengl/include/osmscoutmapopengl/OpenGLProjection.h
@@ -22,7 +22,7 @@
 
 #include <osmscoutmapopengl/MapOpenGLImportExport.h>
 
-#include <osmscout/util/Projection.h>
+#include <osmscout/projection/MercatorProjection.h>
 
 #include <cassert>
 

diff --git a/libosmscout-map/include/osmscoutmap/BatchMapPainter.h b/libosmscout-map/include/osmscoutmap/BatchMapPainter.h
@@ -24,7 +24,7 @@
 
 #include <osmscoutmap/MapImportExport.h>
 
-#include <osmscout/util/Projection.h>
+#include <osmscout/projection/Projection.h>
 
 #include <osmscoutmap/MapData.h>
 #include <osmscoutmap/MapPainter.h>

diff --git a/libosmscout-map/include/osmscoutmap/MapPainter.h b/libosmscout-map/include/osmscoutmap/MapPainter.h
@@ -40,9 +40,10 @@
 
 #include <osmscoutmap/MapData.h>
 
+#include <osmscout/projection/Projection.h>
+
 #include <osmscout/util/Breaker.h>
 #include <osmscout/util/Geometry.h>
-#include <osmscout/util/Projection.h>
 #include <osmscout/util/Transformation.h>
 
 #include <osmscout/system/Compiler.h>

diff --git a/libosmscout-map/include/osmscoutmap/MapPainterStatistics.h b/libosmscout-map/include/osmscoutmap/MapPainterStatistics.h
@@ -23,7 +23,8 @@
 #include <osmscoutmap/MapImportExport.h>
 
 #include <osmscout/TypeConfig.h>
-#include <osmscout/util/Projection.h>
+
+#include <osmscout/projection/Projection.h>
 
 #include <osmscoutmap/MapParameter.h>
 #include <osmscoutmap/MapData.h>

diff --git a/libosmscout-map/include/osmscoutmap/Styles.h b/libosmscout-map/include/osmscoutmap/Styles.h
@@ -27,9 +27,11 @@
 #include <osmscoutmap/MapImportExport.h>
 
 #include <osmscout/Pixel.h>
+
+#include <osmscout/projection/Projection.h>
+
 #include <osmscout/util/Color.h>
 #include <osmscout/util/LaneTurn.h>
-#include <osmscout/util/Projection.h>
 #include <osmscout/util/ScreenBox.h>
 
 #include <osmscoutmap/StyleDescription.h>