From 6718d006c824cbfc501f0e3e93766903615b2c2e Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 14:32:43 +0900 Subject: [PATCH 01/18] Update cityobject.cpp Add intBuildingInstallation --- sources/src/citygml/cityobject.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sources/src/citygml/cityobject.cpp b/sources/src/citygml/cityobject.cpp index a3b14735..d2c7a3fc 100644 --- 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) From 99d51f3c70b3dea6846483fc4c9463694e8951b1 Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 14:34:23 +0900 Subject: [PATCH 02/18] Update cityobject.cpp Alignment --- sources/src/citygml/cityobject.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sources/src/citygml/cityobject.cpp b/sources/src/citygml/cityobject.cpp index d2c7a3fc..4b050621 100644 --- a/sources/src/citygml/cityobject.cpp +++ b/sources/src/citygml/cityobject.cpp @@ -210,7 +210,7 @@ namespace citygml { case CityObject::CityObjectsType::COT_TransportationObject: return "TransportationObject"; case CityObject::CityObjectsType::COT_IntBuildingInstallation: - return "IntBuildingInstallation"; + return "IntBuildingInstallation"; default: return "Unknown"; } @@ -256,7 +256,7 @@ namespace citygml { {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_IntBuildingInstallation), CityObject::CityObjectsType::COT_IntBuildingInstallation} + {cityObjectsTypeToLowerString(CityObject::CityObjectsType::COT_IntBuildingInstallation), CityObject::CityObjectsType::COT_IntBuildingInstallation} }; CityObject::CityObjectsType cityObjectsTypeFromString(const std::string& s, bool& valid) From cf5a76d9a203b1ab0b2475ad79983c78e6f93ea8 Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 14:43:36 +0900 Subject: [PATCH 03/18] Update cityobjectelementparser.cpp Add IntBuildingInstallation --- sources/src/parser/cityobjectelementparser.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/sources/src/parser/cityobjectelementparser.cpp b/sources/src/parser/cityobjectelementparser.cpp index dd43786a..cef24fa5 100644 --- 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; } From 1e5535afd6eb187cb35cfa39ff5ebe7bafb2dbfa Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 14:48:59 +0900 Subject: [PATCH 04/18] Update nodetype.cpp Add intBuildingInstallation --- sources/src/parser/nodetypes.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sources/src/parser/nodetypes.cpp b/sources/src/parser/nodetypes.cpp index 247933bf..f7c92ebe 100644 --- 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) From f347f6cbce974e2cf380f14d279e05207093025f Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 15:01:17 +0900 Subject: [PATCH 05/18] Update cityobject.h Add IntBuildingInstallation --- sources/include/citygml/cityobject.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sources/include/citygml/cityobject.h b/sources/include/citygml/cityobject.h index 58d882e5..dbaeb891 100644 --- 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 }; From 1f4081ed129589019712de55f66d6f472b129d76 Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 15:05:07 +0900 Subject: [PATCH 06/18] Update nodetypes.h Add intBuildingInstallation --- sources/include/parser/nodetypes.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sources/include/parser/nodetypes.h b/sources/include/parser/nodetypes.h index c78d04dc..34611bcc 100644 --- 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) From 8484e27264b744c8113015ca7f3fb072b69febba Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 15:11:32 +0900 Subject: [PATCH 07/18] Update citygmltest.cpp Add IntBuildingInstallation --- test/citygmltest.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/citygmltest.cpp b/test/citygmltest.cpp index 7b87d797..346d742d 100644 --- a/test/citygmltest.cpp +++ b/test/citygmltest.cpp @@ -32,7 +32,7 @@ void usage() std::cout << " -filter 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 From 26592258524f97e196140e21163f51d1f009da77 Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 16:30:09 +0900 Subject: [PATCH 08/18] Update README.md Modify Readme.md --- README.md | 50 +++++++------------------------------------------- 1 file changed, 7 insertions(+), 43 deletions(-) diff --git a/README.md b/README.md index 69f7cf76..b528dd6c 100644 --- a/README.md +++ b/README.md @@ -1,44 +1,8 @@ -libcitygml -========== -[![Build Status](https://travis-ci.org/jklimke/libcitygml.svg?branch=master)](https://travis-ci.org/jklimke/libcitygml) - -[CityGML](http://www.citygml.org/) (City Geography Markup Language) is an XML-based schema for the modelling and exchange of georeferenced 3D city and landscape models that is quickly being adopted on an international level. - -libcitygml is a small and easy to use open source C++ library for parsing CityGML files in such a way that data can be easily exploited by 3D rendering applications (geometry data are tesselated and optimized for rendering during parsing). For instance, it can be used to develop readers of CityGML files in many 3D based applications (OpenGL, OpenSceneGraph, ...) Most metadata are not lost, they are available through a per-node hashmap. - -The project also contains a loader plugin for [OpenSceneGraph](http://www.openscenegraph.org/). It enables OpenSceneGraph (if installed) to read citygml documents for easy rendering and further graphical optimization. - -libcitygml was initally developed by the 3D team of BRGM (the French leading public institution involved in the Earth Science field for the sustainable management of natural resources and surface and subsurface risks) for the research project DeepCity3D. It is now conducted as a Github open source project. - -It was moved to github due to inactivity of the project on google code (https://code.google.com/p/libcitygml/). - - -How to Setup -============ - -The project is based on the CMAKE build system and should be pretty straight forward to setup. - -Dependencies: - -The XercesC xml parsing library is the only requirement compiling and using libcitygml. - -GDAL is required if coordinate transformations should be applied during paring. - -OpenSceneGraph is required for building the plugin. - -Test Data Attribution -===================== - - -Overview over the testing data within the "data" directory: - -| Dataset | Attribution | Source | -| ------------------------- |:---------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------:| -| data/b1_lod2_cs_w_sem.gml | https://www.citygml.org/samplefiles/building/ | [https://www.citygml.org](https://www.citygml.org/samplefiles/) | -| data/b1_lod2_s.gml | https://www.citygml.org/samplefiles/building/ | [https://www.citygml.org](https://www.citygml.org/samplefiles/) | -| data/berlin_open_data_sample_data.gml | Berlin Partner für Wirtschaft und Technologie GmbH | [Berlin Partner Download Portal](http://www.businesslocationcenter.de/berlin3d-downloadportal/?lang=en) | - - - - +libcitygml +======= +(내부 : 3DGISDataStore) +이 프로젝트는 문화기술 연구개발 과제 중, [공간 데이터기반 문화콘텐츠 창/제작 인프라 생성 기술 개발] 과제를 수행하기 위해 제작되고 있습니다. +프로젝트를 수행함에 있어서 C++라이브러리인 libcitygml라이브러리를 활용하여 citygml파일 관련한 기능을 구현할 것입니다. +감사합니다. +공간정보기술(주) 연구소 http://www.git.co.kr/ From 688e3400010829915f15b1b63969500506944f54 Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 16:30:57 +0900 Subject: [PATCH 09/18] Update README.md modify README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index b528dd6c..44c14bcb 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,11 @@ libcitygml ======= (내부 : 3DGISDataStore) + 이 프로젝트는 문화기술 연구개발 과제 중, [공간 데이터기반 문화콘텐츠 창/제작 인프라 생성 기술 개발] 과제를 수행하기 위해 제작되고 있습니다. + 프로젝트를 수행함에 있어서 C++라이브러리인 libcitygml라이브러리를 활용하여 citygml파일 관련한 기능을 구현할 것입니다. + 감사합니다. + 공간정보기술(주) 연구소 http://www.git.co.kr/ From 974515bb0bccb345e449c1b210784cc5b3c3fc8f Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 17:19:40 +0900 Subject: [PATCH 10/18] Update README.md modify README.md --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 44c14bcb..47570d24 100644 --- a/README.md +++ b/README.md @@ -7,6 +7,11 @@ libcitygml 프로젝트를 수행함에 있어서 C++라이브러리인 libcitygml라이브러리를 활용하여 citygml파일 관련한 기능을 구현할 것입니다. +이 프로그램들은 완성되지 않았으며, 최종 완료 전 까지 문제가 발생할 수 있으며, 우선 libcitygml 라이선스를 따르고 발생된 문제는 최종 사용자에게 있으며, 완료가 된다면 제시된 라이선스 및 규약을 적용할 예정입니다. + 감사합니다. +libcitygml https://github.com/jklimke/libcitygml + GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 + 공간정보기술(주) 연구소 http://www.git.co.kr/ From df189ded483a95374ce098271bdb97b39b91533a Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 17:31:37 +0900 Subject: [PATCH 11/18] Update README.md modify README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 47570d24..3b61685d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ libcitygml 감사합니다. -libcitygml https://github.com/jklimke/libcitygml - GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 +libcitygml Link : https://github.com/jklimke/libcitygml + License : GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 공간정보기술(주) 연구소 http://www.git.co.kr/ From 5833df379ecbea5d0bd97bcaca3d4ca7af5dc2f3 Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 17:42:15 +0900 Subject: [PATCH 12/18] Update README.md modify README.md --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 3b61685d..f36f17f0 100644 --- a/README.md +++ b/README.md @@ -1,17 +1,21 @@ - libcitygml ======= (내부 : 3DGISDataStore) 이 프로젝트는 문화기술 연구개발 과제 중, [공간 데이터기반 문화콘텐츠 창/제작 인프라 생성 기술 개발] 과제를 수행하기 위해 제작되고 있습니다. -프로젝트를 수행함에 있어서 C++라이브러리인 libcitygml라이브러리를 활용하여 citygml파일 관련한 기능을 구현할 것입니다. +프로젝트를 수행함에 있어서 C++라이브러리인 libcitygml라이브러리를 활용하여 citygml파일 관련 기능을 구현할 것입니다. -이 프로그램들은 완성되지 않았으며, 최종 완료 전 까지 문제가 발생할 수 있으며, 우선 libcitygml 라이선스를 따르고 발생된 문제는 최종 사용자에게 있으며, 완료가 된다면 제시된 라이선스 및 규약을 적용할 예정입니다. +이 프로그램은 완성되지 않았으며, 최종 완료 전 까지 문제가 발생할 수 있습니다. 우선 libcitygml 라이선스를 따르고 발생된 문제는 최종 사용자에게 있으며, 완료가 된다면 제시된 라이선스 및 규약을 적용할 예정입니다. 감사합니다. -libcitygml Link : https://github.com/jklimke/libcitygml - License : GNU LESSER GENERAL PUBLIC LICENSE Version 2.1 +공간정보기술(주) 연구소 http://www.git.co.kr/   + + +연구기관 +--- + +libcitygml(GNU LESSER GENERAL PUBLIC LICENSE Version 2.1) https://github.com/jklimke/libcitygml -공간정보기술(주) 연구소 http://www.git.co.kr/ + From e011226a588aea2dfb0367c48e98b1293d9c843e Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Mon, 29 Jan 2018 17:42:53 +0900 Subject: [PATCH 13/18] Update README.md modify README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f36f17f0..798863f2 100644 --- a/README.md +++ b/README.md @@ -13,7 +13,7 @@ libcitygml 공간정보기술(주) 연구소 http://www.git.co.kr/   -연구기관 +라이브러리 --- libcitygml(GNU LESSER GENERAL PUBLIC LICENSE Version 2.1) https://github.com/jklimke/libcitygml From 0bbc2e03cb4bfcd5dba8fbd7f606a95686e85b75 Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Tue, 30 Jan 2018 14:14:51 +0900 Subject: [PATCH 14/18] Update README.md Update README.md --- README.md | 42 ++++++++++++++++++++++-------------------- 1 file changed, 22 insertions(+), 20 deletions(-) diff --git a/README.md b/README.md index 798863f2..d34f68ec 100644 --- a/README.md +++ b/README.md @@ -1,21 +1,23 @@ libcitygml -======= -(내부 : 3DGISDataStore) - -이 프로젝트는 문화기술 연구개발 과제 중, [공간 데이터기반 문화콘텐츠 창/제작 인프라 생성 기술 개발] 과제를 수행하기 위해 제작되고 있습니다. - -프로젝트를 수행함에 있어서 C++라이브러리인 libcitygml라이브러리를 활용하여 citygml파일 관련 기능을 구현할 것입니다. - -이 프로그램은 완성되지 않았으며, 최종 완료 전 까지 문제가 발생할 수 있습니다. 우선 libcitygml 라이선스를 따르고 발생된 문제는 최종 사용자에게 있으며, 완료가 된다면 제시된 라이선스 및 규약을 적용할 예정입니다. - -감사합니다. - -공간정보기술(주) 연구소 http://www.git.co.kr/   - - -라이브러리 ---- - -libcitygml(GNU LESSER GENERAL PUBLIC LICENSE Version 2.1) https://github.com/jklimke/libcitygml - - +========== +[![Build Status](https://travis-ci.org/jklimke/libcitygml.svg?branch=master)](https://travis-ci.org/jklimke/libcitygml) +[CityGML](http://www.citygml.org/) (City Geography Markup Language) is an XML-based schema for the modelling and exchange of georeferenced 3D city and landscape models that is quickly being adopted on an international level. +libcitygml is a small and easy to use open source C++ library for parsing CityGML files in such a way that data can be easily exploited by 3D rendering applications (geometry data are tesselated and optimized for rendering during parsing). For instance, it can be used to develop readers of CityGML files in many 3D based applications (OpenGL, OpenSceneGraph, ...) Most metadata are not lost, they are available through a per-node hashmap. +The project also contains a loader plugin for [OpenSceneGraph](http://www.openscenegraph.org/). It enables OpenSceneGraph (if installed) to read citygml documents for easy rendering and further graphical optimization. +libcitygml was initally developed by the 3D team of BRGM (the French leading public institution involved in the Earth Science field for the sustainable management of natural resources and surface and subsurface risks) for the research project DeepCity3D. It is now conducted as a Github open source project. +It was moved to github due to inactivity of the project on google code (https://code.google.com/p/libcitygml/). +How to Setup +============ +The project is based on the CMAKE build system and should be pretty straight forward to setup. +Dependencies: +The XercesC xml parsing library is the only requirement compiling and using libcitygml. +GDAL is required if coordinate transformations should be applied during paring. +OpenSceneGraph is required for building the plugin. +Test Data Attribution +===================== +Overview over the testing data within the "data" directory: +| Dataset | Attribution | Source | +| ------------------------- |:---------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------:| +| data/b1_lod2_cs_w_sem.gml | https://www.citygml.org/samplefiles/building/ | [https://www.citygml.org](https://www.citygml.org/samplefiles/) | +| data/b1_lod2_s.gml | https://www.citygml.org/samplefiles/building/ | [https://www.citygml.org](https://www.citygml.org/samplefiles/) | +| data/berlin_open_data_sample_data.gml | Berlin Partner für Wirtschaft und Technologie GmbH | [Berlin Partner Download Portal](http://www.businesslocationcenter.de/berlin3d-downloadportal/?lang=en) | From 9a0dc9486f924fbedd65503f47400ab8cb203077 Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Tue, 30 Jan 2018 14:15:37 +0900 Subject: [PATCH 15/18] Update README.md Update README.md --- README.md | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/README.md b/README.md index d34f68ec..69f7cf76 100644 --- a/README.md +++ b/README.md @@ -1,23 +1,44 @@ libcitygml ========== [![Build Status](https://travis-ci.org/jklimke/libcitygml.svg?branch=master)](https://travis-ci.org/jklimke/libcitygml) + [CityGML](http://www.citygml.org/) (City Geography Markup Language) is an XML-based schema for the modelling and exchange of georeferenced 3D city and landscape models that is quickly being adopted on an international level. + libcitygml is a small and easy to use open source C++ library for parsing CityGML files in such a way that data can be easily exploited by 3D rendering applications (geometry data are tesselated and optimized for rendering during parsing). For instance, it can be used to develop readers of CityGML files in many 3D based applications (OpenGL, OpenSceneGraph, ...) Most metadata are not lost, they are available through a per-node hashmap. + The project also contains a loader plugin for [OpenSceneGraph](http://www.openscenegraph.org/). It enables OpenSceneGraph (if installed) to read citygml documents for easy rendering and further graphical optimization. + libcitygml was initally developed by the 3D team of BRGM (the French leading public institution involved in the Earth Science field for the sustainable management of natural resources and surface and subsurface risks) for the research project DeepCity3D. It is now conducted as a Github open source project. + It was moved to github due to inactivity of the project on google code (https://code.google.com/p/libcitygml/). + + How to Setup ============ + The project is based on the CMAKE build system and should be pretty straight forward to setup. + Dependencies: + The XercesC xml parsing library is the only requirement compiling and using libcitygml. + GDAL is required if coordinate transformations should be applied during paring. + OpenSceneGraph is required for building the plugin. + Test Data Attribution ===================== + + Overview over the testing data within the "data" directory: + | Dataset | Attribution | Source | | ------------------------- |:---------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------:| | data/b1_lod2_cs_w_sem.gml | https://www.citygml.org/samplefiles/building/ | [https://www.citygml.org](https://www.citygml.org/samplefiles/) | | data/b1_lod2_s.gml | https://www.citygml.org/samplefiles/building/ | [https://www.citygml.org](https://www.citygml.org/samplefiles/) | | data/berlin_open_data_sample_data.gml | Berlin Partner für Wirtschaft und Technologie GmbH | [Berlin Partner Download Portal](http://www.businesslocationcenter.de/berlin3d-downloadportal/?lang=en) | + + + + + From 58f959bff7fb3db312affecd91a847a2cd5b33b1 Mon Sep 17 00:00:00 2001 From: KimJuYoung93 Date: Fri, 2 Feb 2018 17:18:51 +0900 Subject: [PATCH 16/18] Update README.md Update README.md --- README.md | 46 ++++++++++------------------------------------ 1 file changed, 10 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index 69f7cf76..748c304b 100644 --- a/README.md +++ b/README.md @@ -1,44 +1,18 @@ libcitygml ========== -[![Build Status](https://travis-ci.org/jklimke/libcitygml.svg?branch=master)](https://travis-ci.org/jklimke/libcitygml) +(내부: 3DGISDataStore) -[CityGML](http://www.citygml.org/) (City Geography Markup Language) is an XML-based schema for the modelling and exchange of georeferenced 3D city and landscape models that is quickly being adopted on an international level. - -libcitygml is a small and easy to use open source C++ library for parsing CityGML files in such a way that data can be easily exploited by 3D rendering applications (geometry data are tesselated and optimized for rendering during parsing). For instance, it can be used to develop readers of CityGML files in many 3D based applications (OpenGL, OpenSceneGraph, ...) Most metadata are not lost, they are available through a per-node hashmap. - -The project also contains a loader plugin for [OpenSceneGraph](http://www.openscenegraph.org/). It enables OpenSceneGraph (if installed) to read citygml documents for easy rendering and further graphical optimization. - -libcitygml was initally developed by the 3D team of BRGM (the French leading public institution involved in the Earth Science field for the sustainable management of natural resources and surface and subsurface risks) for the research project DeepCity3D. It is now conducted as a Github open source project. - -It was moved to github due to inactivity of the project on google code (https://code.google.com/p/libcitygml/). - - -How to Setup -============ - -The project is based on the CMAKE build system and should be pretty straight forward to setup. - -Dependencies: - -The XercesC xml parsing library is the only requirement compiling and using libcitygml. - -GDAL is required if coordinate transformations should be applied during paring. - -OpenSceneGraph is required for building the plugin. - -Test Data Attribution -===================== - - -Overview over the testing data within the "data" directory: - -| Dataset | Attribution | Source | -| ------------------------- |:---------------------------------------------------------:|:---------------------------------------------------------------------------------------------------------:| -| data/b1_lod2_cs_w_sem.gml | https://www.citygml.org/samplefiles/building/ | [https://www.citygml.org](https://www.citygml.org/samplefiles/) | -| data/b1_lod2_s.gml | https://www.citygml.org/samplefiles/building/ | [https://www.citygml.org](https://www.citygml.org/samplefiles/) | -| data/berlin_open_data_sample_data.gml | Berlin Partner für Wirtschaft und Technologie GmbH | [Berlin Partner Download Portal](http://www.businesslocationcenter.de/berlin3d-downloadportal/?lang=en) | +이 프로젝트는 문화기술 연구개발 과제 중, [공간 데이터기반 문화콘텐츠 창/제작 인프라 생성 기술 개발] 과제를 수행하기 위해 제작되고 있습니다. +프로젝트를 수행함에 있어서 C++라이브러리인 libcitygml라이브러리를 활용하여 citygml파일 관련 기능을 구현할 것입니다. +이 프로그램은 완성되지 않았으며, 최종 완료 전 까지 문제가 발생할 수 있습니다. 우선 libcitygml 라이선스를 따르고 발생된 문제는 최종 사용자에게 있으며, 완료가 된다면 제시된 라이선스 및 규약을 적용할 예정입니다. +감사합니다. +공간정보기술(주) 연구소 http://www.git.co.kr/ +라이브러리 + ---- + + libcitygml(GNU LESSER GENERAL PUBLIC LICENSE Version 2.1) https://github.com/jklimke/libcitygml From a5d157a7336e200e2cb6f754bab0e4dabefef093 Mon Sep 17 00:00:00 2001 From: Jan Klimke Date: Wed, 25 Sep 2019 11:39:46 +0200 Subject: [PATCH 17/18] raised version number to 2.2.0 --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a22b2228..c74ad557 100644 --- 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}") From 6ea56d4e66202858db6d8c4b2dc9302bb30d29eb Mon Sep 17 00:00:00 2001 From: Jan Klimke Date: Wed, 25 Sep 2019 11:41:47 +0200 Subject: [PATCH 18/18] fixed travis build --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 74653b5f..253b308c 100644 --- 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