wassname/geopandas
1
0
Fork 0
mirror of https://github.com/wassname/geopandas.git synced 2026-09-24 13:30:40 +08:00
Code Issues Packages Projects Releases Wiki Activity
339 Commits 19 Branches 4 Tags
06c335efe30ff4b6ed577b3d2f2ce244b22a326e
Commit Graph
339 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Kelsey Jordahl 06c335efe3 Merge pull request #66 from jtratner/fix-perf-issue 
PERF: Use faster version of list comprehension
 2013-11-14 05:56:18 -08:00
Jeff Tratner 0dc6f9e826 PERF: Use faster version of list comprehension 
Using index lookups is ~20% slower (and less pythonic) than unpacking
with comprehension. Plus use lazy iterator.
 2013-11-14 07:14:35 -05:00
Kelsey Jordahl 40b32dbe5d Merge pull request #70 from jwass/singlegeomfix 
BUG: Fix GeoSeries constructor for multi geoms
 2013-11-13 05:21:43 -08:00
Kelsey Jordahl a0e2ad9d6d Merge pull request #67 from kjordahl/test/python_2.6_support 
Python 2.6 support
 2013-11-13 04:51:25 -08:00
Kelsey Jordahl b1ced78b16 BUG: Put back crs arguments that my merge had overwritten 2013-11-12 23:09:58 -05:00
Kelsey Jordahl cae8249421 DOC: Update docs to list supported python versions 2013-11-12 22:58:32 -05:00
Kelsey Jordahl 159d69e1e0 TST: Explicitly use relative imports and clean up tests 2013-11-12 22:58:31 -05:00
Kelsey Jordahl 85365657d7 TST: Use local unittest for python 2.6 compatability in test_types 2013-11-12 22:56:18 -05:00
Kelsey Jordahl 2008b33074 Revert "TST: unittest2 didn't like skipIf" 
This reverts commit e70ea78321749b8229fdfd1b359b050af1c25a34.
 2013-11-12 22:56:18 -05:00
Kelsey Jordahl eb4e198e81 TST: Use local unittest for python 2.6 compatability in test_geocode 2013-11-12 22:56:17 -05:00
Kelsey Jordahl 266f30f222 TST: unittest2 didn't like skipIf 2013-11-12 22:56:17 -05:00
Kelsey Jordahl 30576cf090 BUG: format statements need a position in python 2.6 2013-11-12 22:56:17 -05:00
Kelsey Jordahl 6798c65a99 BUG: OrderedDict is not in collections module in python 2.6 2013-11-12 22:56:17 -05:00
Kelsey Jordahl 8c9e83aa34 TST: pip install, don't source, the 2.6 requirements 2013-11-12 22:56:17 -05:00
Kelsey Jordahl 9ef3d20b11 TST: Separate python 2.6 requirements for Travis CI and add ordereddict 2013-11-12 22:56:17 -05:00
Kelsey Jordahl 249380ee69 TST: Clean up tests with assertRaises context manager. 2013-11-12 22:56:17 -05:00
Kelsey Jordahl d05dc35077 BUG: Everybody likes dictionary comprehensions. Except Python 2.6. 2013-11-12 22:56:17 -05:00
Kelsey Jordahl 46b6bb95a7 TST: Enable Travis CI for Python 2.6 2013-11-12 22:56:17 -05:00
Kelsey Jordahl 17d933c04a TST: Attempt to import unittest2 if running python 2.6 2013-11-12 22:56:17 -05:00
Jacob Wasserman bb58ce7c35 TST: Test GeoSeries constructor with index 
Make sure that when a single geometry is passed in and the index contains
multiple elements, the geometry is replicated in the GeoSeries.

As suggested by @jtratner in Issue #70.
 2013-11-12 22:17:44 -05:00
Jacob Wasserman 1cacbf5f70 BUG: Fix GeoSeries constructor for multi geoms 
Because Multi* geometries are iterable, they get expanded when passed into
np.array(). Protect against this by passing in all base geometries as a
single element list. They will not be expanded into their individual
parts.

Switch on older versions of pandas when Series overrode __new__ instead
of __init__.
 2013-11-12 22:17:33 -05:00
Kelsey Jordahl d080911c04 Merge pull request #64 from jwass/crstest 
Crstest
 2013-11-11 18:36:49 -08:00
Kelsey Jordahl f6e545cdde Merge pull request #63 from jwass/travis-fix 
Fix travis CI build
 2013-11-11 17:26:36 -08:00
Jacob Wasserman b557e44c3c Fix tests to include crs when comparing GeoSeries 2013-11-11 19:21:13 -05:00
Jacob Wasserman 37377cf9ea TST: Add check_crs flag to assert_geoseries_equal 2013-11-11 19:21:13 -05:00
Jacob Wasserman b94e805b0a Fix travis CI build 
Use ubuntugis stable.
 2013-11-11 19:00:00 -05:00
Kelsey Jordahl 2883bea127 Merge pull request #61 from kjordahl/bug/setup_package_io 
BUG: Add io to the packages list
 2013-11-08 20:04:18 -08:00
Kelsey Jordahl 52c718896f BUG: Add io to the packages list 2013-11-08 22:49:40 -05:00
Kelsey Jordahl 40ec104552 Merge pull request #60 from jtratner/be-flexible-with-geometry-column 
Allow arbitrary geo col name and add set_geometry method to DataFrame
 2013-11-07 04:55:47 -08:00
Jeff Tratner ec15621c1e CLN: crs set order: passed in, passed Series, DataFrame. 2013-11-06 20:18:10 -05:00
Jeff Tratner 9a35c2e5c6 ENH: Add set_dataframe method to DataFrame 2013-11-05 22:55:25 -05:00
Jeff Tratner c51add2456 Allow setting of crs in set_geometry 2013-11-05 22:37:11 -05:00
Jeff Tratner 799f6a2eb7 Only define name 'geometry' in one place 2013-11-05 22:34:41 -05:00
Jeff Tratner 6eb617b9dd Changeup tests to reflect drop=False default 2013-11-05 22:28:03 -05:00
Jeff Tratner b014e4f0ff ENH: Allow more flexibility with geometries 2013-11-05 22:11:24 -05:00
Kelsey Jordahl 6c816f0fff Merge pull request #59 from jtratner/skip-and-guard-geopy 
TST/CLN: Guard geopy import and add skip tests if no geopy.
 2013-11-05 18:44:42 -08:00
Kelsey Jordahl b4f772d638 Merge pull request #58 from kjordahl/bug/cached_total_bounds 
BUG: cached total_bounds don't reset if values are changed
 2013-11-05 18:38:38 -08:00
Kelsey Jordahl 0695518621 Merge pull request #54 from jtratner/change-geometry-v2 
ENH: Allow geometry property to be set.
 2013-11-05 18:38:16 -08:00
Jeff Tratner 4b4d93f9a5 TST: Fix setattr issue with geometry property and more edge case tests 2013-11-05 07:08:39 -05:00
Jeff Tratner b759222241 TST/CLN: Guard geopy import and add skip tests if no geopy. 2013-11-04 23:36:32 -05:00
Jeff Tratner 69aa0364e0 Add assert_geoseries_equal test util 2013-11-04 00:31:36 -05:00
Jeff Tratner f96fd89557 TST: Move geom_equals and geom_almost_equals to tests/util and use them 2013-11-04 00:31:28 -05:00
Jeff Tratner 7df6db234f ENH: Allow geometry property to be set. 
* Allows for clearer errors when a GeoDataFrame is created but has no
  geometry.
* TST: Add test util for comparing sequence (b/c assert_almost_equal seems
  to not work with shapely.
 2013-11-04 00:31:12 -05:00
Kelsey Jordahl 7d326c1d68 Merge pull request #57 from jtratner/use-absolute-imports 
CLN: Use absolute imports in __init__ + add to namespace for interactive work
 2013-11-03 18:55:43 -08:00
Kelsey Jordahl 20b0d62056 TST: Test for total_bounds proprty if values in series change 2013-11-03 21:45:59 -05:00
Kelsey Jordahl 0ee9f4df94 BUG: @cache_readonly didn't reset if series values changed. Reverting to @property. 2013-11-03 21:45:36 -05:00
Jeff Tratner d5add6cbc4 CLN: Use absolute imports in __init__ + add to namespace for interactive work 2013-11-03 16:57:19 -05:00
Kelsey Jordahl 120828c6a0 Merge pull request #49 from kjordahl/feature/update_pandas_api 
Update GeoPandas objects to new pandas API
 2013-11-02 11:03:53 -07:00
Kelsey Jordahl 9b4496dd09 Merge pull request #50 from jwass/geojson_omitna 
Add omitna option to GeoDataFrame.to_json
 2013-11-02 11:01:06 -07:00
Jacob Wasserman 0e671667b0 ENH: Introduce method to handle NaNs in to_json() 
This adds an 'na' option specifying how NaN values should be handled in
GeoDataFrame's to_json(). The default is 'null' which outputs JSON null.
The other options are 'drop' which removes any missing property, and 'keep'
which will output them as NaN.
 2013-11-01 12:58:47 -04:00