Changeset 4331

Timestamp:

03/05/09 11:04:28 (18 months ago)

Author:

hans

Message:

fix namespace url replacement, add correction function for existing data

Files:

• deployed/bos/projects/bos/web/kml-handlers.lisp (modified) (3 diffs)

deployed/bos/projects/bos/web/kml-handlers.lisp

@@ -90 +90 @@
 (defun replace-all-url-hosts (string new-host)
   "Replaces all hostnames in STRING by NEW-HOST."
-  (ppcre:regex-replace-all #?r"((?:https?|ftp)://)\w+(?:\.\w+)*(?::\d+)?" string #?r"\1${new-host}"))
+  (ppcre:regex-replace-all #?r"(?<!xmlns=[\"'])((?:https?|ftp)://)\w+(?:\.\w+)*(?::\d+)?" string #?r"\1${new-host}"))
 
 (defun replace-lang-query-params (string new-lang)
@@ -268 +268 @@
                                          (with-element "latitude" (text "49.89989439494514"))
                                          (with-element "altitude" (text "0"))
-                                         (with-element "range" (text "5400715.913126094"))
+                                         (with-element "heading" (text "0"))
                                          (with-element "tilt" (text "0"))
-                                         (with-element "heading" (text "0"))))))))))
+                                         (with-element "range" (text "5400715.913126094"))))))))))
 
 (defmethod handle-object ((handler kml-root-dynamic-handler) (object sponsor))
@@ -354 +354 @@
       (kml-region (make-rectangle2 (allocation-area-bounding-box2 area))
                   nil))))
+
+(defun fix-xmlns ()
+  (with-transaction (:update-kml)
+    (dolist (kml-root (class-instances 'kml-root-data))
+      (with-slots (kml-string) kml-root
+        (setf kml-string (cl-ppcre:regex-replace-all "http://earth.google.com/kml/2.2"
+                                                     kml-string
+                                                     "http://www.opengis.net/kml/2.2"))))))