Merge branch 'master' into fix_msvc2019_build

Framstag · Jun 24, 2023 · 4198428 · 4198428
2 parents 3004464 + 2692a4d
commit 4198428
Show file tree

Hide file tree

Showing 386 changed files with 2,690 additions and 1,366 deletions.
diff --git a/Android/OsmScoutLib/jni/src/jniDatabase.cpp b/Android/OsmScoutLib/jni/src/jniDatabase.cpp
@@ -22,7 +22,7 @@
 #include <android/log.h>
 
 #include <osmscout/AdminRegion.h>
-#include <osmscout/Database.h>
+#include "osmscout/database/Database.h"
 #include <osmscout/Node.h>
 #include <osmscoutmap/MapPainter.h>
 

diff --git a/Android/OsmScoutLib/jni/src/jniMapPainterCanvas.cpp b/Android/OsmScoutLib/jni/src/jniMapPainterCanvas.cpp
@@ -23,7 +23,7 @@
 #include <math.h>
 
 #include <osmscout/AdminRegion.h>
-#include <osmscout/Database.h>
+#include "osmscout/database/Database.h"
 #include <osmscout/Node.h>
 #include <osmscoutmap/MapPainter.h>
 

diff --git a/Android/OsmScoutLib/jni/src/jniOnLoad.cpp b/Android/OsmScoutLib/jni/src/jniOnLoad.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <android/log.h>
 
-#include <osmscout/Database.h>
+#include "osmscout/database/Database.h"
 #include <osmscout/projection/Projection.h>
 #include <osmscout/StyleConfig.h>
 

diff --git a/Android/OsmScoutLib/jni/src/jniStyleConfig.cpp b/Android/OsmScoutLib/jni/src/jniStyleConfig.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <android/log.h>
 
-#include <osmscout/Database.h>
+#include "osmscout/database/Database.h"
 #include <osmscout/StyleConfig.h>
 #include <osmscout/StyleConfigLoader.h>
 

diff --git a/Android/OsmScoutLib/jni/src/jniTypeConfig.cpp b/Android/OsmScoutLib/jni/src/jniTypeConfig.cpp
@@ -21,7 +21,7 @@
 #include <string.h>
 #include <android/log.h>
 
-#include <osmscout/Database.h>
+#include "osmscout/database/Database.h"
 #include <osmscout/StyleConfig.h>
 #include <osmscout/StyleConfigLoader.h>
 
@@ -49,7 +49,7 @@ void Java_osm_scout_TypeConfig_jniDestructor(JNIEnv *env, jobject object,
   }
 
   // Do not delete native TypeConfig. Ii internally belongs to the matching
-  // database
+  // db
   //delete nativeTypeConfig;
 }
 

diff --git a/Apple/OSMScoutOSX/OSMScoutOSX/OSMScout.h b/Apple/OSMScoutOSX/OSMScoutOSX/OSMScout.h
@@ -10,15 +10,15 @@
 #define OSMScout_h
 
 #if __cplusplus
-#include <osmscout/Database.h>
+#include <osmscout/db/Database.h>
 #include <osmscout/Way.h>
 #include <osmscout/Tag.h>
-#include <osmscout/WayDataFile.h>
+#include <osmscout/db/WayDataFile.h>
 #include <osmscout/util/Geometry.h>
 #include <osmscout/routing/RoutePostprocessor.h>
 #include <osmscoutmap/StyleConfig.h>
 #include <osmscoutmap/MapService.h>
-#include <osmscout/LocationService.h>
+#include <osmscout/location/LocationService.h>
 
 namespace osmscout {
     class MyBreaker : public Breaker {

diff --git a/Apple/OSMScoutOSX/OSMScoutOSX/OSMScout.mm b/Apple/OSMScoutOSX/OSMScoutOSX/OSMScout.mm
@@ -26,7 +26,7 @@
 
     bool OSMScoutCpp::initDraw(double initDpi) {
         if (!database->IsOpen() && !database->Open(map.c_str())) {
-            std::cerr << "Cannot open database" << std::endl;
+            std::cerr << "Cannot open db" << std::endl;
 
             return false;
         }

diff --git a/BasemapImport/src/BasemapImport.cpp b/BasemapImport/src/BasemapImport.cpp
@@ -18,21 +18,19 @@
 */
 
 #include <cstring>
-#include <cstdio>
 
 #include <iostream>
 #include <memory>
-#include <sstream>
 #include <string>
 #include <vector>
 #include <algorithm>
 
 #include <osmscout/projection/MercatorProjection.h>
 
-#include <osmscout/util/CmdLineParsing.h>
-#include <osmscout/util/File.h>
+#include <osmscout/cli/CmdLineParsing.h>
+
+#include <osmscout/io/File.h>
 
-#include <osmscoutimport/Import.h>
 #include <osmscoutimport/ShapeFileScanner.h>
 
 #include <osmscoutimport/WaterIndexProcessor.h>

diff --git a/Demos/include/DrawMap.h b/Demos/include/DrawMap.h
@@ -21,12 +21,12 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <osmscout/Database.h>
-#include <osmscout/BasemapDatabase.h>
+#include <osmscout/db/Database.h>
+#include <osmscout/db/BasemapDatabase.h>
 
 #include <osmscout/projection/MercatorProjection.h>
 
-#include <osmscout/util/CmdLineParsing.h>
+#include <osmscout/cli/CmdLineParsing.h>
 
 #include <osmscoutmap/MapService.h>
 
@@ -288,7 +288,7 @@ class DrawMapDemo
     database=std::make_shared<osmscout::Database>(databaseParameter);
 
     if (!database->Open(args.map)) {
-      std::cerr << "Cannot open database" << std::endl;
+      std::cerr << "Cannot open db" << std::endl;
       return false;
     }
 

diff --git a/Demos/include/QtDemoApp.h b/Demos/include/QtDemoApp.h
@@ -20,7 +20,7 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <osmscout/util/CmdLineParsing.h>
+#include <osmscout/cli/CmdLineParsing.h>
 
 #include <QStringList>
 #include <QGuiApplication>

diff --git a/Demos/meson.build b/Demos/meson.build
@@ -354,7 +354,7 @@ if buildMapDirectX
                               include_directories: [osmscoutIncDir, osmscoutmapIncDir, osmscoutmapdirectxIncDir, demoIncDir],
                               dependencies: [mathDep, openmpDep, d2d1Dep, dwriteDep, winCodecsDep],
                               link_with: [osmscout, osmscoutmap, osmscoutmapdirectx],
-                              gui_app: true,
+                              win_subsystem: 'windows',
                               install: true,
                               install_dir: demoInstallDir)
 endif
@@ -365,7 +365,7 @@ if buildMapGDI
                             include_directories: [osmscoutIncDir, osmscoutmapIncDir, osmscoutmapgdiIncDir, demoIncDir],
                             dependencies: [mathDep, openmpDep, gdiplusDep],
                             link_with: [osmscout, osmscoutmap, osmscoutmapgdi],
-                            gui_app: true,
+                            win_subsystem: 'windows',
                             install: true,
                             install_dir: demoInstallDir)
 endif

diff --git a/Demos/src/Coverage.cpp b/Demos/src/Coverage.cpp
@@ -17,11 +17,11 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <osmscout/CoverageIndex.h>
+#include <iostream>
 
-#include <osmscout/util/CmdLineParsing.h>
+#include <osmscout/db/CoverageIndex.h>
 
-#include <iostream>
+#include <osmscout/cli/CmdLineParsing.h>
 
 struct Arguments
 {

diff --git a/Demos/src/DrawMapAgg.cpp b/Demos/src/DrawMapAgg.cpp
@@ -22,7 +22,7 @@
 #include <iostream>
 #include <iomanip>
 
-#include <osmscout/Database.h>
+#include <osmscout/db/Database.h>
 
 #include <osmscoutmap/MapService.h>
 

diff --git a/Demos/src/DrawMapDirectX.cpp b/Demos/src/DrawMapDirectX.cpp
@@ -38,8 +38,7 @@ src/DrawMapDirectX ../maps/nordrhein-westfalen ../stylesheets/standard.oss 51.51
 #include <dwrite.h>
 
 #include <iostream>
-
-#include <osmscout/Database.h>
+#include <sstream>
 
 #include <osmscoutmap/MapService.h>
 

diff --git a/Demos/src/DrawMapGDI.cpp b/Demos/src/DrawMapGDI.cpp
@@ -25,8 +25,7 @@ src/DrawMapGDI ../maps/nordrhein-westfalen ../stylesheets/standard.oss 51.51241
 */
 
 #include <iostream>
-
-#include <osmscout/Database.h>
+#include <sstream>
 
 #include <osmscoutmap/MapService.h>
 

diff --git a/Demos/src/DrawMapOpenGL.cpp b/Demos/src/DrawMapOpenGL.cpp
@@ -21,15 +21,11 @@
 
 #include <fstream>
 #include <iostream>
-#include <cstdlib>
 #include <sstream>
 #include <iomanip>
 
-#include <osmscout/Database.h>
-#include <osmscout/util/CmdLineParsing.h>
-#include <osmscout/util/Logger.h>
-
-#include <osmscoutmap/MapService.h>
+#include <osmscout/cli/CmdLineParsing.h>
+#include <osmscout/log/Logger.h>
 
 #include <osmscoutmapopengl/MapPainterOpenGL.h>
 

diff --git a/Demos/src/DrawMapQt.cpp b/Demos/src/DrawMapQt.cpp
@@ -26,7 +26,8 @@
 #include <QScreen>
 #include <QGuiApplication>
 
-#include <osmscout/Database.h>
+#include <osmscout/db/Database.h>
+
 #include <osmscoutmap/MapService.h>
 
 #include <osmscout/feature/ConstructionYearFeature.h>
@@ -156,12 +157,12 @@ int main(int argc, char* argv[])
 
   if (buildingType!=nullptr) {
     /*
-    osmscout::FillStyleProcessorRef constructionProcessor=std::make_shared<ConstructionProcessor>(*database->GetTypeConfig());
+    osmscout::FillStyleProcessorRef constructionProcessor=std::make_shared<ConstructionProcessor>(*db->GetTypeConfig());
     drawParameter.RegisterFillStyleProcessor(buildingType->GetIndex(),
                                              constructionProcessor);*/
 
     /*
-    osmscout::FillStyleProcessorRef addressProcessor=std::make_shared<AddressProcessor>(*database->GetTypeConfig());
+    osmscout::FillStyleProcessorRef addressProcessor=std::make_shared<AddressProcessor>(*db->GetTypeConfig());
     drawParameter.RegisterFillStyleProcessor(buildingType->GetIndex(),
                                           addressProcessor);*/
   }

diff --git a/Demos/src/DumpOSS.cpp b/Demos/src/DumpOSS.cpp
@@ -23,7 +23,7 @@
 #include <osmscout/TypeConfig.h>
 #include <osmscoutmap/StyleConfig.h>
 
-#include <osmscout/util/CmdLineParsing.h>
+#include <osmscout/cli/CmdLineParsing.h>
 
 struct Arguments
 {

diff --git a/Demos/src/ElevationProfile.cpp b/Demos/src/ElevationProfile.cpp
@@ -17,15 +17,18 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
+
 #include <osmscoutgpx/Import.h>
 
-#include <osmscout/util/CmdLineParsing.h>
-#include <osmscout/util/Logger.h>
-#include <osmscout/util/Distance.h>
 #include <osmscout/ElevationService.h>
 
+#include <osmscout/cli/CmdLineParsing.h>
+#include <osmscout/log/Logger.h>
+#include <osmscout/util/Distance.h>
+
 #include <iostream>
-#include <osmscout/Database.h>
+#include <osmscout/db/Database.h>
+
 #include <osmscoutgpx/Export.h>
 
 struct Arguments
@@ -113,7 +116,7 @@ int main(int argc, char* argv[])
                             args.database=value;
                           }),
                           "DATABASE",
-                          "OSMScout database directory");
+                          "OSMScout db directory");
 
   argParser.AddPositional(osmscout::CmdLineStringOption([&args](const std::string& value) {
                             args.gpxInput=value;
@@ -178,7 +181,7 @@ int main(int argc, char* argv[])
   auto                        database=std::make_shared<osmscout::Database>(databaseParameter);
 
   if (!database->Open(args.database)) {
-    std::cerr << "Cannot open database" << std::endl;
+    std::cerr << "Cannot open db" << std::endl;
     return 1;
   }
 

diff --git a/Demos/src/GpxPipe.cpp b/Demos/src/GpxPipe.cpp
@@ -20,8 +20,8 @@
 #include <osmscoutgpx/Import.h>
 #include <osmscoutgpx/Export.h>
 
-#include <osmscout/util/CmdLineParsing.h>
-#include <osmscout/util/Logger.h>
+#include <osmscout/cli/CmdLineParsing.h>
+#include <osmscout/log/Logger.h>
 #include <osmscout/util/Distance.h>
 
 #include <iostream>

diff --git a/Demos/src/LocationDescription.cpp b/Demos/src/LocationDescription.cpp
@@ -17,17 +17,16 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <cctype>
 #include <iostream>
-#include <iomanip>
 
-#include <osmscout/Database.h>
-#include <osmscout/LocationService.h>
-#include <osmscout/LocationDescriptionService.h>
+#include <osmscout/db/Database.h>
+
+#include <osmscout/location/LocationService.h>
+#include <osmscout/location/LocationDescriptionService.h>
 
 #include <osmscout/feature/AdminLevelFeature.h>
 
-#include <osmscout/util/CmdLineParsing.h>
+#include <osmscout/cli/CmdLineParsing.h>
 
 struct Arguments
 {
@@ -219,7 +218,7 @@ int main(int argc, char* argv[])
                             args.databaseDirectory=value;
                           }),
                           "DATABASE",
-                          "Directory of the database to use");
+                          "Directory of the db to use");
 
   argParser.AddPositional(osmscout::CmdLineGeoCoordOption([&args](const osmscout::GeoCoord& value) {
                             args.location=value;
@@ -255,7 +254,7 @@ int main(int argc, char* argv[])
   osmscout::DatabaseRef       database(new osmscout::Database(databaseParameter));
 
   if (!database->Open(args.databaseDirectory)) {
-    std::cerr << "Cannot open database" << std::endl;
+    std::cerr << "Cannot open db" << std::endl;
 
     return 1;
   }

diff --git a/Demos/src/LocationLookup.cpp b/Demos/src/LocationLookup.cpp
@@ -17,15 +17,14 @@
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
-#include <cctype>
 #include <iostream>
-#include <iomanip>
 
-#include <osmscout/Database.h>
-#include <osmscout/LocationService.h>
-#include <osmscout/LocationDescriptionService.h>
+#include <osmscout/db/Database.h>
 
-#include <osmscout/util/CmdLineParsing.h>
+#include <osmscout/location/LocationService.h>
+#include <osmscout/location/LocationDescriptionService.h>
+
+#include <osmscout/cli/CmdLineParsing.h>
 
 struct Arguments
 {
@@ -392,7 +391,7 @@ int main(int argc, char* argv[])
                             args.databaseDirectory=value;
                           }),
                           "DATABASE",
-                          "Directory of the database to use");
+                          "Directory of the db to use");
 
   argParser.AddPositional(osmscout::CmdLineStringListOption([&args](const std::string& value) {
                             args.location.push_back(value);
@@ -439,7 +438,7 @@ int main(int argc, char* argv[])
   osmscout::DatabaseRef       database(new osmscout::Database(databaseParameter));
 
   if (!database->Open(args.databaseDirectory)) {
-    std::cerr << "Cannot open database" << std::endl;
+    std::cerr << "Cannot open db" << std::endl;
 
     return 1;
   }