Combined scripts

CHANGES.txt

@@ -19,3 +19,7 @@ v2.0.2, 14 Jun 2013 -- Included pygeocoder source until fixed for python 3.
 v2.0.3, 25 Jun 2013 -- Fixed printing.
 
 v2.1.0, 17 Sep 2013 -- Requires TwitterAPI 3.
+
+v2.1.1, 11 Oct 2013 -- Prints GEOCODE with place and lat,lng.
+
+v2.2.0, 15 Oct 2013 -- Combined scripts.

MANIFEST

@@ -3,8 +3,6 @@ CHANGES.txt
 README.txt
 setup.py
 TwitterGeoPics/Geocoder.py
-TwitterGeoPics/GetNewGeo.py
-TwitterGeoPics/GetNewPics.py
-TwitterGeoPics/GetOldGeo.py
-TwitterGeoPics/GetOldPics.py
+TwitterGeoPics/SearchOldTweets.py
+TwitterGeoPics/StreamNewTweets.py
 TwitterGeoPics/__init__.py

README.md

@@ -3,10 +3,42 @@
 
 TwitterGeoPics
 ==============
+Python scripts for geocoding tweets and for downloading images embedded in tweets.  Supports Python 2.x and 3.x.
 
-Scripts for geocoding tweets and for downloading images embedded in tweets.
+SearchOldTweets.py
+-----------------
+Uses 'search/tweets' Twitter resource to get tweets, geocode and embedded photos.
+
+Example:
+	python -u -m TwitterGeoPics.SearchOldTweets -words love hate -location nyc
+For help:
+	python -u -m TwitterGeoPics.SearchOldTweets -h
+
+StreamNewTweets.py
+-----------------
+Uses 'stream/filter' Twitter resource to get tweets, geocode and embedded photos.
+
+Example:
+	python -u -m TwitterGeoPics.StreamNewTweets -words love hate -location nyc
+For help:
+	python -u -m TwitterGeoPics.StreamNewTweets -h
+
+Authentication
+--------------
+See TwitterAPI documentation.
+
+Geocoder
+--------
+The geocoder uses Google Maps API to get latitude and longitude from a human-readable address.  See pygeocoder package for details.  Google will attempt to geocode anything.  (If you say your location is The Titanic, Google will geocode the shipwreck.)
+
+All geocode is cached to avoid duplicate requests.  Geocode requests are throttled to avoid exceeding the rate limit.  See Geocoder.py for more information.
+
+Dependencies
+-----------
+* TwitterAPI
+* pygeocoder
+* Fridge
 
 Contributors
 ------------
-
-* Jonas Geduldig
+* Jonas Geduldig

README.txt

@@ -1 +1,41 @@
-Scripts for geocoding tweets and for downloading images embedded in tweets.
+TwitterGeoPics
+==============
+Python scripts for geocoding tweets and for downloading images embedded in tweets.  Supports Python 2.x and 3.x.
+
+SearchOldTweets.py
+-----------------
+Uses 'search/tweets' Twitter resource to get tweets, geocode and embedded photos.
+
+Example:
+	python -u -m TwitterGeoPics.SearchOldTweets -words love hate -location nyc
+For help:
+	python -u -m TwitterGeoPics.SearchOldTweets -h
+
+StreamNewTweets.py
+-----------------
+Uses 'stream/filter' Twitter resource to get tweets, geocode and embedded photos.
+
+Example:
+	python -u -m TwitterGeoPics.StreamNewTweets -words love hate -location nyc
+For help:
+	python -u -m TwitterGeoPics.StreamNewTweets -h
+
+Authentication
+--------------
+See TwitterAPI documentation.
+
+Geocoder
+--------
+The geocoder uses Google Maps API to get latitude and longitude from a human-readable address.  See pygeocoder package for details.  Google will attempt to geocode anything.  (If you say your location is The Titanic, Google will geocode the shipwreck.)
+
+All geocode is cached to avoid duplicate requests.  Geocode requests are throttled to avoid exceeding the rate limit.  See Geocoder.py for more information.
+
+Dependencies
+-----------
+* TwitterAPI
+* pygeocoder
+* Fridge
+
+Contributors
+------------
+* Jonas Geduldig