Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
226 commits
Select commit Hold shift + click to select a range
7e05006
added gitignore
kotarohara Apr 13, 2015
5124f7a
Minor edit
kotarohara Apr 13, 2015
8cd1f64
Writing merge one ways
kotarohara Apr 13, 2015
b5765c2
Trying Delaunay triangulation to remove unnecessary points
kotarohara May 2, 2015
8c482b1
Minor change
kotarohara May 6, 2015
046d5f9
Minor edit
kotarohara May 8, 2015
1786e44
Working on correctly generating crosswalk nodes around intersections
zacharylawrence May 8, 2015
b182ba4
Minor edit
kotarohara May 9, 2015
6f65f6d
Added a gitignore file
kotarohara May 9, 2015
559fddd
Added the initial network data
kotarohara May 9, 2015
a489111
minor edit
kotarohara May 9, 2015
a3e9afe
Merge pull request #9 from zacharylawrence/intersection-crosswalk-kh
kotarohara May 9, 2015
309322d
Added parser and intersection finder
kotarohara May 9, 2015
952fc3f
Make sidewalk nodes
kotarohara May 10, 2015
9abc106
Created separate files for ways and nodes
kotarohara May 10, 2015
b4fe7f1
Minor edit
kotarohara May 10, 2015
b9e4317
Minor edits
kotarohara May 11, 2015
d37485f
Edited the utilities file and got rid of imposm
kotarohara May 12, 2015
e182ce2
Edits
kotarohara May 13, 2015
504ca3a
Added test map dataset
kotarohara May 23, 2015
97b8a54
Added more sample data
kotarohara May 23, 2015
98d7369
Preprocess osm data
kotarohara May 23, 2015
e3b9a59
Create intersection nodes
kotarohara May 23, 2015
cb37aad
minor edit
kotarohara May 23, 2015
f16caf2
Connection for 4 way intersection
kotarohara May 23, 2015
d717c8a
Taken care of T-intersection
kotarohara May 24, 2015
75feab5
Minor edit
kotarohara May 24, 2015
4181fff
Added more dataset
kotarohara May 24, 2015
5e29f5b
Updated the export function to tag footway=sidewalk
kotarohara May 24, 2015
3b112a2
Cleaning up
kotarohara May 25, 2015
8b760ea
Cleaning up
kotarohara May 25, 2015
97b84dd
Added setup.py
kotarohara May 25, 2015
740ccaa
Updated readme
kotarohara May 25, 2015
cc306c6
Updated README
kotarohara May 25, 2015
09ce209
Changed the directory structure
kotarohara May 25, 2015
973f927
Updated setup.py
kotarohara May 25, 2015
2435871
changed function names
kotarohara May 25, 2015
5329893
Fixed the street segmentation (#1)
kotarohara May 25, 2015
7a42144
Merge pull request #5 from kotarohara/fix-street-segmentation
kotarohara May 25, 2015
7a485df
Fixed minor issues
kotarohara May 25, 2015
5832ffd
README updated
kotarohara May 25, 2015
2fcf39e
Hot fix to the issue #6
kotarohara May 26, 2015
638e8de
Geojson export
kotarohara May 26, 2015
a83a022
Added a slightly larger dataset (SmallMap_03.osm)
kotarohara May 26, 2015
98a1efb
Added test files
kotarohara Jun 2, 2015
c45afe0
Added tests to haversine formula in LatLng
kotarohara Jun 2, 2015
2242a08
Added tests for node and way constructors
kotarohara Jun 2, 2015
26d2385
More tests
kotarohara Jun 2, 2015
eb39dda
Fixed minor bugs
kotarohara Jun 2, 2015
0cbdf29
Cleaned up some code to write some tests
kotarohara Jun 2, 2015
8623485
Code clean up
kotarohara Jun 2, 2015
a15726e
Added tests for ToSidewalk.py
kotarohara Jun 3, 2015
213daf4
Integrated osm.py to network.py
kotarohara Jun 4, 2015
2e5a124
Deleted osm.py and test_osm.py
kotarohara Jun 4, 2015
24eefd2
Made changes
kotarohara Jun 4, 2015
d113335
Added simpler dataset
kotarohara Jun 4, 2015
b361e13
Added shapely as a dependency
kotarohara Jun 4, 2015
d86b711
Trying to merge parallel lines
kotarohara Jun 4, 2015
c897a1f
Updated network.py
kotarohara Jun 4, 2015
30f494f
Working on merging parallel lines
kotarohara Jun 6, 2015
0b225cb
Kind of got the merge_parallel_street_segments working
kotarohara Jun 6, 2015
ce2c14a
Merging done!
kotarohara Jun 6, 2015
4a4b730
More for merging
kotarohara Jun 6, 2015
66f5fde
Cleaned up the merging functions a bit.
kotarohara Jun 7, 2015
351eaa1
Implemented line simplification method with Visvalingam's algorithm
kotarohara Jun 7, 2015
db0164e
Removed RDP dependency
kotarohara Jun 13, 2015
1ba3290
Fixing the method to connect a crosswalk and sidewalks
kotarohara Jun 13, 2015
7ce4a65
Refactored
kotarohara Jun 14, 2015
46c5a6c
More refactori
kotarohara Jun 14, 2015
3d02a49
Refactored network.py
kotarohara Jun 14, 2015
0e590df
Refactoring
kotarohara Jun 14, 2015
0458849
Added geojson files for generated potential sidewalks
kotarohara Jun 14, 2015
fed5166
Merge pull request #15 from kotarohara/merge-parallel-segments
kotarohara Jun 14, 2015
aebdcb7
Deleted merge_oneways.py
kotarohara Jun 14, 2015
6ca3a9e
Added comments to the utilities.py
kotarohara Jun 14, 2015
6a0225e
Fixed minor bugs in test_network.py and added some comments here and …
kotarohara Jun 14, 2015
34b9c10
Minor comments.
kotarohara Jun 14, 2015
af2685f
Wrote export methods for Way and Node for debugging
kotarohara Jun 15, 2015
1fe8c02
Added a new dataset
kotarohara Jun 15, 2015
c72a6ed
Merging done
kotarohara Jun 15, 2015
ef08350
Merge pull request #16 from kotarohara/merge-parallel-segments
kotarohara Jun 15, 2015
623d997
Added SmallMap_04 dataset
kotarohara Jun 15, 2015
6ca53bd
Debugging
kotarohara Jun 15, 2015
1c4f0e4
minor fix
kotarohara Jun 16, 2015
fdbc454
Update README.md
kotarohara Jun 16, 2015
a910f26
minor fix
kotarohara Jun 16, 2015
58a6e98
Added new dataset
kotarohara Jun 16, 2015
692027c
Minor edit in tests
kotarohara Jun 16, 2015
b30244e
Cleaned up code
nilesr Jun 16, 2015
f8732f5
Correctly calculate angle distance, cleaned up code
nilesr Jun 16, 2015
474a2be
Merge pull request #17 from nilesr/master
kotarohara Jun 16, 2015
ddf3186
Debugging options
nilesr Jun 16, 2015
a5d0c19
Merge branch 'master' of github.com:nilesr/ToSidewalk
nilesr Jun 17, 2015
0a20a7e
Added new dataset
kotarohara Jun 17, 2015
a84ebeb
Renamed sidewalk datasets
kotarohara Jun 17, 2015
c45d429
Added a database interface
kotarohara Jun 18, 2015
72fc1a6
Add temporary debug code
tongning Jun 18, 2015
0a8fd04
Work in progress
nilesr Jun 18, 2015
5a9c64f
Fixed
nilesr Jun 18, 2015
5902b09
Now calculates using longest possible vector, more accurate
nilesr Jun 18, 2015
3c2b175
Cleaned up code
nilesr Jun 18, 2015
89192a0
more debug code
tongning Jun 18, 2015
b4b9235
cleanup
tongning Jun 18, 2015
19062b0
Cleaned up code
nilesr Jun 18, 2015
5c66f28
potential merge bug fix
tongning Jun 18, 2015
9332142
remove slow debug code
tongning Jun 18, 2015
ffbc4f1
Almost done
nilesr Jun 18, 2015
6c699dd
add benning road debug information
tongning Jun 18, 2015
afd3e20
Antarctica
nilesr Jun 18, 2015
cf3dcc4
Not antarctica
nilesr Jun 18, 2015
31fdb05
bug fix for g street northeast
tongning Jun 19, 2015
426acd2
put benning.osm in master branch
tongning Jun 19, 2015
553f859
put benning.osm in master branch
tongning Jun 19, 2015
77cb7df
Fixed a large bug
nilesr Jun 19, 2015
f5931b8
Merge git://github.com/nilesr/ToSidewalk
tongning Jun 19, 2015
7408fcc
Revert "Merge git://github.com/nilesr/ToSidewalk"
tongning Jun 19, 2015
48f0a12
add method to get length of street
tongning Jun 19, 2015
3e176ba
added merging networks capability
bridgetjc Jun 22, 2015
d9a41aa
added
bridgetjc Jun 22, 2015
fe73088
Merge pull request #20 from bridgetjc/master
kotarohara Jun 22, 2015
ef8e982
add methods for getting and setting oneway tag for street
tongning Jun 23, 2015
aa4f99a
set oneway tags in street objects to either yes or no
tongning Jun 23, 2015
f59f814
add method for connecting two ways together into one
tongning Jun 23, 2015
35583c8
workaround for merge method bugs
tongning Jun 23, 2015
0048703
method comments
tongning Jun 23, 2015
9b2fb9b
cleanup debug code
tongning Jun 23, 2015
a7c7472
Merge pull request #1 from tongning/mergefix
nilesr Jun 23, 2015
156abd7
only merge roads that are going in opposite directions
tongning Jun 23, 2015
89a73f1
Merge conflict resolved
kotarohara Jun 23, 2015
a811ad1
Merge branch 'tongning-mergefix'
kotarohara Jun 23, 2015
ef3ee8c
Minor changes
kotarohara Jun 23, 2015
729dadb
Added latlng_offset function
kotarohara Jun 24, 2015
9869a90
direction check isn't quite working, remove for now
tongning Jun 24, 2015
fd862cf
add bug fix todo for indexerror
tongning Jun 24, 2015
6e9a6b3
Fix IndexError bug in street segmentation
tongning Jun 24, 2015
242e8ca
fix segmentation bug where sometimes middle segment to merge would be…
tongning Jun 24, 2015
9b5f67f
cleanup
tongning Jun 24, 2015
5179c8c
Cleaned up code
nilesr Jun 24, 2015
8ac501c
Merge branch 'master' of github.com:nilesr/ToSidewalk
nilesr Jun 24, 2015
fa394ed
more cleanup
tongning Jun 24, 2015
9d1bbb7
more cleanup
tongning Jun 24, 2015
52208e7
add test osm files
tongning Jun 24, 2015
9b39792
Merge pull request #1 from tongning/mergefix
tongning Jun 24, 2015
c580c5e
add capitol street osm file
tongning Jun 24, 2015
1e089d7
change pair variable name to pair_poly
tongning Jun 24, 2015
f11053d
Merge pull request #2 from tongning/mergefix
tongning Jun 24, 2015
d580ff4
pep8 formatting fixes
tongning Jun 24, 2015
399c5e7
pep8 formatting fixes
tongning Jun 24, 2015
d04502e
increase distance between sidewalk and street for better match with s…
tongning Jun 24, 2015
17eb3a4
Merge pull request #3 from tongning/detailing
tongning Jun 24, 2015
64c119d
Psuedocode
nilesr Jun 24, 2015
b4f9665
Correct case
nilesr Jun 24, 2015
ae8af65
Changed a comment
nilesr Jun 24, 2015
3bc8473
Merge branch 'master' of git://github.com/tongning/ToSidewalk into to…
nilesr Jun 25, 2015
e343c35
Merge branch 'tongning-master'
nilesr Jun 25, 2015
d40c066
Merge pull request #5 from nilesr/master
tongning Jun 25, 2015
be23129
Print timing info
tongning Jun 25, 2015
838a49f
gracefully skip improper merges
tongning Jun 25, 2015
e08fed5
Merged tests from Anthony
kotarohara Jun 25, 2015
8b56f57
make try except catch all errors in merging
tongning Jun 25, 2015
e365c8f
catch clean street segmentation errors
tongning Jun 25, 2015
dedf918
Merge remote-tracking branch 'origin/optimization' into optimization
tongning Jun 25, 2015
434f7d3
Fixed sidewalk/crosswalk mislabel (issue #8)
kotarohara Jun 25, 2015
35633a2
Merge pull request #23 from kotarohara/fix-sidewalk-crosswalk-mislabel
kotarohara Jun 25, 2015
0653c94
resolve conflict
tongning Jun 25, 2015
c46618a
merge conflict fixes
tongning Jun 25, 2015
c72af3c
Merge branch 'kotarohara-master'
tongning Jun 25, 2015
4d6791c
merge conflict fix
tongning Jun 25, 2015
71365f3
minor change in result printing
tongning Jun 25, 2015
e37c18e
print exception error info
tongning Jun 26, 2015
389010a
Add more try statements
tongning Jun 26, 2015
5018987
Merge pull request #8 from tongning/optimization
tongning Jun 26, 2015
cf57676
add combining multiple files, add test files
tongning Jun 26, 2015
f3a3f46
add test files
tongning Jun 26, 2015
bef5ef4
fix file paths
tongning Jun 26, 2015
5b80a32
bug identification
tongning Jun 29, 2015
a5e34e2
bug fixes
tongning Jun 29, 2015
cea3387
todo math domain error
tongning Jun 29, 2015
135b779
fix for tuple bug in merging sidewalk networks
tongning Jun 29, 2015
06bd576
Fixed the math domain error
kotarohara Jun 29, 2015
e5aa806
Refactored code
kotarohara Jun 29, 2015
fcfadb3
Added more comments
kotarohara Jun 29, 2015
925bcf9
Wrote some utility functions
kotarohara Jun 29, 2015
3d44c53
Fixing segment_parallel_streets
kotarohara Jun 30, 2015
8766eb9
Added tests for segment_parallel_streets
kotarohara Jun 30, 2015
5d3cdec
Added tests
kotarohara Jun 30, 2015
17d9d53
Rewriting merge function
kotarohara Jun 30, 2015
de71c7c
Wrote a new merge function
kotarohara Jun 30, 2015
6eebf58
Debugging
kotarohara Jun 30, 2015
21e69b1
automate splitting of large osm files
tongning Jun 30, 2015
e251804
Debug
kotarohara Jun 30, 2015
fb4164e
Minor update
kotarohara Jun 30, 2015
a60c84a
Merge pull request #24 from kotarohara/fix-merge-parallel-segments
kotarohara Jun 30, 2015
2065cc2
Merge methods updated
kotarohara Jul 1, 2015
06efae7
Merge pull request #25 from kotarohara/fix-merge-parallel-segments
kotarohara Jul 1, 2015
ba06359
Minor change
kotarohara Jul 1, 2015
fdb2c39
use dictionary (hash table) to greatly speed up merging sidewalk netw…
tongning Jul 1, 2015
41b57fb
automatically clear data directory before starting
tongning Jul 2, 2015
b00e062
Working on connecting streets
kotarohara Jul 2, 2015
a089911
Finished working on merging parallel segments
kotarohara Jul 2, 2015
2ce7d5c
Testing the efficacy of the code using different datasets. It is so s…
kotarohara Jul 2, 2015
b785adf
Test
kotarohara Jul 2, 2015
e3b5d24
Resolved conflicts
kotarohara Jul 2, 2015
a620877
Merge branch 'fix-math-domain-error'
kotarohara Jul 2, 2015
22ba154
New merge methods
tongning Jul 2, 2015
8438172
New merging code
tongning Jul 2, 2015
b7e88e0
cleanup
tongning Jul 2, 2015
5ca5230
Merging
kotarohara Jul 2, 2015
6e57876
Resolved conflict
kotarohara Jul 2, 2015
ce36f0b
Merge branch 'tongning-master' into fix-math-domain-error
kotarohara Jul 2, 2015
824220c
Merge pull request #26 from kotarohara/fix-math-domain-error
kotarohara Jul 2, 2015
96a0bd6
Merge remote-tracking branch 'origin/master'
kotarohara Jul 2, 2015
d81f633
Added documentation
kotarohara Jul 2, 2015
0049aca
Merge pull request #28 from kotarohara/add-documentation
kotarohara Jul 2, 2015
cf098ad
Update README.md
kotarohara Jul 2, 2015
fab5f38
Done merging nearby nodes
kotarohara Jul 3, 2015
3412554
Merge pull request #30 from kotarohara/merge-nearby-nodes
kotarohara Jul 3, 2015
5a772de
Minor edits
kotarohara Jul 6, 2015
9cb8855
Merge pull request #31 from kotarohara/merge-nearby-nodes
kotarohara Jul 6, 2015
8d3a498
Refactoring ways.py
kotarohara Jul 6, 2015
abcd9ba
Refactored private variables in nodes.py and ways.py
kotarohara Jul 6, 2015
97bc19e
Added comments
kotarohara Jul 6, 2015
4b8f83d
Added methods to keep track of original ways
kotarohara Jul 6, 2015
85a04d9
Updated export methods
kotarohara Jul 6, 2015
fa4f2e9
Merge pull request #32 from kotarohara/reference-to-parents
kotarohara Jul 6, 2015
514441f
Updated methods to export geojson
kotarohara Jul 6, 2015
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
60 changes: 60 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# Byte-compiled / optimized / DLL files
__pycache__/
*.py[cod]

# C extensions
*.so

# Distribution / packaging
.Python
env/
build/
develop-eggs/
dist/
downloads/
eggs/
.eggs/
lib/
lib64/
parts/
sdist/
var/
*.egg-info/
.installed.cfg
*.egg
.idea/

# PyInstaller
# Usually these files are written by a python script from a template
# before PyInstaller builds the exe, so as to inject date/other infos into it.
*.manifest
*.spec

# Installer logs
pip-log.txt
pip-delete-this-directory.txt

# Unit test / coverage reports
htmlcov/
.tox/
.coverage
.coverage.*
.cache
nosetests.xml
coverage.xml
*,cover

# Translations
*.mo
*.pot

# Django stuff:
*.log

# Sphinx documentation
docs/_build/

# PyBuilder
target/

.settings
35 changes: 35 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
# ToSidewalk
This program generates potential sidewalk network from OpenStreetMap network data.

## Resources
* OSM2Geojson: http://tyrasd.github.io/osmtogeojson/
* LatLng visualization: http://www.darrinward.com/lat-long/?id=592078
* Geojson visualization: http://geojson.io/
* Geojson visualization: https://www.mapbox.com/editor/#data

## Requirements
This project uses the following python libraries as well as the C/C++ libraries that they depend on.
* Basemap >= 1.0.7
* Shapely >= 1.5.8
* Rtree >= 0.8.2

I think, especially on Windows, the easiest way to go is to use
Anaconda Python (https://store.continuum.io/cshop/anaconda/), a free Python distribution from Continuum.

To install requirements, just use the `conda` command (e.g., `conda install basemap`). Note, however, at
the time of writing this README, GEOS (a C++ library for GIS stuff) cannot be installed on a Windows machine via
`conda`. So instead, I install it through OSGeo4W bundle (http://trac.osgeo.org/osgeo4w/).

Another hiccup I encountered with installing dependencies is installing Shapely and Rtree. For Shapely, I followed the instruction here to install it: http://gis.stackexchange.com/questions/38899/geos-and-shapely-installation-on-windows . Similarly, I installed Rtree using the whl in the following link: http://www.lfd.uci.edu/~gohlke/pythonlibs/#rtree

Example:

1. Uninstall Shapely (`pip uninstall shapely`)
2. Download the Shapely wheel file from the following link: http://www.lfd.uci.edu/~gohlke/pythonlibs/#shapely
3. Run `pip install wheel`
4. Run `pip install THE_WHEEL_FILENAME`

## Contributors
* Zachary Lawrence (https://github.com/zacharylawrence)
* Anthony Li (https://github.com/tongning)
* Kotaro Hara
Loading