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.

Sign up for GitHub

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

Jump to bottom

New geometries module - Work In Progress #542

Merged
merged 90 commits into from
Aug 24, 2020
Merged

New geometries module - Work In Progress #542

merged 90 commits into from
Aug 24, 2020

Commits on Jun 24, 2020

  1. creates geometry module - functionally identical to pois module

    @AtelierLibre
    AtelierLibre committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    eccc1b0 View commit details
    Browse the repository at this point in the history

  2. renames geometry module to geometries

    @AtelierLibre
    AtelierLibre committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    7ba5ff1 View commit details
    Browse the repository at this point in the history

  3. includes missing _invalid_multipoly_handler

    @AtelierLibre
    AtelierLibre committed Jun 24, 2020
    Configuration menu
    Copy the full SHA
    98fa859 View commit details
    Browse the repository at this point in the history

Commits on Jun 27, 2020

  1. clarifies that _parse_osm_node parses a single element in the respons… 

    …e, not the whole response
    @AtelierLibre
    AtelierLibre committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    bcea517 View commit details
    Browse the repository at this point in the history

  2. clarifies that _parse_osm_way parses a single element in the response… 

    …, not the whole response
    @AtelierLibre
    AtelierLibre committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    df11027 View commit details
    Browse the repository at this point in the history

  3. renames osm_response to response in _parse_nodes_coords

    @AtelierLibre
    AtelierLibre committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    5fd3d47 View commit details
    Browse the repository at this point in the history

  4. clearer variable names in _create_gdf

    @AtelierLibre
    AtelierLibre committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    922220d View commit details
    Browse the repository at this point in the history

  5. moves element_type into the parse functions

    @AtelierLibre
    AtelierLibre committed Jun 27, 2020
    Configuration menu
    Copy the full SHA
    91a9f5c View commit details
    Browse the repository at this point in the history

Commits on Jun 28, 2020

  1. moves parsing coords into main loop and starts renaming pois to points

    @AtelierLibre
    AtelierLibre committed Jun 28, 2020
    Configuration menu
    Copy the full SHA
    d94f335 View commit details
    Browse the repository at this point in the history

  2. renames variables to point_geometry and polygon_geometry to avoid cla… 

    …shes
    @AtelierLibre
    AtelierLibre committed Jun 28, 2020
    Configuration menu
    Copy the full SHA
    8a3a8cd View commit details
    Browse the repository at this point in the history

  3. adds LineStrings to parsed geometry types

    @AtelierLibre
    AtelierLibre committed Jun 28, 2020
    Configuration menu
    Copy the full SHA
    3743712 View commit details
    Browse the repository at this point in the history

Commits on Jun 29, 2020

  1. merges parsing of ways to lines and polygons into single function

    @AtelierLibre
    AtelierLibre committed Jun 29, 2020
    Configuration menu
    Copy the full SHA
    03f6781 View commit details
    Browse the repository at this point in the history

Commits on Jun 30, 2020

  1. implements multipolygon assembly from linestrings and polygons

    @AtelierLibre
    AtelierLibre committed Jun 30, 2020
    Configuration menu
    Copy the full SHA
    02cd492 View commit details
    Browse the repository at this point in the history

Commits on Jul 2, 2020

  1. improves creation of multipolygons by polygonizing individual merged … 

    …linestrings
    @AtelierLibre
    AtelierLibre committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    79af2ca View commit details
    Browse the repository at this point in the history

  2. minor correction to improved multipolygon handling

    @AtelierLibre
    AtelierLibre committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    1b44447 View commit details
    Browse the repository at this point in the history

  3. adds filtering of GeoDataFrame to keys of requested tags

    @AtelierLibre
    AtelierLibre committed Jul 2, 2020
    Configuration menu
    Copy the full SHA
    0748965 View commit details
    Browse the repository at this point in the history

Commits on Jul 3, 2020

  1. introduces try-except for TopologicalError at difference

    @AtelierLibre
    AtelierLibre committed Jul 3, 2020
    Configuration menu
    Copy the full SHA
    8d6db2d View commit details
    Browse the repository at this point in the history

Commits on Jul 5, 2020

  1. removes print statements for debugging

    @AtelierLibre
    AtelierLibre committed Jul 5, 2020
    Configuration menu
    Copy the full SHA
    dae025d View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2020

  1. implements separation of closed ways to LineStrings or Polygons accor… 

    …ding to tags
    @AtelierLibre
    AtelierLibre committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    7640db9 View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2020

  1. Adds exception if missing 'geometry'column

    @AtelierLibre
    AtelierLibre committed Jul 24, 2020
    Configuration menu
    Copy the full SHA
    ab8be8f View commit details
    Browse the repository at this point in the history

  2. Merge pull request #12 from gboeing/master 

    merge latest version of gboeing osmnx master
    @AtelierLibre
    AtelierLibre authored Jul 24, 2020
    Configuration menu
    Copy the full SHA
    88a6ac4 View commit details
    Browse the repository at this point in the history

  3. replaces .within(polygon) with ._intersect_index_quadrats(gdf, polygon)

    @AtelierLibre
    AtelierLibre committed Jul 24, 2020
    Configuration menu
    Copy the full SHA
    ef22b60 View commit details
    Browse the repository at this point in the history

Commits on Jul 25, 2020

  1. passes only the centroids rather than the whole geometries to .inters… 

    …ect_index_quadrats()
    @AtelierLibre
    AtelierLibre committed Jul 25, 2020
    Configuration menu
    Copy the full SHA
    5635d02 View commit details
    Browse the repository at this point in the history

Commits on Jul 28, 2020

  1. Closed way conflicting tags return a polygon

    @AtelierLibre
    AtelierLibre committed Jul 28, 2020
    Configuration menu
    Copy the full SHA
    37561f9 View commit details
    Browse the repository at this point in the history

Commits on Jul 29, 2020

  1. implements unique_id and single dictionary

    @AtelierLibre
    AtelierLibre committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    a4a99a6 View commit details
    Browse the repository at this point in the history

  2. modifies path to json

    @AtelierLibre
    AtelierLibre committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    89d8a88 View commit details
    Browse the repository at this point in the history

  3. fixes path to json

    @AtelierLibre
    AtelierLibre committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    a31db13 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'geometry' into single_dictionary

    @AtelierLibre
    AtelierLibre authored Jul 29, 2020
    Configuration menu
    Copy the full SHA
    a55d7ea View commit details
    Browse the repository at this point in the history

  5. Merge pull request #13 from AtelierLibre/single_dictionary 

    Merge single dictionary into geometry
    @AtelierLibre
    AtelierLibre authored Jul 29, 2020
    Configuration menu
    Copy the full SHA
    129dbea View commit details
    Browse the repository at this point in the history

  6. fixes JSON path and uncomments polygon filter

    @AtelierLibre
    AtelierLibre committed Jul 29, 2020
    Configuration menu
    Copy the full SHA
    37e0f67 View commit details
    Browse the repository at this point in the history

  7. Merge pull request #14 from gboeing/master 

    pull latest gboeing master into geometry
    @AtelierLibre
    AtelierLibre authored Jul 29, 2020
    Configuration menu
    Copy the full SHA
    502f83a View commit details
    Browse the repository at this point in the history

Commits on Jul 31, 2020

  1. Add functionality: gdf_from_bbox.

    @xgerrmann
    xgerrmann committed Jul 31, 2020
    Configuration menu
    Copy the full SHA
    badb2c0 View commit details
    Browse the repository at this point in the history

Commits on Aug 4, 2020

  1. clarifies that ambiguous tags will return a polygon

    @AtelierLibre
    AtelierLibre committed Aug 4, 2020
    Configuration menu
    Copy the full SHA
    50587ef View commit details
    Browse the repository at this point in the history

  2. Merge pull request #15 from xgerrmann/geometries_wip 

    Add functionality: gdf_from_bbox.
    @AtelierLibre
    AtelierLibre authored Aug 4, 2020
    Configuration menu
    Copy the full SHA
    4ce20a9 View commit details
    Browse the repository at this point in the history

Commits on Aug 5, 2020

  1. reverse changes to MANIFEST.in and setup.py

    @AtelierLibre
    AtelierLibre committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    e491059 View commit details
    Browse the repository at this point in the history

  2. replaces polygon-features.json with polygon_features.py

    @AtelierLibre
    AtelierLibre committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    1d0a78e View commit details
    Browse the repository at this point in the history

  3. removes pathlib and json from imports

    @AtelierLibre
    AtelierLibre committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    5eea6fa View commit details
    Browse the repository at this point in the history

  4. handle empty geodataframes

    @AtelierLibre
    AtelierLibre committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    c1c9a17 View commit details
    Browse the repository at this point in the history

  5. adds numpy import

    @AtelierLibre
    AtelierLibre committed Aug 5, 2020
    Configuration menu
    Copy the full SHA
    d09dfb2 View commit details
    Browse the repository at this point in the history

Commits on Aug 8, 2020

  1. adds consistency between gdf_from_place and graph_from_place

    @AtelierLibre
    AtelierLibre committed Aug 8, 2020
    Configuration menu
    Copy the full SHA
    68556d2 View commit details
    Browse the repository at this point in the history

  2. adds consistency between gdf_from_place and graph_from_place

    @AtelierLibre
    AtelierLibre committed Aug 8, 2020
    Configuration menu
    Copy the full SHA
    0f7ff44 View commit details
    Browse the repository at this point in the history

  3. implements query by subdivided polygon, reorders functions to match g… 

    …raph
    @AtelierLibre
    AtelierLibre committed Aug 8, 2020
    Configuration menu
    Copy the full SHA
    05af9c8 View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2020

  1. making gdf_from_point more consistent with graph_from_point

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    53740f8 View commit details
    Browse the repository at this point in the history

  2. making gdf_from_address more consistent with graph_from_address

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    e1a911b View commit details
    Browse the repository at this point in the history

  3. making gdf_from_bbox more consistent with graph_from_bbox. suggest fu… 

    …rther changes
    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    7b8ac67 View commit details
    Browse the repository at this point in the history

  4. further consistencies with graph module

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    a7b0373 View commit details
    Browse the repository at this point in the history

  5. implements gdf_from_xml()

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    0b220ae View commit details
    Browse the repository at this point in the history

  6. removes saved_response_json parameter no longer necessary with gdf_fr… 

    …om_xml()
    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    9523c51 View commit details
    Browse the repository at this point in the history

  7. reverts change to original polygon-features.json removing hedge

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    b5300fd View commit details
    Browse the repository at this point in the history

  8. simplifies logic of _closed_way_is_linestring_or_polygon()

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    44e6466 View commit details
    Browse the repository at this point in the history

  9. Merge pull request #17 from AtelierLibre/geometry_poly 

    Geometry poly
    @AtelierLibre
    AtelierLibre authored Aug 9, 2020
    Configuration menu
    Copy the full SHA
    27013ca View commit details
    Browse the repository at this point in the history

  10. adds full stops to first lines of docstrings

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    ee2876b View commit details
    Browse the repository at this point in the history

  11. Mainly white space changes for CI

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    206faac View commit details
    Browse the repository at this point in the history

  12. splits_assemble_multipolygon_geometry() to reduce complexity

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    07e72c7 View commit details
    Browse the repository at this point in the history

  13. whitespace and argument description for CI

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    7528799 View commit details
    Browse the repository at this point in the history

  14. creates test_geometries() from test_pois()

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    4d685da View commit details
    Browse the repository at this point in the history

  15. removes .centroid from within polygon filter

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    85405fe View commit details
    Browse the repository at this point in the history

  16. line spacing for CI

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    fc1917a View commit details
    Browse the repository at this point in the history

  17. tests multipolygon creation

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    7e9d407 View commit details
    Browse the repository at this point in the history

  18. tries to reduce memory usage during test

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    7a971b2 View commit details
    Browse the repository at this point in the history

  19. tries to reduce memory usage during test

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    7f291c5 View commit details
    Browse the repository at this point in the history

  20. results of black.sh and reduce memory of test

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    404f0f0 View commit details
    Browse the repository at this point in the history

  21. better handling of JSONs read from XML and testing

    @AtelierLibre
    AtelierLibre committed Aug 9, 2020
    Configuration menu
    Copy the full SHA
    d94ef05 View commit details
    Browse the repository at this point in the history

Commits on Aug 10, 2020

  1. Merge pull request #18 from gboeing/master 

    merge latest master from gboeing
    @AtelierLibre
    AtelierLibre authored Aug 10, 2020
    Configuration menu
    Copy the full SHA
    246d7e3 View commit details
    Browse the repository at this point in the history

Commits on Aug 11, 2020

  1. Merge branch 'geometry' into master

    @AtelierLibre
    AtelierLibre authored Aug 11, 2020
    Configuration menu
    Copy the full SHA
    796a90a View commit details
    Browse the repository at this point in the history

  2. Merge pull request #19 from AtelierLibre/master 

    merge latest master into geometry
    @AtelierLibre
    AtelierLibre authored Aug 11, 2020
    Configuration menu
    Copy the full SHA
    2d1756b View commit details
    Browse the repository at this point in the history

  3. uses _make_overpass_polygon_coord_strs() in _osm_net_download and _os… 

    …m_geometry_download
    @AtelierLibre
    AtelierLibre committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    6bfc4ad View commit details
    Browse the repository at this point in the history

  4. makes gdf_from_bbox() consistent with graph_from_bbox()

    @AtelierLibre
    AtelierLibre committed Aug 11, 2020
    Configuration menu
    Copy the full SHA
    194d5f4 View commit details
    Browse the repository at this point in the history

Commits on Aug 13, 2020

  1. improve consistency of docstrings

    @AtelierLibre
    AtelierLibre committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    ef133a8 View commit details
    Browse the repository at this point in the history

  2. removes untagged geometries before creating the geodataframe

    @AtelierLibre
    AtelierLibre committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    865f671 View commit details
    Browse the repository at this point in the history

  3. exposes polygon parameter and improves docstring in gdf_from_xml() fu… 

    …nction
    @AtelierLibre
    AtelierLibre committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    6be845b View commit details
    Browse the repository at this point in the history

  4. make gdf_from_place() consistent with graph_from_place()

    @AtelierLibre
    AtelierLibre committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    92f9949 View commit details
    Browse the repository at this point in the history

  5. tidies up gdf_from_polygon()

    @AtelierLibre
    AtelierLibre committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    309122a View commit details
    Browse the repository at this point in the history

  6. improves docstring of gdf_from_xml()

    @AtelierLibre
    AtelierLibre committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    fe7c850 View commit details
    Browse the repository at this point in the history

  7. filters final gdf by both keys and values of supplied tags

    @AtelierLibre
    AtelierLibre committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    8bbbf70 View commit details
    Browse the repository at this point in the history

  8. multipolygon relations with only one outer ring returned as Polygons

    @AtelierLibre
    AtelierLibre committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    ac22dd2 View commit details
    Browse the repository at this point in the history

  9. tidy up docstring

    @AtelierLibre
    AtelierLibre committed Aug 13, 2020
    Configuration menu
    Copy the full SHA
    b98f647 View commit details
    Browse the repository at this point in the history

Commits on Aug 14, 2020

  1. logs if no outer polygons are created for a multipolygon relation

    @AtelierLibre
    AtelierLibre committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    06aee58 View commit details
    Browse the repository at this point in the history

  2. only add ways and relations to the set of untagged_element_ids

    @AtelierLibre
    AtelierLibre committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    62ad994 View commit details
    Browse the repository at this point in the history

  3. handle XML relations with _OSMContentHandler and ways missing from re… 

    …lations
    @AtelierLibre
    AtelierLibre committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    0897c5f View commit details
    Browse the repository at this point in the history

  4. results of black.sh

    @AtelierLibre
    AtelierLibre committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    0ee7f82 View commit details
    Browse the repository at this point in the history

  5. remove print call

    @AtelierLibre
    AtelierLibre committed Aug 14, 2020
    Configuration menu
    Copy the full SHA
    e3287ca View commit details
    Browse the repository at this point in the history

Commits on Aug 15, 2020

  1. moves _overpass_json_from_file() and _OSMContentHandler() from graph … 

    …to downloader
    @AtelierLibre
    AtelierLibre committed Aug 15, 2020
    Configuration menu
    Copy the full SHA
    bad0be6 View commit details
    Browse the repository at this point in the history

  2. retains unique id

    @AtelierLibre
    AtelierLibre committed Aug 15, 2020
    Configuration menu
    Copy the full SHA
    d7a5372 View commit details
    Browse the repository at this point in the history

  3. black.sh

    @AtelierLibre
    AtelierLibre committed Aug 15, 2020
    Configuration menu
    Copy the full SHA
    fc2a8b9 View commit details
    Browse the repository at this point in the history

Commits on Aug 20, 2020

  1. catches a couple of errors caused by XMLs that contain incomplete geo… 

    …metries
    @AtelierLibre
    AtelierLibre committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    c9a57a0 View commit details
    Browse the repository at this point in the history

  2. drop both empty and missing geometries, empty can't be plotted, missi… 

    …ng can't be reprojected
    @AtelierLibre
    AtelierLibre committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    979dcb9 View commit details
    Browse the repository at this point in the history

  3. results of black.sh

    @AtelierLibre
    AtelierLibre committed Aug 20, 2020
    Configuration menu
    Copy the full SHA
    05768c3 View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2020

  1. increases testing

    @AtelierLibre
    AtelierLibre committed Aug 21, 2020
    Configuration menu
    Copy the full SHA
    23c32ff View commit details
    Browse the repository at this point in the history

  2. catches further exception from XMLs with missing geometry

    @AtelierLibre
    AtelierLibre committed Aug 21, 2020
    Configuration menu
    Copy the full SHA
    b1404ef View commit details
    Browse the repository at this point in the history