svn commit: r1126267 - in /incubator/nuvem/trunk/nuvem-parallel/nuvem: gaddress.py geolocation.py ggeopos.py gmap.py location.py

[js...@apache.org]

Author: jsdelfino
Date: Sun May 22 22:47:19 2011
New Revision: 1126267

URL: http://svn.apache.org/viewvc?rev=1126267&view=rev
Log:
Refactor location component and add two geocoding components.

Added:
    incubator/nuvem/trunk/nuvem-parallel/nuvem/gaddress.py
      - copied, changed from r1126266, incubator/nuvem/trunk/nuvem-parallel/nuvem/geolocation.py
    incubator/nuvem/trunk/nuvem-parallel/nuvem/ggeopos.py
      - copied, changed from r1126266, incubator/nuvem/trunk/nuvem-parallel/nuvem/geolocation.py
    incubator/nuvem/trunk/nuvem-parallel/nuvem/location.py
      - copied, changed from r1126266, incubator/nuvem/trunk/nuvem-parallel/nuvem/geolocation.py
Removed:
    incubator/nuvem/trunk/nuvem-parallel/nuvem/geolocation.py
Modified:
    incubator/nuvem/trunk/nuvem-parallel/nuvem/gmap.py

Copied: incubator/nuvem/trunk/nuvem-parallel/nuvem/gaddress.py (from r1126266, incubator/nuvem/trunk/nuvem-parallel/nuvem/geolocation.py)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-parallel/nuvem/gaddress.py?p2=incubator/nuvem/trunk/nuvem-parallel/nuvem/gaddress.py&p1=incubator/nuvem/trunk/nuvem-parallel/nuvem/geolocation.py&r1=1126266&r2=1126267&rev=1126267&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-parallel/nuvem/geolocation.py (original)
+++ incubator/nuvem/trunk/nuvem-parallel/nuvem/gaddress.py Sun May 22 22:47:19 2011
@@ -15,9 +15,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-def get(r, content):
-    if r[0:1] == ('setup',):
-        return 'setupLocationHandler();'
-
-    return content.get(r)
+def get(r, a, s):
+    return s.get((("'address", str(a.get(r))), ("'sensor", 'true')))
 

Copied: incubator/nuvem/trunk/nuvem-parallel/nuvem/ggeopos.py (from r1126266, incubator/nuvem/trunk/nuvem-parallel/nuvem/geolocation.py)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-parallel/nuvem/ggeopos.py?p2=incubator/nuvem/trunk/nuvem-parallel/nuvem/ggeopos.py&p1=incubator/nuvem/trunk/nuvem-parallel/nuvem/geolocation.py&r1=1126266&r2=1126267&rev=1126267&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-parallel/nuvem/geolocation.py (original)
+++ incubator/nuvem/trunk/nuvem-parallel/nuvem/ggeopos.py Sun May 22 22:47:19 2011
@@ -15,9 +15,6 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-def get(r, content):
-    if r[0:1] == ('setup',):
-        return 'setupLocationHandler();'
-
-    return content.get(r)
+def get(r, lat, lng, s):
+    return s.get((("'latlng", str(lat.get(r)) + ',' + str(lng.get(r))), ("'sensor", 'true')))
 

Modified: incubator/nuvem/trunk/nuvem-parallel/nuvem/gmap.py
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-parallel/nuvem/gmap.py?rev=1126267&r1=1126266&r2=1126267&view=diff
==============================================================================
--- incubator/nuvem/trunk/nuvem-parallel/nuvem/gmap.py (original)
+++ incubator/nuvem/trunk/nuvem-parallel/nuvem/gmap.py Sun May 22 22:47:19 2011
@@ -32,5 +32,5 @@ def get(r, markers, s):
         return ("'markers", 'color:{0}|label:{1}|{2}'.format(color, label, loc))
     
     mv = markers.get(r)
-    return s.get((("'size", '320x320'), ("'maptype", 'roadmap'), ("'sensor", 'false')) + tuple(map(marker, filter(ismarker, () if mv is None else mv))))
+    return s.get((("'size", '320x320'), ("'maptype", 'roadmap'), ("'sensor", 'true')) + tuple(map(marker, filter(ismarker, () if mv is None else mv))))
 

Copied: incubator/nuvem/trunk/nuvem-parallel/nuvem/location.py (from r1126266, incubator/nuvem/trunk/nuvem-parallel/nuvem/geolocation.py)
URL: http://svn.apache.org/viewvc/incubator/nuvem/trunk/nuvem-parallel/nuvem/location.py?p2=incubator/nuvem/trunk/nuvem-parallel/nuvem/location.py&p1=incubator/nuvem/trunk/nuvem-parallel/nuvem/geolocation.py&r1=1126266&r2=1126267&rev=1126267&view=diff
==============================================================================
    (empty)