required_fixes

Signed-off-by: Paweł Mróz <[email protected]>

Author: mrozpawel

MANIFEST.in

@@ -9,6 +9,4 @@ include README.md
 include setup.cfg
 include *.gitignore
 
-global-exclude geoFrame.py geoSeries.py
-
 prune docs/build

docs/source/geoFrame.rst docs/source/geo_frame.rst

@@ -14,7 +14,7 @@ of an IdaGeoDataFrame.
 
 Open an IdaGeoDataFrame
 =======================
-.. currentmodule:: nzpyida.geoFrame
+.. currentmodule:: nzpyida.geo_frame
 
 .. autoclass:: IdaGeoDataFrame
 

docs/source/geoSeries.rst docs/source/geo_series.rst

@@ -17,7 +17,7 @@ Netezza has three basic classes of geometric objects, which are Netezza spatial
 
 Open an IdaGeoSeries
 ====================
-.. currentmodule:: nzpyida.geoSeries
+.. currentmodule:: nzpyida.geo_series
 
 .. autoclass:: IdaGeoSeries
 
@@ -75,10 +75,6 @@ Exterior Ring
 -------------
 .. automethod:: IdaGeoSeries.exterior_ring
 
-Generalize
-----------
-.. automethod:: IdaGeoSeries.generalize
-
 Geometry Type
 -------------
 .. automethod:: IdaGeoSeries.geometry_type
@@ -127,10 +123,6 @@ MBR
 ---
 .. automethod:: IdaGeoSeries.mbr
 
-Mid Point
----------
-.. automethod:: IdaGeoSeries.mid_point
-
 min M
 -----
 .. automethod:: IdaGeoSeries.min_m
@@ -155,10 +147,6 @@ num Interior Ring
 -----------------
 .. automethod:: IdaGeoSeries.num_interior_ring
 
-num Linestrings
----------------
-.. automethod:: IdaGeoSeries.num_line_strings
-
 num Points
 ----------
 .. automethod:: IdaGeoSeries.num_points

docs/source/geospatial.rst

@@ -33,8 +33,8 @@ __ https://pypi.python.org/pypi/nzpyida
 How the spatial functions work
 ------------------------------
 
-The nzpyida-spatial functions translate geopandas-like syntax into SQL and uses a middleware API (pypyodbc/JayDeBeApi)
-to send it to an ODBC or JDBC-connected database for execution.
+The nzpyida-spatial functions translate geopandas-like syntax into SQL and uses a middleware API (nzpy/pypyodbc/JayDeBeApi)
+to send it to an nzpy, ODBC or JDBC-connected database for execution.
 The results are fetched and formatted into the corresponding data structure, for example, a GeoPandas.GeoDataframe.
 
 The following scenario illustrates how nzpyida works.
@@ -50,12 +50,13 @@ IdaDataBase object, because it holds the connection.
 Now let us compute the area of the counties in the GEO_COUNTY table:
 
     >>> idadf['area'] = idadf['SHAPE'].area()
-         	OBJECTID 	NAME 	        SHAPE 	                                                 area
-         	1 	        Wilbarger 	MULTIPOLYGON (((-99.4756582604 33.8340108094, ... 	0.247254
-         	2 	        Austin 	        MULTIPOLYGON (((-96.6219873342 30.0442882117, ... 	0.162639
-         	3 	        Logan 	        MULTIPOLYGON (((-99.4497297204 46.6316377481, ... 	0.306589
-         	4 	        La Plata 	MULTIPOLYGON (((-107.4817473750 37.0000108736,... 	0.447591
-         	5 	        Randolph 	MULTIPOLYGON (((-91.2589262966 36.2578866492, ... 	0.170844
+    >>> idadf[["NAME", 'area']]
+        NAME		area
+        Wilbarger	0.247254
+     	Austin		0.162639
+     	Logan		0.306589
+        La Plata	0.447591
+     	Randolph	0.170844
 
 The result of the area will be stored as a new column 'area' in the Ida geo data frame.
 
@@ -71,5 +72,5 @@ Here is the SQL request that was executed for this example:
 It's as simple as that!
 
 .. toctree::
-   geoFrame.rst
-   geoSeries.rst
+   geo_frame.rst
+   geo_series.rst

nzpyida/__init__.py

@@ -18,7 +18,8 @@
 from .base import IdaDataBase
 from .frame import IdaDataFrame
 from .series import IdaSeries
-from .geoFrame import IdaGeoDataFrame, IdaGeoSeries
+from .geo_frame import IdaGeoDataFrame
+from .geo_series import IdaGeoSeries
 
 
 __all__ = ['sampledata', 'tests', 'aggregation', 

nzpyida/geoFrame.py nzpyida/geo_frame.py

@@ -27,7 +27,7 @@
 
 import nzpyida
 from nzpyida.frame import IdaDataFrame
-from nzpyida.geoSeries import IdaGeoSeries
+from nzpyida.geo_series import IdaGeoSeries
 from nzpyida.exceptions import IdaGeoDataFrameError
 from nzpy.core import ProgrammingError