commit python-geopy for openSUSE:Factory

20 Mar 2012

Hello community,

here is the log from the commit of package python-geopy for openSUSE:Factory checked in at 2012-03-20 11:33:04
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-geopy (Old)
 and      /work/SRC/openSUSE:Factory/.python-geopy.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "python-geopy", Maintainer is ""

Changes:
--------

--- /work/SRC/openSUSE:Factory/python-geopy/python-geopy.changes	2011-09-26 10:15:24.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.python-geopy.new/python-geopy.changes	2012-03-20 11:33:05.000000000 +0100
@@ -1,0 +2,9 @@
+Tue Mar 13 01:32:09 UTC 2012 - alexandre@exatati.com.br
+
+- Update to 0.94.2:
+  ADDED:   MANIFEST.in so that LICENSE file gets included in dist
+           packages (per req by Debian Python Module Team)
+  UPDATED: Yahoo geocoder uses new PlaceFinder API instead of
+           outdated MapsService V1 API.
+
+-------------------------------------------------------------------

Old:
----
  geopy-0.94.1.tar.bz2

New:
----
  geopy-0.94.2.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ python-geopy.spec ++++++
--- /var/tmp/diff_new_pack.xhttrw/_old	2012-03-20 11:33:08.000000000 +0100
+++ /var/tmp/diff_new_pack.xhttrw/_new	2012-03-20 11:33:08.000000000 +0100
@@ -1,7 +1,7 @@
 #
 # spec file for package python-geopy
 #
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,11 +15,13 @@
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:           python-geopy
-Version:        0.94.1
+Version:        0.94.2
 Release:        0
-Url:            http://www.geopy.org/
+Url:            http://code.google.com/p/geopy/
 Summary:        Python Geocoding Toolbox
 License:        MIT
 Group:          Development/Languages/Python
@@ -36,14 +38,13 @@
 BuildArch:      noarch
 %endif
 %endif
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 
 %description
-geopy makes it easy for developers to locate the coordinates of addresses, cities,
+Geopy makes it easy for developers to locate the coordinates of addresses, cities,
 countries, and landmarks across the globe using third-party geocoders and other data
 sources, such as wikis.
 
-geopy currently includes support for six geocoders: Google Maps, Yahoo! Maps, Windows
+Geopy currently includes support for six geocoders: Google Maps, Yahoo! Maps, Windows
 Local Live (Virtual Earth), geocoder.us, GeoNames, MediaWiki pages (with the GIS
 extension), and Semantic MediaWiki pages.
 
@@ -56,12 +57,8 @@
 %install
 python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
-# TODO: Disable only tests that need network access
-#%%check
-#python setup.py test
-
 %files
 %defattr(-,root,root,-)
-%python_sitelib/*
+%{python_sitelib}/*
 
 %changelog

++++++ geopy-0.94.1.tar.bz2 -> geopy-0.94.2.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/LICENSE new/geopy-0.94.2/LICENSE
--- old/geopy-0.94.1/LICENSE	1970-01-01 01:00:00.000000000 +0100
+++ new/geopy-0.94.2/LICENSE	2012-03-12 20:27:30.000000000 +0100
@@ -0,0 +1,21 @@
+Copyright (c) 2006-2010 Brian Beck
+Copyright (c) 2010-2012 GeoPy Project and individual contributors.
+All rights reserved.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of 
+this software and associated documentation files (the "Software"), to deal in 
+the Software without restriction, including without limitation the rights to 
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies 
+of the Software, and to permit persons to whom the Software is furnished to do 
+so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all 
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 
+SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/MANIFEST.in new/geopy-0.94.2/MANIFEST.in
--- old/geopy-0.94.1/MANIFEST.in	1970-01-01 01:00:00.000000000 +0100
+++ new/geopy-0.94.2/MANIFEST.in	2012-03-12 20:25:40.000000000 +0100
@@ -0,0 +1,3 @@
+include LICENSE
+include MANIFEST.in
+include RELEASES
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/PKG-INFO new/geopy-0.94.2/PKG-INFO
--- old/geopy-0.94.1/PKG-INFO	2011-03-24 23:28:45.000000000 +0100
+++ new/geopy-0.94.2/PKG-INFO	2012-03-12 20:42:29.000000000 +0100
@@ -1,10 +1,10 @@
 Metadata-Version: 1.0
 Name: geopy
-Version: 0.94.1
+Version: 0.94.2
 Summary: Python Geocoding Toolbox
 Home-page: http://www.geopy.org/
-Author: Brian Beck
-Author-email: exogen@gmail.com
+Author: Mike Tigas
+Author-email: mike.tigas@gmail.com
 License: MIT
 Download-URL: http://code.google.com/p/geopy/downloads/list
 Description: UNKNOWN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/RELEASES new/geopy-0.94.2/RELEASES
--- old/geopy-0.94.1/RELEASES	1970-01-01 01:00:00.000000000 +0100
+++ new/geopy-0.94.2/RELEASES	2012-03-12 20:37:38.000000000 +0100
@@ -0,0 +1,67 @@
+0.94.2 - March 12, 2012
+==========
+ADDED:   MANIFEST.in so that LICENSE file gets included in dist packages
+         (per req by Debian Python Module Team)
+
+UPDATED: Yahoo geocoder uses new PlaceFinder API instead of outdated MapsService
+         V1 API.
+
+0.94.1 - March 24, 2011
+==========
+ADDED:   Test suite includes geocoding tests for the Google, Bing, Yahoo,
+         GeocoderDotUS, and GeoNames geocoders.
+
+CHANGED: `output_format` is deprecated in backends that used it.
+
+FIXED:   Bing geocoder now works properly. Updated to use the JSON return
+         method rather than XML. `output_format` has always been ignored
+         and is now deprecated.
+
+FIXED:   GeocoderDotUS now works properly. Updated to use more compact CSV
+         return method rather than XMLRPC.
+
+CHANGED: Yahoo geocoder now uses the "old" tuple return format
+         (address, (lat, lon)) rather than the undocumented Location()
+         object, for API consistency. (Object return values with rich
+         data will be implemented in a future release.)
+
+FIXED:   Issue 40. Fixed "print" statement in Bing backend. No more
+         print statements remain.
+
+FIXED:   Issue 39. In addition to checking for system `json` and `simplejson`,
+         geopy now looks for a system-installed `django` (which bundles a
+         copy of simplejson).
+
+FIXED:   Issue 45. Implement __cmp__ on Distance so that distance objects may
+         be compared against one another.
+
+CHANGED: Added __repr__ and __str__ to Distance
+
+ADDED:   Issue 46. Geocoder backend for MapQuest's OpenMapQuest API, contributed
+         by Shashwat Anand.
+
+0.94 - March 7, 2010
+====================
+ADDED: Partial test suite can now be run via "setup.py test"
+
+FIXED: Issue 5. Converted "print" statements to logger calls to
+       allow compatibility with WSGI.
+
+FIXED: Issue 16. Google geocoder backend now throws more descriptive
+       exceptions on certain failure statuses.
+
+FIXED: Issue 18. Add simplejson to install_requires for setup. Use
+       native (Python 2.6+/3.0+) json module if available.
+
+FIXED: Issue 21 and Issue 25. Distance calculations for values beyond
+       180/-180 and 90/-90 now wrap instead of raising an error.
+
+FIXED: Issue 22. Fixed string representation of Point objects so
+       that they don't throw an exception.
+
+FIXED: Issue 23. Fixed GreatCircleDistance ValueErrors due to floating
+       point precision on extremely close points.
+
+Changes between 0.93 (October 8, 2006) and February 15, 2009
+============================================================
+See https://github.com/mtigas/geopy/compare/0451a051...ffebd5f3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/__init__.py new/geopy-0.94.2/geopy/__init__.py
--- old/geopy-0.94.1/geopy/__init__.py	2011-03-24 23:27:43.000000000 +0100
+++ new/geopy-0.94.2/geopy/__init__.py	2012-03-12 20:38:14.000000000 +0100
@@ -2,12 +2,12 @@
 from geopy.location import Location
 from geopy import geocoders
 
-VERSION = (0, 94, 1)
+VERSION = (0, 94, 2)
 
 def get_version():
     version = '%s.%s' % (VERSION[0], VERSION[1])
     if VERSION[2]:
         version = '%s.%s' % (version, VERSION[2])
     if VERSION[3:]:
-        version = '%s-%s' % (version, VERSION[3])
+        version = '%s.%s' % (version, VERSION[3])
     return version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/geocoders/bing.py new/geopy-0.94.2/geopy/geocoders/bing.py
--- old/geopy-0.94.1/geopy/geocoders/bing.py	2011-03-24 23:11:27.000000000 +0100
+++ new/geopy-0.94.2/geopy/geocoders/bing.py	2012-03-12 20:24:49.000000000 +0100
@@ -71,7 +71,7 @@
             country = a.get('countryRegion', '').strip(stripchars)
             
             city_state = join_filter(", ", [city, state])
-            place = join_filter(" ", [city_state, zip])
+            place = join_filter(" ", [city_state, zipcode])
             location = join_filter(", ", [address, place, country])
             
             latitude = resource['point']['coordinates'][0] or None
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/geocoders/google.py new/geopy-0.94.2/geopy/geocoders/google.py
--- old/geopy-0.94.1/geopy/geocoders/google.py	2011-03-24 23:11:27.000000000 +0100
+++ new/geopy-0.94.2/geopy/geocoders/google.py	2012-03-12 20:24:49.000000000 +0100
@@ -139,8 +139,7 @@
             status_code = status["code"]
             self.check_status_code(status_code)
             return None
-
-        if exactly_one and len(places) != 1:
+        elif exactly_one and len(places) != 1:
             raise ValueError("Didn't find exactly one placemark! " \
                              "(Found %d.)" % len(places))
 
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/geocoders/yahoo.py new/geopy-0.94.2/geopy/geocoders/yahoo.py
--- old/geopy-0.94.1/geopy/geocoders/yahoo.py	2011-03-24 23:11:28.000000000 +0100
+++ new/geopy-0.94.2/geopy/geocoders/yahoo.py	2012-03-12 20:24:49.000000000 +0100
@@ -1,69 +1,84 @@
+"""
+Wrapper to the Yahoo's new PlaceFinder API. (doc says that the API RELEASE 1.0 (22 JUNE 2010))
+"""
 import xml.dom.minidom
 from geopy import util
+from geopy import Point
 from urllib import urlencode
 from urllib2 import urlopen
 from geopy.geocoders.base import Geocoder
+try:
+    import json
+except ImportError:
+    try:
+        import simplejson as json
+    except ImportError:
+        from django.utils import simplejson as json
 
 
 class Yahoo(Geocoder):
 
-    BASE_URL = "http://api.local.yahoo.com/MapsService/V1/geocode?%s"
+    BASE_URL = "http://where.yahooapis.com/geocode?%s"
 
-    def __init__(self, app_id, format_string='%s', output_format='xml'):
+    def __init__(self, app_id, format_string='%s', output_format=None):
         self.app_id = app_id
         self.format_string = format_string
-        self.output_format = output_format.lower()
+        
+        if output_format != None:
+            from warnings import warn
+            warn('geopy.geocoders.yahoo.Yahoo: The `output_format` parameter is deprecated '+
+                 'and now ignored. JSON will be used internally.', DeprecationWarning)
 
     def geocode(self, string, exactly_one=True):
         params = {'location': self.format_string % string,
-                  'output': self.output_format,
-                  'appid': self.app_id
+                  'appid': self.app_id,
+                  'flags': 'J'
                  }
         url = self.BASE_URL % urlencode(params)
+        util.logger.debug("Fetching %s..." % url)
         return self.geocode_url(url, exactly_one)
 
     def geocode_url(self, url, exactly_one=True):
-        util.logger.debug("Fetching %s..." % url)
         page = urlopen(url)
-
-        return self.parse_xml(page, exactly_one)
-
-    def parse_xml(self, page, exactly_one=True):
+        return self.parse_json(page, exactly_one)
+    
+    def parse_json(self, page, exactly_one=True):
         if not isinstance(page, basestring):
             page = util.decode_page(page)
+        doc = json.loads(page)
+        results = doc.get('ResultSet', []).get('Results', [])
 
-        doc = xml.dom.minidom.parseString(page)
-        results = doc.getElementsByTagName('Result')
-
-        def parse_result(result):
-            strip = ", \n"
-            address = util.get_first_text(result, 'Address', strip)
-            city = util.get_first_text(result, 'City', strip)
-            state = util.get_first_text(result, 'State', strip)
-            zip = util.get_first_text(result, 'Zip', strip)
-            country = util.get_first_text(result, 'Country', strip)
-            city_state = util.join_filter(", ", [city, state])
-            place = util.join_filter(" ", [city_state, zip])
-            location = util.join_filter(", ", [address, place, country])
-            latitude = float(util.get_first_text(result, 'Latitude')) or None
-            longitude = float(util.get_first_text(result, 'Longitude')) or None
-            
-            # TODO use Point/Location object API in 0.95
-            #if latitude and longitude:
-            #    point = Point(latitude, longitude)
+        if not results:
+            raise ValueError("No results found")
+        elif exactly_one and len(results) != 1:
+            raise ValueError("Didn't find exactly one placemark! " \
+                             "(Found %d.)" % len(results))
+
+        def parse_result(place):
+            line1, line2, line3, line4 = place.get('line1'), place.get('line2'), place.get('line3'), place.get('line4')
+            address = util.join_filter(", ", [line1, line2, line3, line4])
+            city = place.get('city')
+            state = place.get('state')
+            country = place.get('country')
+            location = util.join_filter(", ", [address, city, country])
+            lat, lng = place.get('latitude'), place.get('longitude')
+            #if lat and lng:
+            #    point = Point(floatlat, lng)
             #else:
-            #    point = Non
-            #return Location(location, point, {
-            #    'Address': address,
-            #    'City': city,
-            #    'State': state,
-            #    'Zip': zip,
-            #    'Country': country
-            #})
-            
-            return address, (latitude, longitude)
-
+            #    point = None
+            return (location, (float(lat), float(lng)))
+    
         if exactly_one:
             return parse_result(results[0])
         else:
             return [parse_result(result) for result in results]
+
+    def reverse(self, coord, exactly_one=True):
+        (lat, lng) = coord
+        params = {'location': '%s,%s' % (lat, lng),
+                  'gflags' : 'R',
+                  'appid': self.app_id,
+                  'flags': 'J'
+                 }
+        url = self.BASE_URL % urlencode(params)
+        return self.geocode_url(url, exactly_one)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/tests/fells_loop.gpx new/geopy-0.94.2/geopy/tests/fells_loop.gpx
--- old/geopy-0.94.1/geopy/tests/fells_loop.gpx	1970-01-01 01:00:00.000000000 +0100
+++ new/geopy-0.94.2/geopy/tests/fells_loop.gpx	2010-12-28 03:35:17.000000000 +0100
@@ -0,0 +1,1110 @@
+<?xml version="1.0"?>
+<!-- From http://www.topografix.com/fells_loop.gpx, tweaked slightly for compatibility with version 1.1 and for brevity -->
+http://www.topografix.com"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://www.topografix.com/GPX/1/1"
+ xsi:schemaLocation="http://www.topografix.com/GPX/1/1 http://www.topografix.com/GPX/1/1/gpx.xsd">
+<metadata>
+<time>2002-02-27T17:18:33Z</time>
+<bounds minlat="42.401051" minlon="-71.126602" maxlat="42.468655" maxlon="-71.102973"/>
+</metadata>
+<wpt lat="42.438878" lon="-71.119277">
+ <ele>44.586548</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>5066</name>
+ <desc><![CDATA[5066]]></desc>
+ <sym>Crossing</sym>
+ <type><![CDATA[Crossing]]></type>
+</wpt>
+<wpt lat="42.439227" lon="-71.119689">
+ <ele>57.607200</ele>
+ <time>2001-06-02T03:26:55Z</time>
+ <name>5067</name>
+ <desc><![CDATA[5067]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.438917" lon="-71.116146">
+ <ele>44.826904</ele>
+ <time>2001-11-16T23:03:38Z</time>
+ <name>5096</name>
+ <desc><![CDATA[5096]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.443904" lon="-71.122044">
+ <ele>50.594727</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>5142</name>
+ <desc><![CDATA[5142]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.447298" lon="-71.121447">
+ <ele>127.711200</ele>
+ <time>2001-06-02T03:26:58Z</time>
+ <name>5156</name>
+ <desc><![CDATA[5156]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.454873" lon="-71.125094">
+ <ele>96.926400</ele>
+ <time>2001-06-02T03:26:59Z</time>
+ <name>5224</name>
+ <desc><![CDATA[5224]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.459079" lon="-71.124988">
+ <ele>82.600800</ele>
+ <time>2001-06-02T03:26:59Z</time>
+ <name>5229</name>
+ <desc><![CDATA[5229]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.456979" lon="-71.124474">
+ <ele>82.905600</ele>
+ <time>2001-06-02T03:26:59Z</time>
+ <name>5237</name>
+ <desc><![CDATA[5237]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.454401" lon="-71.120990">
+ <ele>66.696655</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>5254</name>
+ <desc><![CDATA[5254]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.451442" lon="-71.121746">
+ <ele>74.627442</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>5258</name>
+ <desc><![CDATA[5258]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.454404" lon="-71.120660">
+ <ele>65.254761</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>5264</name>
+ <desc><![CDATA[5264]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.457761" lon="-71.121045">
+ <ele>77.419200</ele>
+ <time>2001-06-02T03:27:00Z</time>
+ <name>526708</name>
+ <desc><![CDATA[526708]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.457089" lon="-71.120313">
+ <ele>74.676000</ele>
+ <time>2001-06-02T03:27:00Z</time>
+ <name>526750</name>
+ <desc><![CDATA[526750]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.456592" lon="-71.119676">
+ <ele>78.713135</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>527614</name>
+ <desc><![CDATA[527614]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.456252" lon="-71.119356">
+ <ele>78.713135</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>527631</name>
+ <desc><![CDATA[527631]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.458148" lon="-71.119135">
+ <ele>68.275200</ele>
+ <time>2001-06-02T03:27:00Z</time>
+ <name>5278</name>
+ <desc><![CDATA[5278]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.459377" lon="-71.117693">
+ <ele>64.008000</ele>
+ <time>2001-06-02T03:27:01Z</time>
+ <name>5289</name>
+ <desc><![CDATA[5289]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.464183" lon="-71.119828">
+ <ele>52.997925</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>5374FIRE</name>
+ <desc><![CDATA[5374FIRE]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.465650" lon="-71.119399">
+ <ele>56.388000</ele>
+ <time>2001-06-02T03:27:02Z</time>
+ <name>5376</name>
+ <desc><![CDATA[5376]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.439018" lon="-71.114456">
+ <ele>56.388000</ele>
+ <time>2001-06-02T03:26:55Z</time>
+ <name>6006</name>
+ <desc><![CDATA[600698]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.438594" lon="-71.114803">
+ <ele>46.028564</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>6006BLUE</name>
+ <desc><![CDATA[6006BLUE]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.436757" lon="-71.113223">
+ <ele>37.616943</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>6014MEADOW</name>
+ <desc><![CDATA[6014MEADOW]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.441754" lon="-71.113220">
+ <ele>56.388000</ele>
+ <time>2001-06-02T03:26:55Z</time>
+ <name>6029</name>
+ <desc><![CDATA[6029]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.436243" lon="-71.109075">
+ <ele>50.292000</ele>
+ <time>2001-06-02T03:27:05Z</time>
+ <name>6053</name>
+ <desc><![CDATA[6053]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.439250" lon="-71.107500">
+ <ele>25.603200</ele>
+ <time>2001-06-02T03:26:57Z</time>
+ <name>6066</name>
+ <desc><![CDATA[6066]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.439764" lon="-71.107582">
+ <ele>34.442400</ele>
+ <time>2001-06-02T03:26:57Z</time>
+ <name>6067</name>
+ <desc><![CDATA[6067]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.434766" lon="-71.105874">
+ <ele>30.480000</ele>
+ <time>2001-06-02T03:26:57Z</time>
+ <name>6071</name>
+ <desc><![CDATA[6071]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.433304" lon="-71.106599">
+ <ele>15.240000</ele>
+ <time>2001-06-02T03:26:56Z</time>
+ <name>6073</name>
+ <desc><![CDATA[6073]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.437338" lon="-71.104772">
+ <ele>37.795200</ele>
+ <time>2001-06-02T03:26:57Z</time>
+ <name>6084</name>
+ <desc><![CDATA[6084]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.442196" lon="-71.110975">
+ <ele>64.008000</ele>
+ <time>2001-06-02T03:26:55Z</time>
+ <name>6130</name>
+ <desc><![CDATA[6130]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.442981" lon="-71.111441">
+ <ele>64.008000</ele>
+ <time>2001-06-02T03:26:58Z</time>
+ <name>6131</name>
+ <desc><![CDATA[6131]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.444773" lon="-71.108882">
+ <ele>62.788800</ele>
+ <time>2001-06-02T03:27:05Z</time>
+ <name>6153</name>
+ <desc><![CDATA[6153]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.443592" lon="-71.106301">
+ <ele>55.473600</ele>
+ <time>2001-06-02T03:27:05Z</time>
+ <name>6171</name>
+ <desc><![CDATA[6171]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.447804" lon="-71.106624">
+ <ele>62.484000</ele>
+ <time>2001-06-02T03:27:04Z</time>
+ <name>6176</name>
+ <desc><![CDATA[6176]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.448448" lon="-71.106158">
+ <ele>62.179200</ele>
+ <time>2001-06-02T03:27:04Z</time>
+ <name>6177</name>
+ <desc><![CDATA[6177]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.453415" lon="-71.106783">
+ <ele>69.799200</ele>
+ <time>2001-06-02T03:26:55Z</time>
+ <name>6272</name>
+ <desc><![CDATA[6272]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.453434" lon="-71.107253">
+ <ele>73.152000</ele>
+ <time>2001-06-02T03:26:56Z</time>
+ <name>6272</name>
+ <desc><![CDATA[6272]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.458298" lon="-71.106771">
+ <ele>70.104000</ele>
+ <time>2001-06-02T03:27:04Z</time>
+ <name>6278</name>
+ <desc><![CDATA[6278]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.451430" lon="-71.105413">
+ <ele>57.564209</ele>
+ <time>2001-11-16T23:03:38Z</time>
+ <name>6280</name>
+ <desc><![CDATA[6280]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.453845" lon="-71.105206">
+ <ele>66.696655</ele>
+ <time>2001-11-16T23:03:38Z</time>
+ <name>6283</name>
+ <desc><![CDATA[6283]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.459986" lon="-71.106170">
+ <ele>72.945191</ele>
+ <time>2001-11-16T23:03:38Z</time>
+ <name>6289</name>
+ <desc><![CDATA[6289]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.457616" lon="-71.105116">
+ <ele>72.847200</ele>
+ <time>2001-06-02T03:27:04Z</time>
+ <name>6297</name>
+ <desc><![CDATA[6297]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.467110" lon="-71.113574">
+ <ele>53.644800</ele>
+ <time>2001-06-02T03:27:02Z</time>
+ <name>6328</name>
+ <desc><![CDATA[6328]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.464202" lon="-71.109863">
+ <ele>43.891200</ele>
+ <time>2001-06-02T03:27:03Z</time>
+ <name>6354</name>
+ <desc><![CDATA[6354]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.466459" lon="-71.110067">
+ <ele>48.768000</ele>
+ <time>2001-06-02T03:27:02Z</time>
+ <name>635722</name>
+ <desc><![CDATA[635722]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.466557" lon="-71.109410">
+ <ele>49.072800</ele>
+ <time>2001-06-02T03:27:02Z</time>
+ <name>635783</name>
+ <desc><![CDATA[635783]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.463495" lon="-71.107117">
+ <ele>62.484000</ele>
+ <time>2001-06-02T03:27:03Z</time>
+ <name>6373</name>
+ <desc><![CDATA[6373]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.401051" lon="-71.110241">
+ <ele>3.962400</ele>
+ <time>2001-06-02T03:26:56Z</time>
+ <name>6634</name>
+ <desc><![CDATA[6634]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.432621" lon="-71.106532">
+ <ele>13.411200</ele>
+ <time>2001-06-02T03:26:56Z</time>
+ <name>6979</name>
+ <desc><![CDATA[6979]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.431033" lon="-71.107883">
+ <ele>34.012085</ele>
+ <time>2001-11-16T23:03:38Z</time>
+ <name>6997</name>
+ <desc><![CDATA[6997]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</wpt>
+<wpt lat="42.465687" lon="-71.107360">
+ <ele>87.782400</ele>
+ <time>2001-06-02T03:27:03Z</time>
+ <name>BEAR HILL</name>
+ <cmt>BEAR HILL TOWER</cmt>
+ <desc><![CDATA[Bear Hill Tower]]></desc>
+ <sym>Tall Tower</sym>
+ <type><![CDATA[Tower]]></type>
+</wpt>
+<wpt lat="42.430950" lon="-71.107628">
+ <ele>23.469600</ele>
+ <time>2001-06-02T00:18:15Z</time>
+ <name>BELLEVUE</name>
+ <cmt>BELLEVUE</cmt>
+ <desc><![CDATA[Bellevue Parking Lot]]></desc>
+ <sym>Parking Area</sym>
+ <type><![CDATA[Parking]]></type>
+</wpt>
+<wpt lat="42.438666" lon="-71.114079">
+ <ele>43.384766</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>6016</name>
+ <desc><![CDATA[Bike Loop Connector]]></desc>
+ <sym>Trailhead</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.456469" lon="-71.124651">
+ <ele>89.916000</ele>
+ <time>2001-06-02T03:26:59Z</time>
+ <name>5236BRIDGE</name>
+ <desc><![CDATA[Bridge]]></desc>
+ <sym>Bridge</sym>
+ <type><![CDATA[Bridge]]></type>
+</wpt>
+<wpt lat="42.465759" lon="-71.119815">
+ <ele>55.473600</ele>
+ <time>2001-06-02T03:27:01Z</time>
+ <name>5376BRIDGE</name>
+ <desc><![CDATA[Bridge]]></desc>
+ <sym>Bridge</sym>
+ <type><![CDATA[Bridge]]></type>
+</wpt>
+<wpt lat="42.442993" lon="-71.105878">
+ <ele>52.730400</ele>
+ <time>2001-06-02T03:27:05Z</time>
+ <name>6181CROSS</name>
+ <desc><![CDATA[Crossing]]></desc>
+ <sym>Crossing</sym>
+ <type><![CDATA[Crossing]]></type>
+</wpt>
+<wpt lat="42.435472" lon="-71.109664">
+ <ele>45.110400</ele>
+ <time>2001-06-02T03:27:05Z</time>
+ <name>6042CROSS</name>
+ <desc><![CDATA[Crossing]]></desc>
+ <sym>Crossing</sym>
+ <type><![CDATA[Crossing]]></type>
+</wpt>
+<wpt lat="42.458516" lon="-71.103646">
+ <name>DARKHOLLPO</name>
+ <desc><![CDATA[Dark Hollow Pond]]></desc>
+ <sym>Fishing Area</sym>
+</wpt>
+<wpt lat="42.443109" lon="-71.112675">
+ <ele>56.083200</ele>
+ <time>2001-06-02T03:26:57Z</time>
+ <name>6121DEAD</name>
+ <desc><![CDATA[Dead End]]></desc>
+ <sym>Danger Area</sym>
+ <type><![CDATA[Dead End]]></type>
+</wpt>
+<wpt lat="42.449866" lon="-71.119298">
+ <ele>117.043200</ele>
+ <time>2001-06-02T03:26:59Z</time>
+ <name>5179DEAD</name>
+ <desc><![CDATA[Dead End]]></desc>
+ <sym>Danger Area</sym>
+ <type><![CDATA[Dead End]]></type>
+</wpt>
+<wpt lat="42.459629" lon="-71.116524">
+ <ele>69.494400</ele>
+ <time>2001-06-02T03:27:01Z</time>
+ <name>5299DEAD</name>
+ <desc><![CDATA[Dead End]]></desc>
+ <sym>Danger Area</sym>
+ <type><![CDATA[Dead End]]></type>
+</wpt>
+<wpt lat="42.465485" lon="-71.119148">
+ <ele>56.997600</ele>
+ <time>2001-06-02T03:27:02Z</time>
+ <name>5376DEAD</name>
+ <desc><![CDATA[Dead End]]></desc>
+ <sym>Danger Area</sym>
+ <type><![CDATA[Dead End]]></type>
+</wpt>
+<wpt lat="42.462776" lon="-71.109986">
+ <ele>46.939200</ele>
+ <time>2001-06-02T03:27:03Z</time>
+ <name>6353DEAD</name>
+ <desc><![CDATA[Dead End]]></desc>
+ <sym>Danger Area</sym>
+ <type><![CDATA[Dead End]]></type>
+</wpt>
+<wpt lat="42.446793" lon="-71.108784">
+ <ele>61.264800</ele>
+ <time>2001-06-02T03:27:04Z</time>
+ <name>6155DEAD</name>
+ <desc><![CDATA[Dead End]]></desc>
+ <sym>Danger Area</sym>
+ <type><![CDATA[Dead End]]></type>
+</wpt>
+<wpt lat="42.451204" lon="-71.126602">
+ <ele>110.947200</ele>
+ <time>2001-06-02T03:26:59Z</time>
+ <name>GATE14</name>
+ <desc><![CDATA[Gate 14]]></desc>
+ <sym>Truck Stop</sym>
+ <type><![CDATA[Road]]></type>
+</wpt>
+<wpt lat="42.458499" lon="-71.122078">
+ <ele>77.724000</ele>
+ <time>2001-06-02T03:27:00Z</time>
+ <name>GATE16</name>
+ <desc><![CDATA[Gate 16]]></desc>
+ <sym>Truck Stop</sym>
+ <type><![CDATA[Road]]></type>
+</wpt>
+<wpt lat="42.459376" lon="-71.119238">
+ <ele>65.836800</ele>
+ <time>2001-06-02T03:27:01Z</time>
+ <name>GATE17</name>
+ <desc><![CDATA[Gate 17]]></desc>
+ <sym>Truck Stop</sym>
+ <type><![CDATA[Road]]></type>
+</wpt>
+<wpt lat="42.466353" lon="-71.119240">
+ <ele>57.302400</ele>
+ <time>2001-06-02T03:27:02Z</time>
+ <name>GATE19</name>
+ <desc><![CDATA[Gate 19]]></desc>
+ <sym>Truck Stop</sym>
+ <type><![CDATA[Road]]></type>
+</wpt>
+<wpt lat="42.468655" lon="-71.107697">
+ <ele>49.377600</ele>
+ <time>2001-06-02T03:27:03Z</time>
+ <name>GATE21</name>
+ <desc><![CDATA[Gate 21]]></desc>
+ <sym>Truck Stop</sym>
+ <type><![CDATA[Road]]></type>
+</wpt>
+<wpt lat="42.456718" lon="-71.102973">
+ <ele>81.076800</ele>
+ <time>2001-06-02T03:27:03Z</time>
+ <name>GATE24</name>
+ <desc><![CDATA[Gate 24]]></desc>
+ <sym>Truck Stop</sym>
+ <type><![CDATA[Road]]></type>
+</wpt>
+<wpt lat="42.430847" lon="-71.107690">
+ <ele>21.515015</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>GATE5</name>
+ <desc><![CDATA[Gate 5]]></desc>
+ <sym>Truck Stop</sym>
+ <type><![CDATA[Truck Stop]]></type>
+</wpt>
+<wpt lat="42.431240" lon="-71.109236">
+ <ele>26.561890</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>GATE6</name>
+ <desc><![CDATA[Gate 6]]></desc>
+ <sym>Trailhead</sym>
+ <type><![CDATA[Trail Head]]></type>
+</wpt>
+<wpt lat="42.439502" lon="-71.106556">
+ <ele>32.004000</ele>
+ <time>2001-06-02T00:18:16Z</time>
+ <name>6077LOGS</name>
+ <desc><![CDATA[Log Crossing]]></desc>
+ <sym>Amusement Park</sym>
+ <type><![CDATA[Obstacle]]></type>
+</wpt>
+<wpt lat="42.449765" lon="-71.122320">
+ <ele>119.809082</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>5148NANEPA</name>
+ <desc><![CDATA[Nanepashemet Road Crossing]]></desc>
+ <sym>Trailhead</sym>
+ <type><![CDATA[Trail Head]]></type>
+</wpt>
+<wpt lat="42.457388" lon="-71.119845">
+ <ele>73.761600</ele>
+ <time>2001-06-02T03:27:00Z</time>
+ <name>5267OBSTAC</name>
+ <desc><![CDATA[Obstacle]]></desc>
+ <sym>Amusement Park</sym>
+ <type><![CDATA[Obstacle]]></type>
+</wpt>
+<wpt lat="42.434980" lon="-71.109942">
+ <ele>45.307495</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>PANTHRCAVE</name>
+ <desc><![CDATA[Panther Cave]]></desc>
+ <sym>Tunnel</sym>
+ <type><![CDATA[Tunnel]]></type>
+</wpt>
+<wpt lat="42.453256" lon="-71.121211">
+ <ele>77.992066</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>5252PURPLE</name>
+ <desc><![CDATA[Purple Rock Hill]]></desc>
+ <sym>Summit</sym>
+ <type><![CDATA[Summit]]></type>
+</wpt>
+<wpt lat="42.457734" lon="-71.117481">
+ <ele>67.970400</ele>
+ <time>2001-06-02T03:27:01Z</time>
+ <name>5287WATER</name>
+ <desc><![CDATA[Reservoir]]></desc>
+ <sym>Swimming Area</sym>
+ <type><![CDATA[Reservoir]]></type>
+</wpt>
+<wpt lat="42.459278" lon="-71.124574">
+ <ele>81.076800</ele>
+ <time>2001-06-02T03:27:00Z</time>
+ <name>5239ROAD</name>
+ <desc><![CDATA[Road]]></desc>
+ <sym>Truck Stop</sym>
+ <type><![CDATA[Road]]></type>
+</wpt>
+<wpt lat="42.458782" lon="-71.118991">
+ <ele>67.360800</ele>
+ <time>2001-06-02T03:27:01Z</time>
+ <name>5278ROAD</name>
+ <desc><![CDATA[Road]]></desc>
+ <sym>Truck Stop</sym>
+ <type><![CDATA[Road]]></type>
+</wpt>
+<wpt lat="42.439993" lon="-71.120925">
+ <ele>53.949600</ele>
+ <time>2001-06-02T00:18:14Z</time>
+ <name>5058ROAD</name>
+ <cmt>ROAD CROSSING</cmt>
+ <desc><![CDATA[Road Crossing]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Road Crossing]]></type>
+</wpt>
+<wpt lat="42.453415" lon="-71.106782">
+ <ele>69.799200</ele>
+ <time>2001-06-02T00:18:13Z</time>
+ <name>SHEEPFOLD</name>
+ <desc><![CDATA[Sheepfold Parking Lot]]></desc>
+ <sym>Parking Area</sym>
+ <type><![CDATA[Parking]]></type>
+</wpt>
+<wpt lat="42.455956" lon="-71.107483">
+ <ele>64.008000</ele>
+ <time>2001-06-02T03:27:04Z</time>
+ <name>SOAPBOX</name>
+ <desc><![CDATA[Soap Box Derby Track]]></desc>
+ <sym>Cemetery</sym>
+ <type><![CDATA[Intersection]]></type>
+</wpt>
+<wpt lat="42.465913" lon="-71.119328">
+ <ele>64.533692</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>5376STREAM</name>
+ <desc><![CDATA[Stream Crossing]]></desc>
+ <sym>Bridge</sym>
+ <type><![CDATA[Bridge]]></type>
+</wpt>
+<wpt lat="42.445359" lon="-71.122845">
+ <ele>61.649902</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>5144SUMMIT</name>
+ <desc><![CDATA[Summit]]></desc>
+ <sym>Summit</sym>
+ <type><![CDATA[Summit]]></type>
+</wpt>
+<wpt lat="42.441727" lon="-71.121676">
+ <ele>67.360800</ele>
+ <time>2001-06-02T00:18:16Z</time>
+ <name>5150TANK</name>
+ <cmt>WATER TANK</cmt>
+ <desc><![CDATA[Water Tank]]></desc>
+ <sym>Museum</sym>
+ <type><![CDATA[Water Tank]]></type>
+</wpt>
+<rte>
+ <name>BELLEVUE (first three waypoints)</name>
+ <desc><![CDATA[Bike Loop Bellevue]]></desc>
+ <number>1</number>
+<rtept lat="42.430950" lon="-71.107628">
+ <ele>23.469600</ele>
+ <time>2001-06-02T00:18:15Z</time>
+ <name>BELLEVUE</name>
+ <cmt>BELLEVUE</cmt>
+ <desc><![CDATA[Bellevue Parking Lot]]></desc>
+ <sym>Parking Area</sym>
+ <type><![CDATA[Parking]]></type>
+</rtept>
+<rtept lat="42.431240" lon="-71.109236">
+ <ele>26.561890</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>GATE6</name>
+ <desc><![CDATA[Gate 6]]></desc>
+ <sym>Trailhead</sym>
+ <type><![CDATA[Trail Head]]></type>
+</rtept>
+<rtept lat="42.434980" lon="-71.109942">
+ <ele>45.307495</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>PANTHRCAVE</name>
+ <desc><![CDATA[Panther Cave]]></desc>
+ <sym>Tunnel</sym>
+ <type><![CDATA[Tunnel]]></type>
+</rtept>
+</rte>
+<rte>
+ <name>BELLEVUE</name>
+ <desc><![CDATA[Bike Loop Bellevue]]></desc>
+ <number>1</number>
+<rtept lat="42.430950" lon="-71.107628">
+ <ele>23.469600</ele>
+ <time>2001-06-02T00:18:15Z</time>
+ <name>BELLEVUE</name>
+ <cmt>BELLEVUE</cmt>
+ <desc><![CDATA[Bellevue Parking Lot]]></desc>
+ <sym>Parking Area</sym>
+ <type><![CDATA[Parking]]></type>
+</rtept>
+<rtept lat="42.431240" lon="-71.109236">
+ <ele>26.561890</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>GATE6</name>
+ <desc><![CDATA[Gate 6]]></desc>
+ <sym>Trailhead</sym>
+ <type><![CDATA[Trail Head]]></type>
+</rtept>
+<rtept lat="42.434980" lon="-71.109942">
+ <ele>45.307495</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>PANTHRCAVE</name>
+ <desc><![CDATA[Panther Cave]]></desc>
+ <sym>Tunnel</sym>
+ <type><![CDATA[Tunnel]]></type>
+</rtept>
+<rtept lat="42.436757" lon="-71.113223">
+ <ele>37.616943</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>6014MEADOW</name>
+ <desc><![CDATA[6014MEADOW]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</rtept>
+<rtept lat="42.439018" lon="-71.114456">
+ <ele>56.388000</ele>
+ <time>2001-06-02T03:26:55Z</time>
+ <name>6006</name>
+ <desc><![CDATA[600698]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.438594" lon="-71.114803">
+ <ele>46.028564</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>6006BLUE</name>
+ <desc><![CDATA[6006BLUE]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</rtept>
+<rtept lat="42.438917" lon="-71.116146">
+ <ele>44.826904</ele>
+ <time>2001-11-16T23:03:38Z</time>
+ <name>5096</name>
+ <desc><![CDATA[5096]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</rtept>
+<rtept lat="42.438878" lon="-71.119277">
+ <ele>44.586548</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>5066</name>
+ <desc><![CDATA[5066]]></desc>
+ <sym>Crossing</sym>
+ <type><![CDATA[Crossing]]></type>
+</rtept>
+<rtept lat="42.439227" lon="-71.119689">
+ <ele>57.607200</ele>
+ <time>2001-06-02T03:26:55Z</time>
+ <name>5067</name>
+ <desc><![CDATA[5067]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.439993" lon="-71.120925">
+ <ele>53.949600</ele>
+ <time>2001-06-02T00:18:14Z</time>
+ <name>5058ROAD</name>
+ <cmt>ROAD CROSSING</cmt>
+ <desc><![CDATA[Road Crossing]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Road Crossing]]></type>
+</rtept>
+<rtept lat="42.441727" lon="-71.121676">
+ <ele>67.360800</ele>
+ <time>2001-06-02T00:18:16Z</time>
+ <name>5150TANK</name>
+ <cmt>WATER TANK</cmt>
+ <desc><![CDATA[Water Tank]]></desc>
+ <sym>Museum</sym>
+ <type><![CDATA[Water Tank]]></type>
+</rtept>
+<rtept lat="42.443904" lon="-71.122044">
+ <ele>50.594727</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>5142</name>
+ <desc><![CDATA[5142]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</rtept>
+<rtept lat="42.445359" lon="-71.122845">
+ <ele>61.649902</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>5144SUMMIT</name>
+ <desc><![CDATA[Summit]]></desc>
+ <sym>Summit</sym>
+ <type><![CDATA[Summit]]></type>
+</rtept>
+<rtept lat="42.447298" lon="-71.121447">
+ <ele>127.711200</ele>
+ <time>2001-06-02T03:26:58Z</time>
+ <name>5156</name>
+ <desc><![CDATA[5156]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.449765" lon="-71.122320">
+ <ele>119.809082</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>5148NANEPA</name>
+ <desc><![CDATA[Nanepashemet Road Crossing]]></desc>
+ <sym>Trailhead</sym>
+ <type><![CDATA[Trail Head]]></type>
+</rtept>
+<rtept lat="42.451442" lon="-71.121746">
+ <ele>74.627442</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>5258</name>
+ <desc><![CDATA[5258]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</rtept>
+<rtept lat="42.453256" lon="-71.121211">
+ <ele>77.992066</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>5252PURPLE</name>
+ <desc><![CDATA[Purple Rock Hill]]></desc>
+ <sym>Summit</sym>
+ <type><![CDATA[Summit]]></type>
+</rtept>
+<rtept lat="42.456252" lon="-71.119356">
+ <ele>78.713135</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>527631</name>
+ <desc><![CDATA[527631]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</rtept>
+<rtept lat="42.456592" lon="-71.119676">
+ <ele>78.713135</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>527614</name>
+ <desc><![CDATA[527614]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</rtept>
+<rtept lat="42.457388" lon="-71.119845">
+ <ele>73.761600</ele>
+ <time>2001-06-02T03:27:00Z</time>
+ <name>5267OBSTAC</name>
+ <desc><![CDATA[Obstacle]]></desc>
+ <sym>Amusement Park</sym>
+ <type><![CDATA[Obstacle]]></type>
+</rtept>
+<rtept lat="42.458148" lon="-71.119135">
+ <ele>68.275200</ele>
+ <time>2001-06-02T03:27:00Z</time>
+ <name>5278</name>
+ <desc><![CDATA[5278]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.459377" lon="-71.117693">
+ <ele>64.008000</ele>
+ <time>2001-06-02T03:27:01Z</time>
+ <name>5289</name>
+ <desc><![CDATA[5289]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.464183" lon="-71.119828">
+ <ele>52.997925</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>5374FIRE</name>
+ <desc><![CDATA[5374FIRE]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</rtept>
+<rtept lat="42.465650" lon="-71.119399">
+ <ele>56.388000</ele>
+ <time>2001-06-02T03:27:02Z</time>
+ <name>5376</name>
+ <desc><![CDATA[5376]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.465913" lon="-71.119328">
+ <ele>64.533692</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>5376STREAM</name>
+ <desc><![CDATA[Stream Crossing]]></desc>
+ <sym>Bridge</sym>
+ <type><![CDATA[Bridge]]></type>
+</rtept>
+<rtept lat="42.467110" lon="-71.113574">
+ <ele>53.644800</ele>
+ <time>2001-06-02T03:27:02Z</time>
+ <name>6328</name>
+ <desc><![CDATA[6328]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.466459" lon="-71.110067">
+ <ele>48.768000</ele>
+ <time>2001-06-02T03:27:02Z</time>
+ <name>635722</name>
+ <desc><![CDATA[635722]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.466557" lon="-71.109410">
+ <ele>49.072800</ele>
+ <time>2001-06-02T03:27:02Z</time>
+ <name>635783</name>
+ <desc><![CDATA[635783]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.463495" lon="-71.107117">
+ <ele>62.484000</ele>
+ <time>2001-06-02T03:27:03Z</time>
+ <name>6373</name>
+ <desc><![CDATA[6373]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.465687" lon="-71.107360">
+ <ele>87.782400</ele>
+ <time>2001-06-02T03:27:03Z</time>
+ <name>BEAR HILL</name>
+ <cmt>BEAR HILL TOWER</cmt>
+ <desc><![CDATA[Bear Hill Tower]]></desc>
+ <sym>Tall Tower</sym>
+ <type><![CDATA[Tower]]></type>
+</rtept>
+<rtept lat="42.459986" lon="-71.106170">
+ <ele>72.945191</ele>
+ <time>2001-11-16T23:03:38Z</time>
+ <name>6289</name>
+ <desc><![CDATA[6289]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</rtept>
+<rtept lat="42.457616" lon="-71.105116">
+ <ele>72.847200</ele>
+ <time>2001-06-02T03:27:04Z</time>
+ <name>6297</name>
+ <desc><![CDATA[6297]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.453845" lon="-71.105206">
+ <ele>66.696655</ele>
+ <time>2001-11-16T23:03:38Z</time>
+ <name>6283</name>
+ <desc><![CDATA[6283]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</rtept>
+<rtept lat="42.451430" lon="-71.105413">
+ <ele>57.564209</ele>
+ <time>2001-11-16T23:03:38Z</time>
+ <name>6280</name>
+ <desc><![CDATA[6280]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</rtept>
+<rtept lat="42.448448" lon="-71.106158">
+ <ele>62.179200</ele>
+ <time>2001-06-02T03:27:04Z</time>
+ <name>6177</name>
+ <desc><![CDATA[6177]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.447804" lon="-71.106624">
+ <ele>62.484000</ele>
+ <time>2001-06-02T03:27:04Z</time>
+ <name>6176</name>
+ <desc><![CDATA[6176]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.444773" lon="-71.108882">
+ <ele>62.788800</ele>
+ <time>2001-06-02T03:27:05Z</time>
+ <name>6153</name>
+ <desc><![CDATA[6153]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.443592" lon="-71.106301">
+ <ele>55.473600</ele>
+ <time>2001-06-02T03:27:05Z</time>
+ <name>6171</name>
+ <desc><![CDATA[6171]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.442981" lon="-71.111441">
+ <ele>64.008000</ele>
+ <time>2001-06-02T03:26:58Z</time>
+ <name>6131</name>
+ <desc><![CDATA[6131]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.442196" lon="-71.110975">
+ <ele>64.008000</ele>
+ <time>2001-06-02T03:26:55Z</time>
+ <name>6130</name>
+ <desc><![CDATA[6130]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.441754" lon="-71.113220">
+ <ele>56.388000</ele>
+ <time>2001-06-02T03:26:55Z</time>
+ <name>6029</name>
+ <desc><![CDATA[6029]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.439018" lon="-71.114456">
+ <ele>56.388000</ele>
+ <time>2001-06-02T03:26:55Z</time>
+ <name>6006</name>
+ <desc><![CDATA[600698]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Intersection]]></type>
+</rtept>
+<rtept lat="42.436757" lon="-71.113223">
+ <ele>37.616943</ele>
+ <time>2001-11-28T21:05:28Z</time>
+ <name>6014MEADOW</name>
+ <desc><![CDATA[6014MEADOW]]></desc>
+ <sym>Dot</sym>
+ <type><![CDATA[Dot]]></type>
+</rtept>
+<rtept lat="42.434980" lon="-71.109942">
+ <ele>45.307495</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>PANTHRCAVE</name>
+ <desc><![CDATA[Panther Cave]]></desc>
+ <sym>Tunnel</sym>
+ <type><![CDATA[Tunnel]]></type>
+</rtept>
+<rtept lat="42.431240" lon="-71.109236">
+ <ele>26.561890</ele>
+ <time>2001-11-07T23:53:41Z</time>
+ <name>GATE6</name>
+ <desc><![CDATA[Gate 6]]></desc>
+ <sym>Trailhead</sym>
+ <type><![CDATA[Trail Head]]></type>
+</rtept>
+<rtept lat="42.430950" lon="-71.107628">
+ <ele>23.469600</ele>
+ <time>2001-06-02T00:18:15Z</time>
+ <name>BELLEVUE</name>
+ <cmt>BELLEVUE</cmt>
+ <desc><![CDATA[Bellevue Parking Lot]]></desc>
+ <sym>Parking Area</sym>
+ <type><![CDATA[Parking]]></type>
+</rtept>
+</rte>
+</gpx>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/tests/run_tests.py new/geopy-0.94.2/geopy/tests/run_tests.py
--- old/geopy-0.94.1/geopy/tests/run_tests.py	2011-03-24 23:11:28.000000000 +0100
+++ new/geopy-0.94.2/geopy/tests/run_tests.py	2012-03-12 20:24:49.000000000 +0100
@@ -1,8 +1,8 @@
 #!/usr/bin/env python
 import unittest
 import sys
-from test_backends import get_suite as get_backend_suite
-from test_gpx import get_suite as get_gpx_suite
+from geopy.tests.test_backends import get_suite as get_backend_suite
+from geopy.tests.test_gpx import get_suite as get_gpx_suite
 
 def all_tests():
     # Test if BeautifulSoup is installed, since the microformat
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy/util.py new/geopy-0.94.2/geopy/util.py
--- old/geopy-0.94.1/geopy/util.py	2011-03-24 23:11:28.000000000 +0100
+++ new/geopy-0.94.2/geopy/util.py	2012-03-12 20:24:49.000000000 +0100
@@ -1,3 +1,4 @@
+from sys import version_info
 import re
 import logging
 import htmlentitydefs
@@ -26,11 +27,13 @@
     return sep.join([unicode(i) for i in seq if pred(i)])
  
 def get_encoding(page, contents=None):
-    plist = page.headers.getplist()
-    if plist:
-        key, value = plist[-1].split('=')
-        if key.lower() == 'charset':
-            return value
+    # TODO: clean up Py3k support
+    if version_info < (3, 0):
+        charset = page.headers.getparam("charset") or None
+    else:
+        charset = page.headers.get_param("charset") or None
+    if charset:
+        return charset
 
     if contents:
         try:
@@ -42,7 +45,11 @@
     contents = page.read()
     # HTTP 1.1 defines iso-8859-1 as the 'implied' encoding if none is given
     encoding = get_encoding(page, contents) or 'iso-8859-1'
-    return unicode(contents, encoding=encoding).encode('utf-8')
+    # TODO: clean up Py3k support
+    if version_info < (3, 0):
+        return unicode(contents, encoding=encoding).encode('utf-8')
+    else:
+        return str(contents, encoding=encoding)
 
 def get_first_text(node, tag_names, strip=None):
     if isinstance(tag_names, basestring):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy.egg-info/PKG-INFO new/geopy-0.94.2/geopy.egg-info/PKG-INFO
--- old/geopy-0.94.1/geopy.egg-info/PKG-INFO	2011-03-24 23:28:45.000000000 +0100
+++ new/geopy-0.94.2/geopy.egg-info/PKG-INFO	2012-03-12 20:42:29.000000000 +0100
@@ -1,10 +1,10 @@
 Metadata-Version: 1.0
 Name: geopy
-Version: 0.94.1
+Version: 0.94.2
 Summary: Python Geocoding Toolbox
 Home-page: http://www.geopy.org/
-Author: Brian Beck
-Author-email: exogen@gmail.com
+Author: Mike Tigas
+Author-email: mike.tigas@gmail.com
 License: MIT
 Download-URL: http://code.google.com/p/geopy/downloads/list
 Description: UNKNOWN
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/geopy.egg-info/SOURCES.txt new/geopy-0.94.2/geopy.egg-info/SOURCES.txt
--- old/geopy-0.94.1/geopy.egg-info/SOURCES.txt	2011-03-24 23:28:45.000000000 +0100
+++ new/geopy-0.94.2/geopy.egg-info/SOURCES.txt	2012-03-12 20:42:29.000000000 +0100
@@ -1,3 +1,6 @@
+LICENSE
+MANIFEST.in
+RELEASES
 setup.cfg
 setup.py
 geopy/__init__.py
@@ -30,6 +33,7 @@
 geopy/parsers/iso8601.py
 geopy/parsers/rdf.py
 geopy/tests/__init__.py
+geopy/tests/fells_loop.gpx
 geopy/tests/run_tests.py
 geopy/tests/test_backends.py
 geopy/tests/test_distance.py
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/geopy-0.94.1/setup.py new/geopy-0.94.2/setup.py
--- old/geopy-0.94.1/setup.py	2011-03-24 23:11:28.000000000 +0100
+++ new/geopy-0.94.2/setup.py	2012-03-12 20:42:15.000000000 +0100
@@ -22,8 +22,8 @@
 setup(name='geopy',
     version=version,
     description='Python Geocoding Toolbox',
-    author='Brian Beck',
-    author_email='exogen@gmail.com',
+    author='Mike Tigas', # update this as needed
+    author_email='mike.tigas@gmail.com', # update this as needed
     url='http://www.geopy.org/',
     download_url='http://code.google.com/p/geopy/downloads/list',
     packages=find_packages(),

-- 
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit python-geopy for openSUSE:Factory

root＠hilbert.suse.de