From db0ee5712aecb1f2e3a8fb965bc406f1a5c86ef2 Mon Sep 17 00:00:00 2001 From: Taku Fukada Date: Mon, 10 Mar 2025 16:15:11 +0900 Subject: [PATCH 1/2] repository --- Cargo.lock | 4 +- Cargo.toml | 2 +- LICENSE-APACHE.txt | 202 +++++++++++++++++++++++++++++++++++++ LICENSE => LICENSE-MIT.txt | 0 jmaxml-rs/Cargo.toml | 3 +- 5 files changed, 207 insertions(+), 4 deletions(-) create mode 100644 LICENSE-APACHE.txt rename LICENSE => LICENSE-MIT.txt (100%) diff --git a/Cargo.lock b/Cargo.lock index a9883b2..1ea0e85 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -113,7 +113,7 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" [[package]] name = "jmaxml" -version = "0.1.9" +version = "0.1.10" dependencies = [ "chrono", "glob", @@ -125,7 +125,7 @@ dependencies = [ [[package]] name = "jmaxml-wasm" -version = "0.1.9" +version = "0.1.10" dependencies = [ "jmaxml", "serde-wasm-bindgen", diff --git a/Cargo.toml b/Cargo.toml index 86fb3dd..20c0ad2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -7,7 +7,7 @@ resolver = "2" [workspace.package] authors = ["Taku Fukada "] -version = "0.1.9" +version = "0.1.10" edition = "2024" repository = "https://github.com/ciscorn/jmaxml" license = "MIT OR Apache-2.0" diff --git a/LICENSE-APACHE.txt b/LICENSE-APACHE.txt new file mode 100644 index 0000000..7a4a3ea --- /dev/null +++ b/LICENSE-APACHE.txt @@ -0,0 +1,202 @@ + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. \ No newline at end of file diff --git a/LICENSE b/LICENSE-MIT.txt similarity index 100% rename from LICENSE rename to LICENSE-MIT.txt diff --git a/jmaxml-rs/Cargo.toml b/jmaxml-rs/Cargo.toml index 6739f03..eae3e06 100644 --- a/jmaxml-rs/Cargo.toml +++ b/jmaxml-rs/Cargo.toml @@ -1,10 +1,11 @@ [package] name = "jmaxml" -description = "Parse Japan Meteorological Agency's XML Format files" +description = "A parser for JMA (Japan Meteorological Agency) XML format files" version.workspace = true license.workspace = true readme.workspace = true edition.workspace = true +repository.workspace = true [dependencies] chrono = { version = "0.4.38", features = ["serde"] } From c6feab4698243dc48a24b8a6d181ee9f78367e7c Mon Sep 17 00:00:00 2001 From: Taku Fukada Date: Tue, 10 Jun 2025 20:31:20 +0900 Subject: [PATCH 2/2] chore: Update misc --- Cargo.lock | 131 ++++++++++++------ Cargo.toml | 6 +- README.md | 5 +- .../sample_json/82_01_02_250318_VPBS50.json | 129 +++++++++++++++++ assets/sample_xmls/82_01_02_250318_VPBS50.xml | 79 +++++++++++ jmaxml-rs/Cargo.toml | 10 +- jmaxml-wasm/Cargo.toml | 2 +- pyproject.toml | 6 +- 8 files changed, 310 insertions(+), 58 deletions(-) create mode 100644 assets/sample_json/82_01_02_250318_VPBS50.json create mode 100755 assets/sample_xmls/82_01_02_250318_VPBS50.xml diff --git a/Cargo.lock b/Cargo.lock index 1ea0e85..e4a3740 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -25,30 +25,30 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "bumpalo" -version = "3.17.0" +version = "3.18.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf" +checksum = "793db76d6187cd04dff33004d8e6c9cc4e05cd330500379d2394209271b4aeee" [[package]] name = "cc" -version = "1.2.16" +version = "1.2.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be714c154be609ec7f5dad223a33bf1482fff90472de28f7362806e6d4832b8c" +checksum = "956a5e21988b87f372569b66183b78babf23ebc2e744b733e4350a752c4dafac" dependencies = [ "shlex", ] [[package]] name = "cfg-if" -version = "1.0.0" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268" [[package]] name = "chrono" -version = "0.4.40" +version = "0.4.41" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c" +checksum = "c469d952047f47f91b68d1cba3f10d63c11d73e4636f24f08daf0278abf01c4d" dependencies = [ "android-tzdata", "iana-time-zone", @@ -73,14 +73,15 @@ checksum = "a8d1add55171497b4705a648c6b583acafb01d58050a51727785f0b2c8e0a2b2" [[package]] name = "iana-time-zone" -version = "0.1.61" +version = "0.1.63" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" +checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8" dependencies = [ "android_system_properties", "core-foundation-sys", "iana-time-zone-haiku", "js-sys", + "log", "wasm-bindgen", "windows-core", ] @@ -107,9 +108,9 @@ dependencies = [ [[package]] name = "itoa" -version = "1.0.14" +version = "1.0.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674" +checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c" [[package]] name = "jmaxml" @@ -145,15 +146,15 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.170" +version = "0.2.172" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" +checksum = "d750af042f7ef4f724306de029d18836c26c1765a54a6a3f094cbd23a7267ffa" [[package]] name = "log" -version = "0.4.26" +version = "0.4.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30bde2b3dc3671ae49d8e2e9f044c7c005836e7a023ee57cffa25ab82764bb9e" +checksum = "13dc2df351e3202783a1fe0d44375f7295ffb4049267b0f3018346dc122a1d94" [[package]] name = "memchr" @@ -198,24 +199,24 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.3" +version = "1.21.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "945462a4b81e43c4e3ba96bd7b49d834c6f61198356aa858733bc4acf3cbe62e" +checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" [[package]] name = "proc-macro2" -version = "1.0.93" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "60946a68e5f9d28b0dc1c21bb8a97ee7d018a8b322fa57838ba31cc878e22d99" +checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778" dependencies = [ "unicode-ident", ] [[package]] name = "quick-xml" -version = "0.37.2" +version = "0.37.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165859e9e55f79d67b96c5d96f4e88b6f2695a1972849c15a6a3f5c59fc2c003" +checksum = "331e97a1af0bf59823e6eadffe373d7b27f485be8748f71471c662c1f269b7fb" dependencies = [ "memchr", "serde", @@ -223,24 +224,24 @@ dependencies = [ [[package]] name = "quote" -version = "1.0.38" +version = "1.0.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e4dccaaaf89514f546c693ddc140f729f958c247918a13380cccc6078391acc" +checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d" dependencies = [ "proc-macro2", ] [[package]] name = "rustversion" -version = "1.0.19" +version = "1.0.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f7c45b9784283f1b2e7fb61b42047c2fd678ef0960d4f6f1eba131594cc369d4" +checksum = "8a0d197bd2c9dc6e53b84da9556a69ba4cdfab8619eb41a8bd1cc2027a0f6b1d" [[package]] name = "ryu" -version = "1.0.19" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ea1a2d0a644769cc99faa24c3ad26b379b786fe7c36fd3c546254801650e6dd" +checksum = "28d3b2b1366ec20994f1fd18c3c594f05c5dd4bc44d8bb0c1c632c8d6829481f" [[package]] name = "same-file" @@ -253,9 +254,9 @@ dependencies = [ [[package]] name = "serde" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8dfc9d19bdbf6d17e22319da49161d5d0108e4188e8b680aef6299eed22df60" +checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6" dependencies = [ "serde_derive", ] @@ -273,9 +274,9 @@ dependencies = [ [[package]] name = "serde_derive" -version = "1.0.218" +version = "1.0.219" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f09503e191f4e797cb8aac08e9a4a4695c5edf6a2e70e376d961ddd5c969f82b" +checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00" dependencies = [ "proc-macro2", "quote", @@ -284,9 +285,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.139" +version = "1.0.140" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44f86c3acccc9c65b153fe1b85a3be07fe5515274ec9f0653b4a0875731c72a6" +checksum = "20068b6e96dc6c9bd23e01df8827e6c7e1f2fddd43c21810382803c136b99373" dependencies = [ "itoa", "memchr", @@ -302,9 +303,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" [[package]] name = "syn" -version = "2.0.98" +version = "2.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36147f1a48ae0ec2b5b3bc5b537d267457555a10dc06f3dbc8cb11ba3006d3b1" +checksum = "f6397daf94fa90f058bd0fd88429dd9e5738999cca8d701813c80723add80462" dependencies = [ "proc-macro2", "quote", @@ -313,9 +314,9 @@ dependencies = [ [[package]] name = "unicode-ident" -version = "1.0.17" +version = "1.0.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "00e2473a93778eb0bad35909dff6a10d28e63f792f16ed15e404fca9d5eeedbe" +checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512" [[package]] name = "walkdir" @@ -443,18 +444,62 @@ dependencies = [ [[package]] name = "windows-core" -version = "0.52.0" +version = "0.61.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9" +checksum = "c0fdd3ddb90610c7638aa2b3a3ab2904fb9e5cdbecc643ddb3647212781c4ae3" dependencies = [ - "windows-targets", + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "windows-interface" +version = "0.59.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8" +dependencies = [ + "proc-macro2", + "quote", + "syn", ] [[package]] name = "windows-link" -version = "0.1.0" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38" + +[[package]] +name = "windows-result" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "56f42bd332cc6c8eac5af113fc0c1fd6a8fd2aa08a0119358686e5160d0586c6" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dccfd733ce2b1753b03b6d3c65edf020262ea35e20ccdf3e288043e6dd620e3" +checksum = "56e6c93f3a0c3b36176cb1327a4958a0353d5d166c2a35cb268ace15e91d3b57" +dependencies = [ + "windows-link", +] [[package]] name = "windows-sys" diff --git a/Cargo.toml b/Cargo.toml index 20c0ad2..4a1ab3f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -3,11 +3,11 @@ members = [ "jmaxml-rs", "jmaxml-wasm", ] -resolver = "2" +resolver = "3" [workspace.package] -authors = ["Taku Fukada "] +authors = ["Taku Fukada ", "MIERUNE Inc. "] version = "0.1.10" edition = "2024" -repository = "https://github.com/ciscorn/jmaxml" +repository = "https://github.com/MIERUNE/jmaxml" license = "MIT OR Apache-2.0" diff --git a/README.md b/README.md index a6df9c5..4d804f7 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # jmaxml -Work in Progress +[![codecov](https://codecov.io/gh/MIERUNE/jmaxml/graph/badge.svg?token=6B5BdIgBeG)](https://codecov.io/gh/MIERUNE/jmaxml) [気象庁防災情報XMLフォーマット](https://xml.kishou.go.jp/)の XML 電文を型付きで読むためのライブラリです。気象庁が提供する XML スキーマをもとにコード生成で作られています。 @@ -32,5 +32,4 @@ make update ## Author -- 2021- Taku Fukada ([@ciscorn](https://github.com/ciscorn)) - +- Taku Fukada ([@ciscorn](https://github.com/ciscorn)) diff --git a/assets/sample_json/82_01_02_250318_VPBS50.json b/assets/sample_json/82_01_02_250318_VPBS50.json new file mode 100644 index 0000000..45fe2bf --- /dev/null +++ b/assets/sample_json/82_01_02_250318_VPBS50.json @@ -0,0 +1,129 @@ +{ + "control": { + "title": "府県気象防災速報", + "dateTime": "2023-07-13T04:29:26Z", + "status": "通常", + "editorialOffice": "網走地方気象台", + "publishingOffices": [ + "気象庁" + ] + }, + "head": { + "title": "網走・北見・紋別地方気象防災速報（記録的短時間大雨）", + "reportDateTime": "2023-07-13T04:29:26Z", + "targetDateTime": "2023-07-13T04:29:26Z", + "eventID": "JPSB202307131329_202307131329", + "infoType": "発表", + "serial": "1", + "infoKind": "気象解説情報", + "infoKindVersion": "1.5_0", + "headline": { + "text": "１３時１０分、北海道美幌町で記録的短時間大雨。\n美幌町付近で約１００ミリ。\n美幌で９３ミリ。\n命に危険が及ぶ土砂災害や浸水害、洪水による災害発生の危険度が急激に高まっています。", + "informations": [ + { + "type": "情報タグ", + "items": [ + { + "kinds": [ + { + "name": "情報タグ", + "condition": "記録雨" + } + ], + "areas": { + "codeType": "気象情報／府県予報区・細分区域等", + "areas": [ + { + "name": "網走地方", + "code": "013010" + } + ] + } + } + ] + } + ] + } + }, + "meteBody": { + "meteorologicalInfos": [ + { + "type": "観測実況", + "meteorologicalInfos": [ + { + "dateTime": { + "value": "2023-07-13T04:29:26Z" + }, + "items": [ + { + "kinds": [ + { + "properties": [ + { + "type": "雨の実況", + "precipitationParts": [ + { + "precipitations": [ + { + "value": 93.0, + "type": "前１時間降水量", + "unit": "mm", + "description": "９３ミリ" + } + ], + "time": "2023-07-13T04:10:00Z" + } + ] + } + ] + } + ], + "station": { + "name": "美幌", + "codes": [ + { + "value": "17631", + "type": "アメダス地点番号" + } + ], + "location": "北海道" + } + }, + { + "kinds": [ + { + "properties": [ + { + "type": "雨の実況", + "precipitationParts": [ + { + "precipitations": [ + { + "value": 100.0, + "type": "前１時間解析雨量", + "unit": "mm", + "condition": "約", + "description": "約１００ミリ" + } + ], + "time": "2023-07-13T04:10:00Z" + } + ] + } + ] + } + ], + "area": { + "codeType": "気象・地震・火山情報／市町村等", + "name": "美幌町", + "code": "0154300", + "status": "付近" + } + } + ] + } + ] + } + ] + } +} \ No newline at end of file diff --git a/assets/sample_xmls/82_01_02_250318_VPBS50.xml b/assets/sample_xmls/82_01_02_250318_VPBS50.xml new file mode 100755 index 0000000..37b7a32 --- /dev/null +++ b/assets/sample_xmls/82_01_02_250318_VPBS50.xml @@ -0,0 +1,79 @@ + + + +府県気象防災速報 +2023-07-13T04:29:26Z +通常 +網走地方気象台 +気象庁 + + +網走・北見・紋別地方気象防災速報（記録的短時間大雨） +2023-07-13T13:29:26+09:00 +2023-07-13T13:29:26+09:00 +JPSB202307131329_202307131329 +発表 +1 +気象解説情報 +1.5_0 + +１３時１０分、北海道美幌町で記録的短時間大雨。 +美幌町付近で約１００ミリ。 +美幌で９３ミリ。 +命に危険が及ぶ土砂災害や浸水害、洪水による災害発生の危険度が急激に高まっています。 + + + +情報タグ +記録雨 + + + +網走地方 +013010 + + + + + + + + + +2023-07-13T13:29:26+09:00 + + + +雨の実況 + +93 + + + + + +美幌 +17631 +北海道 + + + + + +雨の実況 + +100 + + + + + +美幌町 +0154300 +付近 + + + + + + diff --git a/jmaxml-rs/Cargo.toml b/jmaxml-rs/Cargo.toml index eae3e06..5406002 100644 --- a/jmaxml-rs/Cargo.toml +++ b/jmaxml-rs/Cargo.toml @@ -8,11 +8,11 @@ edition.workspace = true repository.workspace = true [dependencies] -chrono = { version = "0.4.38", features = ["serde"] } +chrono = { version = "0.4.41", features = ["serde"] } iso8601-duration = { version = "0.2.0", features = ["chrono", "serde"] } -serde = { version = "1.0.204", features = ["derive"] } -quick-xml = { version = "0.37.2", features = ["serialize"] } -serde_json = "1.0.122" +serde = { version = "1.0.219", features = ["derive"] } +quick-xml = { version = "0.37.5", features = ["serialize"] } +serde_json = "1.0.140" [dev-dependencies] -glob = "0.3.1" +glob = "0.3.2" diff --git a/jmaxml-wasm/Cargo.toml b/jmaxml-wasm/Cargo.toml index 1753c39..6339d8e 100644 --- a/jmaxml-wasm/Cargo.toml +++ b/jmaxml-wasm/Cargo.toml @@ -25,7 +25,7 @@ serde-wasm-bindgen = "0.6.5" # console_error_panic_hook = { version = "0.1.7", optional = true } [dev-dependencies] -wasm-bindgen-test = "0.3.43" +wasm-bindgen-test = "0.3.50" [profile.release] # Tell `rustc` to optimize for small code size. diff --git a/pyproject.toml b/pyproject.toml index 7f47f39..d96b98d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,9 +5,9 @@ description = "Add your description here" readme = "README.md" requires-python = ">=3.12.3" dependencies = [ - "lxml>=5.3.1", - "pandas>=2.2.3", - "ruff>=0.9.9", + "lxml>=5.4.0", + "pandas>=2.3.0", + "ruff>=0.11.13", "xlrd>=2.0.1", ]