Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

cosmetic upgrades #35

Merged
merged 14 commits into from
Dec 6, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 15 additions & 13 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,26 +1,18 @@
# tobler: a library for areal interpolation in Python

<p align="center">
<img src="docsrc/figs/tobler_long.png" height="200px">
</p>

[![Build Status](https://travis-ci.com/pysal/tobler.svg?branch=master)](https://travis-ci.org/pysal/tobler)
[![Coverage Status](https://coveralls.io/repos/github/pysal/tobler/badge.svg?branch=master)](https://coveralls.io/github/pysal/tobler?branch=master&service=github&kill_cache=1)
![PyPI - Python Version](https://img.shields.io/pypi/pyversions/tobler)
![PyPI](https://img.shields.io/pypi/v/tobler)
![Conda (channel only)](https://img.shields.io/conda/vn/conda-forge/tobler)
![GitHub commits since latest release (branch)](https://img.shields.io/github/commits-since/spatialucr/tobler/latest)
![GitHub commits since latest release (branch)](https://img.shields.io/github/commits-since/pysal/tobler/latest)
[![DOI](https://zenodo.org/badge/202220824.svg)](https://zenodo.org/badge/latestdoi/202220824)


Tobler is a python package for areal interpolation, dasymetric mapping, and change of support.
<p></p>

**Easily convert geospatial data from one polygonal representation to another:**

![](docs/figs/toy_census_tracts_example.png)

**Improve conversion accuracy by incorporating raster image data from satellites:**

![](docs/figs/raster_lattice_example.png)

## Functionalities

`tobler` provides:

Expand All @@ -30,6 +22,16 @@ Tobler is a python package for areal interpolation, dasymetric mapping, and chan
+ model-based interpolation using [regression](https://github.com/spatialucr/tobler/blob/master/examples/vectorized_raster_example.ipynb) approaches that incorporates auxiliary data
* Much more to come!


**Easily convert geospatial data from one polygonal representation to another:**

![](docs/figs/toy_census_tracts_example.png)

**Improve conversion accuracy by incorporating raster image data from satellites:**

![](docs/figs/raster_lattice_example.png)


## Installation

```bash
Expand Down
Binary file added docs/_images/tobler_long.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions docs/_modules/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<script type="text/javascript" src="../_static/language_data.js"></script>
<script type="text/javascript" src="../_static/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="../_static/js/jquery-fix.js"></script>
<script type="text/javascript" src="../_static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
<link rel="index" title="Index" href="../genindex.html" />
<link rel="search" title="Search" href="../search.html" />
<meta charset='utf-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
<meta name="apple-mobile-web-app-capable" content="yes">
<script type="text/javascript" src="../_static/js/jquery-1.11.0.min.js "></script>
<script type="text/javascript" src="../_static/js/jquery-fix.js "></script>
<script type="text/javascript" src="../_static/bootstrap-3.3.7/js/bootstrap.min.js "></script>
<script type="text/javascript" src="../_static/bootstrap-sphinx.js "></script>

</head><body>

Expand Down Expand Up @@ -107,7 +107,7 @@

<div class="container">
<div class="row">
<div class="col-md-12 content">
<div class="body col-md-12 content" role="main">

<h1>All modules for which code is available</h1>
<ul><li><a href="tobler/area_weighted/area_weighted.html">tobler.area_weighted.area_weighted</a></li>
Expand Down
10 changes: 5 additions & 5 deletions docs/_modules/tobler/area_weighted/area_weighted.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
<script type="text/javascript" src="../../../_static/underscore.js"></script>
<script type="text/javascript" src="../../../_static/doctools.js"></script>
<script type="text/javascript" src="../../../_static/language_data.js"></script>
<script type="text/javascript" src="../../../_static/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="../../../_static/js/jquery-fix.js"></script>
<script type="text/javascript" src="../../../_static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../../_static/bootstrap-sphinx.js"></script>
<link rel="index" title="Index" href="../../../genindex.html" />
<link rel="search" title="Search" href="../../../search.html" />
<meta charset='utf-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
<meta name="apple-mobile-web-app-capable" content="yes">
<script type="text/javascript" src="../../../_static/js/jquery-1.11.0.min.js "></script>
<script type="text/javascript" src="../../../_static/js/jquery-fix.js "></script>
<script type="text/javascript" src="../../../_static/bootstrap-3.3.7/js/bootstrap.min.js "></script>
<script type="text/javascript" src="../../../_static/bootstrap-sphinx.js "></script>

</head><body>

Expand Down Expand Up @@ -107,7 +107,7 @@

<div class="container">
<div class="row">
<div class="col-md-12 content">
<div class="body col-md-12 content" role="main">

<h1>Source code for tobler.area_weighted.area_weighted</h1><div class="highlight"><pre>
<span></span><span class="sd">&quot;&quot;&quot;</span>
Expand Down
10 changes: 5 additions & 5 deletions docs/_modules/tobler/dasymetric/masked_area_interpolate.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
<script type="text/javascript" src="../../../_static/underscore.js"></script>
<script type="text/javascript" src="../../../_static/doctools.js"></script>
<script type="text/javascript" src="../../../_static/language_data.js"></script>
<script type="text/javascript" src="../../../_static/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="../../../_static/js/jquery-fix.js"></script>
<script type="text/javascript" src="../../../_static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../../_static/bootstrap-sphinx.js"></script>
<link rel="index" title="Index" href="../../../genindex.html" />
<link rel="search" title="Search" href="../../../search.html" />
<meta charset='utf-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
<meta name="apple-mobile-web-app-capable" content="yes">
<script type="text/javascript" src="../../../_static/js/jquery-1.11.0.min.js "></script>
<script type="text/javascript" src="../../../_static/js/jquery-fix.js "></script>
<script type="text/javascript" src="../../../_static/bootstrap-3.3.7/js/bootstrap.min.js "></script>
<script type="text/javascript" src="../../../_static/bootstrap-sphinx.js "></script>

</head><body>

Expand Down Expand Up @@ -107,7 +107,7 @@

<div class="container">
<div class="row">
<div class="col-md-12 content">
<div class="body col-md-12 content" role="main">

<h1>Source code for tobler.dasymetric.masked_area_interpolate</h1><div class="highlight"><pre>
<span></span><span class="kn">from</span> <span class="nn">..area_weighted</span> <span class="kn">import</span> <span class="n">_slow_area_interpolate</span><span class="p">,</span> <span class="n">area_tables_raster</span>
Expand Down
10 changes: 5 additions & 5 deletions docs/_modules/tobler/data.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,16 @@
<script type="text/javascript" src="../../_static/underscore.js"></script>
<script type="text/javascript" src="../../_static/doctools.js"></script>
<script type="text/javascript" src="../../_static/language_data.js"></script>
<script type="text/javascript" src="../../_static/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="../../_static/js/jquery-fix.js"></script>
<script type="text/javascript" src="../../_static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../../_static/bootstrap-sphinx.js"></script>
<link rel="index" title="Index" href="../../genindex.html" />
<link rel="search" title="Search" href="../../search.html" />
<meta charset='utf-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
<meta name="apple-mobile-web-app-capable" content="yes">
<script type="text/javascript" src="../../_static/js/jquery-1.11.0.min.js "></script>
<script type="text/javascript" src="../../_static/js/jquery-fix.js "></script>
<script type="text/javascript" src="../../_static/bootstrap-3.3.7/js/bootstrap.min.js "></script>
<script type="text/javascript" src="../../_static/bootstrap-sphinx.js "></script>

</head><body>

Expand Down Expand Up @@ -107,7 +107,7 @@

<div class="container">
<div class="row">
<div class="col-md-12 content">
<div class="body col-md-12 content" role="main">

<h1>Source code for tobler.data</h1><div class="highlight"><pre>
<span></span><span class="kn">from</span> <span class="nn">urllib.parse</span> <span class="kn">import</span> <span class="n">unquote</span><span class="p">,</span> <span class="n">urlparse</span>
Expand Down
8 changes: 4 additions & 4 deletions docs/_sources/index.rst.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
.. image:: figs/geosnap_long.png
.. image:: figs/tobler_long.png
:align: center
:height: 200px
:width: 800px
:alt: geosnap
:width: 425px
:alt: tobler


Tobler
```````````````````````````````````````````````````````````

`tobler` is a library for areal interpolation and dasymetric mapping. The name is an homage to the legendary geographer.
:code:`tobler` is a library for areal interpolation and dasymetric mapping. The name is an homage to the legendary geographer.

.. toctree::
:hidden:
Expand Down
9 changes: 7 additions & 2 deletions docs/_sources/installation.rst.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
.. Installation

.. highlight:: rst

.. role:: python(code)
:language: python


Installation
===============

Expand All @@ -9,8 +15,7 @@ operating in a python 3 environment.
Installing released version
---------------------------

tobler has not yet been released on the `Python Package Index`_.

You can install tobler with :python:`pip install tobler`

Installing development version
------------------------------
Expand Down
10 changes: 5 additions & 5 deletions docs/api.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
<script type="text/javascript" src="_static/underscore.js"></script>
<script type="text/javascript" src="_static/doctools.js"></script>
<script type="text/javascript" src="_static/language_data.js"></script>
<script type="text/javascript" src="_static/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="_static/js/jquery-fix.js"></script>
<script type="text/javascript" src="_static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
<script type="text/javascript" src="_static/bootstrap-sphinx.js"></script>
<link rel="index" title="Index" href="genindex.html" />
<link rel="search" title="Search" href="search.html" />
<link rel="next" title="tobler.area_weighted.area_interpolate" href="generated/tobler.area_weighted.area_interpolate.html" />
Expand All @@ -24,6 +20,10 @@
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
<meta name="apple-mobile-web-app-capable" content="yes">
<script type="text/javascript" src="_static/js/jquery-1.11.0.min.js "></script>
<script type="text/javascript" src="_static/js/jquery-fix.js "></script>
<script type="text/javascript" src="_static/bootstrap-3.3.7/js/bootstrap.min.js "></script>
<script type="text/javascript" src="_static/bootstrap-sphinx.js "></script>

</head><body>

Expand Down Expand Up @@ -117,7 +117,7 @@

<div class="container">
<div class="row">
<div class="col-md-12 content">
<div class="body col-md-12 content" role="main">

<div class="section" id="api-reference">
<span id="api-ref"></span><h1>API reference<a class="headerlink" href="#api-reference" title="Permalink to this headline">¶</a></h1>
Expand Down
Binary file added docs/figs/tobler_long.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/figs/waldo_travel.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
10 changes: 5 additions & 5 deletions docs/generated/tobler.area_weighted.area_interpolate.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<script type="text/javascript" src="../_static/language_data.js"></script>
<script type="text/javascript" src="../_static/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="../_static/js/jquery-fix.js"></script>
<script type="text/javascript" src="../_static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
<link rel="index" title="Index" href="../genindex.html" />
<link rel="search" title="Search" href="../search.html" />
<link rel="next" title="tobler.area_weighted.area_tables" href="tobler.area_weighted.area_tables.html" />
Expand All @@ -24,6 +20,10 @@
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
<meta name="apple-mobile-web-app-capable" content="yes">
<script type="text/javascript" src="../_static/js/jquery-1.11.0.min.js "></script>
<script type="text/javascript" src="../_static/js/jquery-fix.js "></script>
<script type="text/javascript" src="../_static/bootstrap-3.3.7/js/bootstrap.min.js "></script>
<script type="text/javascript" src="../_static/bootstrap-sphinx.js "></script>

</head><body>

Expand Down Expand Up @@ -112,7 +112,7 @@

<div class="container">
<div class="row">
<div class="col-md-12 content">
<div class="body col-md-12 content" role="main">

<div class="section" id="tobler-area-weighted-area-interpolate">
<h1>tobler.area_weighted.area_interpolate<a class="headerlink" href="#tobler-area-weighted-area-interpolate" title="Permalink to this headline">¶</a></h1>
Expand Down
10 changes: 5 additions & 5 deletions docs/generated/tobler.area_weighted.area_tables.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<script type="text/javascript" src="../_static/language_data.js"></script>
<script type="text/javascript" src="../_static/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="../_static/js/jquery-fix.js"></script>
<script type="text/javascript" src="../_static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
<link rel="index" title="Index" href="../genindex.html" />
<link rel="search" title="Search" href="../search.html" />
<link rel="next" title="tobler.area_weighted.area_tables_binning" href="tobler.area_weighted.area_tables_binning.html" />
Expand All @@ -24,6 +20,10 @@
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
<meta name="apple-mobile-web-app-capable" content="yes">
<script type="text/javascript" src="../_static/js/jquery-1.11.0.min.js "></script>
<script type="text/javascript" src="../_static/js/jquery-fix.js "></script>
<script type="text/javascript" src="../_static/bootstrap-3.3.7/js/bootstrap.min.js "></script>
<script type="text/javascript" src="../_static/bootstrap-sphinx.js "></script>

</head><body>

Expand Down Expand Up @@ -112,7 +112,7 @@

<div class="container">
<div class="row">
<div class="col-md-12 content">
<div class="body col-md-12 content" role="main">

<div class="section" id="tobler-area-weighted-area-tables">
<h1>tobler.area_weighted.area_tables<a class="headerlink" href="#tobler-area-weighted-area-tables" title="Permalink to this headline">¶</a></h1>
Expand Down
10 changes: 5 additions & 5 deletions docs/generated/tobler.area_weighted.area_tables_binning.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<script type="text/javascript" src="../_static/language_data.js"></script>
<script type="text/javascript" src="../_static/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="../_static/js/jquery-fix.js"></script>
<script type="text/javascript" src="../_static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
<link rel="index" title="Index" href="../genindex.html" />
<link rel="search" title="Search" href="../search.html" />
<link rel="next" title="tobler.area_weighted.area_tables_raster" href="tobler.area_weighted.area_tables_raster.html" />
Expand All @@ -24,6 +20,10 @@
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
<meta name="apple-mobile-web-app-capable" content="yes">
<script type="text/javascript" src="../_static/js/jquery-1.11.0.min.js "></script>
<script type="text/javascript" src="../_static/js/jquery-fix.js "></script>
<script type="text/javascript" src="../_static/bootstrap-3.3.7/js/bootstrap.min.js "></script>
<script type="text/javascript" src="../_static/bootstrap-sphinx.js "></script>

</head><body>

Expand Down Expand Up @@ -112,7 +112,7 @@

<div class="container">
<div class="row">
<div class="col-md-12 content">
<div class="body col-md-12 content" role="main">

<div class="section" id="tobler-area-weighted-area-tables-binning">
<h1>tobler.area_weighted.area_tables_binning<a class="headerlink" href="#tobler-area-weighted-area-tables-binning" title="Permalink to this headline">¶</a></h1>
Expand Down
10 changes: 5 additions & 5 deletions docs/generated/tobler.area_weighted.area_tables_raster.html
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,6 @@
<script type="text/javascript" src="../_static/underscore.js"></script>
<script type="text/javascript" src="../_static/doctools.js"></script>
<script type="text/javascript" src="../_static/language_data.js"></script>
<script type="text/javascript" src="../_static/js/jquery-1.11.0.min.js"></script>
<script type="text/javascript" src="../_static/js/jquery-fix.js"></script>
<script type="text/javascript" src="../_static/bootstrap-3.3.7/js/bootstrap.min.js"></script>
<script type="text/javascript" src="../_static/bootstrap-sphinx.js"></script>
<link rel="index" title="Index" href="../genindex.html" />
<link rel="search" title="Search" href="../search.html" />
<link rel="next" title="tobler.dasymetric.masked_area_interpolate" href="tobler.dasymetric.masked_area_interpolate.html" />
Expand All @@ -24,6 +20,10 @@
<meta http-equiv='X-UA-Compatible' content='IE=edge,chrome=1'>
<meta name='viewport' content='width=device-width, initial-scale=1.0, maximum-scale=1'>
<meta name="apple-mobile-web-app-capable" content="yes">
<script type="text/javascript" src="../_static/js/jquery-1.11.0.min.js "></script>
<script type="text/javascript" src="../_static/js/jquery-fix.js "></script>
<script type="text/javascript" src="../_static/bootstrap-3.3.7/js/bootstrap.min.js "></script>
<script type="text/javascript" src="../_static/bootstrap-sphinx.js "></script>

</head><body>

Expand Down Expand Up @@ -112,7 +112,7 @@

<div class="container">
<div class="row">
<div class="col-md-12 content">
<div class="body col-md-12 content" role="main">

<div class="section" id="tobler-area-weighted-area-tables-raster">
<h1>tobler.area_weighted.area_tables_raster<a class="headerlink" href="#tobler-area-weighted-area-tables-raster" title="Permalink to this headline">¶</a></h1>
Expand Down
Loading