jklimke · gostefan · Aug 1, 2024 · Aug 1, 2024 · Aug 1, 2024 · Aug 1, 2024
diff --git a/.github/workflows/cmake-multi-platform.yml b/.github/workflows/cmake-multi-platform.yml
@@ -7,6 +7,7 @@ on:
     branches: [ "master" ]
   pull_request:
     branches: [ "master" ]
+  workflow_dispatch:
 
 env:
   XERCES_C_VERSION: v3.2.5

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,6 @@
-CMAKE_MINIMUM_REQUIRED(VERSION 3.5.0 FATAL_ERROR)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.8.0 FATAL_ERROR)
+
+set(CMAKE_CXX_STANDARD 17)
 
 PROJECT ( libcitygml )
 
@@ -58,9 +60,9 @@ ENDIF(WIN32)
 if(UNIX)
     if(APPLE)
         MESSAGE(STATUS "APPLE")
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
     else(APPLE)
-        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11 -fPIC")
+        set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
 
         MESSAGE(STATUS "Setting UNIX compile flags: ${CMAKE_CXX_FLAGS}")
     endif(APPLE)
@@ -152,6 +154,8 @@ OPTION(LIBCITYGML_TESTS "Set to ON to build libcitygml tests programs." ON)
 IF   (LIBCITYGML_TESTS)
   enable_testing()
   ADD_SUBDIRECTORY( test )
+
+  ADD_SUBDIRECTORY( systemTests )
 ENDIF(LIBCITYGML_TESTS)
 
 

diff --git a/CTestTestfile.cmake b/CTestTestfile.cmake
diff --git a/data/systemTests/CityObjectsTypeMask/BridgeAndBuilding.gml b/data/systemTests/CityObjectsTypeMask/BridgeAndBuilding.gml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>
+<core:CityModel xmlns:gml="http://www.opengis.net/gml" xmlns:core="http://www.opengis.net/citygml/2.0" xmlns:brid="http://www.opengis.net/citygml/bridge/2.0" xmlns:bldg="http://www.opengis.net/citygml/building/2.0">
+	<gml:boundedBy>
+		<gml:Envelope srsName="EPSG:23632" srsDimension="3">
+			<gml:lowerCorner>457644.585 5439126.455 109.0</gml:lowerCorner>
+			<gml:upperCorner>457708.084 5439157.169 124.3</gml:upperCorner>
+		</gml:Envelope>
+	</gml:boundedBy>
+	<core:cityObjectMember>
+		<brid:Bridge>
+			<brid:lod2MultiSurface>
+				<gml:MultiSurface>
+					<gml:surfaceMember>
+						<gml:Polygon>
+							<gml:exterior>
+								<gml:LinearRing>
+									<gml:posList srsDimension="3">
+									0 0 0
+									0 10 0
+									10 10 0
+									10 0 0
+									0 0 0
+									</gml:posList>
+								</gml:LinearRing>
+							</gml:exterior>
+						</gml:Polygon>
+					</gml:surfaceMember>
+				</gml:MultiSurface>
+			</brid:lod2MultiSurface>
+		</brid:Bridge>
+	</core:cityObjectMember>
+	<core:cityObjectMember>
+		<bldg:Building>
+			<bldg:consistsOfBuildingPart>
+				<bldg:BuildingPart>
+					<bldg:boundedBy>
+						<bldg:WallSurface>
+							<bldg:lod2MultiSurface>
+								<gml:MultiSurface>
+									<gml:surfaceMember>
+										<gml:CompositeSurface>
+											<gml:surfaceMember>
+												<gml:Polygon>
+													<gml:exterior>
+														<gml:LinearRing>
+															<gml:posList srsDimension="3">
+															15 0 0
+															15 10 0
+															25 10 0
+															25 0 0
+															15 0 0
+															</gml:posList>
+														</gml:LinearRing>
+													</gml:exterior>
+												</gml:Polygon>
+											</gml:surfaceMember>
+										</gml:CompositeSurface>
+									</gml:surfaceMember>
+								</gml:MultiSurface>
+							</bldg:lod2MultiSurface>
+						</bldg:WallSurface>
+					</bldg:boundedBy>
+				</bldg:BuildingPart>
+			</bldg:consistsOfBuildingPart>
+		</bldg:Building>
+	</core:cityObjectMember>
+</core:CityModel>
diff --git a/osgplugin/ReaderWriterCityGML.cpp b/osgplugin/ReaderWriterCityGML.cpp
@@ -105,7 +105,11 @@ class CityGMLSettings
         {
             std::transform( currentOption.begin(), currentOption.end(), currentOption.begin(), ::tolower );
             if ( currentOption == "names" ) _printNames = true;
-            else if ( currentOption == "mask" ) iss >> _params.objectsMask;
+            else if ( currentOption == "mask" ) {
+                citygml::CityObjectsTypeMask mask;
+                iss >> mask;
+                _params.objectsMask = mask;
+            }
             else if ( currentOption == "minlod" ) iss >> _params.minLOD;
             else if ( currentOption == "maxlod" ) iss >> _params.maxLOD;
             else if ( currentOption == "optimize" ) _params.optimize = true;
@@ -177,15 +181,15 @@ class ReaderWriterCityGML : public osgDB::ReaderWriter
 
     virtual ReadResult readNode( const std::string&, const osgDB::ReaderWriter::Options* ) const override;
     virtual ReadResult readNode( std::istream&, const osgDB::ReaderWriter::Options* ) const override;
-  virtual ReadResult readObject(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const
+    virtual ReadResult readObject(const std::string& fileName, const osgDB::ReaderWriter::Options* options) const override
     {
         ReadResult result = readNode(fileName, options);
         osg::Node* node = result.getNode();
         if (node) return node;
         else return result;
     }
 
-    virtual ReadResult readObject(std::istream& fin, const Options* options) const
+    virtual ReadResult readObject(std::istream& fin, const Options* options) const override
     {
         ReadResult result = readNode(fin, options);
         osg::Node* node = result.getNode();

diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt
@@ -135,7 +135,6 @@ SET(PUBLIC_HEADER
   include/citygml/citygml_api.h
   include/citygml/citygml_export.h
   include/citygml/attributesmap.h
-  include/citygml/enum_type_bitmask.h
   include/citygml/citygmllogger.h
   include/citygml/polygon.h
   include/citygml/material.h
@@ -164,6 +163,7 @@ SET(PUBLIC_HEADER
   include/citygml/address.h
   include/citygml/rectifiedgridcoverage.h
   include/citygml/externalreference.h
+  include/citygml/warnings.h
 )
 
 

diff --git a/sources/include/citygml/address.h b/sources/include/citygml/address.h
@@ -2,6 +2,7 @@
 
 #include <citygml/citygml_api.h>
 #include <citygml/object.h>
+#include <citygml/warnings.h>
 
 namespace citygml {
 
@@ -26,11 +27,13 @@ namespace citygml {
         void setThoroughfareNumber(const std::string& thoroughfareNumber);
 
     protected:
+        PRAGMA_WARN_DLL_BEGIN
         std::string m_country;
         std::string m_locality;
         std::string m_thoroughfareName;
         std::string m_thoroughfareNumber;
         std::string m_postalCode;
+        PRAGMA_WARN_DLL_END
     };
 
 } /* namespace citygml */
diff --git a/sources/include/citygml/appearance.h b/sources/include/citygml/appearance.h
@@ -6,6 +6,7 @@
 
 #include <citygml/citygml_api.h>
 #include <citygml/object.h>
+#include <citygml/warnings.h>
 #include <citygml/appearancetarget.h>
 
 namespace citygml {
@@ -14,8 +15,11 @@ namespace citygml {
     class Texture;
     class GeoreferencedTexture;
 
+
+    PRAGMA_WARN_DLL_BEGIN
     class LIBCITYGML_EXPORT Appearance : public Object, public std::enable_shared_from_this<Appearance>
     {
+    PRAGMA_WARN_DLL_END
     public:
         std::string getType() const;
 
@@ -41,8 +45,11 @@ namespace citygml {
 
     protected:
         Appearance( const std::string& id, const std::string& typeString );
+        PRAGMA_WARN_DLL_BEGIN
         std::string m_typeString;
         std::vector<std::string> m_themes;
+        PRAGMA_WARN_DLL_END
+
         bool m_isFront;
     };
 

diff --git a/sources/include/citygml/appearancemanager.h b/sources/include/citygml/appearancemanager.h
@@ -6,6 +6,7 @@
 #include <unordered_map>
 
 #include <citygml/object.h>
+#include <citygml/warnings.h>
 #include <citygml/vecs.hpp>
 
 namespace citygml {
@@ -53,12 +54,14 @@ namespace citygml {
 
 
     protected:
+        PRAGMA_WARN_DLL_BEGIN
         std::unordered_map<std::string, std::shared_ptr<Appearance> > m_appearancesMap;
         std::vector<std::shared_ptr<MaterialTargetDefinition> > m_materialTargetDefinitions;
         std::vector<std::shared_ptr<TextureTargetDefinition> > m_texTargetDefinitions;
         std::unordered_set<std::string> m_themes;
         std::unordered_map<std::string, AppearanceTarget*> m_appearanceTargetsMap;
         std::shared_ptr<CityGMLLogger> m_logger;
+        PRAGMA_WARN_DLL_END
 
         void addThemesFrom(std::shared_ptr<Appearance> surfaceData);
     };

diff --git a/sources/include/citygml/appearancetarget.h b/sources/include/citygml/appearancetarget.h
@@ -6,6 +6,7 @@
 
 #include <citygml/object.h>
 #include <citygml/appearancetargetdefinition.h>
+#include <citygml/warnings.h>
 
 
 namespace citygml {
@@ -45,11 +46,13 @@ namespace citygml {
 
 
     private:
+        PRAGMA_WARN_DLL_BEGIN
         std::unordered_map<std::string, std::shared_ptr<MaterialTargetDefinition> > m_themeMatMapFront;
         std::unordered_map<std::string, std::shared_ptr<MaterialTargetDefinition> > m_themeMatMapBack;
 
         std::unordered_map<std::string, std::shared_ptr<TextureTargetDefinition> > m_themeTexMapFront;
         std::unordered_map<std::string, std::shared_ptr<TextureTargetDefinition> > m_themeTexMapBack;
+        PRAGMA_WARN_DLL_END
 
     };
 }
diff --git a/sources/include/citygml/appearancetargetdefinition.h b/sources/include/citygml/appearancetargetdefinition.h
@@ -4,6 +4,7 @@
 #include <string>
 
 #include <citygml/object.h>
+#include <citygml/warnings.h>
 
 namespace citygml {
 
@@ -39,8 +40,11 @@ namespace citygml {
         virtual ~AppearanceTargetDefinition() {}
 
     protected:
+        PRAGMA_WARN_DLL_BEGIN
         std::string m_targetID;
         std::shared_ptr<T> m_appearance;
+        PRAGMA_WARN_DLL_END
+
     };
 
 }
diff --git a/sources/include/citygml/attributesmap.h b/sources/include/citygml/attributesmap.h
@@ -4,6 +4,7 @@
 #include <map>
 
 #include <citygml/citygml_api.h>
+#include <citygml/warnings.h>
 
 namespace citygml
 {
@@ -45,7 +46,9 @@ class LIBCITYGML_EXPORT AttributeValue
     int asInteger(int defaultValue=0) const;
 private:
     AttributeType m_type;
+    PRAGMA_WARN_DLL_BEGIN
     std::string m_value;
+    PRAGMA_WARN_DLL_END
 };
 
 LIBCITYGML_EXPORT std::ostream& operator<<(std::ostream& os, const AttributeValue& o);

diff --git a/sources/include/citygml/citygml.h b/sources/include/citygml/citygml.h
@@ -32,6 +32,7 @@
 #include <citygml/cityobject.h>
 #include <citygml/envelope.h>
 #include <citygml/tesselatorbase.h>
+#include <citygml/warnings.h>
 
 namespace citygml
 {
@@ -42,8 +43,6 @@ namespace citygml
     class Material;
     class AppearanceManager;
 
-    typedef EnumClassBitmask<CityObject::CityObjectsType> CityObjectsTypeMask;
-
 
     ///////////////////////////////////////////////////////////////////////////////
     // Parsing routines
@@ -63,7 +62,7 @@ namespace citygml
     {
     public:
         ParserParams()
-            : objectsMask(CityObject::CityObjectsType::COT_All)
+            : objectsMask(~CityObjectsTypeMask{})
             , minLOD( 0 )
             , maxLOD( 4 )
             , optimize( false )
@@ -75,15 +74,32 @@ namespace citygml
         { }
 
     public:
-        CityObjectsTypeMask objectsMask;
+        template <typename New, typename Old, New (*Transform)(Old)>
+        class LegacyAssignable {
+        public:
+            LegacyAssignable(New const& val) : value(val) {}
+            New& operator=(New const& val) { value = val; return value; }
+            [[deprecated]] Old operator=(Old val) { value = Transform(val); return val; }
+            New const& operator->() const { return value; }
+            New const& get() const { return value; }
+            operator New const&() const { return value; }
+        private:
+            New value;
+        };
+
+        PRAGMA_WARN_DLL_BEGIN
+        LegacyAssignable<CityObjectsTypeMask, CityObject::CityObjectsType, toMask> objectsMask;
+        PRAGMA_WARN_DLL_END
         unsigned int minLOD;
         unsigned int maxLOD;
         bool optimize;
         bool pruneEmptyObjects;
         bool tesselate;
         bool keepVertices;
+        PRAGMA_WARN_DLL_BEGIN
         std::string destSRS;
         std::string srcSRS;
+        PRAGMA_WARN_DLL_END
     };
 
     LIBCITYGML_EXPORT std::shared_ptr<const CityModel> load( std::istream& stream, const ParserParams& params, std::unique_ptr<TesselatorBase> tesselator, std::shared_ptr<CityGMLLogger> logger = nullptr);

diff --git a/sources/include/citygml/citygmlfactory.h b/sources/include/citygml/citygmlfactory.h
@@ -3,6 +3,7 @@
 #include <citygml/geometry.h>
 #include <citygml/cityobject.h>
 #include <citygml/externalreference.h>
+#include <citygml/warnings.h>
 
 #include <memory>
 
@@ -70,10 +71,12 @@ namespace citygml {
     protected:
         void appearanceTargetCreated(AppearanceTarget* obj);
 
+        PRAGMA_WARN_DLL_BEGIN
         std::shared_ptr<CityGMLLogger> m_logger;
         std::unique_ptr<AppearanceManager> m_appearanceManager;
         std::unique_ptr<PolygonManager> m_polygonManager;
         std::unique_ptr<GeometryManager> m_geometryManager;
+        PRAGMA_WARN_DLL_END
     };
 
 }