Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

属性のパース・付与 #169

Merged
merged 87 commits into from
Jan 22, 2024
Merged

属性のパース・付与 #169

merged 87 commits into from
Jan 22, 2024

Conversation

nokonoko1203
Copy link
Collaborator

@nokonoko1203 nokonoko1203 commented Jan 10, 2024 •
edited
Loading

#160

  • CityObjectを受け取り、以下のようなことを行う一連の処理群を仮実装しました

    • CityObject.root（Feature）から子要素のFeatureを抽出
    • Dataを別レイヤー化
    • 子要素の別地物化
    • 属性情報の個別変換-

  • sinkなどから利用することを想定しています

  • 特に問題ないということであればそれはそれで良いのですが、あくまで仮実装のイメージで、今後ブラッシュアップしていきます

    • 挙動
    • 設定方法
    • 出力されるCityObject
    • 出力ドライバーでの扱い
    • プログラムの構造

  • 以下のようなコマンドで動作します

    • リポジトリのルートに「マッピングルール」を想定した、以下のようなJSONファイルを置いてください

  • 実行後、リポジトリのルートに「output_object.json」が出力されます

    • これをsink内で利用して出力していく想定です

mappings.json

cargo run --package nusamai /Users/satoru/Downloads/plateau/22203_numazu-shi_2021_citygml_4_op/udx/bldg/52385618_bldg_6697_op.gml --sink geojson --output ~/Downloads/output/output.geojson

@nokonoko1203 nokonoko1203 marked this pull request as draft January 10, 2024 12:42
@codecov Codecov
Copy link

codecov bot commented Jan 10, 2024 •
edited
Loading

Codecov Report

Attention: 350 lines in your changes are missing coverage. Please review.

Files Patch % Lines
nusamai/src/transform/city_object.rs 22.22% 350 Missing ⚠️
Additional details and impacted files
Components Coverage Δ
GUI ∅ <ø> (∅)
Backend 65.60% <23.07%> (-13.91%) ⬇️
Libraries 92.48% <100.00%> (+0.04%) ⬆️

📢 Thoughts on this report? Let us know!

@nokonoko1203
derive clone
1064d39
@nokonoko1203
derive clone
6571a4a
@nokonoko1203
Obtain attributes other than Array, Data, and Feature
f5b275e
@nokonoko1203
add parts for processing CityObject
8d74305
@nokonoko1203
add dummy method
9d80250
@nokonoko1203
extract only features
170ec21
@nokonoko1203
Merge branch 'main' into feature/parse-attributes
601cc13
@nokonoko1203
Merge branch 'main' into feature/parse-attributes
288f9e4
@nokonoko1203
Merge branch 'main' into feature/parse-attributes
82a05d6
@nokonoko1203
Merge branch 'main' into feature/parse-attributes
e4bd880
@nokonoko1203
move to another file
f249a2e
@nokonoko1203
change name
7cec4f2
@nokonoko1203
remove unnecessary function
5809ba5
@nokonoko1203
extract attribute separately
44583fa
@nokonoko1203
Parsing Arrays and Data
614f27f
@nokonoko1203
Duplicate keys are stored in an array
2608160
@nokonoko1203
comment
12863a8
@nokonoko1203
fix
f11baa3
@nokonoko1203
write tmp file
ac925f0
@nokonoko1203
fix
d58dde9
@nokonoko1203
Demo Implementation
f4cba3d
@nokonoko1203
separate CityObject
0fe5d58
@nokonoko1203
fix
9c5ed3e
@nokonoko1203
extract child elements
02d8249
@nokonoko1203
add mapping option
e49679e
@nokonoko1203
add serialize trait
ae36748
@nokonoko1203
converting attribute to json
c76314e
@nokonoko1203 nokonoko1203 marked this pull request as ready for review January 19, 2024 02:03
@nokonoko1203 nokonoko1203 requested a review from ciscorn January 19, 2024 02:04
@ciscorn ciscorn mentioned this pull request Jan 22, 2024
Merged
@ciscorn ciscorn changed the base branch from main to transform-experiment January 22, 2024 11:06
ciscorn
ciscorn approved these changes Jan 22, 2024
View reviewed changes
Copy link
Member

@ciscorn ciscorn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

#197 にて、既存のコードベース上に配置できるように改修したいと思います。

@ciscorn ciscorn merged commit a7a2f88 into transform-experiment Jan 22, 2024
0 of 2 checks passed
@ciscorn ciscorn deleted the feature/parse-attributes branch January 22, 2024 11:10
ciscorn added a commit that referenced this pull request Jan 23, 2024
@ciscorn @nokonoko1203
#169 修正用ブランチ (#197)
439f62e 
#169 を、既存のコードベースに影響を与えない、実験用のSinkとしてマージできるようにする。

---------

Co-authored-by: Satoru Nishio <31245655+nokonoko1203@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ciscorn ciscorn ciscorn approved these changes

Assignees

@nokonoko1203 nokonoko1203

Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@nokonoko1203 @ciscorn