Closed alonisser closed 10 years ago
github can't single-click-merge this, so i'll handle that tomorrow morning
On Tue, Aug 27, 2013 at 1:29 AM, Alonisser notifications@github.com wrote:
besides the point: I suspect we use a different version of requests (I use 1.2.3) since I'm got mistakes from the code calling r.json instead of r.json() maybe a different version of python (I'm running on py2.7) , not explict tuple return etc. I changed the code to work (at least with my
config)
You can merge this Pull Request by running
git pull https://github.com/alonisser/tiptipa master
Or view, comment on, or merge it at:
https://github.com/niryariv/tiptipa/pull/1 Commit Summary
- added a requirements file, since I suspect we don't use the same version of requests, and the code works differently with requests.json
- modified readme to reflect changes
- the previous all_station file, I think the current is better
- fixed errors with accessing json function as attribute(maybe we use a different requests version?) added a function to check if the point is in Israel, only points in Israel get added to the geojson, the rest appended to errors.txt
- I think this version is fixed
- changes to show the correct geojson, should change back after pull request is merged
- no palestine
File Changes
- M all_stations.geojsonhttps://github.com/niryariv/tiptipa/pull/1/files#diff-0(3802)
- A all_stations.geojson.oldhttps://github.com/niryariv/tiptipa/pull/1/files#diff-1(12645)
- M errors.txthttps://github.com/niryariv/tiptipa/pull/1/files#diff-2(2)
- M geoencode.pyhttps://github.com/niryariv/tiptipa/pull/1/files#diff-3(39)
- M readme.mdhttps://github.com/niryariv/tiptipa/pull/1/files#diff-4(4)
- A requirments.txthttps://github.com/niryariv/tiptipa/pull/1/files#diff-5(1)
Patch Links:
besides the point: I suspect we use a different version of requests (I use 1.2.3) since I'm got mistakes from the code calling
r.json
instead ofr.json()
maybe a different version of python (I'm running on py2.7) , not explict tuple return etc. I changed the code to work (at least with my config)