[CalendarServer-changes] [13674] CalendarServer/branches/release/CalendarServer-5.3-dev

[source_changes at macosforge.org]

Revision: 13674
          http://trac.calendarserver.org//changeset/13674
Author:   sagen at apple.com
Date:     2014-06-23 11:00:59 -0700 (Mon, 23 Jun 2014)
Log Message:
-----------
Addresses should have 'geo:' already in the geo urn; we should not prepend that.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-5.3-dev/conf/auth/resources-test.xml
    CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/caldav/datastore/sql.py

Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/conf/auth/resources-test.xml
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.3-dev/conf/auth/resources-test.xml	2014-06-23 16:01:03 UTC (rev 13673)
+++ CalendarServer/branches/release/CalendarServer-5.3-dev/conf/auth/resources-test.xml	2014-06-23 18:00:59 UTC (rev 13674)
@@ -249,7 +249,7 @@
     <name>Test Address One</name>
     <extras>
       <streetAddress>20300 Stevens Creek Blvd, Cupertino, CA 95014</streetAddress>
-      <geo>37.322281,-122.028345</geo>
+      <geo>geo:37.322281,-122.028345</geo>
     </extras>
   </address>
   <address>
@@ -258,7 +258,7 @@
     <name>IL2</name>
     <extras>
       <streetAddress>2 Infinite Loop, Cupertino, CA 95014</streetAddress>
-      <geo>37.332633,-122.030502</geo>
+      <geo>geo:37.332633,-122.030502</geo>
     </extras>
   </address>
   <address>
@@ -267,7 +267,7 @@
     <name>IL1</name>
     <extras>
       <streetAddress>1 Infinite Loop, Cupertino, CA 95014</streetAddress>
-      <geo>37.331741,-122.030333</geo>
+      <geo>geo:37.331741,-122.030333</geo>
     </extras>
   </address>
 </accounts>

Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/caldav/datastore/sql.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/caldav/datastore/sql.py	2014-06-23 16:01:03 UTC (rev 13673)
+++ CalendarServer/branches/release/CalendarServer-5.3-dev/txdav/caldav/datastore/sql.py	2014-06-23 18:00:59 UTC (rev 13674)
@@ -1992,7 +1992,7 @@
                                             "X-TITLE" : title,
                                         }
                                         structured = Property("X-APPLE-STRUCTURED-LOCATION",
-                                            "geo:%s" % (geo,), params=params,
+                                            geo.encode("utf-8"), params=params,
                                             valuetype=PyCalendarValue.VALUETYPE_URI)
                                         sub.replaceProperty(structured)
                                         sub.replaceProperty(Property("LOCATION",
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20140623/a6ab31e0/attachment.html>