Updated version number (v0.2-beta.3 -> v0.2) in setup.py, updated examples notebook

Refactoring

.github/workflows/publish-package.yml

@@ -0,0 +1,64 @@
+name: publish distributions
+
+on:
+  push:
+    branches:
+    - main
+    tags:
+      - v*
+  pull_request:
+    branches:
+    - main
+  release:
+    types: [published]
+  workflow_dispatch:
+
+jobs:
+  build-and-publish:
+    name: Build and publish Python distro to (Test)PyPI
+    runs-on: ubuntu-latest
+
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Set up Python 3.9
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.9
+
+    - name: Install build and twine
+      run: |
+        python -m pip install --upgrade pip setuptools wheel
+        python -m pip install build twine
+        python -m pip list
+
+    - name: Build a sdist and a wheel
+      run: python -m build --outdir dist/ .
+
+    - name: Verify the distribution
+      run: twine check dist/*
+
+    - name: List contents of sdist
+      run: python -m tarfile --list dist/prettymaps-*.tar.gz
+
+    - name: List contents of wheel
+      run: python -m zipfile --list dist/prettymaps-*.whl
+
+    - name: Publish distribution 📦 to Test PyPI
+      # publish to TestPyPI on tag events
+      if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags/v') && github.repository == 'marceloprates/prettymaps'
+      uses: pypa/gh-action-pypi-publish@v1.4.2
+      with:
+        password: ${{ secrets.test_pypi_password }}
+        repository_url: https://test.pypi.org/legacy/
+
+    - name: Publish distribution 📦 to PyPI
+      # publish to PyPI on releases
+      if: github.event_name == 'release' && github.event.action == 'published' && github.repository == 'marceloprates/prettymaps'
+      uses: pypa/gh-action-pypi-publish@v1.4.2
+      with:
+        password: ${{ secrets.pypi_password }}

LICENSE

@@ -1,21 +1,661 @@
-MIT License
+ GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
 
-Copyright (c) 2021 Marcelo de Oliveira Rosa Prates
+ 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.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+                            Preamble
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are 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.
+
+  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.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  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 Affero 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. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  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 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 work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero 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 Affero 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 Affero 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 Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero 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 Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero 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 your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  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 AGPL, see
+<https://www.gnu.org/licenses/>.

MANIFEST.in

@@ -0,0 +1,11 @@
+prune **
+graft prettymaps
+
+include setup.py
+include LICENSE
+include README.md
+include MANIFEST.in
+
+include requirements.txt
+
+global-exclude __pycache__ *.py[cod]

README_files/README_20_0.svg

@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="100.0" height="100.0" viewBox="-51.23032682800001 -30.034281028 0.0006073560000103839 0.0008053559999900983" preserveAspectRatio="xMinYMin meet"><g transform="matrix(1,0,0,-1,0,-60.067756700000004)"><path fill-rule="evenodd" fill="#66cc99" stroke="#555555" stroke-width="1.6107119999801965e-05" opacity="0.6" d="M -51.2298412,-30.03353870000001 L -51.2298154,-30.033540599999984 L -51.2298126,-30.0335408 L -51.2298129,-30.033544300000003 L -51.2297808,-30.033546699999988 L -51.2297805,-30.033544400000007 L -51.2297758,-30.0335447 L -51.2297562,-30.0335462 L -51.2297493,-30.033546700000002 L -51.2297572,-30.033626999999992 L -51.22975770000001,-30.033632 L -51.2298302,-30.03362630000001 L -51.2298538,-30.033865000000006 L -51.2298442,-30.0338658 L -51.2298477,-30.033909500000004 L -51.2298412,-30.03390990000001 L -51.2298357,-30.03390249999999 L -51.2298133,-30.033912799999996 L -51.2298168,-30.0339188 L -51.2297959,-30.0339406 L -51.2297906,-30.033938999999993 L -51.2297826,-30.0339586 L -51.2297866,-30.033959199999998 L -51.2297957,-30.034019000000004 L -51.2297902,-30.034021400000004 L -51.229800700000006,-30.0340417 L -51.2298073,-30.0340393 L -51.2298344,-30.034053999999994 L -51.2298319,-30.034065200000004 L -51.2298509,-30.0340704 L -51.2298558,-30.034059600000003 L -51.2298704,-30.0340585 L -51.2298741,-30.034097 L -51.2298921,-30.034095599999993 L -51.2298985,-30.03416019999999 L -51.2298609,-30.034163 L -51.2298683,-30.03423859999999 L -51.2299531,-30.0342322 L -51.2299549,-30.0342512 L -51.2301846,-30.034234 L -51.2301825,-30.0342134 L -51.2302643,-30.03420729999999 L -51.2302569,-30.034132200000002 L -51.2302241,-30.034134599999994 L -51.2302178,-30.0340702 L -51.2302266,-30.0340694 L -51.2302229,-30.034030399999995 L -51.2302285,-30.03403000000001 L -51.230236500000004,-30.0340294 L -51.2302396,-30.034038299999995 L -51.230256600000004,-30.034034099999996 L -51.2302532,-30.0340242 L -51.230280900000004,-30.034001600000003 L -51.2302902,-30.0340033 L -51.23029700000001,-30.033981200000003 L -51.2302871,-30.0339784 L -51.2302841,-30.033920999999996 L -51.2302898,-30.033919600000008 L -51.2302806,-30.0338995 L -51.2302726,-30.033902400000002 L -51.2302486,-30.0338856 L -51.2302511,-30.033877399999994 L -51.2302264,-30.033868700000003 L -51.2302198,-30.033880699999997 L -51.2302148,-30.033878999999995 L -51.230213000000006,-30.033838099999997 L -51.2302054,-30.033838700000004 L -51.2301818,-30.0336 L -51.2302499,-30.033594899999997 L -51.2302471,-30.033566499999996 L -51.2302452,-30.033566699999998 L -51.2302423,-30.0335373 L -51.2302448,-30.033537100000004 L -51.2302419,-30.0335085 L -51.2302051,-30.0335112 L -51.2302053,-30.033513599999992 L -51.2301756,-30.0335159 L -51.2301752,-30.033512399999992 L -51.23014450000001,-30.033514699999994 L -51.2301449,-30.033518200000003 L -51.2300854,-30.033522700000002 L -51.2300843,-30.033511399999984 L -51.2300823,-30.0335115 L -51.2300635,-30.033512799999997 L -51.2300628,-30.033505500000008 L -51.2300334,-30.0335078 L -51.2300336,-30.03350989999999 L -51.2300339,-30.033513 L -51.22995280000001,-30.033519099999996 L -51.229952600000004,-30.033516999999996 L -51.2299524,-30.0335151 L -51.2299225,-30.03351729999999 L -51.2299228,-30.033520499999998 L -51.2298995,-30.03352229999999 L -51.2299009,-30.033537 L -51.2298443,-30.033541300000003 L -51.229844,-30.0335385 L -51.2298412,-30.03353870000001 z" /></g></svg>

prettymaps/__init__.py

@@ -1 +1 @@
-from .draw import plot
+from .draw import plot, multiplot, Subplot, create_preset, delete_preset, preset, presets

prettymaps/curved_text.py

@@ -1,168 +0,0 @@
-import math
-
-from matplotlib import text as mtext
-import numpy as np
-
-
-class CurvedText(mtext.Text):
-    """
-    A text object that follows an arbitrary curve.
-    """
-
-    def __init__(self, x, y, text, axes, **kwargs):
-        super(CurvedText, self).__init__(x[0], y[0], " ", **kwargs)
-
-        axes.add_artist(self)
-
-        ##saving the curve:
-        self.__x = x
-        self.__y = y
-        self.__zorder = self.get_zorder()
-
-        ##creating the text objects
-        self.__Characters = []
-        for c in text:
-            if c == " ":
-                ##make this an invisible 'a':
-                t = mtext.Text(0, 0, "a")
-                t.set_alpha(0.0)
-            else:
-                t = mtext.Text(0, 0, c, **kwargs)
-
-            # resetting unnecessary arguments
-            t.set_ha("center")
-            t.set_rotation(0)
-            t.set_zorder(self.__zorder + 1)
-
-            self.__Characters.append((c, t))
-            axes.add_artist(t)
-
-    ##overloading some member functions, to assure correct functionality
-    ##on update
-    def set_zorder(self, zorder):
-        super(CurvedText, self).set_zorder(zorder)
-        self.__zorder = self.get_zorder()
-        for c, t in self.__Characters:
-            t.set_zorder(self.__zorder + 1)
-
-    def draw(self, renderer, *args, **kwargs):
-        """
-        Overload of the Text.draw() function. Do not do
-        do any drawing, but update the positions and rotation
-        angles of self.__Characters.
-        """
-        self.update_positions(renderer)
-
-    def update_positions(self, renderer):
-        """
-        Update positions and rotations of the individual text elements.
-        """
-
-        # preparations
-
-        ##determining the aspect ratio:
-        ##from https://stackoverflow.com/a/42014041/2454357
-
-        ##data limits
-        xlim = self.axes.get_xlim()
-        ylim = self.axes.get_ylim()
-        ## Axis size on figure
-        figW, figH = self.axes.get_figure().get_size_inches()
-        ## Ratio of display units
-        _, _, w, h = self.axes.get_position().bounds
-        ##final aspect ratio
-        aspect = ((figW * w) / (figH * h)) * (ylim[1] - ylim[0]) / (xlim[1] - xlim[0])
-
-        # points of the curve in figure coordinates:
-        x_fig, y_fig = (
-            np.array(l)
-            for l in zip(
-                *self.axes.transData.transform(
-                    [(i, j) for i, j in zip(self.__x, self.__y)]
-                )
-            )
-        )
-
-        # point distances in figure coordinates
-        x_fig_dist = x_fig[1:] - x_fig[:-1]
-        y_fig_dist = y_fig[1:] - y_fig[:-1]
-        r_fig_dist = np.sqrt(x_fig_dist ** 2 + y_fig_dist ** 2)
-
-        # arc length in figure coordinates
-        l_fig = np.insert(np.cumsum(r_fig_dist), 0, 0)
-
-        # angles in figure coordinates
-        rads = np.arctan2((y_fig[1:] - y_fig[:-1]), (x_fig[1:] - x_fig[:-1]))
-        degs = np.rad2deg(rads)
-
-        rel_pos = 10
-        for c, t in self.__Characters:
-            # finding the width of c:
-            t.set_rotation(0)
-            t.set_va("center")
-            bbox1 = t.get_window_extent(renderer=renderer)
-            w = bbox1.width
-            h = bbox1.height
-
-            # ignore all letters that don't fit:
-            if rel_pos + w / 2 > l_fig[-1]:
-                t.set_alpha(0.0)
-                rel_pos += w
-                continue
-
-            elif c != " ":
-                t.set_alpha(1.0)
-
-            # finding the two data points between which the horizontal
-            # center point of the character will be situated
-            # left and right indices:
-            il = np.where(rel_pos + w / 2 >= l_fig)[0][-1]
-            ir = np.where(rel_pos + w / 2 <= l_fig)[0][0]
-
-            # if we exactly hit a data point:
-            if ir == il:
-                ir += 1
-
-            # how much of the letter width was needed to find il:
-            used = l_fig[il] - rel_pos
-            rel_pos = l_fig[il]
-
-            # relative distance between il and ir where the center
-            # of the character will be
-            fraction = (w / 2 - used) / r_fig_dist[il]
-
-            ##setting the character position in data coordinates:
-            ##interpolate between the two points:
-            x = self.__x[il] + fraction * (self.__x[ir] - self.__x[il])
-            y = self.__y[il] + fraction * (self.__y[ir] - self.__y[il])
-
-            # getting the offset when setting correct vertical alignment
-            # in data coordinates
-            t.set_va(self.get_va())
-            bbox2 = t.get_window_extent(renderer=renderer)
-
-            bbox1d = self.axes.transData.inverted().transform(bbox1)
-            bbox2d = self.axes.transData.inverted().transform(bbox2)
-            dr = np.array(bbox2d[0] - bbox1d[0])
-
-            # the rotation/stretch matrix
-            rad = rads[il]
-            rot_mat = np.array(
-                [
-                    [math.cos(rad), math.sin(rad) * aspect],
-                    [-math.sin(rad) / aspect, math.cos(rad)],
-                ]
-            )
-
-            ##computing the offset vector of the rotated character
-            drp = np.dot(dr, rot_mat)
-
-            # setting final position and rotation:
-            t.set_position(np.array([x, y]) + drp)
-            t.set_rotation(degs[il])
-
-            t.set_va("center")
-            t.set_ha("center")
-
-            # updating rel_pos to right edge of character
-            rel_pos += w - used

prettymaps/fetch.py

@@ -1,392 +1,221 @@
-'''
-MIT License
+"""
+Prettymaps - A minimal Python library to draw pretty maps from OpenStreetMap Data
+Copyright (C) 2021 Marcelo Prates
 
-Copyright (c) 2021 Marcelo de Oliveira Rosa Prates
+This program is free software: you can redistribute it and/or modify
+it under the terms of the GNU Affero General Public License as published
+by the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+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 Affero General Public License for more details.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+You should have received a copy of the GNU Affero General Public License
+along with this program.  If not, see <https://www.gnu.org/licenses/>.
+"""
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-'''
-
-from ast import Dict
-from functools import reduce
-from tokenize import Number, String
-from typing import Optional, Union, Tuple
-from xmlrpc.client import Boolean
-
-import osmnx as ox
-from osmnx import utils_geo
-from osmnx._errors import EmptyOverpassResponse
+import re
+import warnings
 import numpy as np
-from shapely.geometry import Point, Polygon, MultiPolygon, LineString, MultiLineString
+import osmnx as ox
+from copy import deepcopy
+from shapely.geometry import (
+    box,
+    Point,
+    Polygon,
+    MultiPolygon,
+    LineString,
+    MultiLineString,
+)
+from geopandas import GeoDataFrame
+from shapely.affinity import rotate
 from shapely.ops import unary_union
-from geopandas import GeoDataFrame, read_file
+from shapely.errors import ShapelyDeprecationWarning
 
 
-def get_boundary(
-    point: Tuple, radius: float, crs: String, circle: Boolean = True, dilate: float = 0
-) -> Polygon:
-    """
-    Compute circular or square boundary given point, radius and crs.
-
-    Args:
-        point (Tuple): GPS coordinates
-        radius (Number): radius in meters
-        crs (String): Coordinate Reference System
-        circle (bool, optional): Whether to use a circular (True) or square (False) boundary. Defaults to True.
-        dilate (int, optional): Dilate the boundary by this much, in meters. Defaults to 0.
-
-    Returns:
-        Polygon: a shapely Polygon representing the boundary
-    """
-
-    if circle:
-        return (
-            ox.project_gdf(GeoDataFrame(geometry=[Point(point[::-1])], crs=crs))
-            .geometry[0]
-            .buffer(radius)
-        )
+# Parse query (by coordinates, OSMId or name)
+def parse_query(query):
+    if isinstance(query, GeoDataFrame):
+        return "polygon"
+    elif isinstance(query, tuple):
+        return "coordinates"
+    elif re.match("""[A-Z][0-9]+""", query):
+        return "osmid"
     else:
-        x, y = np.stack(
-            ox.project_gdf(GeoDataFrame(geometry=[Point(point[::-1])], crs=crs))
-            .geometry[0]
-            .xy
-        )
-        r = radius
-        return Polygon(
-            [(x - r, y - r), (x + r, y - r), (x + r, y + r), (x - r, y + r)]
-        ).buffer(dilate)
+        return "address"
 
 
-def get_perimeter(query, by_osmid: Boolean = False, **kwargs) -> GeoDataFrame:
-    """
-    Fetch perimeter given query
+# Get circular or square boundary around point
+def get_boundary(query, radius, circle=False, rotation=0):
 
-    Args:
-        query (String): Query for the perimeter to be fetched (for example, "France")
-        by_osmid (bool, optional): Whether to fetch perimeter by OSM Id. Defaults to False.
-
-    Returns:
-        GeoDataFrame: GeoDataFrame representation of the perimeter
-    """
-    return ox.geocode_to_gdf(
-        query,
-        by_osmid=by_osmid,
-        **kwargs,
-        **{x: kwargs[x] for x in ["circle", "dilate"] if x in kwargs.keys()}
+    # Get point from query
+    point = query if parse_query(query) == "coordinates" else ox.geocode(query)
+    # Create GeoDataFrame from point
+    boundary = ox.project_gdf(
+        GeoDataFrame(geometry=[Point(point[::-1])], crs="EPSG:4326")
     )
 
+    if circle:  # Circular shape
+        # use .buffer() to expand point into circle
+        boundary.geometry = boundary.geometry.buffer(radius)
+    else:  # Square shape
+        x, y = np.concatenate(boundary.geometry[0].xy)
+        r = radius
+        boundary = GeoDataFrame(
+            geometry=[
+                rotate(
+                    Polygon(
+                        [(x - r, y - r), (x + r, y - r),
+                         (x + r, y + r), (x - r, y + r)]
+                    ),
+                    rotation,
+                )
+            ],
+            crs=boundary.crs,
+        )
 
-def get_coast(
-    perimeter=None,
-    point=None,
-    radius=None,
-    perimeter_tolerance=0,
-    union=True,
-    buffer=0,
-    circle=True,
-    dilate=0,
-    file_location=None,
+    # Unproject
+    boundary = boundary.to_crs(4326)
+
+    return boundary
+
+
+# Get perimeter from query
+def get_perimeter(
+    query, radius=None, by_osmid=False, circle=False, dilate=None, rotation=0, **kwargs
 ):
 
-    if perimeter is not None:
-        # Boundary defined by polygon (perimeter)
-        bbox = perimeter.to_crs(3174)
-        bbox = bbox.buffer(perimeter_tolerance + dilate + buffer)
-        bbox = bbox.to_crs(4326)
-        bbox = bbox.envelope
-        # Load the polygons for the coastline from a file
-        geometries = read_file(file_location, bbox=bbox)
-        perimeter = unary_union(ox.project_gdf(perimeter).geometry)
-
-    elif (point is not None) and (radius is not None):
-        # Boundary defined by circle with radius 'radius' around point
-        north, south, west, east = utils_geo.bbox_from_point(
-            point, dist=radius + dilate + buffer
-        )
-        bbox = (west, south, east, north)
-        # Load the polygons for the coastline from a file
-        geometries = read_file(file_location, bbox=bbox)
+    if radius:
+        # Perimeter is a circular or square shape
         perimeter = get_boundary(
-            point, radius, geometries.crs, circle=circle, dilate=dilate
-        )
-
-    # Project GDF
-    if len(geometries) > 0:
-        geometries = ox.project_gdf(geometries)
-
-    # Intersect with perimeter
-    geometries = geometries.intersection(perimeter)
-
-    if union:
-        geometries = unary_union(
-            reduce(
-                lambda x, y: x + y,
-                [
-                    [x] if type(x) == Polygon else list(x)
-                    for x in geometries
-                    if type(x) in [Polygon, MultiPolygon]
-                ],
-                [],
-            )
-        )
+            query, radius, circle=circle, rotation=rotation)
     else:
-        geometries = MultiPolygon(
-            reduce(
-                lambda x, y: x + y,
-                [
-                    [x] if type(x) == Polygon else list(x)
-                    for x in geometries
-                    if type(x) in [Polygon, MultiPolygon]
-                ],
-                [],
-            )
-        )
-
-    return geometries
-
-
-def get_geometries(
-    perimeter: Optional[GeoDataFrame] = None,
-    point: Optional[Tuple] = None,
-    radius: Optional[float] = None,
-    tags: Dict = {},
-    perimeter_tolerance: float = 0,
-    union: Boolean = True,
-    buffer: float = 0,
-    circle: Boolean = True,
-    dilate: float = 0,
-    point_size: float = 1,
-    line_width: float = 1
-) -> Union[Polygon, MultiPolygon]:
-    """Get geometries
-
-    Args:
-        perimeter (Optional[GeoDataFrame], optional): Perimeter from within geometries will be fetched. Defaults to None.
-        point (Optional[Tuple], optional): GPS coordinates. Defaults to None.
-        radius (Optional[Number], optional): Radius in meters. Defaults to None.
-        tags (Dict, optional): OpenStreetMap tags for the geometries to be fetched. Defaults to {}.
-        perimeter_tolerance (Number, optional): Tolerance in meters for fetching geometries that fall outside the perimeter. Defaults to 0.
-        union (Boolean, optional): Whether to compute the union of all geometries. Defaults to True.
-        circle (Boolean, optional): Whether to fetch geometries in a circular (True) or square (False) shape. Defaults to True.
-        dilate (Number, optional): Dilate the boundary by this much in meters. Defaults to 0.
-
-    Returns:
-        [type]: [description]
-    """
-
-    # Boundary defined by polygon (perimeter)
-    if perimeter is not None:
-        geometries = ox.geometries_from_polygon(
-            unary_union(perimeter.to_crs(3174).buffer(buffer+perimeter_tolerance).to_crs(4326).geometry)
-            if buffer >0 or perimeter_tolerance > 0
-            else unary_union(perimeter.geometry),
-            tags={tags: True} if type(tags) == str else tags,
-        )
-        perimeter = unary_union(ox.project_gdf(perimeter).geometry)
-    # Boundary defined by circle with radius 'radius' around point
-    elif (point is not None) and (radius is not None):
-        geometries = ox.geometries_from_point(
-            point,
-            dist=radius + dilate + buffer,
-            tags={tags: True} if type(tags) == str else tags,
-        )
-        perimeter = get_boundary(
-            point, radius, geometries.crs, circle=circle, dilate=dilate
-        )
-
-    # Project GDF
-    if len(geometries) > 0:
-        geometries = ox.project_gdf(geometries)
-
-    # Intersect with perimeter
-    geometries = geometries.intersection(perimeter)
-
-    # Get points, lines, polys & multipolys
-    points, lines, polys, multipolys = map(
-        lambda t: [x for x in geometries if isinstance(x, t)],
-        [Point, LineString, Polygon, MultiPolygon]
-    )
-    # Convert points, lines & polygons into multipolygons
-    points = [x.buffer(point_size) for x in points]
-    lines = [x.buffer(line_width) for x in lines]
-    # Concatenate multipolys
-    multipolys = reduce(lambda x,y: x+y, [list(x) for x in multipolys]) if len(multipolys) > 0 else []
-    # Group everything
-    geometries = MultiPolygon(points + lines + polys + multipolys)
-    # Compute union if specified
-    if union: geometries = unary_union(geometries);
-
-    return geometries
-
-
-def get_streets(
-    perimeter: Optional[GeoDataFrame] = None,
-    point: Optional[Tuple] = None,
-    radius: Optional[float] = None,
-    layer: String = "streets",
-    width: float = 6,
-    custom_filter: Optional[str] = None,
-    buffer: float = 0,
-    retain_all: Boolean = False,
-    circle: Boolean = True,
-    dilate: float = 0,
-    truncate_by_edge: Boolean = True 
-) -> MultiPolygon:
-    """
-    Get streets
-
-    Args:
-        perimeter (Optional[GeoDataFrame], optional): [description]. Defaults to None.
-        point (Optional[Tuple], optional): [description]. Defaults to None.
-        radius (Optional[Number], optional): [description]. Defaults to None.
-        layer (String, optional): [description]. Defaults to "streets".
-        width (Number, optional): [description]. Defaults to 6.
-        custom_filter (Optional[String], optional): [description]. Defaults to None.
-        buffer (Number, optional): [description]. Defaults to 0.
-        retain_all (Boolean, optional): [description]. Defaults to False.
-        circle (Boolean, optional): [description]. Defaults to True.
-        dilate (Number, optional): [description]. Defaults to 0.
-        truncate_by_edge (Boolean, optional): [description]. Defaults to True.
-
-    Returns:
-        MultiPolygon: [description]
-    """
-
-    if layer == "streets":
-        layer = "highway"
-
-    # Boundary defined by polygon (perimeter)
-    if perimeter is not None:
-        # Fetch streets data, project & convert to GDF
-        try:
-            streets = ox.graph_from_polygon(
-                unary_union(perimeter.geometry).buffer(buffer)
-                if buffer > 0
-                else unary_union(perimeter.geometry),
-                custom_filter=custom_filter,
-            )
-            streets = ox.project_graph(streets)
-            streets = ox.graph_to_gdfs(streets, nodes=False)
-        except EmptyOverpassResponse:
-            return MultiLineString()
-    # Boundary defined by polygon (perimeter)
-    elif (point is not None) and (radius is not None):
-        # Fetch streets data, save CRS & project
-        try:
-            streets = ox.graph_from_point(
-                point,
-                dist=radius + dilate + buffer,
-                retain_all=retain_all,
-                custom_filter=custom_filter,
-                truncate_by_edge = truncate_by_edge,
-            )
-            crs = ox.graph_to_gdfs(streets, nodes=False).crs
-            streets = ox.project_graph(streets)
-            # Compute perimeter from point & CRS
-            perimeter = get_boundary(point, radius, crs, circle=circle, dilate=dilate)
-            # Convert to GDF
-            streets = ox.graph_to_gdfs(streets, nodes=False)
-            # Intersect with perimeter & filter empty elements
-            streets.geometry = streets.geometry.intersection(perimeter)
-            streets = streets[~streets.geometry.is_empty]
-        except EmptyOverpassResponse:
-            return MultiLineString()
-
-    if type(width) == dict:
-        streets = unary_union(
-            [
-                # Dilate streets of each highway type == 'highway' using width 'w'
-                MultiLineString(
-                    streets[
-                        [highway in value for value in streets[layer]]
-                        & (streets.geometry.type == "LineString")
-                    ].geometry.tolist()
-                    + list(
-                        reduce(
-                            lambda x, y: x + y,
-                            [
-                                list(lines)
-                                for lines in streets[
-                                    [highway in value for value in streets[layer]]
-                                    & (streets.geometry.type == "MultiLineString")
-                                ].geometry
-                            ],
-                            [],
-                        )
-                    )
-                ).buffer(w)
-                for highway, w in width.items()
-            ]
-        )
-    else:
-        # Dilate all streets by same amount 'width'
-        streets=  MultiLineString(
-            streets[streets.geometry.type == "LineString"].geometry.tolist()
-            + list(
-                reduce(
-                    lambda x, y: x + y,
-                    [
-                        list(lines)
-                        for lines in streets[streets.geometry.type == "MultiLineString"].geometry
-                    ],
-                    [],
-                )
-            )
-        ).buffer(width)
-
-    return streets
-
-
-def get_layer(layer: String, **kwargs) -> Union[Polygon, MultiPolygon]:
-    """[summary]
-
-    Args:
-        layer (String): [description]
-
-    Raises:
-        Exception: [description]
-
-    Returns:
-        Union[Polygon, MultiPolygon]: [description]
-    """
-    # Fetch perimeter
-    if layer == "perimeter":
-        # If perimeter is already provided:
-        if "perimeter" in kwargs:
-            return unary_union(ox.project_gdf(kwargs["perimeter"]).geometry)
-        # If point and radius are provided:
-        elif "point" in kwargs and "radius" in kwargs:
-            crs = "EPSG:4326"
-            perimeter = get_boundary(
-                kwargs["point"],
-                kwargs["radius"],
-                crs,
-                **{x: kwargs[x] for x in ["circle", "dilate"] if x in kwargs.keys()}
-            )
-            return perimeter
+        # Perimeter is a OSM or user-provided polygon
+        if parse_query(query) == "polygon":
+            # Perimeter was already provided
+            perimeter = query
         else:
-            raise Exception("Either 'perimeter' or 'point' & 'radius' must be provided")
-    # Fetch streets or railway
-    if layer in ["streets", "railway", "waterway"]:
-        return get_streets(**kwargs, layer=layer)
-    # Fetch Coastline
+            # Fetch perimeter from OSM
+            perimeter = ox.geocode_to_gdf(
+                query,
+                by_osmid=by_osmid,
+                **kwargs,
+            )
+
+    # Apply dilation
+    perimeter = ox.project_gdf(perimeter)
+    if dilate is not None:
+        perimeter.geometry = perimeter.geometry.buffer(dilate)
+    perimeter = perimeter.to_crs(4326)
+
+    return perimeter
+
+
+# Get a GeoDataFrame
+def get_gdf(
+    layer,
+    perimeter,
+    perimeter_tolerance=0,
+    tags=None,
+    osmid=None,
+    custom_filter=None,
+    union=False,
+    elevation=None,
+    vert_exag=1,
+    azdeg=90,
+    altdeg=80,
+    pad=1,
+    min_height=30,
+    max_height=None,
+    n_curves=100,
+    **kwargs
+):
+
+    # Supress shapely deprecation warning
+    warnings.simplefilter("ignore", ShapelyDeprecationWarning)
+
+    # Apply tolerance to the perimeter
+    perimeter_with_tolerance = (
+        ox.project_gdf(perimeter).buffer(perimeter_tolerance).to_crs(4326)
+    )
+    perimeter_with_tolerance = unary_union(
+        perimeter_with_tolerance.geometry).buffer(0)
+
+    # Fetch from perimeter's bounding box, to avoid missing some geometries
+    bbox = box(*perimeter_with_tolerance.bounds)
+
+    if layer == "hillshade":
+        gdf = get_hillshade(
+            mask_elevation(get_elevation(elevation), perimeter),
+            pad=pad,
+            azdeg=azdeg,
+            altdeg=altdeg,
+            vert_exag=vert_exag,
+            min_height=min_height,
+            max_height=max_height,
+        )
+    elif layer == "level_curves":
+        gdf = get_level_curves(
+            mask_elevation(get_elevation(elevation), perimeter),
+            pad=pad,
+            n_curves=n_curves,
+            min_height=min_height,
+            max_height=max_height,
+        )
+    elif layer in ["streets", "railway", "waterway"]:
+        graph = ox.graph_from_polygon(
+            bbox,
+            custom_filter=custom_filter,
+            truncate_by_edge=True,
+        )
+        gdf = ox.graph_to_gdfs(graph, nodes=False)
     elif layer == "coastline":
-        return get_coast(**kwargs)
-    # Fetch geometries
+        # Fetch geometries from OSM
+        gdf = ox.geometries_from_polygon(
+            bbox, tags={tags: True} if type(tags) == str else tags
+        )
     else:
-        return get_geometries(**kwargs)
+        if osmid is None:
+            # Fetch geometries from OSM
+            gdf = ox.geometries_from_polygon(
+                bbox, tags={tags: True} if type(tags) == str else tags
+            )
+        else:
+            gdf = ox.geocode_to_gdf(osmid, by_osmid=True)
+
+    # Intersect with perimeter
+    gdf.geometry = gdf.geometry.intersection(perimeter_with_tolerance)
+    # gdf = gdf[~gdf.geometry.is_empty]
+    gdf.drop(gdf[gdf.geometry.is_empty].index, inplace=True)
+
+    return gdf
+
+
+# Fetch GeoDataFrames given query and a dictionary of layers
+def get_gdfs(query, layers_dict, radius, dilate, rotation=0) -> dict:
+
+    perimeter_kwargs = {}
+    if "perimeter" in layers_dict:
+        perimeter_kwargs = deepcopy(layers_dict["perimeter"])
+        perimeter_kwargs.pop("dilate")
+
+    # Get perimeter
+    perimeter = get_perimeter(
+        query,
+        radius=radius,
+        rotation=rotation,
+        dilate=dilate,
+        **perimeter_kwargs
+    )
+
+    # Get other layers as GeoDataFrames
+    gdfs = {"perimeter": perimeter}
+    gdfs.update({
+        layer: get_gdf(layer, perimeter, **kwargs)
+        for layer, kwargs in layers_dict.items()
+        if layer != "perimeter"
+    })
+
+    return gdfs

prettymaps/presets/barcelona-plotter.json

@@ -0,0 +1,43 @@
+{
+    "layers": {
+        "streets": {
+            "width": {
+                "primary": 5,
+                "secondary": 4,
+                "tertiary": 3,
+                "residential": 2,
+                "footway": 1
+            }
+        },
+        "building": {
+            "tags": {
+                "building": true
+            }
+        },
+        "green": {
+            "tags": {
+                "landuse": [
+                    "grass",
+                    "village_green"
+                ],
+                "leisure": "park"
+            }
+        }
+    },
+    "style": {
+        "perimeter": {
+            "draw": false
+        },
+        "streets": {
+            "stroke": 1,
+            "fill": 1,
+            "penWidth": 2
+        },
+        "buildings": {
+            "stroke": 2
+        }
+    },
+    "circle": null,
+    "radius": 500,
+    "dilate": 100
+}

prettymaps/presets/barcelona.json

@@ -0,0 +1 @@
+{"layers": {"perimeter": {"circle": false}, "streets": {"width": {"primary": 5, "secondary": 4, "tertiary": 3, "residential": 2, "footway": 1}}, "building": {"tags": {"building": true}}, "green": {"tags": {"landuse": ["grass", "village_green"], "leisure": "park"}}}, "style": {"background": {"fc": "#F2F4CB", "ec": "#dadbc1", "hatch": "ooo...", "zorder": -1}, "perimeter": {"fill": false, "lw": 0, "zorder": 0}, "green": {"fc": "#8BB174", "ec": "#2F3737", "hatch_c": "#A7C497", "hatch": "ooo...", "lw": 1, "zorder": 1}, "water": {"fc": "#a8e1e6", "ec": "#2F3737", "hatch_c": "#9bc3d4", "hatch": "ooo...", "lw": 1, "zorder": 3}, "streets": {"fc": "#2F3737", "ec": "#475657", "alpha": 1, "lw": 0, "zorder": 4}, "building": {"palette": ["#433633", "#FF5E5B"], "ec": "#2F3737", "lw": 0.5, "zorder": 5}}, "circle": null, "radius": 500, "dilate": 100}

prettymaps/presets/cb-bf-f.json

@@ -0,0 +1,96 @@
+{
+    "layers": {
+        "streets": {
+            "width": {
+                "trunk": 6,
+                "primary": 6,
+                "secondary": 5,
+                "tertiary": 4,
+                "residential": 3.5,
+                "pedestrian": 3,
+                "footway": 3,
+                "path": 3
+            }
+        },
+        "building": {
+            "tags": {
+                "building": true,
+                "leisure": [
+                    "track",
+                    "pitch"
+                ]
+            }
+        },
+        "water": {
+            "tags": {
+                "natural": [
+                    "water",
+                    "bay"
+                ]
+            }
+        },
+        "park": {
+            "tags": {
+                "leisure": "park"
+            }
+        },
+        "forest": {
+            "tags": {
+                "landuse": "forest"
+            }
+        },
+        "garden": {
+            "tags": {
+                "leisure": "garden"
+            }
+        }
+    },
+    "style": {
+        "perimeter": {
+            "fill": false,
+            "lw": 0,
+            "zorder": 0
+        },
+        "park": {
+            "fc": "#AABD8C",
+            "ec": "#87996b",
+            "lw": 1,
+            "zorder": 1
+        },
+        "forest": {
+            "fc": "#78A58D",
+            "ec": "#658a76",
+            "lw": 1,
+            "zorder": 1
+        },
+        "garden": {
+            "fc": "#a9d1a9",
+            "ec": "#8ab58a",
+            "lw": 1,
+            "zorder": 1
+        },
+        "water": {
+            "fc": "#92D5F2",
+            "ec": "#6da8c2",
+            "lw": 1,
+            "zorder": 2
+        },
+        "streets": {
+            "fc": "#F1E6D0",
+            "ec": "#2F3737",
+            "lw": 1.5,
+            "zorder": 3
+        },
+        "building": {
+            "palette": [
+                "#fff"
+            ],
+            "ec": "#2F3737",
+            "lw": 1,
+            "zorder": 4
+        }
+    },
+    "circle": null,
+    "radius": null,
+    "dilate": 0
+}

prettymaps/presets/default.json

@@ -0,0 +1,129 @@
+{
+    "layers": {
+        "perimeter": {},
+        "streets": {
+            "width": {
+                "motorway": 5,
+                "trunk": 5,
+                "primary": 4.5,
+                "secondary": 4,
+                "tertiary": 3.5,
+                "cycleway": 3.5,
+                "residential": 3,
+                "service": 2,
+                "unclassified": 2,
+                "pedestrian": 2,
+                "footway": 1
+            }
+        },
+        "building": {
+            "tags": {
+                "building": true,
+                "landuse": "construction"
+            }
+        },
+        "water": {
+            "tags": {
+                "natural": [
+                    "water",
+                    "bay"
+                ]
+            }
+        },
+        "forest": {
+            "tags": {
+                "landuse": "forest"
+            }
+        },
+        "green": {
+            "tags": {
+                "landuse": [
+                    "grass",
+                    "orchard"
+                ],
+                "natural": [
+                    "island",
+                    "wood"
+                ],
+                "leisure": "park"
+            }
+        },
+        "beach": {
+            "tags": {
+                "natural": "beach"
+            }
+        },
+        "parking": {
+            "tags": {
+                "amenity": "parking",
+                "highway": "pedestrian",
+                "man_made": "pier"
+            }
+        }
+    },
+    "style": {
+        "perimeter": {
+            "fill": false,
+            "lw": 0,
+            "zorder": 0
+        },
+        "background": {
+            "fc": "#F2F4CB",
+            "zorder": -1
+        },
+        "green": {
+            "fc": "#8BB174",
+            "ec": "#2F3737",
+            "hatch_c": "#A7C497",
+            "hatch": "ooo...",
+            "lw": 1,
+            "zorder": 1
+        },
+        "forest": {
+            "fc": "#64B96A",
+            "ec": "#2F3737",
+            "lw": 1,
+            "zorder": 2
+        },
+        "water": {
+            "fc": "#a8e1e6",
+            "ec": "#2F3737",
+            "hatch_c": "#9bc3d4",
+            "hatch": "ooo...",
+            "lw": 1,
+            "zorder": 3
+        },
+        "beach": {
+            "fc": "#FCE19C",
+            "ec": "#2F3737",
+            "hatch_c": "#d4d196",
+            "hatch": "ooo...",
+            "lw": 1,
+            "zorder": 3
+        },
+        "parking": {
+            "fc": "#F2F4CB",
+            "ec": "#2F3737",
+            "lw": 1,
+            "zorder": 3
+        },
+        "streets": {
+            "fc": "#2F3737",
+            "ec": "#475657",
+            "alpha": 1,
+            "lw": 0,
+            "zorder": 4
+        },
+        "building": {
+            "palette": [
+                "#433633",
+                "#FF5E5B"
+            ],
+            "ec": "#2F3737",
+            "lw": 0.5,
+            "zorder": 5
+        }
+    },
+    "circle": null,
+    "radius": 500
+}

prettymaps/presets/heerhugowaard.json

@@ -0,0 +1,130 @@
+{
+    "layers": {
+        "perimeter": {},
+        "streets": {
+            "width": {
+                "motorway": 5,
+                "trunk": 5,
+                "primary": 4.5,
+                "secondary": 4,
+                "tertiary": 3.5,
+                "cycleway": 3.5,
+                "residential": 3,
+                "service": 2,
+                "unclassified": 2,
+                "pedestrian": 2,
+                "footway": 1
+            }
+        },
+        "building": {
+            "tags": {
+                "building": true,
+                "landuse": "construction"
+            }
+        },
+        "water": {
+            "tags": {
+                "natural": [
+                    "water",
+                    "bay"
+                ]
+            }
+        },
+        "forest": {
+            "tags": {
+                "landuse": "forest"
+            }
+        },
+        "green": {
+            "tags": {
+                "landuse": [
+                    "grass",
+                    "orchard"
+                ],
+                "natural": [
+                    "island",
+                    "wood"
+                ],
+                "leisure": "park"
+            }
+        },
+        "beach": {
+            "tags": {
+                "natural": "beach"
+            }
+        },
+        "parking": {
+            "tags": {
+                "amenity": "parking",
+                "highway": "pedestrian",
+                "man_made": "pier"
+            }
+        }
+    },
+    "style": {
+        "perimeter": {
+            "fill": false,
+            "lw": 0,
+            "zorder": 0
+        },
+        "background": {
+            "fc": "#F2F4CB",
+            "zorder": -1
+        },
+        "green": {
+            "fc": "#8BB174",
+            "ec": "#2F3737",
+            "hatch_c": "#A7C497",
+            "hatch": "ooo...",
+            "lw": 1,
+            "zorder": 1
+        },
+        "forest": {
+            "fc": "#64B96A",
+            "ec": "#2F3737",
+            "lw": 1,
+            "zorder": 2
+        },
+        "water": {
+            "fc": "#a8e1e6",
+            "ec": "#2F3737",
+            "hatch_c": "#9bc3d4",
+            "hatch": "ooo...",
+            "lw": 1,
+            "zorder": 3
+        },
+        "beach": {
+            "fc": "#FCE19C",
+            "ec": "#2F3737",
+            "hatch_c": "#d4d196",
+            "hatch": "ooo...",
+            "lw": 1,
+            "zorder": 3
+        },
+        "parking": {
+            "fc": "#F2F4CB",
+            "ec": "#2F3737",
+            "lw": 1,
+            "zorder": 3
+        },
+        "streets": {
+            "fc": "#2F3737",
+            "ec": "#475657",
+            "alpha": 1,
+            "lw": 0,
+            "zorder": 4
+        },
+        "building": {
+            "palette": [
+                "#433633",
+                "#FF5E5B"
+            ],
+            "ec": "#2F3737",
+            "lw": 0.5,
+            "zorder": 5
+        }
+    },
+    "circle": null,
+    "radius": 800,
+    "dilate": 100
+}

prettymaps/presets/macao.json

@@ -0,0 +1,118 @@
+{
+    "layers": {
+        "perimeter": {},
+        "streets": {
+            "custom_filter": "[\"highway\"~\"motorway|trunk|primary|secondary|tertiary|residential|service|unclassified|pedestrian|footway\"]",
+            "width": {
+                "motorway": 5,
+                "trunk": 5,
+                "primary": 4.5,
+                "secondary": 4,
+                "tertiary": 3.5,
+                "residential": 3,
+                "service": 2,
+                "unclassified": 2,
+                "pedestrian": 2,
+                "footway": 1
+            }
+        },
+        "building": {
+            "tags": {
+                "building": true,
+                "landuse": "construction"
+            },
+            "union": false
+        },
+        "water": {
+            "tags": {
+                "natural": [
+                    "water",
+                    "bay"
+                ]
+            }
+        },
+        "green": {
+            "tags": {
+                "landuse": "grass",
+                "natural": [
+                    "island",
+                    "wood"
+                ],
+                "leisure": "park"
+            }
+        },
+        "forest": {
+            "tags": {
+                "landuse": "forest"
+            }
+        },
+        "parking": {
+            "tags": {
+                "amenity": "parking",
+                "highway": "pedestrian",
+                "man_made": "pier"
+            }
+        }
+    },
+    "style": {
+        "background": {
+            "fc": "#F2F4CB",
+            "ec": "#dadbc1",
+            "hatch": "ooo...",
+            "zorder": -1
+        },
+        "perimeter": {
+            "fc": "#F2F4CB",
+            "ec": "#dadbc1",
+            "lw": 0,
+            "hatch": "ooo...",
+            "zorder": 0
+        },
+        "green": {
+            "fc": "#D0F1BF",
+            "ec": "#2F3737",
+            "lw": 1,
+            "zorder": 1
+        },
+        "forest": {
+            "fc": "#64B96A",
+            "ec": "#2F3737",
+            "lw": 1,
+            "zorder": 1
+        },
+        "water": {
+            "fc": "#a1e3ff",
+            "ec": "#2F3737",
+            "hatch": "ooo...",
+            "hatch_c": "#85c9e6",
+            "lw": 1,
+            "zorder": 2
+        },
+        "parking": {
+            "fc": "#F2F4CB",
+            "ec": "#2F3737",
+            "lw": 1,
+            "zorder": 3
+        },
+        "streets": {
+            "fc": "#2F3737",
+            "ec": "#475657",
+            "alpha": 1,
+            "lw": 0,
+            "zorder": 3
+        },
+        "building": {
+            "palette": [
+                "#FFC857",
+                "#E9724C",
+                "#C5283D"
+            ],
+            "ec": "#2F3737",
+            "lw": 0.5,
+            "zorder": 4
+        }
+    },
+    "circle": true,
+    "radius": 1100,
+    "dilate": 0
+}

prettymaps/presets/minimal.json

@@ -0,0 +1,44 @@
+{
+    "layers": {
+        "perimeter": {},
+        "streets": {
+            "width": {
+                "motorway": 5,
+                "trunk": 5,
+                "primary": 4,
+                "secondary": 3,
+                "tertiary": 2,
+                "residential": 2
+            }
+        },
+        "building": {
+            "tags": {
+                "building": true
+            }
+        }
+    },
+    "style": {
+        "perimeter": {
+            "fill": false,
+            "lw": 0,
+            "zorder": 0
+        },
+        "background": {
+            "fc": "#fff",
+            "zorder": -1
+        },
+        "streets": {
+            "fc": "#000",
+            "lw": 0,
+            "zorder": 4
+        },
+        "building": {
+            "fc": "#fff",
+            "ec": "#000",
+            "lw": 0.5,
+            "zorder": 5
+        }
+    },
+    "circle": null,
+    "radius": 400
+}

prettymaps/presets/tijuca.json

@@ -0,0 +1 @@
+{"layers": {"perimeter": {}, "streets": {"width": {"motorway": 12, "trunk": 12, "primary": 11, "secondary": 10, "tertiary": 9, "residential": 8}}, "park": {"tags": {"leisure": "nature_reserve", "landuse": "military", "boundary": "protected_area", "place": "square", "natural": "grassland", "amenity": "hospital"}}, "grass": {"tags": {"landuse": "grass", "natural": "wood"}}, "wetland": {"tags": {"natural": "scrub"}}, "beach": {"tags": {"natural": "beach"}}, "water": {"tags": {"natural": "water"}}, "pedestrian": {"tags": {"area:highway": "pedestrian"}}, "building": {"tags": {"building": true}}}, "style": {"perimeter": {"ec": "#0F110C", "fill": false, "lw": 0}, "park": {"fc": "#AAD897", "ec": "#8bc49e", "lw": 0, "zorder": 1, "hatch": "ooo..."}, "grass": {"fc": "#72C07A", "ec": "#64a38d", "lw": 0, "zorder": 1, "hatch": "ooo..."}, "wetland": {"fc": "#D2D68D", "ec": "#AEB441", "lw": 0, "zorder": 3, "hatch": "ooo..."}, "water": {"fc": "#6CCFF6", "ec": "#59adcf", "lw": 0, "zorder": 2, "hatch": "ooo..."}, "beach": {"fc": "#F2E3BC", "ec": "#EBD499", "lw": 0, "zorder": 2, "hatch": "ooo..."}, "pedestrian": {"fc": "#7BC950", "ec": "#638475", "lw": 0, "zorder": 2, "hatch": "ooo..."}, "streets": {"fc": "#898989", "ec": "#706f6f", "zorder": 3, "lw": 0, "hatch": "ooo..."}, "building": {"fc": "#E7A89C", "ec": "#E7A89C", "lw": 0, "zorder": 0}}, "circle": null, "radius": null, "dilate": 0}

requirements.txt

@@ -1,3 +1,3 @@
-osmnx==1.0.1
-tabulate==0.8.9
-#vsketch==1.0.0
+osmnx==1.2.2
+Shapely>=1.8,<2.0
+pyyaml==6.0.0

setup.py

@@ -1,11 +1,13 @@
-from setuptools import setup, find_packages
+import os
 from pathlib import Path
+from setuptools import setup, find_packages
 
 parent_dir = Path(__file__).resolve().parent
+presets_dir = os.path.abspath(os.path.join(os.path.pardir, 'presets'))
 
 setup(
     name="prettymaps",
-    version="v0.1",
+    version="v0.2-beta.3",
     description="A simple python library to draw pretty maps from OpenStreetMap data",
     long_description=parent_dir.joinpath("README.md").read_text(),
     long_description_content_type="text/markdown",
@@ -13,9 +15,13 @@ setup(
     author="Marcelo Prates",
     author_email="marceloorp@gmail.com",
     license="MIT License",
-    packages=find_packages(exclude=("assets", "notebooks", "prints", "script")),
-    install_requires=parent_dir.joinpath("requirements.txt").read_text().splitlines(),
+    packages=find_packages(
+        exclude=("assets", "notebooks", "prints", "script")),
+    install_requires=parent_dir.joinpath(
+        "requirements.txt").read_text().splitlines(),
     classifiers=[
         "Intended Audience :: Science/Research",
     ],
+    package_dir={'prettymaps': 'prettymaps'},
+    package_data={'prettymaps': ['presets/*.json']},
 )