Changeset 2801

Show
Ignore:
Timestamp:
03/26/08 12:21:31 (10 months ago)
Author:
ksprotte
Message:

poi kml handler now outputs more information about images

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/projects/bos/m2/poi.lisp

    r2775 r2801  
    191191                              (text v))) 
    192192                          hash-table))) 
    193              (format-store-image (element-name store-image) 
     193             (format-image (element-name image) 
    194194               (with-element element-name 
    195                  (with-element "id" (text (princ-to-string (store-object-id store-image)))) 
    196                  (with-element "name" (text (store-image-name store-image))) 
    197                  (with-element "width" (text (princ-to-string (store-image-width store-image)))) 
    198                  (with-element "height" (text (princ-to-string (store-image-height store-image))))))) 
     195                 (with-element "id" (text (princ-to-string (store-object-id image)))) 
     196                 (with-element "name" (text (store-image-name image))) 
     197                 (with-element "width" (text (princ-to-string (store-image-width image)))) 
     198                 (with-element "height" (text (princ-to-string (store-image-height image)))) 
     199                 (when (typep image 'poi-image) 
     200                   (format-hash-table "title" (poi-image-title image)) 
     201                   (format-hash-table "subtitle" (poi-image-subtitle image)) 
     202                   (format-hash-table "description" (poi-image-description image)))))) 
    199203      (with-accessors ((id store-object-id) 
    200204                       (name poi-name) 
     
    213217          (format-hash-table "description" description)         
    214218          (with-element "airals" 
    215             (mapc (alexandria:curry #'format-store-image "airal") airals)) 
     219            (mapc (alexandria:curry #'format-image "airal") airals)) 
    216220          (with-element "images" 
    217             (mapc (alexandria:curry #'format-store-image "image") images)) 
     221            (mapc (alexandria:curry #'format-image "image") images)) 
    218222          (with-element "panoramas" 
    219             (mapc (alexandria:curry #'format-store-image "panorama") panoramas)) 
     223            (mapc (alexandria:curry #'format-image "panorama") panoramas)) 
    220224          (with-element "movies" 
    221225            (dolist (url movies)