Changeset 2775

Timestamp:

03/20/08 14:20:00 (10 months ago)

Author:

ksprotte

Message:

finished poi xml and kml handlers

Files:

• trunk/projects/bos/m2/packages.lisp (modified) (1 diff)
• trunk/projects/bos/m2/poi.lisp (modified) (2 diffs)
• trunk/projects/bos/web/poi-handlers.lisp (modified) (1 diff)
• trunk/projects/bos/web/webserver.lisp (modified) (1 diff)

trunk/projects/bos/m2/packages.lisp

@@ -209 +209 @@
-           #:poi-center-x
-           #:poi-center-y
+           #:poi-center-lon-lat
-           #:make-poi-javascript
-
+
+
+
-           ;; news
-           #:news-item

trunk/projects/bos/m2/poi.lisp

@@ -121 +121 @@
-(defmethod poi-center-y ((poi poi))
-  (second (poi-area poi)))
+
+(defun poi-center-lon-lat (poi)
+  (geo-utm:utm-x-y-to-lon-lat (+ +nw-utm-x+ (poi-center-x poi)) (- +nw-utm-y+ (poi-center-y poi)) +utm-zone+ t))
-
-(defun make-poi-javascript (language)
@@ -177 +180 @@
-        (format t "poi['thumbnail'] = 0;~%")
-        (format t "pois.push(poi);~%")))))
+
+(defun write-poi-xml (poi &optional prefix)
+  (macrolet ((with-element (qname &body body)
+               `(with-element* (prefix ,qname) ,@body)))
+    (labels ((format-hash-table (element-name hash-table)
+               (with-element element-name
+                 (maphash (lambda (k v)                        
+                            (with-element "content"
+                              (attribute "lang" k)
+                              (text v)))
+                          hash-table)))
+             (format-store-image (element-name store-image)
+               (with-element element-name
+                 (with-element "id" (text (princ-to-string (store-object-id store-image))))
+                 (with-element "name" (text (store-image-name store-image)))
+                 (with-element "width" (text (princ-to-string (store-image-width store-image))))
+                 (with-element "height" (text (princ-to-string (store-image-height store-image)))))))
+      (with-accessors ((id store-object-id)
+                       (name poi-name)
+                       (title poi-title)
+                       (subtitle poi-subtitle)
+                       (description poi-description)
+                       (airals poi-airals)
+                       (images poi-images)
+                       (panoramas poi-panoramas)
+                       (movies poi-movies)) poi
+        (with-element "poi"
+          (with-element "id" (text (princ-to-string id)))
+          (with-element "name" (text name))
+          (format-hash-table "title" title)
+          (format-hash-table "subtitle" subtitle)
+          (format-hash-table "description" description)        
+          (with-element "airals"
+            (mapc (alexandria:curry #'format-store-image "airal") airals))
+          (with-element "images"
+            (mapc (alexandria:curry #'format-store-image "image") images))
+          (with-element "panoramas"
+            (mapc (alexandria:curry #'format-store-image "panorama") panoramas))
+          (with-element "movies"
+            (dolist (url movies)
+              (with-element "movie"
+                (with-element "url" (text url))))))))))
+
+(defun write-poi-kml (poi)
+  (with-element "Placemark"
+    (with-element "name" (text (poi-name poi)))
+    (with-element "description"
+      (with-namespace ("bos" "http://headcraft.de/bos")
+        (write-poi-xml poi "bos")))
+    (with-element "Point"
+      (with-element "coordinates"
+        (text (format nil "~{~F,~}0" (poi-center-lon-lat poi)))))))

trunk/projects/bos/web/poi-handlers.lisp

@@ -395 +395 @@
-
-(defmethod handle-object ((handler poi-xml-handler) poi)
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

trunk/projects/bos/web/webserver.lisp

@@ -212 +212 @@
-                                        ("/poi-image" poi-image-handler)
-                                        ("/poi-xml" poi-xml-handler)
+                                        ("/poi-kml-all" poi-kml-all-handler)
+                                        ("/poi-kml" poi-kml-handler)
-                                        ("/map-browser" map-browser-handler)
-                                        ("/poi-javascript" poi-javascript-handler)