2015-11-16

Author: MacHu-GWU

readme.rst

@@ -89,10 +89,14 @@ List of the way you can search
 Here's the list of the ways you can search zipcode:
 
 - `by city and state <by_city_and_state_>`_
+- `by city <by_city_>`_
+- `by state <by_state_>`_
 - `by latitude, longitude and radius <by_coordinate_>`_
 - `by zipcode prefix <by_prefix_>`_
 - `by estimated population <by_population_>`_
 - `by estimated population density <by_density_>`_
+- `by landarea <by_landarea_>`_
+- `by waterarea <by_waterarea_>`_
 - `by estimated total annual wage <by_total_wage_>`_
 - `by estimated average total annual wage <by_wealthy_>`_
 - `by estimated house of units <by_house_>`_
@@ -138,6 +142,36 @@ You can add ``standard_only=False`` parameter to enable returning Po Box type zi
 	>>> res = search.by_city_and_state("Chicago", "IL", standard_only=False)
 
 
+.. _by_city:
+
+Search by City
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can search zipcode by city name.
+
+.. code-block:: python
+
+	>>> res = search.by_city("vienna")
+	>>> zipcode = res[0]
+	>>> zipcode.City
+	'Vienna'
+
+
+.. _by_state:
+
+Search by State
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can search zipcode by state name.
+
+.. code-block:: python
+
+	>>> res = search.by_state("Rhode Island")
+	>>> zipcode = res[0]
+	>>> zipcode.State
+	'RI'
+
+
 .. _by_coordinate:
 
 Search by Latitude and Longitude
@@ -204,6 +238,34 @@ You can search all zipcode by defining its population density lower bound or upp
 	... 	# do whatever you want...
 
 
+.. _by_landarea:
+
+Search by Landarea of Zipcode
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can search all zipcode by defining its Landarea lower bound or upper bound, or both:
+
+.. code-block:: python
+
+	>>> res = search.by_landarea(lower=1000, upper=2000)
+	>>> for zipcode in res:
+	... 	# do whatever you want...
+
+
+.. _by_waterarea:
+
+Search by Waterarea of Zipcode
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+You can search all zipcode by defining its Waterarea lower bound or upper bound, or both:
+
+.. code-block:: python
+
+	>>> res = search.by_waterarea(lower=100, upper=200)
+	>>> for zipcode in res:
+	... 	# do whatever you want...
+
+
 .. _by_total_wage:
 
 Search by Zipcode Estimate Annual Total Wage

uszipcode/searchengine.py

@@ -75,10 +75,14 @@ class ZipcodeSearchEngine(object):
     - :meth:`ZipcodeSearchEngine.by_zipcode`
     - :meth:`ZipcodeSearchEngine.by_coordinate`
     - :meth:`ZipcodeSearchEngine.by_city_and_state`
+    - :meth:`ZipcodeSearchEngine.by_city`
+    - :meth:`ZipcodeSearchEngine.by_state`
     - :meth:`ZipcodeSearchEngine.by_prefix`
     - :meth:`ZipcodeSearchEngine.by_pattern`
     - :meth:`ZipcodeSearchEngine.by_population`
     - :meth:`ZipcodeSearchEngine.by_density`
+    - :meth:`ZipcodeSearchEngine.by_landarea`
+    - :meth:`ZipcodeSearchEngine.by_waterarea`
     - :meth:`ZipcodeSearchEngine.by_totalwages`
     - :meth:`ZipcodeSearchEngine.by_wealthy`
     - :meth:`ZipcodeSearchEngine.by_house`