added simplified feed.kml url

geocam · Oct 10, 2011 · cb9eef0 · cb9eef0
1 parent b1ceb6b
commit cb9eef0
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 10 deletions.
diff --git a/geocamLens/ViewKml.py b/geocamLens/ViewKml.py
@@ -52,7 +52,7 @@ def kmlStartSession(self, request):
         print >> sys.stderr, "ViewKml: started session %s" % sessionId
         return KmlUtil.wrapKmlDjango(self.kmlGetStartSessionKml(request, sessionId))
 
-    def kmlGetAllFeaturesFolder(self, request, searchQuery, newUtime):
+    def kmlGetAllFeaturesFolder(self, request, searchQuery, newUtime=None):
         allFeatures = self.search.getAllFeatures()
         features = self.search.searchFeatures(allFeatures, searchQuery)
         if 0:
@@ -67,16 +67,19 @@ def kmlGetAllFeaturesFolder(self, request, searchQuery, newUtime):
 </Folder>
 """ % featuresKml)
 
-    def kmlGetInitialKml(self, request, sessionId):
+    def kmlGetInitialKml(self, request, sessionId=None):
-        newUtime = datetime.datetime.now()
+        if sessionId:
-        session, _created = GoogleEarthSession.objects.get_or_create(sessionId=sessionId,
+            newUtime = datetime.datetime.now()
-                                                                     defaults=dict(utime=newUtime))
+            session, _created = GoogleEarthSession.objects.get_or_create(sessionId=sessionId,
-        session.utime = newUtime
+                                                                         defaults=dict(utime=newUtime))
-        session.save()
+            session.utime = newUtime
+            session.save()
+            query = session.getSearchQuery()
+        else:
+            newUtime = None
+            query = ''
 
-        allFeaturesFolder = self.kmlGetAllFeaturesFolder(request,
+        allFeaturesFolder = self.kmlGetAllFeaturesFolder(request, query, newUtime)
-                                                         session.getSearchQuery(),
-                                                         newUtime)
         global CACHED_CSS
         if not CACHED_CSS:
             cssPath = '%sgeocamCore/css/share.css' % settings.MEDIA_ROOT
@@ -131,3 +134,6 @@ def kmlGetSessionResponse(self, request, quotedId, method):
             return KmlUtil.wrapKmlDjango(self.kmlGetUpdateKml(request, sessionId))
         else:
             raise Exception('method must be "initial" or "update"')
+
+    def kmlFeed(self, request):
+        return KmlUtil.wrapKmlDjango(self.kmlGetInitialKml(request))
diff --git a/geocamLens/urls.py b/geocamLens/urls.py
@@ -23,6 +23,9 @@
      {'challenge': 'digest',
       'readOnly': True},
      'geocamLens_kmlGetSessionResponse'),
+    (r'^feed\.kml$', views.kmlFeed,
+     {'readOnly': True},
+     'geocamLens_kml'),
 
     # features
     (r'^features.json', views.featuresJson, {'readOnly': True}),