November 2023 - Observe-commits - mailman.cloud.codelutin.com

[Git][ultreiaio/ird-observe][develop] Supprimer le module server-configuration-tool (il ne sert pas) - Closes #2807
by Tony CHEMIT (＠tchemit) 25 Nov '23

25 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 16bd168a by Tony Chemit at 2023-11-25T14:57:31+01:00 Supprimer le module server-configuration-tool (il ne sert pas) - Closes #2807 - - - - - 28 changed files: - − server/configuration-tools/.mvn/pom.gitflow.develop - − server/configuration-tools/.mvn/pom.gitflow.master - − server/configuration-tools/.mvn/pom.organizationId - − server/configuration-tools/.mvn/pom.projectId - − server/configuration-tools/.mvn/pom.stageId - − server/configuration-tools/LICENSE.txt - − server/configuration-tools/README.md - − server/configuration-tools/pom.xml - − server/configuration-tools/src/main/assembly/bin.xml - − server/configuration-tools/src/main/assembly/dist/default-migrate-server-v7.sh - − server/configuration-tools/src/main/assembly/dist/migrate-server-v7.bat - − server/configuration-tools/src/main/assembly/dist/migrate-server-v7.sh - − server/configuration-tools/src/main/assembly/dist/optimize-server-v9.bat - − server/configuration-tools/src/main/assembly/dist/optimize-server-v9.sh - − server/configuration-tools/src/main/java/fr/ird/observe/server/configuration/tools/ServerModelMigrate.java - − server/configuration-tools/src/main/java/fr/ird/observe/server/configuration/tools/ServerModelOptimize.java - − server/configuration-tools/src/main/resources/log4j2.xml - − server/configuration-tools/src/site/site.xml - − server/configuration-tools/src/test/java/fr/ird/observe/server/configuration/tools/ServerModelMigrateTest.java - − server/configuration-tools/src/test/java/fr/ird/observe/server/configuration/tools/ServerModelOptimizeTest.java - − server/configuration-tools/src/test/java/fr/ird/observe/server/configuration/tools/ToolsFixtures.java - − server/configuration-tools/src/test/resources/fixtures-security-not-optimized.yml - − server/configuration-tools/src/test/resources/fixtures-security.yml - − server/configuration-tools/src/test/resources/v7/databases.yml - − server/configuration-tools/src/test/resources/v7/users.yml - server/pom.xml - server/runner/pom.xml - server/runner/src/main/assembly/server.xml Changes: ===================================== server/configuration-tools/.mvn/pom.gitflow.develop deleted ===================================== @@ -1 +0,0 @@ -develop \ No newline at end of file ===================================== server/configuration-tools/.mvn/pom.gitflow.master deleted ===================================== @@ -1 +0,0 @@ -master \ No newline at end of file ===================================== server/configuration-tools/.mvn/pom.organizationId deleted ===================================== @@ -1 +0,0 @@ -ultreiaio \ No newline at end of file ===================================== server/configuration-tools/.mvn/pom.projectId deleted ===================================== @@ -1 +0,0 @@ -ird-observe \ No newline at end of file ===================================== server/configuration-tools/.mvn/pom.stageId deleted ===================================== @@ -1 +0,0 @@ -frirdobserve \ No newline at end of file ===================================== server/configuration-tools/LICENSE.txt deleted ===================================== @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/> - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - <one line to give the program's name and a brief idea of what it does.> - Copyright (C) <year> <name of author> - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see <https://www.gnu.org/licenses/>. - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - <program> Copyright (C) <year> <name of author> - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -<https://www.gnu.org/licenses/>. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -<https://www.gnu.org/licenses/why-not-lgpl.html>. ===================================== server/configuration-tools/README.md deleted ===================================== @@ -1,50 +0,0 @@ -# Abstract - -This module exposes some tools around configuration of the server. - -## Migrate v7 server configuration files to v9 - -v7 need two configuration files (**databases.yml** and **users.yml**). - -v9 need only one file **security.yml**. - -Use **migrate-server-v7.sh** script to generate a v9 **security.yml** file from v7 files. - -The script requires three parameters: - -* input databases.yml file -* input users.yml file -* output security.yml file - -Example (using default values): - -```sh -sh migrate-server-v7.sh /var/local/observe-server/.conf/7.x/databases.yml /var/local/observe-server/.conf/7.x/users.yml /var/local/observe-server/.conf/9.x/security.yml -``` - -If you respect convention of the project. You can just launch the **default-migrate-server-v7.sh** script. - -Il will use the previous script with default values. - - -```sh -sh default-migrate-server-v7.sh -``` - -## Optimize v9 server configuration file - -v9 **security.yml** file can be optimized. - -Run the script **optimize-server-v9.sh** for this purpose. - - -The script requires two parameters: - -* input security.yml file -* output security.yml file - -Example (using default values): - -```sh -sh optimize-server-v9.sh /var/local/observe-server/.conf/9.x/security.yml /var/local/observe-server/.conf/server-optimized.yml -``` ===================================== server/configuration-tools/pom.xml deleted ===================================== @@ -1,190 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> - <modelVersion>4.0.0</modelVersion> - <parent> - <groupId>fr.ird.observe</groupId> - <artifactId>server</artifactId> - <version>9.3.0-SNAPSHOT</version> - </parent> - <artifactId>server-configuration-tools</artifactId> - <name>ObServe Server :: Configuration Tools</name> - <description>ObServe Server configuration tools module</description> - <properties> - <applicationJarName>server-configuration-tools</applicationJarName> - </properties> - <dependencies> - <dependency> - <groupId>${project.groupId}</groupId> - <artifactId>toolkit-api-server</artifactId> - <version>${project.version}</version> - <exclusions> - <exclusion> - <groupId>com.vladsch.flexmark</groupId> - <artifactId>flexmark</artifactId> - </exclusion> - <exclusion> - <groupId>com.vladsch.flexmark</groupId> - <artifactId>flexmark-ext-tables</artifactId> - </exclusion> - <exclusion> - <groupId>com.vladsch.flexmark</groupId> - <artifactId>flexmark-util-ast</artifactId> - </exclusion> - <exclusion> - <groupId>com.vladsch.flexmark</groupId> - <artifactId>flexmark-util-data</artifactId> - </exclusion> - <exclusion> - <groupId>io.ultreia.java4all.jaxx</groupId> - <artifactId>jaxx-widgets</artifactId> - </exclusion> - <exclusion> - <groupId>ognl</groupId> - <artifactId>ognl</artifactId> - </exclusion> - <exclusion> - <groupId>org.swinglabs.swingx</groupId> - <artifactId>swingx-core</artifactId> - </exclusion> - <exclusion> - <groupId>io.ultreia.java4all.jaxx</groupId> - <artifactId>jaxx-validator</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.struts.xwork</groupId> - <artifactId>xwork-core</artifactId> - </exclusion> - <exclusion> - <groupId>org.hashids</groupId> - <artifactId>hashids</artifactId> - </exclusion> - <exclusion> - <groupId>org.mozilla</groupId> - <artifactId>rhino-engine</artifactId> - </exclusion> - <exclusion> - <groupId>io.ultreia.java4all.http</groupId> - <artifactId>http-api</artifactId> - </exclusion> - <exclusion> - <groupId>io.ultreia.java4all</groupId> - <artifactId>application-template</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-api</artifactId> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-core</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-jcl</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.logging.log4j</groupId> - <artifactId>log4j-slf4j2-impl</artifactId> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <scope>test</scope> - </dependency> - </dependencies> - <build> - <plugins> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>copy-dependencies</id> - <goals> - <goal>copy-dependencies</goal> - </goals> - <phase>prepare-package</phase> - <configuration> - <includeScope>runtime</includeScope> -  - <overWriteReleases>true</overWriteReleases> - <overWriteSnapshots>true</overWriteSnapshots> - <overWriteIfNewer>true</overWriteIfNewer> - <prependGroupId>true</prependGroupId> - <outputDirectory>${project.build.directory}/lib</outputDirectory> - <silent>true</silent> -  - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <executions> - <execution> - <id>default-jar</id> - <goals> - <goal>jar</goal> - </goals> - <configuration> - <archive> - <manifest> - <useUniqueVersions>false</useUniqueVersions> - <addClasspath>true</addClasspath> - <classpathPrefix>./lib/</classpathPrefix> - <classpathLayoutType>custom</classpathLayoutType> -  - <customClasspathLayout>$${artifact.groupId}.$${artifact.artifactId}-$${artifact.version}$${dashClassifier?}.$${artifact.extension}</customClasspathLayout> - </manifest> - </archive> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <artifactId>maven-assembly-plugin</artifactId> - <executions> - <execution> - <id>create-application-assembly</id> - <goals> - <goal>single</goal> - </goals> - <phase>integration-test</phase> - <configuration> - <descriptors> - <descriptor>src/main/assembly/bin.xml</descriptor> - </descriptors> - <attach>true</attach> - <finalName>${project.build.finalName}</finalName> - <appendAssemblyId>false</appendAssemblyId> - <outputDirectory>${project.build.directory}</outputDirectory> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> ===================================== server/configuration-tools/src/main/assembly/bin.xml deleted ===================================== @@ -1,86 +0,0 @@ - -<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd"> - <id>bin</id> - <formats> - <format>zip</format> - </formats> - - <fileSets> - - <fileSet> - <directory>target</directory> - <outputDirectory/> - <fileMode>0755</fileMode> - <includes> - <include>${project.build.finalName}.jar</include> - </includes> - </fileSet> - - <fileSet> - <directory>target</directory> - <outputDirectory/> - <includes> - <include>lib/*.jar</include> - </includes> - </fileSet> - - <fileSet> - <directory>target/classes</directory> - <outputDirectory/> - <includes> - <include>THIRD-PARTY.txt</include> - <include>LICENSE.txt</include> - </includes> - </fileSet> - - <fileSet> - <directory/> - <outputDirectory/> - <includes> - <include>README.md</include> - </includes> - </fileSet> - - <fileSet> - <directory>src/main/assembly/dist</directory> - <outputDirectory/> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*.sh</exclude> - <exclude>**/*.bat</exclude> - </excludes> - </fileSet> - - <fileSet> - <directory>src/main/assembly/dist</directory> - <outputDirectory/> - <fileMode>0755</fileMode> - <filtered>true</filtered> - <includes> - <include>**/*.sh</include> - <include>**/*.bat</include> - </includes> - </fileSet> - </fileSets> -</assembly> ===================================== server/configuration-tools/src/main/assembly/dist/default-migrate-server-v7.sh deleted ===================================== @@ -1,27 +0,0 @@ -#!/bin/sh -### -# #%L -# ObServe :: Admin Client -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### - -java -cp ${project.build.finalName}.jar fr.ird.observe.server.configuration.tools.ServerModelMigrate /var/local/observe-server/.conf/7.x/databases.yml /var/local/observe-server/.conf/7.x/users.yml /var/local/observe-server/.conf/9.x/security.yml \ No newline at end of file ===================================== server/configuration-tools/src/main/assembly/dist/migrate-server-v7.bat deleted ===================================== @@ -1 +0,0 @@ -java -cp ${project.build.finalName}.jar fr.ird.observe.server.configuration.tools.ServerModelMigrate %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file ===================================== server/configuration-tools/src/main/assembly/dist/migrate-server-v7.sh deleted ===================================== @@ -1,27 +0,0 @@ -#!/bin/sh -### -# #%L -# ObServe :: Admin Client -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### - -java -cp ${project.build.finalName}.jar fr.ird.observe.server.configuration.tools.ServerModelMigrate "$@" \ No newline at end of file ===================================== server/configuration-tools/src/main/assembly/dist/optimize-server-v9.bat deleted ===================================== @@ -1 +0,0 @@ -java -cp ${project.build.finalName}.jar fr.ird.observe.server.configuration.tools.ServerModelOptimize %1 %2 %3 %4 %5 %6 %7 %8 %9 \ No newline at end of file ===================================== server/configuration-tools/src/main/assembly/dist/optimize-server-v9.sh deleted ===================================== @@ -1,27 +0,0 @@ -#!/bin/sh -### -# #%L -# ObServe :: Admin Client -# -# $Id$ -# $HeadURL$ -# %% -# Copyright (C) 2008 - 2010 IRD, Codelutin, Tony Chemit -# %% -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as -# published by the Free Software Foundation, either version 3 of the -# License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public -# License along with this program. If not, see -# <http://www.gnu.org/licenses/gpl-3.0.html>. -# #L% -### - -java -cp ${project.build.finalName}.jar fr.ird.observe.server.configuration.tools.ServerModelOptimize "$@" \ No newline at end of file ===================================== server/configuration-tools/src/main/java/fr/ird/observe/server/configuration/tools/ServerModelMigrate.java deleted ===================================== @@ -1,139 +0,0 @@ -package fr.ird.observe.server.configuration.tools; - -/*- - * #%L - * ObServe Server :: Configuration Tools - * %% - * Copyright (C) 2008 - 2023 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.server.security.model.ServerDatabase; -import fr.ird.observe.server.security.model.ServerModel; -import fr.ird.observe.server.security.model.ServerModelHelper; -import fr.ird.observe.server.security.model.ServerRole; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.io.IOException; -import java.io.StringWriter; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.LinkedHashMap; -import java.util.LinkedHashSet; -import java.util.List; -import java.util.Map; -import java.util.Objects; - -/** - * To migrate server model from v7 → v9 - * Created on 13/12/2021. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 5.0.62 - */ -public class ServerModelMigrate { - - private static final Logger log = LogManager.getLogger(ServerModelMigrate.class); - - private final Path sourceDatabasesFile; - private final Path sourceUsersFile; - - public static void main(String... args) throws IOException { - if (args.length != 3) { - throw new IllegalArgumentException("Need exactly three parameters:\n\t - source databases file\n\t - source users file\n\t - target server file."); - } - Path sourceDatabasesFile = Path.of(args[0]); - Path sourceUsersFile = Path.of(args[1]); - Path targetFile = Path.of(args[2]); - - ServerModelMigrate migrate = new ServerModelMigrate(sourceDatabasesFile, sourceUsersFile); - migrate.migrate(targetFile); - } - - - public ServerModelMigrate(Path sourceDatabasesFile, Path sourceUsersFile) { - this.sourceDatabasesFile = Objects.requireNonNull(sourceDatabasesFile); - this.sourceUsersFile = Objects.requireNonNull(sourceUsersFile); - } - - public ServerModel migrate(Path targetFile) throws IOException { - if (Files.notExists(sourceDatabasesFile)) { - throw new IllegalArgumentException(String.format("Can't find %s", sourceDatabasesFile)); - } - if (Files.notExists(sourceUsersFile)) { - throw new IllegalArgumentException(String.format("Can't find %s", sourceUsersFile)); - } - if (Files.notExists(targetFile.getParent())) { - Files.createDirectories(targetFile.getParent()); - } - log.info(String.format("1/6 - Loading databases from: %s", sourceDatabasesFile)); - ServerModel serverModel = ServerModelHelper.load(sourceDatabasesFile.toFile()); - log.info(String.format("2/6 - Loading users from: %s", sourceUsersFile)); - List<String> usersContentLines = Files.readAllLines(sourceUsersFile); - - log.info("3/6 - Extract roles."); - Map<String, ServerRole> roleLoginMap = new LinkedHashMap<>(); - for (ServerDatabase database : serverModel.getDatabases()) { - LinkedHashSet<ServerRole> roles = new LinkedHashSet<>(); - for (ServerRole role : database.getRoles()) { - String roleLogin = role.getLogin(); - if (roleLoginMap.containsKey(roleLogin)) { - role = roleLoginMap.get(roleLogin); - } else { - roleLoginMap.put(roleLogin, role); - } - roles.add(role); - } - database.setRoles(roles); - } - LinkedHashSet<ServerRole> roles = new LinkedHashSet<>(roleLoginMap.values()); - serverModel.setRoles(roles); - - String content; - - log.info("4/6 - Generate file content."); - - try (StringWriter writer = new StringWriter()) { - String[] contentLines = ServerModelHelper.toString(serverModel).split("\\n"); - - for (String line : contentLines) { - if (line.contains("users:")) { - break; - } - writer.write(line); - writer.write("\n"); - } - int index = 0; - int usersContentLinesCount = usersContentLines.size(); - for (String line : usersContentLines) { - writer.write(line.replace("database: ", "database: *db-") - .replace("role: ", "role: *role-")); - if (++index < usersContentLinesCount) { - writer.write("\n"); - } - } - content = writer.toString(); - } - log.info("5/6 - Optimize content."); - ServerModel load = ServerModelHelper.load(content); - - log.info(String.format("5/6 - Write file: %s", targetFile)); - ServerModelHelper.store(targetFile.toFile(), load); - return load; - } -} ===================================== server/configuration-tools/src/main/java/fr/ird/observe/server/configuration/tools/ServerModelOptimize.java deleted ===================================== @@ -1,78 +0,0 @@ -package fr.ird.observe.server.configuration.tools; - -/*- - * #%L - * ObServe Server :: Configuration Tools - * %% - * Copyright (C) 2008 - 2023 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.server.security.model.ServerModel; -import fr.ird.observe.server.security.model.ServerModelHelper; -import org.apache.logging.log4j.LogManager; -import org.apache.logging.log4j.Logger; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Objects; - -/** - * Created on 14/12/2021. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 5.0.63 - */ -public class ServerModelOptimize { - - - private static final Logger log = LogManager.getLogger(ServerModelOptimize.class); - - private final Path sourceFile; - private final Path targetFile; - - public static void main(String... args) throws IOException { - if (args.length != 2) { - throw new IllegalArgumentException("Need exactly two parameters:\n\t - input server file\n\t - target server file."); - } - Path sourceFile = Path.of(args[0]); - Path targetFile = Path.of(args[1]); - - ServerModelOptimize migrate = new ServerModelOptimize(sourceFile, targetFile); - migrate.optimize(); - } - - public ServerModelOptimize(Path sourceFile, Path targetFile) { - this.sourceFile = Objects.requireNonNull(sourceFile); - this.targetFile = Objects.requireNonNull(targetFile); - } - - public void optimize() throws IOException { - if (Files.notExists(sourceFile)) { - throw new IllegalArgumentException(String.format("Can't find %s", sourceFile)); - } - - if (Files.notExists(targetFile.getParent())) { - Files.createDirectories(targetFile.getParent()); - } - log.info(String.format("1/2 - Loading server from: %s", sourceFile)); - ServerModel serverModel = ServerModelHelper.load(sourceFile.toFile()); - log.info(String.format("2/2 - Write server to: %s", targetFile)); - ServerModelHelper.store(targetFile.toFile(), serverModel); - } -} ===================================== server/configuration-tools/src/main/resources/log4j2.xml deleted ===================================== @@ -1,33 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - -<Configuration status="error"> - <Appenders> - <Console name="console" target="SYSTEM_OUT"> - <PatternLayout pattern="%highlight{%-5p}{FATAL=white, ERROR=bright_red, WARN=yellow bold, INFO=blue bold, DEBUG=normal, TRACE=normal} %d{ISO8601} [%t] %40C{1} :%4L - %m%n"/> - </Console> - </Appenders> - <Loggers> - <Logger name="fr.ird.observe.server.configuration.tools" level="info" additivity="false"> - <AppenderRef ref="console"/> - </Logger> - </Loggers> -</Configuration> ===================================== server/configuration-tools/src/site/site.xml deleted ===================================== @@ -1,34 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - - - -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - name="${project.name}" - xmlns="http://maven.apache.org/DECORATION/1.8.0" - xsi:schemaLocation="http://maven.apache.org/DECORATION/1.8.0 http://maven.apache.org/xsd/decoration-1.8.0.xsd"> - <body> - <breadcrumbs> - <item name="${project.name}" href="${project.url}/index.html"/> - </breadcrumbs> - <menu ref="parent"/> - <menu ref="reports"/> - </body> -</project> ===================================== server/configuration-tools/src/test/java/fr/ird/observe/server/configuration/tools/ServerModelMigrateTest.java deleted ===================================== @@ -1,59 +0,0 @@ -package fr.ird.observe.server.configuration.tools; - -/*- - * #%L - * ObServe Server :: Configuration Tools - * %% - * Copyright (C) 2008 - 2023 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import fr.ird.observe.server.security.model.ServerModel; -import fr.ird.observe.server.security.model.ServerModelHelper; -import org.junit.Test; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - -/** - * Created on 13/12/2021. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 9.0.0 - */ -public class ServerModelMigrateTest extends ToolsFixtures { - - @Test - public void migrate() throws IOException { - Path targetFile = Files.createTempFile("server", ".yml"); - - ServerModelMigrate migrate = new ServerModelMigrate(SOURCE_DATABASES_FILE, SOURCE_USERS_FILE); - ServerModel serverModel = migrate.migrate(targetFile); - - assertResult(targetFile); - System.out.println(ServerModelHelper.toString(serverModel)); - } - - @Test - public void migrateByMain() throws IOException { - Path targetFile = Files.createTempFile("server", ".yml"); - ServerModelMigrate.main(SOURCE_DATABASES_FILE.toString(), SOURCE_USERS_FILE.toString(), targetFile.toString()); - assertResult(targetFile); - } - -} ===================================== server/configuration-tools/src/test/java/fr/ird/observe/server/configuration/tools/ServerModelOptimizeTest.java deleted ===================================== @@ -1,56 +0,0 @@ -package fr.ird.observe.server.configuration.tools; - -/*- - * #%L - * ObServe Server :: Configuration Tools - * %% - * Copyright (C) 2008 - 2023 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import org.junit.Test; - -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; - -/** - * Created on 14/12/2021. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 5.0.63 - */ -public class ServerModelOptimizeTest extends ToolsFixtures { - - @Test - public void main() throws IOException { - - Path targetFile = Files.createTempFile("security", ".yml"); - ServerModelOptimize.main(SOURCE_SECURITY_FILE_NOT_OPTIMIZED.toString(), targetFile.toString()); - assertResult(targetFile); - } - - @Test - public void optimize() throws IOException { - Path targetFile = Files.createTempFile("security", ".yml"); - - ServerModelOptimize migrate = new ServerModelOptimize(SOURCE_SECURITY_FILE_NOT_OPTIMIZED, targetFile); - migrate.optimize(); - - assertResult(targetFile); - } -} ===================================== server/configuration-tools/src/test/java/fr/ird/observe/server/configuration/tools/ToolsFixtures.java deleted ===================================== @@ -1,74 +0,0 @@ -package fr.ird.observe.server.configuration.tools; - -/*- - * #%L - * ObServe Server :: Configuration Tools - * %% - * Copyright (C) 2008 - 2023 IRD, Ultreia.io - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ - -import org.junit.Assert; -import org.junit.BeforeClass; - -import java.io.File; -import java.io.IOException; -import java.nio.file.Files; -import java.nio.file.Path; -import java.util.Iterator; -import java.util.List; - -/** - * Created on 14/12/2021. - * - * @author Tony Chemit - dev(a)tchemit.fr - * @since 9.0.0 - */ -public class ToolsFixtures { - public static final Path PATH = Path - .of(new File("").getAbsolutePath()) - .resolve("src") - .resolve("test") - .resolve("resources") - .resolve("v7"); - public static final Path SOURCE_SECURITY_FILE_NOT_OPTIMIZED = PATH.getParent().resolve("fixtures-security-not-optimized.yml"); - public static final Path SOURCE_SECURITY_FILE = PATH.getParent().resolve("fixtures-security.yml"); - public static final Path SOURCE_DATABASES_FILE = PATH.resolve("databases.yml"); - public static final Path SOURCE_USERS_FILE = PATH.resolve("users.yml"); - public static File temporaryDirectory = new File(System.getProperty("java.io.tmpdir")); - - @BeforeClass - public static void init() throws IOException { - Files.createDirectories(temporaryDirectory.toPath()); - } - - public static void assertResult(Path targetFile) throws IOException { - List<String> actualModelContent = Files.readAllLines(targetFile); - List<String> expectedModelContent = Files.readAllLines(SOURCE_SECURITY_FILE); - - Assert.assertEquals(expectedModelContent.size(), actualModelContent.size()); - Iterator<String> actualIterator = actualModelContent.iterator(); - for (String expectedLine : expectedModelContent) { - String actualLine = actualIterator.next(); - Assert.assertEquals(expectedLine, actualLine - .replace("roles: ", "roles:") - .replace("databases: ", "databases:") - .replace("users: ", "users:") - ); - } - } -} ===================================== server/configuration-tools/src/test/resources/fixtures-security-not-optimized.yml deleted ===================================== @@ -1,54 +0,0 @@ -roles: - - &role-admin - login: admin - password: passwordAdmin - - &role-technicien - login: technicien - password: passwordTechnicien - - &role-utilisateur - login: utilisateur - password: passwordUtilisateur - - &role-referentiel - login: referentiel - password: passwordReferentiel - - &role-test - login: test - password: passwordTest -databases: - - &db-production - name: production - url: jdbc:postgresql://localhost:5432/production - defaultDatabase: true - roles: - - *role-admin - - *role-technicien - - *role-utilisateur - - *role-referentiel - - &db-test - name: test - url: jdbc:postgresql://localhost:5432/test - roles: - - *role-admin - - *role-technicien - - *role-utilisateur - - *role-referentiel - - *role-test -users: - - login: user1 - password: password1 - permissions: - - database: *db-production - role: *role-admin - apiAccess: PUBLIC - validationMode: PERMISSIVE - - database: *db-test - role: *role-technicien - apiAccess: PUBLIC - validationMode: PERMISSIVE - - login: user2 - password: password2 - permissions: - - database: *db-test - role: *role-referentiel - apiAccess: ALL - validationMode: NONE \ No newline at end of file ===================================== server/configuration-tools/src/test/resources/fixtures-security.yml deleted ===================================== @@ -1,45 +0,0 @@ -roles: - - &role-admin - password: passwordAdmin - - &role-technicien - password: passwordTechnicien - - &role-utilisateur - password: passwordUtilisateur - - &role-referentiel - password: passwordReferentiel - - &role-test - password: passwordTest -databases: - - &db-production - url: jdbc:postgresql://localhost:5432/production - defaultDatabase: true - roles: - - *role-admin - - *role-technicien - - *role-utilisateur - - *role-referentiel - - &db-test - url: jdbc:postgresql://localhost:5432/test - roles: - - *role-admin - - *role-technicien - - *role-utilisateur - - *role-referentiel - - *role-test -users: - - login: user1 - password: password1 - defaultApiAccess: PUBLIC - defaultValidationMode: PERMISSIVE - permissions: - - database: *db-production - role: *role-admin - - database: *db-test - role: *role-technicien - - login: user2 - password: password2 - permissions: - - database: *db-test - role: *role-referentiel - apiAccess: ALL - validationMode: NONE \ No newline at end of file ===================================== server/configuration-tools/src/test/resources/v7/databases.yml deleted ===================================== @@ -1,26 +0,0 @@ -databases: - - name: production - url: jdbc:postgresql://localhost:5432/production - defaultDatabase: true - roles: - - login: admin - password: passwordAdmin - - login: technicien - password: passwordTechnicien - - login: utilisateur - password: passwordUtilisateur - - login: referentiel - password: passwordReferentiel - - name: test - url: jdbc:postgresql://localhost:5432/test - roles: - - login: admin - password: passwordAdmin - - login: technicien - password: passwordTechnicien - - login: utilisateur - password: passwordUtilisateur - - login: referentiel - password: passwordReferentiel - - login: test - password: passwordTest \ No newline at end of file ===================================== server/configuration-tools/src/test/resources/v7/users.yml deleted ===================================== @@ -1,19 +0,0 @@ -users: - - login: user1 - password: password1 - permissions: - - database: production - role: admin - apiAccess: PUBLIC - validationMode: PERMISSIVE - - database: test - role: technicien - apiAccess: PUBLIC - validationMode: PERMISSIVE - - login: user2 - password: password2 - permissions: - - database: test - role: referentiel - apiAccess: ALL - validationMode: NONE \ No newline at end of file ===================================== server/pom.xml ===================================== @@ -31,7 +31,6 @@ <description>ObServe Server Pom</description> <modules> <module>configuration</module> - <module>configuration-tools</module> <module>core</module> <module>runner</module> </modules> ===================================== server/runner/pom.xml ===================================== @@ -221,29 +221,6 @@ </execution> </executions> </plugin> - <plugin> - <artifactId>maven-dependency-plugin</artifactId> - <executions> - <execution> - <id>get-server-configuration-tools</id> - <goals> - <goal>unpack</goal> - </goals> - <phase>package</phase> - <configuration> - <outputDirectory>${project.build.directory}</outputDirectory> - <artifactItems> - <artifactItem> - <groupId>${project.groupId}</groupId> - <artifactId>server-configuration-tools</artifactId> - <version>${project.version}</version> - <type>zip</type> - </artifactItem> - </artifactItems> - </configuration> - </execution> - </executions> - </plugin> <plugin> <artifactId>maven-antrun-plugin</artifactId> <inherited>false</inherited> ===================================== server/runner/src/main/assembly/server.xml ===================================== @@ -76,26 +76,5 @@ <include>${applicationName}-CHANGELOG.*</include> </includes> </fileSet> - <fileSet> - <directory>target/server-configuration-tools-${project.version}</directory> - <outputDirectory>tools</outputDirectory> - <includes> - <include>**/*</include> - </includes> - <excludes> - <exclude>**/*.sh</exclude> - <exclude>**/*.bat</exclude> - </excludes> - </fileSet> - <fileSet> - <directory>target/server-configuration-tools-${project.version}</directory> - <outputDirectory>tools</outputDirectory> - <fileMode>0755</fileMode> - <filtered>true</filtered> - <includes> - <include>**/*.sh</include> - <include>**/*.bat</include> - </includes> - </fileSet> </fileSets> </assembly> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/16bd168ad28e5510fbab75982… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/16bd168ad28e5510fbab75982… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 9 commits: update pom
by Tony CHEMIT (＠tchemit) 25 Nov '23

25 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 58a78780 by Tony Chemit at 2023-11-23T13:58:02+01:00 update pom - - - - - 5171ad36 by Tony Chemit at 2023-11-25T13:40:12+01:00 update pom change pom dependencies coordinates - - - - - b474e869 by Tony Chemit at 2023-11-25T13:40:12+01:00 Remove never used code - - - - - b009e471 by Tony Chemit at 2023-11-25T13:40:12+01:00 fix on service should be PUT but was POST... - - - - - e810ab41 by Tony Chemit at 2023-11-25T13:40:12+01:00 Update http library API and improve timeout tuning - - - - - 40a629ff by Tony Chemit at 2023-11-25T13:40:12+01:00 add missing annotations - - - - - 8fbbb17f by Tony Chemit at 2023-11-25T14:47:48+01:00 Upgrade to fileupload2 - - - - - bc7ebe50 by Tony Chemit at 2023-11-25T14:47:48+01:00 update pom - - - - - bdc2aff0 by Tony Chemit at 2023-11-25T14:48:58+01:00 Merge branch 'feature/issue-2605' into develop Mettre à jour la libraire apache http-client - Closes #2605 - - - - - 25 changed files: - core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/AvdthService.java - core/services/client/pom.xml - core/services/client/src/main/java/fr/ird/observe/services/client/ObserveRequestBuilder.java - core/services/client/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java - pom.xml - server/configuration/src/main/resources/log4j2.xml - server/core/src/main/filtered-resources/META-INF/mapping-api-client.wm - server/core/src/main/java/fr/ird/observe/server/ObserveWebApplicationListener.java - server/core/src/main/java/fr/ird/observe/server/request/ObserveWebRequestContext.java - server/runner/src/main/resources/META-INF/configuration/log.xml - toolkit/api-services/src/main/java/fr/ird/observe/services/service/AnonymousService.java - toolkit/api-services/src/main/java/fr/ird/observe/services/service/UsageService.java - toolkit/api-services/src/main/java/fr/ird/observe/services/service/api/DataEntityService.java - toolkit/api-services/src/main/java/fr/ird/observe/services/service/api/ReferentialEntityService.java - toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/service/ServiceGenerateApiRunner.java - toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/service/ServiceLocalMethodDescriptionImpl.java - toolkit/server/pom.xml - toolkit/server/src/main/java/org/debux/webmotion/server/call/ServerContext.java - toolkit/server/src/main/java/org/debux/webmotion/server/handler/ExecutorMethodInvokerHandler.java - toolkit/server/src/main/java/org/debux/webmotion/server/handler/ExecutorParametersInjectorHandler.java - toolkit/server/src/main/java/org/debux/webmotion/server/handler/ParametersMultipartHandler.java - toolkit/server/src/main/java/org/debux/webmotion/server/call/FileProgressListener.java → toolkit/server/src/main/java/org/debux/webmotion/server/tools/upload/FileProgressListener.java - + toolkit/server/src/main/java/org/debux/webmotion/server/tools/upload/FileUpload.java - toolkit/server/src/main/java/org/debux/webmotion/server/tools/StringResponseHandler.java → toolkit/server/src/main/java/org/debux/webmotion/server/tools/upload/RequestContext.java - toolkit/server/src/main/resources/META-INF/web-fragment.xml Changes: ===================================== core/api/services/src/main/java/fr/ird/observe/services/service/data/ps/AvdthService.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.services.service.data.ps; import fr.ird.observe.datasource.security.Permission; import fr.ird.observe.services.service.MethodCredential; import fr.ird.observe.services.service.ObserveService; +import io.ultreia.java4all.http.spi.Get; import io.ultreia.java4all.http.spi.Service; /** @@ -42,6 +43,7 @@ public interface AvdthService extends ObserveService { * @param configuration configuration of import * @return result of import. */ + @Get @MethodCredential(Permission.READ_ALL_AND_WRITE_DATA) AvdthDataImportResult importData(AvdthDataImportConfiguration configuration) throws MissingReferentialException; ===================================== core/services/client/pom.xml ===================================== @@ -102,8 +102,12 @@ <artifactId>commons-lang3</artifactId> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> + </dependency> + <dependency> + <groupId>org.apache.httpcomponents.core5</groupId> + <artifactId>httpcore5</artifactId> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> @@ -163,22 +167,6 @@ <groupId>commons-fileupload</groupId> <artifactId>commons-fileupload</artifactId> </exclusion> - <exclusion> - <groupId>commons-collections</groupId> - <artifactId>commons-collections</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>fluent-hc</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </exclusion> - <exclusion> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </exclusion> <exclusion> <groupId>com.thoughtworks.paranamer</groupId> <artifactId>paranamer</artifactId> @@ -327,7 +315,7 @@ <packageName>fr.ird.observe.services.client</packageName> <serviceSupportType>fr.ird.observe.services.client.ObserveServiceClientSupport</serviceSupportType> <gsonType>io.ultreia.java4all.util.json.JsonAware</gsonType> - <addAuthToken>true</addAuthToken> + <addAuthenticationToken>true</addAuthenticationToken> <classSuffix>Client</classSuffix> </configuration> </execution> ===================================== core/services/client/src/main/java/fr/ird/observe/services/client/ObserveRequestBuilder.java ===================================== @@ -24,10 +24,12 @@ package fr.ird.observe.services.client; import fr.ird.observe.datasource.configuration.rest.ObserveDataSourceConfigurationRestConstants; import fr.ird.observe.services.ObserveServiceInitializerConfig; +import io.ultreia.java4all.http.HRequest; import io.ultreia.java4all.http.HRequestBuilder; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import java.util.Objects; -import java.util.concurrent.TimeUnit; /** * Created by tchemit on 17/07/17. @@ -35,14 +37,13 @@ import java.util.concurrent.TimeUnit; * @author Tony Chemit - dev(a)tchemit.fr */ public class ObserveRequestBuilder extends HRequestBuilder { + private static final Logger log = LogManager.getLogger(ObserveRequestBuilder.class); ObserveRequestBuilder(ObserveServiceClientContext serviceContext, String baseUrl) { super(serviceContext.getServiceUrl(baseUrl)); ObserveServiceInitializerConfig initializerConfig = serviceContext.getInitializer().getInitializerConfig(); - int defaultTimeout = initializerConfig.getHttpTimeout(); - setTimeout(TimeUnit.MILLISECONDS, defaultTimeout); if (serviceContext.getInitializer().withConnection()) { - addAuthTokenSupplier(serviceContext.getAuthTokenSupplier()); + addAuthenticationTokenSupplier(serviceContext.getAuthTokenSupplier()); } if (initializerConfig.withApplicationLocale()) { addHeader(ObserveDataSourceConfigurationRestConstants.REQUEST_APPLICATION_LOCALE, initializerConfig.getApplicationLocale().toString()); @@ -53,17 +54,16 @@ public class ObserveRequestBuilder extends HRequestBuilder { } @Override - protected void setAuthTokenInRequest() { - String authToken = authTokenSupplier.get(); - Objects.requireNonNull(authToken, "Can't add null authToken"); - addHeader(ObserveDataSourceConfigurationRestConstants.REQUEST_AUTHENTICATION_TOKEN, authToken); + protected void setAuthenticationTokenInRequest() { + String authenticationToken = authenticationTokenSupplier.get(); + Objects.requireNonNull(authenticationToken, "Can't add null authenticationToken"); + addHeader(ObserveDataSourceConfigurationRestConstants.REQUEST_AUTHENTICATION_TOKEN, authenticationToken); } @Override - public HRequestBuilder setTimeout(TimeUnit timeUnit, int timeout) { - super.setTimeout(timeUnit, timeout); - //FIXME See the difference with timeout, but it seems strange to have a lesser value here - super.setSocketTimeout(timeUnit, timeout); - return this; + protected HRequest build() { + HRequest request = super.build(); + log.debug("Created request: {}", request); + return request; } } ===================================== core/services/client/src/main/java/fr/ird/observe/services/client/ObserveServiceFactoryClient.java ===================================== @@ -31,10 +31,17 @@ import fr.ird.observe.services.service.ObserveService; import fr.ird.observe.spi.json.DtoGsonSupplier; import io.ultreia.java4all.http.HResponseBuilder; import io.ultreia.java4all.lang.Strings; +import org.apache.hc.client5.http.config.ConnectionConfig; +import org.apache.hc.client5.http.config.RequestConfig; +import org.apache.hc.client5.http.cookie.BasicCookieStore; +import org.apache.hc.client5.http.impl.classic.CloseableHttpClient; +import org.apache.hc.client5.http.impl.classic.HttpClientBuilder; +import org.apache.hc.client5.http.impl.io.BasicHttpClientConnectionManager; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import java.util.Objects; +import java.util.concurrent.TimeUnit; /** * Created on 16/08/15. @@ -48,7 +55,30 @@ public class ObserveServiceFactoryClient implements ObserveServiceFactory { private final static ClassMappingClient CLASS_MAPPING = ClassMappingClient.get(); private final static int LOCATE_PREFIX_LENGTH = ObserveServiceClientSupport.class.getPackage().getName().length(); private final ObserveRequestBuilderFactory requestBuilderFactory = new ObserveRequestBuilderFactory(); - private final HResponseBuilder responseBuilder = HResponseBuilder.create(new DtoGsonSupplier()); + + private HResponseBuilder responseBuilder; + + private synchronized HResponseBuilder getResponseBuilder(ObserveServiceInitializer serviceInitializer) { + if (responseBuilder == null) { + int timeout = serviceInitializer.getInitializerConfig().getHttpTimeout(); + ConnectionConfig connConfig = ConnectionConfig.custom() + .setSocketTimeout(timeout, TimeUnit.MILLISECONDS) + .build(); + BasicHttpClientConnectionManager cm = new BasicHttpClientConnectionManager(); + cm.setConnectionConfig(connConfig); + CloseableHttpClient httpClient = HttpClientBuilder.create() + .setConnectionManager(cm) + .setDefaultCookieStore(new BasicCookieStore()) + .setDefaultRequestConfig(RequestConfig.custom().setResponseTimeout(timeout, TimeUnit.MILLISECONDS).build()) + //FIXME-migration +// .setMaxConnTotal(1000) +// .setMaxConnPerRoute(1000) +// .setConnectionTimeToLive(45, TimeUnit.SECONDS) + .build(); + responseBuilder = HResponseBuilder.create(new DtoGsonSupplier(), httpClient); + } + return responseBuilder; + } @Override public <S extends ObserveService> boolean accept(ObserveDataSourceConfiguration dataSourceConfiguration, Class<S> serviceType) { @@ -88,7 +118,7 @@ public class ObserveServiceFactoryClient implements ObserveServiceFactory { serviceLocation = Strings.removeEnd(serviceLocation, "Client"); ObserveServiceClientContext serviceRestApiContext = new ObserveServiceClientContext( serviceInitializer, - responseBuilder, + getResponseBuilder(serviceInitializer), requestBuilderFactory, serviceLocation); ((ObserveServiceClientSupport) service).setServiceContext(serviceRestApiContext); @@ -97,10 +127,12 @@ public class ObserveServiceFactoryClient implements ObserveServiceFactory { @Override public void close() { - try { - responseBuilder.close(); - } catch (Exception e) { - log.error("Can't close response builder", e); + if (responseBuilder != null) { + try { + responseBuilder.close(); + } catch (Exception e) { + log.error("Can't close response builder", e); + } } } ===================================== pom.xml ===================================== @@ -23,7 +23,7 @@ <parent> <groupId>io.ultreia.maven</groupId> <artifactId>pom</artifactId> - <version>2023.47</version> + <version>2023.51</version> </parent> <groupId>fr.ird.observe</groupId> <artifactId>ird-observe</artifactId> @@ -277,6 +277,16 @@ <artifactId>commons-fileupload</artifactId> <version>${lib.version.commons-fileupload}</version> </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-fileupload2-core</artifactId> + <version>${lib.version.commons-fileupload2}</version> + </dependency> + <dependency> + <groupId>org.apache.commons</groupId> + <artifactId>commons-fileupload2-jakarta</artifactId> + <version>${lib.version.commons-fileupload2}</version> + </dependency> <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> @@ -550,14 +560,14 @@ <version>${lib.version.commons-text}</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - <version>${lib.version.httpclient}</version> + <groupId>org.apache.httpcomponents.client5</groupId> + <artifactId>httpclient5</artifactId> + <version>${lib.version.httpclient5}</version> </dependency> <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - <version>${lib.version.httpcore}</version> + <groupId>org.apache.httpcomponents.core5</groupId> + <artifactId>httpcore5</artifactId> + <version>${lib.version.httpcore5}</version> </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> ===================================== server/configuration/src/main/resources/log4j2.xml ===================================== @@ -64,6 +64,10 @@ <Logger name="org.debux.webmotion.server" level="info" additivity="false"> <AppenderRef ref="console"/> </Logger> +  +  <Logger name="fr.ird.observe" level="info" additivity="false"> <AppenderRef ref="console"/> </Logger> ===================================== server/core/src/main/filtered-resources/META-INF/mapping-api-client.wm ===================================== @@ -64,7 +64,7 @@ DELETE /api/DataEntityService/delete api. GET /api/DataEntityService/generateId api.DataEntityServiceRestApi.generateId GET /api/DataEntityService/getOne api.DataEntityServiceRestApi.getOne GET /api/DataEntityService/getSome api.DataEntityServiceRestApi.getSome -POST /api/DataEntityService/update api.DataEntityServiceRestApi.update +PUT /api/DataEntityService/update api.DataEntityServiceRestApi.update POST /api/ReferentialEntityService/create api.ReferentialEntityServiceRestApi.create DELETE /api/ReferentialEntityService/delete api.ReferentialEntityServiceRestApi.delete GET /api/ReferentialEntityService/generateId api.ReferentialEntityServiceRestApi.generateId ===================================== server/core/src/main/java/fr/ird/observe/server/ObserveWebApplicationListener.java ===================================== @@ -53,12 +53,15 @@ public class ObserveWebApplicationListener implements WebMotionServerListener { contextPath = contextPath.substring(1); } log.info(String.format("Application starting on [%s] at %s...", contextPath, new Date())); + ObserveWebApplicationContext applicationContext; try { - ObserveWebApplicationContext applicationContext = ObserveWebApplicationContext.init(contextPath); + applicationContext = ObserveWebApplicationContext.init(contextPath); servletContext.setAttribute(ObserveWebApplicationContext.APPLICATION_CONTEXT_PARAMETER, applicationContext); } catch (Exception e) { throw new ObserveWebApplicationContextInitException("Can't init application context", e); } + context.setTemporaryPath(applicationContext.getApplicationConfiguration().getTemporaryDirectory().toPath()); + log.info(String.format("Initializing %s done.", this)); } ===================================== server/core/src/main/java/fr/ird/observe/server/request/ObserveWebRequestContext.java ===================================== @@ -141,7 +141,7 @@ public class ObserveWebRequestContext { public void checkAuthentication(ObserveWebUserSession session, Class<? extends ObserveService> serviceType, Method method) { Method serviceMethod = getServiceMethod(serviceType, method); RequestAnnotation requestAnnotation = SpiHelper.getRequestAnnotation(serviceMethod); - boolean requiredAuthentication = requestAnnotation.isAddAuthToken(); + boolean requiredAuthentication = requestAnnotation.isAddAuthenticationToken(); boolean withConnection = session.withConnection(); if (requiredAuthentication) { if (!withConnection) { ===================================== server/runner/src/main/resources/META-INF/configuration/log.xml ===================================== @@ -106,6 +106,11 @@ <AppenderRef ref="console"/> <AppenderRef ref="File"/> </Logger> +  +  <Root level="error"> <AppenderRef ref="console"/> <AppenderRef ref="File"/> ===================================== toolkit/api-services/src/main/java/fr/ird/observe/services/service/AnonymousService.java ===================================== @@ -49,45 +49,45 @@ import java.util.Set; @Service public interface AnonymousService extends ObserveService { - @Get(addAuthtoken = false) + @Get(addAuthenticationToken = false) Version getModelVersion(); - @Get(addAuthtoken = false) + @Get(addAuthenticationToken = false) Version getServerVersion(); - @Get(addAuthtoken = false) + @Get(addAuthenticationToken = false) ObserveDataSourceInformation checkCanConnect(ObserveDataSourceConfiguration config) throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException; - @Get(addAuthtoken = false) + @Get(addAuthenticationToken = false) ObserveDataSourceInformation checkCanConnectOrBeEmpty(ObserveDataSourceConfiguration config) throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException; - @Post(addAuthtoken = false) + @Post(addAuthenticationToken = false) ObserveDataSourceConnection createEmpty(ObserveDataSourceConfiguration config) throws IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException; - @Post(addAuthtoken = false, useMultiPartForm = true) + @Post(addAuthenticationToken = false, useMultiPartForm = true) ObserveDataSourceConnection createFromDump(ObserveDataSourceConfiguration config, SqlScript dump) throws IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException; - @Post(addAuthtoken = false, useMultiPartForm = true) + @Post(addAuthenticationToken = false, useMultiPartForm = true) ObserveDataSourceConnection createFromImport(ObserveDataSourceConfiguration config, SqlScript dump, @Nullable SqlScript optionalDump) throws IncompatibleDataSourceCreateConfigurationException, DataSourceCreateWithNoReferentialImportException, BabModelVersionException, DatabaseConnexionNotAuthorizedException, DatabaseNotFoundException; - @Get(addAuthtoken = false) + @Get(addAuthenticationToken = false) ObserveDataSourceConnection open(ObserveDataSourceConfiguration config) throws DatabaseNotFoundException, DatabaseConnexionNotAuthorizedException, BabModelVersionException; - @Get(addAuthtoken = false) + @Get(addAuthenticationToken = false) Set<DataSourceUserDto> getUsers(ObserveDataSourceConfiguration config); - @Get(addAuthtoken = false, timeOut = 100) + @Get(addAuthenticationToken = false, timeOut = 100) void applySecurity(ObserveDataSourceConfiguration config, Set<DataSourceUserDto> users); - @Get(addAuthtoken = false, timeOut = 100) + @Get(addAuthenticationToken = false, timeOut = 100) void migrateData(ObserveDataSourceConfiguration config); - @Get(addAuthtoken = false) + @Get(addAuthenticationToken = false) String generateHomeId(); /** * @return list of available databases (only available for server service) */ - @Get(addAuthtoken = false) + @Get(addAuthenticationToken = false) Set<String> getAvailableDatabaseNames(); } ===================================== toolkit/api-services/src/main/java/fr/ird/observe/services/service/UsageService.java ===================================== @@ -26,6 +26,7 @@ import fr.ird.observe.datasource.security.Permission; import fr.ird.observe.dto.BusinessDto; import fr.ird.observe.dto.ToolkitIdDtoBean; import fr.ird.observe.dto.ToolkitIdLabel; +import io.ultreia.java4all.http.spi.Get; import io.ultreia.java4all.http.spi.Post; import io.ultreia.java4all.http.spi.Service; @@ -40,9 +41,11 @@ import java.util.Set; @Service public interface UsageService extends ObserveService { + @Get @MethodCredential(Permission.READ_ALL) UsageCount countReferential(ToolkitIdDtoBean request); + @Get @MethodCredential(Permission.READ_ALL) UsageCount countReferentialInData(ToolkitIdDtoBean request); @@ -50,9 +53,11 @@ public interface UsageService extends ObserveService { @MethodCredential(Permission.READ_REFERENTIAL) <D extends BusinessDto> Set<ToolkitIdLabel> findReferential(ToolkitIdDtoBean request, Class<D> targetType); + @Get @MethodCredential(Permission.READ_DATA) UsageCount countOptionalData(ToolkitIdDtoBean request); + @Get @MethodCredential(Permission.READ_DATA) UsageCount countMandatoryData(ToolkitIdDtoBean request); ===================================== toolkit/api-services/src/main/java/fr/ird/observe/services/service/api/DataEntityService.java ===================================== @@ -33,6 +33,7 @@ import io.ultreia.java4all.http.spi.Delete; import io.ultreia.java4all.http.spi.Get; import io.ultreia.java4all.http.spi.Nullable; import io.ultreia.java4all.http.spi.Post; +import io.ultreia.java4all.http.spi.Put; import io.ultreia.java4all.http.spi.Service; import io.ultreia.java4all.http.spi.Write; @@ -62,7 +63,7 @@ public interface DataEntityService extends ObserveService { return getSome(dtoType, config, filters, Map.of()); } - @Get(addAuthtoken = false) + @Get(addAuthenticationToken = false) List<String> generateId(Class<? extends DataDto> dtoType, int number); @Post(useMultiPartForm = true) @@ -70,7 +71,7 @@ public interface DataEntityService extends ObserveService { @Write ToolkitId create(Class<? extends DataDto> dtoType, String content) throws InvalidDataException; - @Post(useMultiPartForm = true) + @Put(useMultiPartForm = true) @MethodCredential(Permission.READ_ALL_AND_WRITE_DATA) @Write ToolkitId update(Class<? extends DataDto> dtoType, String id, String content) throws InvalidDataException; ===================================== toolkit/api-services/src/main/java/fr/ird/observe/services/service/api/ReferentialEntityService.java ===================================== @@ -81,7 +81,7 @@ public interface ReferentialEntityService extends ObserveService { return getSome(dtoType, config, filters, Map.of()); } - @Get(addAuthtoken = false) + @Get(addAuthenticationToken = false) List<String> generateId(Class<? extends ReferentialDto> dtoType, int number); @Post(useMultiPartForm = true) ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/service/ServiceGenerateApiRunner.java ===================================== @@ -35,11 +35,8 @@ import fr.ird.observe.spi.navigation.model.tree.TreeProjectModelBuilder; import fr.ird.observe.toolkit.maven.plugin.MojoRunnable; import io.ultreia.java4all.http.spi.Delete; import io.ultreia.java4all.http.spi.Get; -import io.ultreia.java4all.http.spi.Head; -import io.ultreia.java4all.http.spi.Patch; import io.ultreia.java4all.http.spi.Post; import io.ultreia.java4all.http.spi.Put; -import io.ultreia.java4all.http.spi.Trace; import io.ultreia.java4all.http.spi.Write; import io.ultreia.java4all.http.spi.model.ImportManager; import io.ultreia.java4all.http.spi.model.MethodDescription; @@ -227,6 +224,20 @@ public class ServiceGenerateApiRunner extends MojoRunnable { } + private String addMethodAnnotation(boolean addAuthenticationToken, boolean useMultiPartForm, int timeOut) { + String parameters = ""; + if (!addAuthenticationToken) { + parameters += ", addAuthenticationToken = false"; + } + if (useMultiPartForm) { + parameters += ", useMultiPartForm = true"; + } + if (timeOut != 0) { + parameters += ", timeOut = " + timeOut; + } + return parameters; + } + protected void addMethod(ServiceLocalMethodDescriptionImpl methodDescription, List<String> methods) { Permission methodeCredentials = methodDescription.getMethodeCredentials(); StringBuilder annotationsBuilder = new StringBuilder(); @@ -243,104 +254,32 @@ public class ServiceGenerateApiRunner extends MojoRunnable { parameters += ", " + Permission.class.getSimpleName() + "." + methodeCredentials.name(); } else if (annotation instanceof Get) { Get annotation1 = (Get) annotation; - boolean addAuthToken = annotation1.addAuthtoken(); - boolean useMultiPartForm = annotation1.useMultiPartForm(); + boolean addAuthenticationToken = annotation1.addAuthenticationToken(); + boolean useMultiPartForm = false; int timeOut = annotation1.timeOut(); - if (!addAuthToken) { - parameters += ", addAuthtoken = false"; - } - if (useMultiPartForm) { - parameters += ", useMultiPartForm = true"; - } - if (timeOut != 1) { - parameters += ", timeOut = " + timeOut; - } + parameters += addMethodAnnotation(addAuthenticationToken, useMultiPartForm, timeOut); } else if (annotation instanceof Post) { Post annotation1 = (Post) annotation; - boolean addAuthToken = annotation1.addAuthtoken(); + boolean addAuthenticationToken = annotation1.addAuthenticationToken(); boolean useMultiPartForm = annotation1.useMultiPartForm(); int timeOut = annotation1.timeOut(); - if (!addAuthToken) { - parameters += ", addAuthtoken = false"; - } - if (useMultiPartForm) { - parameters += ", useMultiPartForm = true"; - } - if (timeOut != 1) { - parameters += ", timeOut = " + timeOut; - } + parameters += addMethodAnnotation(addAuthenticationToken, useMultiPartForm, timeOut); + } else if (annotation instanceof Put) { Put annotation1 = (Put) annotation; - boolean addAuthToken = annotation1.addAuthtoken(); + boolean addAuthenticationToken = annotation1.addAuthenticationToken(); boolean useMultiPartForm = annotation1.useMultiPartForm(); int timeOut = annotation1.timeOut(); - if (!addAuthToken) { - parameters += ", addAuthtoken = false"; - } - if (useMultiPartForm) { - parameters += ", useMultiPartForm = true"; - } - if (timeOut != 1) { - parameters += ", timeOut = " + timeOut; - } + parameters += addMethodAnnotation(addAuthenticationToken, useMultiPartForm, timeOut); + } else if (annotation instanceof Delete) { Delete annotation1 = (Delete) annotation; - boolean addAuthToken = annotation1.addAuthtoken(); + boolean addAuthenticationToken = annotation1.addAuthenticationToken(); boolean useMultiPartForm = annotation1.useMultiPartForm(); int timeOut = annotation1.timeOut(); - if (!addAuthToken) { - parameters += ", addAuthtoken = false"; - } - if (useMultiPartForm) { - parameters += ", useMultiPartForm = true"; - } - if (timeOut != 1) { - parameters += ", timeOut = " + timeOut; - } - } else if (annotation instanceof Patch) { - Patch annotation1 = (Patch) annotation; - boolean addAuthToken = annotation1.addAuthtoken(); - boolean useMultiPartForm = annotation1.useMultiPartForm(); - int timeOut = annotation1.timeOut(); - if (!addAuthToken) { - parameters += ", addAuthtoken = false"; - } - if (useMultiPartForm) { - parameters += ", useMultiPartForm = true"; - } - if (timeOut != 1) { - parameters += ", timeOut = " + timeOut; - } - } else if (annotation instanceof Head) { - Head annotation1 = (Head) annotation; - boolean addAuthToken = annotation1.addAuthtoken(); - boolean useMultiPartForm = annotation1.useMultiPartForm(); - int timeOut = annotation1.timeOut(); - if (!addAuthToken) { - parameters += ", addAuthtoken = false"; - } - if (useMultiPartForm) { - parameters += ", useMultiPartForm = true"; - } - if (timeOut != 1) { - parameters += ", timeOut = " + timeOut; - } - } else if (annotation instanceof Trace) { - Trace annotation1 = (Trace) annotation; - boolean addAuthToken = annotation1.addAuthtoken(); - boolean useMultiPartForm = annotation1.useMultiPartForm(); - int timeOut = annotation1.timeOut(); - if (!addAuthToken) { - parameters += ", addAuthtoken = false"; - } - if (useMultiPartForm) { - parameters += ", useMultiPartForm = true"; - } - if (timeOut != 1) { - parameters += ", timeOut = " + timeOut; - } + parameters += addMethodAnnotation(addAuthenticationToken, useMultiPartForm, timeOut); } - if (parameters.length() > 0) { + if (!parameters.isEmpty()) { annotationsBuilder.append("(").append(parameters.substring(2)).append(")"); } } ===================================== toolkit/plugin/src/main/java/fr/ird/observe/toolkit/maven/plugin/service/ServiceLocalMethodDescriptionImpl.java ===================================== @@ -75,7 +75,7 @@ public class ServiceLocalMethodDescriptionImpl implements MethodDescription { this.methodeCredentials = Optional.ofNullable(method.getAnnotation(MethodCredential.class)).map(MethodCredential::value).orElse(null); this.write = SpiHelper.write(method); - this.noTransaction = !SpiHelper.getRequestAnnotation(method).isAddAuthToken(); + this.noTransaction = !SpiHelper.getRequestAnnotation(method).isAddAuthenticationToken(); } public Method getMethod() { ===================================== toolkit/server/pom.xml ===================================== @@ -42,8 +42,8 @@ <artifactId>commons-configuration</artifactId> </dependency> <dependency> - <groupId>commons-fileupload</groupId> - <artifactId>commons-fileupload</artifactId> + <groupId>org.apache.commons</groupId> + <artifactId>commons-fileupload2-core</artifactId> </dependency> <dependency> <groupId>commons-io</groupId> @@ -65,14 +65,6 @@ <groupId>org.apache.commons</groupId> <artifactId>commons-lang3</artifactId> </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpclient</artifactId> - </dependency> - <dependency> - <groupId>org.apache.httpcomponents</groupId> - <artifactId>httpcore</artifactId> - </dependency> <dependency> <groupId>org.apache.logging.log4j</groupId> <artifactId>log4j-api</artifactId> ===================================== toolkit/server/src/main/java/org/debux/webmotion/server/call/ServerContext.java ===================================== @@ -25,6 +25,7 @@ import io.ultreia.java4all.lang.Objects2; import org.apache.commons.beanutils.BeanUtilsBean; import org.apache.commons.beanutils.ConvertUtilsBean; import org.apache.commons.beanutils.Converter; +import org.apache.commons.fileupload2.core.DiskFileItemFactory; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.debux.webmotion.server.WebMotionController; @@ -44,6 +45,7 @@ import org.debux.webmotion.server.tools.SingletonFactory; import javax.servlet.ServletContext; import java.lang.reflect.Method; +import java.nio.file.Path; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -136,6 +138,16 @@ public class ServerContext { * Current exclude paths */ protected String[] excludePaths = {}; + /** + * Temporary path used + */ + protected Path temporaryPath; + /** + * Use to read multi-parts. + * + * @see org.debux.webmotion.server.handler.ParametersMultipartHandler + */ + protected DiskFileItemFactory fileItemFactory; /** * Initialize the context. @@ -461,6 +473,24 @@ public class ServerContext { this.excludePaths = excludePaths; } + public Path getTemporaryPath() { + return temporaryPath; + } + + public void setTemporaryPath(Path temporaryPath) { + this.temporaryPath = temporaryPath; + } + + public synchronized DiskFileItemFactory getFileItemFactory() { + if (fileItemFactory == null) { + if (getTemporaryPath() == null) { + throw new IllegalStateException("No temporary path set in the ServerContext."); + } + fileItemFactory = DiskFileItemFactory.builder().setBufferSize(1024 * 1024 /* 1Mb */).setPath(getTemporaryPath()).get(); + } + return fileItemFactory; + } + private static final Logger log = LogManager.getLogger(ServerContext.class); public void loadExecutors(Mapping mapping, Stream<? extends Rule> actionStream) { ===================================== toolkit/server/src/main/java/org/debux/webmotion/server/handler/ExecutorMethodInvokerHandler.java ===================================== @@ -30,7 +30,7 @@ import org.debux.webmotion.server.WebMotionFilter; import org.debux.webmotion.server.WebMotionHandler; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.call.Executor; -import org.debux.webmotion.server.call.FileProgressListener; +import org.debux.webmotion.server.tools.upload.FileProgressListener; import org.debux.webmotion.server.call.HttpContext; import org.debux.webmotion.server.call.ServerContext; import org.debux.webmotion.server.mapping.Action; ===================================== toolkit/server/src/main/java/org/debux/webmotion/server/handler/ExecutorParametersInjectorHandler.java ===================================== @@ -24,7 +24,7 @@ package org.debux.webmotion.server.handler; import org.debux.webmotion.server.WebMotionHandler; import org.debux.webmotion.server.call.Call; import org.debux.webmotion.server.call.Executor; -import org.debux.webmotion.server.call.FileProgressListener; +import org.debux.webmotion.server.tools.upload.FileProgressListener; import org.debux.webmotion.server.call.HttpContext; import org.debux.webmotion.server.call.HttpContext.ErrorData; import org.debux.webmotion.server.call.ServerContext; ===================================== toolkit/server/src/main/java/org/debux/webmotion/server/handler/ParametersMultipartHandler.java ===================================== @@ -21,25 +21,24 @@ */ package org.debux.webmotion.server.handler; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItem; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; +import io.ultreia.java4all.lang.Strings; +import org.apache.commons.fileupload2.core.DiskFileItem; import org.apache.commons.lang3.ArrayUtils; +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; import org.debux.webmotion.server.WebMotionException; import org.debux.webmotion.server.WebMotionHandler; import org.debux.webmotion.server.call.Call; -import org.debux.webmotion.server.call.FileProgressListener; import org.debux.webmotion.server.call.HttpContext; import org.debux.webmotion.server.call.UploadFile; import org.debux.webmotion.server.mapping.Mapping; +import org.debux.webmotion.server.tools.upload.FileUpload; import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; import java.io.File; +import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.util.List; import java.util.Map; @@ -51,6 +50,8 @@ import java.util.Map; */ public class ParametersMultipartHandler extends AbstractHandler implements WebMotionHandler { + private static final Logger log = LogManager.getLogger(ParametersMultipartHandler.class); + @Override public void handle(Mapping mapping, Call call) { HttpContext context = call.getContext(); @@ -58,29 +59,28 @@ public class ParametersMultipartHandler extends AbstractHandler implements WebMo Map<String, Object> extractParameters = call.getExtractParameters(); - boolean isMultipart = ServletFileUpload.isMultipartContent(request); + boolean isMultipart = FileUpload.isMultipartContent(request); if (isMultipart) { - FileItemFactory fileItemFactory = new DiskFileItemFactory(0, null); - ServletFileUpload upload = new ServletFileUpload(fileItemFactory); - - HttpSession session = request.getSession(); - if (session != null) { - FileProgressListener listener = new FileProgressListener(); - upload.setProgressListener(listener); - session.setAttribute(FileProgressListener.SESSION_ATTRIBUTE_NAME, listener); - call.setFileUploadRequest(true); - } + FileUpload upload = new FileUpload(context.getServerContext().getFileItemFactory()); + +// HttpSession session = request.getSession(); +// if (session != null) { +// FileProgressListener listener = new FileProgressListener(); +// upload.setProgressListener(listener); +// session.setAttribute(FileProgressListener.SESSION_ATTRIBUTE_NAME, listener); +// call.setFileUploadRequest(true); +// } try { - List<FileItem> items = upload.parseRequest(request); - for (FileItem item0 : items) { - DiskFileItem item = (DiskFileItem) item0; + List<DiskFileItem> items = upload.parseRequest(request); + for (DiskFileItem item : items) { String fieldName = item.getFieldName(); + log.debug("Multipart: {} - size: {} - in memory? {} - location: {}", fieldName, Strings.convertMemory(item.getSize()), item.isInMemory(), item.getPath()); if (item.isFormField()) { String fieldValue; try { - fieldValue = item.getString("UTF-8"); + fieldValue = item.getString(StandardCharsets.UTF_8); } catch (UnsupportedEncodingException e) { fieldValue = item.getString(); } @@ -96,24 +96,12 @@ public class ParametersMultipartHandler extends AbstractHandler implements WebMo } } else { - UploadFile uploadFile = new UploadFile(); - - File file = item.getStoreLocation(); - uploadFile.setFile(file); - - String fileName = item.getName(); - uploadFile.setName(fileName); - - long fileSize = item.getSize(); - uploadFile.setSize(fileSize); - - String fileType = item.getContentType(); - uploadFile.setContentType(fileType); + UploadFile uploadFile = getUploadFile(item); extractParameters.put(fieldName, uploadFile); } } - } catch (FileUploadException fue) { + } catch (IOException fue) { throw new WebMotionException("Error during upload file on server", fue); } @@ -122,4 +110,21 @@ public class ParametersMultipartHandler extends AbstractHandler implements WebMo extractParameters.putAll(parameters); } } + + private static UploadFile getUploadFile(DiskFileItem item) { + UploadFile uploadFile = new UploadFile(); + + File file = item.getPath().toFile(); + uploadFile.setFile(file); + + String fileName = item.getName(); + uploadFile.setName(fileName); + + long fileSize = item.getSize(); + uploadFile.setSize(fileSize); + + String fileType = item.getContentType(); + uploadFile.setContentType(fileType); + return uploadFile; + } } ===================================== toolkit/server/src/main/java/org/debux/webmotion/server/call/FileProgressListener.java → toolkit/server/src/main/java/org/debux/webmotion/server/tools/upload/FileProgressListener.java ===================================== @@ -19,9 +19,9 @@ * <http://www.gnu.org/licenses/gpl-3.0.html>. * #L% */ -package org.debux.webmotion.server.call; +package org.debux.webmotion.server.tools.upload; -import org.apache.commons.fileupload.ProgressListener; +import org.apache.commons.fileupload2.core.ProgressListener; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; @@ -30,7 +30,6 @@ import org.apache.logging.log4j.Logger; * stored in session. * * @author julien - * @see org.apache.commons.fileupload.FileUpload */ public class FileProgressListener implements ProgressListener { ===================================== toolkit/server/src/main/java/org/debux/webmotion/server/tools/upload/FileUpload.java ===================================== @@ -0,0 +1,69 @@ +package org.debux.webmotion.server.tools.upload; + +/*- + * #%L + * ObServe Toolkit :: Server + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import org.apache.commons.fileupload2.core.AbstractFileUpload; +import org.apache.commons.fileupload2.core.DiskFileItem; +import org.apache.commons.fileupload2.core.DiskFileItemFactory; +import org.apache.commons.fileupload2.core.FileItemInputIterator; +import org.apache.commons.fileupload2.core.FileUploadException; + +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Set; + +/** + * Created at 24/11/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class FileUpload extends AbstractFileUpload<HttpServletRequest, DiskFileItem, DiskFileItemFactory> { + + public static final Set<String> ACCEPTED_METHOD = Set.of("post","put"); + public FileUpload(DiskFileItemFactory fileItemFactory) { + setFileItemFactory(Objects.requireNonNull(fileItemFactory)); + } + + public static boolean isMultipartContent(final HttpServletRequest request) { + return ACCEPTED_METHOD.contains(request.getMethod().toLowerCase()) && AbstractFileUpload.isMultipartContent(new RequestContext(request)); + } + + @Override + public FileItemInputIterator getItemIterator(HttpServletRequest request) throws IOException { + return super.getItemIterator(new RequestContext(request)); + } + + @Override + public Map<String, List<DiskFileItem>> parseParameterMap(HttpServletRequest request) throws FileUploadException { + return super.parseParameterMap(new RequestContext(request)); + } + + @Override + public List<DiskFileItem> parseRequest(HttpServletRequest request) throws FileUploadException { + return super.parseRequest(new RequestContext(request)); + } +} ===================================== toolkit/server/src/main/java/org/debux/webmotion/server/tools/StringResponseHandler.java → toolkit/server/src/main/java/org/debux/webmotion/server/tools/upload/RequestContext.java ===================================== @@ -1,6 +1,6 @@ -package org.debux.webmotion.server.tools; +package org.debux.webmotion.server.tools.upload; -/* +/*- * #%L * ObServe Toolkit :: Server * %% @@ -22,31 +22,59 @@ package org.debux.webmotion.server.tools; * #L% */ -import java.io.IOException; +import org.apache.commons.fileupload2.core.AbstractRequestContext; -import org.apache.http.HttpEntity; -import org.apache.http.HttpResponse; -import org.apache.http.client.ClientProtocolException; -import org.apache.http.client.ResponseHandler; -import org.apache.http.util.EntityUtils; +import javax.servlet.http.HttpServletRequest; +import java.io.IOException; +import java.io.InputStream; /** - * Return the content as String without test on status code. - * You can @see ContentResponseHandler for more information. - * - * @author julien + * Created at 24/11/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 */ -public class StringResponseHandler implements ResponseHandler<String> { +public class RequestContext extends AbstractRequestContext<HttpServletRequest> { + + /** + * The request for which the context is being provided. + */ + private final HttpServletRequest request; + + protected RequestContext(HttpServletRequest request) { + super(request::getHeader, request::getContentLength, request); + this.request = request; + } + + /** + * Gets the character encoding for the request. + * + * @return The character encoding for the request. + */ + @Override + public String getCharacterEncoding() { + return request.getCharacterEncoding(); + } + + /** + * Gets the content type of the request. + * + * @return The content type of the request. + */ + @Override + public String getContentType() { + return request.getContentType(); + } + /** + * Gets the input stream for the request. + * + * @return The input stream for the request. + * @throws java.io.IOException if a problem occurs. + */ @Override - public String handleResponse( - final HttpResponse response) throws ClientProtocolException, IOException { - HttpEntity entity = response.getEntity(); - if (entity != null) { - return EntityUtils.toString(entity); - } else { - return null; - } + public InputStream getInputStream() throws IOException { + return request.getInputStream(); } } ===================================== toolkit/server/src/main/resources/META-INF/web-fragment.xml ===================================== @@ -23,11 +23,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-fragment_3_0.xsd"> <name>webmotion</name> - - <listener> - <listener-class>org.apache.commons.fileupload.servlet.FileCleanerCleanup</listener-class> - </listener> - + <listener> <listener-class>org.debux.webmotion.server.WebMotionServletContextListener</listener-class> </listener> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/576a6a8c62fd4e73af30e47a… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/576a6a8c62fd4e73af30e47a… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Move persistence model back to 9.2 (we don't need a migration at this time) and update pom
by Tony CHEMIT (＠tchemit) 23 Nov '23

23 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 576a6a8c by Tony Chemit at 2023-11-23T13:44:28+01:00 Move persistence model back to 9.2 (we don't need a migration at this time) and update pom - - - - - 2 changed files: - core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java - pom.xml Changes: ===================================== core/persistence/migration/src/main/java/fr/ird/observe/spi/migration/v9/DataSourceMigrationForVersion_9_3.java ===================================== @@ -35,7 +35,7 @@ import org.nuiton.topia.service.migration.resources.MigrationVersionResourceExec * @author Tony Chemit - dev(a)tchemit.fr * @since 9.3.0 */ -(a)AutoService(MigrationVersionResource.class) +//(a)AutoService(MigrationVersionResource.class) public class DataSourceMigrationForVersion_9_3 extends ByMajorMigrationVersionResource { public DataSourceMigrationForVersion_9_3() { ===================================== pom.xml ===================================== @@ -93,9 +93,9 @@ <model.persistence.defaultPackage>fr.ird.observe.entities</model.persistence.defaultPackage> <model.persistence.fullPackagePath>fr.ird.observe</model.persistence.fullPackagePath>  - <persistence.model.version>9.3</persistence.model.version> + <persistence.model.version>9.2</persistence.model.version>  - <persistence.previous.model.version>9.2</persistence.previous.model.version> + <persistence.previous.model.version>9.1</persistence.previous.model.version> <tck.filename>tck-v${persistence.model.version}.zip</tck.filename> <tck.updated.filename>updated-${tck.filename}</tck.updated.filename> <tck.remote.path>/var/www/html/private/ird-observe/tck</tck.remote.path> View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/576a6a8c62fd4e73af30e47a6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/576a6a8c62fd4e73af30e47a6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 2 commits: add validCount and notValidCount in ObserveMapPaneLegendItem (to be able to...
by Tony CHEMIT (＠tchemit) 22 Nov '23

22 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: c86477a7 by Tony Chemit at 2023-11-22T15:37:45+01:00 add validCount and notValidCount in ObserveMapPaneLegendItem (to be able to compute real label at runtime via the getLabel method) - See #2805 - - - - - d72c14b2 by Tony Chemit at 2023-11-22T17:45:06+01:00 Pouvoir sélectionner/déselectionner les lignes et les points dans la carte - Closes #2806 - - - - - 8 changed files: - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/ObserveMapPane.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/ObserveMapPaneLegendItem.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapContentBuilderSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUIHandler.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripMapContentBuilder.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java - core/api/dto/src/main/java/fr/ird/observe/dto/data/TripMapContentBuilder.java Changes: ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java ===================================== @@ -25,6 +25,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data; import fr.ird.observe.client.WithClientUIContextApi; import fr.ird.observe.client.configuration.ClientConfig; import fr.ird.observe.client.datasource.editor.api.content.data.list.ContentListUIHandler; +import fr.ird.observe.client.datasource.editor.api.content.data.map.ObserveMapPane; import fr.ird.observe.client.datasource.editor.api.content.data.map.TripMapUI; import fr.ird.observe.client.datasource.editor.api.content.data.ropen.ContentRootOpenableUI; import fr.ird.observe.dto.data.RootOpenableDto; @@ -88,7 +89,7 @@ public abstract class TripUIHelper<D extends RootOpenableDto, U extends ContentR updateMapModel(); } }); - + tripMap.getObserveMapPane().addPropertyChangeListener(ObserveMapPane.PROPERTY_REBUILD_MODEL, e -> rebuildTripMap()); ui.getMainTabbedPane().addChangeListener(this::onTabChanged); // Disable map tab because can't manage it :( ui.getMainTabbedPane().setEnabledAt(ui.getMainTabbedPane().getTabCount() - 1, false); @@ -121,8 +122,34 @@ public abstract class TripUIHelper<D extends RootOpenableDto, U extends ContentR TripMapUI tripMap = ui.getTripMap(); TripMapConfigDto tripMapConfig = tripMap.getTripMapConfig(); log.info(prefix + String.format("Ask to build map: show observation? %s, show logbook? %s", tripMapConfig.isAddObservations(), tripMapConfig.isAddLogbook())); - TripMapDto tripLonglineMap = getMap(tripMapConfig); - tripMap.getHandler().doOpenMap(tripMapConfig, tripLonglineMap); + TripMapDto tripMapDto = getMap(tripMapConfig); + Set<String> excludedFeatureNames = tripMap.getObserveMapPane().getExcludedFeatureNames(); + tripMap.getHandler().doOpenMap(tripMapConfig, tripMapDto, excludedFeatureNames); + } finally { + getBusyModel().popTask(); + } + }); + } + + private void rebuildTripMap() { + if (ui.getModel().getStates().isCreatingMode()) { + return; + } + if (opening) { + return; + } + if (!ui.getModel().getStates().isOpened()) { + return; + } + + SwingUtilities.invokeLater(() -> { + getBusyModel().addTask("Rebuild map"); + try { + TripMapUI tripMap = ui.getTripMap(); + TripMapConfigDto tripMapConfig = tripMap.getTripMapConfig(); + TripMapDto tripMapDto = tripMap.getObserveMapPane().getTripMapDto(); + Set<String> excludedFeatureNames = tripMap.getObserveMapPane().getExcludedFeatureNames(); + tripMap.getHandler().doOpenMap(tripMapConfig, tripMapDto, excludedFeatureNames); } finally { getBusyModel().popTask(); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/ObserveMapPane.java ===================================== @@ -22,6 +22,8 @@ package fr.ird.observe.client.datasource.editor.api.content.data.map; * #L% */ +import fr.ird.observe.client.util.UIHelper; +import fr.ird.observe.dto.data.TripMapDto; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.geotools.geometry.jts.ReferencedEnvelope; @@ -33,18 +35,25 @@ import org.geotools.swing.JMapPane; import org.geotools.swing.event.MapPaneAdapter; import org.geotools.swing.event.MapPaneEvent; +import javax.swing.Icon; import java.awt.Color; import java.awt.Font; import java.awt.FontMetrics; import java.awt.Graphics; import java.awt.Point; import java.awt.Polygon; +import java.awt.Rectangle; import java.awt.geom.Point2D; import java.awt.geom.Rectangle2D; import java.awt.image.BufferedImage; import java.util.ArrayList; +import java.util.LinkedHashMap; import java.util.List; +import java.util.Map; import java.util.Objects; +import java.util.Optional; +import java.util.Set; +import java.util.stream.Collectors; import static io.ultreia.java4all.i18n.I18n.n; import static io.ultreia.java4all.i18n.I18n.t; @@ -54,6 +63,7 @@ import static io.ultreia.java4all.i18n.I18n.t; */ public class ObserveMapPane extends JMapPane { public static final String PROPERTY_ADD_POINT_COUNT = "addPointCount"; + public static final String PROPERTY_REBUILD_MODEL = "rebuildModel"; protected static final int MARGIN = 10; protected static final int SCALE_HEIGHT = 15; protected static final int SCALE_WIDTH_MAX = 200; @@ -74,6 +84,18 @@ public class ObserveMapPane extends JMapPane { private boolean showLegend = true; private LegendPosition legendPosition = LegendPosition.BOTTOM; private boolean addPointCount = true; + private final Icon notSelectedIcon = UIHelper.getUIManagerIcon("checkbox.empty"); + private final Icon selectedIcon = UIHelper.getUIManagerIcon("checkbox.full"); + private TripMapDto tripMapDto; + private final Map<ObserveMapPaneLegendItem, Rectangle> legendItemPositions = new LinkedHashMap<>(); + + public void setTripMapDto(TripMapDto tripMapDto) { + this.tripMapDto = tripMapDto; + } + + public TripMapDto getTripMapDto() { + return tripMapDto; + } public enum LegendPosition { TOP, BOTTOM @@ -93,6 +115,23 @@ public class ObserveMapPane extends JMapPane { } + public Set<String> getExcludedFeatureNames() { + return legendItems.stream().filter(i -> !i.isSelected()).map(ObserveMapPaneLegendItem::getName).collect(Collectors.toSet()); + } + + public void fireRebuildModel() { + firePropertyChange(PROPERTY_REBUILD_MODEL, null, true); + } + + public Optional<ObserveMapPaneLegendItem> getLegendItem(Point point) { + for (Map.Entry<ObserveMapPaneLegendItem, Rectangle> entry : legendItemPositions.entrySet()) { + if (entry.getValue().contains(point)) { + return Optional.of(entry.getKey()); + } + } + return Optional.empty(); + } + public long getScaleInMiles() { return scaleInMiles; } @@ -128,13 +167,13 @@ public class ObserveMapPane extends JMapPane { } public boolean isLegendPositionTop() { - return getLegendPosition()==LegendPosition.TOP; + return getLegendPosition() == LegendPosition.TOP; } + public boolean isLegendPositionBottom() { - return getLegendPosition()==LegendPosition.BOTTOM; + return getLegendPosition() == LegendPosition.BOTTOM; } - public boolean isAddPointCount() { return addPointCount; } @@ -222,18 +261,18 @@ public class ObserveMapPane extends JMapPane { Point2D direction = cardinalPoint.getDirection(rotation, AXIS_LENGTH, center); - Point2D sommet1 = cardinalPoint.getDirection(rotation - Math.PI / 4, SUB_AXIS_LENGTH, center); + Point2D top1 = cardinalPoint.getDirection(rotation - Math.PI / 4, SUB_AXIS_LENGTH, center); - Point2D sommet2 = cardinalPoint.getDirection(rotation + Math.PI / 4, SUB_AXIS_LENGTH, center); + Point2D top2 = cardinalPoint.getDirection(rotation + Math.PI / 4, SUB_AXIS_LENGTH, center); Polygon polygon = new Polygon(); polygon.addPoint((int) center.getX(), (int) center.getY()); polygon.addPoint((int) direction.getX(), (int) direction.getY()); - polygon.addPoint((int) sommet2.getX(), (int) sommet2.getY()); + polygon.addPoint((int) top2.getX(), (int) top2.getY()); graphics.fillPolygon(polygon); - graphics.drawLine((int) sommet1.getX(), (int) sommet1.getY(), (int) direction.getX(), (int) direction.getY()); + graphics.drawLine((int) top1.getX(), (int) top1.getY(), (int) direction.getX(), (int) direction.getY()); Rectangle2D textArea = fm.getStringBounds(cardinalPoint.getLabel(), graphics); @@ -258,8 +297,10 @@ public class ObserveMapPane extends JMapPane { this.legendItems = legendItems; } + protected void paintLegend(Graphics graphics) { + legendItemPositions.clear(); if (getLegendItems() != null && isShowLegend()) { int x; @@ -291,25 +332,34 @@ public class ObserveMapPane extends JMapPane { int legendWidth = ObserveMapPaneLegendItem.LEGEND_SYMBOL_WIDTH + maxLabelWidth + ObserveMapPaneLegendItem.LEGEND_MARGIN * 2; - graphics.setColor(ObserveMapPaneLegendItem.LEGEND_BACKGROUND); - graphics.fillRect( - x, - y, - legendWidth, - LEGEND_MARGIN); +// graphics.setColor(ObserveMapPaneLegendItem.LEGEND_BACKGROUND); +// graphics.fillRect( +// x, +// y, +// legendWidth, +// LEGEND_MARGIN); y += LEGEND_MARGIN; for (ObserveMapPaneLegendItem item : legendItems) { + Rectangle itemPosition = new Rectangle(x, y, legendWidth, ObserveMapPaneLegendItem.LEGEND_ITEM_HEIGHT); + legendItemPositions.put(item, itemPosition); + + + int x2 = x + 22; graphics.setColor(ObserveMapPaneLegendItem.LEGEND_BACKGROUND); graphics.fillRect( x, y, - legendWidth, + legendWidth + 22, ObserveMapPaneLegendItem.LEGEND_ITEM_HEIGHT); - - BufferedImage symbole = new BufferedImage( + if (item.isSelected()) { + selectedIcon.paintIcon(this, graphics, x, y); + } else { + notSelectedIcon.paintIcon(this, graphics, x, y); + } + BufferedImage symbol = new BufferedImage( ObserveMapPaneLegendItem.LEGEND_SYMBOL_WIDTH, ObserveMapPaneLegendItem.LEGEND_ITEM_HEIGHT, BufferedImage.TYPE_INT_ARGB); @@ -322,32 +372,33 @@ public class ObserveMapPane extends JMapPane { if (rule.getFilter().evaluate(item.getSimpleFeature())) { - drawer.drawDirect(symbole, item.getSimpleFeature(), rule); + drawer.drawDirect(symbol, item.getSimpleFeature(), rule); } } } - graphics.drawImage(symbole, x + LEGEND_MARGIN, y, null); + graphics.drawImage(symbol, x2 + LEGEND_MARGIN, y, null); - graphics.setColor(Color.BLACK); + Color textColor = item.isSelected() ? Color.BLACK : ObserveMapPaneLegendItem.LEGEND_TEXT_NOT_SELECTED; + graphics.setColor(textColor); int labelMarginBottom = ((ObserveMapPaneLegendItem.LEGEND_ITEM_HEIGHT - fm.getHeight()) / 2) + fm.getDescent(); graphics.drawString(item.getLabel(addPointCount), - x + LEGEND_MARGIN + ObserveMapPaneLegendItem.LEGEND_SYMBOL_WIDTH, + x2 + LEGEND_MARGIN + ObserveMapPaneLegendItem.LEGEND_SYMBOL_WIDTH, y + ObserveMapPaneLegendItem.LEGEND_ITEM_HEIGHT - labelMarginBottom); y += ObserveMapPaneLegendItem.LEGEND_ITEM_HEIGHT; } - graphics.setColor(ObserveMapPaneLegendItem.LEGEND_BACKGROUND); - graphics.fillRect( - x, - y, - legendWidth, - LEGEND_MARGIN); +// graphics.setColor(ObserveMapPaneLegendItem.LEGEND_BACKGROUND); +// graphics.fillRect( +// x, +// y, +// legendWidth+22, +// LEGEND_MARGIN); } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/ObserveMapPaneLegendItem.java ===================================== @@ -38,18 +38,23 @@ public class ObserveMapPaneLegendItem { protected static final int LEGEND_SYMBOL_WIDTH = 50; protected static final int LEGEND_MARGIN = 5; protected static final Color LEGEND_BACKGROUND = new Color(1f, 1f, 1f, 0.8f); + protected static final Color LEGEND_TEXT_NOT_SELECTED = Color.RED; protected final SimpleFeature simpleFeature; protected final Style style; protected final String label; protected final int notValidCount; protected final int validCount; + protected final String name; + protected boolean selected; - public ObserveMapPaneLegendItem(SimpleFeature simpleFeature, Style style, String label, int notValidCount, int validCount) { + public ObserveMapPaneLegendItem(String name, SimpleFeature simpleFeature, Style style, String label, int notValidCount, int validCount, boolean selected) { + this.name = name; this.simpleFeature = simpleFeature; this.style = style; this.label = label; this.notValidCount = notValidCount; this.validCount = validCount; + this.selected = selected; } public static Coordinate[] lineCoordinates() { @@ -63,6 +68,10 @@ public class ObserveMapPaneLegendItem { return new Coordinate(LEGEND_SYMBOL_WIDTH / 2., LEGEND_ITEM_HEIGHT / 2.); } + public String getName() { + return name; + } + public SimpleFeature getSimpleFeature() { return simpleFeature; } @@ -90,4 +99,12 @@ public class ObserveMapPaneLegendItem { } return label; } + + public boolean isSelected() { + return selected; + } + + public void setSelected(boolean selected) { + this.selected = selected; + } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapContentBuilderSupport.java ===================================== @@ -108,7 +108,7 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil protected StyledLayerDescriptor styledLayerDescriptor; private GeometryFactory geometryFactory; - public static TripMapContentBuilderSupport of(TripMapConfig config, TripMapConfigDto tripMapConfig, TripMapDto tripMapDto, List<TripMapPoint> tripMapPoints) throws Exception { + public static TripMapContentBuilderSupport of(TripMapConfig config, TripMapConfigDto tripMapConfig, TripMapDto tripMapDto, List<TripMapPoint> tripMapPoints, Set<String> excludedFeatureNames) throws Exception { TripMapContentBuilderSupport builder = (TripMapContentBuilderSupport) config.getTripMapContentBuilders().stream().filter(t -> t.accept(tripMapDto)).findFirst().orElseThrow(IllegalStateException::new); builder.reset(); String mapDateFormat = config.getMapDateFormat(); @@ -134,8 +134,8 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil for (File layerFile : config.getMapLayerFiles()) { builder.addLayer(layerFile); } - builder.addLines(tripMapConfig, tripMapPoints); - builder.addPoints(tripMapConfig, tripMapPoints); + builder.addLines(tripMapConfig, tripMapPoints, excludedFeatureNames); + builder.addPoints(tripMapConfig, tripMapPoints, excludedFeatureNames); return builder; } @@ -242,22 +242,13 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil mapContent.addLayer(layer); } - protected void addPoint(DefaultFeatureCollection pointsFeatures, TripMapPoint tripMapPoint) { - Point point = getGeometryFactory().createPoint(create(tripMapPoint)); - pointBuilder.add(point); - pointBuilder.add(formatDate(tripMapPoint.getTime())); - pointBuilder.add(tripMapPoint.getType().name()); - pointsFeatures.add(pointBuilder.buildFeature(null)); - validPoints.computeIfAbsent(tripMapPoint.getType(), e -> new LinkedList<>()).add(tripMapPoint); - } - - public void addPoints(List<TripMapPoint> tripMapPoints, String layerName, String notValidPointsLabel) { + public void addPoints(List<TripMapPoint> tripMapPoints, String layerName, String notValidPointsLabel, Set<String> excludedFeatureNames) { DefaultFeatureCollection pointsFeatures = new DefaultFeatureCollection(); Style stylePoints = findStyle(styledLayerDescriptor, layerName); for (TripMapPoint tripMapPoint : tripMapPoints) { if (tripMapPoint.isValid()) { - addPoint(pointsFeatures, tripMapPoint); + addPoint(pointsFeatures, tripMapPoint, excludedFeatureNames); } else { notValidPoints.computeIfAbsent(tripMapPoint.getType(), e -> new LinkedList<>()).add(tripMapPoint); } @@ -281,15 +272,29 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil if (notValidCount > 0) { notValidTypes.remove(type); } - addPointLegend(stylePoints, type.name(), label, notValidCount, validCount); + addPointLegend(stylePoints, type.name(), label, notValidCount, validCount, excludedFeatureNames); } if (!notValidTypes.isEmpty()) { for (TripMapPointType type : notValidTypes) { List<TripMapPoint> notValidPointsForType = notValidPoints.get(type); String label = I18n.t(notValidPointsLabel, notValidPointsForType.size()) + " - " + type.getLabel(); - addPointLegend(stylePoints, "notValidPoint", label, 0, 0); + addPointLegend(stylePoints, "notValidPoint", label, 0, 0, excludedFeatureNames); } } + validPoints.clear(); + notValidPoints.clear(); + } + + protected void addPoint(DefaultFeatureCollection pointsFeatures, TripMapPoint tripMapPoint, Set<String> excludedFeatureNames) { + if (!excludedFeatureNames.contains(tripMapPoint.getType().name())) { + // display this point + Point point = getGeometryFactory().createPoint(create(tripMapPoint)); + pointBuilder.add(point); + pointBuilder.add(formatDate(tripMapPoint.getTime())); + pointBuilder.add(tripMapPoint.getType().name()); + pointsFeatures.add(pointBuilder.buildFeature(null)); + } + validPoints.computeIfAbsent(tripMapPoint.getType(), e -> new LinkedList<>()).add(tripMapPoint); } protected GeometryFactory getGeometryFactory() { @@ -337,14 +342,20 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil return DATE_FORMAT.format(date); } - protected void addLine(DefaultFeatureCollection linesFeatures, String lineName, Coordinate[] coordinates) { + protected void addLine(DefaultFeatureCollection linesFeatures, String lineName, Coordinate[] coordinates, Set<String> excludedFeatureNames) { + if (excludedFeatureNames.contains(lineName)) { + return; + } LineString line = getGeometryFactory().createLineString(coordinates); lineBuilder.add(line); lineBuilder.add(lineName); linesFeatures.add(lineBuilder.buildFeature(null)); } - protected void addLine(DefaultFeatureCollection linesFeatures, String lineName, Coordinate[] coordinates, Date date) { + protected void addLine(DefaultFeatureCollection linesFeatures, String lineName, Coordinate[] coordinates, Date date, Set<String> excludedFeatureNames) { + if (excludedFeatureNames.contains(lineName)) { + return; + } LineString line = getGeometryFactory().createLineString(coordinates); lineBuilder.add(line); lineBuilder.add(date == null ? null : formatDate(date)); @@ -352,7 +363,7 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil linesFeatures.add(lineBuilder.buildFeature(null)); } - protected void addLineLegend(Style styleLines, String legendName, String legendLabel) { + protected void addLineLegend(Style styleLines, String legendName, String legendLabel, Set<String> excludedFeatureNames) { LineString line = getGeometryFactory().createLineString(ObserveMapPaneLegendItem.lineCoordinates()); lineBuilder.add(line); if (withLabelLine) { @@ -360,17 +371,17 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil } lineBuilder.add(legendName); SimpleFeature simpleFeature = lineBuilder.buildFeature(null); - ObserveMapPaneLegendItem legendTripDay = new ObserveMapPaneLegendItem(simpleFeature, styleLines, legendLabel, 0, 0); + ObserveMapPaneLegendItem legendTripDay = new ObserveMapPaneLegendItem(legendName, simpleFeature, styleLines, legendLabel, 0, 0, !excludedFeatureNames.contains(legendName)); legendItems.add(legendTripDay); } - protected void addPointLegend(Style stylePoints, String legendName, String legendLabel, int notValidCount, int validCount) { + protected void addPointLegend(Style stylePoints, String legendName, String legendLabel, int notValidCount, int validCount, Set<String> excludedFeatureNames) { Point point = getGeometryFactory().createPoint(ObserveMapPaneLegendItem.pointCoordinates()); pointBuilder.add(point); pointBuilder.add(""); pointBuilder.add(legendName); SimpleFeature simpleFeature = pointBuilder.buildFeature(null); - ObserveMapPaneLegendItem legendPoint = new ObserveMapPaneLegendItem(simpleFeature, stylePoints, legendLabel, notValidCount, validCount); + ObserveMapPaneLegendItem legendPoint = new ObserveMapPaneLegendItem(legendName, simpleFeature, stylePoints, legendLabel, notValidCount, validCount, !excludedFeatureNames.contains(legendName)); legendItems.add(legendPoint); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUIHandler.java ===================================== @@ -47,6 +47,8 @@ import java.awt.geom.AffineTransform; import java.awt.geom.Point2D; import java.util.ArrayList; import java.util.List; +import java.util.Optional; +import java.util.Set; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -76,7 +78,7 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { return ui.getObserveMapPane(); } - public void doOpenMap(TripMapConfigDto tripMapConfig, TripMapDto tripMapDto) { + public void doOpenMap(TripMapConfigDto tripMapConfig, TripMapDto tripMapDto, Set<String> excludedFeatureNames) { try { flipContent(); @@ -89,10 +91,12 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { List<TripMapPoint> tripMapPoints = new ArrayList<>(tripMapDto.getPoints()); log.info(String.format("Found %d point(s).", tripMapPoints.size())); + mapPane.setTripMapDto(tripMapDto); TripMapContentBuilderSupport mapContentBuilder = TripMapContentBuilderSupport.of(config, tripMapConfig, tripMapDto, - tripMapPoints); + tripMapPoints, + excludedFeatureNames); // set zoom tripArea = new ReferencedEnvelope(); @@ -224,7 +228,16 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { @Override public void mouseClicked(MouseEvent e) { - + if (e.getClickCount() < 2) { + return; + } + Point point = e.getPoint(); + Optional<ObserveMapPaneLegendItem> legendItem = getObserveMapPane().getLegendItem(point); + legendItem.ifPresent(i -> { + i.setSelected(!i.isSelected()); + log.info("Change selected value for legend item: {} to value: {}", i.getName(), i.isSelected()); + SwingUtilities.invokeLater(ui.getObserveMapPane()::fireRebuildModel); + }); } @Override ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripMapContentBuilder.java ===================================== @@ -95,26 +95,26 @@ public class TripMapContentBuilder extends TripMapContentBuilderSupport { } @Override - public void addLines(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints) { + public void addLines(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints, Set<String> excludedFeatureNames) { if (tripMapConfig.isAddObservations()) { List<TripMapPoint> obsPoints = getObsPoints(tripMapPoints); addFishingZone(OBSERVATIONS_ZONES_BUILDER, obsPoints); - addLines(OBSERVATIONS_LINES_BUILDER, obsPoints, tripMapConfig.isAddObservationsTripSegment()); + addLines(OBSERVATIONS_LINES_BUILDER, obsPoints, tripMapConfig.isAddObservationsTripSegment(), excludedFeatureNames); } if (tripMapConfig.isAddLogbook()) { List<TripMapPoint> logbookPoints = getLogbookPoints(tripMapPoints); addFishingZone(LOGBOOK_ZONES_BUILDER, logbookPoints); - addLines(LOGBOOK_LINES_BUILDER, logbookPoints, tripMapConfig.isAddLogbookTripSegment()); + addLines(LOGBOOK_LINES_BUILDER, logbookPoints, tripMapConfig.isAddLogbookTripSegment(), excludedFeatureNames); } } @Override - public void addPoints(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints) { + public void addPoints(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints, Set<String> excludedFeatureNames) { if (tripMapConfig.isAddObservations()) { - addPoints(getObsPoints(tripMapPoints), OBSERVATION_POINTS_LAYER_NAME, n("observe.ui.datasource.editor.content.map.observation.points.not.valid")); + addPoints(getObsPoints(tripMapPoints), OBSERVATION_POINTS_LAYER_NAME, n("observe.ui.datasource.editor.content.map.observation.points.not.valid"), excludedFeatureNames); } if (tripMapConfig.isAddLogbook()) { - addPoints(getLogbookPoints(tripMapPoints), LOGBOOK_POINTS_LAYER_NAME, n("observe.ui.datasource.editor.content.map.logbook.points.not.valid")); + addPoints(getLogbookPoints(tripMapPoints), LOGBOOK_POINTS_LAYER_NAME, n("observe.ui.datasource.editor.content.map.logbook.points.not.valid"), excludedFeatureNames); } } @@ -132,36 +132,36 @@ public class TripMapContentBuilder extends TripMapContentBuilderSupport { } } - private void addLines(LinesBuilder builder, List<TripMapPoint> tripMapPoints, boolean addTripSegment) { + private void addLines(LinesBuilder builder, List<TripMapPoint> tripMapPoints, boolean addTripSegment, Set<String> excludedFeatureNames) { DefaultFeatureCollection linesFeatures = new DefaultFeatureCollection(); Set<String> lineTypes = new TreeSet<>(); builder.build(tripMapPoints); if (addTripSegment) { - addLines(TRIP_LINE_TYPE, linesFeatures, lineTypes, builder.getTripLines()); + addLines(TRIP_LINE_TYPE, linesFeatures, lineTypes, builder.getTripLines(), excludedFeatureNames); } - addLines(SETTING_LINE_TYPE, linesFeatures, lineTypes, builder.getSettingLines()); - addLines(HAULING_LINE_TYPE, linesFeatures, lineTypes, builder.getHaulingLines()); + addLines(SETTING_LINE_TYPE, linesFeatures, lineTypes, builder.getSettingLines(), excludedFeatureNames); + addLines(HAULING_LINE_TYPE, linesFeatures, lineTypes, builder.getHaulingLines(), excludedFeatureNames); if (!linesFeatures.isEmpty()) { Style styleLines = findStyle(styledLayerDescriptor, builder.layerName()); Layer layerLines = new FeatureLayer(linesFeatures, styleLines, builder.layerName()); mapContent.addLayer(layerLines); if (lineTypes.contains(TRIP_LINE_TYPE)) { - addLineLegend(styleLines, TRIP_LINE_TYPE, builder.tripLineTitle()); + addLineLegend(styleLines, TRIP_LINE_TYPE, builder.tripLineTitle(), excludedFeatureNames); } if (lineTypes.contains(SETTING_LINE_TYPE)) { - addLineLegend(styleLines, SETTING_LINE_TYPE, builder.settingLineTitle()); + addLineLegend(styleLines, SETTING_LINE_TYPE, builder.settingLineTitle(), excludedFeatureNames); } if (lineTypes.contains(HAULING_LINE_TYPE)) { - addLineLegend(styleLines, HAULING_LINE_TYPE, builder.haulingLineTitle()); + addLineLegend(styleLines, HAULING_LINE_TYPE, builder.haulingLineTitle(), excludedFeatureNames); } } } - private void addLines(String lineType, DefaultFeatureCollection linesFeatures, Set<String> lineTypes, List<Coordinate[]> lines) { + private void addLines(String lineType, DefaultFeatureCollection linesFeatures, Set<String> lineTypes, List<Coordinate[]> lines, Set<String> excludedFeatureNames) { if (!lines.isEmpty()) { lineTypes.add(lineType); for (Coordinate[] tripLine : lines) { - addLine(linesFeatures, lineType, tripLine); + addLine(linesFeatures, lineType, tripLine, excludedFeatureNames); } } } ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java ===================================== @@ -100,24 +100,24 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit } @Override - public void addPoints(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints) { + public void addPoints(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints, Set<String> excludedFeatureNames) { if (tripMapConfig.isAddObservations()) { - addPoints(tripMapPoints.stream().filter(f -> f.getType().isTrip() || f.getType().isObs()).collect(Collectors.toList()), OBSERVATION_POINTS_LAYER_NAME, n("observe.ui.datasource.editor.content.map.observation.points.not.valid")); + addPoints(tripMapPoints.stream().filter(f -> f.getType().isTrip() || f.getType().isObs()).collect(Collectors.toList()), OBSERVATION_POINTS_LAYER_NAME, n("observe.ui.datasource.editor.content.map.observation.points.not.valid"), excludedFeatureNames); } if (tripMapConfig.isAddLogbook()) { - addPoints(tripMapPoints.stream().filter(f -> f.getType().isTrip() || f.getType().isLogbook()).collect(Collectors.toList()), LOGBOOK_POINTS_LAYER_NAME, n("observe.ui.datasource.editor.content.map.logbook.points.not.valid")); + addPoints(tripMapPoints.stream().filter(f -> f.getType().isTrip() || f.getType().isLogbook()).collect(Collectors.toList()), LOGBOOK_POINTS_LAYER_NAME, n("observe.ui.datasource.editor.content.map.logbook.points.not.valid"), excludedFeatureNames); } } @Override - public void addLines(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints) { + public void addLines(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints, Set<String> excludedFeatureNames) { if (tripMapConfig.isAddObservations() && tripMapConfig.isAddObservationsTripSegment()) { addLines0(tripMapPoints.stream().filter(f -> f.getType().isTrip() || f.getType().isObs()).collect(Collectors.toList()), "observationDay", "observationNight", true, t("observe.ui.datasource.editor.content.map.legend.obs.tripDay"), - t("observe.ui.datasource.editor.content.map.legend.obs.tripBetweenTwoDays")); + t("observe.ui.datasource.editor.content.map.legend.obs.tripBetweenTwoDays"), excludedFeatureNames); } if (tripMapConfig.isAddLogbook() && tripMapConfig.isAddLogbookTripSegment()) { addLines0(tripMapPoints.stream().filter(f -> f.getType().isTrip() || f.getType().isLogbook()).collect(Collectors.toList()), @@ -125,23 +125,23 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit "logbookSegment", false, t("observe.ui.datasource.editor.content.map.legend.logbook.tripSegment"), - null); + null, excludedFeatureNames); } } - protected void addTripDay(DefaultFeatureCollection linesFeatures, String label, List<Coordinate> coordinatesByDay, TripMapPoint previousPoint) { + protected void addTripDay(DefaultFeatureCollection linesFeatures, String label, List<Coordinate> coordinatesByDay, TripMapPoint previousPoint, Set<String> excludedFeatureNames) { if (coordinatesByDay.size() > 1) { Coordinate[] coordinates = coordinatesByDay.toArray(new Coordinate[0]); - addLine(linesFeatures, label, coordinates, previousPoint.getTime()); + addLine(linesFeatures, label, coordinates, previousPoint.getTime(), excludedFeatureNames); } } - protected void addTripBetweenTwoDay(DefaultFeatureCollection linesFeatures, String label, TripMapPoint previousPoint, TripMapPoint point, boolean addTime) { + protected void addTripBetweenTwoDay(DefaultFeatureCollection linesFeatures, String label, TripMapPoint previousPoint, TripMapPoint point, boolean addTime, Set<String> excludedFeatureNames) { Coordinate[] coordinates = create(previousPoint, point); - addLine(linesFeatures, label, coordinates, addTime ? previousPoint.getTime() : null); + addLine(linesFeatures, label, coordinates, addTime ? previousPoint.getTime() : null, excludedFeatureNames); } - protected void addLines0(List<TripMapPoint> tripMapPoints, String pointDay, String pointNight, boolean addDate, String pointDayLabel, String pointNightLabel) { + protected void addLines0(List<TripMapPoint> tripMapPoints, String pointDay, String pointNight, boolean addDate, String pointDayLabel, String pointNightLabel, Set<String> excludedFeatureNames) { if (tripMapPoints.size() == 2 && tripMapPoints.stream().allMatch(t -> t.getType().isTrip())) { // Got only trip points, nothing to display then return; @@ -157,24 +157,24 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit Coordinate coordinate = create(point); if (previousPoint != null && !DateUtils.isSameDay(previousPoint.getTime(), point.getTime())) { // changing day - addTripDay(linesFeatures, pointDay, coordinatesByDay, previousPoint); - addTripBetweenTwoDay(linesFeatures, pointNight, previousPoint, point, addDate); + addTripDay(linesFeatures, pointDay, coordinatesByDay, previousPoint, excludedFeatureNames); + addTripBetweenTwoDay(linesFeatures, pointNight, previousPoint, point, addDate, excludedFeatureNames); coordinatesByDay.clear(); } coordinatesByDay.add(coordinate); previousPoint = point; } if (previousPoint != null) { - addTripDay(linesFeatures, pointDay, coordinatesByDay, previousPoint); + addTripDay(linesFeatures, pointDay, coordinatesByDay, previousPoint, excludedFeatureNames); } Style styleLines = findStyle(styledLayerDescriptor, LINES_LAYER_NAME); if (!linesFeatures.isEmpty()) { Layer layerLines = new FeatureLayer(linesFeatures, styleLines, LINES_LAYER_NAME); mapContent.addLayer(layerLines); } - addLineLegend(styleLines, pointDay, pointDayLabel); + addLineLegend(styleLines, pointDay, pointDayLabel, excludedFeatureNames); if (pointNightLabel != null) { - addLineLegend(styleLines, pointNight, pointNightLabel); + addLineLegend(styleLines, pointNight, pointNightLabel, excludedFeatureNames); } } ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/TripMapContentBuilder.java ===================================== @@ -43,9 +43,9 @@ public interface TripMapContentBuilder { boolean accept(TripMapDto tripMapDto); - void addLines(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints) throws Exception; + void addLines(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints, Set<String> excludedFeatureNames) throws Exception; - void addPoints(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints) throws Exception; + void addPoints(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints, Set<String> excludedFeatureNames) throws Exception; File getStyleFile(Path mapDirectory); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/70eb8a1c52404a5bc6d4c5b4… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/70eb8a1c52404a5bc6d4c5b4… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] Merge branch 'feature/issue-2805' into develop
by Tony CHEMIT (＠tchemit) 22 Nov '23

22 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 70eb8a1c by Tony Chemit at 2023-11-22T14:17:17+01:00 Merge branch 'feature/issue-2805' into develop Ajouter une option pour voir le nombre de points dans la légende - Closes #2805 - - - - - 0 changed files: Changes: View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/70eb8a1c52404a5bc6d4c5b4e… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/70eb8a1c52404a5bc6d4c5b4e… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 14 commits: sort items in legend
by Tony CHEMIT (＠tchemit) 22 Nov '23

22 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 777cba00 by Tony Chemit at 2023-11-22T10:36:58+01:00 sort items in legend - - - - - 10adf5d7 by Tony Chemit at 2023-11-22T10:37:48+01:00 add new entries in TripMapPointType - - - - - 1fc0533e by Tony Chemit at 2023-11-22T10:40:30+01:00 get logbook activities with sampling and use new entries of TripMapPointType in TripMapBuilder - - - - - 5cd87f5f by Tony Chemit at 2023-11-22T10:41:07+01:00 add new configuration option for logbook activities with sampling (default is yellow) - - - - - dc72c092 by Tony Chemit at 2023-11-22T10:41:48+01:00 update TripMapContentBuilder and ps style to use new type of point (with sampling) - - - - - 0fa755fe by Tony Chemit at 2023-11-22T12:45:05+01:00 add suppressWarning for services with generics and AutoService annotation usage - - - - - 6a0e6978 by Tony Chemit at 2023-11-22T12:45:50+01:00 change shortcut (Alt + Fxx is used under linux by X) - - - - - 29e47618 by Tony Chemit at 2023-11-22T12:46:41+01:00 Merge branch 'feature/issue-2549' into develop Mettre en exergue sur la carte les calées qui ont été échantillonnées - See - - - - - 41742eaf by Tony Chemit at 2023-11-22T12:56:55+01:00 add suppressWarning for services with generics and AutoService annotation usage - - - - - a36cd49b by Tony Chemit at 2023-11-22T14:01:21+01:00 fix french I18n legendBottom and legendTop are reversed.... - - - - - ea70e2f2 by Tony Chemit at 2023-11-22T14:01:22+01:00 add validCount and notValidCount in ObserveMapPaneLegendItem (o be able to compute real label at runtime) - - - - - c5c1314f by Tony Chemit at 2023-11-22T14:15:59+01:00 add addPointCount option in ObserveMapPane and use it to compute legend label - - - - - f261cfc6 by Tony Chemit at 2023-11-22T14:15:59+01:00 add AddPointCount action to switch addPointCount option - - - - - cfe7a3f5 by Tony Chemit at 2023-11-22T14:16:06+01:00 Merge branch 'feature/issue-2805' into develop Ajouter une option pour voir le nombre de points dans la légende - Closes - - - - - 29 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client/core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsBodyContent.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigBodyContent.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/main/body/NoBodyContent.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/ObserveMapPane.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/ObserveMapPaneLegendItem.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapContentBuilderSupport.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUI.jcss - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/AddPointCount.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java - client/datasource/editor/ps/src/main/resources/map/ps-style.xml - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto/src/main/i18n/getters/java-enumeration.getter - core/api/dto/src/main/java/fr/ird/observe/dto/data/TripMapPointType.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripMapBuilder.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties Changes: ===================================== client/configuration/src/main/config/Client.ini ===================================== @@ -846,6 +846,12 @@ key = ui.map.ps.style.logbook.point.color type = color defaultValue = java.awt.Color[r=255,g=0,b=0] +[option mapPsStyleLogbookWithSamplingPointColor] +description = observe.config.map.ps.style.logbook.withSampling.point.color +key = ui.map.ps.style.logbook.withSampling.point.color +type = color +defaultValue = java.awt.Color[r=255,g=255,b=0] + [option mapPsStyleLogbookTextColor] description = observe.config.map.ps.style.logbook.text.color key = ui.map.ps.style.logbook.text.color ===================================== client/configuration/src/main/i18n/getters/config.getter ===================================== @@ -86,6 +86,7 @@ observe.config.map.ps.style.logbook.point.color observe.config.map.ps.style.logbook.text.color observe.config.map.ps.style.logbook.text.size observe.config.map.ps.style.logbook.transmitting.buoy.lost.point.color +observe.config.map.ps.style.logbook.withSampling.point.color observe.config.map.ps.style.observations.line.color observe.config.map.ps.style.observations.point.color observe.config.map.ps.style.observations.text.color ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java ===================================== @@ -36,6 +36,7 @@ import org.nuiton.converter.NuitonConverter; * * @author Tony Chemit - dev(a)tchemit.fr */ +@SuppressWarnings("rawtypes") @AutoService(NuitonConverter.class) public class SeineBycatchObservedSystemConfigConverter implements NuitonConverter<SeineBycatchObservedSystemConfig> { ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java ===================================== @@ -38,6 +38,7 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since ? */ +@SuppressWarnings("rawtypes") @AutoService(MainUIBodyContent.class) public class H2ServerBodyContent extends MainUIBodyContent<H2ServerUI> implements WithClientUIContextApi { ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsBodyContent.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.client.main.body.MainUIBodyContent; * @author Tony Chemit - dev(a)tchemit.fr * @since 8 */ +@SuppressWarnings("rawtypes") @AutoService(MainUIBodyContent.class) public class RemotePresetsBodyContent extends MainUIBodyContent<RemotePresetsUI> { ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigBodyContent.java ===================================== @@ -33,6 +33,7 @@ import java.util.function.Supplier; * @author Tony Chemit - dev(a)tchemit.fr * @since 8 */ +@SuppressWarnings("rawtypes") @AutoService(MainUIBodyContent.class) public class ClientConfigBodyContent extends MainUIBodyContent<ClientConfigUI> implements WithClientUIContextApi { ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -334,6 +334,7 @@ public class ClientConfigUI extends JXTitledPanel implements WithClientUIContext helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_TEXT_SIZE); helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_LINE_COLOR); helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_POINT_COLOR); + helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_WITH_SAMPLING_POINT_COLOR); helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_TRANSMITTING_BUOY_LOST_POINT_COLOR); helper.addOption(ClientConfigOption.MAP_LL_STYLE_FILE); helper.addOption(ClientConfigOption.MAP_LL_STYLE_OBSERVATIONS_LINE_TRIP_COLOR); ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/NoBodyContent.java ===================================== @@ -28,6 +28,7 @@ import com.google.auto.service.AutoService; * @author Tony Chemit - dev(a)tchemit.fr * @since 8 */ +@SuppressWarnings("rawtypes") @AutoService(MainUIBodyContent.class) public class NoBodyContent extends MainUIBodyContent<NoBodyContentComponent> { ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java ===================================== @@ -55,6 +55,7 @@ import java.util.function.Supplier; * @author Tony Chemit - dev(a)tchemit.fr * @since 8 */ +@SuppressWarnings("rawtypes") @AutoService(MainUIBodyContent.class) public class AdminUIBodyContent extends MainUIBodyContent<AdminUI> implements WithClientUIContextApi { ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -214,6 +214,7 @@ observe.ui.datasource.editor.content.map.action.zoomMoins observe.ui.datasource.editor.content.map.action.zoomMoins.tip observe.ui.datasource.editor.content.map.action.zoomPlus observe.ui.datasource.editor.content.map.action.zoomPlus.tip +observe.ui.datasource.editor.content.map.addPointCount observe.ui.datasource.editor.content.map.east observe.ui.datasource.editor.content.map.export.chooseFile.ok observe.ui.datasource.editor.content.map.export.chooseFile.png @@ -221,7 +222,10 @@ observe.ui.datasource.editor.content.map.export.chooseFile.title observe.ui.datasource.editor.content.map.export.success observe.ui.datasource.editor.content.map.legend observe.ui.datasource.editor.content.map.legend.not.valid.count +observe.ui.datasource.editor.content.map.legend.not.valid.counts observe.ui.datasource.editor.content.map.legend.tip +observe.ui.datasource.editor.content.map.legend.valid.count +observe.ui.datasource.editor.content.map.legend.valid.counts observe.ui.datasource.editor.content.map.legendBottom observe.ui.datasource.editor.content.map.legendBottom.tip observe.ui.datasource.editor.content.map.legendTop ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/DataSourceEditorBodyContent.java ===================================== @@ -73,6 +73,7 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since 8 */ +@SuppressWarnings("rawtypes") @AutoService(MainUIBodyContent.class) public class DataSourceEditorBodyContent extends MainUIBodyContent<DataSourceEditor> implements WithClientUIContextApi { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java ===================================== @@ -37,7 +37,7 @@ public class ObserveKeyStrokesEditorApi extends ObserveKeyStrokesSupport { //FIXME Let's design a nice new API to register KeyStroke (a new annotation, processed to generate KeyStroke resources) // Navigation - public static final KeyStroke KEY_STROKE_MAP_CONFIGURE = KeyStroke.getKeyStroke("alt pressed F2"); + public static final KeyStroke KEY_STROKE_MAP_CONFIGURE = KeyStroke.getKeyStroke("ctrl pressed F2"); public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE = KeyStroke.getKeyStroke("pressed F12"); public static final KeyStroke KEY_STROKE_STORAGE_MENU_LEFT = KeyStroke.getKeyStroke("pressed F1"); @@ -51,6 +51,7 @@ public class ObserveKeyStrokesEditorApi extends ObserveKeyStrokesSupport { public static final KeyStroke KEY_STROKE_SHOW_OBS = KeyStroke.getKeyStroke("ctrl pressed O"); public static final KeyStroke KEY_STROKE_SHOW_OBSERVATIONS_TRIP_SEGMENT = KeyStroke.getKeyStroke("shift ctrl pressed O"); + public static final KeyStroke KEY_STROKE_SHOW_POINT_COUNT = KeyStroke.getKeyStroke("ctrl pressed P"); public static final KeyStroke KEY_STROKE_SHOW_LOGBOOK = KeyStroke.getKeyStroke("ctrl pressed L"); public static final KeyStroke KEY_STROKE_SHOW_LOGBOOK_TRIP_SEGMENT = KeyStroke.getKeyStroke("shift ctrl pressed L"); public static final KeyStroke KEY_STROKE_LEGEND_TOGGLE = KeyStroke.getKeyStroke("pressed F11"); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/ObserveMapPane.java ===================================== @@ -53,7 +53,7 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr */ public class ObserveMapPane extends JMapPane { - + public static final String PROPERTY_ADD_POINT_COUNT = "addPointCount"; protected static final int MARGIN = 10; protected static final int SCALE_HEIGHT = 15; protected static final int SCALE_WIDTH_MAX = 200; @@ -73,6 +73,7 @@ public class ObserveMapPane extends JMapPane { private long scaleInMiles; private boolean showLegend = true; private LegendPosition legendPosition = LegendPosition.BOTTOM; + private boolean addPointCount = true; public enum LegendPosition { TOP, BOTTOM @@ -132,6 +133,18 @@ public class ObserveMapPane extends JMapPane { public boolean isLegendPositionBottom() { return getLegendPosition()==LegendPosition.BOTTOM; } + + + public boolean isAddPointCount() { + return addPointCount; + } + + public void setAddPointCount(boolean addPointCount) { + boolean oldValue = isAddPointCount(); + this.addPointCount = addPointCount; + firePropertyChange(PROPERTY_ADD_POINT_COUNT, oldValue, addPointCount); + } + protected void updateScale() { ReferencedEnvelope displayArea = getDisplayArea(); double dpi = 2.54 / 100; // pour avoir l'echélle en metre/pixel @@ -270,7 +283,7 @@ public class ObserveMapPane extends JMapPane { int maxLabelWidth = 0; for (ObserveMapPaneLegendItem item : legendItems) { - Rectangle2D labelArea = fm.getStringBounds(item.getLabel(), graphics); + Rectangle2D labelArea = fm.getStringBounds(item.getLabel(addPointCount), graphics); maxLabelWidth = Math.max((int) labelArea.getWidth(), maxLabelWidth); @@ -321,7 +334,7 @@ public class ObserveMapPane extends JMapPane { int labelMarginBottom = ((ObserveMapPaneLegendItem.LEGEND_ITEM_HEIGHT - fm.getHeight()) / 2) + fm.getDescent(); - graphics.drawString(item.getLabel(), + graphics.drawString(item.getLabel(addPointCount), x + LEGEND_MARGIN + ObserveMapPaneLegendItem.LEGEND_SYMBOL_WIDTH, y + ObserveMapPaneLegendItem.LEGEND_ITEM_HEIGHT - labelMarginBottom); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/ObserveMapPaneLegendItem.java ===================================== @@ -22,6 +22,7 @@ package fr.ird.observe.client.datasource.editor.api.content.data.map; * #L% */ +import io.ultreia.java4all.i18n.I18n; import org.geotools.styling.Style; import org.locationtech.jts.geom.Coordinate; import org.opengis.feature.simple.SimpleFeature; @@ -37,14 +38,18 @@ public class ObserveMapPaneLegendItem { protected static final int LEGEND_SYMBOL_WIDTH = 50; protected static final int LEGEND_MARGIN = 5; protected static final Color LEGEND_BACKGROUND = new Color(1f, 1f, 1f, 0.8f); - protected SimpleFeature simpleFeature; - protected Style style; - protected String label; + protected final SimpleFeature simpleFeature; + protected final Style style; + protected final String label; + protected final int notValidCount; + protected final int validCount; - public ObserveMapPaneLegendItem(SimpleFeature simpleFeature, Style style, String label) { + public ObserveMapPaneLegendItem(SimpleFeature simpleFeature, Style style, String label, int notValidCount, int validCount) { this.simpleFeature = simpleFeature; this.style = style; this.label = label; + this.notValidCount = notValidCount; + this.validCount = validCount; } public static Coordinate[] lineCoordinates() { @@ -62,23 +67,27 @@ public class ObserveMapPaneLegendItem { return simpleFeature; } - public void setSimpleFeature(SimpleFeature simpleFeature) { - this.simpleFeature = simpleFeature; - } - public Style getStyle() { return style; } - public void setStyle(Style style) { - this.style = style; - } + public String getLabel(boolean addPointCount) { + String label = this.label; + if (addPointCount && validCount > 0) { + if (validCount == 1) { + label += " " + I18n.t("observe.ui.datasource.editor.content.map.legend.valid.count", validCount); + } else { + label += " " + I18n.t("observe.ui.datasource.editor.content.map.legend.valid.counts", validCount); + } + } + if (notValidCount > 0) { + if (notValidCount == 1) { + label += " " + I18n.t("observe.ui.datasource.editor.content.map.legend.not.valid.count", notValidCount); + } else { + label += " " + I18n.t("observe.ui.datasource.editor.content.map.legend.not.valid.counts", notValidCount); - public String getLabel() { + } + } return label; } - - public void setLabel(String label) { - this.label = label; - } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapContentBuilderSupport.java ===================================== @@ -68,15 +68,16 @@ import java.nio.file.Path; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.Date; import java.util.EnumMap; -import java.util.HashSet; import java.util.LinkedHashSet; import java.util.LinkedList; import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -97,6 +98,7 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil protected static SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("MM-dd"); protected final List<ObserveMapPaneLegendItem> legendItems; + protected final Map<TripMapPointType, List<TripMapPoint>> validPoints = new EnumMap<>(TripMapPointType.class); protected final Map<TripMapPointType, List<TripMapPoint>> notValidPoints = new EnumMap<>(TripMapPointType.class); protected final Set<TripMapPointType> acceptedTripPointTypes; protected final SimpleFeatureBuilder lineBuilder; @@ -206,6 +208,7 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil @Override public void reset() { legendItems.clear(); + validPoints.clear(); notValidPoints.clear(); if (mapContent != null) { mapContent.dispose(); @@ -245,43 +248,46 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil pointBuilder.add(formatDate(tripMapPoint.getTime())); pointBuilder.add(tripMapPoint.getType().name()); pointsFeatures.add(pointBuilder.buildFeature(null)); + validPoints.computeIfAbsent(tripMapPoint.getType(), e -> new LinkedList<>()).add(tripMapPoint); } public void addPoints(List<TripMapPoint> tripMapPoints, String layerName, String notValidPointsLabel) { DefaultFeatureCollection pointsFeatures = new DefaultFeatureCollection(); Style stylePoints = findStyle(styledLayerDescriptor, layerName); - Set<TripMapPointType> pointTypeInLegend = new HashSet<>(); for (TripMapPoint tripMapPoint : tripMapPoints) { if (tripMapPoint.isValid()) { addPoint(pointsFeatures, tripMapPoint); - pointTypeInLegend.add(tripMapPoint.getType()); } else { notValidPoints.computeIfAbsent(tripMapPoint.getType(), e -> new LinkedList<>()).add(tripMapPoint); } } - pointTypeInLegend.retainAll(acceptedTripPointTypes); if (!pointsFeatures.isEmpty()) { Layer pointsLayer = new FeatureLayer(pointsFeatures, stylePoints, layerName); mapContent.addLayer(pointsLayer); } + Set<TripMapPointType> pointTypeInLegend = validPoints.keySet(); + pointTypeInLegend.retainAll(acceptedTripPointTypes); - Set<TripMapPointType> notValidTypes = new LinkedHashSet<>(notValidPoints.keySet()); + Set<TripMapPointType> notValidTypes = notValidPoints.keySet().stream().sorted(Comparator.comparing(TripMapPointType::getLabel)).collect(Collectors.toCollection(LinkedHashSet::new)); - for (TripMapPointType type : pointTypeInLegend) { + List<TripMapPointType> sortedPointTypeInLegend = pointTypeInLegend.stream().sorted(Comparator.comparing(TripMapPointType::getLabel)).collect(Collectors.toList()); + for (TripMapPointType type : sortedPointTypeInLegend) { List<TripMapPoint> notValidPointsForType = notValidPoints.get(type); + List<TripMapPoint> validPointsForType = validPoints.get(type); + int notValidCount = notValidPointsForType == null ? 0 : notValidPointsForType.size(); + int validCount = validPointsForType == null ? 0 : validPointsForType.size(); String label = type.getLabel(); - if (notValidPointsForType != null && !notValidPointsForType.isEmpty()) { - label += " " + I18n.t("observe.ui.datasource.editor.content.map.legend.not.valid.count", notValidPointsForType.size()); + if (notValidCount > 0) { notValidTypes.remove(type); } - addPointLegend(stylePoints, type.name(), label); + addPointLegend(stylePoints, type.name(), label, notValidCount, validCount); } if (!notValidTypes.isEmpty()) { for (TripMapPointType type : notValidTypes) { List<TripMapPoint> notValidPointsForType = notValidPoints.get(type); String label = I18n.t(notValidPointsLabel, notValidPointsForType.size()) + " - " + type.getLabel(); - addPointLegend(stylePoints, "notValidPoint", label); + addPointLegend(stylePoints, "notValidPoint", label, 0, 0); } } } @@ -354,17 +360,17 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil } lineBuilder.add(legendName); SimpleFeature simpleFeature = lineBuilder.buildFeature(null); - ObserveMapPaneLegendItem legendTripDay = new ObserveMapPaneLegendItem(simpleFeature, styleLines, legendLabel); + ObserveMapPaneLegendItem legendTripDay = new ObserveMapPaneLegendItem(simpleFeature, styleLines, legendLabel, 0, 0); legendItems.add(legendTripDay); } - protected void addPointLegend(Style stylePoints, String legendName, String legendLabel) { + protected void addPointLegend(Style stylePoints, String legendName, String legendLabel, int notValidCount, int validCount) { Point point = getGeometryFactory().createPoint(ObserveMapPaneLegendItem.pointCoordinates()); pointBuilder.add(point); pointBuilder.add(""); pointBuilder.add(legendName); SimpleFeature simpleFeature = pointBuilder.buildFeature(null); - ObserveMapPaneLegendItem legendPoint = new ObserveMapPaneLegendItem(simpleFeature, stylePoints, legendLabel); + ObserveMapPaneLegendItem legendPoint = new ObserveMapPaneLegendItem(simpleFeature, stylePoints, legendLabel, notValidCount, validCount); legendItems.add(legendPoint); } } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUI.jaxx ===================================== @@ -22,6 +22,7 @@ <import> fr.ird.observe.dto.data.TripMapConfigDto java.awt.CardLayout + java.util.Objects </import> <CardLayout id="contentLayout"/> @@ -44,6 +45,7 @@ <JCheckBoxMenuItem id='toggleLegend'/> <JRadioButtonMenuItem id='legendPositionTop' styleClass='legendPosition'/> <JRadioButtonMenuItem id='legendPositionBottom' styleClass='legendPosition'/> + <JCheckBoxMenuItem id='addPointCount'/> </JToolBar> </JPanel> ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUI.jcss ===================================== @@ -50,16 +50,20 @@ } .legendPosition { - buttonGroup:"legendPosition"; - enabled:{toggleLegend.isSelected()}; + buttonGroup: legendPosition; } #legendPositionTop { selected:{observeMapPane.isLegendPositionTop()}; - enabled:{observeMapPane.isLegendPositionBottom()} + enabled:{observeMapPane.isShowLegend() && observeMapPane.isLegendPositionBottom()} } #legendPositionBottom { selected:{observeMapPane.isLegendPositionBottom()}; - enabled:{observeMapPane.isLegendPositionTop()} + enabled:{observeMapPane.isShowLegend() && observeMapPane.isLegendPositionTop()} } + +#addPointCount { + enabled:{observeMapPane.isShowLegend()}; + selected:{observeMapPane.isAddPointCount()}; +} \ No newline at end of file ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/AddPointCount.java ===================================== @@ -0,0 +1,54 @@ +package fr.ird.observe.client.datasource.editor.api.content.data.map.actions; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: API + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; +import fr.ird.observe.client.datasource.editor.api.content.data.map.ObserveMapPane; +import fr.ird.observe.client.datasource.editor.api.content.data.map.TripMapUI; + +import java.awt.event.ActionEvent; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created at 22/11/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class AddPointCount extends TripMapUIActionSupport implements ConfigureMapAction { + + public AddPointCount() { + super(t("observe.ui.datasource.editor.content.map.addPointCount"), + t("observe.ui.datasource.editor.content.map.addPointCount"), + null, ObserveKeyStrokesEditorApi.KEY_STROKE_SHOW_POINT_COUNT); + } + + @Override + protected void doActionPerformed(ActionEvent e, TripMapUI ui) { + ObserveMapPane observeMapPane = ui.getObserveMapPane(); + boolean newValue = !observeMapPane.isAddPointCount(); + observeMapPane.setAddPointCount(newValue); + ui.getHandler().updateMap(observeMapPane.isShowLegend()); + } +} ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java ===================================== @@ -63,9 +63,12 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit TripMapPointType.psActivityObsWithFreeSchoolType, TripMapPointType.psActivityObsWithObjectSchoolType, TripMapPointType.psActivityLogbook, + TripMapPointType.psActivityLogbookWithSampling, TripMapPointType.psActivityLogbookInHarbour, TripMapPointType.psActivityLogbookWithFreeSchoolType, + TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling, TripMapPointType.psActivityLogbookWithObjectSchoolType, + TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling, TripMapPointType.psTransmittingBuoyLostLogbook )), createLineBuilder(true)); } @@ -81,6 +84,7 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit result.add("mapPsStyleLogbookTextSize"); result.add("mapPsStyleLogbookLineColor"); result.add("mapPsStyleLogbookPointColor"); + result.add("mapPsStyleLogbookWithSamplingPointColor"); result.add("mapPsStyleLogbookTransmittingBuoyLostPointColor"); return result; } ===================================== client/datasource/editor/ps/src/main/resources/map/ps-style.xml ===================================== @@ -318,6 +318,33 @@ </Rule> </FeatureTypeStyle> + <FeatureTypeStyle> + <Rule> + <Name>Other (with sampling)</Name> + <ogc:Filter> + <ogc:PropertyIsEqualTo> + <ogc:PropertyName>pointType</ogc:PropertyName> + <ogc:Literal>psActivityLogbookWithSampling</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <PointSymbolizer> + <Graphic> + + <WellKnownName>ttf://Serif#U+2299</WellKnownName> + <Fill> + <CssParameter name="fill">${mapPsStyleLogbookWithSamplingPointColor}</CssParameter> + </Fill> + <Stroke> + <CssParameter name="stroke">#000000</CssParameter> + <CssParameter name="stroke-width">1</CssParameter> + </Stroke> + + <Size>16</Size> + </Graphic> + </PointSymbolizer> + </Rule> + </FeatureTypeStyle> + <FeatureTypeStyle> <Rule> <Name>With free school type</Name> @@ -345,6 +372,33 @@ </Rule> </FeatureTypeStyle> + <FeatureTypeStyle> + <Rule> + <Name>With free school type (with sampling)</Name> + <ogc:Filter> + <ogc:PropertyIsEqualTo> + <ogc:PropertyName>pointType</ogc:PropertyName> + <ogc:Literal>psActivityLogbookWithFreeSchoolTypeWithSampling</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <PointSymbolizer> + <Graphic> + + <WellKnownName>ttf://Serif#U+25C8</WellKnownName> + <Fill> + <CssParameter name="fill">${mapPsStyleLogbookWithSamplingPointColor}</CssParameter> + </Fill> + <Stroke> + <CssParameter name="stroke">#000000</CssParameter> + <CssParameter name="stroke-width">1</CssParameter> + </Stroke> + + <Size>16</Size> + </Graphic> + </PointSymbolizer> + </Rule> + </FeatureTypeStyle> + <FeatureTypeStyle> <Rule> <Name>With object school type</Name> @@ -366,7 +420,34 @@ <CssParameter name="stroke-width">1</CssParameter> </Stroke> - <Size>12</Size> + <Size>16</Size> + </Graphic> + </PointSymbolizer> + </Rule> + </FeatureTypeStyle> + + <FeatureTypeStyle> + <Rule> + <Name>With object school type (with sampling)</Name> + <ogc:Filter> + <ogc:PropertyIsEqualTo> + <ogc:PropertyName>pointType</ogc:PropertyName> + <ogc:Literal>psActivityLogbookWithObjectSchoolTypeWithSampling</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <PointSymbolizer> + <Graphic> + + <WellKnownName>ttf://Serif#U+2295</WellKnownName> + <Fill> + <CssParameter name="fill">${mapPsStyleLogbookWithSamplingPointColor}</CssParameter> + </Fill> + <Stroke> + <CssParameter name="stroke">#000000</CssParameter> + <CssParameter name="stroke-width">1</CssParameter> + </Stroke> + + <Size>16</Size> </Graphic> </PointSymbolizer> </Rule> ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -103,6 +103,7 @@ observe.config.map.ps.style.logbook.point.color=[PS - Logbook] Color for points observe.config.map.ps.style.logbook.text.color=[PS - Logbook] Color for text observe.config.map.ps.style.logbook.text.size=[PS - Logbook] Size for text observe.config.map.ps.style.logbook.transmitting.buoy.lost.point.color=[PS - Logbook] Color for transmitting buoy lost points +observe.config.map.ps.style.logbook.withSampling.point.color=[PS - Logbook] Color for points (with sampling) observe.config.map.ps.style.observations.line.color=[PS - Observations] Color for lines observe.config.map.ps.style.observations.point.color=[PS - Observations] Color for points observe.config.map.ps.style.observations.text.color=[PS - Observations] Color for text @@ -703,6 +704,7 @@ observe.ui.datasource.editor.content.map.action.zoomMoins=Zoom out observe.ui.datasource.editor.content.map.action.zoomMoins.tip=Zoom out observe.ui.datasource.editor.content.map.action.zoomPlus=Zoom in observe.ui.datasource.editor.content.map.action.zoomPlus.tip=Zoom in +observe.ui.datasource.editor.content.map.addPointCount=Display point counts in legend observe.ui.datasource.editor.content.map.east=East observe.ui.datasource.editor.content.map.export.chooseFile.ok=Exporter observe.ui.datasource.editor.content.map.export.chooseFile.png=PNG image @@ -713,13 +715,16 @@ observe.ui.datasource.editor.content.map.legend.logbook.hauling=Logbook - Haulin observe.ui.datasource.editor.content.map.legend.logbook.setting=Logbook - Setting observe.ui.datasource.editor.content.map.legend.logbook.trip=Logbook - Route observe.ui.datasource.editor.content.map.legend.logbook.tripSegment=Logbook - Segment -observe.ui.datasource.editor.content.map.legend.not.valid.count=( %d points are not displayed ) +observe.ui.datasource.editor.content.map.legend.not.valid.count=( %d point are not displayed ) +observe.ui.datasource.editor.content.map.legend.not.valid.counts=( %d points are not displayed ) observe.ui.datasource.editor.content.map.legend.obs.hauling=Observation - Hauling observe.ui.datasource.editor.content.map.legend.obs.setting=Observation - Setting observe.ui.datasource.editor.content.map.legend.obs.trip=Observation - Route observe.ui.datasource.editor.content.map.legend.obs.tripBetweenTwoDays=Night trip observe.ui.datasource.editor.content.map.legend.obs.tripDay=Observation - Day trip observe.ui.datasource.editor.content.map.legend.tip=To display or hide legend +observe.ui.datasource.editor.content.map.legend.valid.count=- %d point is displayed +observe.ui.datasource.editor.content.map.legend.valid.counts=- %d point(s) are displayed observe.ui.datasource.editor.content.map.legendBottom=Display legend at bottom observe.ui.datasource.editor.content.map.legendBottom.tip=Display legend at bottom observe.ui.datasource.editor.content.map.legendTop=Display legend at top ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -103,6 +103,7 @@ observe.config.map.ps.style.logbook.point.color=[PS - Logbook] Color for points observe.config.map.ps.style.logbook.text.color=[PS - Logbook] Color for text observe.config.map.ps.style.logbook.text.size=[PS - Logbook] Size for text observe.config.map.ps.style.logbook.transmitting.buoy.lost.point.color=[PS - Logbook] Color for transmitting buoy lost points +observe.config.map.ps.style.logbook.withSampling.point.color=[PS - Logbook] Color for points (with sampling) \#TODO observe.config.map.ps.style.observations.line.color=[PS - Observations] Color for lines observe.config.map.ps.style.observations.point.color=[PS - Observations] Color for points observe.config.map.ps.style.observations.text.color=[PS - Observations] Color for text @@ -703,6 +704,7 @@ observe.ui.datasource.editor.content.map.action.zoomMoins=Zoom out \#TODO observe.ui.datasource.editor.content.map.action.zoomMoins.tip=Zoom out \#TODO observe.ui.datasource.editor.content.map.action.zoomPlus=Zoom in \#TODO observe.ui.datasource.editor.content.map.action.zoomPlus.tip=Zoom in \#TODO +observe.ui.datasource.editor.content.map.addPointCount=Display point counts in legend \#TODO observe.ui.datasource.editor.content.map.east=Este observe.ui.datasource.editor.content.map.export.chooseFile.ok=Exportar observe.ui.datasource.editor.content.map.export.chooseFile.png=imagen PNG @@ -713,13 +715,16 @@ observe.ui.datasource.editor.content.map.legend.logbook.hauling=Logbook - Arrast observe.ui.datasource.editor.content.map.legend.logbook.setting=Logbook - Calada observe.ui.datasource.editor.content.map.legend.logbook.trip=Logbook - Trayecto observe.ui.datasource.editor.content.map.legend.logbook.tripSegment=Logbook - Trayecto -observe.ui.datasource.editor.content.map.legend.not.valid.count=( %d points are not displayed ) +observe.ui.datasource.editor.content.map.legend.not.valid.count=( %d point is not displayed ) +observe.ui.datasource.editor.content.map.legend.not.valid.counts=( %d points are not displayed ) observe.ui.datasource.editor.content.map.legend.obs.hauling=Observation - Arrastre observe.ui.datasource.editor.content.map.legend.obs.setting=Observation - Calada observe.ui.datasource.editor.content.map.legend.obs.trip=Observation - Route observe.ui.datasource.editor.content.map.legend.obs.tripBetweenTwoDays=Observation - Trayecto del noche observe.ui.datasource.editor.content.map.legend.obs.tripDay=Observation - Trayecto observe.ui.datasource.editor.content.map.legend.tip=To display or hide legend \#TODO +observe.ui.datasource.editor.content.map.legend.valid.count=- %d point is displayed \#TODO +observe.ui.datasource.editor.content.map.legend.valid.counts=- %d points are displayed \#TODO observe.ui.datasource.editor.content.map.legendBottom=Display legend at bottom observe.ui.datasource.editor.content.map.legendBottom.tip=Display legend at bottom observe.ui.datasource.editor.content.map.legendTop=Display legend at top ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -103,6 +103,7 @@ observe.config.map.ps.style.logbook.point.color=[Senne - Livre de bord] Couleur observe.config.map.ps.style.logbook.text.color=[Senne - Livre de bord] Couleur pour les textes observe.config.map.ps.style.logbook.text.size=[Senne - Livre de bord] Taille pour les textes observe.config.map.ps.style.logbook.transmitting.buoy.lost.point.color=[Senne - Observations] Couleur pour la fin de transmission de balise +observe.config.map.ps.style.logbook.withSampling.point.color=[Senne - Livre de bord] Couleur pour les points (avec échantillonnage) observe.config.map.ps.style.observations.line.color=[Senne - Observations] Couleur pour les traces observe.config.map.ps.style.observations.point.color=[Senne - Observations] Couleur pour les points observe.config.map.ps.style.observations.text.color=[Senne - Observations] Couleur pour les textes @@ -703,6 +704,7 @@ observe.ui.datasource.editor.content.map.action.zoomMoins=Réduire observe.ui.datasource.editor.content.map.action.zoomMoins.tip=Réduire observe.ui.datasource.editor.content.map.action.zoomPlus=Agrandir observe.ui.datasource.editor.content.map.action.zoomPlus.tip=Agrandir +observe.ui.datasource.editor.content.map.addPointCount=Afficher le nombre de points dans la légende observe.ui.datasource.editor.content.map.east=Est observe.ui.datasource.editor.content.map.export.chooseFile.ok=Exporter observe.ui.datasource.editor.content.map.export.chooseFile.png=image PNG @@ -713,17 +715,20 @@ observe.ui.datasource.editor.content.map.legend.logbook.hauling=Livre de bord - observe.ui.datasource.editor.content.map.legend.logbook.setting=Livre de bord - Filage observe.ui.datasource.editor.content.map.legend.logbook.trip=Livre de bord - Trajet observe.ui.datasource.editor.content.map.legend.logbook.tripSegment=Livre de bord - Trajet -observe.ui.datasource.editor.content.map.legend.not.valid.count=( dont %d points non affichés ) +observe.ui.datasource.editor.content.map.legend.not.valid.count=( dont un point non affiché ) +observe.ui.datasource.editor.content.map.legend.not.valid.counts=( dont %d points non affichés ) observe.ui.datasource.editor.content.map.legend.obs.hauling=Observation - Virage observe.ui.datasource.editor.content.map.legend.obs.setting=Observation - Filage observe.ui.datasource.editor.content.map.legend.obs.trip=Observation - Trajet observe.ui.datasource.editor.content.map.legend.obs.tripBetweenTwoDays=Observation - Trajet de nuit observe.ui.datasource.editor.content.map.legend.obs.tripDay=Observation - Trajet de jour observe.ui.datasource.editor.content.map.legend.tip=Pour afficher ou masquer la légende -observe.ui.datasource.editor.content.map.legendBottom=Afficher la légende en haut -observe.ui.datasource.editor.content.map.legendBottom.tip=Afficher la légende en haut -observe.ui.datasource.editor.content.map.legendTop=Afficher la légende en bas -observe.ui.datasource.editor.content.map.legendTop.tip=Afficher la légende en bas +observe.ui.datasource.editor.content.map.legend.valid.count=- un point affiché +observe.ui.datasource.editor.content.map.legend.valid.counts=- %d points affichés +observe.ui.datasource.editor.content.map.legendBottom=Afficher la légende en bas +observe.ui.datasource.editor.content.map.legendBottom.tip=Afficher la légende en bas +observe.ui.datasource.editor.content.map.legendTop=Afficher la légende en haut +observe.ui.datasource.editor.content.map.legendTop.tip=Afficher la légende en hat observe.ui.datasource.editor.content.map.logbook.points.not.valid=Livre de bord - Nombre de points non affichés \: %d observe.ui.datasource.editor.content.map.miles=milles observe.ui.datasource.editor.content.map.north=Nord ===================================== core/api/dto/src/main/i18n/getters/java-enumeration.getter ===================================== @@ -33,7 +33,10 @@ observe.constant.TripMapPointType.llTripLandingHarbour observe.constant.TripMapPointType.psActivityLogbook observe.constant.TripMapPointType.psActivityLogbookInHarbour observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling +observe.constant.TripMapPointType.psActivityLogbookWithSampling observe.constant.TripMapPointType.psActivityObs observe.constant.TripMapPointType.psActivityObsInHarbour observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/TripMapPointType.java ===================================== @@ -43,9 +43,12 @@ public enum TripMapPointType { psActivityObsWithObjectSchoolType, psActivityLogbook, + psActivityLogbookWithSampling, psActivityLogbookInHarbour, psActivityLogbookWithFreeSchoolType, + psActivityLogbookWithFreeSchoolTypeWithSampling, psActivityLogbookWithObjectSchoolType, + psActivityLogbookWithObjectSchoolTypeWithSampling, psTransmittingBuoyLostLogbook, llTripDepartureHarbour, ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripMapBuilder.java ===================================== @@ -94,7 +94,8 @@ public class TripMapBuilder { /* 03 */ " a.latitude," + /* 04 */ " a.longitude," + /* 05 */ " a.vesselActivity," + - /* 06 */ " a.schoolType" + + /* 06 */ " a.schoolType," + + /* 07 */ " (SELECT count(*) FROM ps_logbook.sampleActivity sa WHERE sa.activity = a.topiaId)" + " FROM ps_logbook.route r" + " INNER JOIN ps_logbook.activity a ON a.route = r.topiaId" + " WHERE r.trip = ?" + @@ -106,15 +107,25 @@ public class TripMapBuilder { String schoolType = resultSet.getString(6); String vesselActivityId = resultSet.getString(5); TripMapPointType type = TripMapPointType.psActivityLogbook; + boolean withSample = resultSet.getInt(7) > 0; + if (withSample) { + type = TripMapPointType.psActivityLogbookWithSampling; + } if (ProtectedIdsPs.PS_COMMON_ACTIVITY_HARBOUR_ID.equals(vesselActivityId)) { type = TripMapPointType.psActivityLogbookInHarbour; } else if (schoolType != null) { switch (schoolType) { case ProtectedIdsPs.PS_COMMON_SCHOOL_TYPE_FREE_ID: type = TripMapPointType.psActivityLogbookWithFreeSchoolType; + if (withSample) { + type = TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling; + } break; case ProtectedIdsPs.PS_COMMON_SCHOOL_TYPE_OBJECT_ID: type = TripMapPointType.psActivityLogbookWithObjectSchoolType; + if (withSample) { + type = TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling; + } break; } } ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -460,7 +460,10 @@ observe.constant.TripMapPointType.llTripLandingHarbour=Port landing observe.constant.TripMapPointType.psActivityLogbook=Logbook - Other activity observe.constant.TripMapPointType.psActivityLogbookInHarbour=Logbook - In port observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType=Logbook - Free School type +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling=Logbook - Free School type (with sampling) observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType=Logbook - Object School type +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling=Logbook - Object School type (with sampling) +observe.constant.TripMapPointType.psActivityLogbookWithSampling=Logbook - Other activity (with sampling) observe.constant.TripMapPointType.psActivityObs=Observation - Other activity observe.constant.TripMapPointType.psActivityObsInHarbour=Observation - In port observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Observation - Free School type ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -460,7 +460,10 @@ observe.constant.TripMapPointType.llTripLandingHarbour=Puerto de llegada observe.constant.TripMapPointType.psActivityLogbook=Logbook - Otro Actividad observe.constant.TripMapPointType.psActivityLogbookInHarbour=Logbook - En puerto observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType=Logbook - Banco libre +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling=Logbook - Banco libre (with sampling) \#TODO observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType=Logbook - Banco a objeto +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling=Logbook - Banco a objeto (with sampling) \#TODO +observe.constant.TripMapPointType.psActivityLogbookWithSampling=Logbook - Otro Actividad (with sampling) \#TODO observe.constant.TripMapPointType.psActivityObs=Observation - Otro Actividad observe.constant.TripMapPointType.psActivityObsInHarbour=Observation - En puerto observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Observation - Banco libre ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -457,10 +457,13 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Fin observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Début de filage observe.constant.TripMapPointType.llTripDepartureHarbour=Port de départ observe.constant.TripMapPointType.llTripLandingHarbour=Port d'arrivée -observe.constant.TripMapPointType.psActivityLogbook=Livre de Bord - Autre activité -observe.constant.TripMapPointType.psActivityLogbookInHarbour=Livre de Bord - Au port -observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType=Livre de Bord - Banc libre -observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType=Livre de Bord - Banc objet +observe.constant.TripMapPointType.psActivityLogbook=Livre de bord - Autre activité +observe.constant.TripMapPointType.psActivityLogbookInHarbour=Livre de bord - Au port +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType=Livre de bord - Banc libre +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling=Livre de bord - Banc libre (avec échantillonnage) +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType=Livre de bord - Banc objet +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling=Livre de bord - Banc objet (avec échantillonnage) +observe.constant.TripMapPointType.psActivityLogbookWithSampling=Livre de bord - Autre activité (avec échantillonnage) observe.constant.TripMapPointType.psActivityObs=Observation - Autre activité observe.constant.TripMapPointType.psActivityObsInHarbour=Observation - Au port observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Observation - Banc libre View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/580b9080122536dfeb933ff6… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/580b9080122536dfeb933ff6… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Deleted branch feature/issue-2549
by Tony CHEMIT (＠tchemit) 22 Nov '23

22 Nov '23

Tony CHEMIT deleted branch feature/issue-2549 at ultreiaio / ird-observe -- You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][feature/issue-2549] 7 commits: sort items in legend
by Tony CHEMIT (＠tchemit) 22 Nov '23

22 Nov '23

Tony CHEMIT pushed to branch feature/issue-2549 at ultreiaio / ird-observe Commits: 777cba00 by Tony Chemit at 2023-11-22T10:36:58+01:00 sort items in legend - - - - - 10adf5d7 by Tony Chemit at 2023-11-22T10:37:48+01:00 add new entries in TripMapPointType - - - - - 1fc0533e by Tony Chemit at 2023-11-22T10:40:30+01:00 get logbook activities with sampling and use new entries of TripMapPointType in TripMapBuilder - - - - - 5cd87f5f by Tony Chemit at 2023-11-22T10:41:07+01:00 add new configuration option for logbook activities with sampling (default is yellow) - - - - - dc72c092 by Tony Chemit at 2023-11-22T10:41:48+01:00 update TripMapContentBuilder and ps style to use new type of point (with sampling) - - - - - 0fa755fe by Tony Chemit at 2023-11-22T12:45:05+01:00 add suppressWarning for services with generics and AutoService annotation usage - - - - - 6a0e6978 by Tony Chemit at 2023-11-22T12:45:50+01:00 change shortcut (Alt + Fxx is used under linux by X) - - - - - 22 changed files: - client/configuration/src/main/config/Client.ini - client/configuration/src/main/i18n/getters/config.getter - client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java - client/core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java - client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsBodyContent.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigBodyContent.java - client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java - client/core/src/main/java/fr/ird/observe/client/main/body/NoBodyContent.java - client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapContentBuilderSupport.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java - client/datasource/editor/ps/src/main/resources/map/ps-style.xml - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto/src/main/i18n/getters/java-enumeration.getter - core/api/dto/src/main/java/fr/ird/observe/dto/data/TripMapPointType.java - core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripMapBuilder.java - core/services/i18n/src/main/i18n/translations/services_en_GB.properties - core/services/i18n/src/main/i18n/translations/services_es_ES.properties - core/services/i18n/src/main/i18n/translations/services_fr_FR.properties Changes: ===================================== client/configuration/src/main/config/Client.ini ===================================== @@ -846,6 +846,12 @@ key = ui.map.ps.style.logbook.point.color type = color defaultValue = java.awt.Color[r=255,g=0,b=0] +[option mapPsStyleLogbookWithSamplingPointColor] +description = observe.config.map.ps.style.logbook.withSampling.point.color +key = ui.map.ps.style.logbook.withSampling.point.color +type = color +defaultValue = java.awt.Color[r=255,g=255,b=0] + [option mapPsStyleLogbookTextColor] description = observe.config.map.ps.style.logbook.text.color key = ui.map.ps.style.logbook.text.color ===================================== client/configuration/src/main/i18n/getters/config.getter ===================================== @@ -86,6 +86,7 @@ observe.config.map.ps.style.logbook.point.color observe.config.map.ps.style.logbook.text.color observe.config.map.ps.style.logbook.text.size observe.config.map.ps.style.logbook.transmitting.buoy.lost.point.color +observe.config.map.ps.style.logbook.withSampling.point.color observe.config.map.ps.style.observations.line.color observe.config.map.ps.style.observations.point.color observe.config.map.ps.style.observations.text.color ===================================== client/configuration/src/main/java/fr/ird/observe/client/configuration/SeineBycatchObservedSystemConfigConverter.java ===================================== @@ -36,6 +36,7 @@ import org.nuiton.converter.NuitonConverter; * * @author Tony Chemit - dev(a)tchemit.fr */ +@SuppressWarnings("rawtypes") @AutoService(NuitonConverter.class) public class SeineBycatchObservedSystemConfigConverter implements NuitonConverter<SeineBycatchObservedSystemConfig> { ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/h2/server/H2ServerBodyContent.java ===================================== @@ -38,6 +38,7 @@ import static io.ultreia.java4all.i18n.I18n.t; * @author Tony Chemit - dev(a)tchemit.fr * @since ? */ +@SuppressWarnings("rawtypes") @AutoService(MainUIBodyContent.class) public class H2ServerBodyContent extends MainUIBodyContent<H2ServerUI> implements WithClientUIContextApi { ===================================== client/core/src/main/java/fr/ird/observe/client/datasource/presets/RemotePresetsBodyContent.java ===================================== @@ -29,6 +29,7 @@ import fr.ird.observe.client.main.body.MainUIBodyContent; * @author Tony Chemit - dev(a)tchemit.fr * @since 8 */ +@SuppressWarnings("rawtypes") @AutoService(MainUIBodyContent.class) public class RemotePresetsBodyContent extends MainUIBodyContent<RemotePresetsUI> { ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigBodyContent.java ===================================== @@ -33,6 +33,7 @@ import java.util.function.Supplier; * @author Tony Chemit - dev(a)tchemit.fr * @since 8 */ +@SuppressWarnings("rawtypes") @AutoService(MainUIBodyContent.class) public class ClientConfigBodyContent extends MainUIBodyContent<ClientConfigUI> implements WithClientUIContextApi { ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/ClientConfigUI.java ===================================== @@ -334,6 +334,7 @@ public class ClientConfigUI extends JXTitledPanel implements WithClientUIContext helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_TEXT_SIZE); helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_LINE_COLOR); helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_POINT_COLOR); + helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_WITH_SAMPLING_POINT_COLOR); helper.addOption(ClientConfigOption.MAP_PS_STYLE_LOGBOOK_TRANSMITTING_BUOY_LOST_POINT_COLOR); helper.addOption(ClientConfigOption.MAP_LL_STYLE_FILE); helper.addOption(ClientConfigOption.MAP_LL_STYLE_OBSERVATIONS_LINE_TRIP_COLOR); ===================================== client/core/src/main/java/fr/ird/observe/client/main/body/NoBodyContent.java ===================================== @@ -28,6 +28,7 @@ import com.google.auto.service.AutoService; * @author Tony Chemit - dev(a)tchemit.fr * @since 8 */ +@SuppressWarnings("rawtypes") @AutoService(MainUIBodyContent.class) public class NoBodyContent extends MainUIBodyContent<NoBodyContentComponent> { ===================================== client/datasource/actions/src/main/java/fr/ird/observe/client/datasource/actions/AdminUIBodyContent.java ===================================== @@ -55,6 +55,7 @@ import java.util.function.Supplier; * @author Tony Chemit - dev(a)tchemit.fr * @since 8 */ +@SuppressWarnings("rawtypes") @AutoService(MainUIBodyContent.class) public class AdminUIBodyContent extends MainUIBodyContent<AdminUI> implements WithClientUIContextApi { ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java ===================================== @@ -37,7 +37,7 @@ public class ObserveKeyStrokesEditorApi extends ObserveKeyStrokesSupport { //FIXME Let's design a nice new API to register KeyStroke (a new annotation, processed to generate KeyStroke resources) // Navigation - public static final KeyStroke KEY_STROKE_MAP_CONFIGURE = KeyStroke.getKeyStroke("alt pressed F2"); + public static final KeyStroke KEY_STROKE_MAP_CONFIGURE = KeyStroke.getKeyStroke("ctrl pressed F2"); public static final KeyStroke KEY_STROKE_NAVIGATION_CONFIGURE = KeyStroke.getKeyStroke("pressed F12"); public static final KeyStroke KEY_STROKE_STORAGE_MENU_LEFT = KeyStroke.getKeyStroke("pressed F1"); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapContentBuilderSupport.java ===================================== @@ -68,6 +68,7 @@ import java.nio.file.Path; import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Arrays; +import java.util.Comparator; import java.util.Date; import java.util.EnumMap; import java.util.HashSet; @@ -77,6 +78,7 @@ import java.util.List; import java.util.Map; import java.util.Optional; import java.util.Set; +import java.util.stream.Collectors; /** * @author Tony Chemit - dev(a)tchemit.fr @@ -266,9 +268,10 @@ public abstract class TripMapContentBuilderSupport implements TripMapContentBuil mapContent.addLayer(pointsLayer); } - Set<TripMapPointType> notValidTypes = new LinkedHashSet<>(notValidPoints.keySet()); + Set<TripMapPointType> notValidTypes = notValidPoints.keySet().stream().sorted(Comparator.comparing(TripMapPointType::getLabel)).collect(Collectors.toCollection(LinkedHashSet::new)); - for (TripMapPointType type : pointTypeInLegend) { + List<TripMapPointType> sortedPointTypeInLegend = pointTypeInLegend.stream().sorted(Comparator.comparing(TripMapPointType::getLabel)).collect(Collectors.toList()); + for (TripMapPointType type : sortedPointTypeInLegend) { List<TripMapPoint> notValidPointsForType = notValidPoints.get(type); String label = type.getLabel(); if (notValidPointsForType != null && !notValidPointsForType.isEmpty()) { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java ===================================== @@ -63,9 +63,12 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit TripMapPointType.psActivityObsWithFreeSchoolType, TripMapPointType.psActivityObsWithObjectSchoolType, TripMapPointType.psActivityLogbook, + TripMapPointType.psActivityLogbookWithSampling, TripMapPointType.psActivityLogbookInHarbour, TripMapPointType.psActivityLogbookWithFreeSchoolType, + TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling, TripMapPointType.psActivityLogbookWithObjectSchoolType, + TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling, TripMapPointType.psTransmittingBuoyLostLogbook )), createLineBuilder(true)); } @@ -81,6 +84,7 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit result.add("mapPsStyleLogbookTextSize"); result.add("mapPsStyleLogbookLineColor"); result.add("mapPsStyleLogbookPointColor"); + result.add("mapPsStyleLogbookWithSamplingPointColor"); result.add("mapPsStyleLogbookTransmittingBuoyLostPointColor"); return result; } ===================================== client/datasource/editor/ps/src/main/resources/map/ps-style.xml ===================================== @@ -318,6 +318,33 @@ </Rule> </FeatureTypeStyle> + <FeatureTypeStyle> + <Rule> + <Name>Other (with sampling)</Name> + <ogc:Filter> + <ogc:PropertyIsEqualTo> + <ogc:PropertyName>pointType</ogc:PropertyName> + <ogc:Literal>psActivityLogbookWithSampling</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <PointSymbolizer> + <Graphic> + + <WellKnownName>ttf://Serif#U+2299</WellKnownName> + <Fill> + <CssParameter name="fill">${mapPsStyleLogbookWithSamplingPointColor}</CssParameter> + </Fill> + <Stroke> + <CssParameter name="stroke">#000000</CssParameter> + <CssParameter name="stroke-width">1</CssParameter> + </Stroke> + + <Size>16</Size> + </Graphic> + </PointSymbolizer> + </Rule> + </FeatureTypeStyle> + <FeatureTypeStyle> <Rule> <Name>With free school type</Name> @@ -345,6 +372,33 @@ </Rule> </FeatureTypeStyle> + <FeatureTypeStyle> + <Rule> + <Name>With free school type (with sampling)</Name> + <ogc:Filter> + <ogc:PropertyIsEqualTo> + <ogc:PropertyName>pointType</ogc:PropertyName> + <ogc:Literal>psActivityLogbookWithFreeSchoolTypeWithSampling</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <PointSymbolizer> + <Graphic> + + <WellKnownName>ttf://Serif#U+25C8</WellKnownName> + <Fill> + <CssParameter name="fill">${mapPsStyleLogbookWithSamplingPointColor}</CssParameter> + </Fill> + <Stroke> + <CssParameter name="stroke">#000000</CssParameter> + <CssParameter name="stroke-width">1</CssParameter> + </Stroke> + + <Size>16</Size> + </Graphic> + </PointSymbolizer> + </Rule> + </FeatureTypeStyle> + <FeatureTypeStyle> <Rule> <Name>With object school type</Name> @@ -366,7 +420,34 @@ <CssParameter name="stroke-width">1</CssParameter> </Stroke> - <Size>12</Size> + <Size>16</Size> + </Graphic> + </PointSymbolizer> + </Rule> + </FeatureTypeStyle> + + <FeatureTypeStyle> + <Rule> + <Name>With object school type (with sampling)</Name> + <ogc:Filter> + <ogc:PropertyIsEqualTo> + <ogc:PropertyName>pointType</ogc:PropertyName> + <ogc:Literal>psActivityLogbookWithObjectSchoolTypeWithSampling</ogc:Literal> + </ogc:PropertyIsEqualTo> + </ogc:Filter> + <PointSymbolizer> + <Graphic> + + <WellKnownName>ttf://Serif#U+2295</WellKnownName> + <Fill> + <CssParameter name="fill">${mapPsStyleLogbookWithSamplingPointColor}</CssParameter> + </Fill> + <Stroke> + <CssParameter name="stroke">#000000</CssParameter> + <CssParameter name="stroke-width">1</CssParameter> + </Stroke> + + <Size>16</Size> </Graphic> </PointSymbolizer> </Rule> ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -103,6 +103,7 @@ observe.config.map.ps.style.logbook.point.color=[PS - Logbook] Color for points observe.config.map.ps.style.logbook.text.color=[PS - Logbook] Color for text observe.config.map.ps.style.logbook.text.size=[PS - Logbook] Size for text observe.config.map.ps.style.logbook.transmitting.buoy.lost.point.color=[PS - Logbook] Color for transmitting buoy lost points +observe.config.map.ps.style.logbook.withSampling.point.color=[PS - Logbook] Color for points (with sampling) observe.config.map.ps.style.observations.line.color=[PS - Observations] Color for lines observe.config.map.ps.style.observations.point.color=[PS - Observations] Color for points observe.config.map.ps.style.observations.text.color=[PS - Observations] Color for text ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -103,6 +103,7 @@ observe.config.map.ps.style.logbook.point.color=[PS - Logbook] Color for points observe.config.map.ps.style.logbook.text.color=[PS - Logbook] Color for text observe.config.map.ps.style.logbook.text.size=[PS - Logbook] Size for text observe.config.map.ps.style.logbook.transmitting.buoy.lost.point.color=[PS - Logbook] Color for transmitting buoy lost points +observe.config.map.ps.style.logbook.withSampling.point.color=[PS - Logbook] Color for points (with sampling) \#TODO observe.config.map.ps.style.observations.line.color=[PS - Observations] Color for lines observe.config.map.ps.style.observations.point.color=[PS - Observations] Color for points observe.config.map.ps.style.observations.text.color=[PS - Observations] Color for text ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -103,6 +103,7 @@ observe.config.map.ps.style.logbook.point.color=[Senne - Livre de bord] Couleur observe.config.map.ps.style.logbook.text.color=[Senne - Livre de bord] Couleur pour les textes observe.config.map.ps.style.logbook.text.size=[Senne - Livre de bord] Taille pour les textes observe.config.map.ps.style.logbook.transmitting.buoy.lost.point.color=[Senne - Observations] Couleur pour la fin de transmission de balise +observe.config.map.ps.style.logbook.withSampling.point.color=[Senne - Livre de bord] Couleur pour les points (avec échantillonnage) observe.config.map.ps.style.observations.line.color=[Senne - Observations] Couleur pour les traces observe.config.map.ps.style.observations.point.color=[Senne - Observations] Couleur pour les points observe.config.map.ps.style.observations.text.color=[Senne - Observations] Couleur pour les textes ===================================== core/api/dto/src/main/i18n/getters/java-enumeration.getter ===================================== @@ -33,7 +33,10 @@ observe.constant.TripMapPointType.llTripLandingHarbour observe.constant.TripMapPointType.psActivityLogbook observe.constant.TripMapPointType.psActivityLogbookInHarbour observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling +observe.constant.TripMapPointType.psActivityLogbookWithSampling observe.constant.TripMapPointType.psActivityObs observe.constant.TripMapPointType.psActivityObsInHarbour observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/TripMapPointType.java ===================================== @@ -43,9 +43,12 @@ public enum TripMapPointType { psActivityObsWithObjectSchoolType, psActivityLogbook, + psActivityLogbookWithSampling, psActivityLogbookInHarbour, psActivityLogbookWithFreeSchoolType, + psActivityLogbookWithFreeSchoolTypeWithSampling, psActivityLogbookWithObjectSchoolType, + psActivityLogbookWithObjectSchoolTypeWithSampling, psTransmittingBuoyLostLogbook, llTripDepartureHarbour, ===================================== core/persistence/java/src/main/java/fr/ird/observe/entities/data/ps/common/TripMapBuilder.java ===================================== @@ -94,7 +94,8 @@ public class TripMapBuilder { /* 03 */ " a.latitude," + /* 04 */ " a.longitude," + /* 05 */ " a.vesselActivity," + - /* 06 */ " a.schoolType" + + /* 06 */ " a.schoolType," + + /* 07 */ " (SELECT count(*) FROM ps_logbook.sampleActivity sa WHERE sa.activity = a.topiaId)" + " FROM ps_logbook.route r" + " INNER JOIN ps_logbook.activity a ON a.route = r.topiaId" + " WHERE r.trip = ?" + @@ -106,15 +107,25 @@ public class TripMapBuilder { String schoolType = resultSet.getString(6); String vesselActivityId = resultSet.getString(5); TripMapPointType type = TripMapPointType.psActivityLogbook; + boolean withSample = resultSet.getInt(7) > 0; + if (withSample) { + type = TripMapPointType.psActivityLogbookWithSampling; + } if (ProtectedIdsPs.PS_COMMON_ACTIVITY_HARBOUR_ID.equals(vesselActivityId)) { type = TripMapPointType.psActivityLogbookInHarbour; } else if (schoolType != null) { switch (schoolType) { case ProtectedIdsPs.PS_COMMON_SCHOOL_TYPE_FREE_ID: type = TripMapPointType.psActivityLogbookWithFreeSchoolType; + if (withSample) { + type = TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling; + } break; case ProtectedIdsPs.PS_COMMON_SCHOOL_TYPE_OBJECT_ID: type = TripMapPointType.psActivityLogbookWithObjectSchoolType; + if (withSample) { + type = TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling; + } break; } } ===================================== core/services/i18n/src/main/i18n/translations/services_en_GB.properties ===================================== @@ -460,7 +460,10 @@ observe.constant.TripMapPointType.llTripLandingHarbour=Port landing observe.constant.TripMapPointType.psActivityLogbook=Logbook - Other activity observe.constant.TripMapPointType.psActivityLogbookInHarbour=Logbook - In port observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType=Logbook - Free School type +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling=Logbook - Free School type (with sampling) observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType=Logbook - Object School type +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling=Logbook - Object School type (with sampling) +observe.constant.TripMapPointType.psActivityLogbookWithSampling=Logbook - Other activity (with sampling) observe.constant.TripMapPointType.psActivityObs=Observation - Other activity observe.constant.TripMapPointType.psActivityObsInHarbour=Observation - In port observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Observation - Free School type ===================================== core/services/i18n/src/main/i18n/translations/services_es_ES.properties ===================================== @@ -460,7 +460,10 @@ observe.constant.TripMapPointType.llTripLandingHarbour=Puerto de llegada observe.constant.TripMapPointType.psActivityLogbook=Logbook - Otro Actividad observe.constant.TripMapPointType.psActivityLogbookInHarbour=Logbook - En puerto observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType=Logbook - Banco libre +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling=Logbook - Banco libre (with sampling) \#TODO observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType=Logbook - Banco a objeto +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling=Logbook - Banco a objeto (with sampling) \#TODO +observe.constant.TripMapPointType.psActivityLogbookWithSampling=Logbook - Otro Actividad (with sampling) \#TODO observe.constant.TripMapPointType.psActivityObs=Observation - Otro Actividad observe.constant.TripMapPointType.psActivityObsInHarbour=Observation - En puerto observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Observation - Banco libre ===================================== core/services/i18n/src/main/i18n/translations/services_fr_FR.properties ===================================== @@ -457,10 +457,13 @@ observe.constant.TripMapPointType.llActivityObsWithSettingEnd=Observation - Fin observe.constant.TripMapPointType.llActivityObsWithSettingStart=Observation - Début de filage observe.constant.TripMapPointType.llTripDepartureHarbour=Port de départ observe.constant.TripMapPointType.llTripLandingHarbour=Port d'arrivée -observe.constant.TripMapPointType.psActivityLogbook=Livre de Bord - Autre activité -observe.constant.TripMapPointType.psActivityLogbookInHarbour=Livre de Bord - Au port -observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType=Livre de Bord - Banc libre -observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType=Livre de Bord - Banc objet +observe.constant.TripMapPointType.psActivityLogbook=Livre de bord - Autre activité +observe.constant.TripMapPointType.psActivityLogbookInHarbour=Livre de bord - Au port +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolType=Livre de bord - Banc libre +observe.constant.TripMapPointType.psActivityLogbookWithFreeSchoolTypeWithSampling=Livre de bord - Banc libre (avec échantillonnage) +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolType=Livre de bord - Banc objet +observe.constant.TripMapPointType.psActivityLogbookWithObjectSchoolTypeWithSampling=Livre de bord - Banc objet (avec échantillonnage) +observe.constant.TripMapPointType.psActivityLogbookWithSampling=Livre de bord - Autre activité (avec échantillonnage) observe.constant.TripMapPointType.psActivityObs=Observation - Autre activité observe.constant.TripMapPointType.psActivityObsInHarbour=Observation - Au port observe.constant.TripMapPointType.psActivityObsWithFreeSchoolType=Observation - Banc libre View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5a1869b73eb86a3709ab9a62… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/5a1869b73eb86a3709ab9a62… You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe] Pushed new branch feature/issue-2549
by Tony CHEMIT (＠tchemit) 21 Nov '23

21 Nov '23

Tony CHEMIT pushed new branch feature/issue-2549 at ultreiaio / ird-observe -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/tree/feature/issue-2549 You're receiving this email because of your account on gitlab.com.

1 0

[Git][ultreiaio/ird-observe][develop] 4 commits: use plain line style - See #2756
by Tony CHEMIT (＠tchemit) 21 Nov '23

21 Nov '23

Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: 3e2f7791 by Tony Chemit at 2023-11-21T16:13:01+01:00 use plain line style - See #2756 - - - - - 284c10f6 by Tony Chemit at 2023-11-21T16:14:51+01:00 add new options in TripMapConfigDto (only used by TripMapContentBuilder) - - - - - 1c2772ec by Tony Chemit at 2023-11-21T16:16:00+01:00 add new options in TripMapUI and use them to update add new options in TripMapConfigDto and rebuild map model - - - - - 580b9080 by Tony Chemit at 2023-11-21T16:17:38+01:00 Merge branch 'feature/issue-2363' into develop Ajouter une option pour afficher/masquer la trace entre les activités de la carte - See #2363 - - - - - 15 changed files: - client/datasource/editor/api/src/main/i18n/getters/java.getter - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUI.jaxx - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUI.jcss - client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUIHandler.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/AddLogbookTripSegment.java - + client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/AddObservationsTripSegment.java - client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripMapContentBuilder.java - client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java - client/datasource/editor/ps/src/main/resources/map/ps-style.xml - client/runner/src/main/i18n/translations/client-runner_en_GB.properties - client/runner/src/main/i18n/translations/client-runner_es_ES.properties - client/runner/src/main/i18n/translations/client-runner_fr_FR.properties - core/api/dto/src/main/java/fr/ird/observe/dto/data/TripMapConfigDto.java Changes: ===================================== client/datasource/editor/api/src/main/i18n/getters/java.getter ===================================== @@ -229,7 +229,9 @@ observe.ui.datasource.editor.content.map.legendTop.tip observe.ui.datasource.editor.content.map.miles observe.ui.datasource.editor.content.map.north observe.ui.datasource.editor.content.map.showLogbook +observe.ui.datasource.editor.content.map.showLogbookTripSegment observe.ui.datasource.editor.content.map.showObservation +observe.ui.datasource.editor.content.map.showObservationsTripSegment observe.ui.datasource.editor.content.map.south observe.ui.datasource.editor.content.map.west observe.ui.datasource.search.add.criteria.tip ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/ObserveKeyStrokesEditorApi.java ===================================== @@ -50,7 +50,9 @@ public class ObserveKeyStrokesEditorApi extends ObserveKeyStrokesSupport { public static final KeyStroke KEY_STROKE_DATA_SYNCHRO_INFO_RIGHT = KeyStroke.getKeyStroke("pressed F8"); public static final KeyStroke KEY_STROKE_SHOW_OBS = KeyStroke.getKeyStroke("ctrl pressed O"); + public static final KeyStroke KEY_STROKE_SHOW_OBSERVATIONS_TRIP_SEGMENT = KeyStroke.getKeyStroke("shift ctrl pressed O"); public static final KeyStroke KEY_STROKE_SHOW_LOGBOOK = KeyStroke.getKeyStroke("ctrl pressed L"); + public static final KeyStroke KEY_STROKE_SHOW_LOGBOOK_TRIP_SEGMENT = KeyStroke.getKeyStroke("shift ctrl pressed L"); public static final KeyStroke KEY_STROKE_LEGEND_TOGGLE = KeyStroke.getKeyStroke("pressed F11"); public static final KeyStroke KEY_STROKE_LEGEND_TOP = KeyStroke.getKeyStroke("ctrl pressed T"); public static final KeyStroke KEY_STROKE_LEGEND_BOTTOM = KeyStroke.getKeyStroke("ctrl pressed B"); ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/TripUIHelper.java ===================================== @@ -39,6 +39,7 @@ import org.apache.logging.log4j.Logger; import javax.swing.JTabbedPane; import javax.swing.SwingUtilities; import javax.swing.event.ChangeEvent; +import java.util.Set; public abstract class TripUIHelper<D extends RootOpenableDto, U extends ContentRootOpenableUI<D, U> & TripUI<D>> implements WithClientUIContextApi { @@ -59,13 +60,22 @@ public abstract class TripUIHelper<D extends RootOpenableDto, U extends ContentR return getService(ui.getHandler()).getTripMap(tripMapConfig); } + private static final Set<String> UPDATE_MAP_MODEL_PROPERTIES = Set.of( + TripMapConfigDto.PROPERTY_ADD_OBSERVATIONS, + TripMapConfigDto.PROPERTY_ADD_OBSERVATIONS_TRIP_SEGMENT, + TripMapConfigDto.PROPERTY_ADD_LOGBOOK, + TripMapConfigDto.PROPERTY_ADD_LOGBOOK_TRIP_SEGMENT + ); + public void installMap(TripAware trip) { TripMapUI tripMap = ui.getTripMap(); TripMapConfigDto tripMapConfig = tripMap.getTripMapConfig(); tripMapConfig.setAddObservations(true); + tripMapConfig.setAddObservationsTripSegment(true); tripMapConfig.setAddLogbook(true); + tripMapConfig.setAddLogbookTripSegment(true); SwingUtilities.invokeLater(tripMap::validate); ClientConfig config = getClientConfig(); @@ -73,8 +83,11 @@ public abstract class TripUIHelper<D extends RootOpenableDto, U extends ContentR trip.addPropertyChangeListener(TripAware.PROPERTY_LOGBOOK_AVAILABILITY, evt -> onLogbookAvailabilityChanged((Boolean) evt.getNewValue())); tripMap.getHandler().setConfig(config); - tripMapConfig.addPropertyChangeListener(TripMapConfigDto.PROPERTY_ADD_OBSERVATIONS, e -> updateMapModel()); - tripMapConfig.addPropertyChangeListener(TripMapConfigDto.PROPERTY_ADD_LOGBOOK, e -> updateMapModel()); + tripMapConfig.addPropertyChangeListener(e -> { + if (UPDATE_MAP_MODEL_PROPERTIES.contains(e.getPropertyName())) { + updateMapModel(); + } + }); ui.getMainTabbedPane().addChangeListener(this::onTabChanged); // Disable map tab because can't manage it :( ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUI.jaxx ===================================== @@ -38,7 +38,9 @@ <JToolBar id='configToolBar' constraints="BorderLayout.EAST"> <JToggleButton id='toggleConfigure'/> <JCheckBoxMenuItem id='addObservations'/> + <JCheckBoxMenuItem id='addObservationsTripSegment'/> <JCheckBoxMenuItem id='addLogbook'/> + <JCheckBoxMenuItem id='addLogbookTripSegment'/> <JCheckBoxMenuItem id='toggleLegend'/> <JRadioButtonMenuItem id='legendPositionTop' styleClass='legendPosition'/> <JRadioButtonMenuItem id='legendPositionBottom' styleClass='legendPosition'/> ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUI.jcss ===================================== @@ -39,6 +39,16 @@ selected:{tripMapConfig.isAddLogbook()}; } +#addObservationsTripSegment { + enabled:{tripMapConfig.isAddObservations()}; + selected:{tripMapConfig.isAddObservationsTripSegment()}; +} + +#addLogbookTripSegment { + enabled:{tripMapConfig.isAddLogbook()}; + selected:{tripMapConfig.isAddLogbookTripSegment()}; +} + .legendPosition { buttonGroup:"legendPosition"; enabled:{toggleLegend.isSelected()}; ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/TripMapUIHandler.java ===================================== @@ -36,7 +36,6 @@ import org.geotools.swing.event.MapPaneListener; import org.nuiton.jaxx.runtime.spi.UIHandler; import javax.swing.JSeparator; -import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import java.awt.Point; import java.awt.event.MouseEvent; @@ -183,7 +182,8 @@ public class TripMapUIHandler implements UIHandler<TripMapUI> { mapPane.addMouseMotionListener(mouseMapListener); mapPane.addMouseListener(mouseMapListener); mapPane.addMapPaneListener(new TripMapListener()); - ui.getConfigurePopup().add(new JSeparator(SwingConstants.HORIZONTAL), 2); + ui.getConfigurePopup().add(new JSeparator(JSeparator.HORIZONTAL), 4); + ui.getConfigurePopup().add(new JSeparator(JSeparator.HORIZONTAL), 2); rendererRunning = false; } ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/AddLogbookTripSegment.java ===================================== @@ -0,0 +1,56 @@ +package fr.ird.observe.client.datasource.editor.api.content.data.map.actions; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: API + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; +import fr.ird.observe.client.datasource.editor.api.content.data.map.ObserveMapPane; +import fr.ird.observe.client.datasource.editor.api.content.data.map.TripMapUI; +import fr.ird.observe.dto.data.TripMapConfigDto; + +import java.awt.event.ActionEvent; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created at 21/11/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class AddLogbookTripSegment extends TripMapUIActionSupport implements ConfigureMapAction { + + public AddLogbookTripSegment() { + super(t("observe.ui.datasource.editor.content.map.showLogbookTripSegment"), + t("observe.ui.datasource.editor.content.map.showLogbookTripSegment"), + null, ObserveKeyStrokesEditorApi.KEY_STROKE_SHOW_LOGBOOK_TRIP_SEGMENT); + } + + @Override + protected void doActionPerformed(ActionEvent e, TripMapUI ui) { + ObserveMapPane observeMapPane = ui.getObserveMapPane(); + TripMapConfigDto mapConfig = ui.getTripMapConfig(); + boolean newValue = !mapConfig.isAddLogbookTripSegment(); + mapConfig.setAddLogbookTripSegment(newValue); + ui.getHandler().updateMap(observeMapPane.isShowLegend()); + } +} ===================================== client/datasource/editor/api/src/main/java/fr/ird/observe/client/datasource/editor/api/content/data/map/actions/AddObservationsTripSegment.java ===================================== @@ -0,0 +1,56 @@ +package fr.ird.observe.client.datasource.editor.api.content.data.map.actions; + +/*- + * #%L + * ObServe Client :: DataSource :: Editor :: API + * %% + * Copyright (C) 2008 - 2023 IRD, Ultreia.io + * %% + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/gpl-3.0.html>. + * #L% + */ + +import fr.ird.observe.client.datasource.editor.api.ObserveKeyStrokesEditorApi; +import fr.ird.observe.client.datasource.editor.api.content.data.map.ObserveMapPane; +import fr.ird.observe.client.datasource.editor.api.content.data.map.TripMapUI; +import fr.ird.observe.dto.data.TripMapConfigDto; + +import java.awt.event.ActionEvent; + +import static io.ultreia.java4all.i18n.I18n.t; + +/** + * Created at 21/11/2023. + * + * @author Tony Chemit - dev(a)tchemit.fr + * @since 9.3.0 + */ +public class AddObservationsTripSegment extends TripMapUIActionSupport implements ConfigureMapAction { + + public AddObservationsTripSegment() { + super(t("observe.ui.datasource.editor.content.map.showObservationsTripSegment"), + t("observe.ui.datasource.editor.content.map.showObservationsTripSegment"), + null, ObserveKeyStrokesEditorApi.KEY_STROKE_SHOW_OBSERVATIONS_TRIP_SEGMENT); + } + + @Override + protected void doActionPerformed(ActionEvent e, TripMapUI ui) { + ObserveMapPane observeMapPane = ui.getObserveMapPane(); + TripMapConfigDto mapConfig = ui.getTripMapConfig(); + boolean newValue = !mapConfig.isAddObservationsTripSegment(); + mapConfig.setAddObservationsTripSegment(newValue); + ui.getHandler().updateMap(observeMapPane.isShowLegend()); + } +} ===================================== client/datasource/editor/ll/src/main/java/fr/ird/observe/client/datasource/editor/ll/data/common/TripMapContentBuilder.java ===================================== @@ -99,12 +99,12 @@ public class TripMapContentBuilder extends TripMapContentBuilderSupport { if (tripMapConfig.isAddObservations()) { List<TripMapPoint> obsPoints = getObsPoints(tripMapPoints); addFishingZone(OBSERVATIONS_ZONES_BUILDER, obsPoints); - addLines(OBSERVATIONS_LINES_BUILDER, obsPoints); + addLines(OBSERVATIONS_LINES_BUILDER, obsPoints, tripMapConfig.isAddObservationsTripSegment()); } if (tripMapConfig.isAddLogbook()) { List<TripMapPoint> logbookPoints = getLogbookPoints(tripMapPoints); addFishingZone(LOGBOOK_ZONES_BUILDER, logbookPoints); - addLines(LOGBOOK_LINES_BUILDER, logbookPoints); + addLines(LOGBOOK_LINES_BUILDER, logbookPoints, tripMapConfig.isAddLogbookTripSegment()); } } @@ -132,11 +132,13 @@ public class TripMapContentBuilder extends TripMapContentBuilderSupport { } } - private void addLines(LinesBuilder builder, List<TripMapPoint> tripMapPoints) { + private void addLines(LinesBuilder builder, List<TripMapPoint> tripMapPoints, boolean addTripSegment) { DefaultFeatureCollection linesFeatures = new DefaultFeatureCollection(); Set<String> lineTypes = new TreeSet<>(); builder.build(tripMapPoints); - addLines(TRIP_LINE_TYPE, linesFeatures, lineTypes, builder.getTripLines()); + if (addTripSegment) { + addLines(TRIP_LINE_TYPE, linesFeatures, lineTypes, builder.getTripLines()); + } addLines(SETTING_LINE_TYPE, linesFeatures, lineTypes, builder.getSettingLines()); addLines(HAULING_LINE_TYPE, linesFeatures, lineTypes, builder.getHaulingLines()); if (!linesFeatures.isEmpty()) { ===================================== client/datasource/editor/ps/src/main/java/fr/ird/observe/client/datasource/editor/ps/data/common/TripMapContentBuilder.java ===================================== @@ -107,7 +107,7 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit @Override public void addLines(TripMapConfigDto tripMapConfig, List<TripMapPoint> tripMapPoints) { - if (tripMapConfig.isAddObservations()) { + if (tripMapConfig.isAddObservations() && tripMapConfig.isAddObservationsTripSegment()) { addLines0(tripMapPoints.stream().filter(f -> f.getType().isTrip() || f.getType().isObs()).collect(Collectors.toList()), "observationDay", "observationNight", @@ -115,7 +115,7 @@ public class TripMapContentBuilder extends fr.ird.observe.client.datasource.edit t("observe.ui.datasource.editor.content.map.legend.obs.tripDay"), t("observe.ui.datasource.editor.content.map.legend.obs.tripBetweenTwoDays")); } - if (tripMapConfig.isAddLogbook()) { + if (tripMapConfig.isAddLogbook() && tripMapConfig.isAddLogbookTripSegment()) { addLines0(tripMapPoints.stream().filter(f -> f.getType().isTrip() || f.getType().isLogbook()).collect(Collectors.toList()), "logbookSegment", "logbookSegment", ===================================== client/datasource/editor/ps/src/main/resources/map/ps-style.xml ===================================== @@ -91,7 +91,7 @@ <Stroke> <CssParameter name="stroke">${mapPsStyleLogbookLineColor}</CssParameter> <CssParameter name="stroke-width">2</CssParameter> - <CssParameter name="stroke-dasharray">6 4</CssParameter> + </Stroke> </LineSymbolizer> <TextSymbolizer> ===================================== client/runner/src/main/i18n/translations/client-runner_en_GB.properties ===================================== @@ -729,7 +729,9 @@ observe.ui.datasource.editor.content.map.miles=miles observe.ui.datasource.editor.content.map.north=North observe.ui.datasource.editor.content.map.observation.points.not.valid=Observation - Number of none displayed points\: %d observe.ui.datasource.editor.content.map.showLogbook=Show Logbook data +observe.ui.datasource.editor.content.map.showLogbookTripSegment=Logbook - Show trip segments observe.ui.datasource.editor.content.map.showObservation=Show Observation data +observe.ui.datasource.editor.content.map.showObservationsTripSegment=Observation - Show trip segments observe.ui.datasource.editor.content.map.south=South observe.ui.datasource.editor.content.map.waitLoading=Please wait while loading the map observe.ui.datasource.editor.content.map.west=West ===================================== client/runner/src/main/i18n/translations/client-runner_es_ES.properties ===================================== @@ -729,7 +729,9 @@ observe.ui.datasource.editor.content.map.miles=milles observe.ui.datasource.editor.content.map.north=Norte observe.ui.datasource.editor.content.map.observation.points.not.valid=Observation - Number of none displayed points\: %d \#TODO observe.ui.datasource.editor.content.map.showLogbook=Show Logbook data \#TODO +observe.ui.datasource.editor.content.map.showLogbookTripSegment=Logbook - Show trip segments \#TODO observe.ui.datasource.editor.content.map.showObservation=Show Observation data \#TODO +observe.ui.datasource.editor.content.map.showObservationsTripSegment=Observation - Show trip segments \#TODO observe.ui.datasource.editor.content.map.south=Sur observe.ui.datasource.editor.content.map.waitLoading=Espere mientras que el mapa se está cargando observe.ui.datasource.editor.content.map.west=Oeste ===================================== client/runner/src/main/i18n/translations/client-runner_fr_FR.properties ===================================== @@ -729,7 +729,9 @@ observe.ui.datasource.editor.content.map.miles=milles observe.ui.datasource.editor.content.map.north=Nord observe.ui.datasource.editor.content.map.observation.points.not.valid=Observation - Nombre de points non affichés \: %d observe.ui.datasource.editor.content.map.showLogbook=Voir les données Livre de bord +observe.ui.datasource.editor.content.map.showLogbookTripSegment=Livre de bord - Voir le trajet observe.ui.datasource.editor.content.map.showObservation=Voir les données Observation +observe.ui.datasource.editor.content.map.showObservationsTripSegment=Observation - Voir le trajet observe.ui.datasource.editor.content.map.south=Sud observe.ui.datasource.editor.content.map.waitLoading=Veuillez patienter pendant le chargement de la carte observe.ui.datasource.editor.content.map.west=Ouest ===================================== core/api/dto/src/main/java/fr/ird/observe/dto/data/TripMapConfigDto.java ===================================== @@ -39,10 +39,14 @@ public class TripMapConfigDto extends AbstractJavaBean implements JsonAware { public static final String PROPERTY_TRIP_ID = "tripId"; public static final String PROPERTY_ADD_OBSERVATIONS = "addObservations"; + public static final String PROPERTY_ADD_OBSERVATIONS_TRIP_SEGMENT = "addObservationsTripSegment"; public static final String PROPERTY_ADD_LOGBOOK = "addLogbook"; + public static final String PROPERTY_ADD_LOGBOOK_TRIP_SEGMENT = "addLogbookTripSegment"; private String tripId; private boolean addObservations; private boolean addLogbook; + private boolean addLogbookTripSegment; + private boolean addObservationsTripSegment; public String getTripId() { return tripId; @@ -74,6 +78,26 @@ public class TripMapConfigDto extends AbstractJavaBean implements JsonAware { firePropertyChange(PROPERTY_ADD_LOGBOOK, oldValue, addLogbook); } + public boolean isAddLogbookTripSegment() { + return addLogbookTripSegment; + } + + public void setAddLogbookTripSegment(boolean addLogbookTripSegment) { + boolean oldValue = isAddLogbookTripSegment(); + this.addLogbookTripSegment = addLogbookTripSegment; + firePropertyChange(PROPERTY_ADD_LOGBOOK_TRIP_SEGMENT, oldValue, addLogbookTripSegment); + } + + public boolean isAddObservationsTripSegment() { + return addObservationsTripSegment; + } + + public void setAddObservationsTripSegment(boolean addObservationsTripSegment) { + boolean oldValue = isAddObservationsTripSegment(); + this.addObservationsTripSegment = addObservationsTripSegment; + firePropertyChange(PROPERTY_ADD_OBSERVATIONS_TRIP_SEGMENT, oldValue, addObservationsTripSegment); + } + @Override public String toString() { return new StringJoiner(", ", TripMapConfigDto.class.getSimpleName() + "[", "]") View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f5d247789bfb78dda53318a5… -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/compare/f5d247789bfb78dda53318a5… You're receiving this email because of your account on gitlab.com.

1 0