Changeset 647 for PCL/branches/PCL-newfeatureapi/PCL-GeoRSS

Timestamp:

03/24/07 22:13:41 (3 years ago)

Author:

seang

Message:

Changed GeoRSS typename to 'entries'

Location:

PCL/branches/PCL-newfeatureapi/PCL-GeoRSS

Files:

• cartography/data/georss.py (modified) (3 diffs)
• tests/Features.txt (modified) (4 diffs)

PCL/branches/PCL-newfeatureapi/PCL-GeoRSS/cartography/data/georss.py

@@ -228 +228 @@
             self._document = feedparser.parse(s.read())
 
-    def featuretype(self, typename='feed'):
+    def featuretype(self, typename='entries'):
         if not self._featuretype:
             if not self._document:
@@ -234 +234 @@
             self._featuretype = type("%sFeature" % str(self._document.feed.id), 
                 (GeoRSSFeature,), 
-                dict(__typename__='feed',
+                dict(__typename__='entries',
                      __srs__ = SpatialReference(epsg=4326),
                      _storage = self,
@@ -251 +251 @@
     def typenames(self):
         """Returns the typenames available in this store."""
-        return ['feed']
+        return ['entries']
 
         

PCL/branches/PCL-newfeatureapi/PCL-GeoRSS/tests/Features.txt

@@ -12 +12 @@
     >>> store = GeoRSSFeatureStore("file://%s" % path)
     >>> store.typenames()
-    ['feed']
+    ['entries']
 
-    >>> Feed = store.featuretype('feed')
-    >>> print Feed
+    >>> Entry = store.featuretype('entries')
+    >>> print Entry
     <class 'cartography.data.georss.http://gispython.org/testingFeature'>
-    >>> Feed.features.count
+    >>> Entry.features.count
     4
 
-    >>> features = [f for f in Feed.features.all()]
+    >>> features = [f for f in Entry.features.all()]
     >>> len(features)
     4
@@ -31 +31 @@
     >>> store = GeoRSSFeatureStore('http://pleiades.stoa.org/places/archaic.atom')
     >>> store.typenames()
-    ['feed']
+    ['entries']
 
-    >>> Feed = store.featuretype('feed')
-    >>> print Feed
+    >>> Entry = store.featuretype('entries')
+    >>> print Entry
     <class 'cartography.data.georss.http://pleiades.stoa.org/places/archaicFeature'>
-    >>> Feed.features.count
+    >>> Entry.features.count
     3
 
-    >>> features = [f for f in Feed.features.all()]
+    >>> features = [f for f in Entry.features.all()]
     >>> len(features)
     3
@@ -48 +48 @@
     -------------------------
 
-    >>> store = GeoRSSFeatureStore('http://pleiades.stoa.org/places/settlement.atom')
-    >>> Feed = store.featuretype('feed')
-    >>> Feed.features.count
+    >>> url = 'http://pleiades.stoa.org/places/settlement.atom'
+    >>> store = GeoRSSFeatureStore(url)
+    >>> Entry = store.featuretype('entries')
+    >>> Entry.features.count
     230
 
     Filter for intersection with a (29dE, 36dN, 30dE, 37dN) bounding box
 
-    >>> features = [f for f in Feed.features.filter(bbox=(29.0,36.0,30.0,37.0))]
+    >>> features = [f for f in Entry.features.filter(
+    ...                        bbox=(29.0, 36.0, 30.0, 37.0)
+    ...                        )
+    ...            ]
     >>> len(features)
     62
-    >>> print features[0].info()
-    {'srs': 'None', 'properties': {'updated': u'', 'summary': u'An ancient settlement, attested during the Classical, Hellenistic (Roman Republic), Roman and Late Antique periods (modern location: Ka\u015f). It was known in antiquity by the names: Antiphellos and Habesos.', 'tags': [], 'title': u'Antiphellos/Habesos'}, 'id': 'http://pleiades.stoa.org/places/638749', 'bounds': [29.637, 36.193199999999997, 29.637, 36.193199999999997]}
+    >>> from pprint import pprint
+    >>> pprint(features[0].info())
+    {'bounds': [29.637, 36.193199999999997, 29.637, 36.193199999999997],
+     'id': 'http://pleiades.stoa.org/places/638749',
+     'properties': {'summary': u'An ancient settlement, attested during the Classical, Hellenistic (Roman Republic), Roman and Late Antique periods (modern location: Ka\u015f). It was known in antiquity by the names: Antiphellos and Habesos.',
+                    'tags': [],
+                    'title': u'Antiphellos/Habesos',
+                    'updated': u''},
+     'srs': 'None'}
+    >>> f = features[0]
+    >>> f.id
+    'http://pleiades.stoa.org/places/638749'
+    >>> f.properties.title
+    u'Antiphellos/Habesos'
+    >>> f.properties.the_geom.toWKT()
+    'POINT (29.6370000000000005 36.1931999999999974)'
+    >>> type(f.context)
+    <class 'feedparser.FeedParserDict'>
 
     With property equals filter
@@ -66 +86 @@
     >>> path = os.path.abspath('../fixtures/atom-tagged.xml')
     >>> store = GeoRSSFeatureStore("file://%s" % path)
-    >>> Feed = store.featuretype('feed')
-    >>> Feed.features.count
+    >>> Entry = store.featuretype('entries')
+    >>> Entry.features.count
     31
 
-    >>> features = [f for f in Feed.features.filter(properties="'web' in f.tags")]
+    >>> features = [f for f in Entry.features.filter(properties="'web' in f.tags")]
     >>> len(features)
     12
     >>> print features[0].info()
     {'srs': 'None', 'properties': {'updated': u'2007-03-23T08:28:33-06:00', 'summary': u'Sam Ruby finds GeoRSS and finds it a bit confusing. My blog entries feed validates perfectly,\nunlike the slashgeo feed Google references.', 'tags': [u'web'], 'title': u'GeoRSS and Validation'}, 'id': 'http://zcologia.com/news/entries/412', 'bounds': [-105.09583000000001, 40.58699, -105.09583000000001, 40.58699]}
+    >>> f = features[0]
+    >>> f.id
+    'http://zcologia.com/news/entries/412'
+    >>> f.properties.title
+    u'GeoRSS and Validation'
+    >>> f.properties.tags
+    [u'web']
+    >>> f.properties.the_geom.toWKT()
+    'POINT (-105.0958300000000065 40.5869900000000001)'
+    >>> type(f.context)
+    <class 'feedparser.FeedParserDict'>
+    >>> f.context.tags
+    [{'term': u'web', 'scheme': u'http://zcologia.com/news/categories/', 'label': u'Web'}]