Update README.md

Reviewed-on: #55

.github/workflows/build.yml

@@ -0,0 +1,64 @@
+#file: noinspection SpellCheckingInspection
+
+name: CI-Android APK
+
+env:
+  main_project_module: app
+  playstore_name: Beans
+
+on:
+  push:
+    branches: [ main ]
+    tags:
+      - '**'
+  pull_request:
+    branches: [ main ]
+  workflow_dispatch:
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: set up secrets
+        run: |
+          echo "${{ secrets.RELEASE_KEYSTORE }}" > keystore.asc
+          echo "${{ secrets.RELEASE_KEY}}" > key.asc
+          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
+
+      - name: create and checkout branch
+        if: github.event_name == 'pull_request'
+        env:
+          BRANCH: ${{ github.head_ref }}
+        run: git checkout -B "$BRANCH"
+
+      - name: set up JDK
+        uses: actions/setup-java@v4
+        with:
+          java-version: 17
+          distribution: "temurin"
+          cache: 'gradle'
+
+      - name: Build APK
+        run: ./gradlew assembleSignedRelease
+
+      - name: Release
+        uses: softprops/action-gh-release@v2
+        if: startsWith(github.ref, 'refs/tags/')
+        with:
+          files: |
+            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

.gitignore

@@ -16,4 +16,12 @@ temp/
 .externalNativeBuild
 .cxx
 .yarn
+app/build/
+app/debug/
+app/release/
+captures/
+.externalNativeBuild
+.cxx
 local.properties
+keystore.properties
+key.jks

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

@@ -0,0 +1,85 @@
+<!--suppress ALL -->
+<div align="center">
+  <h1>Beans</h1>
+  <img width="100px" src="./metadata/en-US/images/icon.png" alt="Logo">
+  
+  <p>A virtual scratchmap of the world</p>
+  
+  <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/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>
+
+## 🌄 Screenshots
+
+<div align="center">
+  <table>
+    <tr>
+      <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>
+
+## ⭐ Features
+
+- 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://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://github.com/helcel-net/beans/releases/latest">
+        <img width="200" height="84" alt="APK Download" src=".github/images/apk.png">
+    </a>
+</div>
+
+
+## ⚙️ Permissions
+
+None
+
+## 📝 Contribute
+
+Beans is a user-driven project. We welcome any contribution, big or small.
+
+- **🖥️ Development:** Fix bugs, implement features, or research issues. Open a PR for review.
+- **🍥 Design:** Improve interfaces, including accessibility and usability.
+- **📂 Issue Reporting:** Report bugs and edge cases with relevant info.
+- **🌍 Localization:** Translate if it doesn't support your language.
+
+## ✏️ Acknowledgements
+
+Thanks to all contributors, the developers of our dependencies, and our users.
+
+## 📝 License
+
+```
+Copyright (C) 2024 Helcel MYDOLI
+
+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

@@ -2,9 +2,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 'com.mikepenz.aboutlibraries.plugin' version '11.1.3'
 }
 
+
 android {
     namespace 'net.helcel.beans'
     compileSdk 34
@@ -16,13 +17,38 @@ android {
         versionCode 1
         versionName "1.0"
     }
+    signingConfigs {
+        create("release") {
+            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'
-            signingConfig signingConfigs.debug
+        }
+        signedRelease {
+            minifyEnabled true
+            shrinkResources false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            signingConfig = signingConfigs.getByName("release")
         }
     }
     compileOptions {
@@ -49,6 +75,9 @@ android {
     }
 
 }
+aboutLibraries {
+    exclusionPatterns = [~"androidx.*", ~"com.google.android.*", ~"org.jetbrains.*"]
+}
 
 dependencies {
     coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs_nio:2.0.4'
@@ -58,6 +87,5 @@ dependencies {
 
     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.1.3'
 }

app/src/main/AndroidManifest.xml

@@ -3,21 +3,21 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <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 +25,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_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,7 +1029,7 @@ 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_MH|GRC|Macedonia and Thrace|33122
 GRC_PW|GRC|Peloponnese, Western Greeceand|29194
 GRC_TC|GRC|Thessalyand Central Greece|29744
 GRL_KU|GRL|Kujalleq|45647
@@ -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
@@ -1291,14 +1324,14 @@ IRL_WD|IRL|Waterford|1857
 IRL_WH|IRL|Westmeath|1835
 IRL_WX|IRL|Wexford|2367
 IRL_WW|IRL|Wicklow|2022
-IRL_CK|IRL|NA|7488
+IRL_CK|IRL|Cork|7488
 IMN_AY|IMN|Ramsey|4
 IMN_RU|IMN|Port Saint Mary|2
 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
@@ -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
@@ -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
@@ -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|NA|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
@@ -1931,7 +1995,7 @@ MMR_SA|MMR|Sagaing|96034
 MMR_SH|MMR|Shan|156514
 MMR_TN|MMR|Tanintharyi|41535
 MMR_YA|MMR|Yangon|9607
-NAM_KA|NAM|!Karas|161821
+NAM_KA|NAM|Karas|161821
 NAM_ER|NAM|Erongo|63918
 NAM_HA|NAM|Hardap|110185
 NAM_OK|NAM|Kavango|48945
@@ -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_NA|NLD|NA|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|NA|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
@@ -3295,7 +3378,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 +3387,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 +3430,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 +3450,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 +3479,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 +3575,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 +3628,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
-NA_NA|GBR|NA|417
+Z06_NA|PAK|Gilgit-Baltistan|68053

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

@@ -1,39 +1,41 @@
 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 androidx.viewpager2.widget.ViewPager2
-import com.google.android.material.tabs.TabLayout
+import androidx.fragment.app.Fragment
 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.EditPlaceColorFragment
 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.DialogCloser
+import net.helcel.beans.helper.Settings
 import net.helcel.beans.helper.Theme.createActionBar
 
 
 class EditActivity : AppCompatActivity() {
 
-    private lateinit var viewPager: ViewPager2
-    private lateinit var tabLayout: TabLayout
+    private lateinit var _binding: ActivityEditBinding
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+        _binding = ActivityEditBinding.inflate(layoutInflater)
 
-        setContentView(R.layout.activity_edit)
+        setContentView(_binding.root)
         createActionBar(this, getString(R.string.action_edit))
 
-
-        viewPager = findViewById(R.id.pager)
-        tabLayout = findViewById(R.id.tab)
-
-        val adapter = ViewPagerAdapter(supportFragmentManager, lifecycle, viewPager)
-        viewPager.adapter = adapter
+        val adapter = ViewPagerAdapter(supportFragmentManager, lifecycle, _binding.pager)
+        _binding.pager.adapter = adapter
         adapter.addFragment(null, EditPlaceFragment(World.WWW, adapter))
 
-        TabLayoutMediator(tabLayout, viewPager) { tab, position ->
+        TabLayoutMediator(_binding.tab, _binding.pager) { tab, position ->
             tab.text = adapter.getLabel(position)
         }.attach()
 
@@ -44,8 +46,24 @@ 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

@@ -1,19 +1,16 @@
 package net.helcel.beans.activity
 
 import android.content.Intent
-import android.content.SharedPreferences
 import android.graphics.drawable.PictureDrawable
 import android.os.Bundle
 import android.view.Menu
-import android.view.MenuInflater
 import android.view.MenuItem
 import androidx.appcompat.app.AppCompatActivity
-import androidx.core.view.MenuProvider
 import com.caverock.androidsvg.RenderOptions
-import com.github.chrisbanes.photoview.PhotoView
 import net.helcel.beans.R
 import net.helcel.beans.countries.GeoLocImporter
-import net.helcel.beans.helper.Data.loadData
+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
@@ -21,79 +18,59 @@ import net.helcel.beans.svg.SVGWrapper
 
 
 class MainActivity : AppCompatActivity() {
-
-    private lateinit var sharedPreferences: SharedPreferences
-
-    private lateinit var photoView: PhotoView
+    private lateinit var _binding: ActivityMainBinding
 
     private lateinit var psvg: SVGWrapper
     private lateinit var css: CSSWrapper
 
     override fun onRestart() {
+        refreshProjection()
         refreshMap()
         super.onRestart()
     }
 
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
+        menuInflater.inflate(R.menu.menu_main, menu)
+        return true
+    }
+
+    override fun onOptionsItemSelected(item: MenuItem): Boolean {
+        val d = when (item.itemId) {
+            R.id.action_edit -> EditActivity::class.java
+            R.id.action_stats -> StatsActivity::class.java
+            R.id.action_settings -> SettingsActivity::class.java
+            else -> throw Exception("Non Existent Menu Item")
+        }
+        startActivity(Intent(this@MainActivity, d))
+        return true
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-
-        // Create action bar
-        supportActionBar?.setBackgroundDrawable(colorWrapper(this, android.R.attr.colorPrimary))
-
-        // Fetch shared preferences to restore app theme upon startup
+        _binding = ActivityMainBinding.inflate(layoutInflater)
         Settings.start(this)
 
-        // Create menu in action bar
-        addMenuProvider(object : MenuProvider {
-            override fun onCreateMenu(menu: Menu, menuInflater: MenuInflater) {
-                menuInflater.inflate(R.menu.menu_main, menu)
-            }
+        setContentView(_binding.root)
 
-            override fun onMenuItemSelected(menuItem: MenuItem): Boolean {
-                return when (menuItem.itemId) {
-                    R.id.action_edit -> {
-                        startActivity(Intent(this@MainActivity, EditActivity::class.java))
-                        true
-                    }
+        _binding.photoView.minimumScale = 1f
+        _binding.photoView.maximumScale = 40f
 
-                    R.id.action_stats -> {
-                        startActivity(Intent(this@MainActivity, StatActivity::class.java))
-                        true
-                    }
-
-                    R.id.action_settings -> {
-                        startActivity(Intent(this@MainActivity, SettingsActivity::class.java))
-                        true
-                    }
-
-                    else -> {
-                        false
-                    }
-                }
-            }
-
-        })
-
-        // Populate map from list of countries
-        setContentView(R.layout.activity_main)
-
-        photoView = findViewById(R.id.photo_view)
-        photoView.minimumScale = 1f
-        photoView.maximumScale = 40f
-
-        GeoLocImporter.importState(this)
-        loadData(this, Int.MIN_VALUE)
-        psvg = SVGWrapper(this)
-        css = CSSWrapper(this)
+        GeoLocImporter.importStates(this)
+        Data.loadData(this, Int.MIN_VALUE)
 
+        refreshProjection()
         refreshMap()
     }
 
     private fun refreshMap() {
         val opt: RenderOptions = RenderOptions.create()
-        css.refresh()
         opt.css(css.get())
-        photoView.setImageDrawable(PictureDrawable(psvg.get()?.renderToPicture(opt)))
+        _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,45 +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.View
 import android.view.ViewGroup
-import android.widget.TextView
 import androidx.fragment.app.FragmentActivity
-import androidx.preference.PreferenceManager
 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.helper.Data.groups
-import net.helcel.beans.helper.Data.saveData
-import net.helcel.beans.helper.Data.selected_geoloc
-import net.helcel.beans.helper.Data.selected_group
-import net.helcel.beans.helper.Data.visits
-import net.helcel.beans.helper.Settings
+import net.helcel.beans.databinding.ItemListGeolocBinding
+import net.helcel.beans.helper.*
 import net.helcel.beans.helper.Theme.colorWrapper
 
 class GeolocListAdapter(
-    private val ctx: EditPlaceFragment, 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 lateinit var view: View
+    private val sortedList = l.children.toList().sortedBy { it.fullName }
+    private val holders: MutableSet<FoldingListViewHolder> = mutableSetOf()
 
     override fun onCreateViewHolder(viewGroup: ViewGroup, viewType: Int): FoldingListViewHolder {
-        view = LayoutInflater
-            .from(viewGroup.context)
-            .inflate(R.layout.item_list_geoloc, viewGroup, false)
-        return FoldingListViewHolder(ctx.requireActivity(), view)
+        val binding = ItemListGeolocBinding.inflate(
+            LayoutInflater.from(viewGroup.context),
+            viewGroup,
+            false
+        )
+        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
         }
     }
@@ -50,110 +49,144 @@ class GeolocListAdapter(
         return l.children.size
     }
 
-    class FoldingListViewHolder(private val ctx: FragmentActivity, itemView: View) :
-        RecyclerView.ViewHolder(itemView) {
-        private val textView: TextView = itemView.findViewById(R.id.textView)
-        private val progressView: TextView = itemView.findViewById(R.id.name)
-        private val checkBox: MaterialCheckBox = itemView.findViewById(R.id.checkBox)
+    fun refreshColors(colorDrawable: ColorDrawable) {
+        holders.forEach { it.refreshColor(colorDrawable) }
+    }
 
-        private val sharedPreferences = PreferenceManager.getDefaultSharedPreferences(ctx)
-        private val statsPref = sharedPreferences.getString(
-            ctx.getString(R.string.key_stats),
-            ctx.getString(R.string.counters)
-        )
+    class FoldingListViewHolder(
+        private val ctx: FragmentActivity,
+        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) {
+            refreshCount(el)
+            _binding.textView.setTypeface(null, Typeface.BOLD)
+            _binding.textView.backgroundTintList = ColorStateList.valueOf(
+                colorWrapper(
+                    ctx,
+                    android.R.attr.panelColorBackground
+                ).color
+            ).withAlpha(64)
+        }
 
         fun bind(el: GeoLoc) {
-            textView.text = el.fullName
-            if (el.children.isEmpty() || (el.type == GeoLoc.LocType.COUNTRY && !Settings.isRegional(
-                    ctx
-                ))
-            ) {
-                textView.backgroundTintList =
-                    ColorStateList.valueOf(colorWrapper(ctx, android.R.attr.colorBackground).color)
-            } else {
-                textView.setTypeface(null, Typeface.BOLD)
+            this.el = el
+            _binding.textView.text = el.fullName
+            _binding.textView.backgroundTintList =
+                ColorStateList.valueOf(colorWrapper(ctx, android.R.attr.colorBackground).color)
 
-                val numerator = el.children.map { visits.getVisited(it) != 0 }.count { it }
-                val denominator = el.children.size
+            if (el.children.isNotEmpty())
+                bindGroup(el)
 
-                progressView.text = when (statsPref) {
-                    ctx.getString(R.string.percentages) -> ctx.getString(
-                        R.string.percentage,
-                        (100 * (numerator.toFloat() / denominator.toFloat())).toInt()
-                    )
-
-                    else -> ctx.getString(R.string.rate, numerator, denominator)
-                }
-                textView.backgroundTintList = ColorStateList.valueOf(
-                    colorWrapper(
-                        ctx,
-                        android.R.attr.panelColorBackground
-                    ).color
-                ).withAlpha(128)
-                textView.parent.parent.requestChildFocus(textView, textView)
-            }
             refreshCheck(el)
         }
 
-        fun addListeners(el: GeoLoc, expandLambda: () -> Boolean) {
-            if (el.children.isNotEmpty() && (el.type != GeoLoc.LocType.COUNTRY || Settings.isRegional(
-                    ctx
-                ))
-            ) {
-                textView.setOnClickListener { expandLambda() }
+        fun refreshColor(colorDrawable: ColorDrawable) {
+            if (Data.visits.getVisited(el) !in listOf(NO_GROUP, AUTO_GROUP)) {
+                _binding.checkBox.buttonTintList =
+                    ColorStateList.valueOf(colorDrawable.color)
+                refreshCheck(el)
             }
-            checkBox.setOnClickListener {
-                selected_geoloc = el
-                if (groups.size() == 1 && Settings.isSingleGroup(ctx)) {
-                    if (checkBox.isChecked) {
+        }
+
+        fun addListeners(el: GeoLoc, expandLambda: () -> Boolean) {
+            if (el.children.isNotEmpty()) {
+                _binding.textView.setOnClickListener { expandLambda() }
+            }
+            _binding.checkBox.setOnClickListener {
+                Data.selected_geoloc = el
+                if (Data.groups.size() == 1 && Settings.isSingleGroup(ctx)) {
+                    if (_binding.checkBox.isChecked) {
                         // If one has just checked the box (assign unique group)
-                        selected_group = groups.getUniqueEntry()
-                        onColorDialogDismiss(false)
+                        Data.selected_group = Data.groups.getUniqueEntry()
+                        onDialogDismiss(false)
                     } else {
                         // If one has just unchecked the box (unassign unique group)
-                        selected_group = null
-                        onColorDialogDismiss(true)
+                        Data.selected_group = null
+                        onDialogDismiss(true)
                     }
                 } else {
-                    selected_group = null
+                    Data.selected_group = null
                     EditPlaceColorFragment(this).show(
                         ctx.supportFragmentManager,
                         "AddColorDialogFragment"
                     )
                 }
+                _parentHolder?.refresh(_parentGeoLoc)
             }
         }
 
-        fun onColorDialogDismiss(clear: Boolean) {
+        override fun onDialogDismiss(clear: Boolean) {
             if (clear) {
-                visits.setVisited(selected_geoloc!!, 0)
-                saveData()
+                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 (selected_group != null && selected_geoloc != null) {
-                visits.setVisited(selected_geoloc!!, selected_group!!.key)
-                saveData()
+            if (Data.selected_group != null && Data.selected_geoloc != null) {
+                Data.visits.setVisited(Data.selected_geoloc, Data.selected_group?.key ?: NO_GROUP)
+                Data.saveData()
             }
-            selected_geoloc?.let { refreshCheck(it) }
-            selected_geoloc = null
-            selected_group = null
+            Data.selected_geoloc?.let { refreshCheck(it) }
+            Data.selected_geoloc = null
+            Data.selected_group = null
+            _parentHolder?.refresh(_parentGeoLoc)
         }
 
         private fun refreshCheck(geoLoc: GeoLoc) {
-            var col = groups.getGroupFromKey(visits.getVisited(geoLoc)).color.color
-            if (col == Color.TRANSPARENT)
-                col = Color.GRAY
-            checkBox.checkedState =
-                if (visits.getVisited(geoLoc) != 0) MaterialCheckBox.STATE_CHECKED
-                else if (geoLoc.children.any { visits.getVisited(it) != 0 }) MaterialCheckBox.STATE_INDETERMINATE
-                else MaterialCheckBox.STATE_UNCHECKED
+            _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()
 
-            checkBox.buttonTintList = ColorStateList(
-                arrayOf(
-                    intArrayOf(-android.R.attr.state_checked),
-                    intArrayOf(android.R.attr.state_checked)
-                ),
-                intArrayOf(col, col)
-            )
+            var col = Data.groups.getGroupFromKey(Data.visits.getVisited(geoLoc)).color
+            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.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

@@ -1,28 +1,26 @@
 package net.helcel.beans.activity.adapter
 
 import android.view.LayoutInflater
-import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
-import android.widget.TextView
 import androidx.fragment.app.DialogFragment
 import androidx.fragment.app.FragmentActivity
 import androidx.recyclerview.widget.RecyclerView
-import net.helcel.beans.R
 import net.helcel.beans.activity.fragment.EditGroupAddFragment
+import net.helcel.beans.databinding.ItemListGroupBinding
 import net.helcel.beans.helper.Data
 import net.helcel.beans.helper.Groups
 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 {
-        val view: View =
-            LayoutInflater.from(parent.context).inflate(R.layout.item_list_group, parent, false)
-        return GroupViewHolder(view, activity, selectDialog)
+        val binding =
+            ItemListGroupBinding.inflate(LayoutInflater.from(parent.context), parent, false)
+        return GroupViewHolder(binding, activity, selectDialog)
     }
 
     override fun onBindViewHolder(holder: GroupViewHolder, pos: Int) {
@@ -34,46 +32,46 @@ class GroupListAdapter(
     }
 
     inner class GroupViewHolder(
-        itemView: View,
+        private val _binding: ItemListGroupBinding,
         private val activity: FragmentActivity,
         private val selectDialog: DialogFragment
-    ) : RecyclerView.ViewHolder(itemView) {
-        private val color: Button = itemView.findViewById(R.id.group_color)
-        private val entries: TextView = itemView.findViewById(R.id.name)
+    ) : RecyclerView.ViewHolder(_binding.root) {
         private lateinit var dialogFragment: EditGroupAddFragment
         fun bind(entry: Pair<Int, Groups.Group>) {
-            color.text = entry.second.name
+            _binding.groupColor.text = entry.second.name
             dialogFragment = EditGroupAddFragment(entry.first, {
                 val newEntry = Data.groups.getGroupFromKey(entry.first)
-                color.text = newEntry.name
+                _binding.groupColor.text = newEntry.name
                 val newEntryColor = newEntry.color.color
                 val contrastNewEntryColor =
                     getContrastColor(newEntryColor)
-                color.setBackgroundColor(newEntryColor)
-                color.setTextColor(contrastNewEntryColor)
-                entries.setTextColor(contrastNewEntryColor)
-                entries.text = "0"
+                _binding.groupColor.setBackgroundColor(newEntryColor)
+                _binding.groupColor.setTextColor(contrastNewEntryColor)
+                _binding.name.setTextColor(contrastNewEntryColor)
+                _binding.name.text = "0"
             }, {
                 notifyItemRemoved(it)
             })
 
             val entryColor = entry.second.color.color
             val contrastEntryColor = getContrastColor(entryColor)
-            color.setBackgroundColor(entryColor)
-            color.setTextColor(contrastEntryColor)
-            entries.setTextColor(contrastEntryColor)
-            entries.text = Data.visits.countVisited(entry.first).toString()
+            _binding.groupColor.setBackgroundColor(entryColor)
+            _binding.groupColor.setTextColor(contrastEntryColor)
+            _binding.name.setTextColor(contrastEntryColor)
+            _binding.name.text = Data.visits.countVisited(entry.first).toString()
 
-            color.setOnClickListener {
+            _binding.groupColor.setOnClickListener {
                 Data.selected_group = entry.second
                 selectDialog.dismiss()
             }
-            color.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

@@ -7,8 +7,6 @@ import android.os.Bundle
 import android.text.Editable
 import android.text.TextWatcher
 import android.view.View
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.widget.AppCompatButton
 import androidx.core.graphics.blue
 import androidx.core.graphics.green
 import androidx.core.graphics.red
@@ -17,6 +15,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder
 import com.google.android.material.slider.Slider
 import com.google.android.material.textfield.TextInputEditText
 import net.helcel.beans.R
+import net.helcel.beans.databinding.FragmentEditGroupsAddBinding
 import net.helcel.beans.helper.Data
 import net.helcel.beans.helper.Groups
 import net.helcel.beans.helper.Theme.colorToHex6
@@ -25,59 +24,37 @@ import net.helcel.beans.helper.Theme.colorToHex6
 class EditGroupAddFragment(
     private val key: Int = 0,
     val onAddCb: (Int) -> Unit,
-    val onDelCb: (Int) -> Unit
-) :
-    DialogFragment() {
-    private lateinit var colorNameEditText: TextInputEditText
-    private lateinit var colorEditText: TextInputEditText
-
-    private lateinit var colorView: View
-
-    private lateinit var colorEditR: Slider
-    private lateinit var colorEditG: Slider
-    private lateinit var colorEditB: Slider
-
-    private lateinit var btnDelete: AppCompatButton
-    private lateinit var btnCancel: AppCompatButton
-    private lateinit var btnOk: AppCompatButton
+    val onDelCb: (Int) -> Unit,
+    private val deleteEnabled: Boolean = true
+) : DialogFragment() {
 
+    private lateinit var _binding: FragmentEditGroupsAddBinding
     private val grp = Data.groups.getGroupFromKey(key)
+
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = AlertDialog.Builder(requireActivity())
-        val inflater = requireActivity().layoutInflater
-        val view: View = inflater.inflate(R.layout.fragment_edit_groups_add, null)
+        val builder = MaterialAlertDialogBuilder(requireContext())
+        _binding = FragmentEditGroupsAddBinding.inflate(layoutInflater)
 
-        colorNameEditText = view.findViewById(R.id.group_name)
-        colorEditText = view.findViewById(R.id.group_color)
-        colorView = view.findViewById(R.id.colorView)
-        colorEditR = view.findViewById(R.id.colorR)
-        colorEditG = view.findViewById(R.id.colorG)
-        colorEditB = view.findViewById(R.id.colorB)
+        setupSlider(_binding.colorR, grp.color.color.red / 255F)
+        setupSlider(_binding.colorG, grp.color.color.green / 255F)
+        setupSlider(_binding.colorB, grp.color.color.blue / 255F)
+        setupText(_binding.groupColor, grp)
 
-        setupSlider(colorEditR, grp.color.color.red / 255F)
-        setupSlider(colorEditG, grp.color.color.green / 255F)
-        setupSlider(colorEditB, grp.color.color.blue / 255F)
+        _binding.colorView.background = ColorDrawable(grp.color.color)
 
-        setupText(colorEditText, grp)
 
-        colorView.background = ColorDrawable(grp.color.color)
-
-        btnDelete = view.findViewById(R.id.btnDelete)
-        btnCancel = view.findViewById(R.id.btnCancel)
-        btnOk = view.findViewById(R.id.btnOk)
-
-        if (key == 0) {
-            btnDelete.visibility = View.INVISIBLE
-            btnDelete.isEnabled = false
+        if (key == 0 || !deleteEnabled) {
+            _binding.btnDelete.visibility = View.INVISIBLE
+            _binding.btnDelete.isEnabled = false
         }
-        btnDelete.setOnClickListener {
+        _binding.btnDelete.setOnClickListener {
             MaterialAlertDialogBuilder(requireActivity())
                 .setMessage(R.string.delete_group)
                 .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)
@@ -87,9 +64,9 @@ class EditGroupAddFragment(
                 .show()
         }
 
-        btnOk.setOnClickListener {
-            val name = colorNameEditText.text.toString()
-            val color = colorEditText.text.toString()
+        _binding.btnOk.setOnClickListener {
+            val name = _binding.groupName.text.toString()
+            val color = _binding.groupColor.text.toString()
             val key = (if (key != 0) key else Data.groups.genKey())
             Data.groups.setGroup(key, name, ColorDrawable(Color.parseColor("#$color")))
             Data.saveData()
@@ -97,12 +74,12 @@ class EditGroupAddFragment(
             dialog?.dismiss()
         }
 
-        btnCancel.setOnClickListener {
+        _binding.btnCancel.setOnClickListener {
             dialog?.cancel()
         }
 
-        colorNameEditText.setText(grp.name)
-        builder.setView(view)
+        _binding.groupName.setText(grp.name)
+        builder.setView(_binding.root)
         return builder.create()
     }
 
@@ -110,11 +87,11 @@ class EditGroupAddFragment(
         s.setText(colorToHex6(ColorDrawable(grp?.color?.color ?: 0)).substring(1))
         s.addTextChangedListener(
             EditTextListener(
-                colorEditR,
-                colorEditG,
-                colorEditB,
-                colorEditText,
-                colorView
+                _binding.colorR,
+                _binding.colorG,
+                _binding.colorB,
+                _binding.groupColor,
+                _binding.colorView
             )
         )
     }
@@ -125,11 +102,11 @@ class EditGroupAddFragment(
         s.value = v
         s.addOnChangeListener(
             SliderOnChangeListener(
-                colorEditR,
-                colorEditG,
-                colorEditB,
-                colorEditText,
-                colorView
+                _binding.colorR,
+                _binding.colorG,
+                _binding.colorB,
+                _binding.groupColor,
+                _binding.colorView
             )
         )
     }

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

@@ -4,53 +4,57 @@ import android.app.Dialog
 import android.content.DialogInterface
 import android.os.Bundle
 import android.view.View
-import androidx.appcompat.app.AlertDialog
-import androidx.appcompat.widget.AppCompatButton
 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.R
-import net.helcel.beans.activity.adapter.GeolocListAdapter
 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
     private lateinit var listAdapt: GroupListAdapter
-    private lateinit var list: RecyclerView
     private var clear: Boolean = false
 
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
-        val builder = AlertDialog.Builder(
-            requireActivity()
-        )
-        val inflater = requireActivity().layoutInflater
-        val view: View = inflater.inflate(R.layout.fragment_edit_places_colors, null)
-
-        val btnAdd: AppCompatButton = view.findViewById(R.id.btnAdd)
-        val btnClear: AppCompatButton = view.findViewById(R.id.btnClear)
-        btnAdd.setOnClickListener {
+        val ctx = requireContext()
+        val builder = MaterialAlertDialogBuilder(ctx)
+        _binding = FragmentEditPlacesColorsBinding.inflate(layoutInflater)
+        _binding.btnAdd.setOnClickListener {
             EditGroupAddFragment(0, {
                 listAdapt.notifyItemInserted(Data.groups.findGroupPos(it))
             }, {}).show(requireActivity().supportFragmentManager, "AddColorDialogFragment")
         }
-        btnClear.setOnClickListener {
+        _binding.btnClear.setOnClickListener {
             clear = true
             dialog?.dismiss()
         }
 
-        val dialog = builder.setView(view).create()
-        listAdapt = GroupListAdapter(requireActivity(), this)
-        list = view.findViewById(R.id.groups_color)!!
-        list.layoutManager = LinearLayoutManager(requireContext(), RecyclerView.VERTICAL, false)
-        list.adapter = listAdapt
+        val dialog = builder.setView(_binding.root).create()
+        listAdapt = GroupListAdapter(requireActivity(), this, delete)
+        _binding.groupsColor.layoutManager =
+            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,24 +5,81 @@ 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?) {
-        setPreferencesFromResource(R.xml.fragment_settings, rootKey)
+        this.savedInstanceState = savedInstanceState
+        this.rootKey = rootKey
 
+        setPreferencesFromResource(R.xml.fragment_settings, rootKey)
+        val ctx = requireContext()
 
         // Select Light/Dark/System Mode
-        val themePreference = findPreference<Preference>(getString(R.string.key_theme))
-        themePreference?.setOnPreferenceChangeListener { _, key ->
-            setTheme(requireContext(), key as String)
+        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
-        val licensesPreference = findPreference<Preference>(getString(R.string.licenses))
-        licensesPreference?.setOnPreferenceClickListener {
+        findPreference<Preference>(getString(R.string.licenses))?.setOnPreferenceClickListener {
             requireActivity().supportFragmentManager.beginTransaction()
                 .replace(R.id.fragment_view, LicenseFragment(), getString(R.string.licenses))
                 .commit()
@@ -30,12 +87,10 @@ class SettingsFragment : PreferenceFragmentCompat() {
         }
 
         // Open about fragment
-        val aboutPreference = findPreference<Preference>(getString(R.string.about))
-        aboutPreference?.setOnPreferenceClickListener {
+        findPreference<Preference>(getString(R.string.about))?.setOnPreferenceClickListener {
             requireActivity().supportFragmentManager.beginTransaction()
                 .replace(R.id.fragment_view, AboutFragment(), getString(R.string.about))
                 .commit()
-
             true
         }
 
@@ -54,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

@@ -8,8 +8,6 @@ enum class Country(
     HKG("Hong Kong", 1104),
     MAC("Macao", 32),
     ANT("Netherlands Antilles", 800),
-
-
     AFG("Afghanistan", 645487),
     XAD("Akrotiri and Dhekelia", 234),
     ALA("Åland", 1483),
@@ -217,7 +215,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 +246,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 +263,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,10 +1,9 @@
 package net.helcel.beans.countries
 
-
 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
@@ -12,8 +11,5 @@ interface GeoLoc {
     val area: Int
 
     val type: LocType
-    val children: List<GeoLoc>
-
+    val children: Set<GeoLoc>
 }
-
-

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

@@ -1,21 +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 importState(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 { 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,12 @@ 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(
+            XAD,
+            ALA,// Åland Islands: an autonomous region of Finland, but not a member of the EU or UN
             ALB,
             AND,
             AUT,
@@ -18,14 +20,19 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             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,
+            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,
+            JEY, // Jersey: a British Crown dependency located in the English Channel
             KAZ,
             XKO,
             LVA,
@@ -48,25 +55,28 @@ 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(
             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
             GEO,
             HKG,
             IND,
@@ -111,7 +121,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
         )
     ),
     FFF(
-        "Africa", listOf(
+        "Africa", setOf(
             DZA,
             AGO,
             BDI,
@@ -131,8 +141,8 @@ 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,
@@ -165,6 +175,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             SSD,
             SHN,
             SDN,
+            SWZ,
             TZA,
             TGO,
             TUN,
@@ -176,7 +187,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
         )
     ),
     NNN(
-        "North America", listOf(
+        "North America", setOf(
             ABW,
             AIA,
             ATG,
@@ -184,9 +195,11 @@ 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,
@@ -208,19 +221,22 @@ enum class Group(override val fullName: String, override val children: List<GeoL
             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,
@@ -238,7 +254,7 @@ enum class Group(override val fullName: String, override val children: List<GeoL
         )
     ),
     UUU(
-        "Oceania", listOf(
+        "Oceania", setOf(
             ASM,
             AUS,
             COK,
@@ -257,6 +273,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 +284,22 @@ enum class Group(override val fullName: String, override val children: List<GeoL
     ),
 
     XXX(
-        "Others", listOf(
+        "Others", setOf(
             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
+            BVT, // Bouvet Island: an uninhabited territory of Norway in the South Atlantic
+            HMD, // Heard Island and McDonald Islands: an uninhabited Australian external territory in the southern Indian Ocean
             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
         )
     ),
 
     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,18 @@ 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, XXX
+        )
+    );
 
     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,34 +2,47 @@ 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>) {
+class Groups(val id: Int, private val grps: HashMap<Int, Group>) {
 
     fun setGroup(key: Int, name: String, col: ColorDrawable) {
-        grps[key] = Group(key,name,col)
+        grps[key] = Group(key, name, col)
     }
 
     fun deleteGroup(key: Int) {
         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())
+        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
     }
 
@@ -46,32 +59,38 @@ class Groups(val id: Int, private val grps: HashMap<Int,Group>) {
         }
     }
 
-    fun getGroupFromPos(pos: Int): Pair<Int,Group> {
+    fun getGroupFromPos(pos: Int): Pair<Int, Group> {
         val key = grps.keys.toList()[pos]
-        return Pair(key,getGroupFromKey(key))
+        return Pair(key, getGroupFromKey(key))
     }
 
     fun findGroupPos(key: Int): Int {
         return grps.keys.toList().indexOf(key)
     }
 
-    class EmptyGroup: Group(0,"")
+    class EmptyGroup : Group(0, "")
 
     @Serializable
-    open class Group(val key: Int, val name: String, @Serializable(with = ColorDrawableSerializer::class) val color: ColorDrawable = ColorDrawable(Color.TRANSPARENT))
+    open class Group(
+        val key: Int,
+        val name: String,
+        @Serializable(with = Theme.ColorDrawableSerializer::class) val color: ColorDrawable = ColorDrawable(
+            Color.GRAY
+        )
+    )
 
     @OptIn(ExperimentalSerializationApi::class)
     @Serializer(Groups::class)
-    class GroupsSerializer{
+    class GroupsSerializer {
         val defaultValue: Groups
-            get() = Groups(Int.MIN_VALUE,hashMapOf())
+            get() = Groups(Int.MIN_VALUE, hashMapOf())
 
         fun readFrom(input: InputStream): Groups {
-            return Json.decodeFromString(serializer(),input.readBytes().decodeToString())
+            return Json.decodeFromString(serializer(), input.readBytes().decodeToString())
         }
 
         fun writeTo(t: Groups): String {
-            return Json.encodeToString(serializer(),t).encodeToByteArray().decodeToString()
+            return Json.encodeToString(serializer(), t).encodeToByteArray().decodeToString()
         }
 
     }

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))
@@ -30,6 +33,18 @@ object Settings {
         )
     }
 
+    fun getStatPref(ctx: Context): String? {
+        return sp.getString(
+            ctx.getString(R.string.key_stats),
+            ctx.getString(R.string.counters)
+        )
+    }
+
+    fun refreshProjection(): Boolean {
+        mainActivity.refreshProjection()
+        return true
+    }
+
     private fun getBooleanValue(ctx: Context, key: String?): Boolean {
         return when (key) {
             ctx.getString(R.string.on) -> true
@@ -37,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

@@ -6,6 +6,11 @@ import android.graphics.drawable.ColorDrawable
 import android.util.TypedValue
 import androidx.appcompat.app.AppCompatActivity
 import androidx.core.graphics.ColorUtils
+import kotlinx.serialization.KSerializer
+import kotlinx.serialization.descriptors.PrimitiveKind
+import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
+import kotlinx.serialization.encoding.Decoder
+import kotlinx.serialization.encoding.Encoder
 
 object Theme {
     fun colorWrapper(ctx: Context, res: Int): ColorDrawable {
@@ -24,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)
     }
@@ -34,4 +38,17 @@ object Theme {
         val blackContrast = ColorUtils.calculateContrast(Color.BLACK, color)
         return if (whiteContrast > blackContrast) Color.WHITE else Color.BLACK
     }
-}
+
+    object ColorDrawableSerializer : KSerializer<ColorDrawable> {
+        override val descriptor = PrimitiveSerialDescriptor("ColorDrawable", PrimitiveKind.INT)
+
+        override fun deserialize(decoder: Decoder): ColorDrawable {
+            return ColorDrawable(decoder.decodeInt())
+        }
+
+        override fun serialize(encoder: Encoder, value: ColorDrawable) {
+            encoder.encodeInt(value.color)
+        }
+    }
+
+}

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

@@ -1,20 +0,0 @@
-package net.helcel.beans.helper
-
-import android.graphics.drawable.ColorDrawable
-import kotlinx.serialization.KSerializer
-import kotlinx.serialization.descriptors.PrimitiveKind
-import kotlinx.serialization.descriptors.PrimitiveSerialDescriptor
-import kotlinx.serialization.encoding.Decoder
-import kotlinx.serialization.encoding.Encoder
-
-object ColorDrawableSerializer : KSerializer<ColorDrawable> {
-    override val descriptor = PrimitiveSerialDescriptor("ColorDrawable", PrimitiveKind.INT)
-
-    override fun deserialize(decoder: Decoder): ColorDrawable {
-        return ColorDrawable(decoder.decodeInt())
-    }
-
-    override fun serialize(encoder: Encoder, value: ColorDrawable) {
-        encoder.encodeInt(value.color)
-    }
-}

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

@@ -9,9 +9,11 @@ import java.io.InputStream
 
 
 @Serializable
-class Visits(val id: Int, private val locs: HashMap<String,Int>) {
+class Visits(val id: Int, private val locs: HashMap<String, Int>) {
 
-    fun setVisited(key: GeoLoc, b: Int) {
+    fun setVisited(key: GeoLoc?, b: Int) {
+        if (key == null)
+            return
         locs[key.code] = b
     }
 
@@ -25,10 +27,11 @@ 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 {
-        return locs.getOrDefault(key,0)
+        return locs.getOrDefault(key, 0)
     }
 
     fun countVisited(key: Int): Int {
@@ -39,18 +42,31 @@ 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 {
         val defaultValue: Visits
-            get() = Visits(Int.MIN_VALUE,hashMapOf())
+            get() = Visits(Int.MIN_VALUE, hashMapOf())
 
         fun readFrom(input: InputStream): Visits {
-            return Json.decodeFromString(serializer(),input.readBytes().decodeToString())
+            return Json.decodeFromString(serializer(), input.readBytes().decodeToString())
         }
 
-       fun writeTo(t: Visits): String {
-            return Json.encodeToString(serializer(),t).encodeToByteArray().decodeToString()
+        fun writeTo(t: Visits): String {
+            return Json.encodeToString(serializer(), t).encodeToByteArray().decodeToString()
         }
 
     }

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

@@ -2,50 +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-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,24 @@
 package net.helcel.beans.svg
 
 import android.content.Context
+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")
+    val 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

@@ -0,0 +1,41 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="72dp"
+    android:height="72dp"
+    android:viewportWidth="72"
+    android:viewportHeight="72">
+  <path
+      android:pathData="M31,16l0,-4l10,0l0,4"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4"
+      android:fillColor="#00000000"
+      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="?attr/colorOnBackground"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M17,16h38v4h-38z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4"
+      android:fillColor="#00000000"
+      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="?attr/colorOnBackground"
+      android:strokeLineCap="round"/>
+  <path
+      android:pathData="M31,28.25L31,55"
+      android:strokeLineJoin="round"
+      android:strokeWidth="4"
+      android:fillColor="#00000000"
+      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_edit.xml

@@ -1,13 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    tools:context=".activity.EditActivity">
+
     <com.google.android.material.tabs.TabLayout
         android:id="@+id/tab"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
+        android:layout_height="wrap_content" />
 
     <androidx.viewpager2.widget.ViewPager2
         android:id="@+id/pager"

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

@@ -1,13 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-
+    tools:context=".activity.MainActivity">
+    
     <com.github.chrisbanes.photoview.PhotoView
         android:id="@+id/photo_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 </LinearLayout>

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

@@ -1,13 +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"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    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

@@ -9,56 +9,55 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:gravity="center_horizontal"
-        android:orientation="vertical" >
+        android:orientation="vertical">
 
-        <ImageView
-            android:layout_width="250dp"
-            android:layout_height="250dp"
-            android:layout_marginTop="40dp"
-            android:layout_marginBottom="30dp"
+        <com.google.android.material.imageview.ShapeableImageView
+            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" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="15dp"
+            android:layout_marginEnd="10dp"
             android:layout_marginBottom="10dp"
-            android:layout_marginStart="10dp"
-            android:layout_marginEnd="10dp"
             android:text="@string/app_name"
-            android:textStyle="bold"
+            android:textAlignment="center"
             android:textSize="30sp"
-            android:textAlignment="center" />
+            android:textStyle="bold" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginStart="10dp"
             android:layout_marginTop="0dp"
-            android:layout_marginBottom="15dp"
-            android:layout_marginStart="10dp"
             android:layout_marginEnd="10dp"
+            android:layout_marginBottom="15dp"
             android:text="@string/app_version"
-            android:textSize="25sp"
-            android:textAlignment="center" />
+            android:textAlignment="center"
+            android:textSize="25sp" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:layout_marginBottom="15dp"
             android:layout_marginStart="10dp"
+            android:layout_marginTop="15dp"
             android:layout_marginEnd="10dp"
+            android:layout_marginBottom="15dp"
             android:text="@string/beans_is_foss"
             android:textAlignment="center" />
 
-        <TextView
+        <com.google.android.material.textview.MaterialTextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="15dp"
-            android:layout_marginBottom="15dp"
             android:layout_marginStart="10dp"
+            android:layout_marginTop="15dp"
             android:layout_marginEnd="10dp"
+            android:layout_marginBottom="15dp"
             android:autoLink="web"
             android:text="@string/beans_repo"
             android:textAlignment="center" />

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

@@ -1,10 +1,12 @@
 <?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="wrap_content"
     android:orientation="vertical"
-    android:padding="16dp">
+    android:padding="16dp"
+    tools:context=".activity.fragment.EditGroupAddFragment">
 
 
     <com.google.android.material.textfield.TextInputEditText
@@ -92,29 +94,39 @@
         android:layout_height="match_parent"
         android:layout_marginTop="10dp">
 
-        <androidx.appcompat.widget.AppCompatButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnDelete"
-            android:layout_width="wrap_content"
+            android:layout_width="52dp"
             android:layout_height="wrap_content"
-            android:text="@string/delete"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
+            android:tooltipText="@string/delete"
+            app:icon="@drawable/delete"
+            app:iconGravity="textStart"
+            app:iconPadding="0dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
 
-        <androidx.appcompat.widget.AppCompatButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnCancel"
-            android:layout_width="wrap_content"
+            android:layout_width="80dp"
             android:layout_height="wrap_content"
+            android:layout_marginEnd="6dp"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
             android:text="@string/cancel"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toStartOf="@+id/btnOk"
             app:layout_constraintTop_toTopOf="parent" />
 
-        <androidx.appcompat.widget.AppCompatButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnOk"
-            android:layout_width="wrap_content"
+            android:layout_width="52dp"
             android:layout_height="wrap_content"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
             android:text="@string/ok"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.constraintlayout.widget.ConstraintLayout 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:layout_height="match_parent"
+    tools:context=".activity.fragment.EditPlaceFragment">
 
 
     <androidx.core.widget.NestedScrollView

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

@@ -6,11 +6,17 @@
     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"
         android:orientation="vertical"
-        android:padding="16dp">
+        android:padding="4dp">
 
         <androidx.recyclerview.widget.RecyclerView
             android:id="@+id/groups_color"
@@ -24,20 +30,24 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="10dp">
 
-        <androidx.appcompat.widget.AppCompatButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnAdd"
-            android:layout_width="wrap_content"
+            android:layout_width="64dp"
             android:layout_height="wrap_content"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
             android:text="@string/add"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
 
 
-        <androidx.appcompat.widget.AppCompatButton
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/btnClear"
-            android:layout_width="wrap_content"
+            android:layout_width="64dp"
             android:layout_height="wrap_content"
+            android:paddingLeft="6dp"
+            android:paddingRight="6dp"
             android:text="@string/clear"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"

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

@@ -7,8 +7,7 @@
 
     <androidx.fragment.app.FragmentContainerView
         android:id="@+id/license_fragment_view"
-        android:name="androidx.navigation.fragment.NavHostFragment"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"/>
+        android:layout_height="match_parent" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,57 +1,52 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/textView"
+        android:layout_width="0dp"
+        android:layout_height="50dp"
+        android:clickable="true"
+        android:focusable="true"
+        android:gravity="start|center_vertical"
+        android:insetTop="4dp"
+        android:insetBottom="4dp"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        android:textAllCaps="false"
+        android:textAppearance="?attr/textAppearanceBody2"
+        android:textColor="?attr/colorOnBackground"
 
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/textView"
-            android:layout_width="0dp"
-            android:layout_height="50dp"
-            android:clickable="true"
-            android:focusable="true"
-            android:gravity="start|center_vertical"
-            android:insetTop="4dp"
-            android:insetBottom="4dp"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:textAllCaps="false"
-            android:textAppearance="?attr/textAppearanceBody2"
-            android:textColor="?attr/colorOnBackground"
-            app:cornerRadius="0dp"
-            app:layout_constraintBottom_toBottomOf="@id/checkBox"
-            app:layout_constraintEnd_toStartOf="@id/checkBox"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+        app:cornerRadius="4dp"
+        app:layout_constraintBottom_toBottomOf="@id/checkBox"
+        app:layout_constraintEnd_toStartOf="@id/checkBox"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:gravity="start|center_vertical"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            app:layout_constraintBottom_toBottomOf="@id/checkBox"
-            app:layout_constraintEnd_toStartOf="@id/checkBox"
-            app:layout_constraintTop_toTopOf="parent" />
+    <com.google.android.material.textview.MaterialTextView
+        android:id="@+id/count"
+        android:layout_width="wrap_content"
+        android:layout_height="50dp"
+        android:gravity="start|center_vertical"
+        android:paddingStart="20dp"
+        android:paddingEnd="20dp"
+        app:layout_constraintBottom_toBottomOf="@id/checkBox"
+        app:layout_constraintEnd_toStartOf="@id/checkBox"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <com.google.android.material.checkbox.MaterialCheckBox
-            android:id="@+id/checkBox"
-            android:layout_width="50dp"
-            android:layout_height="50dp"
-            app:checkedState="indeterminate"
-            app:layout_constraintBottom_toBottomOf="@id/textView"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintHorizontal_bias="1"
-            app:layout_constraintStart_toEndOf="@id/textView"
-            app:layout_constraintTop_toTopOf="@id/textView"
-            app:layout_constraintVertical_bias="0.5" />
+    <com.google.android.material.checkbox.MaterialCheckBox
+        android:id="@+id/checkBox"
+        android:layout_width="50dp"
+        android:layout_height="50dp"
+        app:checkedState="indeterminate"
+        app:layout_constraintBottom_toBottomOf="@id/textView"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1"
+        app:layout_constraintStart_toEndOf="@id/textView"
+        app:layout_constraintTop_toTopOf="@id/textView"
+        app:layout_constraintVertical_bias="0.5" />
 
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-</FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,41 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content">
+    <com.google.android.material.button.MaterialButton
+        android:id="@+id/group_color"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="32dp"
+        android:layout_marginTop="2dp"
+        android:layout_marginEnd="32dp"
+        android:layout_marginBottom="2dp"
+        android:textAlignment="textStart"
+        android:textColor="?attr/colorOnPrimary"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
 
-        <Button
-            android:id="@+id/group_color"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:layout_marginStart="32dp"
-            android:layout_marginTop="2dp"
-            android:layout_marginEnd="32dp"
-            android:layout_marginBottom="2dp"
-            android:textAlignment="textStart"
-            android:textColor="?attr/colorOnPrimary"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent" />
+    <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="20dp"
+        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" />
 
-        <TextView
-            android:id="@+id/name"
-            android:layout_width="wrap_content"
-            android:layout_height="50dp"
-            android:gravity="start|center_vertical"
-            android:paddingStart="20dp"
-            android:paddingEnd="20dp"
-            android:textColor="?attr/colorOnPrimary"
-            app:layout_constraintTop_toTopOf="@id/group_color"
-            app:layout_constraintBottom_toBottomOf="@id/group_color"
-            app:layout_constraintEnd_toEndOf="@id/group_color" />
-
-    </androidx.constraintlayout.widget.ConstraintLayout>
-
-
-</FrameLayout>
+</androidx.constraintlayout.widget.ConstraintLayout>

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-v26/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-v26/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

@@ -5,6 +5,7 @@
     <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
@@ -33,9 +33,31 @@
         app:title="@string/key_stats"
         app:useSimpleSummaryProvider="true" />
 
+    <ListPreference
+        app:defaultValue="@string/off"
+        app:enabled="true"
+        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" />

genenum.js

@@ -58,12 +58,25 @@ 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("Côted'","Côte 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 ")
+  .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

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

@@ -0,0 +1,11 @@
+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/short_description.txt

@@ -0,0 +1 @@
+A virtual scratchmap of the world

metadata/en-US/title.txt

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

out0.txt

@@ -1,251 +0,0 @@
-AFG("Afghanistan",645487,listOf(AFG_BD,AFG_BG,AFG_BL,AFG_BK,AFG_BM,AFG_DK,AFG_FH,AFG_FB,AFG_GZ,AFG_GR,AFG_HM,AFG_HR,AFG_JW,AFG_KB,AFG_KD,AFG_KP,AFG_KT,AFG_KR,AFG_KZ,AFG_LA,AFG_LW,AFG_NG,AFG_NM,AFG_NR,AFG_PK,AFG_PT,AFG_PJ,AFG_PV,AFG_SM,AFG_SP,AFG_TK,AFG_OZ,AFG_VR,AFG_ZB)),
-XAD("Akrotiriand Dhekelia",234,listOf(XAD_NA,XAD_NA)),
-ALA("Åland",1483,listOf(ALA_AR,ALA_CO,ALA_MH)),
-ALB("Albania",28755,listOf(ALB_BE,ALB_DB,ALB_DU,ALB_EB,ALB_FI,ALB_GK,ALB_KE,ALB_KK,ALB_LZ,ALB_SD,ALB_TI,ALB_VR)),
-DZA("Algeria",2316624,listOf(DZA_AR,DZA_AD,DZA_AT,DZA_AL,DZA_AN,DZA_BT,DZA_BC,DZA_BJ,DZA_BS,DZA_BL,DZA_BB,DZA_BU,DZA_BM,DZA_CH,DZA_CO,DZA_DJ,DZA_EB,DZA_EO,DZA_ET,DZA_GR,DZA_GL,DZA_IL,DZA_JJ,DZA_KH,DZA_LG,DZA_MS,DZA_MC,DZA_MD,DZA_ML,DZA_MG,DZA_NA,DZA_OR,DZA_OG,DZA_OB,DZA_RE,DZA_SD,DZA_SF,DZA_SB,DZA_SK,DZA_SA,DZA_TM,DZA_TB,DZA_TR,DZA_TN,DZA_TP,DZA_TS,DZA_TO,DZA_TL)),
-ASM("American Samoa",205,listOf(ASM_ET,ASM_MA,ASM_UU,ASM_WT)),
-AND("Andorra",451,listOf(AND_AN,AND_CA,AND_EN,AND_EE,AND_MA,AND_OR,AND_JL)),
-AGO("Angola",1254492,listOf(AGO_BO,AGO_BG,AGO_BI,AGO_CB,AGO_CC,AGO_CN,AGO_CS,AGO_CU,AGO_HM,AGO_HL,AGO_LU,AGO_LN,AGO_LS,AGO_ML,AGO_MX,AGO_NA,AGO_UI,AGO_ZA)),
-AIA("Anguilla",80,listOf(AIA_BP,AIA_NA,AIA_EE,AIA_GH,AIA_IH,AIA_NH,AIA_NS,AIA_NA,AIA_SG,AIA_SH,AIA_NA,AIA_NA,AIA_SO,AIA_ST,AIA_TF,AIA_TQ,AIA_TV,AIA_WE)),
-ATG("Antiguaand Barbuda",438,listOf(ATG_BB,ATG_RD,ATG_GE,ATG_JO,ATG_MA,ATG_PA,ATG_PE,ATG_PH)),
-ARG("Argentina",2785500,listOf(ARG_BA,ARG_CT,ARG_CC,ARG_CH,ARG_DF,ARG_CB,ARG_CN,ARG_ER,ARG_FM,ARG_JY,ARG_LP,ARG_LR,ARG_MZ,ARG_MN,ARG_NQ,ARG_RN,ARG_SA,ARG_SJ,ARG_SL,ARG_SC,ARG_SF,ARG_SE,ARG_TF,ARG_TM)),
-ARM("Armenia",29724,listOf(ARM_AG,ARM_AR,ARM_AV,ARM_ER,ARM_GR,ARM_KT,ARM_LO,ARM_SH,ARM_SU,ARM_TV,ARM_VD)),
-ABW("Aruba",183,emptyList()),
-AUS("Australia",7720095,listOf(AUS_AS,AUS_AC,AUS_CR,AUS_JB,AUS_NS,AUS_NT,AUS_QL,AUS_SA,AUS_TS,AUS_VI,AUS_WA)),
-AUT("Austria",83897,listOf(AUT_BU,AUT_KA,AUT_NO,AUT_OO,AUT_SZ,AUT_ST,AUT_TR,AUT_VO,AUT_WI)),
-AZE("Azerbaijan",86331,listOf(AZE_NA,AZE_NA,AZE_NA,AZE_NA,AZE_NA,AZE_LA,AZE_NA,AZE_NA,AZE_NA,AZE_NA)),
-BHS("Bahamas",13437,listOf(BHS_AK,BHS_BR,BHS_BI,BHS_BP,BHS_CI,BHS_CB,BHS_CN,BHS_CE,BHS_FP,BHS_CK,BHS_EB,BHS_EM,BHS_GC,BHS_HB,BHS_HT,BHS_IN,BHS_LI,BHS_MC,BHS_MG,BHS_MI,BHS_NW,BHS_NB,BHS_NN,BHS_NE,BHS_RI,BHS_RC,BHS_SS,BHS_SB,BHS_SN,BHS_SE,BHS_SW,BHS_WB)),
-BHR("Bahrain",718,listOf(BHR_CA,BHR_MU,BHR_NO,BHR_SO)),
-BGD("Bangladesh",140002,listOf(BGD_BA,BGD_CG,BGD_DH,BGD_KH,BGD_MM,BGD_RS,BGD_RP,BGD_SY)),
-BRB("Barbados",437,listOf(BRB_CC,BRB_AN,BRB_GE,BRB_JM,BRB_JN,BRB_JS,BRB_LU,BRB_MI,BRB_PE,BRB_PH,BRB_TH)),
-BLR("Belarus",206665,listOf(BLR_BR,BLR_HO,BLR_HR,BLR_MI,BLR_MI,BLR_MA,BLR_VI)),
-BEL("Belgium",30668,listOf(BEL_NA,BEL_NA,BEL_NA)),
-BLZ("Belize",22164,listOf(BLZ_BZ,BLZ_CY,BLZ_CZ,BLZ_OW,BLZ_SC,BLZ_TO)),
-BEN("Benin",116014,listOf(BEN_AL,BEN_AK,BEN_AQ,BEN_BO,BEN_CL,BEN_DO,BEN_CF,BEN_LI,BEN_MO,BEN_OU,BEN_PL,BEN_ZO)),
-BMU("Bermuda",68,listOf(BMU_DE,BMU_HA,BMU_HC,BMU_PA,BMU_PE,BMU_SC,BMU_SG,BMU_SA,BMU_SM,BMU_SO,BMU_WA)),
-BTN("Bhutan",38913,listOf(BTN_BU,BTN_CK,BTN_DA,BTN_GA,BTN_HA,BTN_LH,BTN_MO,BTN_PR,BTN_PM,BTN_PN,BTN_SJ,BTN_SM,BTN_GE,BTN_TM,BTN_TY,BTN_TA,BTN_TO,BTN_CR,BTN_WP,BTN_SG)),
-BOL("Bolivia",1090425,listOf(BOL_EB,BOL_CQ,BOL_CB,BOL_LP,BOL_OR,BOL_PA,BOL_PO,BOL_SC,BOL_TR)),
-BES("Bonaire, Sint Eustatiusand Saba",325,listOf(BES_BO,BES_SA,BES_SE)),
-BIH("Bosniaand Herzegovina",51081,listOf(BIH_BR,BIH_BF,BIH_SR)),
-BWA("Botswana",580648,listOf(BWA_CE,BWA_CH,BWA_FR,BWA_GB,BWA_GH,BWA_JW,BWA_KG,BWA_KL,BWA_KW,BWA_LB,BWA_NE,BWA_NC,BWA_SP,BWA_SR,BWA_SO,BWA_ST)),
-BVT("Bouvet Island",77,emptyList()),
-BRA("Brazil",8560656,listOf(BRA_AC,BRA_AL,BRA_AP,BRA_AM,BRA_BA,BRA_CE,BRA_DF,BRA_ES,BRA_GO,BRA_MA,BRA_MT,BRA_MS,BRA_MG,BRA_PA,BRA_PB,BRA_PR,BRA_PE,BRA_PI,BRA_RJ,BRA_RN,BRA_RS,BRA_RO,BRA_RR,BRA_SC,BRA_SP,BRA_SE,BRA_TO)),
-IOT("British Indian Ocean Territory",65,emptyList()),
-VGB("British Virgin Islands",169,listOf(VGB_NA,VGB_NA,VGB_NA,VGB_NA,VGB_NA)),
-BRN("Brunei",5815,listOf(BRN_BE,BRN_BM,BRN_TE,BRN_TU)),
-BGR("Bulgaria",111647,listOf(BGR_BL,BGR_BR,BGR_DO,BGR_GB,BGR_SG,BGR_KK,BGR_KZ,BGR_KY,BGR_LV,BGR_MT,BGR_PZ,BGR_PN,BGR_PV,BGR_PD,BGR_RG,BGR_RS,BGR_SH,BGR_SI,BGR_SL,BGR_SM,BGR_SF,BGR_SZ,BGR_TU,BGR_VN,BGR_VT,BGR_VD,BGR_VR,BGR_YA)),
-BFA("Burkina Faso",274620,listOf(BFA_BO,BFA_CD,BFA_CT,BFA_CE,BFA_CN,BFA_CO,BFA_CS,BFA_ES,BFA_HB,BFA_NO,BFA_PC,BFA_SA,BFA_SO)),
-BDI("Burundi",27113,listOf(BDI_BB,BDI_BM,BDI_BU,BDI_BR,BDI_CA,BDI_CI,BDI_GI,BDI_KR,BDI_KY,BDI_KI,BDI_MA,BDI_MV,BDI_MY,BDI_MW,BDI_NG,BDI_RT,BDI_RY)),
-KHM("Cambodia",182800,listOf(KHM_OM,KHM_BA,KHM_KM,KHM_KG,KHM_KS,KHM_KT,KHM_KP,KHM_KN,KHM_KK,KHM_,KHM_KH,KHM_PL,KHM_KA,KHM_MK,KHM_OC,KHM_PP,KHM_PO,KHM_PH,KHM_PY,KHM_RO,KHM_SI,KHM_ST,KHM_SR,KHM_TA,KHM_TB)),
-CMR("Cameroon",469101,listOf(CMR_AD,CMR_CE,CMR_ES,CMR_EN,CMR_LT,CMR_NO,CMR_NW,CMR_OU,CMR_SU,CMR_SW)),
-CAN("Canada",9925768,listOf(CAN_AB,CAN_BC,CAN_MB,CAN_NB,CAN_NF,CAN_NT,CAN_NS,CAN_NU,CAN_ON,CAN_PE,CAN_QC,CAN_SK,CAN_YT)),
-CPV("Cabo Verde",4115,listOf(CPV_BV,CPV_BR,CPV_MA,CPV_MO,CPV_PA,CPV_PN,CPV_PC,CPV_RB,CPV_RG,CPV_RS,CPV_SL,CPV_CT,CPV_CT,CPV_CZ,CPV_SD,CPV_FP,CPV_LO,CPV_SM,CPV_SS,CPV_SV,CPV_TF,CPV_TS)),
-XCA("Caspian Sea",371885,emptyList()),
-CYM("Cayman Islands",282,listOf(CYM_BT,CYM_EE,CYM_GT,CYM_NS,CYM_SI,CYM_WB)),
-CAF("Central African Republic",624264,listOf(CAF_BB,CAF_BG,CAF_BK,CAF_HM,CAF_HK,CAF_KG,CAF_LB,CAF_HS,CAF_MB,CAF_KB,CAF_NM,CAF_MP,CAF_UK,CAF_AC,CAF_OP,CAF_SE,CAF_VK)),
-TCD("Chad",1277250,listOf(TCD_BG,TCD_BA,TCD_BR,TCD_CB,TCD_EE,TCD_EO,TCD_GR,TCD_HD,TCD_KM,TCD_LC,TCD_LO,TCD_LR,TCD_MA,TCD_ME,TCD_MW,TCD_MC,TCD_OA,TCD_SA,TCD_SI,TCD_TA,TCD_TI,TCD_NJ,TCD_BI)),
-CHL("Chile",753785,listOf(CHL_AN,CHL_AR,CHL_AP,CHL_AT,CHL_AI,CHL_BI,CHL_CO,CHL_LI,CHL_LL,CHL_LR,CHL_MA,CHL_ML,CHL_NB,CHL_RM,CHL_TA,CHL_VS)),
-CHN("China",9405272,listOf(CHN_AH,CHN_BJ,CHN_CQ,CHN_FJ,CHN_GS,CHN_GD,CHN_GX,CHN_GZ,CHN_HA,CHN_HB,CHN_HL,CHN_HE,CHN_,CHN_HU,CHN_HN,CHN_JS,CHN_JX,CHN_JL,CHN_LN,CHN_,CHN_NM,CHN_NX,CHN_QH,CHN_SA,CHN_SD,CHN_SH,CHN_SX,CHN_SC,CHN_TJ,CHN_XJ,Z02_XJ,Z03_XJ,CHN_XZ,Z03_XZ,Z08_XZ,CHN_YN,CHN_ZJ)),
-CXR("Christmas Island",140,emptyList()),
-XCL("Clipperton Island",10,emptyList()),
-CCK("Cocos Islands",14,emptyList()),
-COL("Colombia",1144791,listOf(COL_AM,COL_AN,COL_AR,COL_AT,COL_DC,COL_BL,COL_BY,COL_CL,COL_CQ,COL_CS,COL_CA,COL_CE,COL_CH,COL_CO,COL_CU,COL_GN,COL_GV,COL_HU,COL_LG,COL_MA,COL_ME,COL_NA,COL_NS,COL_PU,COL_QD,COL_RI,COL_SA,COL_ST,COL_SU,COL_TO,COL_VC,COL_VP,COL_VD)),
-COM("Comoros",1684,listOf(COM_MO,COM_GC,COM_AN)),
-COK("Cook Islands",281,listOf(COK_NA,COK_NA,COK_NA,COK_NA,COK_NA,COK_NA,COK_NA,COK_NA,COK_NA,COK_NA,COK_NA)),
-CRI("Costa Rica",51511,listOf(CRI_AL,CRI_CA,CRI_GU,CRI_HE,CRI_LI,CRI_PU,CRI_SJ)),
-CIV("Côted'Ivoire",323636,listOf(CIV_AB,CIV_BA,CIV_CM,CIV_DE,CIV_GD,CIV_LA,CIV_LN,CIV_MN,CIV_SM,CIV_SV,CIV_VB,CIV_WB,CIV_YM,CIV_ZA)),
-HRV("Croatia",57065,listOf(HRV_BB,HRV_SP,HRV_DN,HRV_GZ,HRV_IS,HRV_KA,HRV_KK,HRV_KZ,HRV_LS,HRV_ME,HRV_OB,HRV_PS,HRV_PG,HRV_SB,HRV_SM,HRV_SD,HRV_VA,HRV_VP,HRV_VS,HRV_ZD,HRV_ZG)),
-CUB("Cuba",111255,listOf(CUB_CM,CUB_CA,CUB_CF,CUB_CH,CUB_GR,CUB_GU,CUB_HO,CUB_IJ,CUB_LH,CUB_LT,CUB_MA,CUB_MQ,CUB_PR,CUB_SS,CUB_SC,CUB_VC)),
-CUW("Curaçao",440,emptyList()),
-CYP("Cyprus",5733,listOf(CYP_FA,CYP_LA,CYP_LI,CYP_NI,CYP_PA)),
-CZE("Czechia",78754,listOf(CZE_CK,CZE_BK,CZE_KK,CZE_JK,CZE_HK,CZE_LK,CZE_VK,CZE_OK,CZE_EK,CZE_PK,CZE_SK,CZE_SK,CZE_UK,CZE_ZK)),
-COD("Democratic Republicofthe Congo",2344314,listOf(COD_BU,COD_ET,COD_HK,COD_HL,COD_HU,COD_IT,COD_KS,COD_LL,COD_KO,COD_KN,COD_BC,COD_KG,COD_KU,COD_LM,COD_LB,COD_MA,COD_MN,COD_MO,COD_NK,COD_NU,COD_SN,COD_SK,COD_SU,COD_TG,COD_TO,COD_TP)),
-DNK("Denmark",43034,listOf(DNK_HS,DNK_MJ,DNK_ND,DNK_SL,DNK_SD)),
-DJI("Djibouti",22509,listOf(DJI_AS,DJI_AR,DJI_DK,DJI_DB,DJI_OB,DJI_TA)),
-DMA("Dominica",759,listOf(DMA_AN,DMA_DA,DMA_GO,DMA_JN,DMA_JH,DMA_LU,DMA_MA,DMA_PK,DMA_PL,DMA_PR)),
-DOM("Dominican Republic",48348,listOf(DOM_AZ,DOM_BR,DOM_BH,DOM_DA,DOM_NC,DOM_DU,DOM_SE,DOM_ES,DOM_HM,DOM_IN,DOM_AL,DOM_EP,DOM_RO,DOM_VE,DOM_MT,DOM_MN,DOM_MC,DOM_MP,DOM_PN,DOM_PV,DOM_PP,DOM_SC,DOM_SM,DOM_CR,DOM_JO,DOM_JU,DOM_PM,DOM_SZ,DOM_ST,DOM_SR,DOM_SD,DOM_VA)),
-ECU("Ecuador",258071,listOf(ECU_AZ,ECU_BO,ECU_CN,ECU_CR,ECU_CB,ECU_CT,ECU_EO,ECU_ES,ECU_GA,ECU_GU,ECU_IM,ECU_LJ,ECU_LR,ECU_MN,ECU_MS,ECU_NA,ECU_OR,ECU_PA,ECU_PI,ECU_SE,ECU_SD,ECU_SU,ECU_TU,ECU_ZC)),
-EGY("Egypt",987766,listOf(EGY_DQ,EGY_BA,EGY_BH,EGY_FY,EGY_GH,EGY_IK,EGY_IS,EGY_JZ,EGY_MF,EGY_MN,EGY_QH,EGY_QL,EGY_UQ,EGY_WJ,EGY_SW,EGY_SQ,EGY_AN,EGY_AT,EGY_BN,EGY_BS,EGY_DT,EGY_JS,EGY_KS,EGY_MT,EGY_QN,EGY_SS,EGY_SJ)),
-SLV("El Salvador",20545,listOf(SLV_AH,SLV_CA,SLV_CH,SLV_CU,SLV_LI,SLV_PA,SLV_UN,SLV_MO,SLV_SM,SLV_SS,SLV_SV,SLV_SA,SLV_SO,SLV_US)),
-GNQ("Equatorial Guinea",27138,listOf(GNQ_AN,GNQ_BN,GNQ_BS,GNQ_CS,GNQ_KN,GNQ_LI,GNQ_WN)),
-ERI("Eritrea",121150,listOf(ERI_AN,ERI_DU,ERI_DK,ERI_GB,ERI_MA,ERI_SK)),
-EST("Estonia",45354,listOf(EST_HA,EST_HI,EST_IV,EST_JR,EST_JN,EST_LN,EST_LV,EST_PR,EST_NA,EST_PL,EST_RA,EST_SA,EST_TA,EST_VG,EST_VD,EST_VR)),
-ETH("Ethiopia",1136255,listOf(ETH_AA,ETH_AF,ETH_AM,ETH_BE,ETH_DD,ETH_GA,ETH_HA,ETH_OR,ETH_SO,ETH_SN,ETH_TI)),
-FLK("Falkland Islands",12370,emptyList()),
-FRO("Faroe Islands",1434,listOf(FRO_OS,FRO_NO,FRO_SA,FRO_ST,FRO_SN|FO,FRO_VG)),
-FJI("Fiji",19057,listOf(FJI_CE,FJI_EA,FJI_NO,FJI_RO,FJI_W)),
-FIN("Finland",335489,listOf(FIN_IS,FIN_LP,FIN_OU,FIN_ES,FIN_LS)),
-FRA("France",549335,listOf(FRA_AR,FRA_BF,FRA_BT,FRA_CN,FRA_CE,FRA_AO,FRA_NC,FRA_IF,FRA_ND,FRA_AC,FRA_LP,FRA_PL,FRA_PR)),
-GUF("French Guiana",83856,listOf(GUF_CY,GUF_SL)),
-PYF("French Polynesia",4053,listOf(PYF_TI,PYF_WI,PYF_MI,PYF_LI,PYF_TG)),
-ATF("French Southern Territories",7852,listOf(ATF_CR,ATF_NA,ATF_AS,ATF_KG)),
-GAB("Gabon",266332,listOf(GAB_ES,GAB_HO,GAB_MO,GAB_NG,GAB_NY,GAB_OI,GAB_OL,GAB_OM,GAB_WN)),
-GMB("Gambia",10731,listOf(GMB_BJ,GMB_LR,GMB_MC,GMB_NB,GMB_UR,GMB_WE)),
-GEO("Georgia",69893,listOf(GEO_AB,GEO_AJ,GEO_GU,GEO_IM,GEO_KA,GEO_KK,GEO_MM,GEO_RK,GEO_SZ,GEO_SJ,GEO_SD,GEO_TB)),
-DEU("Germany",357324,listOf(DEU_BW,DEU_BY,DEU_BE,DEU_BR,DEU_HB,DEU_HH,DEU_HE,DEU_MV,DEU_NI,DEU_NW,DEU_RP,DEU_SL,DEU_SN,DEU_ST,DEU_SH,DEU_TH)),
-GHA("Ghana",241025,listOf(GHA_AF,GHA_AH,GHA_BO,GHA_BE,GHA_CP,GHA_EP,GHA_AA,GHA_NE,GHA_NP,GHA_OT,GHA_SV,GHA_UE,GHA_UW,GHA_TV,GHA_WP,GHA_WN)),
-GIB("Gibraltar",7,emptyList()),
-GRC("Greece",132751,listOf(GRC_AI,GRC_MA,GRC_AT,GRC_CR,GRC_EM,GRC_MH,GRC_PW,GRC_TC)),
-GRL("Greenland",2139125,listOf(GRL_KU,GRL_UO,GRL_QS,GRL_QT,GRL_SE)),
-GRD("Grenada",362,listOf(GRD_CA,GRD_AN,GRD_DA,GRD_GE,GRD_JO,GRD_MA,GRD_PA)),
-GLP("Guadeloupe",1658,listOf(GLP_BT,GLP_PP)),
-GUM("Guam",554,listOf(GUM_AH,GUM_AT,GUM_AS,GUM_BA,GUM_CP,GUM_DD,GUM_AN,GUM_IN,GUM_MA,GUM_ME,GUM_MT,GUM_PI,GUM_SR,GUM_SJ,GUM_TF,GUM_TM,GUM_UM,GUM_YG,GUM_YN)),
-GTM("Guatemala",109777,listOf(GTM_AV,GTM_BV,GTM_CM,GTM_CQ,GTM_PR,GTM_ES,GTM_GU,GTM_HU,GTM_IZ,GTM_JA,GTM_JU,GTM_PE,GTM_QZ,GTM_QC,GTM_RE,GTM_SA,GTM_SM,GTM_SR,GTM_SO,GTM_SU,GTM_TO,GTM_ZA)),
-GGY("Guernsey",88,listOf(GGY_AL,GGY_CA,GGY_FO,GGY_AN,GGY_MA,GGY_PP,GGY_SB,GGY_SM,GGY_SV,GGY_SK,GGY_TV,GGY_VA)),
-GIN("Guinea",246356,listOf(GIN_NA,GIN_C,GIN_NA,GIN_K,GIN_NA,GIN_NA,GIN_NA,GIN_NA)),
-GNB("Guinea-Bissau",34088,listOf(GNB_BA,GNB_BM,GNB_BS,GNB_BL,GNB_CA,GNB_GA,GNB_OI,GNB_QU,GNB_TO)),
-GUY("Guyana",211133,listOf(GUY_BA,GUY_CU,GUY_DE,GUY_EB,GUY_ES,GUY_MA,GUY_PM,GUY_PT,GUY_UD,GUY_UT)),
-HTI("Haiti",27258,listOf(HTI_CE,HTI_GR,HTI_AR,HTI_NI,HTI_ND,HTI_NE,HTI_NO,HTI_OU,HTI_SD,HTI_SE)),
-HMD("Heard Islandand Mc Donald Island",362,emptyList()),
-HND("Honduras",112950,listOf(HND_AT,HND_CH,HND_CL,HND_CM,HND_CP,HND_CR,HND_EP,HND_FM,HND_GD,HND_IN,HND_IB,HND_LP,HND_LE,HND_OC,HND_OL,HND_CP,HND_VA,HND_YO)),
-HUN("Hungary",92993,listOf(HUN_BK,HUN_BA,HUN_BE,HUN_BZ,HUN_BU,HUN_CS,HUN_FE,HUN_GS,HUN_HB,HUN_HE,HUN_JN,HUN_KE,HUN_NO,HUN_PE,HUN_SO,HUN_SZ,HUN_TO,HUN_VA,HUN_VE,HUN_ZA)),
-ISL("Iceland",101781,listOf(ISL_AL,ISL_HO,ISL_NE,ISL_NV,ISL_SL,ISL_SU,ISL_VF,ISL_VL)),
-IND("India",3166019,listOf(IND_AN,IND_AP,IND_AR,Z07_AR,IND_AS,IND_BR,IND_CH,IND_CT,IND_DN,IND_DD,IND_GA,IND_GJ,IND_HR,IND_HP,Z04_HP,Z09_HP,Z01_JK,IND_JH,IND_KA,IND_KL,IND_LD,IND_MP,IND_MH,IND_MN,IND_ML,IND_MZ,IND_NL,IND_DL,IND_OR,IND_PY,IND_PB,IND_RJ,IND_SK,IND_TN,IND_TG,IND_TR,IND_UP,IND_UT,Z05_UT,Z09_UT,IND_WB)),
-IDN("Indonesia",1902704,listOf(IDN_AC,IDN_BA,IDN_BB,IDN_BT,IDN_BE,IDN_GO,IDN_JK,IDN_JA,IDN_JR,IDN_JT,IDN_JI,IDN_KB,IDN_KS,IDN_KT,IDN_KM,IDN_KU,IDN_KR,IDN_LA,IDN_MA,IDN_MU,IDN_NB,IDN_NT,IDN_PA,IDN_IB,IDN_RI,IDN_SR,IDN_SE,IDN_ST,IDN_SG,IDN_SW,IDN_SB,IDN_SL,IDN_SU,IDN_YO)),
-IRN("Iran",1626366,listOf(IRN_AL,IRN_AR,IRN_BS,IRN_CM,IRN_EA,IRN_ES,IRN_FA,IRN_GI,IRN_GO,IRN_HD,IRN_HG,IRN_IL,IRN_KE,IRN_BK,IRN_KZ,IRN_KB,IRN_KD,IRN_LO,IRN_MK,IRN_MN,IRN_KS,IRN_QZ,IRN_QM,IRN_KV,IRN_SM,IRN_SB,IRN_KJ,IRN_TH,IRN_WA,IRN_YA,IRN_ZA)),
-IRQ("Iraq",437670,listOf(IRQ_AN,IRQ_BA,IRQ_MU,IRQ_QA,IRQ_NA,IRQ_AR,IRQ_SU,IRQ_TS,IRQ_BB,IRQ_BG,IRQ_DQ,IRQ_DA,IRQ_DI,IRQ_KA,IRQ_MA,IRQ_NI,IRQ_SD,IRQ_WA)),
-IRL("Ireland",70131,listOf(IRL_CW,IRL_CN,IRL_CE,IRL_DL,IRL_DN,IRL_GY,IRL_KY,IRL_KE,IRL_KK,IRL_LS,IRL_LM,IRL_LK,IRL_LD,IRL_LH,IRL_MO,IRL_MH,IRL_MN,IRL_OY,IRL_RN,IRL_SO,IRL_TY,IRL_WD,IRL_WH,IRL_WX,IRL_WW,IRL_CK)),
-IMN("Isleof Man",578,listOf(IMN_AY,IMN_RU,IMN_MC,IMN_MD,IMN_AY,IMN_RU,IMN_MD,IMN_GR,IMN_GB,IMN_MC,IMN_AY,IMN_RU,IMN_MD,IMN_MC,IMN_MD,IMN_GB,IMN_GB,IMN_RU,IMN_RU,IMN_AY,IMN_MD)),
-ISR("Israel",22226,listOf(ISR_NA,ISR_HD,ISR_HA,ISR_HM,ISR_HZ,ISR_JM,ISR_TA)),
-ITA("Italy",300894,listOf(ITA_65,ITA_16,ITA_77,ITA_78,ITA_72,ITA_45,ITA_36,ITA_62,ITA_42,ITA_25,ITA_57,ITA_67,ITA_21,ITA_88,ITA_19,ITA_52,ITA_32,ITA_55,ITA_23,ITA_34)),
-JAM("Jamaica",11061,listOf(JAM_CL,JAM_HA,JAM_KI,JAM_MA,JAM_PO,JAM_SD,JAM_SN,JAM_SC,JAM_SE,JAM_SJ,JAM_SM,JAM_ST,JAM_TR,JAM_WE)),
-JPN("Japan",373106,listOf(JPN_AI,JPN_AK,JPN_AO,JPN_CH,JPN_EH,JPN_FI,JPN_FO,JPN_FS,JPN_GF,JPN_GM,JPN_HS,JPN_HK,JPN_HG,JPN_IB,JPN_IS,JPN_IW,JPN_KG,JPN_KS,JPN_KN,JPN_KC,JPN_KM,JPN_KY,JPN_ME,JPN_MG,JPN_MZ,JPN_NN,JPN_NS,JPN_NR,JPN_NI,JPN_OT,JPN_OY,JPN_ON,JPN_OS,JPN_SG,JPN_ST,JPN_SH,JPN_SM,JPN_SZ,JPN_TC,JPN_TS,JPN_TK,JPN_TT,JPN_TY,JPN_WK,JPN_YT,JPN_YC,JPN_YN)),
-JEY("Jersey",125,listOf(JEY_GR,JEY_BR,JEY_CL,JEY_HE,JEY_JO,JEY_LA,JEY_MT,JEY_MY,JEY_OU,JEY_PE,JEY_SA,JEY_TR)),
-JOR("Jordan",89464,listOf(JOR_AJ,JOR_AM,JOR_AQ,JOR_BA,JOR_IR,JOR_JA,JOR_KA,JOR_MN,JOR_MD,JOR_MA,JOR_AT,JOR_AZ)),
-KAZ("Kazakhstan",2728680,listOf(KAZ_AA,KAZ_AM,KAZ_AT,KAZ_AR,KAZ_EK,KAZ_MG,KAZ_NK,KAZ_PA,KAZ_QG,KAZ_QS,KAZ_QO,KAZ_SK,KAZ_WK,KAZ_ZM)),
-KEN("Kenya",589936,listOf(KEN_BA,KEN_BO,KEN_BN,KEN_BS,KEN_EM,KEN_EB,KEN_GA,KEN_HB,KEN_IS,KEN_KJ,KEN_KK,KEN_KR,KEN_KB,KEN_KF,KEN_KY,KEN_KI,KEN_KU,KEN_KT,KEN_KW,KEN_LK,KEN_LM,KEN_MC,KEN_MK,KEN_MD,KEN_MB,KEN_ME,KEN_MG,KEN_MM,KEN_MU,KEN_NB,KEN_NK,KEN_ND,KEN_NR,KEN_NM,KEN_NN,KEN_NI,KEN_SA,KEN_SI,KEN_TT,KEN_TR,KEN_NT,KEN_TN,KEN_TU,KEN_UG,KEN_VI,KEN_WJ,KEN_WP)),
-KIR("Kiribati",1017,emptyList()),
-XKO("Kosovo",10843,listOf(XKO_NA,XKO_NA,XKO_KM,XKO_PE,XKO_NA,XKO_PZ,XKO_NA)),
-KWT("Kuwait",17486,listOf(KWT_AH,KWT_FA,KWT_JA,KWT_KU,KWT_HW,KWT_MU)),
-KGZ("Kyrgyzstan",197618,listOf(KGZ_BA,KGZ_GB,KGZ_CU,KGZ_DA,KGZ_NA,KGZ_OS,KGZ_OS,KGZ_TL,KGZ_YK)),
-LAO("Laos",231104,listOf(LAO_AT,LAO_BK,LAO_BL,LAO_CH,LAO_HO,LAO_KH,LAO_LM,LAO_LP,LAO_OU,LAO_PH,LAO_SL,LAO_SV,LAO_VI,LAO_VT,LAO_XA,LAO_XS,LAO_XE,LAO_XI)),
-LVA("Latvia",64537,listOf(LVA_,LVA_,LVA_,LVA_,LVA_)),
-LBN("Lebanon",10265,listOf(LBN_NA,LBN_NA,LBN_NA,LBN_NA,LBN_NA,LBN_NA,LBN_NA,LBN_NA)),
-LSO("Lesotho",30653,listOf(LSO_BE,LSO_BB,LSO_LE,LSO_MF,LSO_MS,LSO_MH,LSO_MK,LSO_QN,LSO_QT,LSO_TT)),
-LBR("Liberia",96550,listOf(LBR_BM,LBR_BG,LBR_GP,LBR_GB,LBR_CM,LBR_GD,LBR_GK,LBR_LF,LBR_MG,LBR_MY,LBR_MO,LBR_NI,LBR_RG,LBR_RI,LBR_SI)),
-LBY("Libya",1622430,listOf(LBY_BN,LBY_JK,LBY_JG,LBY_JR,LBY_JF,LBY_KU,LBY_MA,LBY_MR,LBY_AW,LBY_NK,LBY_ZW,LBY_BG,LBY_DA,LBY_GH,LBY_MS,LBY_MU,LBY_NT,LBY_SA,LBY_ST,LBY_TR,LBY_WH,LBY_WS)),
-LIE("Liechtenstein",159,listOf(LIE_BA,LIE_ES,LIE_GA,LIE_MA,LIE_PL,LIE_RU,LIE_SN,LIE_SB,LIE_TN,LIE_TB,LIE_VA)),
-LTU("Lithuania",64862,listOf(LTU_AS,LTU_KS,LTU_KP,LTU_MA,LTU_PA,LTU_SH,LTU_TG,LTU_TL,LTU_UN,LTU_VI)),
-LUX("Luxembourg",2579,listOf(LUX_DI,LUX_GR,LUX_LU)),
-SXM("Sint Maarten",38,emptyList()),
-MKD("North Macedonia",24930,listOf(MKD_AD,MKD_AR,MKD_BR,MKD_TL,MKD_BG,MKD_VJ,MKD_BS,MKD_BN,MKD_BU,MKD_CI,MKD_CA,MKD_CE,MKD_CZ,MKD_CH,MKD_CS,MKD_DB,MKD_DA,MKD_DL,MKD_DM,MKD_DK,MKD_DE,MKD_GB,MKD_GV,MKD_GP,MKD_GT,MKD_GR,MKD_IL,MKD_JG,MKD_KB,MKD_KX,MKD_AV,MKD_KH,MKD_VD,MKD_OC,MKD_KN,MKD_KY,MKD_KZ,MKD_KG,MKD_KS,MKD_UM,MKD_NA,MKD_LI,MKD_LO,MKD_MK,MKD_MD,MKD_MR,MKD_MG,MKD_NG,MKD_NV,MKD_NS,MKD_OD,MKD_PH,MKD_PE,MKD_PN,MKD_PP,MKD_PT,MKD_RV,MKD_RN,MKD_RE,MKD_RM,MKD_AJ,MKD_SS,MKD_SD,MKD_NA,MKD_ST,MKD_UG,MKD_RU,MKD_SU,MKD_SO,MKD_SL,MKD_TR,MKD_ET,MKD_VA,MKD_VL,MKD_VE,MKD_VV,MKD_NI,MKD_VH,MKD_ZK,MKD_ZE,MKD_ZR)),
-MDG("Madagascar",594538,listOf(MDG_T,MDG_D,MDG_F,MDG_M,MDG_A,MDG_NA)),
-MWI("Malawi",118637,listOf(MWI_BA,MWI_BL,MWI_CK,MWI_CR,MWI_CT,MWI_DE,MWI_DO,MWI_KR,MWI_KS,MWI_LK,MWI_LI,MWI_MA,MWI_MG,MWI_MC,MWI_MJ,MWI_MN,MWI_MZ,MWI_NN,MWI_NA,MWI_NK,MWI_NS,MWI_NU,MWI_NI,MWI_PH,MWI_RU,MWI_SA,MWI_TH,MWI_ZO)),
-MYS("Malaysia",331770,listOf(MYS_JH,MYS_KH,MYS_KN,MYS_KL,MYS_LA,MYS_ME,MYS_NS,MYS_PH,MYS_PK,MYS_PL,MYS_PG,MYS_PJ,MYS_SA,MYS_SK,MYS_SL,MYS_TE)),
-MDV("Maldives",281,emptyList()),
-MLI("Mali",1258093,listOf(MLI_BA,MLI_GA,MLI_KY,MLI_KD,MLI_KK,MLI_MO,MLI_SG,MLI_SK,MLI_TB)),
-MLT("Malta",324,listOf(MLT_CE,MLT_GO,MLT_SO,MLT_NO,MLT_SE)),
-MHL("Marshall Islands",285,listOf(MHL_NA,MHL_NA,MHL_NA,MHL_NA,MHL_NA,MHL_NA,MHL_NA,MHL_NA,MHL_KWA,MHL_NA,MHL_NA,MHL_NA,MHL_MAJ,MHL_NA,MHL_NA,MHL_NA,MHL_NA,MHL_NA,MHL_NA,MHL_NA,MHL_NA,MHL_NA,MHL_NA)),
-MTQ("Martinique",1124,listOf(MTQ_FF,MTQ_MA,MTQ_TR,MTQ_SP)),
-MRT("Mauritania",1046483,listOf(MRT_AD,MRT_AS,MRT_BR,MRT_DN,MRT_GO,MRT_GD,MRT_HC,MRT_HG,MRT_IN,MRT_NO,MRT_TG,MRT_TZ,MRT_TR)),
-MUS("Mauritius",2036,listOf(MUS_AG,MUS_BL,MUS_FL,MUS_GP,MUS_MO,MUS_PA,MUS_PW,MUS_PL,MUS_RR,MUS_RO,MUS_CC,MUS_SA)),
-MYT("Mayotte",394,listOf(MYT_01,MYT_,MYT_,MYT_04,MYT_05,MYT_06,MYT_07,MYT_08,MYT_,MYT_10,MYT_13,MYT_,MYT_12,MYT_,MYT_,MYT_,MYT_17)),
-MEX("México",1960059,listOf(MEX_AG,MEX_BN,MEX_BS,MEX_CM,MEX_CP,MEX_CH,MEX_CA,MEX_CL,MEX_DF,MEX_DU,MEX_GJ,MEX_GR,MEX_HI,MEX_JA,MEX_MX,MEX_MC,MEX_MR,MEX_NA,MEX_NL,MEX_OA,MEX_PU,MEX_QE,MEX_QR,MEX_SL,MEX_SI,MEX_SO,MEX_TB,MEX_TM,MEX_TL,MEX_VE,MEX_YU,MEX_ZA)),
-FSM("Micronesia",770,listOf(FSM_CH,FSM_KO,FSM_PO,FSM_YA)),
-MDA("Moldova",33889,listOf(MDA_AN,MDA_BT,MDA_BA,MDA_BD,MDA_BR,MDA_CH,MDA_CA,MDA_CN,MDA_CU,MDA_CV,MDA_CS,MDA_CR,MDA_DO,MDA_DR,MDA_DB,MDA_ED,MDA_FA,MDA_FL,MDA_GA,MDA_GL,MDA_HI,MDA_IA,MDA_LE,MDA_NI,MDA_OC,MDA_OH,MDA_RZ,MDA_RS,MDA_SI,MDA_SD,MDA_SO,MDA_SV,MDA_ST,MDA_TA,MDA_TE,MDA_DU,MDA_UG)),
-MCO("Monaco",2,emptyList()),
-MNG("Mongolia",1565638,listOf(MNG_AR,MNG_BO,MNG_BH,MNG_BU,MNG_DA,MNG_DD,MNG_DG,MNG_DU,MNG_DZ,MNG_GA,MNG_GS,MNG_HN,MNG_HD,MNG_HG,MNG_OG,MNG_ER,MNG_OH,MNG_SL,MNG_SB,MNG_TO,MNG_UB,MNG_UV)),
-MNE("Montenegro",13342,listOf(MNE_AN,MNE_BA,MNE_BE,MNE_BP,MNE_BU,MNE_CE,MNE_DA,MNE_HN,MNE_KL,MNE_KT,MNE_MK,MNE_NK,MNE_PV,MNE_PL,MNE_PU,MNE_PG,MNE_RO,MNE_SA,MNE_TI,MNE_UL,MNE_ZA)),
-MSR("Montserrat",101,listOf(MSR_SA,MSR_SG,MSR_SP)),
-MAR("Morocco",414714,listOf(MAR_CO,MAR_DA,MAR_FB,MAR_GB,MAR_GC,MAR_GE,MAR_LB,MAR_MK,MAR_MT,MAR_OR,MAR_RZ,MAR_SM,MAR_TD,MAR_TO,MAR_TH)),
-MOZ("Mozambique",791805,listOf(MOZ_CD,MOZ_GA,MOZ_IN,MOZ_MN,MOZ_MP,MOZ_MC,MOZ_NM,MOZ_NS,MOZ_SO,MOZ_TE,MOZ_ZA)),
-MMR("Myanmar",672590,listOf(MMR_AY,MMR_BA,MMR_CH,MMR_KC,MMR_KH,MMR_KN,MMR_MG,MMR_MD,MMR_MO,MMR_NY,MMR_RA,MMR_SA,MMR_SH,MMR_TN,MMR_YA)),
-NAM("Namibia",828017,listOf(NAM_KA,NAM_ER,NAM_HA,NAM_OK,NAM_KH,NAM_KU,NAM_OW,NAM_OH,NAM_OS,NAM_ON,NAM_OT,NAM_OD,NAM_CA)),
-NRU("Nauru",22,listOf(NRU_AI,NRU_AB,NRU_AT,NRU_AR,NRU_BA,NRU_BO,NRU_BU,NRU_DE,NRU_EW,NRU_IJ,NRU_ME,NRU_NI,NRU_UA,NRU_YA)),
-NPL("Nepal",148210,listOf(NPL_MM,NPL_PW,NPL_SP,NPL_MP,NPL_PM)),
-NLD("Netherlands",37624,listOf(NLD_DR,NLD_FL,NLD_FR,NLD_GE,NLD_GR,NLD_NA,NLD_LI,NLD_NB,NLD_NH,NLD_OV,NLD_UT,NLD_ZE,NLD_NA,NLD_NA)),
-NCL("New Caledonia",18916,listOf(NCL_IL,NCL_NO,NCL_SU)),
-NZL("New Zealand",268937,listOf(NZL_AU,NZL_BP,NZL_CA,NZL_CI,NZL_GI,NZL_HB,NZL_MW,NZL_MA,NZL_NE,NZL_01,NZL_NO,NZL_OT,NZL_02,NZL_SO,NZL_TK,NZL_TS,NZL_WK,NZL_WG,NZL_WC)),
-NIC("Nicaragua",128957,listOf(NIC_AN,NIC_AS,NIC_BO,NIC_CA,NIC_CI,NIC_CO,NIC_ES,NIC_GR,NIC_JI,NIC_,NIC_LE,NIC_MD,NIC_MN,NIC_MS,NIC_MT,NIC_NS,NIC_SJ,NIC_RI)),
-NER("Niger",1190189,listOf(NER_AG,NER_DF,NER_DS,NER_MA,NER_NI,NER_TH,NER_TL,NER_ZI)),
-NGA("Nigeria",914161,listOf(NGA_AB,NGA_AD,NGA_AK,NGA_AN,NGA_BA,NGA_BY,NGA_BE,NGA_BO,NGA_CR,NGA_DE,NGA_EB,NGA_ED,NGA_EK,NGA_EN,NGA_FC,NGA_GO,NGA_IM,NGA_JI,NGA_KD,NGA_KN,NGA_KT,NGA_KE,NGA_KO,NGA_KW,NGA_LA,NGA_NA,NGA_NI,NGA_OG,NGA_ON,NGA_OS,NGA_OY,NGA_PL,NGA_RI,NGA_SO,NGA_TA,NGA_YO,NGA_ZA)),
-NIU("Niue",268,emptyList()),
-NFK("Norfolk Island",41,emptyList()),
-PRK("North Korea",122844,listOf(PRK_CH,PRK_HG,PRK_HN,PRK_WB,PRK_WN,PRK_KS,PRK_KW,PRK_NA,PRK_PB,PRK_PN,PRK_PY,PRK_NJ,PRK_YG,PRK_NA)),
-ZNC("Northern Cyprus",3321,listOf(ZNC_NA,ZNC_NA,ZNC_NA,ZNC_NA,ZNC_NA)),
-MNP("Northern Mariana Islands",506,listOf(MNP_NI,MNP_RO,MNP_SA,MNP_TI)),
-NOR("Norway",323747,listOf(NOR_AK,NOR_OF,NOR_AA,NOR_BU,NOR_FI,NOR_HE,NOR_HO,NOR_MR,NOR_NT,NOR_NO,NOR_OP,NOR_OS,NOR_RO,NOR_SF,NOR_ST,NOR_TE,NOR_TR,NOR_VA,NOR_VF)),
-OMN("Oman",310686,listOf(OMN_DA,OMN_BN,OMN_BS,OMN_DH,OMN_ZA,OMN_WU,OMN_SN,OMN_SS,OMN_JA,OMN_MU,OMN_MA)),
-PAK("Pakistan",877139,listOf(Z06_JK,PAK_BA,PAK_TA,Z06_NA,PAK_IS,PAK_NW,PAK_PB,PAK_SD)),
-PLW("Palau",484,listOf(PLW_AM,PLW_AR,PLW_PE,PLW_HA,PLW_KA,PLW_KO,PLW_ME,PLW_ND,PLW_NC,PLW_NM,PLW_NP,PLW_NS,PLW_NL,PLW_NW,PLW_PE,PLW_SO)),
-PSE("Palestine",6238,listOf(PSE_GZ,PSE_WE)),
-PAN("Panama",75933,listOf(PAN_BC,PAN_CH,PAN_CC,PAN_CL,PAN_DR,PAN_EM,PAN_HE,PAN_SB,PAN_LS,PAN_NB,PAN_PN,PAN_PO,PAN_VR)),
-PNG("Papua New Guinea",466628,listOf(PNG_NS,PNG_CE,PNG_CH,PNG_EN,PNG_ES,PNG_EH,PNG_EG,PNG_GU,PNG_HE,PNG_JI,PNG_MD,PNG_MN,PNG_MB,PNG_MR,PNG_NC,PNG_NI,PNG_NO,PNG_SA,PNG_SL,PNG_WN,PNG_WE,PNG_WL)),
-PRY("Paraguay",401148,listOf(PRY_AG,PRY_AA,PRY_AM,PRY_AS,PRY_BQ,PRY_CG,PRY_CZ,PRY_CY,PRY_CE,PRY_CN,PRY_CR,PRY_GU,PRY_IT,PRY_MI,PRY_NE,PRY_PG,PRY_PH,PRY_SP)),
-PER("Peru",1300636,listOf(PER_AM,PER_AN,PER_AP,PER_AR,PER_AY,PER_CJ,PER_CL,PER_CS,PER_HV,PER_HC,PER_IC,PER_JU,PER_LL,PER_LB,PER_LR,PER_LP,PER_LO,PER_MD,PER_MQ,PER_PA,PER_PI,PER_PU,PER_SM,PER_TA,PER_TU,PER_UC)),
-PHL("Philippines",297628,listOf(PHL_AB,PHL_AN,PHL_AS,PHL_AK,PHL_AL,PHL_AQ,PHL_AP,PHL_AU,PHL_BS,PHL_BA,PHL_BN,PHL_BT,PHL_BG,PHL_BI,PHL_BO,PHL_BK,PHL_BU,PHL_CG,PHL_CN,PHL_CS,PHL_CM,PHL_CP,PHL_CT,PHL_CV,PHL_CB,PHL_CL,PHL_DV,PHL_DS,PHL_DO,PHL_DI,PHL_ES,PHL_GU,PHL_IF,PHL_IN,PHL_IS,PHL_II,PHL_IB,PHL_KA,PHL_LU,PHL_LG,PHL_LN,PHL_LS,PHL_LE,PHL_MG,PHL_MQ,PHL_MB,PHL_MM,PHL_MD,PHL_MN,PHL_MT,PHL_ND,PHL_NR,PHL_NC,PHL_NS,PHL_NE,PHL_NV,PHL_MC,PHL_MR,PHL_PL,PHL_PM,PHL_PN,PHL_QZ,PHL_QR,PHL_RI,PHL_RO,PHL_SM,PHL_SG,PHL_SQ,PHL_SR,PHL_SC,PHL_SL,PHL_SK,PHL_SU,PHL_SN,PHL_SS,PHL_TR,PHL_TT,PHL_PN,PHL_ZN,PHL_ZS,PHL_ZY)),
-PCN("Pitcairn Islands",54,emptyList()),
-POL("Poland",311892,listOf(POL_02,POL_04,POL_10,POL_06,POL_08,POL_12,POL_14,POL_16,POL_18,POL_20,POL_22,POL_24,POL_26,POL_28,POL_30,POL_32)),
-PRT("Portugal",91999,listOf(PRT_AV,PRT_AC,PRT_BE,PRT_BR,PRT_BA,PRT_CB,PRT_CO,PRT_EV,PRT_FA,PRT_GU,PRT_LE,PRT_LI,PRT_NA,PRT_PA,PRT_PO,PRT_SA,PRT_SE,PRT_VC,PRT_VR,PRT_VI)),
-PRI("Puerto Rico",9019,listOf(PRI_AJ,PRI_AD,PRI_AL,PRI_AB,PRI_AI,PRI_AN,PRI_AC,PRI_AR,PRI_BC,PRI_BQ,PRI_BY,PRI_CR,PRI_CG,PRI_CA,PRI_CV,PRI_CN,PRI_CT,PRI_CY,PRI_CB,PRI_CL,PRI_CD,PRI_CO,PRI_CM,PRI_CZ,PRI_CU,PRI_DO,PRI_FJ,PRI_FL,PRI_GC,PRI_GM,PRI_GL,PRI_GB,PRI_GR,PRI_HA,PRI_HO,PRI_HU,PRI_IS,PRI_JY,PRI_JD,PRI_JC,PRI_LJ,PRI_LR,PRI_LM,PRI_LP,PRI_LZ,PRI_LQ,PRI_MT,PRI_MR,PRI_MB,PRI_MG,PRI_MC,PRI_MV,PRI_NG,PRI_NR,PRI_OR,PRI_PT,PRI_PN,PRI_PO,PRI_QB,PRI_RC,PRI_RG,PRI_SB,PRI_SA,PRI_SG,PRI_SJ,PRI_SL,PRI_SS,PRI_SI,PRI_TA,PRI_TB,PRI_TJ,PRI_UT,PRI_VA,PRI_VB,PRI_VQ,PRI_VL,PRI_YB,PRI_YU)),
-QAT("Qatar",11633,listOf(QAT_DA,QAT_DY,QAT_KR,QAT_WA,QAT_RY,QAT_MS,QAT_SL)),
-COG("Republicofthe Congo",344030,listOf(COG_BO,COG_BR,COG_CU,COG_CO,COG_KO,COG_LE,COG_LI,COG_NI,COG_PL,COG_PN,COG_PO,COG_SA)),
-REU("Réunion",2526,listOf(REU_BN,REU_DN,REU_PL,REU_PR)),
-ROU("Romania",238297,listOf(ROU_AB,ROU_AR,ROU_AG,ROU_BC,ROU_BH,ROU_BN,ROU_BT,ROU_BR,ROU_BV,ROU_BI,ROU_BZ,ROU_CL,ROU_CS,ROU_CJ,ROU_CT,ROU_CV,ROU_DB,ROU_DJ,ROU_GL,ROU_GR,ROU_GJ,ROU_HR,ROU_HD,ROU_IL,ROU_IS,ROU_IF,ROU_MM,ROU_MH,ROU_MS,ROU_NT,ROU_OT,ROU_PH,ROU_SJ,ROU_SM,ROU_SB,ROU_SV,ROU_TR,ROU_TM,ROU_TL,ROU_VL,ROU_VS,ROU_VN)),
-RUS("Russia",16869756,listOf(RUS_AD,RUS_AL,RUS_AM,RUS_AR,RUS_AS,RUS_BK,RUS_BL,RUS_BR,RUS_BU,RUS_CN,RUS_CL,RUS_CK,RUS_CV,RUS_SP,RUS_DA,RUS_GA,RUS_IN,RUS_IK,RUS_IV,RUS_KB,RUS_KN,RUS_KL,RUS_KG,RUS_KQ,RUS_KC,RUS_KI,RUS_KE,RUS_KH,RUS_KK,RUS_KM,RUS_KV,RUS_KO,RUS_KT,RUS_KD,RUS_KX,RUS_KU,RUS_KS,RUS_LN,RUS_LP,RUS_MG,RUS_ME,RUS_MR,RUS_NA,RUS_MS,RUS_MM,RUS_NN,RUS_NZ,RUS_NO,RUS_NG,RUS_NS,RUS_OM,RUS_OL,RUS_OB,RUS_PZ,RUS_PE,RUS_PR,RUS_PS,RUS_RO,RUS_RZ,RUS_SK,RUS_SL,RUS_SA,RUS_SR,RUS_SM,RUS_ST,RUS_SV,RUS_TB,RUS_TT,RUS_TO,RUS_TL,RUS_TU,RUS_TV,RUS_TY,RUS_UD,RUS_UL,RUS_VL,RUS_VG,RUS_VO,RUS_VR,RUS_YN,RUS_YS,RUS_YV,RUS_ZB)),
-RWA("Rwanda",25449,listOf(RWA_NO,RWA_SU,RWA_ES,RWA_OU,RWA_KV)),
-BLM("Saint-Barthélemy",21,listOf(BLM_NA,BLM_NA)),
-MAF("Saint-Martin",56,emptyList()),
-SHN("Saint Helena, Ascensionand Tris",412,listOf(SHN_AC,SHN_SH,SHN_TA)),
-KNA("Saint Kittsand Nevis",269,listOf(KNA_CC,KNA_AS,KNA_GB,KNA_GG,KNA_JW,KNA_JC,KNA_JF,KNA_MC,KNA_PP,KNA_PL,KNA_PB,KNA_TL,KNA_TM,KNA_TP)),
-LCA("Saint Lucia",618,listOf(LCA_AR,LCA_CN,LCA_CS,LCA_CH,LCA_DE,LCA_GI,LCA_LB,LCA_MI,LCA_CO,LCA_VF)),
-SPM("Saint Pierreand Miquelon",227,listOf(SPM_ML,SPM_SP)),
-VCT("Saint Vincentandthe Grenadines",400,listOf(VCT_CH,VCT_GT,VCT_AN,VCT_DA,VCT_GE,VCT_PA)),
-WSM("Samoa",2871,listOf(WSM_AA,WSM_AL,WSM_AT,WSM_FA,WSM_GE,WSM_GI,WSM_PA,WSM_SA,WSM_TU,WSM_VF,WSM_VS)),
-SMR("San Marino",61,listOf(SMR_AC,SMR_BM,SMR_CH,SMR_DO,SMR_FA,SMR_FI,SMR_MG,SMR_SM,SMR_SE)),
-STP("SãoToméand Príncipe",1009,listOf(STP_PR,STP_ST)),
-SAU("Saudi Arabia",1931654,listOf(SAU_AS,SAU_BA,SAU_HS,SAU_JF,SAU_MD,SAU_QS,SAU_RI,SAU_SH,SAU_HA,SAU_JZ,SAU_MK,SAU_NJ,SAU_TB)),
-SEN("Senegal",198056,listOf(SEN_DK,SEN_DB,SEN_FK,SEN_KF,SEN_KC,SEN_KG,SEN_KD,SEN_LG,SEN_MT,SEN_ST,SEN_SD,SEN_TB,SEN_TH,SEN_ZG)),
-SRB("Serbia",78247,listOf(SRB_BO,SRB_BR,SRB_BG,SRB_JA,SRB_JC,SRB_JN,SRB_KB,SRB_MA,SRB_MR,SRB_NS,SRB_PC,SRB_PI,SRB_PD,SRB_PM,SRB_RN,SRB_RS,SRB_SC,SRB_SN,SRB_SD,SRB_SM,SRB_SU,SRB_TO,SRB_ZJ,SRB_ZC,SRB_ZL)),
-SYC("Seychelles",492,listOf(SYC_PI,SYC_AB,SYC_ET,SYC_RO,SYC_LO,SYC_BL,SYC_BS,SYC_BV,SYC_BA,SYC_BO,SYC_CA,SYC_RA,SYC_GL,SYC_GM,SYC_GP,SYC_DI,SYC_LM,SYC_MB,SYC_MF,SYC_OI,SYC_PL,SYC_PR,SYC_PG,SYC_RC,SYC_SL,SYC_TA)),
-SLE("Sierra Leone",73067,listOf(SLE_EA,SLE_NO,SLE_SO,SLE_WE)),
-SGP("Singapore",700,listOf(SGP_NA,SGP_NA,SGP_NA,SGP_NA,SGP_NA)),
-SVK("Slovakia",49055,listOf(SVK_BC,SVK_BL,SVK_KI,SVK_NI,SVK_PV,SVK_TC,SVK_TA,SVK_ZI)),
-SVN("Slovenia",19951,listOf(SVN_GO,SVN_SP,SVN_NA,SVN_KO,SVN_NO,SVN_JP,SVN_LJ,SVN_PD,SVN_PM,SVN_SA,SVN_PS,SVN_ZS)),
-SLB("Solomon Islands",28686,listOf(SLB_CN,SLB_CH,SLB_GU,SLB_CT,SLB_IS,SLB_MK,SLB_ML,SLB_RB,SLB_TE,SLB_WE)),
-SOM("Somalia",637672,listOf(SOM_AW,SOM_BK,SOM_BN,SOM_BR,SOM_BY,SOM_GA,SOM_GE,SOM_HI,SOM_JD,SOM_JH,SOM_MU,SOM_NU,SOM_SA,SOM_SD,SOM_SH,SOM_SO,SOM_TO,SOM_WO)),
-ZAF("South Africa",1224059,listOf(ZAF_EC,ZAF_FS,ZAF_GT,ZAF_NL,ZAF_NP,ZAF_MP,ZAF_NW,ZAF_NC,ZAF_WC)),
-SGS("South Georgiaandthe South Sand",4085,emptyList()),
-KOR("South Korea",100721,listOf(KOR_PU,KOR_GB,KOR_GN,KOR_TG,KOR_TJ,KOR_KW,KOR_KJ,KOR_KG,KOR_KB,KOR_KN,KOR_IN,KOR_CJ,KOR_CB,KOR_CN,KOR_SJ,KOR_SO,KOR_UL)),
-SSD("South Sudan",632186,listOf(SSD_BG,SSD_EE,SSD_JG,SSD_EB,SSD_NB,SSD_WH,SSD_UN,SSD_WR,SSD_WB,SSD_WE)),
-ESP("Spain",506617,listOf(ESP_AN,ESP_AR,ESP_CB,ESP_CM,ESP_CL,ESP_CT,ESP_ML,ESP_MD,ESP_NA,ESP_VC,ESP_EX,ESP_GA,ESP_PM,ESP_CN,ESP_LO,ESP_PV,ESP_AS,ESP_MU)),
-LKA("Sri Lanka",66267,listOf(LKA_AP,LKA_AD,LKA_BD,LKA_BC,LKA_CO,LKA_GL,LKA_GQ,LKA_HB,LKA_JA,LKA_KT,LKA_KY,LKA_KE,LKA_KL,LKA_KG,LKA_MB,LKA_MT,LKA_MH,LKA_MJ,LKA_MP,LKA_NW,LKA_PR,LKA_PX,LKA_RN,LKA_TC,LKA_VA)),
-SDN("Sudan",1882758,listOf(SDN_GZ,SDN_GD,SDN_BN,SDN_CD,SDN_ED,SDN_KA,SDN_KH,SDN_ND,SDN_KN,SDN_NO,SDN_RS,SDN_RN,SDN_SI,SDN_SD,SDN_KS,SDN_WD,SDN_KN,SDN_WN)),
-SUR("Suriname",147402,listOf(SUR_BR,SUR_CM,SUR_CR,SUR_MA,SUR_NI,SUR_PR,SUR_PM,SUR_SA,SUR_SI,SUR_WA)),
-SJM("Svalbardand Jan Mayen",59960,listOf(SJM_JN,SJM_SV)),
-SWZ("Swaziland",17451,listOf(SWZ_HH,SWZ_LU,SWZ_MA,SWZ_SH)),
-SWE("Sweden",448298,listOf(SWE_BL,SWE_KO,SWE_GV,SWE_GT,SWE_HA,SWE_JA,SWE_JO,SWE_KA,SWE_KR,SWE_NB,SWE_OR,SWE_OG,SWE_SN,SWE_SD,SWE_ST,SWE_UP,SWE_VR,SWE_VB,SWE_VN,SWE_VM,SWE_VG)),
-CHE("Switzerland",41217,listOf(CHE_AG,CHE_AR,CHE_AI,CHE_BL,CHE_BS,CHE_BE,CHE_FR,CHE_GE,CHE_GL,CHE_GR,CHE_JU,CHE_LU,CHE_NE,CHE_NW,CHE_OW,CHE_SG,CHE_SH,CHE_SZ,CHE_SO,CHE_TG,CHE_TI,CHE_UR,CHE_VS,CHE_VD,CHE_ZG,CHE_ZH)),
-SYR("Syria",187360,listOf(SYR_HA,SYR_HL,SYR_RA,SYR_SU,SYR_DI,SYR_DR,SYR_DY,SYR_HM,SYR_HI,SYR_ID,SYR_LA,SYR_QU,SYR_RD,SYR_TA)),
-TWN("Taiwan",36571,listOf(TWN_FK,TWN_KH,TWN_NT,TWN_TG,TWN_TN,TWN_TP,TWN_TA)),
-TJK("Tajikistan",142330,listOf(TJK_RR,TJK_DU,TJK_BK,TJK_KL,TJK_LE)),
-TZA("Tanzania",946695,listOf(TZA_AS,TZA_DS,TZA_DO,TZA_GE,TZA_IG,TZA_KG,TZA_PN,TZA_ZN,TZA_KA,TZA_KM,TZA_KL,TZA_PS,TZA_ZS,TZA_LI,TZA_MY,TZA_MA,TZA_MB,TZA_ZW,TZA_MO,TZA_MT,TZA_MZ,TZA_NJ,TZA_PW,TZA_RU,TZA_RV,TZA_SY,TZA_SI,TZA_SD,TZA_SO,TZA_TB,TZA_TN)),
-THA("Thailand",516901,listOf(THA_AC,THA_AT,THA_BM,THA_BK,THA_BR,THA_CC,THA_CN,THA_CY,THA_CT,THA_CM,THA_CR,THA_CB,THA_CP,THA_KL,THA_KP,THA_KN,THA_KK,THA_KR,THA_LG,THA_LN,THA_LE,THA_LB,THA_MH,THA_MS,THA_MD,THA_NN,THA_NP,THA_NF,THA_NR,THA_NS,THA_NT,THA_NA,THA_NW,THA_NB,THA_NK,THA_NO,THA_PT,THA_PI,THA_PG,THA_PL,THA_PY,THA_PH,THA_PE,THA_PC,THA_PS,THA_PA,THA_PR,THA_PU,THA_PB,THA_PK,THA_RN,THA_RT,THA_RY,THA_RE,THA_SK,THA_SN,THA_SP,THA_SS,THA_SM,THA_SR,THA_SA,THA_SI,THA_SB,THA_SG,THA_SO,THA_SH,THA_ST,THA_SU,THA_TK,THA_TG,THA_TT,THA_UR,THA_UN,THA_UT,THA_UD,THA_YL,THA_YS)),
-TLS("Timor-Leste",15012,listOf(TLS_AL,TLS_AN,TLS_AM,TLS_BC,TLS_BB,TLS_CL,TLS_DL,TLS_ER,TLS_BT,TLS_LQ,TLS_MT,TLS_MF,TLS_VQ)),
-TGO("Togo",57272,listOf(TGO_CE,TGO_KA,TGO_MA,TGO_PL,TGO_SA)),
-TKL("Tokelau",15,listOf(TKL_AT,TKL_FA,TKL_NU)),
-TON("Tonga",762,listOf(TON_EU,TON_HA,TON_NI,TON_TT,TON_VA)),
-TTO("Trinidadand Tobago",5193,listOf(TTO_AR,TTO_CH,TTO_CT,TTO_DM,TTO_MR,TTO_PD,TTO_PF,TTO_PS,TTO_PT,TTO_SF,TTO_SL,TTO_SN,TTO_SI,TTO_TB,TTO_TP)),
-TUN("Tunisia",155257,listOf(TUN_AN,TUN_BJ,TUN_BA,TUN_BZ,TUN_GB,TUN_GF,TUN_JE,TUN_KR,TUN_KS,TUN_KB,TUN_KF,TUN_MH,TUN_MN,TUN_ME,TUN_MS,TUN_NB,TUN_SF,TUN_SZ,TUN_SL,TUN_SS,TUN_TA,TUN_TO,TUN_TU,TUN_ZA)),
-TUR("Turkey",781794,listOf(TUR_AA,TUR_AD,TUR_AF,TUR_AG,TUR_AK,TUR_AM,TUR_AN,TUR_AL,TUR_AR,TUR_AV,TUR_AY,TUR_BK,TUR_BR,TUR_BM,TUR_BB,TUR_BC,TUR_BG,TUR_BT,TUR_BL,TUR_BD,TUR_BU,TUR_CK,TUR_CI,TUR_CM,TUR_DN,TUR_DY,TUR_DU,TUR_ED,TUR_EG,TUR_EN,TUR_EM,TUR_ES,TUR_GA,TUR_GI,TUR_GU,TUR_HK,TUR_HT,TUR_IG,TUR_IP,TUR_IB,TUR_IZ,TUR_KM,TUR_KB,TUR_KR,TUR_KA,TUR_KS,TUR_KY,TUR_KI,TUR_KK,TUR_KL,TUR_KH,TUR_KC,TUR_KO,TUR_KU,TUR_ML,TUR_MN,TUR_MR,TUR_IC,TUR_MG,TUR_MS,TUR_NV,TUR_NG,TUR_OR,TUR_OS,TUR_RI,TUR_SK,TUR_SS,TUR_SU,TUR_SI,TUR_SP,TUR_SR,TUR_SV,TUR_TG,TUR_TT,TUR_TB,TUR_TC,TUR_US,TUR_VA,TUR_YL,TUR_YZ,TUR_ZO)),
-TKM("Turkmenistan",490273,listOf(TKM_AL,TKM_AB,TKM_BA,TKM_DA,TKM_LE,TKM_MA)),
-TCA("Turksand Caicos Islands",995,listOf(TCA_NA,TCA_NA,TCA_NA,TCA_NA,TCA_NA,TCA_NA)),
-TUV("Tuvalu",40,listOf(TUV_FN,TUV_NG,TUV_NA,TUV_NK,TUV_NT,TUV_NU,TUV_NF,TUV_NL,TUV_VI)),
-UGA("Uganda",243045,listOf(UGA_AD,UGA_AC,UGA_AW,UGA_BG,UGA_BN,UGA_BS,UGA_BU,UGA_GL,UGA_HO,UGA_IN,UGA_JI,UGA_KA,UGA_BR,UGA_KD,UGA_KN,UGA_KM,UGA_KX,UGA_KE,UGA_UU,UGA_KP,UGA_KS,UGA_KK,UGA_KY,UGA_KI,UGA_KG,UGA_KR,UGA_TG,UGA_KF,UGA_KU,UGA_KJ,UGA_NA,UGA_NA,UGA_LA,UGA_LW,UGA_MA,UGA_MC,UGA_MG,UGA_ME,UGA_RR,UGA_MT,UGA_MY,UGA_MI,UGA_MD,UGA_MN,UGA_NP,UGA_NA,UGA_NE,UGA_NT,UGA_PD,UGA_PL,UGA_RA,UGA_RK,UGA_SE,UGA_SI,UGA_SR,UGA_TR,UGA_WA,UGA_YU)),
-UKR("Ukraine",600816,listOf(UKR_,UKR_CK,UKR_CH,UKR_CV,UKR_KR,UKR_DP,UKR_DT,UKR_IF,UKR_KK,UKR_KS,UKR_KM,UKR_KV,UKR_KC,UKR_KH,UKR_LV,UKR_LH,UKR_MY,UKR_OD,UKR_PL,UKR_RV,UKR_SC,UKR_SM,UKR_TP,UKR_VI,UKR_VO,UKR_ZK,UKR_ZP,UKR_ZT)),
-ARE("United Arab Emirates",71429,listOf(ARE_AZ,ARE_AJ,ARE_DU,ARE_FU,ARE_RK,ARE_SH,ARE_UQ)),
-GBR("United Kingdom",244732,listOf(GBR_NIR,GBR_SCT,GBR_WLS,GBR_NA,NA_NA)),
-USA("United States",9477483,listOf(USA_AL,USA_AK,USA_AZ,USA_AR,USA_CA,USA_CO,USA_CT,USA_DE,USA_DC,USA_FL,USA_GA,USA_HI,USA_ID,USA_IL,USA_IN,USA_IA,USA_KS,USA_KY,USA_LA,USA_ME,USA_MD,USA_MA,USA_MI,USA_MN,USA_MS,USA_MO,USA_MT,USA_NE,USA_NV,USA_NH,USA_NJ,USA_NM,USA_NY,USA_NC,USA_ND,USA_OH,USA_OK,USA_OR,USA_PA,USA_RI,USA_SC,USA_SD,USA_TN,USA_TX,USA_UT,USA_VT,USA_VA,USA_WA,USA_WV,USA_WI,USA_WY)),
-UMI("United States Minor Outlying Isl",47,listOf(UMI_NA,UMI_NA,UMI_NA,UMI_NA,UMI_NA,UMI_NA,UMI_NA,UMI_NA,UMI_NA)),
-URY("Uruguay",178103,listOf(URY_AR,URY_CA,URY_CL,URY_CO,URY_DU,URY_FS,URY_FD,URY_LA,URY_MA,URY_MO,URY_PA,URY_RN,URY_RV,URY_RO,URY_SA,URY_SJ,URY_SO,URY_TA,URY_TT)),
-UZB("Uzbekistan",447894,listOf(UZB_AN,UZB_BU,UZB_FA,UZB_JI,UZB_NG,UZB_NW,UZB_QR,UZB_QA,UZB_SA,UZB_SI,UZB_SU,UZB_TA,UZB_TK,UZB_KH)),
-VUT("Vanuatu",12384,listOf(VUT_ML,VUT_PM,VUT_SN,VUT_SE,VUT_TF,VUT_TR)),
-VAT("Vatican City",1,emptyList()),
-VEN("Venezuela",918303,listOf(VEN_Z,VEN_NA,VEN_C,VEN_D,VEN_E,VEN_NA,VEN_G,VEN_H,VEN_Y,VEN_DP,VEN_A,VEN_NA,VEN_NA,VEN_K,VEN_NA,VEN_M,VEN_N,VEN_O,VEN_P,VEN_R,VEN_NA,VEN_T,VEN_NA,VEN_U,VEN_V)),
-VNM("Vietnam",331121,listOf(VNM_AG,VNM_BV,VNM_BG,VNM_BK,VNM_BL,VNM_BN,VNM_BR,VNM_BD,VNM_BI,VNM_BP,VNM_BU,VNM_CM,VNM_CN,VNM_CB,VNM_DA,VNM_DC,VNM_DO,VNM_DB,VNM_DN,VNM_DT,VNM_GL,VNM_HG,VNM_HM,VNM_HI,VNM_HT,VNM_HD,VNM_HP,VNM_HU,VNM_HC,VNM_HO,VNM_HY,VNM_KH,VNM_KG,VNM_KT,VNM_LI,VNM_LD,VNM_LS,VNM_LO,VNM_LA,VNM_ND,VNM_NA,VNM_NB,VNM_NT,VNM_PT,VNM_PY,VNM_QB,VNM_QM,VNM_QG,VNM_QN,VNM_QT,VNM_ST,VNM_SL,VNM_TN,VNM_TB,VNM_TY,VNM_TH,VNM_TT,VNM_TG,VNM_TV,VNM_TQ,VNM_VL,VNM_VC,VNM_YB)),
-VIR("Virgin Islands, U.S.",364,listOf(VIR_SC,VIR_SJ,VIR_ST)),
-WLF("Wallisand Futuna",157,listOf(WLF_AL,WLF_SI,WLF_UV)),
-ESH("Western Sahara",268500,listOf(ESH_BO,ESH_ES,ESH_LA,ESH_OD)),
-YEM("Yemen",454747,listOf(YEM_AD,YEM_AB,YEM_BA,YEM_DL,YEM_HU,YEM_JA,YEM_MR,YEM_MW,YEM_13,YEM_AM,YEM_DH,YEM_HD,YEM_HJ,YEM_IB,YEM_LA,YEM_MA,YEM_31,YEM_SD,YEM_SN,YEM_SH,YEM_TA)),
-ZMB("Zambia",755679,listOf(ZMB_CE,ZMB_CO,ZMB_EA,ZMB_LP,ZMB_LS,ZMB_MU,ZMB_NW,ZMB_NO,ZMB_SO,ZMB_WE)),
-ZWE("Zimbabwe",392107,listOf(ZWE_BU,ZWE_HA,ZWE_MA,ZWE_MC,ZWE_ME,ZWE_MW,ZWE_MV,ZWE_MN,ZWE_MS,ZWE_MI)),

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",
+    "jsdom": "^24.0.0",
     "mapshaper": "^0.6.79"
   },
   "type": "module"

yarn.lock

@@ -62,15 +62,15 @@ __metadata:
   linkType: hard
 
 "@npmcli/agent@npm:^2.0.0":
-  version: 2.2.1
-  resolution: "@npmcli/agent@npm:2.2.1"
+  version: 2.2.2
+  resolution: "@npmcli/agent@npm:2.2.2"
   dependencies:
     agent-base: ^7.1.0
     http-proxy-agent: ^7.0.0
     https-proxy-agent: ^7.0.1
     lru-cache: ^10.0.1
-    socks-proxy-agent: ^8.0.1
-  checksum: c69aca42dbba393f517bc5777ee872d38dc98ea0e5e93c1f6d62b82b8fecdc177a57ea045f07dda1a770c592384b2dd92a5e79e21e2a7cf51c9159466a8f9c9b
+    socks-proxy-agent: ^8.0.3
+  checksum: 67de7b88cc627a79743c88bab35e023e23daf13831a8aa4e15f998b92f5507b644d8ffc3788afc8e64423c612e0785a6a92b74782ce368f49a6746084b50d874
   languageName: node
   linkType: hard
 
@@ -1483,11 +1483,11 @@ __metadata:
   linkType: hard
 
 "@types/node@npm:*":
-  version: 20.12.2
-  resolution: "@types/node@npm:20.12.2"
+  version: 20.12.7
+  resolution: "@types/node@npm:20.12.7"
   dependencies:
     undici-types: ~5.26.4
-  checksum: 3242ab04fe69ae32a2da29a7a2fce41fccb370bc1189de43d2dfbb491bd3253d3ee2070cbb5613061148e4862fdaa9cf62722c43128ce5c7d33fe83750956613
+  checksum: 7cc979f7e2ca9a339ec71318c3901b9978555257929ef3666987f3e447123bc6dc92afcc89f6347e09e07d602fde7d51bcddea626c23aa2bb74aeaacfd1e1686
   languageName: node
   linkType: hard
 
@@ -1696,7 +1696,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"combined-stream@npm:^1.0.6":
+"combined-stream@npm:^1.0.6, combined-stream@npm:^1.0.8":
   version: 1.0.8
   resolution: "combined-stream@npm:1.0.8"
   dependencies:
@@ -1771,6 +1771,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"cssstyle@npm:^4.0.1":
+  version: 4.0.1
+  resolution: "cssstyle@npm:4.0.1"
+  dependencies:
+    rrweb-cssom: ^0.6.0
+  checksum: 4b2fdd81c565b1f8f24a792f85d3a19269a2f201e731c3fe3531d7fc78b4bc6b31906ed17aba7edba7b1c8b7672574fc6c09fe925556da3a9a9458dbf8c4fa22
+  languageName: node
+  linkType: hard
+
 "d3-array@npm:1":
   version: 1.2.4
   resolution: "d3-array@npm:1.2.4"
@@ -1820,6 +1829,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"data-urls@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "data-urls@npm:5.0.0"
+  dependencies:
+    whatwg-mimetype: ^4.0.0
+    whatwg-url: ^14.0.0
+  checksum: 5c40568c31b02641a70204ff233bc4e42d33717485d074244a98661e5f2a1e80e38fe05a5755dfaf2ee549f2ab509d6a3af2a85f4b2ad2c984e5d176695eaf46
+  languageName: node
+  linkType: hard
+
 "debug@npm:4, debug@npm:^4.3.4":
   version: 4.3.4
   resolution: "debug@npm:4.3.4"
@@ -1832,6 +1851,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"decimal.js@npm:^10.4.3":
+  version: 10.4.3
+  resolution: "decimal.js@npm:10.4.3"
+  checksum: 796404dcfa9d1dbfdc48870229d57f788b48c21c603c3f6554a1c17c10195fc1024de338b0cf9e1efe0c7c167eeb18f04548979bcc5fdfabebb7cc0ae3287bae
+  languageName: node
+  linkType: hard
+
 "deep-equal@npm:1.x, deep-equal@npm:^1.0.0":
   version: 1.1.2
   resolution: "deep-equal@npm:1.1.2"
@@ -1935,6 +1961,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"entities@npm:^4.4.0":
+  version: 4.5.0
+  resolution: "entities@npm:4.5.0"
+  checksum: 853f8ebd5b425d350bffa97dd6958143179a5938352ccae092c62d1267c4e392a039be1bae7d51b6e4ffad25f51f9617531fedf5237f15df302ccfb452cbf2d7
+  languageName: node
+  linkType: hard
+
 "env-paths@npm:^2.2.0":
   version: 2.2.1
   resolution: "env-paths@npm:2.2.1"
@@ -1972,13 +2005,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"extend@npm:^3.0.2":
-  version: 3.0.2
-  resolution: "extend@npm:3.0.2"
-  checksum: a50a8309ca65ea5d426382ff09f33586527882cf532931cb08ca786ea3146c0553310bda688710ff61d7668eba9f96b923fe1420cdf56a2c3eaf30fcab87b515
-  languageName: node
-  linkType: hard
-
 "fflate@npm:^0.7.4":
   version: 0.7.4
   resolution: "fflate@npm:0.7.4"
@@ -2023,6 +2049,17 @@ __metadata:
   languageName: node
   linkType: hard
 
+"form-data@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "form-data@npm:4.0.0"
+  dependencies:
+    asynckit: ^0.4.0
+    combined-stream: ^1.0.8
+    mime-types: ^2.1.12
+  checksum: 01135bf8675f9d5c61ff18e2e2932f719ca4de964e3be90ef4c36aacfc7b9cb2fceb5eca0b7e0190e3383fe51c5b37f4cb80b62ca06a99aaabfcfd6ac7c9328c
+  languageName: node
+  linkType: hard
+
 "fs-minipass@npm:^2.0.0":
   version: 2.1.0
   resolution: "fs-minipass@npm:2.1.0"
@@ -2062,13 +2099,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"geojson-bbox@npm:^0.0.1":
-  version: 0.0.1
-  resolution: "geojson-bbox@npm:0.0.1"
-  checksum: 4bacdef0d3465c28d60ccbd08671c95ba97bb462acfdfb958097800c15de4a69db31fa9b39b8af13da76d5fab62a558c5850877730c22d8497565e077d501b6e
-  languageName: node
-  linkType: hard
-
 "geojson-equality@npm:0.1.6":
   version: 0.1.6
   resolution: "geojson-equality@npm:0.1.6"
@@ -2091,17 +2121,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"geojson2svg@npm:^2.0.1":
-  version: 2.0.1
-  resolution: "geojson2svg@npm:2.0.1"
-  dependencies:
-    extend: ^3.0.2
-    geojson-bbox: ^0.0.1
-    multigeojson: ~0.0.1
-  checksum: 742eb45407f1bef860aacc51df3e32d0ede1ae23125e62c199f41338166f0744a403662ea90bf6e0f83e5acc977d1bbb536c59e31f7b02cd4b0a56832a50eeba
-  languageName: node
-  linkType: hard
-
 "geokdbush@npm:^1.1.0":
   version: 1.1.0
   resolution: "geokdbush@npm:1.1.0"
@@ -2203,6 +2222,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"html-encoding-sniffer@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "html-encoding-sniffer@npm:4.0.0"
+  dependencies:
+    whatwg-encoding: ^3.1.1
+  checksum: 3339b71dab2723f3159a56acf541ae90a408ce2d11169f00fe7e0c4663d31d6398c8a4408b504b4eec157444e47b084df09b3cb039c816660f0dd04846b8957d
+  languageName: node
+  linkType: hard
+
 "http-basic@npm:^6.0.0":
   version: 6.0.0
   resolution: "http-basic@npm:6.0.0"
@@ -2243,7 +2271,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"https-proxy-agent@npm:^7.0.1":
+"https-proxy-agent@npm:^7.0.1, https-proxy-agent@npm:^7.0.2":
   version: 7.0.4
   resolution: "https-proxy-agent@npm:7.0.4"
   dependencies:
@@ -2253,7 +2281,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3":
+"iconv-lite@npm:0.6.3, iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3":
   version: 0.6.3
   resolution: "iconv-lite@npm:0.6.3"
   dependencies:
@@ -2333,6 +2361,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"is-potential-custom-element-name@npm:^1.0.1":
+  version: 1.0.1
+  resolution: "is-potential-custom-element-name@npm:1.0.1"
+  checksum: ced7bbbb6433a5b684af581872afe0e1767e2d1146b2207ca0068a648fb5cab9d898495d1ac0583524faaf24ca98176a7d9876363097c2d14fee6dd324f3a1ab
+  languageName: node
+  linkType: hard
+
 "is-regex@npm:^1.1.4":
   version: 1.1.4
   resolution: "is-regex@npm:1.1.4"
@@ -2391,6 +2426,40 @@ __metadata:
   languageName: node
   linkType: hard
 
+"jsdom@npm:^24.0.0":
+  version: 24.0.0
+  resolution: "jsdom@npm:24.0.0"
+  dependencies:
+    cssstyle: ^4.0.1
+    data-urls: ^5.0.0
+    decimal.js: ^10.4.3
+    form-data: ^4.0.0
+    html-encoding-sniffer: ^4.0.0
+    http-proxy-agent: ^7.0.0
+    https-proxy-agent: ^7.0.2
+    is-potential-custom-element-name: ^1.0.1
+    nwsapi: ^2.2.7
+    parse5: ^7.1.2
+    rrweb-cssom: ^0.6.0
+    saxes: ^6.0.0
+    symbol-tree: ^3.2.4
+    tough-cookie: ^4.1.3
+    w3c-xmlserializer: ^5.0.0
+    webidl-conversions: ^7.0.0
+    whatwg-encoding: ^3.1.1
+    whatwg-mimetype: ^4.0.0
+    whatwg-url: ^14.0.0
+    ws: ^8.16.0
+    xml-name-validator: ^5.0.0
+  peerDependencies:
+    canvas: ^2.11.2
+  peerDependenciesMeta:
+    canvas:
+      optional: true
+  checksum: 180cf672c1f5e4375fd831b6990c453b4c22b540619abe7a0a3ed0d18eca1171dea9f25739bc06dfea26d1c0d71c7ac26e62fc9a2d9b1657003fc8fd1bf6f9f4
+  languageName: node
+  linkType: hard
+
 "kdbush@npm:^3.0.0":
   version: 3.0.0
   resolution: "kdbush@npm:3.0.0"
@@ -2443,8 +2512,8 @@ __metadata:
   linkType: hard
 
 "mapshaper@npm:^0.6.79":
-  version: 0.6.79
-  resolution: "mapshaper@npm:0.6.79"
+  version: 0.6.88
+  resolution: "mapshaper@npm:0.6.88"
   dependencies:
     "@placemarkio/tokml": ^0.3.3
     "@tmcw/togeojson": ^5.6.0
@@ -2462,7 +2531,7 @@ __metadata:
     iconv-lite: ^0.6.3
     idb-keyval: ^6.2.0
     kdbush: ^3.0.0
-    mproj: 0.0.37
+    mproj: 0.0.38
     msgpackr: ^1.10.1
     opn: ^5.3.0
     rw: ~1.3.3
@@ -2472,7 +2541,7 @@ __metadata:
     mapshaper: bin/mapshaper
     mapshaper-gui: bin/mapshaper-gui
     mapshaper-xl: bin/mapshaper-xl
-  checksum: 0a33bd50927e0e7597c066a7dfb035b0b4af6dea28e8823595e464db577d6c537d99cf08e9ae5ff2e074fdae2323271d4a25be600efc3b0092de4fc2b004fd16
+  checksum: c33b651d242c5ae1f6e23f54f615f8370b2d3d8a5cd6f5eca68cdc773f7abcc30dad2095a44d85a1a3f85d358f91aff29cacdf84ac054ec2929924f9c36f16cb
   languageName: node
   linkType: hard
 
@@ -2594,16 +2663,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"mproj@npm:0.0.37":
-  version: 0.0.37
-  resolution: "mproj@npm:0.0.37"
+"mproj@npm:0.0.38":
+  version: 0.0.38
+  resolution: "mproj@npm:0.0.38"
   dependencies:
     geographiclib: 1.48.0
     rw: ~1.3.2
   bin:
     mcs2cs: bin/mcs2cs
     mproj: bin/mproj
-  checksum: 0bcd4f2ce14e88035f9f517683dd86a15c8c5a04579e1bb087a287cddb319217bcf6670229ce51a64372f111b45755691794e78f510ff36ab98eabd51494cc28
+  checksum: e8ecf6b26602ba7ccf6ac3551f32a3cd8d5c1271a2b076a5bf45b8bc09862b5a0ff9b7d58978c0a3ee2d212ac84deac847048bb9db5732ad0d35e5bda509ea54
   languageName: node
   linkType: hard
 
@@ -2657,13 +2726,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"multigeojson@npm:~0.0.1":
-  version: 0.0.1
-  resolution: "multigeojson@npm:0.0.1"
-  checksum: 25211a4e7cf561f28dd60aec93a39a35535372817e4540cbf18449f20750d789a510dc5042921a8126b21a830c482381ffdc5674ad82a31e67e01bf508121b34
-  languageName: node
-  linkType: hard
-
 "negotiator@npm:^0.6.3":
   version: 0.6.3
   resolution: "negotiator@npm:0.6.3"
@@ -2713,6 +2775,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"nwsapi@npm:^2.2.7":
+  version: 2.2.7
+  resolution: "nwsapi@npm:2.2.7"
+  checksum: cab25f7983acec7e23490fec3ef7be608041b460504229770e3bfcf9977c41d6fe58f518994d3bd9aa3a101f501089a3d4a63536f4ff8ae4b8c4ca23bdbfda4e
+  languageName: node
+  linkType: hard
+
 "object-assign@npm:*":
   version: 4.1.1
   resolution: "object-assign@npm:4.1.1"
@@ -2769,6 +2838,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"parse5@npm:^7.1.2":
+  version: 7.1.2
+  resolution: "parse5@npm:7.1.2"
+  dependencies:
+    entities: ^4.4.0
+  checksum: 59465dd05eb4c5ec87b76173d1c596e152a10e290b7abcda1aecf0f33be49646ea74840c69af975d7887543ea45564801736356c568d6b5e71792fd0f4055713
+  languageName: node
+  linkType: hard
+
 "path-key@npm:^3.1.0":
   version: 3.1.1
   resolution: "path-key@npm:3.1.1"
@@ -2836,6 +2914,20 @@ __metadata:
   languageName: node
   linkType: hard
 
+"psl@npm:^1.1.33":
+  version: 1.9.0
+  resolution: "psl@npm:1.9.0"
+  checksum: 20c4277f640c93d393130673f392618e9a8044c6c7bf61c53917a0fddb4952790f5f362c6c730a9c32b124813e173733f9895add8d26f566ed0ea0654b2e711d
+  languageName: node
+  linkType: hard
+
+"punycode@npm:^2.1.1, punycode@npm:^2.3.1":
+  version: 2.3.1
+  resolution: "punycode@npm:2.3.1"
+  checksum: bb0a0ceedca4c3c57a9b981b90601579058903c62be23c5e8e843d2c2d4148a3ecf029d5133486fb0e1822b098ba8bba09e89d6b21742d02fa26bda6441a6fb2
+  languageName: node
+  linkType: hard
+
 "qs@npm:^6.4.0":
   version: 6.12.0
   resolution: "qs@npm:6.12.0"
@@ -2845,6 +2937,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"querystringify@npm:^2.1.1":
+  version: 2.2.0
+  resolution: "querystringify@npm:2.2.0"
+  checksum: 5641ea231bad7ef6d64d9998faca95611ed4b11c2591a8cae741e178a974f6a8e0ebde008475259abe1621cb15e692404e6b6626e927f7b849d5c09392604b15
+  languageName: node
+  linkType: hard
+
 "quickselect@npm:^1.0.1":
   version: 1.1.1
   resolution: "quickselect@npm:1.1.1"
@@ -2904,6 +3003,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"requires-port@npm:^1.0.0":
+  version: 1.0.0
+  resolution: "requires-port@npm:1.0.0"
+  checksum: eee0e303adffb69be55d1a214e415cf42b7441ae858c76dfc5353148644f6fd6e698926fc4643f510d5c126d12a705e7c8ed7e38061113bdf37547ab356797ff
+  languageName: node
+  linkType: hard
+
 "retry@npm:^0.12.0":
   version: 0.12.0
   resolution: "retry@npm:0.12.0"
@@ -2930,17 +3036,19 @@ __metadata:
   resolution: "root-workspace-0b6124@workspace:."
   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
+    jsdom: ^24.0.0
     mapshaper: ^0.6.79
   languageName: unknown
   linkType: soft
 
+"rrweb-cssom@npm:^0.6.0":
+  version: 0.6.0
+  resolution: "rrweb-cssom@npm:0.6.0"
+  checksum: 182312f6e4f41d18230ccc34f14263bc8e8a6b9d30ee3ec0d2d8e643c6f27964cd7a8d638d4a00e988d93e8dc55369f4ab5a473ccfeff7a8bab95b36d2b5499c
+  languageName: node
+  linkType: hard
+
 "rw@npm:~1.3.2, rw@npm:~1.3.3":
   version: 1.3.3
   resolution: "rw@npm:1.3.3"
@@ -2962,6 +3070,15 @@ __metadata:
   languageName: node
   linkType: hard
 
+"saxes@npm:^6.0.0":
+  version: 6.0.0
+  resolution: "saxes@npm:6.0.0"
+  dependencies:
+    xmlchars: ^2.2.0
+  checksum: d3fa3e2aaf6c65ed52ee993aff1891fc47d5e47d515164b5449cbf5da2cbdc396137e55590472e64c5c436c14ae64a8a03c29b9e7389fc6f14035cf4e982ef3b
+  languageName: node
+  linkType: hard
+
 "semver@npm:^7.3.5":
   version: 7.6.0
   resolution: "semver@npm:7.6.0"
@@ -3048,7 +3165,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"socks-proxy-agent@npm:^8.0.1":
+"socks-proxy-agent@npm:^8.0.3":
   version: 8.0.3
   resolution: "socks-proxy-agent@npm:8.0.3"
   dependencies:
@@ -3060,12 +3177,12 @@ __metadata:
   linkType: hard
 
 "socks@npm:^2.7.1":
-  version: 2.8.1
-  resolution: "socks@npm:2.8.1"
+  version: 2.8.3
+  resolution: "socks@npm:2.8.3"
   dependencies:
     ip-address: ^9.0.5
     smart-buffer: ^4.2.0
-  checksum: 29586d42e9c36c5016632b2bcb6595e3adfbcb694b3a652c51bc8741b079c5ec37bdd5675a1a89a1620078c8137208294991fabb50786f92d47759a725b2b62e
+  checksum: 7a6b7f6eedf7482b9e4597d9a20e09505824208006ea8f2c49b71657427f3c137ca2ae662089baa73e1971c62322d535d9d0cf1c9235cf6f55e315c18203eadd
   languageName: node
   linkType: hard
 
@@ -3141,6 +3258,13 @@ __metadata:
   languageName: node
   linkType: hard
 
+"symbol-tree@npm:^3.2.4":
+  version: 3.2.4
+  resolution: "symbol-tree@npm:3.2.4"
+  checksum: 6e8fc7e1486b8b54bea91199d9535bb72f10842e40c79e882fc94fb7b14b89866adf2fd79efa5ebb5b658bc07fb459ccce5ac0e99ef3d72f474e74aaf284029d
+  languageName: node
+  linkType: hard
+
 "sync-request@npm:5.0.0":
   version: 5.0.0
   resolution: "sync-request@npm:5.0.0"
@@ -3232,6 +3356,27 @@ __metadata:
   languageName: node
   linkType: hard
 
+"tough-cookie@npm:^4.1.3":
+  version: 4.1.3
+  resolution: "tough-cookie@npm:4.1.3"
+  dependencies:
+    psl: ^1.1.33
+    punycode: ^2.1.1
+    universalify: ^0.2.0
+    url-parse: ^1.5.3
+  checksum: c9226afff36492a52118432611af083d1d8493a53ff41ec4ea48e5b583aec744b989e4280bcf476c910ec1525a89a4a0f1cae81c08b18fb2ec3a9b3a72b91dcc
+  languageName: node
+  linkType: hard
+
+"tr46@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "tr46@npm:5.0.0"
+  dependencies:
+    punycode: ^2.3.1
+  checksum: 8d8b021f8e17675ebf9e672c224b6b6cfdb0d5b92141349e9665c14a2501c54a298d11264bbb0b17b447581e1e83d4fc3c038c929f3d210e3964d4be47460288
+  languageName: node
+  linkType: hard
+
 "tsscmp@npm:1.0.6":
   version: 1.0.6
   resolution: "tsscmp@npm:1.0.6"
@@ -3278,6 +3423,23 @@ __metadata:
   languageName: node
   linkType: hard
 
+"universalify@npm:^0.2.0":
+  version: 0.2.0
+  resolution: "universalify@npm:0.2.0"
+  checksum: e86134cb12919d177c2353196a4cc09981524ee87abf621f7bc8d249dbbbebaec5e7d1314b96061497981350df786e4c5128dbf442eba104d6e765bc260678b5
+  languageName: node
+  linkType: hard
+
+"url-parse@npm:^1.5.3":
+  version: 1.5.10
+  resolution: "url-parse@npm:1.5.10"
+  dependencies:
+    querystringify: ^2.1.1
+    requires-port: ^1.0.0
+  checksum: fbdba6b1d83336aca2216bbdc38ba658d9cfb8fc7f665eb8b17852de638ff7d1a162c198a8e4ed66001ddbf6c9888d41e4798912c62b4fd777a31657989f7bdf
+  languageName: node
+  linkType: hard
+
 "util-deprecate@npm:~1.0.1":
   version: 1.0.2
   resolution: "util-deprecate@npm:1.0.2"
@@ -3285,6 +3447,48 @@ __metadata:
   languageName: node
   linkType: hard
 
+"w3c-xmlserializer@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "w3c-xmlserializer@npm:5.0.0"
+  dependencies:
+    xml-name-validator: ^5.0.0
+  checksum: 593acc1fdab3f3207ec39d851e6df0f3fa41a36b5809b0ace364c7a6d92e351938c53424a7618ce8e0fbaffee8be2e8e070a5734d05ee54666a8bdf1a376cc40
+  languageName: node
+  linkType: hard
+
+"webidl-conversions@npm:^7.0.0":
+  version: 7.0.0
+  resolution: "webidl-conversions@npm:7.0.0"
+  checksum: f05588567a2a76428515333eff87200fae6c83c3948a7482ebb109562971e77ef6dc49749afa58abb993391227c5697b3ecca52018793e0cb4620a48f10bd21b
+  languageName: node
+  linkType: hard
+
+"whatwg-encoding@npm:^3.1.1":
+  version: 3.1.1
+  resolution: "whatwg-encoding@npm:3.1.1"
+  dependencies:
+    iconv-lite: 0.6.3
+  checksum: f75a61422421d991e4aec775645705beaf99a16a88294d68404866f65e92441698a4f5b9fa11dd609017b132d7b286c3c1534e2de5b3e800333856325b549e3c
+  languageName: node
+  linkType: hard
+
+"whatwg-mimetype@npm:^4.0.0":
+  version: 4.0.0
+  resolution: "whatwg-mimetype@npm:4.0.0"
+  checksum: f97edd4b4ee7e46a379f3fb0e745de29fe8b839307cc774300fd49059fcdd560d38cb8fe21eae5575b8f39b022f23477cc66e40b0355c2851ce84760339cef30
+  languageName: node
+  linkType: hard
+
+"whatwg-url@npm:^14.0.0":
+  version: 14.0.0
+  resolution: "whatwg-url@npm:14.0.0"
+  dependencies:
+    tr46: ^5.0.0
+    webidl-conversions: ^7.0.0
+  checksum: 4b5887e50f786583bead70916413e67a381d2126899b9eb5c67ce664bba1e7ec07cdff791404581ce73c6190d83c359c9ca1d50711631217905db3877dec075c
+  languageName: node
+  linkType: hard
+
 "which@npm:^2.0.1":
   version: 2.0.2
   resolution: "which@npm:2.0.2"
@@ -3329,6 +3533,35 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ws@npm:^8.16.0":
+  version: 8.16.0
+  resolution: "ws@npm:8.16.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ">=5.0.2"
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: feb3eecd2bae82fa8a8beef800290ce437d8b8063bdc69712725f21aef77c49cb2ff45c6e5e7fce622248f9c7abaee506bae0a9064067ffd6935460c7357321b
+  languageName: node
+  linkType: hard
+
+"xml-name-validator@npm:^5.0.0":
+  version: 5.0.0
+  resolution: "xml-name-validator@npm:5.0.0"
+  checksum: 86effcc7026f437701252fcc308b877b4bc045989049cfc79b0cc112cb365cf7b009f4041fab9fb7cd1795498722c3e9fe9651afc66dfa794c16628a639a4c45
+  languageName: node
+  linkType: hard
+
+"xmlchars@npm:^2.2.0":
+  version: 2.2.0
+  resolution: "xmlchars@npm:2.2.0"
+  checksum: 8c70ac94070ccca03f47a81fcce3b271bd1f37a591bf5424e787ae313fcb9c212f5f6786e1fa82076a2c632c0141552babcd85698c437506dfa6ae2d58723062
+  languageName: node
+  linkType: hard
+
 "yallist@npm:^4.0.0":
   version: 4.0.0
   resolution: "yallist@npm:4.0.0"