Changeset 3706

Timestamp:

07/31/08 10:54:27 (4 months ago)

Author:

ksprotte

Message:

added reader poi-sat-images and transaction poi-sat-images-exchange-neighbours for edit-poi handler

Files:

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

trunk/projects/bos/m2/packages.lisp

@@ -230 +230 @@
-           #:poi-center-lon-lat
-           #:poi-images
+           #:poi-sat-images
+           #:poi-sat-images-exchange-neighbours
-           #:poi-airals
-           #:poi-panoramas

trunk/projects/bos/m2/poi.lisp

@@ -118 +118 @@
-  (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))
-
+;;; POI media are stored in one list - for convenience we provide
+;;; accessors by type. POI-IMAGES e.g. returns a list of all
+;;; POI-IMAGES in the same order as they appear in the media list. The
+;;; second value is a list of corresponding positions in that list.
-(macrolet ((define-poi-medium-reader (name)
-             (let ((type (find-symbol (subseq (symbol-name name) 0 (1- (length (symbol-name name)))))))
-               (assert type)
-               `(defun ,name (poi)
-
+
+
+
+
-  (define-poi-medium-reader poi-images)
-  (define-poi-medium-reader poi-airals)
-  (define-poi-medium-reader poi-panoramas)
-  (define-poi-medium-reader poi-movies))
+
+(defun poi-sat-images (poi)
+  "We use the 6 last (oldest) images of POI as images for the
+  satellite application."
+  (multiple-value-bind (images positions)
+      (poi-images poi)
+    (let* ((length (length images))
+           (start (max 0 (- length 6))))
+      (values (subseq images start length)
+              (subseq positions start length)))))
+
+;;; Provides for the shifting of images in the edit-poi handler.
+;;; Exchanges (nth index (poi-sat-images poi)) with
+;;; (nth (1+ index) (poi-sat-images poi)).
+(deftransaction poi-sat-images-exchange-neighbours (poi index)  
+  (check-type index (integer 0 4))
+  (multiple-value-bind (images positions)
+      (poi-images poi)
+    (declare (ignore images))
+    (let ((media-index-a (nth index positions))
+          (media-index-b (nth (1+ index) positions)))
+      (rotatef (nth media-index-a (poi-media poi))
+               (nth media-index-b (poi-media poi))))))
-
-(defun make-poi-javascript (language)
@@ -156 +186 @@
-              (poi-center-x poi)
-              (poi-center-y poi)
-
-
+sat-
+sat-
-      (when (poi-airals poi)
-
@@ -169 +199 @@
-         for slot-values = (mapcar (lambda (image)
-                                     (escape-nl (slot-string image slot-name language)))
-
+sat-
-         when slot-values
-         do (format t "poi.~A = [ ~{~S~^, ~} ];~%" javascript-name slot-values))

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

@@ -57 +57 @@
-      (setq shift (find-store-object (parse-integer shift)))
-      (setq shift-by (parse-integer shift-by))
-
+sat-
-             (old-position (position shift new-images))
-             (tmp (nth old-position new-images)))
@@ -64 +64 @@
-        (setf (nth old-position new-images) (nth (+ shift-by old-position) new-images))
-        (setf (nth (+ shift-by old-position) new-images) tmp)
-
-
+sat-
+sat-
-    (with-bos-cms-page (:title "Edit POI")
-      (content-language-chooser)
@@ -108 +108 @@
-              ((:table)
-               (:tr
-
+sat-
-                   for index from 1 by 1
-                   do (html (:td ((:a :href (format nil "/edit-poi-image/~a?poi=~A" (store-object-id image) (store-object-id poi)))
-                                  ((:img :border "0" :src (format nil "/image/~a/thumbnail,,55,55" (store-object-id image)))))
-
-
-
-
-
-
-
-
-(unless (eql index (length (poi
-
-
-
-
-
+    
+    
+    
+    
+    
+    
+    
+    
+    (unless (eql index (length (poi-sat
+    
+    
+    
+    
+sat-
-                (html
-                 :br
@@ -343 +343 @@
-                (:tr (:td "upload new image")
-                     (:td ((:input :type "file" :name "image-file"))
-
-
+    
+    
-                (:tr (:td "title")
-                     (:td (text-field "title"
@@ -417 +417 @@
-    (let ((image-index (1- (parse-integer image-index-string))))
-      (if (and (not (minusp image-index))
-
+sat-
-          (redirect (format nil "/image/~D~@[~{/~a~}~]"
-
+sat-
-                            imageproc-arguments))
-          (error "image index ~a out of bounds for poi ~a" image-index poi)))))
@@ -437 +437 @@
-     ((:param :name "allowFullScreen" :value "true"))
-     ((:embed :src (poi-movie-url poi-movie) :type "application/x-shockwave-flash"
-                               
-                               
+
+
-
-(defun write-poi-xml (poi language)
@@ -468 +468 @@
-                       (description poi-description)
-                       (airals poi-airals)
-
+sat-
-                       (panoramas poi-panoramas)
-                       (movies poi-movies)) poi
@@ -565 +565 @@
-                      (with-element "table"
-                        (with-element "tbody"
-
+sat-
-                            (images-2trs (subseq images 0 (min 3 (length images))))
-                            (when (> (length images) 3)