Revision: 3666 Author: ksprotte URL: http://bknr.net/trac/changeset/3666
some fixes to bos to avoid compilation warnings U trunk/projects/bos/m2/m2.lisp U trunk/projects/bos/m2/packages.lisp U trunk/projects/bos/web/bos.web.asd U trunk/projects/bos/web/quad-tree.lisp
Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-07-28 15:14:31 UTC (rev 3665) +++ trunk/projects/bos/m2/m2.lisp 2008-07-28 18:33:35 UTC (rev 3666) @@ -377,7 +377,7 @@ (dolist (m2 (contract-m2s contract)) (collect (list (m2-x m2) (m2-y m2))))))
-(defun contracts-bounding-box (&optional (contracts (all-contracts))) +(defun contracts-bounding-box (&optional (contracts (class-instances 'contract))) (geometry:with-bounding-box-collect (collect) (dolist (contract contracts) (dolist (m2 (contract-m2s contract))
Modified: trunk/projects/bos/m2/packages.lisp =================================================================== --- trunk/projects/bos/m2/packages.lisp 2008-07-28 15:14:31 UTC (rev 3665) +++ trunk/projects/bos/m2/packages.lisp 2008-07-28 18:33:35 UTC (rev 3666) @@ -140,8 +140,7 @@ #:contract #:make-contract #:contract-p - #:get-contract - #:all-contracts + #:get-contract #:contract-sponsor #:contract-paidp #:contract-download-only
Modified: trunk/projects/bos/web/bos.web.asd =================================================================== --- trunk/projects/bos/web/bos.web.asd 2008-07-28 15:14:31 UTC (rev 3665) +++ trunk/projects/bos/web/bos.web.asd 2008-07-28 18:33:35 UTC (rev 3666) @@ -21,7 +21,7 @@ :components ((:file "packages") (:file "utf-8" :depends-on ("packages")) (:file "config" :depends-on ("packages")) - (:file "dictionary" :depends-on ("packages")) + (:file "dictionary" :depends-on ("packages" #+nil "startup")) (:file "web-macros" :depends-on ("config")) (:file "web-utils" :depends-on ("web-macros")) (:file "cms-links" :depends-on ("web-utils"))
Modified: trunk/projects/bos/web/quad-tree.lisp =================================================================== --- trunk/projects/bos/web/quad-tree.lisp 2008-07-28 15:14:31 UTC (rev 3665) +++ trunk/projects/bos/web/quad-tree.lisp 2008-07-28 18:33:35 UTC (rev 3666) @@ -359,6 +359,15 @@ :order order) (nreverse nodes)))
+(defmethod node-path ((node node-extension)) + (node-path (base-node node))) + +;;; *quad-tree* +(defvar *quad-tree*) + +(defun make-quad-tree () + (setq *quad-tree* (make-instance 'quad-node :geo-box *m2-geo-box*))) + (defmethod node-path ((node quad-node)) (let (prev-n path) (map-nodes (lambda (n) @@ -372,15 +381,6 @@ (geo-box node)))) :order :depth-first)))
-(defmethod node-path ((node node-extension)) - (node-path (base-node node))) - -;;; *quad-tree* -(defvar *quad-tree*) - -(defun make-quad-tree () - (setq *quad-tree* (make-instance 'quad-node :geo-box *m2-geo-box*))) - (defun node-lod (node) (if (zerop (depth node)) '(:min 16 :max -1)