Merge pull request #56 from jklimke/master_internal_building

internal building installation with english readme
jklimke · Sep 25, 2019 · dc507ab · dc507ab
2 parents 6b56983 + 6ea56d4
commit dc507ab
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 7 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -16,7 +16,7 @@ addons:
     packages:
       - libxerces-c-dev
       - libxerces-c3.1
-      - libgdal1h
+      - libgdal1i
       - libgdal-dev
       - cmake-data
       - cmake

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,8 +3,8 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0.0 FATAL_ERROR)
 PROJECT ( libcitygml )
 
 set(META_VERSION_MAJOR       "2")
-set(META_VERSION_MINOR       "0")
-set(META_VERSION_PATCH       "9")
+set(META_VERSION_MINOR       "2")
+set(META_VERSION_PATCH       "0")
 
 set(META_VERSION             "${META_VERSION_MAJOR}.${META_VERSION_MINOR}.${META_VERSION_PATCH}")
 

diff --git a/sources/include/citygml/cityobject.h b/sources/include/citygml/cityobject.h
@@ -62,6 +62,9 @@ namespace citygml {
             // covers all supertypes of tran::_TransportationObject that are not Track, Road, Railway or Square...
             // there are to many for to few bits to explicitly enumerate them. However Track, Road, Railway or Square should be used most of the time
             COT_TransportationObject        = 1ll<< 33,
+
+           	// ADD Buildding model 
+			COT_IntBuildingInstallation		= 1ll<< 34,
 
             COT_All                         = 0xFFFFFFFFFFFFFFFFll
         };

diff --git a/sources/include/parser/nodetypes.h b/sources/include/parser/nodetypes.h
@@ -209,7 +209,8 @@ namespace citygml {
         NODETYPE( BLDG, OuterCeilingSurface )
         NODETYPE( BLDG, OuterFloorSurface )
         NODETYPE( BLDG, BuildingFurniture )
-
+        NODETYPE( BLDG, IntBuildingInstallation)
+
         NODETYPE( BLDG, CityFurniture )
         NODETYPE( BLDG, Address)
 

diff --git a/sources/src/citygml/cityobject.cpp b/sources/src/citygml/cityobject.cpp
@@ -209,6 +209,8 @@ namespace citygml {
             return "OuterFloorSurface";
         case CityObject::CityObjectsType::COT_TransportationObject:
             return "TransportationObject";
+        case CityObject::CityObjectsType::COT_IntBuildingInstallation:
+	    return "IntBuildingInstallation";
         default:
             return "Unknown";
         }
@@ -253,7 +255,8 @@ namespace citygml {
          {cityObjectsTypeToLowerString(CityObject::CityObjectsType::COT_CeilingSurface), CityObject::CityObjectsType::COT_CeilingSurface},
          {cityObjectsTypeToLowerString(CityObject::CityObjectsType::COT_OuterCeilingSurface), CityObject::CityObjectsType::COT_OuterCeilingSurface},
          {cityObjectsTypeToLowerString(CityObject::CityObjectsType::COT_OuterFloorSurface), CityObject::CityObjectsType::COT_OuterFloorSurface},
-         {cityObjectsTypeToLowerString(CityObject::CityObjectsType::COT_TransportationObject), CityObject::CityObjectsType::COT_TransportationObject}
+         {cityObjectsTypeToLowerString(CityObject::CityObjectsType::COT_TransportationObject), CityObject::CityObjectsType::COT_TransportationObject},
+	 {cityObjectsTypeToLowerString(CityObject::CityObjectsType::COT_IntBuildingInstallation), CityObject::CityObjectsType::COT_IntBuildingInstallation}
     };
 
     CityObject::CityObjectsType cityObjectsTypeFromString(const std::string& s, bool& valid)

diff --git a/sources/src/parser/cityobjectelementparser.cpp b/sources/src/parser/cityobjectelementparser.cpp
@@ -93,6 +93,7 @@ namespace citygml {
                 typeIDTypeMap.insert(HANDLE_TYPE(BLDG, OuterFloorSurface));
                 typeIDTypeMap.insert(HANDLE_TYPE(GRP, CityObjectGroup));
                 typeIDTypeMap.insert(HANDLE_TYPE(DEM, ReliefFeature));
+                typeIDTypeMap.insert(HANDLE_TYPE(BLDG, IntBuildingInstallation));
 
                 typeIDTypeMapInitialized = true;
             }

diff --git a/sources/src/parser/nodetypes.cpp b/sources/src/parser/nodetypes.cpp
@@ -267,6 +267,7 @@ namespace citygml {
                 INITIALIZE_NODE( BLDG, OuterFloorSurface )
                 INITIALIZE_NODE( BLDG, BuildingFurniture )
                 INITIALIZE_NODE( BLDG, RoofType)
+                INITIALIZE_NODE( BLDG, IntBuildingInstallation)
 
                 INITIALIZE_NODE( BLDG, CityFurniture )
 
@@ -646,7 +647,8 @@ namespace citygml {
     DEFINE_NODE( BLDG, OuterFloorSurface )
     DEFINE_NODE( BLDG, BuildingFurniture )
     DEFINE_NODE( BLDG, RoofType)
-
+    DEFINE_NODE( BLDG, IntBuildingInstallation)
+
     DEFINE_NODE( BLDG, CityFurniture )
 
     DEFINE_NODE( BLDG, Address)

diff --git a/test/citygmltest.cpp b/test/citygmltest.cpp
@@ -32,7 +32,7 @@ void usage()
     std::cout << "  -filter <mask>  CityGML objects to parse (default:All)" << std::endl
         << "                  The mask is composed of:" << std::endl
         << "                   GenericCityObject, Building, Room," << std::endl
-        << "                   BuildingInstallation, BuildingFurniture, Door, Window, " << std::endl
+        << "                   BuildingInstallation, BuildingFurniture, IntBuildingInstallation, Door, Window, " << std::endl
         << "                   CityFurniture, Track, Road, Railway, Square, PlantCover," << std::endl
         << "                   SolitaryVegetationObject, WaterBody, TINRelief, LandUse," << std::endl
         << "                   Tunnel, Bridge, BridgeConstructionElement," << std::endl