pandana 0.1.2__zip → 0.4.0__zip

{pandana-0.1.2 → pandana-0.4.0}/MANIFEST.in

@@ -1,5 +1,3 @@
 include ez_setup.py
 include README.rst
 recursive-include src *.h *.cpp
-prune src/ann_1.1.2/sample
-prune src/ann_1.1.2/test

{pandana-0.1.2/pandana.egg-info → pandana-0.4.0}/PKG-INFO

@@ -1,24 +1,22 @@
 Metadata-Version: 1.1
 Name: pandana
-Version: 0.1.2
+Version: 0.4.0
 Summary: Pandas Network Analysis - dataframes of network queries, quickly
-Home-page: http://synthicity.github.io/pandana/
-Author: UNKNOWN
+Home-page: https://udst.github.io/pandana/
+Author: UrbanSim Inc.
 Author-email: UNKNOWN
 License: AGPL
 Description: Pandana
         =======
         
-        .. image:: https://travis-ci.org/synthicity/pandana.svg?branch=master
+        .. image:: https://travis-ci.org/UDST/pandana.svg?branch=master
            :alt: Build Status
-           :target: https://travis-ci.org/synthicity/pandana
+           :target: https://travis-ci.org/UDST/pandana
         
-        .. image:: https://img.shields.io/coveralls/synthicity/pandana.svg
+        .. image:: https://coveralls.io/repos/UDST/pandana/badge.svg?branch=master&service=github
            :alt: Coverage Status
-           :target: https://coveralls.io/r/synthicity/pandana
+           :target: https://coveralls.io/r/UDST/pandana
         
-        A nice slideshow showing example code is available
-        `here <http://bit.ly/1tivyjw>`__.
         
         In this case, a picture is worth a thousand words. The image below shows
         the distance to the *2nd* nearest restaurant (rendered by matplotlib)
@@ -28,7 +26,7 @@ Description: Pandana
         you can get back a Pandas Series of node\_ids and computed values of
         various measures of access to destinations on the street network.
         
-        .. figure:: https://raw.githubusercontent.com/synthicity/pandana/master/docs/img/distance_to_restaurants.png
+        .. figure:: https://raw.githubusercontent.com/udst/pandana/master/docs/img/distance_to_restaurants.png
            :alt: Distance to Restaurants
            :width: 800
         
@@ -41,45 +39,52 @@ Description: Pandana
         can be used to characterize the local neighborhood around each street
         intersection. The result can then be mapped, or assigned to parcel and
         building records, or used in statistical models as we commonly do with
-        `UrbanSim <https://github.com/synthicity/urbansim>`__. This is in stark
+        `UrbanSim <https://github.com/udst/urbansim>`__. This is in stark
         contrast to the arbitrary non-overlapping geographies ubiquitous in GIS.
         Although there are advantages to the GIS approach, we think network
         queries are a more accurate representation of how people interact with
         their environment.
         
         We look forward to creative uses of a general library like this - please
-        let us know when you think you have a great use case with the hashtag
-        ``#synthicity``.
+        let us know if you think you have a great use case by tweeting us at
+        ``@urbansim`` or post on the UrbanSim `forum`_.
         
         Docs
         ----
         
-        `Documentation <http://synthicity.github.io/pandana>`__ for Pandana is
+        `Documentation <http://udst.github.io/pandana>`__ for Pandana is
         now available.
         
         Thorough `API
-        documentation <http://synthicity.github.io/pandana/network.html>`__ for
+        documentation <http://udst.github.io/pandana/network.html>`__ for
         Pandana is also available.
         
         Acknowledgments
         ---------------
         
-        None of this would be possible without the help of Dennis Luxen (now at
-        MapBox) and his OSRM (https://github.com/DennisOSRM/Project-OSRM). Thank
-        you Dennis!
-        
-        Nearest neighbor queries are performed with the fastest k-d tree around,
-        i.e. ANN (http://www.cs.umd.edu/~mount/ANN/).
+        None of this would be possible without the help of Dennis Luxen and
+        his OSRM (https://github.com/DennisOSRM/Project-OSRM). Thank you Dennis!
         
         Academic Literature
         -------------------
         
-        I'm currently working on getting a `complete description of the
-        methodology <https://github.com/fscottfoti/dissertation/blob/master/networks/Foti%20and%20Waddell%20-%20Accessibility%20Framework.pdf?raw=true>`__
-        published in an academic journal. Please cite this paper when referring
+        A `complete description of the
+        methodology <http://onlinepubs.trb.org/onlinepubs/conferences/2012/4thITM/Papers-A/0117-000062.pdf>`__
+        was presented at the Transportation Research Board Annual Conference in 2012. Please cite this paper when referring
         to the methodology implemented by this library.
         
+        Related UDST libraries
+        ----------------------
+        
+        -  `OSMnet`_
+        -  `UrbanAccess`_
+        
+        .. _forum: http://discussion.urbansim.com/
+        .. _OSMnet: https://github.com/udst/osmnet
+        .. _UrbanAccess: https://github.com/UDST/urbanaccess
+        
 Platform: UNKNOWN
 Classifier: Development Status :: 3 - Alpha
 Classifier: Programming Language :: Python :: 2.7
+Classifier: Programming Language :: Python :: 3.5
 Classifier: License :: OSI Approved :: GNU Affero General Public License v3

{pandana-0.1.2 → pandana-0.4.0}/README.rst

@@ -1,16 +1,14 @@
 Pandana
 =======
 
-.. image:: https://travis-ci.org/synthicity/pandana.svg?branch=master
+.. image:: https://travis-ci.org/UDST/pandana.svg?branch=master
    :alt: Build Status
-   :target: https://travis-ci.org/synthicity/pandana
+   :target: https://travis-ci.org/UDST/pandana
 
-.. image:: https://img.shields.io/coveralls/synthicity/pandana.svg
+.. image:: https://coveralls.io/repos/UDST/pandana/badge.svg?branch=master&service=github
    :alt: Coverage Status
-   :target: https://coveralls.io/r/synthicity/pandana
+   :target: https://coveralls.io/r/UDST/pandana
 
-A nice slideshow showing example code is available
-`here <http://bit.ly/1tivyjw>`__.
 
 In this case, a picture is worth a thousand words. The image below shows
 the distance to the *2nd* nearest restaurant (rendered by matplotlib)
@@ -20,7 +18,7 @@ OpenStreetMap have recorded, and in about half a second of compute time
 you can get back a Pandas Series of node\_ids and computed values of
 various measures of access to destinations on the street network.
 
-.. figure:: https://raw.githubusercontent.com/synthicity/pandana/master/docs/img/distance_to_restaurants.png
+.. figure:: https://raw.githubusercontent.com/udst/pandana/master/docs/img/distance_to_restaurants.png
    :alt: Distance to Restaurants
    :width: 800
 
@@ -33,40 +31,46 @@ overlapping buffer queries (still performed in less than a second) that
 can be used to characterize the local neighborhood around each street
 intersection. The result can then be mapped, or assigned to parcel and
 building records, or used in statistical models as we commonly do with
-`UrbanSim <https://github.com/synthicity/urbansim>`__. This is in stark
+`UrbanSim <https://github.com/udst/urbansim>`__. This is in stark
 contrast to the arbitrary non-overlapping geographies ubiquitous in GIS.
 Although there are advantages to the GIS approach, we think network
 queries are a more accurate representation of how people interact with
 their environment.
 
 We look forward to creative uses of a general library like this - please
-let us know when you think you have a great use case with the hashtag
-``#synthicity``.
+let us know if you think you have a great use case by tweeting us at
+``@urbansim`` or post on the UrbanSim `forum`_.
 
 Docs
 ----
 
-`Documentation <http://synthicity.github.io/pandana>`__ for Pandana is
+`Documentation <http://udst.github.io/pandana>`__ for Pandana is
 now available.
 
 Thorough `API
-documentation <http://synthicity.github.io/pandana/network.html>`__ for
+documentation <http://udst.github.io/pandana/network.html>`__ for
 Pandana is also available.
 
 Acknowledgments
 ---------------
 
-None of this would be possible without the help of Dennis Luxen (now at
-MapBox) and his OSRM (https://github.com/DennisOSRM/Project-OSRM). Thank
-you Dennis!
-
-Nearest neighbor queries are performed with the fastest k-d tree around,
-i.e. ANN (http://www.cs.umd.edu/~mount/ANN/).
+None of this would be possible without the help of Dennis Luxen and
+his OSRM (https://github.com/DennisOSRM/Project-OSRM). Thank you Dennis!
 
 Academic Literature
 -------------------
 
-I'm currently working on getting a `complete description of the
-methodology <https://github.com/fscottfoti/dissertation/blob/master/networks/Foti%20and%20Waddell%20-%20Accessibility%20Framework.pdf?raw=true>`__
-published in an academic journal. Please cite this paper when referring
+A `complete description of the
+methodology <http://onlinepubs.trb.org/onlinepubs/conferences/2012/4thITM/Papers-A/0117-000062.pdf>`__
+was presented at the Transportation Research Board Annual Conference in 2012. Please cite this paper when referring
 to the methodology implemented by this library.
+
+Related UDST libraries
+----------------------
+
+-  `OSMnet`_
+-  `UrbanAccess`_
+
+.. _forum: http://discussion.urbansim.com/
+.. _OSMnet: https://github.com/udst/osmnet
+.. _UrbanAccess: https://github.com/UDST/urbanaccess

{pandana-0.1.2 → pandana-0.4.0}/ez_setup.py

@@ -39,6 +39,7 @@ except ImportError:
 DEFAULT_VERSION = "5.7"
 DEFAULT_URL = "https://pypi.python.org/packages/source/s/setuptools/"
 
+
 def _python_cmd(*args):
     """
     Return True if the command succeeded.
@@ -130,7 +131,7 @@ def _do_download(version, download_base, to_dir, download_delay):
 
 
 def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-        to_dir=os.curdir, download_delay=15):
+                   to_dir=os.curdir, download_delay=15):
     to_dir = os.path.abspath(to_dir)
     rep_modules = 'pkg_resources', 'setuptools'
     imported = set(sys.modules).intersection(rep_modules)
@@ -160,6 +161,7 @@ def use_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         del pkg_resources, sys.modules['pkg_resources']
         return _do_download(version, download_base, to_dir, download_delay)
 
+
 def _clean_check(cmd, target):
     """
     Run the command to download target. If the command fails, clean up before
@@ -172,6 +174,7 @@ def _clean_check(cmd, target):
             os.unlink(target)
         raise
 
+
 def download_file_powershell(url, target):
     """
     Download the file at url to target using Powershell (which will validate
@@ -191,6 +194,7 @@ def download_file_powershell(url, target):
     ]
     _clean_check(cmd, target)
 
+
 def has_powershell():
     if platform.system() != 'Windows':
         return False
@@ -202,12 +206,15 @@ def has_powershell():
             return False
     return True
 
+
 download_file_powershell.viable = has_powershell
 
+
 def download_file_curl(url, target):
     cmd = ['curl', url, '--silent', '--output', target]
     _clean_check(cmd, target)
 
+
 def has_curl():
     cmd = ['curl', '--version']
     with open(os.path.devnull, 'wb') as devnull:
@@ -217,12 +224,15 @@ def has_curl():
             return False
     return True
 
+
 download_file_curl.viable = has_curl
 
+
 def download_file_wget(url, target):
     cmd = ['wget', url, '--quiet', '--output-document', target]
     _clean_check(cmd, target)
 
+
 def has_wget():
     cmd = ['wget', '--version']
     with open(os.path.devnull, 'wb') as devnull:
@@ -232,8 +242,10 @@ def has_wget():
             return False
     return True
 
+
 download_file_wget.viable = has_wget
 
+
 def download_file_insecure(url, target):
     """
     Use Python to download the file, even though it cannot authenticate the
@@ -250,8 +262,10 @@ def download_file_insecure(url, target):
     with open(target, "wb") as dst:
         dst.write(data)
 
+
 download_file_insecure.viable = lambda: True
 
+
 def get_best_downloader():
     downloaders = (
         download_file_powershell,
@@ -262,8 +276,10 @@ def get_best_downloader():
     viable_downloaders = (dl for dl in downloaders if dl.viable())
     return next(viable_downloaders, None)
 
+
 def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
-        to_dir=os.curdir, delay=15, downloader_factory=get_best_downloader):
+                        to_dir=os.curdir, delay=15,
+                        downloader_factory=get_best_downloader):
     """
     Download setuptools from a specified location and return its filename
 
@@ -287,12 +303,14 @@ def download_setuptools(version=DEFAULT_VERSION, download_base=DEFAULT_URL,
         downloader(url, saveto)
     return os.path.realpath(saveto)
 
+
 def _build_install_args(options):
     """
     Build the arguments to 'python setup.py install' on the setuptools package
     """
     return ['--user'] if options.user_install else []
 
+
 def _parse_args():
     """
     Parse the command line for options
@@ -318,6 +336,7 @@ def _parse_args():
     # positional arguments are ignored
     return options
 
+
 def main():
     """Install or upgrade setuptools and EasyInstall"""
     options = _parse_args()
@@ -328,5 +347,6 @@ def main():
     )
     return _install(archive, _build_install_args(options))
 
+
 if __name__ == '__main__':
     sys.exit(main())

pandana-0.4.0/pandana/__init__.py

@@ -0,0 +1,3 @@
+from .network import Network
+
+version = __version__ = '0.4.0'

pandana-0.4.0/pandana/loaders/osm.py

@@ -0,0 +1,189 @@
+"""
+Tools for creating Pandana networks from OpenStreetMap.
+
+"""
+
+import pandas as pd
+import requests
+from osmnet.load import network_from_bbox
+
+from .. import Network
+
+
+def pdna_network_from_bbox(
+        lat_min=None, lng_min=None, lat_max=None, lng_max=None, bbox=None,
+        network_type='walk', two_way=True,
+        timeout=180, memory=None, max_query_area_size=50 * 1000 * 50 * 1000):
+    """
+    Make a Pandana network from a bounding lat/lon box
+    request to the Overpass API. Distance will be in the default units meters.
+
+    Parameters
+    ----------
+    lat_min, lng_min, lat_max, lng_max : float
+    bbox : tuple
+        Bounding box formatted as a 4 element tuple:
+        (lng_max, lat_min, lng_min, lat_max)
+    network_type : {'walk', 'drive'}, optional
+        Specify whether the network will be used for walking or driving.
+        A value of 'walk' attempts to exclude things like freeways,
+        while a value of 'drive' attempts to exclude things like
+        bike and walking paths.
+    two_way : bool, optional
+        Whether the routes are two-way. If True, node pairs will only
+        occur once.
+    timeout : int, optional
+        the timeout interval for requests and to pass to Overpass API
+    memory : int, optional
+        server memory allocation size for the query, in bytes.
+        If none, server will use its default allocation size
+    max_query_area_size : float, optional
+        max area for any part of the geometry, in the units the geometry is in
+
+    Returns
+    -------
+    network : pandana.Network
+
+    """
+
+    nodes, edges = network_from_bbox(lat_min=lat_min, lng_min=lng_min,
+                                     lat_max=lat_max, lng_max=lng_max,
+                                     bbox=bbox, network_type=network_type,
+                                     two_way=two_way, timeout=timeout,
+                                     memory=memory,
+                                     max_query_area_size=max_query_area_size)
+
+    return Network(
+        nodes['x'], nodes['y'],
+        edges['from'], edges['to'], edges[['distance']])
+
+
+def process_node(e):
+    """
+    Process a node element entry into a dict suitable for going into
+    a Pandas DataFrame.
+
+    Parameters
+    ----------
+    e : dict
+    Returns
+    -------
+    node : dict
+    """
+
+    uninteresting_tags = {
+        'source',
+        'source_ref',
+        'source:ref',
+        'history',
+        'attribution',
+        'created_by',
+        'tiger:tlid',
+        'tiger:upload_uuid',
+    }
+
+    node = {
+        'id': e['id'],
+        'lat': e['lat'],
+        'lon': e['lon']
+    }
+
+    if 'tags' in e:
+        for t, v in list(e['tags'].items()):
+            if t not in uninteresting_tags:
+                node[t] = v
+
+    return node
+
+
+def make_osm_query(query):
+    """
+    Make a request to OSM and return the parsed JSON.
+
+    Parameters
+    ----------
+    query : str
+        A string in the Overpass QL format.
+
+    Returns
+    -------
+    data : dict
+
+    """
+    osm_url = 'http://www.overpass-api.de/api/interpreter'
+    req = requests.get(osm_url, params={'data': query})
+    req.raise_for_status()
+
+    return req.json()
+
+
+def build_node_query(lat_min, lng_min, lat_max, lng_max, tags=None):
+    """
+    Build the string for a node-based OSM query.
+
+    Parameters
+    ----------
+    lat_min, lng_min, lat_max, lng_max : float
+    tags : str or list of str, optional
+        Node tags that will be used to filter the search.
+        See http://wiki.openstreetmap.org/wiki/Overpass_API/Language_Guide
+        for information about OSM Overpass queries
+        and http://wiki.openstreetmap.org/wiki/Map_Features
+        for a list of tags.
+
+    Returns
+    -------
+    query : str
+
+    """
+    if tags is not None:
+        if isinstance(tags, str):
+            tags = [tags]
+        tags = ''.join('[{}]'.format(t) for t in tags)
+    else:
+        tags = ''
+
+    query_fmt = (
+        '[out:json];'
+        '('
+        '  node'
+        '  {tags}'
+        '  ({lat_min},{lng_min},{lat_max},{lng_max});'
+        ');'
+        'out;')
+
+    return query_fmt.format(
+        lat_min=lat_min, lng_min=lng_min, lat_max=lat_max, lng_max=lng_max,
+        tags=tags)
+
+
+def node_query(lat_min, lng_min, lat_max, lng_max, tags=None):
+    """
+    Search for OSM nodes within a bounding box that match given tags.
+
+    Parameters
+    ----------
+    lat_min, lng_min, lat_max, lng_max : float
+    tags : str or list of str, optional
+        Node tags that will be used to filter the search.
+        See http://wiki.openstreetmap.org/wiki/Overpass_API/Language_Guide
+        for information about OSM Overpass queries
+        and http://wiki.openstreetmap.org/wiki/Map_Features
+        for a list of tags.
+
+    Returns
+    -------
+    nodes : pandas.DataFrame
+        Will have 'lat' and 'lon' columns, plus other columns for the
+        tags associated with the node (these will vary based on the query).
+        Index will be the OSM node IDs.
+
+    """
+    node_data = make_osm_query(build_node_query(
+        lat_min, lng_min, lat_max, lng_max, tags=tags))
+
+    if len(node_data['elements']) == 0:
+        raise RuntimeError('OSM query results contain no data.')
+
+    nodes = [process_node(n) for n in node_data['elements']]
+    return pd.DataFrame.from_records(nodes, index='id')

pandana-0.4.0/pandana/loaders/pandash5.py

@@ -0,0 +1,79 @@
+import pandas as pd
+
+
+def remove_nodes(network, rm_nodes):
+    """
+    Create DataFrames of nodes and edges that do not include specified nodes.
+
+    Parameters
+    ----------
+    network : pandana.Network
+    rm_nodes : array_like
+        A list, array, Index, or Series of node IDs that should *not*
+        be saved as part of the Network.
+
+    Returns
+    -------
+    nodes, edges : pandas.DataFrame
+
+    """
+    rm_nodes = set(rm_nodes)
+    ndf = network.nodes_df
+    edf = network.edges_df
+
+    nodes_to_keep = ~ndf.index.isin(rm_nodes)
+    edges_to_keep = ~(edf['from'].isin(rm_nodes) | edf['to'].isin(rm_nodes))
+
+    return ndf.loc[nodes_to_keep], edf.loc[edges_to_keep]
+
+
+def network_to_pandas_hdf5(network, filename, rm_nodes=None):
+    """
+    Save a Network's data to a Pandas HDFStore.
+
+    Parameters
+    ----------
+    network : pandana.Network
+    filename : str
+    rm_nodes : array_like
+        A list, array, Index, or Series of node IDs that should *not*
+        be saved as part of the Network.
+
+    """
+    if rm_nodes is not None:
+        nodes, edges = remove_nodes(network, rm_nodes)
+    else:
+        nodes, edges = network.nodes_df, network.edges_df
+
+    with pd.HDFStore(filename, mode='w') as store:
+        store['nodes'] = nodes
+        store['edges'] = edges
+
+        store['two_way'] = pd.Series([network._twoway])
+        store['impedance_names'] = pd.Series(network.impedance_names)
+
+
+def network_from_pandas_hdf5(cls, filename):
+    """
+    Build a Network from data in a Pandas HDFStore.
+
+    Parameters
+    ----------
+    cls : class
+        Class to instantiate, usually pandana.Network.
+    filename : str
+
+    Returns
+    -------
+    network : pandana.Network
+
+    """
+    with pd.HDFStore(filename) as store:
+        nodes = store['nodes']
+        edges = store['edges']
+        two_way = store['two_way'][0]
+        imp_names = store['impedance_names'].tolist()
+
+    return cls(
+        nodes['x'], nodes['y'], edges['from'], edges['to'], edges[imp_names],
+        twoway=two_way)