Lock file maintenance

Reviewed-on: #87

.github/workflows/build.yml

@@ -32,7 +32,7 @@ jobs:
           gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch keystore.asc > app/keystore.properties
           gpg -d --passphrase "${{ secrets.RELEASE_KEYSTORE_PASSWORD }}" --batch key.asc > app/key.jks          
 
-      - uses: gradle/wrapper-validation-action@v2
+      - uses: gradle/wrapper-validation-action@v3
 
       - name: create and checkout branch
         if: github.event_name == 'pull_request'
@@ -48,17 +48,17 @@ jobs:
           cache: 'gradle'
 
       - name: Build APK
-        run: ./gradlew assemble
-
-      # - name: Upload APK
-      #   uses: actions/upload-artifact@v4
-      #   with:
-      #     name: app.apk
-      #     path: app/build/outputs/apk/release/app-release.apk
+        run: ./gradlew assembleSignedRelease
 
       - name: Release
         uses: softprops/action-gh-release@v2
         if: startsWith(github.ref, 'refs/tags/')
         with:
           files: |
-            app/build/outputs/apk/release/app-release.apk   
+            app/build/outputs/apk/signedRelease/app-signedRelease.apk
+          prerelease: |
+            if [[ ${{ github.ref }} =~ ^refs/tags/[0-9]+\.[0-9]+[a-z]+$ ]]; then
+              echo "false"
+            else
+              echo "true"
+            fi

LICENSE

@@ -0,0 +1,674 @@
+                    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) 2024  Frédéric Gerber
+
+    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) 2024  Frédéric Gerber
+    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>.

README.md

@@ -8,8 +8,8 @@
   <img src="https://forthebadge.com/images/badges/built-for-android.svg" alt="Built for Android">
   <img src="https://forthebadge.com/images/badges/built-with-love.svg" alt="Built with love">
   <br>
-    <a href="https://github.com/choelzl/beans/actions/workflows/build.yml">
-    <img src="https://github.com/choelzl/beans/actions/workflows/build.yml/badge.svg?branch=main" alt="Build Status">
+    <a href="https://github.com/helcel-net/beans/actions/workflows/build.yml">
+    <img src="https://github.com/helcel-net/beans/actions/workflows/build.yml/badge.svg?branch=main" alt="Build Status">
   </a>
 </div>
 
@@ -18,9 +18,10 @@
 <div align="center">
   <table>
     <tr>
-      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/launcher.jpg" alt="Launcher" style="width: 100%; height: 100%;"></td>
-      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/view.jpg" alt="View" style="width: 100%; height: 100%;"></td>
-      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/edit.jpg" alt="Edit" style="width: 100%; height: 100%;"></td>
+      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/screenshot01.png" alt="Map" style="width: 100%; height: 100%;"></td>
+      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/screenshot02.png" alt="Edit" style="width: 100%; height: 100%;"></td>
+      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/screenshot03.png" alt="Statistics" style="width: 100%; height: 100%;"></td>
+      <td style="width: 33%; height: 100px;"><img src="./metadata/en-US/images/phoneScreenshots/screenshot04.png" alt="Settings" style="width: 100%; height: 100%;"></td>
     </tr>
   </table>
 </div>
@@ -30,17 +31,26 @@
 - Color a map of places based on custom labels
 - Country/State based coloring
 - Single/Multi color modes
+- Different map projections available
 - Small & Fast
 - Statistics (WIP)
+- 100% Free and Open Source software, with no proprietary dependencies
 
 ## 📳 Installation
 
 <div style="display: flex; justify-content: center; align-items: center; flex-direction: row;">
-    <a href="https://github.com/choelzl/beans/releases/latest">
+    <!--<a href="https://f-droid.org/packages/net.helcel.beans/">
+        <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png" alt="Get it on F-Droid" width="206">
+    </a>-->
+    <a href="https://apt.izzysoft.de/fdroid/index/apk/net.helcel.beans">
+        <img width="200" height="80" alt="Izzy Download" src=".github/images/izzy.png">
+    </a>
+    <a href="https://github.com/helcel-net/beans/releases/latest">
         <img width="200" height="84" alt="APK Download" src=".github/images/apk.png">
     </a>
 </div>
 
+
 ## ⚙️ Permissions
 
 None
@@ -61,7 +71,18 @@ Thanks to all contributors, the developers of our dependencies, and our users.
 ## 📝 License
 
 ```
-Copyright (C) 2024 Helcel
+Copyright (C) 2024 Helcel & MYDOLI
 
-Licensed under ???
-```
+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/>.
+```

app/build.gradle

@@ -1,13 +1,10 @@
 plugins {
     id 'com.android.application'
     id 'org.jetbrains.kotlin.android'
-    id 'org.jetbrains.kotlin.plugin.serialization' version '1.9.23'
-    id 'com.mikepenz.aboutlibraries.plugin' version '11.1.1'
+    id 'org.jetbrains.kotlin.plugin.serialization' version '2.1.0'
+    id 'com.mikepenz.aboutlibraries.plugin' version '11.4.0'
 }
 
-def keystorePropertiesFile = rootProject.file("app/keystore.properties")
-def keystoreProperties = new Properties()
-keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
 
 android {
     namespace 'net.helcel.beans'
@@ -17,25 +14,40 @@ android {
         applicationId 'net.helcel.beans'
         minSdk 28
         targetSdk 34
-        versionCode 1
-        versionName "0.1a"
+        versionCode 2
+        versionName "1.0b"
     }
-
     signingConfigs {
         create("release") {
-            keyAlias keystoreProperties['keyAlias']
-            keyPassword keystoreProperties['keyPassword']
-            storeFile file(keystoreProperties['storeFile'])
-            storePassword keystoreProperties['storePassword']
+            try {
+                def keystorePropertiesFile = rootProject.file("app/keystore.properties")
+                def keystoreProperties = new Properties()
+                keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
+
+                keyAlias keystoreProperties['keyAlias']
+                keyPassword keystoreProperties['keyPassword']
+                storeFile file(keystoreProperties['storeFile'])
+                storePassword keystoreProperties['storePassword']
+            } catch (FileNotFoundException e) {
+                println("File not found: ${e.message}")
+            }
         }
     }
 
 
     buildTypes {
+        debug {
+            debuggable true
+        }
         release {
             minifyEnabled true
             shrinkResources false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+        signedRelease {
+            minifyEnabled true
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
             signingConfig = signingConfigs.getByName("release")
         }
     }
@@ -65,16 +77,17 @@ android {
 }
 aboutLibraries {
     exclusionPatterns = [~"androidx.*", ~"com.google.android.*", ~"org.jetbrains.*"]
+    configPath = "config"
+    excludeFields = ["generated"]
 }
 
 dependencies {
-    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.1.4'
     implementation 'androidx.preference:preference-ktx:1.2.1'
-    implementation 'com.google.android.material:material:1.11.0'
-    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.6.3'
+    implementation 'com.google.android.material:material:1.12.0'
+    implementation 'org.jetbrains.kotlinx:kotlinx-serialization-json:1.8.0'
 
     implementation 'com.caverock:androidsvg-aar:1.4'
     implementation 'com.github.chrisbanes:PhotoView:2.3.0'
-    implementation "com.github.AppDevNext:AndroidChart:3.1.0.21"
-    implementation 'com.mikepenz:aboutlibraries:11.1.1'
+    implementation 'com.mikepenz:aboutlibraries:11.4.0'
 }

app/src/main/AndroidManifest.xml

@@ -1,23 +1,25 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
+    xmlns:tools="http://schemas.android.com/tools"
+    android:versionCode="2"
+    android:versionName="1.0c">
 
     <application
-        android:hardwareAccelerated="false"
         android:allowBackup="true"
         android:dataExtractionRules="@xml/data_extraction_rules"
         android:fullBackupContent="@xml/backup_rules"
-        android:icon="@mipmap/ic_launcher"
+        android:hardwareAccelerated="false"
+        android:icon="@mipmap/ic_launcher_round"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/Theme.Beans"
-        tools:targetApi="31"
         tools:replace="android:allowBackup"
-        >
-        <profileable android:shell="true"/>
+        tools:targetApi="31">
+        <profileable android:shell="true" />
+
         <activity
             android:name=".activity.MainActivity"
-            android:exported="true" >
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
@@ -25,21 +27,21 @@
         </activity>
         <activity
             android:name=".activity.EditActivity"
-            android:exported="true" >
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
         <activity
-            android:name=".activity.StatActivity"
-            android:exported="true" >
+            android:name=".activity.StatsActivity"
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
         </activity>
         <activity
             android:name=".activity.SettingsActivity"
-            android:exported="true" >
+            android:exported="true">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>

app/src/main/assets/geoloc_state.txt

@@ -32,7 +32,8 @@ AFG_TK|AFG|Takhar|12361
 AFG_OZ|AFG|Uruzgan|12900
 AFG_VR|AFG|Wardak|8945
 AFG_ZB|AFG|Zabul|17375
-XAD_NA|XAD|Dhekelia|125
+XAD_Akrotiri|XAD|Akrotiri|109
+XAD_Dhekelia|XAD|Dhekelia|125
 ALA_AR|ALA|Archipelago|448
 ALA_CO|ALA|Countryside|1022
 ALA_MH|ALA|Mariehamn|13
@@ -49,8 +50,8 @@ ALB_SD|ALB|Shkodër|3507
 ALB_TI|ALB|Tiranë|1638
 ALB_VR|ALB|Vlorë|2648
 DZA_AR|DZA|Adrar|433285
-DZA_AD|DZA|AïnDefla|4557
-DZA_AT|DZA|AïnTémouchent|2405
+DZA_AD|DZA|Aïn Defla|4557
+DZA_AT|DZA|Aïn Témouchent|2405
 DZA_AL|DZA|Alger|769
 DZA_AN|DZA|Annaba|1413
 DZA_BT|DZA|Batna|12167
@@ -106,7 +107,7 @@ AND_EN|AND|Encamp|68
 AND_EE|AND|Escaldes-Engordany|47
 AND_MA|AND|La Massana|68
 AND_OR|AND|Ordino|79
-AND_JL|AND|Sant Juliàde Lòria|65
+AND_JL|AND|Sant Julià de Lòria|65
 AGO_BO|AGO|Bengo|34586
 AGO_BG|AGO|Benguela|39748
 AGO_BI|AGO|Bié|72491
@@ -126,14 +127,17 @@ AGO_NA|AGO|Namibe|58240
 AGO_UI|AGO|Uíge|62425
 AGO_ZA|AGO|Zaire|36821
 AIA_BP|AIA|Blowing Point|5
-AIA_NA|AIA|Sombrero Island|0
+AIA_DogIsland|AIA|Dog Island|2
 AIA_EE|AIA|East End|5
 AIA_GH|AIA|George Hill|7
 AIA_IH|AIA|Island Harbour|6
 AIA_NH|AIA|North Hill|1
 AIA_NS|AIA|North Side|9
+AIA_PriclyPearCays|AIA|Pricly Pear Cays|0
 AIA_SG|AIA|Sandy Ground|1
 AIA_SH|AIA|Sandy Hill|7
+AIA_ScrubIsland|AIA|Scrub Island|4
+AIA_SombreroIsland|AIA|Sombrero Island|0
 AIA_SO|AIA|South Hill|7
 AIA_ST|AIA|Stoney Ground|7
 AIA_TF|AIA|The Farrington|5
@@ -152,7 +156,7 @@ ARG_BA|ARG|Buenos Aires|307606
 ARG_CT|ARG|Catamarca|101718
 ARG_CC|ARG|Chaco|100177
 ARG_CH|ARG|Chubut|224436
-ARG_DF|ARG|Ciudadde Buenos Aires|212
+ARG_DF|ARG|Ciudad de Buenos Aires|212
 ARG_CB|ARG|Córdoba|165143
 ARG_CN|ARG|Corrientes|89281
 ARG_ER|ARG|Entre Ríos|78238
@@ -163,14 +167,14 @@ ARG_LR|ARG|La Rioja|91415
 ARG_MZ|ARG|Mendoza|149125
 ARG_MN|ARG|Misiones|30098
 ARG_NQ|ARG|Neuquén|94649
-ARG_RN|ARG|RíoNegro|202737
+ARG_RN|ARG|Río Negro|202737
 ARG_SA|ARG|Salta|155883
 ARG_SJ|ARG|San Juan|89103
 ARG_SL|ARG|San Luis|76041
 ARG_SC|ARG|Santa Cruz|242689
 ARG_SF|ARG|Santa Fe|133534
-ARG_SE|ARG|Santiagodel Estero|137431
-ARG_TF|ARG|Tierradel Fuego|20841
+ARG_SE|ARG|Santiago del Estero|137431
+ARG_TF|ARG|Tierra del Fuego|20841
 ARG_TM|ARG|Tucumán|22628
 ARM_AG|ARM|Aragatsotn|2884
 ARM_AR|ARM|Ararat|2227
@@ -183,7 +187,7 @@ ARM_SH|ARM|Shirak|2987
 ARM_SU|ARM|Syunik|4504
 ARM_TV|ARM|Tavush|2521
 ARM_VD|ARM|Vayots Dzor|2316
-AUS_AS|AUS|Ashmoreand Cartier Islands|18
+AUS_AS|AUS|Ashmore and Cartier Islands|18
 AUS_AC|AUS|Australian Capital Territory|2364
 AUS_CR|AUS|Coral Sea Islands Territory|7
 AUS_JB|AUS|Jervis Bay Territory|68
@@ -203,8 +207,16 @@ AUT_ST|AUT|Steiermark|16408
 AUT_TR|AUT|Tirol|12646
 AUT_VO|AUT|Vorarlberg|2602
 AUT_WI|AUT|Wien|415
-AZE_NA|AZE|Yukhari-Karabakh|7407
+AZE_Absheron|AZE|Absheron|6147
+AZE_Aran|AZE|Aran|21914
+AZE_Daglig-Shirvan|AZE|Daglig-Shirvan|5989
+AZE_Ganja-Qazakh|AZE|Ganja-Qazakh|12044
+AZE_Kalbajar-Lachin|AZE|Kalbajar-Lachin|5770
 AZE_LA|AZE|Lankaran|5592
+AZE_Nakhchivan|AZE|Nakhchivan|5400
+AZE_Quba-Khachmaz|AZE|Quba-Khachmaz|7339
+AZE_Shaki-Zaqatala|AZE|Shaki-Zaqatala|8729
+AZE_Yukhari-Karabakh|AZE|Yukhari-Karabakh|7407
 BHS_AK|BHS|Acklins|496
 BHS_BR|BHS|Berry Islands|61
 BHS_BI|BHS|Biminis|34
@@ -213,7 +225,7 @@ BHS_CI|BHS|Cat Island|371
 BHS_CB|BHS|Central Abaco|712
 BHS_CN|BHS|Central Andros|1216
 BHS_CE|BHS|Central Eleuthera|70
-BHS_FP|BHS|Cityof Freeport|25
+BHS_FP|BHS|City of Freeport|25
 BHS_CK|BHS|Crooked Island|334
 BHS_EB|BHS|East Grand Bahama|580
 BHS_EM|BHS|Exuma|348
@@ -224,7 +236,7 @@ BHS_IN|BHS|Inagua|1688
 BHS_LI|BHS|Long Island|481
 BHS_MC|BHS|Mangrove Cay|489
 BHS_MG|BHS|Mayaguana|290
-BHS_MI|BHS|Moore'sIsland|21
+BHS_MI|BHS|Moore's Island|21
 BHS_NW|BHS|New Providence|231
 BHS_NB|BHS|North Abaco|219
 BHS_NN|BHS|North Andros|2876
@@ -266,7 +278,9 @@ BLR_HR|BLR|Grodno|24952
 BLR_MI|BLR|Minsk|2255
 BLR_MA|BLR|Mogilev|28984
 BLR_VI|BLR|Vitebsk|40056
-BEL_NA|BEL|Wallonie|16827
+BEL_Bruxelles|BEL|Bruxelles|156
+BEL_Vlaanderen|BEL|Vlaanderen|13685
+BEL_Wallonie|BEL|Wallonie|16827
 BLZ_BZ|BLZ|Belize|3372
 BLZ_CY|BLZ|Cayo|5322
 BLZ_CZ|BLZ|Corozal|2012
@@ -291,7 +305,7 @@ BMU_HC|BMU|Hamilton Municipality|1
 BMU_PA|BMU|Paget|6
 BMU_PE|BMU|Pembroke|7
 BMU_SC|BMU|Saint George's|10
-BMU_SG|BMU|Saint Georgemunicipality|2
+BMU_SG|BMU|Saint George municipality|2
 BMU_SA|BMU|Sandys|9
 BMU_SM|BMU|Smiths|5
 BMU_SO|BMU|Southampton|6
@@ -365,18 +379,22 @@ BRA_PB|BRA|Paraíba|56838
 BRA_PR|BRA|Paraná|200198
 BRA_PE|BRA|Pernambuco|98705
 BRA_PI|BRA|Piauí|253394
-BRA_RJ|BRA|Riode Janeiro|43962
-BRA_RN|BRA|Rio Grandedo Norte|53165
-BRA_RS|BRA|Rio Grandedo Sul|282688
+BRA_RJ|BRA|Rio de Janeiro|43962
+BRA_RN|BRA|Rio Grande do Norte|53165
+BRA_RS|BRA|Rio Grande do Sul|282688
 BRA_RO|BRA|Rondônia|238929
 BRA_RR|BRA|Roraima|225857
 BRA_SC|BRA|Santa Catarina|96032
-BRA_SP|BRA|SãoPaulo|249417
+BRA_SP|BRA|São Paulo|249417
 BRA_SE|BRA|Sergipe|22079
 BRA_TO|BRA|Tocantins|279170
-VGB_NA|VGB|Virgin Gorda|28
+VGB_Anegada|VGB|Anegada|40
+VGB_JostVanDyke|VGB|Jost Van Dyke|11
+VGB_OtherIslands|VGB|Other Islands|14
+VGB_Tortola|VGB|Tortola|76
+VGB_VirginGorda|VGB|Virgin Gorda|28
 BRN_BE|BRN|Belait|2863
-BRN_BM|BRN|Bruneiand Muara|533
+BRN_BM|BRN|Brunei and Muara|533
 BRN_TE|BRN|Temburong|1283
 BRN_TU|BRN|Tutong|1136
 BGR_BL|BGR|Blagoevgrad|6611
@@ -445,11 +463,11 @@ KHM_KS|KHM|Kâmpóng Spœ|7014
 KHM_KT|KHM|Kâmpóng Thum|12907
 KHM_KP|KHM|Kâmpôt|4752
 KHM_KN|KHM|Kândal|3274
-KHM_KK|KHM|KaôhKong|11076
+KHM_KK|KHM|Kaôh Kong|11076
 KHM_KH|KHM|Krâchéh|12057
 KHM_PL|KHM|Krong Pailin|1082
 KHM_KA|KHM|Krong Preah Sihanouk|2651
-KHM_MK|KHM|MôndólKiri|13747
+KHM_MK|KHM|Môndól Kiri|13747
 KHM_OC|KHM|Otdar Mean Chey|6672
 KHM_PP|KHM|Phnom Penh|689
 KHM_PO|KHM|Pouthisat|12588
@@ -493,18 +511,18 @@ CPV_PN|CPV|Porto Novo|581
 CPV_PC|CPV|Praia|103
 CPV_RB|CPV|Ribeira Brava|237
 CPV_RG|CPV|Ribeira Grande|168
-CPV_RS|CPV|Ribeira Grandede Santiago|142
+CPV_RS|CPV|Ribeira Grande de Santiago|142
 CPV_SL|CPV|Sal|225
 CPV_CT|CPV|Santa Catarinado Fogo|55
 CPV_CZ|CPV|Santa Cruz|116
-CPV_SD|CPV|SãoDomingos|159
-CPV_FP|CPV|SãoFilipe|340
-CPV_LO|CPV|SãoLourençodosÓrgãos|36
-CPV_SM|CPV|SãoMiguel|81
-CPV_SS|CPV|SãoSalvadordo Mundo|31
-CPV_SV|CPV|SãoVicente|271
+CPV_SD|CPV|São Domingos|159
+CPV_FP|CPV|São Filipe|340
+CPV_LO|CPV|São Lourenço dos Órgãos|36
+CPV_SM|CPV|São Miguel|81
+CPV_SS|CPV|São Salvadordo Mundo|31
+CPV_SV|CPV|São Vicente|271
 CPV_TF|CPV|Tarrafal|120
-CPV_TS|CPV|Tarrafalde SãoNicolau|115
+CPV_TS|CPV|Tarrafal de São Nicolau|115
 CYM_BT|CYM|Bodden Town|8
 CYM_EE|CYM|East End|56
 CYM_GT|CYM|George Town|29
@@ -549,13 +567,13 @@ TCD_SA|TCD|Salamat|68389
 TCD_SI|TCD|Sila|35924
 TCD_TA|TCD|Tandjilé|17645
 TCD_TI|TCD|Tibesti|126795
-TCD_NJ|TCD|Villede N'Djamena|399
+TCD_NJ|TCD|Ville de N'Djamena|399
 TCD_BI|TCD|Wadi Fira|54434
 CHL_AN|CHL|Antofagasta|126678
 CHL_AR|CHL|Araucanía|31844
 CHL_AP|CHL|Aricay Parinacota|16931
 CHL_AT|CHL|Atacama|75995
-CHL_AI|CHL|Ayséndel General Ibañezdel Cam|106476
+CHL_AI|CHL|Aysén del General Ibañez del Cam|106476
 CHL_BI|CHL|Bío-Bío|24032
 CHL_CO|CHL|Coquimbo|40711
 CHL_LI|CHL|Libertador General Bernardo O'Hi|16389
@@ -604,7 +622,7 @@ COL_AM|COL|Amazonas|109901
 COL_AN|COL|Antioquia|63337
 COL_AR|COL|Arauca|23888
 COL_AT|COL|Atlántico|3336
-COL_DC|COL|BogotáD.C.|1646
+COL_DC|COL|Bogotá D.C.|1646
 COL_BL|COL|Bolívar|26790
 COL_BY|COL|Boyacá|23235
 COL_CL|COL|Caldas|7454
@@ -622,21 +640,31 @@ COL_LG|COL|La Guajira|20580
 COL_MA|COL|Magdalena|22912
 COL_ME|COL|Meta|85947
 COL_NA|COL|Nariño|31546
-COL_NS|COL|Nortede Santander|22077
+COL_NS|COL|Norte de Santander|22077
 COL_PU|COL|Putumayo|26063
 COL_QD|COL|Quindío|1947
 COL_RI|COL|Risaralda|3562
-COL_SA|COL|San Andrésy Providencia|52
+COL_SA|COL|San Andrés y Providencia|52
 COL_ST|COL|Santander|30788
 COL_SU|COL|Sucre|10787
 COL_TO|COL|Tolima|24131
-COL_VC|COL|Valledel Cauca|21034
+COL_VC|COL|Valle del Cauca|21034
 COL_VP|COL|Vaupés|53546
 COL_VD|COL|Vichada|100014
 COM_MO|COM|Mwali|220
 COM_GC|COM|Njazídja|1028
 COM_AN|COM|Nzwani|436
-COK_NA|COK|Rarotonga|70
+COK_Aitutaki|COK|Aitutaki|28
+COK_Atiu|COK|Atiu|31
+COK_Mangaia|COK|Mangaia|49
+COK_Manihiki|COK|Manihiki|8
+COK_Mauke|COK|Mauke|20
+COK_Mitiaro|COK|Mitiaro|25
+COK_Palmerston|COK|Palmerston|24
+COK_Penhryn|COK|Penhryn|17
+COK_Pukapuka|COK|Pukapuka|6
+COK_Rakahanga|COK|Rakahanga|5
+COK_Rarotonga|COK|Rarotonga|70
 CRI_AL|CRI|Alajuela|9834
 CRI_CA|CRI|Cartago|3113
 CRI_GU|CRI|Guanacaste|10250
@@ -682,18 +710,18 @@ HRV_ZG|HRV|Zagrebačka|2395
 CUB_CM|CUB|Camagüey|15816
 CUB_CA|CUB|CiegodeÁvila|7393
 CUB_CF|CUB|Cienfuegos|4019
-CUB_CH|CUB|Ciudaddela Habana|822
+CUB_CH|CUB|Ciudad de la Habana|822
 CUB_GR|CUB|Granma|8700
 CUB_GU|CUB|Guantánamo|6187
 CUB_HO|CUB|Holguín|8738
-CUB_IJ|CUB|Isladela Juventud|2519
+CUB_IJ|CUB|Isla de la Juventud|2519
 CUB_LH|CUB|La Habana|1964
 CUB_LT|CUB|Las Tunas|6583
 CUB_MA|CUB|Matanzas|11741
 CUB_MQ|CUB|Mayabeque|3692
-CUB_PR|CUB|Pinardel Río|11079
+CUB_PR|CUB|Pinar del Río|11079
 CUB_SS|CUB|Sancti Spíritus|6401
-CUB_SC|CUB|Santiagode Cuba|6441
+CUB_SC|CUB|Santiago de Cuba|6441
 CUB_VC|CUB|Villa Clara|9161
 CYP_FA|CYP|Famagusta|204
 CYP_LA|CYP|Larnaca|915
@@ -774,7 +802,7 @@ DOM_AL|DOM|La Altagracia|3119
 DOM_EP|DOM|La Estrelleta|1432
 DOM_RO|DOM|La Romana|561
 DOM_VE|DOM|La Vega|2257
-DOM_MT|DOM|MaríaTrinidad Sánchez|1238
+DOM_MT|DOM|María Trinidad Sánchez|1238
 DOM_MN|DOM|Monseñor Nouel|977
 DOM_MC|DOM|Monte Cristi|1956
 DOM_MP|DOM|Monte Plata|2604
@@ -784,9 +812,9 @@ DOM_PP|DOM|Puerto Plata|1900
 DOM_SC|DOM|Salcedo|426
 DOM_SM|DOM|Samaná|864
 DOM_CR|DOM|San Cristóbal|1217
-DOM_JO|DOM|San Joséde Ocoa|853
+DOM_JO|DOM|San José de Ocoa|853
 DOM_JU|DOM|San Juan|3347
-DOM_PM|DOM|San Pedrode Macorís|1270
+DOM_PM|DOM|San Pedro de Macorís|1270
 DOM_SZ|DOM|Sánchez Ramírez|1183
 DOM_ST|DOM|Santiago|2786
 DOM_SR|DOM|Santiago Rodríguez|1150
@@ -812,7 +840,7 @@ ECU_OR|ECU|Orellana|21738
 ECU_PA|ECU|Pastaza|29671
 ECU_PI|ECU|Pichincha|9512
 ECU_SE|ECU|Santa Elena|3720
-ECU_SD|ECU|Santo Domingodelos Tsachilas|3803
+ECU_SD|ECU|Santo Domingo de los Tsachilas|3803
 ECU_SU|ECU|Sucumbios|18069
 ECU_TU|ECU|Tungurahua|3405
 ECU_ZC|ECU|Zamora Chinchipe|10605
@@ -878,7 +906,7 @@ EST_JN|EST|Jõgeva|2597
 EST_LN|EST|Lääne|2420
 EST_LV|EST|Lääne-Viru|3478
 EST_PR|EST|Pärnu|4796
-EST_NA|EST|Peipsi|1758
+EST_Peipsi|EST|Peipsi|1758
 EST_PL|EST|Põlva|2161
 EST_RA|EST|Rapla|2971
 EST_SA|EST|Saare|2932
@@ -916,7 +944,7 @@ FIN_LS|FIN|Western Finland|89423
 FRA_AR|FRA|Auvergne-Rhône-Alpes|71204
 FRA_BF|FRA|Bourgogne-Franche-Comté|48033
 FRA_BT|FRA|Bretagne|27609
-FRA_CN|FRA|Centre-Valde Loire|39509
+FRA_CN|FRA|Centre-Val de Loire|39509
 FRA_CE|FRA|Corse|8750
 FRA_AO|FRA|Grand Est|57666
 FRA_NC|FRA|Hauts-de-France|31945
@@ -924,17 +952,17 @@ FRA_IF|FRA|Île-de-France|12058
 FRA_ND|FRA|Normandie|30143
 FRA_AC|FRA|Nouvelle-Aquitaine|84800
 FRA_LP|FRA|Occitanie|73302
-FRA_PL|FRA|Paysdela Loire|32365
-FRA_PR|FRA|Provence-Alpes-Côted'Azur|31952
+FRA_PL|FRA|Pays de la Loire|32365
+FRA_PR|FRA|Provence-Alpes-Côte d'Azur|31952
 GUF_CY|GUF|Cayenne|42886
 GUF_SL|GUF|Saint-Laurent-du-Maroni|40970
 PYF_TI|PYF|Îles Australes|373
-PYF_WI|PYF|Îlesdu Vent|1216
+PYF_WI|PYF|Îles du Vent|1216
 PYF_MI|PYF|Îles Marquises|996
 PYF_LI|PYF|Îles Sous-le-Vent|429
 PYF_TG|PYF|Îles Tuamotu-Gambier|1039
 ATF_CR|ATF|Îles Crozet|372
-ATF_NA|ATF|ÎlesÉparses|44
+ATF_ÎlesÉparses|ATF|Îles Éparses|44
 ATF_AS|ATF|Îles Saint Paulet Amsterdam|64
 ATF_KG|ATF|Kerguelen|7372
 GAB_ES|GAB|Estuaire|20024
@@ -1001,8 +1029,8 @@ GRC_MA|GRC|Athos|338
 GRC_AT|GRC|Attica|3853
 GRC_CR|GRC|Crete|8391
 GRC_EM|GRC|Epirusand Western Macedonia|18771
-GRC_MH|GRC|Macedoniaand Thrace|33122
-GRC_PW|GRC|Peloponnese, Western Greeceand|29194
+GRC_MH|GRC|Macedonia and Thrace|33122
+GRC_PW|GRC|Peloponnese, Western Greece and the Ionian|29194
 GRC_TC|GRC|Thessalyand Central Greece|29744
 GRL_KU|GRL|Kujalleq|45647
 GRL_UO|GRL|Northeast Greenland National Par|919384
@@ -1071,9 +1099,14 @@ GGY_SV|GGY|Saint Saviour|6
 GGY_SK|GGY|Sark|7
 GGY_TV|GGY|Torteval|3
 GGY_VA|GGY|Vale|10
-GIN_NA|GIN|Nzérékoré|36751
+GIN_Boké|GIN|Boké|34287
 GIN_C|GIN|Conakry|423
+GIN_Faranah|GIN|Faranah|35989
 GIN_K|GIN|Kankan|72197
+GIN_Kindia|GIN|Kindia|25816
+GIN_Labé|GIN|Labé|22959
+GIN_Mamou|GIN|Mamou|17935
+GIN_Nzérékoré|GIN|Nzérékoré|36751
 GNB_BA|GNB|Bafatá|5881
 GNB_BM|GNB|Biombo|761
 GNB_BS|GNB|Bissau|83
@@ -1113,7 +1146,7 @@ HND_EP|HND|El Paraíso|7417
 HND_FM|HND|Francisco Morazán|8606
 HND_GD|HND|Graciasa Dios|16439
 HND_IN|HND|Intibucá|3167
-HND_IB|HND|Islasdela Bahía|233
+HND_IB|HND|Islas de la Bahía|233
 HND_LP|HND|La Paz|2463
 HND_LE|HND|Lempira|4277
 HND_OC|HND|Ocotepeque|1704
@@ -1155,7 +1188,7 @@ IND_AS|IND|Assam|78810
 IND_BR|IND|Bihar|94631
 IND_CH|IND|Chandigarh|118
 IND_CT|IND|Chhattisgarh|136109
-IND_DN|IND|Dadraand Nagar Haveli|494
+IND_DN|IND|Dadra and Nagar Haveli|494
 IND_DD|IND|Damanand Diu|84
 IND_GA|IND|Goa|3717
 IND_GJ|IND|Gujarat|186600
@@ -1171,7 +1204,7 @@ IND_MN|IND|Manipur|22420
 IND_ML|IND|Meghalaya|22612
 IND_MZ|IND|Mizoram|21350
 IND_NL|IND|Nagaland|16668
-IND_DL|IND|NC Tof Delhi|1508
+IND_DL|IND|NCT of Delhi|1508
 IND_OR|IND|Odisha|156427
 IND_PY|IND|Puducherry|550
 IND_PB|IND|Punjab|50386
@@ -1298,7 +1331,7 @@ IMN_MC|IMN|Michael|34
 IMN_MD|IMN|Santon|16
 IMN_GR|IMN|Garff|72
 IMN_GB|IMN|Peel|2
-ISR_NA|ISR|Golan|1238
+ISR_Golan|ISR|Golan|1238
 ISR_HD|ISR|Ha Darom|14557
 ISR_HA|ISR|Haifa|887
 ISR_HM|ISR|Ha Merkaz|1243
@@ -1323,7 +1356,7 @@ ITA_19|ITA|Sicily|25787
 ITA_52|ITA|Toscana|23025
 ITA_32|ITA|Trentino-Alto Adige|13591
 ITA_55|ITA|Umbria|8456
-ITA_23|ITA|Valled'Aosta|3248
+ITA_23|ITA|Valle d'Aosta|3248
 ITA_34|ITA|Veneto|17893
 JAM_CL|JAM|Clarendon|1210
 JAM_HA|JAM|Hanover|457
@@ -1471,10 +1504,13 @@ KEN_UG|KEN|Uasin Gishu|3453
 KEN_VI|KEN|Vihiga|562
 KEN_WJ|KEN|Wajir|57017
 KEN_WP|KEN|West Pokot|9574
-XKO_NA|XKO|Uroševac|1056
+XKO_Đakovica|XKO|Đakovica|1109
+XKO_Gnjilane|XKO|Gnjilane|1360
 XKO_KM|XKO|Kosovska Mitrovica|2070
 XKO_PE|XKO|Pećki|1357
+XKO_Pristina|XKO|Pristina|2175
 XKO_PZ|XKO|Prizren|1715
+XKO_Uroševac|XKO|Uroševac|1056
 KWT_AH|KWT|Al Ahmadi|4659
 KWT_FA|KWT|Al Farwaniyah|219
 KWT_JA|KWT|Al Jahrah|12438
@@ -1501,8 +1537,8 @@ LAO_OU|LAO|Oudômxai|11832
 LAO_PH|LAO|Phôngsali|15414
 LAO_SL|LAO|Saravan|10238
 LAO_SV|LAO|Savannakhét|21546
-LAO_VI|LAO|Vientiane|12590
-LAO_VT|LAO|Vientiane[prefecture]|3639
+LAO_VI|LAO|Vientiane Province|12590
+LAO_VT|LAO|Vientiane Prefecture|3639
 LAO_XA|LAO|Xaignabouri|15691
 LAO_XS|LAO|Xaisômboun|7778
 LAO_XE|LAO|Xékong|8414
@@ -1512,15 +1548,22 @@ LVA_L|LVA|Latgale|14678
 LVA_R|LVA|Riga|10324
 LVA_V|LVA|Vidzeme|15240
 LVA_Z|LVA|Zemgale|10775
-LBN_NA|LBN|South|919
+LBN_Akkar|LBN|Akkar|793
+LBN_Baalbak-Hermel|LBN|Baalbak-Hermel|2854
+LBN_Beirut|LBN|Beirut|21
+LBN_Bekaa|LBN|Bekaa|1408
+LBN_MountLebanon|LBN|Mount Lebanon|1990
+LBN_Nabatiyeh|LBN|Nabatiyeh|1099
+LBN_North|LBN|North|1181
+LBN_South|LBN|South|919
 LSO_BE|LSO|Berea|1999
 LSO_BB|LSO|Butha-Buthe|1796
 LSO_LE|LSO|Leribe|2829
 LSO_MF|LSO|Mafeteng|2659
 LSO_MS|LSO|Maseru|3781
-LSO_MH|LSO|Mohale'sHoek|3451
+LSO_MH|LSO|Mohale's Hoek|3451
 LSO_MK|LSO|Mokhotlong|4184
-LSO_QN|LSO|Qacha'sNek|2131
+LSO_QN|LSO|Qacha's Nek|2131
 LSO_QT|LSO|Quthing|2974
 LSO_TT|LSO|Thaba-Tseka|4849
 LBR_BM|LBR|Bomi|2122
@@ -1570,7 +1613,7 @@ LIE_SN|LIE|Schaan|28
 LIE_SB|LIE|Schellenberg|3
 LIE_TN|LIE|Triesen|26
 LIE_TB|LIE|Triesenberg|29
-LIE_VA|LIE|Valduz|17
+LIE_VA|LIE|Vaduz|17
 LTU_AS|LTU|Alytaus|5624
 LTU_KS|LTU|Kauno|8156
 LTU_KP|LTU|Klaipedos|5363
@@ -1607,7 +1650,7 @@ MKD_DK|MKD|Demir Kapija|314
 MKD_DE|MKD|Dolneni|410
 MKD_GB|MKD|Gazi Baba|102
 MKD_GV|MKD|Gevgelija|438
-MKD_GP|MKD|GjorčePetrov|70
+MKD_GP|MKD|Gjorče Petrov|70
 MKD_GT|MKD|Gostivar|524
 MKD_GR|MKD|Gradsko|282
 MKD_IL|MKD|Ilinden|95
@@ -1624,7 +1667,7 @@ MKD_KZ|MKD|Kriva Palanka|508
 MKD_KG|MKD|Krivogaštani|95
 MKD_KS|MKD|Kruševo|183
 MKD_UM|MKD|Kumanovo|503
-MKD_NA|MKD|Staro Nagoričane|438
+MKD_LakeOhrid|MKD|Lake Ohrid|247
 MKD_LI|MKD|Lipkovo|265
 MKD_LO|MKD|Lozovo|161
 MKD_MK|MKD|Makedonska Kamenica|198
@@ -1647,6 +1690,7 @@ MKD_RM|MKD|Rosoman|133
 MKD_AJ|MKD|Saraj|234
 MKD_SS|MKD|Sopište|214
 MKD_SD|MKD|Star Dojran|150
+MKD_NA|MKD|Staro Nagoričane|438
 MKD_ST|MKD|Štip|565
 MKD_UG|MKD|Struga|475
 MKD_RU|MKD|Strumitsa|320
@@ -1669,7 +1713,7 @@ MDG_D|MDG|Antsiranana|44120
 MDG_F|MDG|Fianarantsoa|101276
 MDG_M|MDG|Mahajanga|152526
 MDG_A|MDG|Toamasina|71636
-MDG_NA|MDG|Toliary|164809
+MDG_Toliary|MDG|Toliary|164809
 MWI_BA|MWI|Balaka|2143
 MWI_BL|MWI|Blantyre|2038
 MWI_CK|MWI|Chikwawa|4908
@@ -1728,9 +1772,29 @@ MLT_GO|MLT|Għawdex|71
 MLT_SO|MLT|Nofsinhar|78
 MLT_NO|MLT|Tramuntana|116
 MLT_SE|MLT|Xlokk|36
-MHL_NA|MHL|NA|26
+MHL_Ailinglaplap|MHL|Ailinglaplap|18
+MHL_Ailuk|MHL|Ailuk|11
+MHL_Arno|MHL|Arno|28
+MHL_Aur|MHL|Aur|6
+MHL_Ebon|MHL|Ebon|8
+MHL_Enewetok|MHL|Enewetok|16
+MHL_Jabat|MHL|Jabat|1
+MHL_Jaluit|MHL|Jaluit|13
 MHL_KWA|MHL|Kwajalein|27
+MHL_Lae|MHL|Lae|3
+MHL_Lib|MHL|Lib|1
+MHL_Likiep|MHL|Likiep|13
 MHL_MAJ|MHL|Majuro|22
+MHL_Maloelap|MHL|Maloelap|12
+MHL_Mejit|MHL|Mejit|4
+MHL_Mili|MHL|Mili|27
+MHL_Namorik|MHL|Namorik|5
+MHL_Namu|MHL|Namu|7
+MHL_Ujae|MHL|Ujae|3
+MHL_Utirik|MHL|Utirik|14
+MHL_Wotho|MHL|Wotho|6
+MHL_Wotje|MHL|Wotje|15
+MHL_19_1|MHL|Rongelap|26
 MTQ_FF|MTQ|Fort-de-France|189
 MTQ_MA|MTQ|Le Marin|393
 MTQ_TR|MTQ|Le Trinité|353
@@ -1896,7 +1960,7 @@ MAR_FB|MAR|Fès-Boulemane|19366
 MAR_GB|MAR|Gharb-Chrarda-Béni Hssen|8782
 MAR_GC|MAR|Grand Casablanca|879
 MAR_GE|MAR|Guelmim-Es-Semara|64701
-MAR_LB|MAR|Laâyoune-Boujdour-Sakia El H|5763
+MAR_LB|MAR|Laâyoune-Boujdour-Sakia El Hamra|5763
 MAR_MK|MAR|Marrakech-Tensift-Al Haouz|32483
 MAR_MT|MAR|Meknès-Tafilalet|60303
 MAR_OR|MAR|Oriental|59914
@@ -1968,22 +2032,24 @@ NLD_FL|NLD|Flevoland|1466
 NLD_FR|NLD|Fryslân|3573
 NLD_GE|NLD|Gelderland|5102
 NLD_GR|NLD|Groningen|2370
-NLD_SH|NLD|Zuid-Holland|3143
+NLD_IJsselmeer|NLD|IJsselmeer|1995
 NLD_LI|NLD|Limburg|2159
 NLD_NB|NLD|Noord-Brabant|5082
 NLD_NH|NLD|Noord-Holland|2872
 NLD_OV|NLD|Overijssel|3369
 NLD_UT|NLD|Utrecht|1555
 NLD_ZE|NLD|Zeeland|1804
+NLD_Zeeuwsemeren|NLD|Zeeuwsemeren|477
+NLD_14_1|NLD|Zuid-Holland|3143
 NCL_IL|NCL|Îles Loyauté|1988
 NCL_NO|NCL|Nord|9520
 NCL_SU|NCL|Sud|7408
 NZL_AU|NZL|Auckland|4958
-NZL_BP|NZL|Bayof Plenty|12293
+NZL_BP|NZL|Bay of Plenty|12293
 NZL_CA|NZL|Canterbury|48152
 NZL_CI|NZL|Chatham Islands|798
 NZL_GI|NZL|Gisborne|8369
-NZL_HB|NZL|Hawke'sBay|12790
+NZL_HB|NZL|Hawke's Bay|12790
 NZL_MW|NZL|Manawatu-Wanganui|21998
 NZL_MA|NZL|Marlborough|10491
 NZL_NE|NZL|Nelson|425
@@ -2013,7 +2079,7 @@ NIC_MN|NIC|Managua|4628
 NIC_MS|NIC|Masaya|607
 NIC_MT|NIC|Matagalpa|8856
 NIC_NS|NIC|Nueva Segovia|3142
-NIC_SJ|NIC|RíoSan Juan|7345
+NIC_SJ|NIC|Río San Juan|7345
 NIC_RI|NIC|Rivas|1909
 NER_AG|NER|Agadez|626771
 NER_DF|NER|Diffa|147076
@@ -2067,13 +2133,18 @@ PRK_WB|PRK|Hwanghae-bukto|8248
 PRK_WN|PRK|Hwanghae-namdo|8563
 PRK_KS|PRK|Kaesŏng|1182
 PRK_KW|PRK|Kangwŏn-do|10286
-PRK_NA|PRK|Sinŭiju|109
+PRK_Kumgangsan|PRK|Kumgangsan|987
 PRK_PB|PRK|P'yŏngan-bukto|12424
 PRK_PN|PRK|P'yŏngan-namdo|12479
 PRK_PY|PRK|P'yŏngyang|2718
 PRK_NJ|PRK|Rasŏn|856
 PRK_YG|PRK|Ryanggang|13935
-ZNC_NA|ZNC|Nicosia|522
+PRK_Sinŭiju|PRK|Sinŭiju|109
+ZNC_Gazimağusa|ZNC|Gazimağusa|927
+ZNC_Girne|ZNC|Girne|677
+ZNC_Güzelyurt|ZNC|Güzelyurt|346
+ZNC_Iskele|ZNC|Iskele|849
+ZNC_Nicosia|ZNC|Nicosia|522
 MNP_NI|MNP|Northern Islands|181
 MNP_RO|MNP|Rota|90
 MNP_SA|MNP|Saipan|123
@@ -2131,7 +2202,7 @@ PLW_NW|PLW|Ngiwal|18
 PLW_SO|PLW|Sonsorol|3
 PSE_GZ|PSE|Gaza|344
 PSE_WE|PSE|West Bank|5895
-PAN_BC|PAN|Bocasdel Toro|4718
+PAN_BC|PAN|Bocas del Toro|4718
 PAN_CH|PAN|Chiriquí|6676
 PAN_CC|PAN|Coclé|4939
 PAN_CL|PAN|Colón|4711
@@ -2142,7 +2213,7 @@ PAN_SB|PAN|Kuna Yala|2554
 PAN_LS|PAN|Los Santos|3819
 PAN_NB|PAN|Ngöbe Buglé|6649
 PAN_PN|PAN|Panamá|8843
-PAN_PO|PAN|PanamáOeste|3066
+PAN_PO|PAN|Panamá Oeste|3066
 PAN_VR|PAN|Veraguas|10980
 PNG_NS|PNG|Bougainville|9470
 PNG_CE|PNG|Central|29630
@@ -2201,7 +2272,7 @@ PER_LB|PER|Lambayeque|14380
 PER_LR|PER|Lima|32537
 PER_LP|PER|Lima Province|2722
 PER_LO|PER|Loreto|377948
-PER_MD|PER|Madrede Dios|84858
+PER_MD|PER|Madre de Dios|84858
 PER_MQ|PER|Moquegua|15844
 PER_PA|PER|Pasco|24123
 PER_PI|PER|Piura|36095
@@ -2211,8 +2282,8 @@ PER_TA|PER|Tacna|16085
 PER_TU|PER|Tumbes|4673
 PER_UC|PER|Ucayali|105741
 PHL_AB|PHL|Abra|3992
-PHL_AN|PHL|Agusandel Norte|3013
-PHL_AS|PHL|Agusandel Sur|8641
+PHL_AN|PHL|Agusan del Norte|3013
+PHL_AS|PHL|Agusan del Sur|8641
 PHL_AK|PHL|Aklan|1673
 PHL_AL|PHL|Albay|2529
 PHL_AQ|PHL|Antique|2753
@@ -2236,8 +2307,8 @@ PHL_CT|PHL|Catanduanes|1482
 PHL_CV|PHL|Cavite|1251
 PHL_CB|PHL|Cebu|4912
 PHL_CL|PHL|Compostela Valley|4277
-PHL_DV|PHL|Davaodel Norte|3511
-PHL_DS|PHL|Davaodel Sur|6091
+PHL_DV|PHL|Davao del Norte|3511
+PHL_DS|PHL|Davao del Sur|6091
 PHL_DO|PHL|Davao Oriental|5158
 PHL_DI|PHL|Dinagat Islands|813
 PHL_ES|PHL|Eastern Samar|4304
@@ -2250,8 +2321,8 @@ PHL_IB|PHL|Isabela|10340
 PHL_KA|PHL|Kalinga|2914
 PHL_LU|PHL|La Union|1470
 PHL_LG|PHL|Laguna|2713
-PHL_LN|PHL|Lanaodel Norte|2859
-PHL_LS|PHL|Lanaodel Sur|3904
+PHL_LN|PHL|Lanao del Norte|2859
+PHL_LS|PHL|Lanao del Sur|3904
 PHL_LE|PHL|Leyte|5595
 PHL_MG|PHL|Maguindanao|4817
 PHL_MQ|PHL|Marinduque|934
@@ -2283,12 +2354,12 @@ PHL_SC|PHL|South Cotabato|4375
 PHL_SL|PHL|Southern Leyte|1694
 PHL_SK|PHL|Sultan Kudarat|4478
 PHL_SU|PHL|Sulu|1562
-PHL_SN|PHL|Surigaodel Norte|2110
-PHL_SS|PHL|Surigaodel Sur|4335
+PHL_SN|PHL|Surigao del Norte|2110
+PHL_SS|PHL|Surigao del Sur|4335
 PHL_TR|PHL|Tarlac|3032
 PHL_TT|PHL|Tawi-Tawi|1183
-PHL_ZN|PHL|Zamboangadel Norte|6433
-PHL_ZS|PHL|Zamboangadel Sur|5329
+PHL_ZN|PHL|Zamboanga del Norte|6433
+PHL_ZS|PHL|Zamboanga del Sur|5329
 PHL_ZY|PHL|Zamboanga Sibugay|2733
 POL_02|POL|Dolnośląskie|19878
 POL_04|POL|Kujawsko-Pomorskie|17940
@@ -2318,7 +2389,7 @@ PRT_FA|PRT|Faro|4975
 PRT_GU|PRT|Guarda|5541
 PRT_LE|PRT|Leiria|3501
 PRT_LI|PRT|Lisboa|2765
-PRT_NA|PRT|Madeira|801
+PRT_Madeira|PRT|Madeira|801
 PRT_PA|PRT|Portalegre|6091
 PRT_PO|PRT|Porto|2332
 PRT_SA|PRT|Santarém|6725
@@ -2386,7 +2457,7 @@ PRI_PN|PRI|Peñuelas|118
 PRI_PO|PRI|Ponce|307
 PRI_QB|PRI|Quebradillas|60
 PRI_RC|PRI|Rincón|37
-PRI_RG|PRI|RíoGrande|158
+PRI_RG|PRI|Río Grande|158
 PRI_SB|PRI|Sabana Grande|94
 PRI_SA|PRI|Salinas|185
 PRI_SG|PRI|San Germán|140
@@ -2482,7 +2553,7 @@ RUS_CN|RUS|Chechnya|15154
 RUS_CL|RUS|Chelyabinsk|88739
 RUS_CK|RUS|Chukot|716435
 RUS_CV|RUS|Chuvash|18377
-RUS_SP|RUS|Cityof St.Petersburg|2039
+RUS_SP|RUS|City of St.Petersburg|2039
 RUS_DA|RUS|Dagestan|49446
 RUS_GA|RUS|Gorno-Altay|92910
 RUS_IN|RUS|Ingush|3228
@@ -2511,7 +2582,7 @@ RUS_LP|RUS|Lipetsk|24425
 RUS_MG|RUS|Magadan|459480
 RUS_ME|RUS|Mariy-El|23468
 RUS_MR|RUS|Mordovia|26161
-RUS_NA|RUS|Moscow City|1095
+RUS_MoscowCity|RUS|Moscow City|1095
 RUS_MS|RUS|Moskva|46592
 RUS_MM|RUS|Murmansk|142851
 RUS_NN|RUS|Nenets|175502
@@ -2557,7 +2628,8 @@ RWA_SU|RWA|Amajyepfo|5997
 RWA_ES|RWA|Iburasirazuba|9530
 RWA_OU|RWA|Iburengerazuba|5910
 RWA_KV|RWA|Umujyiwa Kigali|733
-BLM_NA|BLM|Sousle Vent|8
+BLM_AuVent|BLM|Au Vent|13
+BLM_SousleVent|BLM|Sous le Vent|8
 SHN_AC|SHN|Ascension|100
 SHN_SH|SHN|Saint Helena|124
 SHN_TA|SHN|Tristanda Cunha|189
@@ -2614,7 +2686,7 @@ SMR_MG|SMR|Montegiardino|3
 SMR_SM|SMR|San Marino|7
 SMR_SE|SMR|Serravalle|10
 STP_PR|STP|Príncipe|145
-STP_ST|STP|SãoTomé|864
+STP_ST|STP|São Tomé|864
 SAU_AS|SAU|'Asir|77398
 SAU_BA|SAU|Al Bahah|10566
 SAU_HS|SAU|Al Hududash Shamaliyah|104147
@@ -2697,7 +2769,11 @@ SLE_EA|SLE|Eastern|15846
 SLE_NO|SLE|Northern|36238
 SLE_SO|SLE|Southern|20261
 SLE_WE|SLE|Western|722
-SGP_NA|SGP|West|230
+SGP_Central|SGP|Central|133
+SGP_East|SGP|East|103
+SGP_North|SGP|North|131
+SGP_North-East|SGP|North-East|103
+SGP_West|SGP|West|230
 SVK_BC|SVK|Banskobystrický|9565
 SVK_BL|SVK|Bratislavský|2015
 SVK_KI|SVK|Košický|6768
@@ -2708,7 +2784,7 @@ SVK_TA|SVK|Trnavský|4125
 SVK_ZI|SVK|Žilinský|6828
 SVN_GO|SVN|Gorenjska|2117
 SVN_SP|SVN|Goriška|2277
-SVN_NA|SVN|Jugovzhodna Slovenija|2635
+SVN_JugovzhodnaSlovenija|SVN|Jugovzhodna Slovenija|2635
 SVN_KO|SVN|Koroška|1032
 SVN_NO|SVN|Notranjsko-kraška|1452
 SVN_JP|SVN|Obalno-kraška|945
@@ -2789,17 +2865,17 @@ ESP_CM|ESP|Castilla-La Mancha|79561
 ESP_CL|ESP|Castillay León|94291
 ESP_CT|ESP|Cataluña|32133
 ESP_ML|ESP|Ceutay Melilla|29
-ESP_MD|ESP|Comunidadde Madrid|8036
-ESP_NA|ESP|Comunidad Foralde Navarra|10362
+ESP_MD|ESP|Comunidad de Madrid|8036
+ESP_NA|ESP|Comunidad Foral de Navarra|10362
 ESP_VC|ESP|Comunidad Valenciana|23290
 ESP_EX|ESP|Extremadura|41695
 ESP_GA|ESP|Galicia|29622
 ESP_PM|ESP|Islas Baleares|5036
 ESP_CN|ESP|Islas Canarias|7540
 ESP_LO|ESP|La Rioja|5053
-ESP_PV|ESP|PaísVasco|7237
-ESP_AS|ESP|Principadode Asturias|10607
-ESP_MU|ESP|Regiónde Murcia|11337
+ESP_PV|ESP|País Vasco|7237
+ESP_AS|ESP|Principado de Asturias|10607
+ESP_MU|ESP|Región de Murcia|11337
 LKA_AP|LKA|Ampara|4513
 LKA_AD|LKA|Anuradhapura|7253
 LKA_BD|LKA|Badulla|2887
@@ -2926,7 +3002,7 @@ TWN_TG|TWN|Taichung|2254
 TWN_TN|TWN|Tainan|2236
 TWN_TP|TWN|Taipei|279
 TWN_TA|TWN|Taiwan|26568
-TJK_RR|TJK|Districtsof Republican Subordin|28383
+TJK_RR|TJK|Districts of Republican Subordin|28383
 TJK_DU|TJK|Dushanbe|169
 TJK_BK|TJK|Gorno-Badakhshan|63429
 TJK_KL|TJK|Khatlon|23925
@@ -3072,7 +3148,7 @@ TTO_DM|TTO|Diego Martin|142
 TTO_MR|TTO|Mayaro/Rio Claro|792
 TTO_PD|TTO|Penal-Debe|246
 TTO_PF|TTO|Point Fortin|29
-TTO_PS|TTO|Portof Spain|14
+TTO_PS|TTO|Port of Spain|14
 TTO_PT|TTO|Princes Town|619
 TTO_SF|TTO|San Fernando|20
 TTO_SL|TTO|San Juan-Laventille|216
@@ -3191,7 +3267,12 @@ TKM_BA|TKM|Balkan|136605
 TKM_DA|TKM|Daşoguz|76751
 TKM_LE|TKM|Lebap|96478
 TKM_MA|TKM|Mary|86353
-TCA_NA|TCA|South Caicosand East Caicos|247
+TCA_GrandTurk|TCA|Grand Turk|20
+TCA_MiddleCaicos|TCA|Middle Caicos|306
+TCA_NorthCaicos|TCA|North Caicos|259
+TCA_ProvidencialesandWestCaicos|TCA|Providenciales and West Caicos|152
+TCA_SaltCay|TCA|Salt Cay|11
+TCA_SouthCaicosandEastCaicos|TCA|South Caicos and East Caicos|247
 TUV_FN|TUV|Funafuti|7
 TUV_NG|TUV|Nanumanga|3
 TUV_NA|TUV|Nanumea|4
@@ -3231,7 +3312,8 @@ UGA_TG|UGA|Kitgum|9621
 UGA_KF|UGA|Kotido|13366
 UGA_KU|UGA|Kumi|2867
 UGA_KJ|UGA|Kyenjojo|4125
-UGA_NA|UGA|Nakasongola|3536
+UGA_LakeAlbert|UGA|Lake Albert|3212
+UGA_LakeVictoria|UGA|Lake Victoria|28585
 UGA_LA|UGA|Lira|7285
 UGA_LW|UGA|Luwero|5734
 UGA_MA|UGA|Masaka|3643
@@ -3245,6 +3327,7 @@ UGA_MI|UGA|Mpigi|3321
 UGA_MD|UGA|Mubende|6242
 UGA_MN|UGA|Mukono|3434
 UGA_NP|UGA|Nakapiripirit|5859
+UGA_NA|UGA|Nakasongola|3536
 UGA_NE|UGA|Nebbi|2910
 UGA_NT|UGA|Ntungamo|2068
 UGA_PD|UGA|Pader|6905
@@ -3257,7 +3340,6 @@ UGA_SR|UGA|Soroti|3401
 UGA_TR|UGA|Tororo|1863
 UGA_WA|UGA|Wakiso|1944
 UGA_YU|UGA|Yumbe|2337
-UKR_?|UKR|?|136
 UKR_CK|UKR|Cherkasy|20922
 UKR_CH|UKR|Chernihiv|32416
 UKR_CV|UKR|Chernivtsi|8202
@@ -3269,7 +3351,7 @@ UKR_KK|UKR|Kharkiv|31388
 UKR_KS|UKR|Kherson|25534
 UKR_KM|UKR|Khmel'nyts'kyy|20718
 UKR_KV|UKR|Kiev|28073
-UKR_KC|UKR|Kiev City|695
+UKR_KC|UKR|Kiev City|831
 UKR_KH|UKR|Kirovohrad|24713
 UKR_LV|UKR|L'viv|21773
 UKR_LH|UKR|Luhans'k|27042
@@ -3295,7 +3377,7 @@ ARE_UQ|ARE|Ummal-Qaywayn|746
 GBR_NIR|GBR|Northern Ireland|14134
 GBR_SCT|GBR|Scotland|78704
 GBR_WLS|GBR|Wales|20818
-GBR_NA|GBR|NA|130659
+GBR_1_1|GBR|England|130659
 USA_AL|USA|Alabama|133995
 USA_AK|USA|Alaska|1501231
 USA_AZ|USA|Arizona|296082
@@ -3304,7 +3386,7 @@ USA_CA|USA|California|410314
 USA_CO|USA|Colorado|270116
 USA_CT|USA|Connecticut|12902
 USA_DE|USA|Delaware|5304
-USA_DC|USA|Districtof Columbia|166
+USA_DC|USA|District of Columbia|166
 USA_FL|USA|Florida|147978
 USA_GA|USA|Georgia|152863
 USA_HI|USA|Hawaii|16809
@@ -3347,7 +3429,15 @@ USA_WA|USA|Washington|174789
 USA_WV|USA|West Virginia|62782
 USA_WI|USA|Wisconsin|169315
 USA_WY|USA|Wyoming|253420
-UMI_NA|UMI|Wake|9
+UMI_Baker|UMI|Baker|2
+UMI_Howland|UMI|Howland|2
+UMI_Jarvisisland|UMI|Jarvis island|5
+UMI_Johnston|UMI|Johnston|5
+UMI_KingmanReef|UMI|Kingman Reef|3
+UMI_Midway|UMI|Midway|12
+UMI_Navassa|UMI|Navassa|5
+UMI_Palmyra|UMI|Palmyra|4
+UMI_Wake|UMI|Wake|9
 URY_AR|URY|Artigas|12058
 URY_CA|URY|Canelones|4536
 URY_CL|URY|Cerro Largo|13843
@@ -3359,7 +3449,7 @@ URY_LA|URY|Lavalleja|10055
 URY_MA|URY|Maldonado|4819
 URY_MO|URY|Montevideo|533
 URY_PA|URY|Paysandú|14141
-URY_RN|URY|RíoNegro|9727
+URY_RN|URY|Río Negro|9727
 URY_RV|URY|Rivera|9358
 URY_RO|URY|Rocha|10965
 URY_SA|URY|Salto|14226
@@ -3388,87 +3478,93 @@ VUT_SE|VUT|Shefa|1522
 VUT_TF|VUT|Tafea|1666
 VUT_TR|VUT|Torba|889
 VEN_Z|VEN|Amazonas|184052
-VEN_NA|VEN|Vargas|1002
+VEN_Anzoátegui|VEN|Anzoátegui|48025
 VEN_C|VEN|Apure|74003
 VEN_D|VEN|Aragua|6977
 VEN_E|VEN|Barinas|36436
+VEN_Bolívar|VEN|Bolívar|241518
 VEN_G|VEN|Carabobo|4812
 VEN_H|VEN|Cojedes|14572
 VEN_Y|VEN|Delta Amacuro|40278
 VEN_DP|VEN|Dependencias Federales|343
 VEN_A|VEN|Distrito Capital|329
+VEN_Falcón|VEN|Falcón|27275
+VEN_Guárico|VEN|Guárico|67685
 VEN_K|VEN|Lara|19166
+VEN_Mérida|VEN|Mérida|12914
 VEN_M|VEN|Miranda|8623
 VEN_N|VEN|Monagas|29251
 VEN_O|VEN|Nueva Esparta|1039
 VEN_P|VEN|Portuguesa|19622
 VEN_R|VEN|Sucre|10950
+VEN_Táchira|VEN|Táchira|10851
 VEN_T|VEN|Trujillo|8129
+VEN_Vargas|VEN|Vargas|1002
 VEN_U|VEN|Yaracuy|6259
 VEN_V|VEN|Zulia|44191
 VNM_AG|VNM|An Giang|3547
-VNM_BV|VNM|BàRịa-Vũng Tàu|1918
-VNM_BG|VNM|BắcGiang|3913
-VNM_BK|VNM|BắcKạn|4885
-VNM_BL|VNM|BạcLiêu|2495
-VNM_BN|VNM|BắcNinh|825
-VNM_BR|VNM|BếnTre|2354
-VNM_BD|VNM|BìnhĐịnh|6102
+VNM_BV|VNM|Bà Rịa-Vũng Tàu|1918
+VNM_BG|VNM|Bắc Giang|3913
+VNM_BK|VNM|Bắc Kạn|4885
+VNM_BL|VNM|Bạc Liêu|2495
+VNM_BN|VNM|Bắc Ninh|825
+VNM_BR|VNM|Bến Tre|2354
+VNM_BD|VNM|Bình Định|6102
 VNM_BI|VNM|Bình Dương|2709
 VNM_BP|VNM|Bình Phước|6909
 VNM_BU|VNM|Bình Thuận|7994
-VNM_CM|VNM|CàMau|5201
-VNM_CN|VNM|CầnThơ|1448
+VNM_CM|VNM|Cà Mau|5201
+VNM_CN|VNM|Cần Thơ|1448
 VNM_CB|VNM|Cao Bằng|6729
-VNM_DA|VNM|ĐàNẵng|988
-VNM_DC|VNM|ĐắkLắk|13105
-VNM_DO|VNM|ĐắkNông|6550
-VNM_DB|VNM|ĐiệnBiên|9549
+VNM_DA|VNM|Đà Nẵng|988
+VNM_DC|VNM|Đắk Lắk|13105
+VNM_DO|VNM|Đắk Nông|6550
+VNM_DB|VNM|Điện Biên|9549
 VNM_DN|VNM|Đồng Nai|5899
 VNM_DT|VNM|Đồng Tháp|3410
 VNM_GL|VNM|Gia Lai|15610
-VNM_HG|VNM|HàGiang|7958
-VNM_HM|VNM|HàNam|867
-VNM_HI|VNM|HàNội|3374
-VNM_HT|VNM|HàTĩnh|6016
-VNM_HD|VNM|HảiDương|1679
-VNM_HP|VNM|HảiPhòng|1407
-VNM_HU|VNM|HậuGiang|1633
-VNM_HC|VNM|HồChíMinh|2122
-VNM_HO|VNM|HoàBình|4602
+VNM_HG|VNM|Hà Giang|7958
+VNM_HM|VNM|Hà Nam|867
+VNM_HI|VNM|Hà Nội|3374
+VNM_HT|VNM|Hà Tĩnh|6016
+VNM_HD|VNM|Hải Dương|1679
+VNM_HP|VNM|Hải Phòng|1407
+VNM_HU|VNM|Hậu Giang|1633
+VNM_HC|VNM|Hồ Chí Minh|2122
+VNM_HO|VNM|Hoà Bình|4602
 VNM_HY|VNM|Hưng Yên|931
 VNM_KH|VNM|Khánh Hòa|4870
-VNM_KG|VNM|KiênGiang|6327
+VNM_KG|VNM|Kiên Giang|6327
 VNM_KT|VNM|Kon Tum|9706
 VNM_LI|VNM|Lai Châu|9106
-VNM_LD|VNM|LâmĐồng|9846
+VNM_LD|VNM|Lâm Đồng|9846
 VNM_LS|VNM|Lạng Sơn|8344
-VNM_LO|VNM|LàoCai|6390
+VNM_LO|VNM|Lào Cai|6390
 VNM_LA|VNM|Long An|4518
-VNM_ND|VNM|NamĐịnh|1595
-VNM_NA|VNM|NghệAn|16562
+VNM_ND|VNM|Nam Định|1595
+VNM_NA|VNM|Nghệ An|16562
 VNM_NB|VNM|Ninh Bình|1351
 VNM_NT|VNM|Ninh Thuận|3382
-VNM_PT|VNM|PhúThọ|3555
-VNM_PY|VNM|PhúYên|5061
+VNM_PT|VNM|Phú Thọ|3555
+VNM_PY|VNM|Phú Yên|5061
 VNM_QB|VNM|Quảng Bình|8023
 VNM_QM|VNM|Quảng Nam|10634
 VNM_QG|VNM|Quảng Ngãi|5194
 VNM_QN|VNM|Quảng Ninh|6017
 VNM_QT|VNM|Quảng Trị|4639
-VNM_ST|VNM|SócTrăng|3303
-VNM_SL|VNM|SơnLa|14185
-VNM_TN|VNM|TâyNinh|4060
-VNM_TB|VNM|TháiBình|1620
-VNM_TY|VNM|TháiNguyên|3540
+VNM_ST|VNM|Sóc Trăng|3303
+VNM_SL|VNM|Sơn La|14185
+VNM_TN|VNM|Tây Ninh|4060
+VNM_TB|VNM|Thái Bình|1620
+VNM_TY|VNM|Thái Nguyên|3540
 VNM_TH|VNM|Thanh Hóa|11163
-VNM_TT|VNM|ThừaThiênHuế|5053
-VNM_TG|VNM|TiềnGiang|2421
-VNM_TV|VNM|TràVinh|2339
-VNM_TQ|VNM|TuyênQuang|5895
+VNM_TT|VNM|Thừa Thiên Huế|5053
+VNM_TG|VNM|Tiền Giang|2421
+VNM_TV|VNM|Trà Vinh|2339
+VNM_TQ|VNM|Tuyên Quang|5895
 VNM_VL|VNM|Vĩnh Long|1534
 VNM_VC|VNM|Vĩnh Phúc|1237
-VNM_YB|VNM|YênBái|6921
+VNM_YB|VNM|Yên Bái|6921
 VIR_SC|VIR|Saint Croix|222
 VIR_SJ|VIR|Saint John|53
 VIR_ST|VIR|Saint Thomas|89
@@ -3478,7 +3574,7 @@ WLF_UV|WLF|Uvéa|82
 ESH_BO|ESH|Boujdour|43588
 ESH_ES|ESH|Es Semara|67211
 ESH_LA|ESH|Laayoune|30514
-ESH_OD|ESH|Ouedel Dahab|127186
+ESH_OD|ESH|Oued el Dahab|127186
 YEM_AD|YEM|`Adan|730
 YEM_AB|YEM|Abyan|16406
 YEM_BA|YEM|Al Bayda'|9338
@@ -3531,5 +3627,4 @@ Z01_JK|IND|Jammuand Kashmir|104512
 Z05_UT|IND|Uttarakhand|259
 Z09_UT|IND|Uttarakhand|987
 Z06_JK|PAK|Azad Kashmir|13931
-Z06_NA|PAK|Gilgit-Baltistan|68053
-GBR_EN|GBR|England|417
+Z06_NA|PAK|Gilgit-Baltistan|68053

app/src/main/java/net/helcel/beans/activity/EditActivity.kt

@@ -1,15 +1,19 @@
 package net.helcel.beans.activity
 
 import android.os.Bundle
+import android.view.Menu
 import android.view.MenuItem
 import androidx.activity.addCallback
 import androidx.appcompat.app.AppCompatActivity
 import com.google.android.material.tabs.TabLayoutMediator
 import net.helcel.beans.R
 import net.helcel.beans.activity.adapter.ViewPagerAdapter
+import net.helcel.beans.activity.fragment.EditGroupAddFragment
 import net.helcel.beans.activity.fragment.EditPlaceFragment
 import net.helcel.beans.countries.World
 import net.helcel.beans.databinding.ActivityEditBinding
+import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.Settings
 import net.helcel.beans.helper.Theme.createActionBar
 
 
@@ -39,8 +43,25 @@ class EditActivity : AppCompatActivity() {
         }
     }
 
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        if (Settings.isSingleGroup(this)) {
+            menuInflater.inflate(R.menu.menu_edit, menu)
+        }
+        return true
+    }
+
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        finish()
+        when (item.itemId) {
+            R.id.action_color -> {
+                Data.groups.getUniqueEntry()?.let { group ->
+                    EditGroupAddFragment(group.key, {
+                        (_binding.pager.adapter as ViewPagerAdapter?)?.refreshColors(group.color)
+                    }, {}, false).show(supportFragmentManager, "AddColorDialogFragment")
+                }
+            }
+
+            else -> finish()
+        }
         return super.onOptionsItemSelected(item)
     }
 

app/src/main/java/net/helcel/beans/activity/MainActivity.kt

@@ -12,7 +12,6 @@ import net.helcel.beans.countries.GeoLocImporter
 import net.helcel.beans.databinding.ActivityMainBinding
 import net.helcel.beans.helper.Data
 import net.helcel.beans.helper.Settings
-import net.helcel.beans.helper.Theme.colorWrapper
 import net.helcel.beans.svg.CSSWrapper
 import net.helcel.beans.svg.SVGWrapper
 
@@ -24,6 +23,7 @@ class MainActivity : AppCompatActivity() {
     private lateinit var css: CSSWrapper
 
     override fun onRestart() {
+        refreshProjection()
         refreshMap()
         super.onRestart()
     }
@@ -36,7 +36,7 @@ class MainActivity : AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         val d = when (item.itemId) {
             R.id.action_edit -> EditActivity::class.java
-            R.id.action_stats -> StatActivity::class.java
+            R.id.action_stats -> StatsActivity::class.java
             R.id.action_settings -> SettingsActivity::class.java
             else -> throw Exception("Non Existent Menu Item")
         }
@@ -48,8 +48,6 @@ class MainActivity : AppCompatActivity() {
         super.onCreate(savedInstanceState)
         _binding = ActivityMainBinding.inflate(layoutInflater)
         Settings.start(this)
-        supportActionBar?.setBackgroundDrawable(colorWrapper(this, android.R.attr.colorPrimary))
-
 
         setContentView(_binding.root)
 
@@ -58,9 +56,8 @@ class MainActivity : AppCompatActivity() {
 
         GeoLocImporter.importStates(this)
         Data.loadData(this, Int.MIN_VALUE)
-        psvg = SVGWrapper(this)
-        css = CSSWrapper(this)
 
+        refreshProjection()
         refreshMap()
     }
 
@@ -70,4 +67,9 @@ class MainActivity : AppCompatActivity() {
         _binding.photoView.setImageDrawable(PictureDrawable(psvg.get()?.renderToPicture(opt)))
     }
 
+    fun refreshProjection() {
+        psvg = SVGWrapper(this)
+        css = CSSWrapper(this)
+    }
+
 }

app/src/main/java/net/helcel/beans/activity/StatActivity.kt

@@ -1,104 +0,0 @@
-package net.helcel.beans.activity
-
-import android.graphics.Color
-import android.os.Bundle
-import android.util.Log
-import android.view.MenuItem
-import androidx.appcompat.app.AppCompatActivity
-import com.github.mikephil.charting.charts.PieChart
-import com.github.mikephil.charting.data.PieData
-import com.github.mikephil.charting.data.PieDataSet
-import com.github.mikephil.charting.data.PieEntry
-import com.github.mikephil.charting.formatter.PercentFormatter
-import com.github.mikephil.charting.utils.MPPointF
-import net.helcel.beans.R
-import net.helcel.beans.countries.World
-import net.helcel.beans.helper.Data.groups
-import net.helcel.beans.helper.Data.visits
-import net.helcel.beans.helper.Theme.colorWrapper
-import net.helcel.beans.helper.Theme.createActionBar
-
-
-class StatActivity : AppCompatActivity() {
-
-    private lateinit var chart: PieChart
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-
-        setContentView(R.layout.activity_stat)
-        createActionBar(this, getString(R.string.action_stat))
-
-
-        chart = findViewById(R.id.chart)
-        chart.setUsePercentValues(true)
-        chart.description.isEnabled = false
-        chart.setExtraOffsets(5F, 10F, 5F, 5F)
-
-        chart.centerText = "Country Area"
-
-        chart.setDrawCenterText(true)
-        chart.isDrawHoleEnabled = true
-        chart.setTransparentCircleColor(Color.TRANSPARENT)
-        chart.setHoleColor(Color.TRANSPARENT)
-        chart.setCenterTextColor(colorWrapper(this, android.R.attr.colorForeground).color)
-        chart.setTransparentCircleAlpha(0)
-        chart.holeRadius = 40F
-        chart.transparentCircleRadius = 40F
-        chart.rotationAngle = 0F
-        chart.isRotationEnabled = false
-        chart.isHighlightPerTapEnabled = false
-
-        chart.legend.isEnabled = false
-
-        bind()
-    }
-
-    override fun onOptionsItemSelected(item: MenuItem): Boolean {
-        finish()
-        return super.onOptionsItemSelected(item)
-    }
-
-
-    private fun bind() {
-        val entries = ArrayList<PieEntry>()
-        val VIS_continents = World.WWW.children.groupBy { visits.getVisited(it) }
-            .map { Pair(it.key, it.value.map { c -> c.area }.fold(0) { acc, i -> acc + i }) }
-        val VIS_country =
-            World.WWW.children.map { it.children }.flatten().groupBy { visits.getVisited(it) }
-                .map { Pair(it.key, it.value.map { c -> c.area }.fold(0) { acc, i -> acc + i }) }
-        val vis = VIS_country
-        Log.d("VIS", vis.toString())
-        val max = vis.map { it.second }.fold(0) { acc, i -> acc + i }
-        vis.forEach {
-            entries.add(
-                PieEntry(
-                    it.second.toFloat().div(max.toFloat()),
-                    groups.getGroupFromKey(it.first).name
-                )
-            )
-        }
-        val dataSet = PieDataSet(entries, "GG1")
-
-        dataSet.valueTextColor = Color.BLACK
-        dataSet.sliceSpace = 3f
-        dataSet.iconsOffset = MPPointF(0f, 40f)
-        dataSet.selectionShift = 5f
-
-
-        dataSet.setDrawIcons(true)
-        dataSet.colors = vis.map { groups.getGroupFromKey(it.first).color.color }.toList()
-
-        val data = PieData(dataSet)
-        data.setDrawValues(false)
-        data.setValueFormatter(PercentFormatter())
-        data.setValueTextSize(11f)
-        data.setValueTextColor(Color.BLACK)
-        chart.setEntryLabelColor(Color.BLACK)
-        chart.data = data
-        chart.highlightValues(null)
-        chart.invalidate()
-    }
-
-
-}

app/src/main/java/net/helcel/beans/activity/StatsActivity.kt

@@ -0,0 +1,57 @@
+package net.helcel.beans.activity
+
+import android.os.Bundle
+import android.view.MenuItem
+import androidx.appcompat.app.AppCompatActivity
+import androidx.fragment.app.Fragment
+import androidx.recyclerview.widget.LinearLayoutManager
+import androidx.recyclerview.widget.RecyclerView
+import androidx.viewpager2.adapter.FragmentStateAdapter
+import androidx.viewpager2.widget.ViewPager2
+import com.google.android.material.tabs.TabLayoutMediator
+import net.helcel.beans.R
+import net.helcel.beans.activity.adapter.StatsListAdapter
+import net.helcel.beans.countries.GeoLoc.LocType
+import net.helcel.beans.databinding.ActivityStatBinding
+import net.helcel.beans.helper.Settings
+import net.helcel.beans.helper.Theme.createActionBar
+
+private val MODE_LIST = listOf(LocType.WORLD, LocType.COUNTRY, LocType.STATE)
+
+class StatsActivity : AppCompatActivity() {
+    private lateinit var _binding: ActivityStatBinding
+    private var activeMode = LocType.WORLD
+
+    override fun onCreate(savedInstanceState: Bundle?) {
+        super.onCreate(savedInstanceState)
+        _binding = ActivityStatBinding.inflate(layoutInflater)
+        setContentView(_binding.root)
+        createActionBar(this, getString(R.string.action_stat))
+
+        _binding.stats.layoutManager =
+            LinearLayoutManager(this, RecyclerView.VERTICAL, false)
+        val adapter = StatsListAdapter(_binding.stats, _binding.name)
+        _binding.groupColor.setOnClickListener { adapter.invertCountMode() }
+        _binding.stats.adapter = adapter
+
+        _binding.pager.adapter = object : FragmentStateAdapter(supportFragmentManager, lifecycle) {
+            override fun getItemCount(): Int = if (Settings.isRegional(applicationContext)) 3 else 2
+            override fun createFragment(position: Int): Fragment = Fragment()
+        }
+        TabLayoutMediator(_binding.tab, _binding.pager) { tab, position ->
+            tab.text = MODE_LIST[position].txt
+        }.attach()
+
+        _binding.pager.registerOnPageChangeCallback(object : ViewPager2.OnPageChangeCallback() {
+            override fun onPageSelected(position: Int) {
+                activeMode = MODE_LIST[position]
+                adapter.refreshMode(activeMode)
+            }
+        })
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        finish()
+        return super.onOptionsItemSelected(item)
+    }
+}

app/src/main/java/net/helcel/beans/activity/adapter/GeolocListAdapter.kt

@@ -3,39 +3,44 @@ package net.helcel.beans.activity.adapter
 import android.content.res.ColorStateList
 import android.graphics.Color
 import android.graphics.Typeface
+import android.graphics.drawable.ColorDrawable
 import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.checkbox.MaterialCheckBox
-import net.helcel.beans.R
 import net.helcel.beans.activity.fragment.EditPlaceColorFragment
 import net.helcel.beans.activity.fragment.EditPlaceFragment
 import net.helcel.beans.countries.GeoLoc
 import net.helcel.beans.databinding.ItemListGeolocBinding
-import net.helcel.beans.helper.Data
-import net.helcel.beans.helper.Settings
+import net.helcel.beans.helper.*
 import net.helcel.beans.helper.Theme.colorWrapper
 
 class GeolocListAdapter(
-    private val ctx: EditPlaceFragment, private val l: GeoLoc, private val pager: ViewPagerAdapter
+    private val ctx: EditPlaceFragment, private val l: GeoLoc, private val pager: ViewPagerAdapter,
+    private val parentHolder: FoldingListViewHolder?
 ) : RecyclerView.Adapter<GeolocListAdapter.FoldingListViewHolder>() {
 
+    private val sortedList = l.children.toList().sortedBy { it.fullName }
+    private val holders: MutableSet<FoldingListViewHolder> = mutableSetOf()
+
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): FoldingListViewHolder {
         val binding = ItemListGeolocBinding.inflate(
             LayoutInflater.from(viewGroup.context),
             viewGroup,
             false
         )
-        return FoldingListViewHolder(ctx.requireActivity(), binding)
+        val holder = FoldingListViewHolder(ctx.requireActivity(), binding, parentHolder, l)
+        holders.add(holder)
+        return holder
     }
 
     override fun onBindViewHolder(holder: FoldingListViewHolder, position: Int) {
-        val el = l.children[position]
+        val el = sortedList[position]
         holder.bind(el)
         holder.addListeners(el) {
             if (el.children.isNotEmpty())
-                pager.addFragment(ctx, EditPlaceFragment(el, pager))
+                pager.addFragment(ctx, EditPlaceFragment(el, pager, holder))
             true
         }
     }
@@ -44,23 +49,20 @@ class GeolocListAdapter(
         return l.children.size
     }
 
+    fun refreshColors(colorDrawable: ColorDrawable) {
+        holders.forEach { it.refreshColor(colorDrawable) }
+    }
+
     class FoldingListViewHolder(
         private val ctx: FragmentActivity,
-        private val _binding: ItemListGeolocBinding
-    ) : RecyclerView.ViewHolder(_binding.root) {
+        private val _binding: ItemListGeolocBinding,
+        private val _parentHolder: FoldingListViewHolder? = null,
+        private val _parentGeoLoc: GeoLoc,
+    ) : RecyclerView.ViewHolder(_binding.root), DialogCloser {
+        private lateinit var el: GeoLoc
 
         private fun bindGroup(el: GeoLoc) {
-            val numerator = el.children.map { Data.visits.getVisited(it) != 0 }.count { it }
-            val denominator = el.children.size
-
-            _binding.count.text = when (Settings.getStatPref(ctx)) {
-                ctx.getString(R.string.percentages) -> ctx.getString(
-                    R.string.percentage,
-                    (100 * (numerator.toFloat() / denominator.toFloat())).toInt()
-                )
-
-                else -> ctx.getString(R.string.rate, numerator, denominator)
-            }
+            refreshCount(el)
             _binding.textView.setTypeface(null, Typeface.BOLD)
             _binding.textView.backgroundTintList = ColorStateList.valueOf(
                 colorWrapper(
@@ -71,18 +73,27 @@ class GeolocListAdapter(
         }
 
         fun bind(el: GeoLoc) {
+            this.el = el
             _binding.textView.text = el.fullName
             _binding.textView.backgroundTintList =
                 ColorStateList.valueOf(colorWrapper(ctx, android.R.attr.colorBackground).color)
 
-            if (el.shouldShowChildren(ctx))
+            if (el.children.isNotEmpty())
                 bindGroup(el)
 
             refreshCheck(el)
         }
 
+        fun refreshColor(colorDrawable: ColorDrawable) {
+            if (Data.visits.getVisited(el) !in listOf(NO_GROUP, AUTO_GROUP)) {
+                _binding.checkBox.buttonTintList =
+                    ColorStateList.valueOf(colorDrawable.color)
+                refreshCheck(el)
+            }
+        }
+
         fun addListeners(el: GeoLoc, expandLambda: () -> Boolean) {
-            if (el.shouldShowChildren(ctx)) {
+            if (el.children.isNotEmpty()) {
                 _binding.textView.setOnClickListener { expandLambda() }
             }
             _binding.checkBox.setOnClickListener {
@@ -91,11 +102,11 @@ class GeolocListAdapter(
                     if (_binding.checkBox.isChecked) {
                         // If one has just checked the box (assign unique group)
                         Data.selected_group = Data.groups.getUniqueEntry()
-                        onColorDialogDismiss(false)
+                        onDialogDismiss(false)
                     } else {
                         // If one has just unchecked the box (unassign unique group)
                         Data.selected_group = null
-                        onColorDialogDismiss(true)
+                        onDialogDismiss(true)
                     }
                 } else {
                     Data.selected_group = null
@@ -104,39 +115,79 @@ class GeolocListAdapter(
                         "AddColorDialogFragment"
                     )
                 }
+                _parentHolder?.refresh(_parentGeoLoc)
             }
         }
 
-        fun onColorDialogDismiss(clear: Boolean) {
+        override fun onDialogDismiss(clear: Boolean) {
             if (clear) {
-                Data.visits.setVisited(Data.selected_geoloc, 0)
+                Data.visits.setVisited(Data.selected_geoloc, NO_GROUP)
                 Data.saveData()
+
+                if (_parentGeoLoc.children.all { Data.visits.getVisited(it) == NO_GROUP }) {
+                    Data.clearing_geoloc = _parentGeoLoc
+                }
             }
             if (Data.selected_group != null && Data.selected_geoloc != null) {
-                Data.visits.setVisited(Data.selected_geoloc, Data.selected_group?.key ?: 0)
+                Data.visits.setVisited(Data.selected_geoloc, Data.selected_group?.key ?: NO_GROUP)
                 Data.saveData()
             }
             Data.selected_geoloc?.let { refreshCheck(it) }
             Data.selected_geoloc = null
             Data.selected_group = null
+            _parentHolder?.refresh(_parentGeoLoc)
         }
 
         private fun refreshCheck(geoLoc: GeoLoc) {
+            _binding.checkBox.checkedState =
+                if (Data.visits.getVisited(geoLoc) !in listOf(NO_GROUP, AUTO_GROUP)) {
+                    MaterialCheckBox.STATE_CHECKED
+                } else if (geoLoc.children.isNotEmpty() &&
+                    geoLoc.children.all {
+                        Data.visits.getVisited(it) !in listOf(NO_GROUP, AUTO_GROUP)
+                    }
+                ) {
+                    Data.visits.setVisited(geoLoc, AUTO_GROUP)
+                    MaterialCheckBox.STATE_CHECKED
+                } else if (geoLoc.children.isEmpty() && Data.visits.getVisited(geoLoc) == AUTO_GROUP) {
+                    MaterialCheckBox.STATE_CHECKED
+                } else if (geoLoc.children.any { Data.visits.getVisited(it) != NO_GROUP }) {
+                    Data.visits.setVisited(geoLoc, AUTO_GROUP)
+                    MaterialCheckBox.STATE_INDETERMINATE
+                } else {
+                    Data.visits.setVisited(geoLoc, NO_GROUP)
+                    if (Data.clearing_geoloc == geoLoc) {
+                        Data.clearing_geoloc = null
+                    }
+                    MaterialCheckBox.STATE_UNCHECKED
+                }
+            Data.saveData()
+
             var col = Data.groups.getGroupFromKey(Data.visits.getVisited(geoLoc)).color
-            if (col.color == Color.TRANSPARENT) {
-                col = colorWrapper(
-                    ctx,
-                    android.R.attr.panelColorBackground
-                )
+            if (Data.visits.getVisited(geoLoc) == AUTO_GROUP) {
+                col = colorWrapper(ctx, android.R.attr.colorPrimary)
+            } else if (col.color == Color.TRANSPARENT) {
+                col = colorWrapper(ctx, android.R.attr.panelColorBackground)
                 col.alpha = 64
             }
-            _binding.checkBox.checkedState =
-                if (Data.visits.getVisited(geoLoc) != 0) MaterialCheckBox.STATE_CHECKED
-                else if (geoLoc.children.any { Data.visits.getVisited(it) != 0 }) MaterialCheckBox.STATE_INDETERMINATE
-                else MaterialCheckBox.STATE_UNCHECKED
-
             _binding.checkBox.buttonTintList = ColorStateList.valueOf(col.color)
         }
 
+        private fun refreshCount(geoLoc: GeoLoc) {
+            val numerator =
+                geoLoc.children.map { Data.visits.getVisited(it) != NO_GROUP }.count { it }
+            val denominator = geoLoc.children.size
+            _binding.count.text = Settings.getStats(ctx, numerator, denominator)
+        }
+
+        private fun refresh(geoLoc: GeoLoc) {
+            // Refresh
+            refreshCheck(geoLoc)
+            refreshCount(geoLoc)
+
+            // Recursively refresh parent
+            _parentHolder?.refresh(_parentGeoLoc)
+        }
+
     }
 }

app/src/main/java/net/helcel/beans/activity/adapter/GroupListAdapter.kt

@@ -13,7 +13,8 @@ import net.helcel.beans.helper.Theme.getContrastColor
 
 class GroupListAdapter(
     private val activity: FragmentActivity,
-    private val selectDialog: DialogFragment
+    private val selectDialog: DialogFragment,
+    private val delete: Boolean = false
 ) : RecyclerView.Adapter<GroupListAdapter.GroupViewHolder>() {
 
     override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): GroupViewHolder {
@@ -63,12 +64,14 @@ class GroupListAdapter(
                 Data.selected_group = entry.second
                 selectDialog.dismiss()
             }
-            _binding.groupColor.setOnLongClickListener {
-                dialogFragment.show(
-                    activity.supportFragmentManager,
-                    "AddColorDialogFragment"
-                )
-                true
+            if (!delete) {
+                _binding.groupColor.setOnLongClickListener {
+                    dialogFragment.show(
+                        activity.supportFragmentManager,
+                        "AddColorDialogFragment"
+                    )
+                    true
+                }
             }
         }
     }

app/src/main/java/net/helcel/beans/activity/adapter/StatsListAdapter.kt

@@ -0,0 +1,152 @@
+package net.helcel.beans.activity.adapter
+
+import android.content.Context
+import android.view.LayoutInflater
+import android.view.ViewGroup
+import androidx.recyclerview.widget.RecyclerView
+import com.google.android.material.textview.MaterialTextView
+import net.helcel.beans.R
+import net.helcel.beans.countries.GeoLoc
+import net.helcel.beans.countries.GeoLoc.LocType
+import net.helcel.beans.countries.World
+import net.helcel.beans.databinding.ItemListGroupBinding
+import net.helcel.beans.helper.AUTO_GROUP
+import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.Groups
+import net.helcel.beans.helper.Settings
+import net.helcel.beans.helper.Theme.getContrastColor
+
+class StatsListAdapter(private val stats: RecyclerView, private val total: MaterialTextView) :
+    RecyclerView.Adapter<StatsListAdapter.StatsViewHolder>() {
+    private val unit = "km²"
+
+    private var locMode = LocType.WORLD
+    private lateinit var ctx: Context
+    private var countMode: Boolean = true
+    private var initialSum: Int = 0
+
+    private val wwwTotal: List<GeoLoc> = World.WWW.children.toList()
+    private val countryTotal: List<GeoLoc> = World.WWW.children.flatMap { it.children }
+    private val stateTotal: List<GeoLoc> =
+        World.WWW.children.flatMap { it.children.flatMap { itt -> itt.children } }
+
+    override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): StatsViewHolder {
+        ctx = parent.context
+        val binding =
+            ItemListGroupBinding.inflate(LayoutInflater.from(ctx), parent, false)
+
+        return StatsViewHolder(binding)
+    }
+
+    override fun onBindViewHolder(holder: StatsViewHolder, pos: Int) {
+        initialSum += if (pos == itemCount - 1) {
+            holder.bind(
+                Pair(
+                    AUTO_GROUP,
+                    Groups.Group(AUTO_GROUP, ctx.getString(R.string.uncategorized))
+                )
+            )
+        } else {
+            holder.bind(Data.groups.getGroupFromPos(pos))
+        }
+        val unitNow = if (!countMode) unit else ""
+        total.text = Settings.getStats(ctx, initialSum, getTotal(), unitNow)
+    }
+
+    override fun getItemCount(): Int {
+        return Data.groups.size() + 1
+    }
+
+    private fun getTotal(): Int {
+        return if (countMode) {
+            when (locMode) {
+                LocType.WORLD -> wwwTotal.size
+                LocType.COUNTRY -> countryTotal.size
+                LocType.STATE -> stateTotal.size
+                else -> 0
+            }
+        } else {
+            when (locMode) {
+                LocType.WORLD -> wwwTotal.sumOf { it.area }
+                LocType.COUNTRY -> countryTotal.sumOf { it.area }
+                LocType.STATE -> stateTotal.sumOf { it.area }
+                else -> 0
+            }
+        }
+    }
+
+    fun refreshMode(mode: LocType) {
+        val sum = (0 until itemCount).map {
+            val viewHolder = stats.findViewHolderForAdapterPosition(it) as? StatsViewHolder
+            viewHolder?.refresh(mode)
+        }.reduce { acc, i -> acc?.plus((i ?: 0)) }
+        val unitNow = if (!countMode) unit else ""
+        total.text = Settings.getStats(ctx, sum, getTotal(), unitNow)
+    }
+
+    fun invertCountMode() {
+        countMode = !countMode
+        refreshMode(locMode)
+    }
+
+    inner class StatsViewHolder(
+        private val _binding: ItemListGroupBinding
+    ) : RecyclerView.ViewHolder(_binding.root) {
+
+        private lateinit var data: Pair<Int, Groups.Group>
+
+        private lateinit var wwwCount: List<GeoLoc>
+        private lateinit var countryCount: List<GeoLoc>
+        private lateinit var stateCount: List<GeoLoc>
+
+        fun bind(entry: Pair<Int, Groups.Group>): Int {
+            data = entry
+            _binding.groupColor.text = entry.second.name
+
+            val entryColor = data.second.color.color
+            val contrastEntryColor = getContrastColor(entryColor)
+            _binding.groupColor.setBackgroundColor(entryColor)
+            _binding.groupColor.setTextColor(contrastEntryColor)
+            _binding.name.setTextColor(contrastEntryColor)
+
+            _binding.groupColor.setOnClickListener { invertCountMode() }
+            compute()
+            return refresh(locMode)
+        }
+
+        private fun compute() {
+            val visited = Data.visits.getVisitedByValue(data.first)
+            wwwCount = World.WWW.children.filter { it.code in visited }
+            countryCount =
+                World.WWW.children.map { it.children.filter { itt -> itt.code in visited } }
+                    .flatten()
+            stateCount =
+                World.WWW.children.map { it.children.map { itt -> itt.children.filter { ittt -> ittt.code in visited } } }
+                    .flatten().flatten()
+        }
+
+        fun refresh(mode: LocType): Int {
+            locMode = mode
+            return if (countMode) {
+                val count = when (locMode) {
+                    LocType.WORLD -> wwwCount.size
+                    LocType.COUNTRY -> countryCount.size
+                    LocType.STATE -> stateCount.size
+                    else -> -1
+                }
+                _binding.name.text = count.toString()
+                count
+            } else {
+                val area = when (locMode) {
+                    LocType.WORLD -> wwwCount.sumOf { it.area }
+                    LocType.COUNTRY -> countryCount.sumOf { it.area }
+                    LocType.STATE -> stateCount.sumOf { it.area }
+                    else -> -1
+                }
+                _binding.name.text = ctx.getString(R.string.number_with_unit, area, unit)
+                area
+            }
+        }
+
+    }
+}

app/src/main/java/net/helcel/beans/activity/adapter/ViewPagerAdapter.kt

@@ -1,11 +1,13 @@
 package net.helcel.beans.activity.adapter
 
+import android.graphics.drawable.ColorDrawable
 import androidx.fragment.app.Fragment
 import androidx.fragment.app.FragmentManager
 import androidx.lifecycle.Lifecycle
 import androidx.viewpager2.adapter.FragmentStateAdapter
 import androidx.viewpager2.widget.ViewPager2
 import net.helcel.beans.activity.fragment.EditPlaceFragment
+import kotlin.math.max
 
 class ViewPagerAdapter(
     fragmentManager: FragmentManager,
@@ -17,15 +19,13 @@ class ViewPagerAdapter(
     private val fragmentList: MutableList<EditPlaceFragment> = ArrayList()
 
     fun addFragment(src: EditPlaceFragment?, target: EditPlaceFragment) {
-        if (src != null) {
-            while (fragmentList.last() != src) {
-                fragmentList.removeLast()
-                notifyItemRemoved(fragmentList.size)
-            }
+        val idx = fragmentList.indexOf(src)
+        viewPager.currentItem = max(0, idx)
+        if (src != null && idx >= 0) {
+            fragmentList.subList(idx + 1, fragmentList.size).clear()
         }
-        println(src.toString() + " -  " + target.toString())
         fragmentList.add(target)
-        notifyItemInserted(fragmentList.size)
+        notifyItemRangeChanged(max(0, idx), fragmentList.size)
         viewPager.currentItem = fragmentList.size - 1
     }
 
@@ -52,6 +52,10 @@ class ViewPagerAdapter(
     override fun createFragment(position: Int): Fragment {
         return fragmentList[position]
     }
+
+    fun refreshColors(colorDrawable: ColorDrawable) {
+        fragmentList.forEach{ it.refreshColors(colorDrawable)}
+    }
 }
 
 

app/src/main/java/net/helcel/beans/activity/fragment/EditGroupAddFragment.kt

@@ -24,7 +24,8 @@ import net.helcel.beans.helper.Theme.colorToHex6
 class EditGroupAddFragment(
     private val key: Int = 0,
     val onAddCb: (Int) -> Unit,
-    val onDelCb: (Int) -> Unit
+    val onDelCb: (Int) -> Unit,
+    private val deleteEnabled: Boolean = true
 ) : DialogFragment() {
 
     private lateinit var _binding: FragmentEditGroupsAddBinding
@@ -42,7 +43,7 @@ class EditGroupAddFragment(
         _binding.colorView.background = ColorDrawable(grp.color.color)
 
 
-        if (key == 0) {
+        if (key == 0 || !deleteEnabled) {
             _binding.btnDelete.visibility = View.INVISIBLE
             _binding.btnDelete.isEnabled = false
         }
@@ -52,8 +53,8 @@ class EditGroupAddFragment(
                 .setPositiveButton(android.R.string.ok) { _, _ ->
                     val pos = Data.groups.findGroupPos(key)
                     // Remove all countries belonging to that group
-                    // Delete the group
                     Data.visits.deleteVisited(key)
+                    // Delete the group
                     Data.groups.deleteGroup(key)
                     Data.saveData()
                     onDelCb(pos)

app/src/main/java/net/helcel/beans/activity/fragment/EditPlaceColorFragment.kt

@@ -3,17 +3,19 @@ package net.helcel.beans.activity.fragment
 import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
+import android.view.View
 import androidx.fragment.app.DialogFragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.google.android.material.dialog.MaterialAlertDialogBuilder
-import net.helcel.beans.activity.adapter.GeolocListAdapter
+import net.helcel.beans.R
 import net.helcel.beans.activity.adapter.GroupListAdapter
 import net.helcel.beans.databinding.FragmentEditPlacesColorsBinding
 import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.DialogCloser
 
 
-class EditPlaceColorFragment(private val parent: GeolocListAdapter.FoldingListViewHolder) :
+class EditPlaceColorFragment(private val parent: DialogCloser, private val delete: Boolean = false) :
     DialogFragment() {
 
     private lateinit var _binding: FragmentEditPlacesColorsBinding
@@ -21,7 +23,8 @@ class EditPlaceColorFragment(private val parent: GeolocListAdapter.FoldingListVi
     private var clear: Boolean = false
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = MaterialAlertDialogBuilder(requireContext())
+        val ctx = requireContext()
+        val builder = MaterialAlertDialogBuilder(ctx)
         _binding = FragmentEditPlacesColorsBinding.inflate(layoutInflater)
         _binding.btnAdd.setOnClickListener {
             EditGroupAddFragment(0, {
@@ -34,16 +37,24 @@ class EditPlaceColorFragment(private val parent: GeolocListAdapter.FoldingListVi
         }
 
         val dialog = builder.setView(_binding.root).create()
-        listAdapt = GroupListAdapter(requireActivity(), this)
+        listAdapt = GroupListAdapter(requireActivity(), this, delete)
         _binding.groupsColor.layoutManager =
-            LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
+            LinearLayoutManager(ctx, RecyclerView.VERTICAL, false)
         _binding.groupsColor.adapter = listAdapt
 
+        if (delete) {
+            _binding.btnAdd.visibility = View.GONE
+            _binding.btnClear.text = ctx.getString(R.string.cancel)
+            _binding.warningText.text = ctx.getString(R.string.select_group)
+        } else {
+            _binding.warningText.text = ctx.getString(R.string.edit_group)
+        }
+
         return dialog
     }
 
     override fun onDismiss(dialog: DialogInterface) {
         super.onDismiss(dialog)
-        parent.onColorDialogDismiss(clear)
+        parent.onDialogDismiss(clear)
     }
 }

app/src/main/java/net/helcel/beans/activity/fragment/EditPlaceFragment.kt

@@ -1,5 +1,6 @@
 package net.helcel.beans.activity.fragment
 
+import android.graphics.drawable.ColorDrawable
 import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
@@ -8,11 +9,12 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import net.helcel.beans.activity.adapter.GeolocListAdapter
+import net.helcel.beans.activity.adapter.GeolocListAdapter.FoldingListViewHolder
 import net.helcel.beans.activity.adapter.ViewPagerAdapter
 import net.helcel.beans.countries.GeoLoc
 import net.helcel.beans.databinding.FragmentEditPlacesBinding
 
-class EditPlaceFragment(val loc: GeoLoc, private val pager: ViewPagerAdapter) : Fragment() {
+class EditPlaceFragment(val loc: GeoLoc, private val pager: ViewPagerAdapter, private val holder: FoldingListViewHolder? = null) : Fragment() {
     private lateinit var _binding: FragmentEditPlacesBinding
 
     override fun onCreateView(
@@ -26,7 +28,11 @@ class EditPlaceFragment(val loc: GeoLoc, private val pager: ViewPagerAdapter) :
         _binding.list.setHasFixedSize(true)
         _binding.list.layoutManager =
             LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
-        _binding.list.adapter = GeolocListAdapter(this, loc, pager)
+        _binding.list.adapter = GeolocListAdapter(this, loc, pager, holder)
         return _binding.root
     }
+
+    fun refreshColors(colorDrawable: ColorDrawable) {
+        (_binding.list.adapter as GeolocListAdapter?)?.refreshColors(colorDrawable)
+    }
 }

app/src/main/java/net/helcel/beans/activity/fragment/SettingsFragment.kt

@@ -5,29 +5,79 @@ import android.os.Bundle
 import androidx.appcompat.app.AppCompatDelegate
 import androidx.preference.Preference
 import androidx.preference.PreferenceFragmentCompat
+import androidx.preference.PreferenceManager
+import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import net.helcel.beans.R
 import net.helcel.beans.countries.GeoLocImporter
+import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.DialogCloser
+import net.helcel.beans.helper.Settings
 
 
-class SettingsFragment : PreferenceFragmentCompat() {
+class SettingsFragment : PreferenceFragmentCompat(), DialogCloser {
+    private var savedInstanceState: Bundle? = null
+    private var rootKey: String? = null
 
     override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
+        this.savedInstanceState = savedInstanceState
+        this.rootKey = rootKey
+
         setPreferencesFromResource(R.xml.fragment_settings, rootKey)
         val ctx = requireContext()
-        findPreference<Preference>(getString(R.string.key_regional))?.setOnPreferenceChangeListener { _, key ->
-            when (key as String) {
-                ctx.getString(R.string.off) -> GeoLocImporter.clearStates()
-                ctx.getString(R.string.on) -> GeoLocImporter.importStates(ctx)
-                else -> GeoLocImporter.clearStates()
-            }
-            true
-        }
 
         // Select Light/Dark/System Mode
         findPreference<Preference>(getString(R.string.key_theme))?.setOnPreferenceChangeListener { _, key ->
             setTheme(ctx, key as String)
         }
 
+        // Select map projection
+        findPreference<Preference>(getString(R.string.key_projection))?.setOnPreferenceChangeListener { _, key ->
+            Settings.refreshProjection()
+        }
+
+        // Toggle groups
+        findPreference<Preference>(getString(R.string.key_group))?.setOnPreferenceChangeListener { _, key ->
+            if (key as String == ctx.getString(R.string.off)) {
+                val fragment = EditPlaceColorFragment(this, true)
+                fragment.show(
+                    this.parentFragmentManager,
+                    "AddColorDialogFragment"
+                )
+                false
+            } else {
+                true
+            }
+        }
+
+        // Toggle regional geolocs
+        findPreference<Preference>(getString(R.string.key_regional))?.setOnPreferenceChangeListener { _, key ->
+            when (key as String) {
+                ctx.getString(R.string.off) -> {
+                    MaterialAlertDialogBuilder(requireActivity())
+                        .setMessage(R.string.delete_regions)
+                        .setPositiveButton(android.R.string.ok) { _, _ ->
+                            GeoLocImporter.clearStates()
+                            PreferenceManager.getDefaultSharedPreferences(ctx).edit().putString(
+                                ctx.getString(R.string.key_regional),
+                                ctx.getString(R.string.off)
+                            ).apply()
+                            refreshPreferences()
+                        }
+                        .setNegativeButton(android.R.string.cancel) { _, _ -> }
+                        .show()
+                    false
+                }
+
+                ctx.getString(R.string.on) -> {
+                    GeoLocImporter.importStates(ctx, true)
+                    true
+                }
+
+                else -> false
+            }
+        }
+
+
         // Open license fragment
         findPreference<Preference>(getString(R.string.licenses))?.setOnPreferenceClickListener {
             requireActivity().supportFragmentManager.beginTransaction()
@@ -59,4 +109,34 @@ class SettingsFragment : PreferenceFragmentCompat() {
             return true
         }
     }
+
+    override fun onDialogDismiss(clear: Boolean) {
+        // When turning groups off, select one group to keep and reassign everything
+        Data.selected_group?.let { selectedGroup ->
+            // Reassign all visited that are not to selectedGroup to selectedGroup
+            Data.visits.reassignAllVisitedToGroup(selectedGroup.key)
+
+            // Delete all groups that are not selectedGroup
+            Data.groups.deleteAllExcept(selectedGroup.key)
+
+            // Save and clear global variables
+            Data.saveData()
+            Data.selected_geoloc = null
+            Data.selected_group = null
+
+            // Actually change preference
+            val ctx = requireContext()
+            val sp = PreferenceManager.getDefaultSharedPreferences(ctx)
+            sp.edit().putString(ctx.getString(R.string.key_group), ctx.getString(R.string.off))
+                .apply()
+
+            // Refresh entire preference fragment to reflect changes
+            refreshPreferences()
+        }
+    }
+
+    private fun refreshPreferences() {
+        preferenceScreen.removeAll()
+        onCreatePreferences(savedInstanceState, rootKey)
+    }
 }

app/src/main/java/net/helcel/beans/countries/Country.kt

@@ -5,11 +5,10 @@ enum class Country(
     override val area: Int
 ) : GeoLoc {
     ATA("Antarctica", 14000000),
-    HKG("Hong Kong", 1104),
-    MAC("Macao", 32),
-    ANT("Netherlands Antilles", 800),
-
 
+    //    HKG("Hong Kong", 1104),
+//    MAC("Macao", 32),
+//    ANT("Netherlands Antilles", 800),
     AFG("Afghanistan", 645487),
     XAD("Akrotiri and Dhekelia", 234),
     ALA("Åland", 1483),
@@ -217,7 +216,7 @@ enum class Country(
     SLB("Solomon Islands", 28686),
     SOM("Somalia", 637672),
     ZAF("South Africa", 1224059),
-    SGS("South Georgia and the South Sand", 4085),
+    SGS("South Georgia and the South Sandwich Islands", 4085),
     KOR("South Korea", 100721),
     SSD("South Sudan", 632186),
     ESP("Spain", 506617),
@@ -248,7 +247,7 @@ enum class Country(
     ARE("United Arab Emirates", 71429),
     GBR("United Kingdom", 244732),
     USA("United States", 9477483),
-    UMI("United States Minor Outlying Isl", 47),
+    UMI("United States Minor Outlying Islands", 47),
     URY("Uruguay", 178103),
     UZB("Uzbekistan", 447894),
     VUT("Vanuatu", 12384),
@@ -265,5 +264,5 @@ enum class Country(
 
     override val code = this.name
     override val type = GeoLoc.LocType.COUNTRY
-    override val children: MutableList<GeoLoc> = ArrayList()
+    override val children: MutableSet<GeoLoc> = HashSet()
 }

app/src/main/java/net/helcel/beans/countries/GeoLoc.kt

@@ -1,13 +1,9 @@
 package net.helcel.beans.countries
 
-import android.content.Context
-import net.helcel.beans.helper.Settings
-
-
 interface GeoLoc {
 
-    enum class LocType {
-        WORLD, GROUP, CUSTOM_GROUP, COUNTRY, STATE;
+    enum class LocType(val txt: String) {
+        WORLD("Continents"), GROUP("Groups"), CUSTOM_GROUP("Groups"), COUNTRY("Countries"), STATE("Regions");
     }
 
     val code: String
@@ -15,16 +11,5 @@ interface GeoLoc {
     val area: Int
 
     val type: LocType
-    val children: List<GeoLoc>
-
-    fun shouldShowChildren(ctx: Context): Boolean {
-        if (children.isEmpty())
-            return false
-        if (type == LocType.COUNTRY && !Settings.isRegional(ctx))
-            return false
-        return true
-    }
-
+    val children: Set<GeoLoc>
 }
-
-

app/src/main/java/net/helcel/beans/countries/GeoLocImporter.kt

@@ -1,25 +1,44 @@
 package net.helcel.beans.countries
 
 import android.content.Context
+import net.helcel.beans.helper.AUTO_GROUP
+import net.helcel.beans.helper.Data
+import net.helcel.beans.helper.NO_GROUP
 import net.helcel.beans.helper.Settings
 import java.io.BufferedReader
 import java.io.InputStreamReader
 
 object GeoLocImporter {
 
-    fun importStates(ctx: Context) {
-        if (!Settings.isRegional(ctx)) {
+    fun importStates(ctx: Context, force: Boolean = false) {
+        if (!Settings.isRegional(ctx) and !force) {
             return
         }
         val fs = BufferedReader(InputStreamReader(ctx.assets.open("geoloc_state.txt")))
         while (fs.ready()) {
             val line = fs.readLine().split("|")
             val state = State(line[0], line[2], line[3].toInt())
-            Country.entries.find { it.code == line[1] }?.children?.add(state)
+            val country = Country.entries.find { it.code == line[1] }
+            country?.children?.add(state)
+            country?.let {
+                if (Data.visits.getVisited(it) == NO_GROUP) {
+                    Data.visits.setVisited(state, NO_GROUP)
+                }
+            }
         }
     }
 
     fun clearStates() {
-        Country.entries.forEach { it.children.clear() }
+        Country.entries.forEach { country ->
+            if (country.children.any { region ->
+                    Data.visits.getVisited(region) != NO_GROUP
+                }) {
+                if (Data.visits.getVisited(country) == NO_GROUP) {
+                    Data.visits.setVisited(country, AUTO_GROUP)
+                }
+            }
+            country.children.clear()
+        }
+        Data.saveData()
     }
 }

app/src/main/java/net/helcel/beans/countries/Group.kt

@@ -2,10 +2,11 @@ package net.helcel.beans.countries
 
 import net.helcel.beans.countries.Country.*
 
-enum class Group(override val fullName: String, override val children: List<GeoLoc>) : GeoLoc {
+enum class Group(override val fullName: String, override val children: Set<GeoLoc>) : GeoLoc {
 
     EEE(
-        "Europe", listOf(
+        "Europe", setOf(
+            ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
             ALB,
             AND,
             AUT,
@@ -14,19 +15,23 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             BIH,
             BGR,
             HRV,
-            CYP,
             CZE,
             DNK,
             EST,
+            FRO, // Faroe Islands: an autonomous region of Denmark
             FIN,
             FRA,
             DEU,
+            GIB, // Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
             GRC,
+            GRL,
+            GGY, // Guernsey: a British Crown dependency in the English Channel
             HUN,
             ISL,
             IRL,
+            IMN, // Isle of Man: a British Crown dependency located in the Irish Sea
             ITA,
-            KAZ,
+            JEY, // Jersey: a British Crown dependency located in the English Channel
             XKO,
             LVA,
             LIE,
@@ -48,27 +53,32 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             SVK,
             SVN,
             ESP,
+            SJM, // Svalbard and Jan Mayen: an archipelago administered by Norway
             SWE,
             CHE,
             UKR,
             GBR,
             VAT,
-            XAD,
         )
     ),
     ABB(
-        "Asia", listOf(
+        "Asia", setOf(
+            XAD,
             AFG,
             ARM,
             AZE,
             BHR,
             BGD,
             BTN,
+            IOT, // British Indian Ocean Territory: a British overseas territory in the Indian Ocean
             BRN,
             KHM,
+            CCK, // Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
             CHN,
+            CXR, // Christmas Island: an Australian external territory in the Indian Ocean
+            CYP,
             GEO,
-            HKG,
+            //HKG,
             IND,
             IDN,
             IRN,
@@ -76,11 +86,12 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             ISR,
             JPN,
             JOR,
+            KAZ,
             KWT,
             KGZ,
             LAO,
             LBN,
-            MAC,
+            //MAC,
             MYS,
             MDV,
             MNG,
@@ -111,12 +122,13 @@ enum class Group(override val fullName: String, override val children: List<GeoL
         )
     ),
     FFF(
-        "Africa", listOf(
+        "Africa", setOf(
             DZA,
             AGO,
             BDI,
             BEN,
             BWA,
+            BVT, // Bouvet Island: an uninhabited territory of Norway in the South Atlantic
             BFA,
             BDI,
             CPV,
@@ -131,13 +143,14 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             EGY,
             GNQ,
             ERI,
-            SWZ,
             ETH,
+            ATF, // French Southern and Antarctic Lands: a territory of France located in the southern Indian Ocean
             GAB,
             GMB,
             GHA,
             GIN,
             GNB,
+            HMD, // Heard Island and McDonald Islands: an uninhabited Australian external territory in the southern Indian Ocean
             KEN,
             LSO,
             LBR,
@@ -165,6 +178,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             SSD,
             SHN,
             SDN,
+            SWZ,
             TZA,
             TGO,
             TUN,
@@ -176,7 +190,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
         )
     ),
     NNN(
-        "North America", listOf(
+        "North America", setOf(
             ABW,
             AIA,
             ATG,
@@ -184,16 +198,17 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             BRB,
             BLZ,
             BMU,
+            BES, // Bonaire, Sint Eustatius and Saba: special municipalities of the Netherlands in the Caribbean
             VGB,
             CAN,
             CYM,
+            XCL,
             CRI,
             CUB,
             CUW,
             DMA,
             DOM,
             SLV,
-            GRL,
             GRD,
             GLP,
             GTM,
@@ -203,24 +218,27 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             MTQ,
             MEX,
             MSR,
-            ANT,
+            //ANT,
             CUW,
             NIC,
             PAN,
             PRI,
+            BLM, // Saint Barthélemy: an overseas collectivity of France in the Caribbean
             KNA,
             LCA,
             MAF,
             SPM,
             VCT,
+            SXM, // Sint Maarten: a constituent country of the Kingdom of the Netherlands in the Caribbean
             TTO,
             TCA,
             USA,
-            XCL,
+            UMI, // United States Minor Outlying Islands: a collection of nine insular areas of the United States
+            VIR, // United States Virgin Islands: an unincorporated territory of the United States in the Caribbean
         )
     ),
     SRR(
-        "South America", listOf(
+        "South America", setOf(
             ARG,
             BOL,
             BRA,
@@ -232,13 +250,14 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             GUY,
             PRY,
             PER,
+            SGS, // South Georgia and the South Sandwich Islands: a British overseas territory in the southern Atlantic Ocean
             SUR,
             URY,
             VEN,
         )
     ),
     UUU(
-        "Oceania", listOf(
+        "Oceania", setOf(
             ASM,
             AUS,
             COK,
@@ -257,6 +276,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             PLW,
             PNG,
             PCN,
+            WSM, // Samoa: an independent island nation in the South Pacific
             SLB,
             TKL,
             TON,
@@ -267,39 +287,19 @@ enum class Group(override val fullName: String, override val children: List<GeoL
     ),
 
     XXX(
-        "Others", listOf(
-            ATA, // Antarctica: not in any other region
-            ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
-            BES,// Bonaire, Sint Eustatius and Saba: special municipalities of the Netherlands in the Caribbean
-            BVT,// Bouvet Island: an uninhabited territory of Norway in the South Atlantic
-            IOT,// British Indian Ocean Territory: a British overseas territory in the Indian Ocean
-            CXR,// Christmas Island: an Australian external territory in the Indian Ocean
-            CCK,// Cocos (Keeling) Islands: an Australian external territory in the Indian Ocean
-            FRO,// Faroe Islands: an autonomous region of Denmark
-            ATF,// French Southern and Antarctic Lands: a territory of France located in the southern Indian Ocean
-            GIB,// Gibraltar: a British overseas territory located at the southern tip of the Iberian Peninsula
-            GGY,// Guernsey: a British Crown dependency in the English Channel
-            HMD,// Heard Island and McDonald Islands: an uninhabited Australian external territory in the southern Indian Ocean
-            IMN,// Isle of Man: a British Crown dependency located in the Irish Sea
-            JEY,// Jersey: a British Crown dependency located in the English Channel
-            BLM,// Saint Barthélemy: an overseas collectivity of France in the Caribbean
-            WSM, // Samoa: an independent island nation in the South Pacific
-            SXM, // Sint Maarten: a constituent country of the Kingdom of the Netherlands in the Caribbean
-            SGS, // South Georgia and the South Sandwich Islands: a British overseas territory in the southern Atlantic Ocean
-            SJM, // Svalbard and Jan Mayen: an archipelago administered by Norway
-            UMI, // United States Minor Outlying Islands: a collection of nine insular areas of the United States
-            VIR, // United States Virgin Islands: an unincorporated territory of the United States in the Caribbean
+        "Other", setOf(
+           
         )
     ),
 
     ZZZ(
-        "Undefined", listOf(
+        "Undefined", setOf(
         )
     ),
 
 
     NTT(
-        "NATO", listOf(
+        "NATO", setOf(
             ALB, BEL, BGR, CAN, HRV, CZE, DNK, EST, FRA, DEU, GRC, HUN, ISL, ITA, LVA, LTU, LUX,
             MNE, NLD, NOR, POL, PRT, ROU, SVK, SVN, ESP, TUR, GBR, USA
         )

app/src/main/java/net/helcel/beans/countries/State.kt

@@ -3,6 +3,17 @@ package net.helcel.beans.countries
 class State(override val code: String, override val fullName: String, override val area: Int) :
     GeoLoc {
 
-    override val children = emptyList<GeoLoc>()
+    override val children = emptySet<GeoLoc>()
     override val type = GeoLoc.LocType.STATE
+
+    override fun hashCode(): Int {
+        return code.hashCode()
+    }
+
+    override fun equals(other: Any?): Boolean {
+        if (other is GeoLoc) {
+            return other.code == this.code
+        }
+        return false
+    }
 }

app/src/main/java/net/helcel/beans/countries/World.kt

@@ -2,19 +2,19 @@ package net.helcel.beans.countries
 
 import net.helcel.beans.countries.Group.*
 
-enum class World(override val fullName: String, override val children: List<GeoLoc>) : GeoLoc {
+enum class World(override val fullName: String, override val children: Set<GeoLoc>) : GeoLoc {
 
-    WWW("World", listOf(
-        EEE, ABB, FFF, NNN, SRR, UUU, XXX
-    ));
+    WWW(
+        "World", setOf(
+            EEE, ABB, FFF, NNN, SRR, UUU, Country.ATA,
+
+            )
+    );
 
     override val area = children.fold(0) { acc, i ->
         acc + i.area
     }
 
-
     override val type = GeoLoc.LocType.WORLD
     override val code = this.name
-
-
 }

app/src/main/java/net/helcel/beans/helper/Data.kt

@@ -10,42 +10,40 @@ import net.helcel.beans.countries.GeoLoc
 import java.util.HashMap
 
 object Data {
+    var visits : Visits = Visits(0, HashMap())
+    var groups : Groups = Groups(0,HashMap())
 
+    var selected_group : Groups.Group? = null
+    var selected_geoloc: GeoLoc? = null
+    var clearing_geoloc: GeoLoc? = null
 
-var visits : Visits = Visits(0, HashMap())
-var groups : Groups = Groups(0,HashMap())
+    private val groupsSerial = Groups.GroupsSerializer()
+    private val visitsSerial = Visits.VisitsSerializer()
 
-var selected_group : Groups.Group? = null
-var selected_geoloc: GeoLoc? = null
+    private lateinit var sharedPreferences: SharedPreferences
 
-private val groupsSerial = Groups.GroupsSerializer()
-private val visitsSerial = Visits.VisitsSerializer()
+    fun loadData(ctx: Context, id:Int) {
+        sharedPreferences = PreferenceManager.getDefaultSharedPreferences(ctx)
 
-private lateinit var sharedPreferences: SharedPreferences
+        val groupsString = sharedPreferences.getString("groups_$id",null)
+        val visitsString = sharedPreferences.getString("visits_$id",null)
 
-fun loadData(ctx: Context, id:Int) {
-    sharedPreferences = PreferenceManager.getDefaultSharedPreferences(ctx)
+        groups = if(!groupsString.isNullOrEmpty()) groupsSerial.readFrom(groupsString.byteInputStream()) else groupsSerial.defaultValue
+        visits = if(!visitsString.isNullOrEmpty()) visitsSerial.readFrom(visitsString.byteInputStream()) else visitsSerial.defaultValue
 
-    val groupsString = sharedPreferences.getString("groups_$id",null)
-    val visitsString = sharedPreferences.getString("visits_$id",null)
-
-    groups = if(!groupsString.isNullOrEmpty()) groupsSerial.readFrom(groupsString.byteInputStream()) else groupsSerial.defaultValue
-    visits = if(!visitsString.isNullOrEmpty()) visitsSerial.readFrom(visitsString.byteInputStream()) else visitsSerial.defaultValue
-
-    // Add default group "Visited" with app's color if there is no group already
-    if (groups.size() == 0) {
-        groups.setGroup(1, "Visited", ColorDrawable(ContextCompat.getColor(ctx, R.color.blue)))
-        saveData()
+        // Add default group "Visited" with app's color if there is no group already
+        if (groups.size() == 0) {
+            groups.setGroup(DEFAULT_GROUP, "Visited", ColorDrawable(ContextCompat.getColor(ctx, R.color.blue)))
+            saveData()
+        }
     }
 
-}
-
-fun saveData() {
-    if(groups.id != visits.id) return
-    val id = groups.id
-    val editor = sharedPreferences.edit()
-    editor.putString("groups_$id", groupsSerial.writeTo(groups))
-    editor.putString("visits_$id", visitsSerial.writeTo(visits))
-    editor.apply()
-}
-    }
+    fun saveData() {
+        if(groups.id != visits.id) return
+        val id = groups.id
+        val editor = sharedPreferences.edit()
+        editor.putString("groups_$id", groupsSerial.writeTo(groups))
+        editor.putString("visits_$id", visitsSerial.writeTo(visits))
+        editor.apply()
+    }
+}

app/src/main/java/net/helcel/beans/helper/DialogCloser.kt

@@ -0,0 +1,5 @@
+package net.helcel.beans.helper
+
+interface DialogCloser {
+    fun onDialogDismiss(clear: Boolean)
+}

app/src/main/java/net/helcel/beans/helper/Groups.kt

@@ -2,17 +2,24 @@ package net.helcel.beans.helper
 
 import android.graphics.Color
 import android.graphics.drawable.ColorDrawable
+import androidx.core.content.ContextCompat
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.Serializable
 import kotlinx.serialization.Serializer
 import kotlinx.serialization.json.Json
+import net.helcel.beans.R
 import java.io.InputStream
+import kotlin.coroutines.coroutineContext
 import kotlin.random.Random
 
 
 private const val randSeed = 0
 private val rnd = Random(randSeed)
 
+const val NO_GROUP = 0
+const val DEFAULT_GROUP = 1
+const val AUTO_GROUP = -1
+
 @Serializable
 class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
 
@@ -24,13 +31,18 @@ class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
         grps.remove(key)
     }
 
+    fun deleteAllExcept(grp: Int) {
+        val keysToDelete = grps.keys.filter { it != grp }
+        keysToDelete.forEach { grps.remove(it) }
+    }
+
     fun getGroupFromKey(key: Int): Group {
         return grps.getOrDefault(key, EmptyGroup())
     }
 
     fun genKey(): Int {
         val key = rnd.nextInt()
-        if (grps.containsKey(key) || key == 0) return genKey()
+        if (grps.containsKey(key) || key in listOf(NO_GROUP, DEFAULT_GROUP, AUTO_GROUP)) return genKey()
         return key
     }
 
@@ -63,7 +75,7 @@ class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
         val key: Int,
         val name: String,
         @Serializable(with = Theme.ColorDrawableSerializer::class) val color: ColorDrawable = ColorDrawable(
-            Color.TRANSPARENT
+            Color.GRAY
         )
     )
 

app/src/main/java/net/helcel/beans/helper/Settings.kt

@@ -4,12 +4,15 @@ import android.content.Context
 import android.content.SharedPreferences
 import androidx.preference.PreferenceManager
 import net.helcel.beans.R
+import net.helcel.beans.activity.MainActivity
 import net.helcel.beans.activity.fragment.SettingsFragment
 
 object Settings {
 
     private lateinit var sp: SharedPreferences
-    fun start(ctx: Context) {
+    private lateinit var mainActivity: MainActivity
+    fun start(ctx: MainActivity) {
+        mainActivity = ctx
         sp = PreferenceManager.getDefaultSharedPreferences(ctx)
         SettingsFragment.setTheme(
             ctx, sp.getString(ctx.getString(R.string.key_theme), ctx.getString(R.string.system))
@@ -37,6 +40,11 @@ object Settings {
         )
     }
 
+    fun refreshProjection(): Boolean {
+        mainActivity.refreshProjection()
+        return true
+    }
+
     private fun getBooleanValue(ctx: Context, key: String?): Boolean {
         return when (key) {
             ctx.getString(R.string.on) -> true
@@ -44,4 +52,24 @@ object Settings {
             else -> false
         }
     }
+
+    fun getStats(ctx: Context, numerator: Int?, denominator: Int?, unit: String = ""): String {
+        if (numerator == null || denominator == null || denominator == 0) {
+            return ""
+        }
+        return when (getStatPref(ctx)) {
+            ctx.getString(R.string.percentages) -> ctx.getString(
+                R.string.percentage,
+                (100 * (numerator.toFloat() / denominator.toFloat())).toInt()
+            )
+
+            else -> {
+                if (unit == "") {
+                    ctx.getString(R.string.rate, numerator, denominator)
+                } else {
+                    ctx.getString(R.string.rate_with_unit, numerator, denominator, unit)
+                }
+            }
+        }
+    }
 }

app/src/main/java/net/helcel/beans/helper/Theme.kt

@@ -29,7 +29,6 @@ object Theme {
     }
 
     fun createActionBar(ctx: AppCompatActivity, title: String) {
-        ctx.supportActionBar?.setBackgroundDrawable(colorWrapper(ctx, android.R.attr.colorPrimary))
         ctx.supportActionBar?.title = title
         ctx.supportActionBar?.setDisplayHomeAsUpEnabled(true)
     }

app/src/main/java/net/helcel/beans/helper/Visits.kt

@@ -27,7 +27,7 @@ class Visits(val id: Int, private val locs: HashMap<String, Int>) {
     }
 
     fun getVisited(key: GeoLoc): Int {
-        return locs.getOrDefault(key.code, 0)
+        return getVisited(key.code)
     }
 
     private fun getVisited(key: String): Int {
@@ -42,6 +42,19 @@ class Visits(val id: Int, private val locs: HashMap<String, Int>) {
         return locs.keys.groupBy { getVisited(it) }
     }
 
+    fun getVisitedByValue(key: Int): List<String> {
+        return locs.filter { it.value == key }.keys.toList()
+    }
+
+    fun reassignAllVisitedToGroup(group: Int) {
+        val keys = locs.filter { (_, grp) ->
+            grp !in listOf(NO_GROUP, AUTO_GROUP)
+        }.keys
+        keys.forEach {
+            locs[it] = group
+        }
+    }
+
     @OptIn(ExperimentalSerializationApi::class)
     @Serializer(Visits::class)
     class VisitsSerializer {

app/src/main/java/net/helcel/beans/svg/CSSWrapper.kt

@@ -2,49 +2,67 @@ package net.helcel.beans.svg
 
 import android.content.Context
 import net.helcel.beans.countries.World
+import net.helcel.beans.helper.AUTO_GROUP
 import net.helcel.beans.helper.Data.groups
 import net.helcel.beans.helper.Data.visits
+import net.helcel.beans.helper.NO_GROUP
+import net.helcel.beans.helper.Settings
 import net.helcel.beans.helper.Theme.colorToHex6
 import net.helcel.beans.helper.Theme.colorWrapper
 
-class CSSWrapper(ctx: Context) {
+class CSSWrapper(private val ctx: Context) {
 
     private val colorForeground: String =
         colorToHex6(colorWrapper(ctx, android.R.attr.panelColorBackground))
     private val colorBackground: String =
         colorToHex6(colorWrapper(ctx, android.R.attr.colorBackground))
 
-    private val baseCSS: String
+    private val continents: String = World.WWW.children.joinToString(",") { "#${it.code}2" }
+    private val countries: String = World.WWW.children.joinToString(",") { itt ->
+        itt.children.joinToString(",") { "#${it.code}2" }
+    }
+    private val regional: String = World.WWW.children.joinToString(",") { itt ->
+        itt.children.joinToString(",") { "#${it.code}1" }
+    }
+    private val countryOnlyCSS: String =
+        "svg{fill:$colorForeground;stroke:$colorBackground;stroke-width:0.1;}" +
+                "${regional}{display:none;}"
+    private val countryRegionalCSS: String =
+        "svg{fill:$colorForeground;stroke:$colorBackground;stroke-width:0.01;}" +
+                "$continents,$countries{fill:none;stroke:$colorBackground;stroke-width:0.1;}"
     private var customCSS: String = ""
 
     init {
-        val www = World.WWW.children.joinToString(",") { "#${it.code}2" }
-        val ccc = World.WWW.children.joinToString(",") { itt ->
-            itt.children.joinToString(",") { "#${it.code}2" }
-        }
-        baseCSS = "svg{fill:$colorForeground;stroke:$colorBackground;stroke-width:0.01;}" +
-                "$www,$ccc{stroke:$colorBackground;stroke-width:0.1;fill:none}"
         refresh()
     }
 
-    fun refresh() {
+    private fun refresh() {
+        val id = if (Settings.isRegional(ctx)) "1" else "2"
         customCSS = visits.getVisitedByValue().map { (k, v) ->
-            if (groups.getGroupFromKey(k).key == 0)
-                ""
-            else
-                v.joinToString(",") { "#${it}1,#${it}" } + "{fill:${
-                    colorToHex6(
-                        groups.getGroupFromKey(
-                            k
-                        ).color
-                    )
-                };}"
+            (if (groups.getGroupFromKey(k).key != NO_GROUP) {
+                v
+            } else if (!Settings.isRegional(ctx) && k == AUTO_GROUP) {
+                v.filter { it !in World.WWW.children.map { it1 -> it1.code } }
+            } else {
+                emptyList()
+            }).takeIf { it.isNotEmpty() }
+                ?.joinToString(",") { "#${it}$id,#${it}" } + "{fill:${
+                colorToHex6(
+                    if (k == AUTO_GROUP)
+                        colorWrapper(ctx, android.R.attr.colorPrimary)
+                    else groups.getGroupFromKey(k).color
+                )
+            };}"
         }.joinToString("")
     }
 
     fun get(): String {
         refresh()
-        return baseCSS + customCSS
+        return if (Settings.isRegional(ctx)) {
+            countryRegionalCSS + customCSS
+        } else {
+            countryOnlyCSS + customCSS
+        }
     }
 
 }

app/src/main/java/net/helcel/beans/svg/SVGWrapper.kt

@@ -1,11 +1,26 @@
 package net.helcel.beans.svg
 
 import android.content.Context
+import android.content.SharedPreferences
+import androidx.preference.PreferenceManager
 import com.caverock.androidsvg.SVG
+import net.helcel.beans.R
 
 class SVGWrapper(ctx: Context) {
 
-    private var svg: SVG? = SVG.getFromAsset(ctx.assets, "mercator01.svg")
+    private val sharedPreferences: SharedPreferences =
+        PreferenceManager.getDefaultSharedPreferences(ctx)
+    private val svgFile = when (sharedPreferences.getString(
+        ctx.getString(R.string.key_projection),
+        ctx.getString(R.string.mercator)
+    )) {
+        ctx.getString(R.string.azimuthalequidistant) -> "aeqd01.svg"
+        ctx.getString(R.string.loximuthal) -> "loxim01.svg"
+        ctx.getString(R.string.mercator) -> "webmercator01.svg"
+        else -> "webmercator01.svg"
+    }
+
+    private var svg: SVG? = SVG.getFromAsset(ctx.assets, svgFile)
 
     fun get(): SVG? {
         return svg

app/src/main/res/drawable/back.xml

@@ -0,0 +1,5 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp">
+      
+    <path android:fillColor="@android:color/white" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
+    
+</vector>

app/src/main/res/drawable/color.xml

@@ -0,0 +1,10 @@
+<vector
+    android:height="24dp"
+    android:viewportHeight="960"
+    android:viewportWidth="960"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+<path
+    android:fillColor="@color/white"
+    android:pathData="M346,820L100,574Q90,564 85,552Q80,540 80,527Q80,514 85,502Q90,490 100,480L330,251L224,145L286,80L686,480Q696,490 700.5,502Q705,514 705,527Q705,540 700.5,552Q696,564 686,574L440,820Q430,830 418,835Q406,840 393,840Q380,840 368,835Q356,830 346,820ZM393,314L179,528Q179,528 179,528Q179,528 179,528L607,528Q607,528 607,528Q607,528 607,528L393,314ZM792,840Q756,840 731,814.5Q706,789 706,752Q706,725 719.5,701Q733,677 750,654L792,600L836,654Q852,677 866,701Q880,725 880,752Q880,789 854,814.5Q828,840 792,840Z"/>
+</vector>

app/src/main/res/drawable/delete.xml

@@ -8,34 +8,34 @@
       android:strokeLineJoin="round"
       android:strokeWidth="4"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="?attr/colorOnBackground"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M51,25v31c0,2.209 -1.791,4 -4,4H25c-2.209,0 -4,-1.791 -4,-4V25"
       android:strokeLineJoin="round"
       android:strokeWidth="4"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="?attr/colorOnBackground"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M17,16h38v4h-38z"
       android:strokeLineJoin="round"
       android:strokeWidth="4"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="?attr/colorOnBackground"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M41,28.25L41,55"
       android:strokeLineJoin="round"
       android:strokeWidth="4"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="?attr/colorOnBackground"
       android:strokeLineCap="round"/>
   <path
       android:pathData="M31,28.25L31,55"
       android:strokeLineJoin="round"
       android:strokeWidth="4"
       android:fillColor="#00000000"
-      android:strokeColor="#000000"
+      android:strokeColor="?attr/colorOnBackground"
       android:strokeLineCap="round"/>
 </vector>

app/src/main/res/drawable/edit.xml

@@ -5,6 +5,6 @@
     android:width="24dp"
     xmlns:android="http://schemas.android.com/apk/res/android">
     <path
-        android:fillColor="?attr/colorOnBackground"
+        android:fillColor="@color/white"
         android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
 </vector>

app/src/main/res/drawable/group.xml

@@ -0,0 +1,16 @@
+<vector
+android:height="24dp"
+android:viewportHeight="24"
+android:viewportWidth="24"
+android:width="24dp"
+xmlns:android="http://schemas.android.com/apk/res/android" >
+
+<path android:fillColor="?attr/colorOnBackground" android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM12,20c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8z"/>
+
+<path android:fillColor="?attr/colorPrimary" android:pathData="M8,14m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+
+<path android:fillColor="?attr/colorPrimary" android:pathData="M12,8m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+
+<path android:fillColor="?attr/colorPrimary" android:pathData="M16,14m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+
+</vector>

app/src/main/res/drawable/ic_launcher_background.xml

@@ -5,6 +5,6 @@
     android:viewportWidth="960"
     android:viewportHeight="960">
     <path
-        android:fillColor="@color/blue"
+        android:fillColor="@color/darkgray"
         android:pathData="M0,0h960v960h-960z" />
 </vector>

app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -1,13 +1,50 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="12dp"
-    android:height="12dp"
-    android:viewportWidth="1600"
-    android:viewportHeight="1600">
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="128"
+    android:viewportHeight="128">
+  <group android:scaleX="0.8918919"
+      android:scaleY="0.8918919"
+      android:translateX="6.918919"
+      android:translateY="6.918919">
 
-    <path
-        android:fillColor="@color/white"
-        android:fillType="nonZero"
-        android:pathData="m800,1200q-83,0 -156,-31.5Q571,1137 517,1083 463,1029 431.5,956 400,883 400,800 400,717 431.5,644 463,571 517,517 571,463 644,431.5 717,400 800,400q83,0 156,31.5 73,31.5 127,85.5 54,54 85.5,127 31.5,73 31.5,156 0,83 -31.5,156 -31.5,73 -85.5,127 -54,54 -127,85.5 -73,31.5 -156,31.5zM800,1120q134,0 227,-93 93,-93 93,-227 0,-7 -0.5,-14.5 -0.5,-7.5 -0.5,-12.5 -5,29 -27,48 -22,19 -52,19L960,840Q927,840 903.5,816.5 880,793 880,760L880,720L720,720v-80q0,-33 23.5,-56.5Q767,560 800,560h40v0q0,-23 12.5,-40.5Q865,502 883,491q-20,-5 -40.5,-8 -20.5,-3 -42.5,-3 -134,0 -227,93 -93,93 -93,227 0,0 0,0 0,0 0,0h200q66,0 113,47 47,47 47,113v40L720,1000v110q20,5 39.5,7.5 19.5,2.5 40.5,2.5z"
-        android:strokeWidth="1"
-        android:strokeColor="#00000000" />
+      <group
+          android:scaleX="1.5"
+          android:scaleY="1.5"
+          android:translateX="10"
+          android:translateY="10">
+          <path
+              android:pathData="M36,36m-28,0a28,28 0,1 1,56 0a28,28 0,1 1,-56 0"
+              android:strokeLineJoin="round"
+              android:strokeWidth="2"
+              android:fillColor="@color/blue"
+              android:strokeColor="#000000"
+              android:strokeLineCap="round"/>
+
+      </group>
+      <group
+          android:scaleX="1.25"
+          android:scaleY="1.25"
+          android:translateX="18"
+          android:translateY="18">
+          <path
+              android:pathData="M56.803,45.75c0.599,-0.299 1.157,-0.672 1.663,-1.11 0.804,-0.698 1.463,-1.546 1.94,-2.497 0.599,-1.303 0.883,-2.728 0.829,-4.161 0.034,-1.498 -0.154,-2.994 -0.558,-4.437 -0.451,-1.645 -1.104,-3.229 -1.944,-4.714 -0.967,-2.141 -2.28,-4.108 -3.887,-5.822 -1.242,-1.326 -2.757,-2.366 -4.44,-3.048 -0.877,-0.372 -1.821,-0.56 -2.774,-0.553 -1.402,0.074 -2.729,0.697 -3.882,1.389 -1.285,0.81 -2.244,1.735 -2.771,3.053 -0.739,2.362 0.827,4.821 1.113,5.269 0.003,0.005 0.187,0.281 0.555,0.832 1.512,2.264 1.589,2.358 1.666,2.495 0.646,1.221 1.114,2.528 1.389,3.882 1.043,4.001 1.565,6.001 2.223,6.932 1.208,1.71 3.455,3.414 5.826,3.325 1.059,-0.088 2.093,-0.371 3.05,-0.835Z"
+              android:strokeWidth="2"
+              android:fillColor="@color/white"
+              android:strokeColor="#000000"
+              android:strokeLineCap="round"/>
+          <path
+              android:pathData="M22,41c-1.54,0.554 -2.83,1.642 -3.636,3.066 -0.714,1.365 -0.957,2.928 -0.693,4.445 0.178,1.247 0.632,2.439 1.329,3.488 2.032,3.228 5.383,4.423 7,5 1.613,0.561 3.295,0.897 5,1 2.387,0.205 6.923,0.535 11,-2 1.287,-0.665 2.335,-1.713 3,-3 0.661,-1.601 0.661,-3.399 0,-5 -0.389,-1.156 -1.121,-2.165 -2.099,-2.894 -0.919,-0.599 -1.974,-0.956 -3.069,-1.039 -2.057,-0.313 -2.756,0.139 -5.014,0.057 -1.271,-0.019 -2.534,-0.214 -3.753,-0.577 -3.036,-0.95 -3.33,-2.457 -5.889,-2.829 -1.066,-0.158 -2.155,-0.061 -3.177,0.282Z"
+              android:strokeWidth="2"
+              android:fillColor="@color/red"
+              android:strokeColor="#000000"
+              android:strokeLineCap="round"/>
+          <path
+              android:pathData="M12.7,26.975c1.758,-3.604 5.311,-3.191 9.58,-7.091 2.701,-2.469 2.858,-4.078 5.613,-5.202 1.407,-0.644 2.984,-0.819 4.498,-0.5 2.053,0.475 3.761,1.891 4.61,3.819 1.116,2.742 -0.314,5.437 -1.398,7.482 -0.951,1.689 -2.167,3.215 -3.602,4.518 -1.479,1.552 -3.161,2.898 -5,4 -2.629,1.541 -6.332,3.711 -9.989,2.43 -1.481,-0.548 -2.768,-1.521 -3.699,-2.796 -1.496,-1.906 -1.735,-4.512 -0.612,-6.659Z"
+              android:strokeWidth="2"
+              android:fillColor="@color/green"
+              android:strokeColor="#000000"
+              android:strokeLineCap="round"/>
+      </group>
+  </group>
 </vector>

app/src/main/res/drawable/map.xml

@@ -0,0 +1,16 @@
+<vector
+    android:height="24dp"
+    android:viewportHeight="24"
+    android:viewportWidth="24"
+    android:width="24dp"
+    xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <path
+        android:fillColor="?attr/colorOnBackground"
+        android:pathData="M20.5,3l-0.16,0.03L15,5.1 9,3 3.36,4.9c-0.21,0.07 -0.36,0.25 -0.36,0.48L3,20.5c0,0.28 0.22,0.5 0.5,0.5l0.16,-0.03L9,18.9l6,2.1 5.64,-1.9c0.21,-0.07 0.36,-0.25 0.36,-0.48L21,3.5c0,-0.28 -0.22,-0.5 -0.5,-0.5zM10,5.47l4,1.4v11.66l-4,-1.4L10,5.47zM5,6.46l3,-1.01v11.7l-3,1.16L5,6.46zM19,17.54l-3,1.01L16,6.86l3,-1.16v11.84z" />
+
+    <path
+        android:fillColor="?attr/colorPrimary"
+        android:pathData="M15,18.89l-6,-2.11L9,5.11l6,2.11v11.67z"/>
+
+</vector>

app/src/main/res/drawable/palette.xml

@@ -7,7 +7,7 @@
 
     <path
         android:fillColor="?attr/colorOnBackground"
-        android:pathData="M12,2C6.49,2 2,6.49 2,12s4.49,10 10,10c1.38,0 2.5,-1.12 2.5,-2.5c0,-0.61 -0.23,-1.2 -0.64,-1.67c-0.08,-0.1 -0.13,-0.21 -0.13,-0.33c0,-0.28 0.22,-0.5 0.5,-0.5H16c3.31,0 6,-2.69 6,-6C22,6.04 17.51,2 12,2zM17.5,13c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5C19,12.33 18.33,13 17.5,13zM14.5,9C13.67,9 13,8.33 13,7.5C13,6.67 13.67,6 14.5,6S16,6.67 16,7.5C16,8.33 15.33,9 14.5,9zM5,11.5C5,10.67 5.67,10 6.5,10S8,10.67 8,11.5C8,12.33 7.33,13 6.5,13S5,12.33 5,11.5zM11,7.5C11,8.33 10.33,9 9.5,9S8,8.33 8,7.5C8,6.67 8.67,6 9.5,6S11,6.67 11,7.5z" />
+        android:pathData="M12,22C6.49,22 2,17.51 2,12S6.49,2 12,2s10,4.04 10,9c0,3.31 -2.69,6 -6,6h-1.77c-0.28,0 -0.5,0.22 -0.5,0.5c0,0.12 0.05,0.23 0.13,0.33c0.41,0.47 0.64,1.06 0.64,1.67C14.5,20.88 13.38,22 12,22zM12,4c-4.41,0 -8,3.59 -8,8s3.59,8 8,8c0.28,0 0.5,-0.22 0.5,-0.5c0,-0.16 -0.08,-0.28 -0.14,-0.35c-0.41,-0.46 -0.63,-1.05 -0.63,-1.65c0,-1.38 1.12,-2.5 2.5,-2.5H16c2.21,0 4,-1.79 4,-4C20,7.14 16.41,4 12,4z" />
     <path
         android:fillColor="?attr/colorPrimary"
         android:pathData="M17.5,13c-0.83,0 -1.5,-0.67 -1.5,-1.5c0,-0.83 0.67,-1.5 1.5,-1.5s1.5,0.67 1.5,1.5C19,12.33 18.33,13 17.5,13zM14.5,9C13.67,9 13,8.33 13,7.5C13,6.67 13.67,6 14.5,6S16,6.67 16,7.5C16,8.33 15.33,9 14.5,9zM5,11.5C5,10.67 5.67,10 6.5,10S8,10.67 8,11.5C8,12.33 7.33,13 6.5,13S5,12.33 5,11.5zM11,7.5C11,8.33 10.33,9 9.5,9S8,8.33 8,7.5C8,6.67 8.67,6 9.5,6S11,6.67 11,7.5z" />

app/src/main/res/drawable/zoomin.xml

@@ -0,0 +1,12 @@
+<vector
+android:height="24dp"
+android:viewportHeight="24"
+android:viewportWidth="24"
+android:width="24dp"
+xmlns:android="http://schemas.android.com/apk/res/android" >
+
+<path android:fillColor="?attr/colorOnBackground" android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
+
+<path android:fillColor="?attr/colorPrimary" android:pathData="M12,10h-2v2H9v-2H7V9h2V7h1v2h2v1z"/>
+
+</vector>

app/src/main/res/layout/activity_stat.xml

@@ -1,15 +1,66 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical"
     android:theme="@style/Theme.Beans"
-    tools:context=".activity.StatActivity">
+    tools:context=".activity.StatsActivity">
 
-    <com.github.mikephil.charting.charts.PieChart
-        android:id="@+id/chart"
+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tab"
         android:layout_width="match_parent"
-        android:layout_height="match_parent" />
+        android:layout_height="wrap_content" />
+
+    <androidx.viewpager2.widget.ViewPager2
+        android:id="@+id/pager"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:visibility="gone" />
+
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingBottom="10dp">
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/group_color"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="2dp"
+            android:layout_marginBottom="2dp"
+            android:paddingStart="56dp"
+            android:text="@string/total"
+            android:textAlignment="textStart"
+            android:textColor="?attr/colorOnPrimary"
+            app:cornerRadius="0dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="RtlSymmetry" />
+
+        <com.google.android.material.textview.MaterialTextView
+            android:id="@+id/name"
+            android:layout_width="wrap_content"
+            android:layout_height="50dp"
+            android:gravity="start|center_vertical"
+            android:paddingStart="20dp"
+            android:paddingEnd="52dp"
+            android:text=""
+            android:textColor="?attr/colorOnPrimary"
+            app:layout_constraintBottom_toBottomOf="@id/group_color"
+            app:layout_constraintEnd_toEndOf="@id/group_color"
+            app:layout_constraintTop_toTopOf="@id/group_color" />
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+
+
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/stats"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" />
 
 </LinearLayout>

app/src/main/res/layout/fragment_about.xml

@@ -12,12 +12,11 @@
         android:orientation="vertical">
 
         <com.google.android.material.imageview.ShapeableImageView
-            android:layout_width="250dp"
-            android:layout_height="250dp"
-            android:layout_marginTop="40dp"
-            android:layout_marginBottom="30dp"
+            android:layout_width="300dp"
+            android:layout_height="300dp"
+            android:layout_marginTop="20dp"
             android:contentDescription="@string/logo"
-            android:src="@mipmap/ic_launcher_round" />
+            android:src="@drawable/ic_launcher_foreground" />
 
         <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"

app/src/main/res/layout/fragment_edit_places_colors.xml

@@ -6,6 +6,12 @@
     android:orientation="vertical"
     android:padding="16dp">
 
+    <TextView
+        android:id="@+id/warning_text"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="10dp" />
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"

app/src/main/res/menu/menu_edit.xml

@@ -0,0 +1,13 @@
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    tools:context="net.helcel.beans.activity.EditActivity" >
+
+    <item
+        android:id="@+id/action_color"
+        android:orderInCategory="100"
+        android:icon="@drawable/color"
+        android:title="@string/action_color"
+        app:showAsAction="ifRoom" />
+
+</menu>

app/src/main/res/mipmap-anydpi/ic_launcher.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/mipmap-anydpi/ic_launcher_round.xml

@@ -2,5 +2,4 @@
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@drawable/ic_launcher_background"/>
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
-    <monochrome android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>

app/src/main/res/values/arrays.xml

@@ -15,4 +15,11 @@
         <item>@string/on</item>
         <item>@string/off</item>
     </string-array>
+
+    <string-array name="map_projection">
+        <item>@string/azimuthalequidistant</item>
+        <item>@string/loximuthal</item>
+        <item>@string/mercator</item>
+
+    </string-array>
 </resources>

app/src/main/res/values/colors.xml

@@ -2,12 +2,12 @@
 <resources>
     <color name="black">#FF000000</color>
     <color name="darkgray">#FF0C1D2E</color>
+    <color name="gray">#425F7C</color>
     <color name="lightgray">#FF93A9BE</color>
-    <color name="white">#FFFFFFFF</color>
-
-    <color name="green">#93F531</color>
-    <color name="blue">#3193F5</color>
-    <color name="red">#F53131</color>
+    <color name="white">#FFF0F3F7</color>
 
+    <color name="blue">#0d5cab</color>
+    <color name="green">#B9F57D</color>
+    <color name="red">#F57D7D</color>
 
 </resources>

app/src/main/res/values/en.xml

@@ -1,10 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">Beans</string>
-    <string name="app_version">1.0</string>
+    <string name="app_version">1.0a</string>
     <string name="action_settings">Settings</string>
     <string name="action_stat">Stats</string>
     <string name="action_edit">Edit</string>
+    <string name="action_color">Color</string>
     <string name="key_theme">App theme</string>
     <string name="system">System</string>
     <string name="light">Light</string>
@@ -17,16 +18,21 @@
     <string name="key_regional">Regional</string>
     <string name="about">About</string>
     <string name="beans_is_foss">Beans is free and open source software, licensed under the GNU General Public License (version 3 or later)</string>
-    <string name="beans_repo">Project repository: https://git.helcel.net/helcel/beans\n Feel free to report issues or contribute to the project.</string>
+    <string name="beans_repo">Project repository: https://github.com/helcel-net/beans\n Feel free to report issues or contribute to the project.</string>
     <string name="foss_licenses">Free and open source dependencies and licenses</string>
     <string name="about_beans">About the Beans application</string>
+    <string name="edit_group">Select the group to assign. Long press on a group to edit its name and color.</string>
     <string name="delete_group">Are your sure you want to delete this group and remove all its country mappings?</string>
+    <string name="select_group">Select one group you want to keep. All others will be deleted and its mappings reassigned to the group you choose here.</string>
+    <string name="delete_regions">Are you sure you want to disable regions and reassign all regional mappings to the corresponding countries?</string>
     <string name="add">Add</string>
     <string name="clear">Clear</string>
     <string name="logo">Logo</string>
     <string name="name">Name</string>
     <string name="rate">%1$d/%2$d</string>
+    <string name="rate_with_unit">%1$d / %2$d %3$s</string>
     <string name="percentage">%1$d&#65285;</string>
+    <string name="number_with_unit">%1$d %2$s</string>
     <string name="color_rrggbb">RRGGBB</string>
     <string name="hashtag">#</string>
     <string name="on">On</string>
@@ -34,4 +40,10 @@
     <string name="delete">Delete</string>
     <string name="cancel">Cancel</string>
     <string name="ok">Ok</string>
+    <string name="total">Total</string>
+    <string name="uncategorized">Uncategorized</string>
+    <string name="azimuthalequidistant">Azimuthal Equidistant</string>
+    <string name="mercator">Mercator</string>
+    <string name="loximuthal">Loximuthal</string>
+    <string name="key_projection">Map Projection</string>
 </resources>

app/src/main/res/values/themes.xml

@@ -6,9 +6,27 @@
         <item name="android:panelColorBackground">@color/lightgray</item>
         <item name="android:statusBarColor">?attr/colorPrimary</item>
 
-        <item name="checkboxStyle">@style/Widget.App.CheckBox</item>
+        <item name="checkboxStyle">@style/Theme.Beans.CheckBox</item>
+        <item name="actionBarStyle">@style/Theme.Beans.ActionBar</item>
+        <item name="android:actionOverflowButtonStyle">@style/Theme.Beans.ActionBar.ButtonOverflow</item>
     </style>
 
-    <style name="Widget.App.CheckBox" parent="Widget.Material3.CompoundButton.CheckBox">
+    <style name="Theme.Beans.CheckBox" parent="Widget.Material3.CompoundButton.CheckBox">
+    </style>
+
+    <style name="Theme.Beans.ActionBar" parent="Widget.Material3.ActionBar.Solid">
+        <item name="background">?attr/colorPrimary</item>
+        <item name="titleTextStyle">@style/Theme.Beans.ActionBar.Text</item>
+        <item name="android:tint">@color/white</item>
+        <item name="actionMenuTextColor">@color/white</item>
+        <item name="homeAsUpIndicator">@drawable/back</item>
+    </style>
+
+    <style name="Theme.Beans.ActionBar.Text" parent="TextAppearance.Material3.ActionBar.Title">
+        <item name="android:textColor">@color/white</item>
+    </style>
+
+    <style name="Theme.Beans.ActionBar.ButtonOverflow" parent="Widget.Material3.Search.ActionButton.Overflow">
+        <item name="android:tint">@color/white</item>
     </style>
 </resources>

app/src/main/res/xml/fragment_settings.xml

@@ -4,23 +4,23 @@
     android:theme="@style/Theme.Beans">
 
     <ListPreference
-        app:defaultValue="@string/off"
+        app:defaultValue="@string/system"
         app:enabled="true"
-        app:entries="@array/entries_onoff"
-        app:entryValues="@array/entries_onoff"
-        app:icon="@drawable/edit"
-        app:key="@string/key_group"
-        app:title="@string/key_group"
+        app:entries="@array/entries_theme"
+        app:entryValues="@array/entries_theme"
+        app:icon="@drawable/palette"
+        app:key="@string/key_theme"
+        app:title="@string/key_theme"
         app:useSimpleSummaryProvider="true" />
 
     <ListPreference
-        app:defaultValue="@string/off"
+        app:defaultValue="@string/mercator"
         app:enabled="true"
-        app:entries="@array/entries_onoff"
-        app:entryValues="@array/entries_onoff"
-        app:icon="@drawable/edit"
-        app:key="@string/key_regional"
-        app:title="@string/key_regional"
+        app:entries="@array/map_projection"
+        app:entryValues="@array/map_projection"
+        app:icon="@drawable/map"
+        app:key="@string/key_projection"
+        app:title="@string/key_projection"
         app:useSimpleSummaryProvider="true" />
 
     <ListPreference
@@ -32,20 +32,32 @@
         app:key="@string/key_stats"
         app:title="@string/key_stats"
         app:useSimpleSummaryProvider="true" />
-    
+
     <ListPreference
-        app:defaultValue="@string/system"
+        app:defaultValue="@string/off"
         app:enabled="true"
-        app:entries="@array/entries_theme"
-        app:entryValues="@array/entries_theme"
-        app:icon="@drawable/palette"
-        app:key="@string/key_theme"
-        app:title="@string/key_theme"
+        app:allowDividerAbove="true"
+        app:entries="@array/entries_onoff"
+        app:entryValues="@array/entries_onoff"
+        app:icon="@drawable/group"
+        app:key="@string/key_group"
+        app:title="@string/key_group"
+        app:useSimpleSummaryProvider="true" />
+
+    <ListPreference
+        app:defaultValue="@string/off"
+        app:enabled="true"
+        app:entries="@array/entries_onoff"
+        app:entryValues="@array/entries_onoff"
+        app:icon="@drawable/zoomin"
+        app:key="@string/key_regional"
+        app:title="@string/key_regional"
         app:useSimpleSummaryProvider="true" />
 
     <Preference
         android:summary="@string/foss_licenses"
         app:enabled="true"
+        app:allowDividerAbove="true"
         app:icon="@drawable/licenses"
         app:key="@string/licenses"
         app:title="@string/licenses" />

build.gradle

@@ -1,6 +1,6 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.3.1' apply false
-    id 'com.android.library' version '8.3.1' apply false
-    id 'org.jetbrains.kotlin.android' version '1.9.23' apply false
+    id 'com.android.application' version '8.8.0' apply false
+    id 'com.android.library' version '8.8.0' apply false
+    id 'org.jetbrains.kotlin.android' version '2.1.0' apply false
 }

config/libraries/lib_gadm.json

@@ -0,0 +1,21 @@
+{
+  "uniqueId": "org.gadm:data",
+  "developers": [
+    {
+      "organisationUrl": "https://gadm.org/index.html",
+      "name": "GADM"
+    }
+  ],
+  "artifactVersion": "4.1",
+  "description": "GADM provides maps and spatial data for all countries and their sub-divisions.",
+  "scm": {
+    "connection": "scm:git@github.com:mikepenz/MaterialDrawer.git",
+    "url": "https://github.com/mikepenz/MaterialDrawer",
+    "developerConnection": "scm:git@github.com:mikepenz/MaterialDrawer.git"
+  },
+  "name": "GADM maps and data",
+  "website": "https://gadm.org/index.html",
+  "licenses": [
+    "0151ac7b561a385c536ad4c94532e60b"
+  ]
+}

config/licenses/lic_gadm.json

@@ -0,0 +1,6 @@
+{
+  "content": "<b>The data are freely available for academic use and other non-commercial use. Redistribution or commercial use is not allowed without prior permission.</b>\n\nUsing the data to create maps for publishing of academic research articles is allowed. Thus you can use the maps you made with GADM data for figures in articles published by PLoS, Springer Nature, Elsevier, MDPI, etc. You are allowed (but not required) to publish these articles (and the maps they contain) under an open license such as CC-BY as is the case with PLoS journals and may be the case with other open access articles. <b>Data for the following countries is covered by a a different license</b> <b>Austria</b>: Creative Commons Attribution-ShareAlike 2.0 (source: Government of Ausria)",
+  "hash": "0151ac7b561a385c536ad4c94532e60b",
+  "url": "https://gadm.org/license.html",
+  "name": "GADM license"
+}

genenum.js

@@ -58,12 +58,30 @@ const groups = {
 var dict0 = {}
 var dict1 = {}
 
-const formatStr = (str)=> str.replace(/(?<!\b\w)\B[A-Z]|,(?!$)/g, match => {
+const formatStr = (str)=> str.replace(/(?<!\b\w\u00E0-\u00FC)\B[A-Z\u00C0-\u00DC]|,(?!$)/g, match => {
   if (match.startsWith(',')) {
       return ', ';
   } else {
       return ' ' + match;
-  }})
+  }}).replace("ofthe "," of the ").replace("dela ", " de la ").replace("delos ", " de los ").replace("áD","á D").replace("eÁ","e Á")
+  .replace("ed'","e d'").replace("leof ","le of ").replace("dde ","d de ").replace("iode ","io de ").replace("àde ","à de ")
+  .replace("yof ","y of ").replace("Andrésy ","Andrés y")
+  .replace("aand ","a and ").replace("iand ", "i and ").replace("tsand ","ts and ").replace("onand ","on and ").replace("reand ", "re and ")
+  .replace("odel ","o del ").replace("adel ", "a del ").replace("ndel ","n del ").replace("zdel ","z del ").replace("falde ", "fal de ").replace("casdel ","cas del ")
+  .replace("odosÓ", "o dos Ó")
+  .replace("Grandedo ", "Grande do ").replace("Grandede ","Grande de ")
+  .replace("Santiagode ","Santiago de ").replace("Joséde ","José de ").replace("Pedrode ","Pedro de ")
+  .replace("andthe "," and the ")
+  .replace("emunicipality", "e municipality").replace("Villede ", "Ville de ")
+  .replace("Valledel ","Valle del ").replace("Valde ","Val de ").replace("Îlesdu ","Îles du ")
+  .replace("sÉ","s É").replace("áO","á O").replace("N C Tof ","NCT of ").replace("N A","NA")
+  .replace("Nortede ", "Norte de ")
+  .replace("Pinardel ", "Pinar del ")
+  .replace("Greeceand", "Greece and the Ionian")
+  .replace("Vientiane", "Vientiane Province")
+  .replace("Vientiane Province[prefecture]", "Vientiane Prefecture")
+  .replace("Valduz", "Vaduz")
+  .trim()
 
 const parse0 = (country) => {
   const filepath = `temp/0/${country}.json`

gensvg.sh

@@ -6,6 +6,7 @@ GADM_VERSION="4.1"
 GADM_BASEPATH="https://geodata.ucdavis.edu/gadm"
 
 mapshaper="./node_modules/mapshaper/bin/mapshaper"
+ATA_URL="https://media.githubusercontent.com/media/wmgeolab/geoBoundaries/905b0baf5f4fb3b9ccf45293647dcacdb2b799d4/releaseData/gbOpen/ATA/ADM0/geoBoundaries-ATA-ADM0_simplified.geojson"
 
 countries=(
   "AFG" "XAD" "ALA" "ALB" "DZA" "ASM" "AND" "AGO" "AIA" "ATG" "ARG" "ARM" "ABW" "AUS" "AUT" "AZE"
@@ -14,13 +15,13 @@ countries=(
   "DNK" "DJI" "DMA" "DOM" "ECU" "EGY" "SLV" "GNQ" "ERI" "EST" "ETH" "FLK" "FRO" "FJI" "FIN" "FRA" "GUF" "PYF" "ATF"
   "GAB" "GMB" "GEO" "DEU" "GHA" "GIB" "GRC" "GRL" "GRD" "GLP" "GUM" "GTM" "GGY" "GIN" "GNB" "GUY" "HTI" "HMD" "HND" "HUN"
   "ISL" "IND" "IDN" "IRN" "IRQ" "IRL" "IMN" "ISR" "ITA" "JAM" "JPN" "JEY" "JOR" "KAZ" "KEN" "KIR" "XKO" "KWT" "KGZ"
-  "LAO" "LVA" "LBN" "LSO" "LBR" "LBY" "LIE" "LTU" "LUX" "SXM"
-  "MKD" "MDG" "MWI" "MYS" "MDV" "MLI" "MLT" "MHL" "MTQ" "MRT" "MUS" "MYT" "MEX" "FSM" "MDA" "MCO" "MNG" "MNE" "MSR" "MAR" "MOZ" "MMR"
-  "NAM" "NRU" "NPL" "NLD" "NCL" "NZL" "NIC" "NER" "NGA" "NIU" "NFK" "PRK" "ZNC" "MNP" "NOR" "OMN"
-  "PAK" "PLW" "PSE" "PAN" "PNG" "PRY" "PER" "PHL" "PCN" "POL" "PRT" "PRI" "QAT" "COG" "REU" "ROU" "RUS" "RWA" "BLM" "MAF"
-  "SHN" "KNA" "LCA" "SPM" "VCT" "WSM" "SMR" "STP" "SAU" "SEN" "SRB" "SYC" "SLE" "SGP" "SVK" "SVN" "SLB" "SOM" "ZAF" "SGS" "KOR" "SSD" "ESP"
-  "LKA" "SDN" "SUR" "SJM" "SWZ" "SWE" "CHE" "SYR" "TWN" "TJK" "TZA" "THA" "TLS" "TGO" "TKL" "TON" "TTO" "TUN" "TUR" "TKM" "TCA" "TUV" "UGA"
-  "UKR" "ARE" "GBR" "USA" "UMI" "URY" "UZB" "VUT" "VAT" "VEN" "VNM" "VIR" "WLF" "ESH" "YEM" "ZMB" "ZWE"
+"LAO" "LVA" "LBN" "LSO" "LBR" "LBY" "LIE" "LTU" "LUX" "SXM"
+"MKD" "MDG" "MWI" "MYS" "MDV" "MLI" "MLT" "MHL" "MTQ" "MRT" "MUS" "MYT" "MEX" "FSM" "MDA" "MCO" "MNG" "MNE" "MSR" "MAR" "MOZ" "MMR"
+"NAM" "NRU" "NPL" "NLD" "NCL" "NZL" "NIC" "NER" "NGA" "NIU" "NFK" "PRK" "ZNC" "MNP" "NOR" "OMN"
+"PAK" "PLW" "PSE" "PAN" "PNG" "PRY" "PER" "PHL" "PCN" "POL" "PRT" "PRI" "QAT" "COG" "REU" "ROU" "RUS" "RWA" "BLM" "MAF"
+"SHN" "KNA" "LCA" "SPM" "VCT" "WSM" "SMR" "STP" "SAU" "SEN" "SRB" "SYC" "SLE" "SGP" "SVK" "SVN" "SLB" "SOM" "ZAF" "SGS" "KOR" "SSD" "ESP"
+"LKA" "SDN" "SUR" "SJM" "SWZ" "SWE" "CHE" "SYR" "TWN" "TJK" "TZA" "THA" "TLS" "TGO" "TKL" "TON" "TTO" "TUN" "TUR" "TKM" "TCA" "TUV" "UGA"
+"UKR" "ARE" "GBR" "USA" "UMI" "URY" "UZB" "VUT" "VAT" "VEN" "VNM" "VIR" "WLF" "ESH" "YEM" "ZMB" "ZWE"
 )
 
 
@@ -67,7 +68,10 @@ download_1() {
         jq '.features[] |= . + {properties: (.properties | .GID_1 = (.GID_0 + "_" + (
             if .HASC_1 != "NA" then (.HASC_1 | split(".") | .[-1])
             elif .ISO_1 != "NA" then (.ISO_1 | split("-") | .[-1])
-            else (.CC_1)
+            elif .CC_1 != "NA" then (.CC_1)
+            elif .NAME_1 != "NA" then (.NAME_1)
+            elif .GID_1 != "NA" then (.GID_1 | split(".") | .[-1])
+            else .GID_1
             end
             )))}' "$output_dir/gadm41_${1}_1.json"  > "$output_dir/$1.json.1"
         sed -E 's/"[gadm41_]*([A-Z]*)_1"/"\1"/g' "$output_dir/$1.json.1" > "$output_dir/$1.json"
@@ -76,7 +80,7 @@ download_1() {
 
 
 toSVG_0() {
-    local input_files=()
+    local input_files=("ATA")
 
     for country in "${countries[@]}"
     do
@@ -94,7 +98,7 @@ toSVG_0() {
 }
 
 toSVG_1() {
-    input_files=()
+    input_files=("ATA")
 
     for country in "${countries[@]}"
     do
@@ -114,21 +118,27 @@ toSVG_1() {
 
 toSVG_01() {
     input_files=()
-
+    
+    input_files+=("./temp/1/ATA.json")
     for country in "${countries[@]}"
     do
-        input_file0="./temp/0/${country}.json"
         input_file1="./temp/1/${country}.json"
         if [ -f "$input_file1" ]; then
             input_files+=("$input_file1")
         fi
+    done
+    input_files+=("./temp/0/ATA.json")
+    for country in "${countries[@]}"
+    do
+        input_file0="./temp/0/${country}.json"
         if [ -f "$input_file0" ]; then
             input_files+=("$input_file0")
         fi
     done
 
-    "$mapshaper" -i combine-files ${input_files[@]} -proj webmercator -simplify 0.005 weighted keep-shapes resolution=1200x1200  -o ./app/src/main/assets/mercator01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
-    "$mapshaper" -i combine-files ${input_files[@]} -proj aeqd +lat_0=90 -simplify 0.005 weighted keep-shapes resolution=1200x1200 -o ./app/src/main/assets/aeqd01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    "$mapshaper" -i combine-files ${input_files[@]} snap -proj loxim densify -simplify 0.001 weighted keep-shapes -o ./app/src/main/assets/loxim01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    "$mapshaper" -i combine-files ${input_files[@]} snap -proj webmercator densify -simplify 0.001 weighted keep-shapes -o ./app/src/main/assets/webmercator01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
+    "$mapshaper" -i combine-files ${input_files[@]} snap -proj aeqd +lat_0=90 densify -simplify 0.001 weighted keep-shapes -o ./app/src/main/assets/aeqd01.svg svg-data=GID_0,COUNTRY,GID,NAME id-field=GID
 }
 
 do_1() {
@@ -136,15 +146,17 @@ do_1() {
     do
         download_1 "$country"
     done
+    wget -q -O "./temp/1/ATA.json" "$ATA_URL"
 }
 do_0() {
     for country in "${countries[@]}"
     do
         download_0 "$country"
     done
+    wget -q -O "./temp/1/ATA.json" "$ATA_URL"
 }
 # do_0
-do_1
+# do_1
 # toSVG_0
-toSVG_1
+# toSVG_1
 toSVG_01

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip
+distributionSha256Sum=7a00d51fb93147819aab76024feece20b6b84e420694101f276be952e08bef03
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.12-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -84,7 +86,7 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

mapping.js

@@ -0,0 +1,325 @@
+var continents = {
+XAD:"EEE",
+ALA:"EEE",
+ALB:"EEE",
+AND:"EEE",
+AUT:"EEE",
+BLR:"EEE",
+BEL:"EEE",
+BIH:"EEE",
+BGR:"EEE",
+HRV:"EEE",
+CYP:"EEE",
+CZE:"EEE",
+DNK:"EEE",
+EST:"EEE",
+FRO:"EEE",
+FIN:"EEE",
+FRA:"EEE",
+DEU:"EEE",
+GIB:"EEE",
+GRC:"EEE",
+GGY:"EEE",
+HUN:"EEE",
+ISL:"EEE",
+IRL:"EEE",
+IMN:"EEE",
+ITA:"EEE",
+JEY:"EEE",
+KAZ:"EEE",
+XKO:"EEE",
+LVA:"EEE",
+LIE:"EEE",
+LTU:"EEE",
+LUX:"EEE",
+MLT:"EEE",
+MDA:"EEE",
+MCO:"EEE",
+MNE:"EEE",
+NLD:"EEE",
+MKD:"EEE",
+NOR:"EEE",
+POL:"EEE",
+PRT:"EEE",
+ROU:"EEE",
+RUS:"EEE",
+SMR:"EEE",
+SRB:"EEE",
+SVK:"EEE",
+SVN:"EEE",
+ESP:"EEE",
+SJM:"EEE",
+SWE:"EEE",
+CHE:"EEE",
+UKR:"EEE",
+GBR:"EEE",
+VAT:"EEE",
+
+AFG:"ABB",
+ARM:"ABB",
+AZE:"ABB",
+BHR:"ABB",
+BGD:"ABB",
+BTN:"ABB",
+IOT:"ABB",
+BRN:"ABB",
+KHM:"ABB",
+CCK:"ABB",
+CHN:"ABB",
+CXR:"ABB",
+GEO:"ABB",
+HKG:"ABB",
+IND:"ABB",
+IDN:"ABB",
+IRN:"ABB",
+IRQ:"ABB",
+ISR:"ABB",
+JPN:"ABB",
+JOR:"ABB",
+KWT:"ABB",
+KGZ:"ABB",
+LAO:"ABB",
+LBN:"ABB",
+MAC:"ABB",
+MYS:"ABB",
+MDV:"ABB",
+MNG:"ABB",
+MMR:"ABB",
+NPL:"ABB",
+PRK:"ABB",
+OMN:"ABB",
+PAK:"ABB",
+PSE:"ABB",
+PHL:"ABB",
+QAT:"ABB",
+SAU:"ABB",
+SGP:"ABB",
+KOR:"ABB",
+LKA:"ABB",
+SYR:"ABB",
+TWN:"ABB",
+TJK:"ABB",
+THA:"ABB",
+TLS:"ABB",
+TUR:"ABB",
+TKM:"ABB",
+ARE:"ABB",
+UZB:"ABB",
+VNM:"ABB",
+YEM:"ABB",
+ZNC:"ABB",
+
+DZA:"FFF",
+AGO:"FFF",
+BDI:"FFF",
+BEN:"FFF",
+BWA:"FFF",
+BFA:"FFF",
+BDI:"FFF",
+CPV:"FFF",
+CMR:"FFF",
+CAF:"FFF",
+TCD:"FFF",
+COM:"FFF",
+COG:"FFF",
+COD:"FFF",
+CIV:"FFF",
+DJI:"FFF",
+EGY:"FFF",
+GNQ:"FFF",
+ERI:"FFF",
+ETH:"FFF",
+ATF:"FFF",
+GAB:"FFF",
+GMB:"FFF",
+GHA:"FFF",
+GIN:"FFF",
+GNB:"FFF",
+KEN:"FFF",
+LSO:"FFF",
+LBR:"FFF",
+LBY:"FFF",
+MDG:"FFF",
+MWI:"FFF",
+MLI:"FFF",
+MRT:"FFF",
+MUS:"FFF",
+MYT:"FFF",
+MAR:"FFF",
+MOZ:"FFF",
+NAM:"FFF",
+NER:"FFF",
+NGA:"FFF",
+COD:"FFF",
+REU:"FFF",
+RWA:"FFF",
+STP:"FFF",
+SEN:"FFF",
+SYC:"FFF",
+SLE:"FFF",
+SOM:"FFF",
+ZAF:"FFF",
+SSD:"FFF",
+SHN:"FFF",
+SDN:"FFF",
+SWZ:"FFF",
+TZA:"FFF",
+TGO:"FFF",
+TUN:"FFF",
+UGA:"FFF",
+COD:"FFF",
+ZMB:"FFF",
+ZWE:"FFF",
+ESH:"FFF",
+
+ABW:"NNN",
+AIA:"NNN",
+ATG:"NNN",
+BHS:"NNN",
+BRB:"NNN",
+BLZ:"NNN",
+BMU:"NNN",
+BES:"NNN",
+VGB:"NNN",
+CAN:"NNN",
+CYM:"NNN",
+XCL:"NNN",
+CRI:"NNN",
+CUB:"NNN",
+CUW:"NNN",
+DMA:"NNN",
+DOM:"NNN",
+SLV:"NNN",
+GRL:"NNN",
+GRD:"NNN",
+GLP:"NNN",
+GTM:"NNN",
+HTI:"NNN",
+HND:"NNN",
+JAM:"NNN",
+MTQ:"NNN",
+MEX:"NNN",
+MSR:"NNN",
+ANT:"NNN",
+CUW:"NNN",
+NIC:"NNN",
+PAN:"NNN",
+PRI:"NNN",
+BLM:"NNN",
+KNA:"NNN",
+LCA:"NNN",
+MAF:"NNN",
+SPM:"NNN",
+VCT:"NNN",
+SXM:"NNN",
+TTO:"NNN",
+TCA:"NNN",
+USA:"NNN",
+UMI:"NNN",
+VIR:"NNN",
+
+ARG:"SRR",
+BOL:"SRR",
+BRA:"SRR",
+CHL:"SRR",
+COL:"SRR",
+ECU:"SRR",
+FLK:"SRR",
+GUF:"SRR",
+GUY:"SRR",
+PRY:"SRR",
+PER:"SRR",
+SUR:"SRR",
+URY:"SRR",
+VEN:"SRR",
+
+ASM:"UUU",
+AUS:"UUU",
+COK:"UUU",
+FJI:"UUU",
+PYF:"UUU",
+GUM:"UUU",
+KIR:"UUU",
+MHL:"UUU",
+FSM:"UUU",
+NRU:"UUU",
+NCL:"UUU",
+NZL:"UUU",
+NIU:"UUU",
+NFK:"UUU",
+MNP:"UUU",
+PLW:"UUU",
+PNG:"UUU",
+PCN:"UUU",
+WSM:"UUU",
+SLB:"UUU",
+TKL:"UUU",
+TON:"UUU",
+TUV:"UUU",
+VUT:"UUU",
+WLF:"UUU",
+
+ATA:"XXX",
+BVT:"XXX",
+HMD:"XXX",
+SGS:"XXX",
+}
+
+import fs from "fs"
+import {JSDOM} from "jsdom"
+
+function groupByContinent(svgFilePath) {
+    // Read the SVG file
+    fs.readFile(svgFilePath, 'utf-8', (err, data) => {
+        if (err) {
+            console.error('Error reading SVG file:', err);
+            return;
+        }
+
+        // Create a virtual DOM with JSDOM
+        const dom = new JSDOM(data);
+        const document = dom.window.document;
+
+        // Select the root <svg> element
+        const svgElement = document.querySelector('svg');
+
+        // Group <g> elements representing countries by continent
+        const world = {}; // Renamed continents object to 'world'
+        svgElement.querySelectorAll('g').forEach(countryGroup => {
+            const countryId = countryGroup.getAttribute('id');
+            if (countryId!= null){
+                const continentId = continents[countryId.replace(/\d/g, "")] || "XXX"; // Remove numbers from country ID to get continent ID
+                if (!world[continentId]) {
+                    world[continentId] = document.createElementNS('http://www.w3.org/2000/svg', 'g');
+                    world[continentId].setAttribute('id', continentId);
+                }
+                world[continentId].innerHTML += countryGroup.outerHTML;
+            }else{
+
+            console.log(countryId,countryGroup.outerHTML)
+            }
+        });
+
+        // Create new <g> elements for each continent
+        svgElement.innerHTML = '';
+        for (const continentId in world) {
+            svgElement.appendChild(world[continentId]);
+        }
+
+        // Output the modified SVG
+        fs.writeFile(svgFilePath, svgElement.outerHTML, 'utf-8', err => {
+            if (err) {
+                console.error('Error writing to SVG file:', err);
+                return;
+            }
+            console.log('SVG file updated successfully.');
+        });
+    });
+}
+
+
+// Example usage:
+const svgFileBasePath = "./app/src/main/assets/" ;
+groupByContinent(svgFileBasePath+ "webmercator01.svg");
+groupByContinent(svgFileBasePath+ "aeqd01.svg");
+groupByContinent(svgFileBasePath+ "loxim01.svg");

metadata/en-US/full_description.txt

@@ -1 +1,11 @@
-<p><i>Beans</i> is a scratchmap of the world for android. You can color in a single or many custom colors. You can color on a country or state basis.</p>
+Beans is a scratchmap of the world for Android.
+
+Keep track of your discovery of the world on a colorful visual map.
+
+* Color a map of places based on custom labels
+* Country/State based coloring
+* Single/Multi color modes
+* Different map projections available
+* Small & Fast
+* Statistics (WIP)
+* 100% Free and Open Source software, with no proprietary dependencies

metadata/en-US/title.txt

@@ -0,0 +1 @@
+Beans

package.json

@@ -1,13 +1,8 @@
 {
   "dependencies": {
-    "@turf/area": "^6.5.0",
-    "@turf/concave": "^6.5.0",
-    "@turf/convex": "^6.5.0",
-    "@turf/projection": "^6.5.0",
-    "@turf/simplify": "^6.5.0",
-    "@turf/truncate": "^6.5.0",
-    "@turf/turf": "^6.5.0",
-    "geojson2svg": "^2.0.1",
+    "@turf/area": "^7.0.0",
+    "@turf/turf": "^7.0.0",
+    "jsdom": "^26.0.0",
     "mapshaper": "^0.6.79"
   },
   "type": "module"