Skip to content

Commit

Permalink
[Fix]修复metadata.xml解析不正确提示
Browse files Browse the repository at this point in the history
  • Loading branch information
scially committed Apr 10, 2022
1 parent e73aacd commit 8431c3b
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 12 deletions.
1 change: 0 additions & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@ if(ENABLE_TEST)
COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/gdal_data ${PROJECT_BINARY_DIR}/src/gdal_data
COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/gdal_data ${PROJECT_BINARY_DIR}/test/gdal_data
COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/data ${PROJECT_BINARY_DIR}/test/data)

else()
add_custom_target(CopyResources ALL
COMMAND ${CMAKE_COMMAND} -E copy_directory ${PROJECT_SOURCE_DIR}/proj_data ${PROJECT_BINARY_DIR}/src/proj_data
Expand Down
6 changes: 2 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,7 @@
3. 本人本身是对Qt比较熟悉的,就萌生了这个想法,用C++和Qt,从新梳理整个框架,刚好今年春节一个人,秉着学习想法,使用纯C++(加了Qt)重写了该工程,新的工程基于C++ 17标准重写,使用了Qt5.15,主要作者本身写C++大部分时候都是基于Qt,对Qt也稍微了解,同时也借助Qt很好的跨平台特性,性能没有变化,并且也便于调试学习。
1. 整个工程开源,但是鉴于Qt一些限制,该程序采用LGPL协议。
2. 后续会与作者同步保持更新,后期希望可以加入自己一些特色功能。

[Download Windows Pre-build](https://github.com/scially/Cesium3DTilesConverter/releases/download/V1.0/Cesium3DTilesConverter.zip)


# 简介

3DTiles 转换工具集, 快速将OSGB、Shp、GDB等格式转为Cesium 3DTiles, 方便搭建三维平台。
Expand All @@ -34,7 +32,7 @@ Converter.exe --format <FORMAT> --input <INPUT> --output <OUTPUT> [OPTIONS]

```sh
# from osgb dataset
Converter.exe --format osgb -input E:\osgb_path --output E:\out_path --yUpAxis true
Converter.exe --format osgb -input <OSGB Path> --output <Out Path> --yUpAxis true

# from single shp file
Converter.exe --format gdal --input <Shapefile Path> --output <DIR> --field height --layer <Shapefile Name>
Expand Down
7 changes: 5 additions & 2 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,10 @@ target_link_libraries(Core
Qt5::Core
Qt5::Xml)


add_executable(Converter "main.cpp")
add_executable(Converter main.cpp)
target_link_libraries(Converter Core)

add_custom_command(TARGET Converter POST_BUILD
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:Qt5::Core> $<TARGET_FILE_DIR:Converter>
COMMAND ${CMAKE_COMMAND} -E copy $<TARGET_FILE:Qt5::Xml> $<TARGET_FILE_DIR:Converter>)

11 changes: 7 additions & 4 deletions src/OSGBConvertJob.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ namespace scially {
void OSGBConvertJob::run() {
// 解析XML中的坐标
ModelMetadata metadata;
metadata.parse(input + "/metadata.xml");

double lon, lat;
metadata.getCoordinate(lon, lat);

try{
metadata.parse(input + "/metadata.xml");
metadata.getCoordinate(lon, lat);
}catch (const TilesConvertException& e){
qCritical() << e.what();
return;
}

// 遍历Data
QDir dataDir(input + "/Data");
Expand Down
1 change: 0 additions & 1 deletion src/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,6 @@ int main(int argc, char** argv){

scially::ShpConvertJob shpConvert(input, layerName, output, fieldName);
shpConvert.run();

}
else{
qCritical() << "Only support OSGB and GDAL format";
Expand Down

0 comments on commit 8431c3b

Please sign in to comment.