- bknr-cvs@common-lisp.net - mailman3.common-lisp.net

[bknr-cvs] hans changed trunk/projects/bos/
by BKNR Commits 05 Dec '08

05 Dec '08

Revision: 4116 Author: hans URL: http://bknr.net/trac/changeset/4116 placemark for contract U trunk/projects/bos/m2/m2.lisp U trunk/projects/bos/payment-website/static/poi-ms.js Modified: trunk/projects/bos/m2/m2.lisp =================================================================== --- trunk/projects/bos/m2/m2.lisp 2008-12-05 12:08:08 UTC (rev 4115) +++ trunk/projects/bos/m2/m2.lisp 2008-12-05 13:37:32 UTC (rev 4116) @@ -700,13 +700,16 @@ (defmethod json:encode-slots progn ((contract contract)) (destructuring-bind (left top width height) (contract-bounding-box contract) - (json:encode-object-elements - "timestamp" (format-date-time (contract-date contract) :mail-style t) - "count" (length (contract-m2s contract)) - "top" top - "left" left - "width" width - "height" height))) + (destructuring-bind (center-x center-y) (contract-center contract) + (json:encode-object-elements + "timestamp" (format-date-time (contract-date contract) :mail-style t) + "count" (length (contract-m2s contract)) + "top" top + "left" left + "width" width + "height" height + "centerX" center-x + "centerY" center-y)))) (defmethod json:encode-slots progn ((sponsor sponsor)) (json:encode-object-elements Modified: trunk/projects/bos/payment-website/static/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.js 2008-12-05 12:08:08 UTC (rev 4115) +++ trunk/projects/bos/payment-website/static/poi-ms.js 2008-12-05 13:37:32 UTC (rev 4116) @@ -151,7 +151,6 @@ }, poi.media); mainMap.hide(); -// mainMap.zoomTo(poi.x, poi.y); } function pointToPath(point, level) { @@ -180,26 +179,35 @@ function Map() { this.map = new GMap2($('#map')[0]); - var copyright - = new GCopyright(1, - new GLatLngBounds(new GLatLng(-90, -180), new GLatLng(90, 180)), - 3, - "Copyright BOS Deutschland e.V."); var copyrightCollection = new GCopyrightCollection('Map'); - copyrightCollection.addCopyright(copyright); - var tileLayers = [new GTileLayer(copyrightCollection, 0, 12)]; - var projection = new GMercatorProjection(12); - tileLayers[0].getTileUrl = function(point, level) { - if (level < 15) { - var path = pointToPath(point, level); - log('getTileUrl: x:' + point.x + ' y:' + point.y + ' level:' + level + ' path: ' + path); - return '/simple-map/contracts?path=' + path; - } else { - return null; + copyrightCollection.addCopyright(new GCopyright(1, + new GLatLngBounds(new GLatLng(-90, -180), new GLatLng(90, 180)), + 3, + "Copyright BOS Deutschland e.V.")); + + this.layers = {}; + + this.makeLayer = function (name) { + var tileLayer = new GTileLayer(copyrightCollection, 0, 12); + tileLayer.getTileUrl = function(point, level) { + if (level < 15) { + var path = pointToPath(point, level); +// log('getTileUrl: x:' + point.x + ' y:' + point.y + ' level:' + level + ' path: ' + path); + return '/simple-map/' + name + '?path=' + path; + } else { + return null; + } } + this.layers[name] = tileLayer; + return tileLayer; } - var customMap = new GMapType(tileLayers, projection, 'Map', { errorMessage: NLS("Keine Daten in dieser Zoomstufe") }); + var projection = new GMercatorProjection(12); + var customMap = new GMapType( + [ this.makeLayer('sat-2002'), + this.makeLayer('contracts') ], + projection, 'Map', { errorMessage: NLS("Keine Daten in dieser Zoomstufe") }); + this.map.addMapType(customMap); this.controls = [ new GLargeMapControl() ]; @@ -218,6 +226,17 @@ this.map.enableContinuousZoom(); this.map.enableScrollWheelZoom(); + this.mapClicked = function (overlay, latlng, overlaylatlng) { + log('map clicked, overlay: ' + overlay + ' latlng: ' + latlng + ' overlaylatlng: ' + overlaylatlng); + } + + this.moveEnd = function () { + log('map has moved'); + } + + GEvent.addListener(this.map, "click", bind(this.mapClicked, this)); + GEvent.addListener(this.map, "moveend", bind(this.moveEnd, this)); + this.overview = function () { this.show(); $('#map').removeClass('small'); @@ -227,7 +246,7 @@ this.map.checkResize(); } - this.zoomTo = function (x, y) { + this.poiDetail = function (x, y) { $('#map').removeClass('large'); $('#map').addClass('small'); this.removeControls(); @@ -235,6 +254,10 @@ this.map.checkResize(); } + this.zoomTo = function (x, y, level) { + this.map.setCenter(projection.fromPixelToLatLng(new GPoint(x, y), 6), level); + } + this.hide = function () { $('#map').css('display', 'none'); } @@ -254,10 +277,21 @@ GEvent.addListener(marker, "click", partial(showPOI, pois[i])); this.map.addOverlay(marker); } + + this.setSponsorMarker = function (sponsor) { + var position = pointToLatLng(sponsor.contracts[0].centerX, sponsor.contracts[0].centerY); + if (this.sponsorMarker) { + this.sponsorMarker.setLatLng(position); + } else { + this.sponsorMarker = new GMarker(position); + this.map.addOverlay(this.sponsorMarker); + } + } } var pages = { overview: showOverview, + sponsors: showSponsors } function selectPage(e) { @@ -276,6 +310,11 @@ $('#content-body') .empty() .append(H2(null, sponsor.name)); + + mainMap.zoomTo(contract.left, contract.top, 8); + mainMap.setSponsorMarker(sponsor); + + // Math.max(contract.width, contract.height) } function showSponsors() { @@ -296,6 +335,8 @@ " ", sponsor.contracts[0].count, " m²"))) .bind('click', sponsor, showSponsor)); }, sponsors.slice(0, 10)); + + mainMap.overview(); } function loadSponsors(data) {

1 0

[bknr-cvs] hans changed trunk/bknr/web/src/images/image.lisp
by BKNR Commits 05 Dec '08

05 Dec '08

Revision: 4115 Author: hans URL: http://bknr.net/trac/changeset/4115 Only try to delete old blob file if it exists. U trunk/bknr/web/src/images/image.lisp Modified: trunk/bknr/web/src/images/image.lisp =================================================================== --- trunk/bknr/web/src/images/image.lisp 2008-12-05 11:27:44 UTC (rev 4114) +++ trunk/bknr/web/src/images/image.lisp 2008-12-05 12:08:08 UTC (rev 4115) @@ -77,7 +77,8 @@ (:supersede (delete-object existing-image)) (:kill - (delete-file (blob-pathname existing-image)) + (when (probe-file (blob-pathname existing-image)) + (delete-file (blob-pathname existing-image))) (delete-object existing-image)))) (let ((store-image (apply #'make-instance class-name

1 0

[bknr-cvs] hans changed trunk/projects/bos/
by BKNR Commits 05 Dec '08

05 Dec '08

Revision: 4114 Author: hans URL: http://bknr.net/trac/changeset/4114 Contract rendering works now. U trunk/projects/bos/payment-website/static/poi-ms.js U trunk/projects/bos/web/simple-sat-map.lisp Modified: trunk/projects/bos/payment-website/static/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.js 2008-12-05 09:49:44 UTC (rev 4113) +++ trunk/projects/bos/payment-website/static/poi-ms.js 2008-12-05 11:27:44 UTC (rev 4114) @@ -193,7 +193,7 @@ if (level < 15) { var path = pointToPath(point, level); log('getTileUrl: x:' + point.x + ' y:' + point.y + ' level:' + level + ' path: ' + path); - return '/simple-map/sat-2002?path=' + path; + return '/simple-map/contracts?path=' + path; } else { return null; } @@ -223,7 +223,7 @@ $('#map').removeClass('small'); $('#map').addClass('large'); this.addControls(); - this.map.setCenter(projection.fromPixelToLatLng(new GPoint(7000, 6350), 6), 2, customMap); + this.map.setCenter(projection.fromPixelToLatLng(new GPoint(7000, 6350), 6), 3, customMap); this.map.checkResize(); } Modified: trunk/projects/bos/web/simple-sat-map.lisp =================================================================== --- trunk/projects/bos/web/simple-sat-map.lisp 2008-12-05 09:49:44 UTC (rev 4113) +++ trunk/projects/bos/web/simple-sat-map.lisp 2008-12-05 11:27:44 UTC (rev 4114) @@ -8,9 +8,19 @@ ;; directions. It is then stored in a quad tree, with each node ;; having one image and four children. +(defparameter *levels* 6) +(defparameter *tree-size* 16384) +(defparameter *tile-size* 256) +(defparameter *tile-pow* (floor (log *tile-size* 2))) + (define-persistent-class tree () - ((root :read))) + ((root :read) + (layers :read :initform nil))) +(defmethod print-object ((tree tree) stream) + (print-store-object (tree stream :type t) + (format stream "LAYERS: ~S" (tree-layers tree)))) + (defmethod destroy-object :before ((tree tree)) (labels ((descend (node) @@ -20,43 +30,91 @@ (delete-object node))) (descend (tree-root tree)))) -(defparameter *levels* 6) -(defparameter *tree-size* 16384) -(defparameter *tile-size* 256) - (defun make-tree () (labels - ((make-quad (level) + ((make-quad (x y level) (apply #'make-instance 'node + :x x :y y :level level (when (< level *levels*) - (let ((next-level (1+ level))) + (let* ((next-level (1+ level)) + (next-tile-size (/ *tree-size* (expt 2 next-level)))) (list :children - (list (make-quad next-level) - (make-quad next-level) - (make-quad next-level) - (make-quad next-level)))))))) + (list (make-quad x y next-level) + (make-quad (+ x next-tile-size) y next-level) + (make-quad x (+ y next-tile-size) next-level) + (make-quad (+ x next-tile-size) (+ y next-tile-size) next-level)))))))) (make-instance 'tree - :root (make-quad 0)))) + :root (make-quad 0 0 0)))) (defun get-tree () (or (first (class-instances 'tree)) (make-tree))) (define-persistent-class node () - ((images :read :initform (make-hash-table :test #'equal)) + ((x :read) + (y :read) + (level :read) + (images :read :initform (make-hash-table)) (children :read :initform nil))) +(defun node-pixel-size (node) + (/ *tree-size* (expt 2 (node-level node)) 256)) + +(defun node-size (node) + (/ *tree-size* (expt 2 (node-level node)))) + +(defmethod print-object ((node node) stream) + (print-store-object (node stream :type t) + (format stream "X: ~A Y: ~A LEVEL: ~A IMAGES: ~A CHILDREN: ~:[NO~;YES~]" + (node-x node) (node-y node) (node-level node) + (loop for layer being the hash-keys of (node-images node) + collect layer) + (node-children node)))) + (defmethod destroy-object :before ((node node)) (loop for image being the hash-values of (node-images node) do (unless (object-destroyed-p image) (delete-object image)))) -(defun node-image (node layer-name) - (gethash layer-name (node-images node))) +(defun find-m2 (x y) + (when (and (< x bos.m2.config:+width+) + (< y bos.m2.config:+width+)) + (bos.m2:get-m2 x y))) +(defun generate-contract-image (node) + (cl-gd:with-image* (256 256 t) + (setf (cl-gd:save-alpha-p) t) + (let ((transparent (cl-gd:find-color 255 255 255 :alpha 127)) + (factor (expt 2 (- *levels* (node-level node))))) + (cl-gd:do-rows (y) + (cl-gd:do-pixels-in-row (x) + (let ((m2 (find-m2 (+ (node-x node) + (* x factor)) + (+ (node-y node) + (* y factor))))) + (setf (cl-gd:raw-pixel) + (if (and m2 (bos.m2:m2-contract m2)) + (apply #'cl-gd:find-color (bos.m2:contract-color (bos.m2:m2-contract m2))) + transparent)))))) + (with-transaction (:generate-contract-image) + (setf (node-image node :contracts) + (bknr.images:make-store-image :name (format nil "contracts-~A-~A-~A" + (node-level node) + (node-x node) + (node-y node)) + :if-exists :kill))))) + +(defgeneric node-image (node layer-name) + (:method (node layer-name) + (gethash (find-keyword layer-name) (node-images node))) + (:method (node (layer-name (eql :contracts))) + (or (call-next-method) + (generate-contract-image node)))) + (defun (setf node-image) (new-image node layer-name) - (setf (gethash layer-name (node-images node)) new-image)) + (pushnew layer-name (slot-value (get-tree) 'layers)) + (setf (gethash (find-keyword layer-name) (node-images node)) new-image)) (defun import-image (image-filename layer-name) (cl-gd:with-image-from-file (map-image image-filename) @@ -75,11 +133,11 @@ tile-source-size tile-source-size :dest-width *tile-size* :dest-height *tile-size* :resample t :resize t) - (when-let (old-image (bknr.images:store-image-with-name image-name)) - (delete-object old-image)) - (setf (node-image node layer-name) - (bknr.images:make-store-image :image tile - :name image-name)) + (with-transaction (:make-tile) + (setf (node-image node layer-name) + (bknr.images:make-store-image :image tile + :name image-name + :if-exists :kill))) (when (< level *levels*) (let ((next-tile-source-size (/ tile-source-size 2)) (next-level (1+ level))) @@ -100,8 +158,11 @@ (defclass simple-map-handler (bknr.images::imageproc-handler) ()) +(defun find-keyword (name) + (find-symbol (string-upcase (string name)) :keyword)) + (defmethod bknr.web:object-handler-get-object ((handler simple-map-handler)) - (let* ((layer (bknr.web:parse-url)) + (let* ((layer (find-keyword (bknr.web:parse-url))) (tree (get-tree)) (node (tree-root tree)) (path (or (bknr.web:query-param "path") ""))) @@ -113,7 +174,8 @@ (setf (hunchentoot:aux-request-value 'zoom-path) (subseq path *levels*))) (or (node-image node layer) - (transparent-image)))) + (when (find layer (tree-layers tree)) + (transparent-image))))) (defun zoom-image (store-image zoom-path) (let ((source-size (floor (expt 2 (- (log *tile-size* 2) (length zoom-path))))) @@ -128,17 +190,47 @@ (incf y bit)) (setf bit (/ bit 2)))) (bknr.images:with-store-image (source-image store-image) - (cl-gd:with-image (zoomed-image *tile-size* *tile-size* t) - (cl-gd:copy-image source-image zoomed-image + (cl-gd:with-image* (*tile-size* *tile-size* t) + (setf (cl-gd:save-alpha-p) t) + (cl-gd:fill-image 0 0 :color (cl-gd:find-color 255 255 255 :alpha 127)) + (cl-gd:copy-image source-image cl-gd:*default-image* x y 0 0 source-size source-size :resize t :dest-width *tile-size* :dest-height *tile-size*) - (bknr.images:emit-image-to-browser zoomed-image :png))))) + (bknr.images:emit-image-to-browser cl-gd:*default-image* :png))))) (defmethod bknr.web:handle-object ((handler simple-map-handler) (image bknr.images:store-image)) (if-let (zoom-path (hunchentoot:aux-request-value 'zoom-path)) (zoom-image image zoom-path) (call-next-method))) +(defun contracts-changed (tree contract &key type) + (declare (ignore type tree)) + (destructuring-bind (width height) (cddr (bos.m2:contract-bounding-box contract)) + (let ((contract-size (max width height))) + (labels + ((recur (node) + (when (>= contract-size (node-pixel-size node)) + ;; contract is likely to be visible at this resolution, remove tile images so that they are regenerated + (when-let (image (gethash :contracts (node-images node))) + (format t "; contract image of ~A deleted~%" node) + (delete-file (blob-pathname image)) + (delete-object image) + (setf (node-image node :contracts) nil))) + (dolist (child (node-children node)) + (when (geometry:rectangle-intersects-p (bos.m2:contract-bounding-box contract) + (list (node-x child) (node-y child) + (node-size child) (node-size child))) + (recur child))))) + (recur (tree-root (get-tree))))))) + +(defun init-simple-sat-map () + (geometry:register-rect-subscriber geometry:*rect-publisher* + 'tree + (list 0 0 bos.m2.config:+width+ bos.m2.config:+width+) + 'contracts-changed)) + +(bos.m2:register-transient-init-function 'init-simple-sat-map + 'geometry:make-rect-publisher) \ No newline at end of file

1 0

[bknr-cvs] hans changed trunk/bknr/web/src/images/image.lisp
by BKNR Commits 05 Dec '08

05 Dec '08

Revision: 4113 Author: hans URL: http://bknr.net/trac/changeset/4113 Add new :IF-EXISTS keyword argument to MAKE-STORE-IMAGE that can be set to control whether an existing image of the same name should be overwritten. U trunk/bknr/web/src/images/image.lisp Modified: trunk/bknr/web/src/images/image.lisp =================================================================== --- trunk/bknr/web/src/images/image.lisp 2008-12-04 15:02:57 UTC (rev 4112) +++ trunk/bknr/web/src/images/image.lisp 2008-12-05 09:49:44 UTC (rev 4113) @@ -65,12 +65,20 @@ name (type :png) directory keywords + (if-exists :error) (class-name 'store-image) initargs) (unless (scan #?r"\D" name) (error "invalid image name ~A, needs to contain at least one non-digit character" name)) - (when (store-image-with-name name) - (error "can't make image with name ~A, an image with this name already exists in the datastore" name)) + (when-let (existing-image (store-image-with-name name)) + (ecase if-exists + (:error + (error "can't make image with name ~A, an image with this name already exists in the datastore" name)) + (:supersede + (delete-object existing-image)) + (:kill + (delete-file (blob-pathname existing-image)) + (delete-object existing-image)))) (let ((store-image (apply #'make-instance class-name :name name

1 0

[bknr-cvs] hans changed trunk/projects/bos/
by BKNR Commits 04 Dec '08

04 Dec '08

Revision: 4112 Author: hans URL: http://bknr.net/trac/changeset/4112 Support multiple layers in simple map tree. Hide map when displaying POI U trunk/projects/bos/payment-website/static/poi-ms.js U trunk/projects/bos/web/simple-sat-map.lisp Modified: trunk/projects/bos/payment-website/static/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.js 2008-12-03 22:48:32 UTC (rev 4111) +++ trunk/projects/bos/payment-website/static/poi-ms.js 2008-12-04 15:02:57 UTC (rev 4112) @@ -150,7 +150,8 @@ } }, poi.media); - mainMap.zoomTo(poi.x, poi.y); + mainMap.hide(); +// mainMap.zoomTo(poi.x, poi.y); } function pointToPath(point, level) { @@ -192,7 +193,7 @@ if (level < 15) { var path = pointToPath(point, level); log('getTileUrl: x:' + point.x + ' y:' + point.y + ' level:' + level + ' path: ' + path); - return '/simple-map/sl_utm50s-0?path=' + path; + return '/simple-map/sat-2002?path=' + path; } else { return null; } @@ -217,7 +218,8 @@ this.map.enableContinuousZoom(); this.map.enableScrollWheelZoom(); - this.overview = function() { + this.overview = function () { + this.show(); $('#map').removeClass('small'); $('#map').addClass('large'); this.addControls(); @@ -233,6 +235,14 @@ this.map.checkResize(); } + this.hide = function () { + $('#map').css('display', 'none'); + } + + this.show = function () { + $('#map').css('display', 'block'); + } + this.overview(); function pointToLatLng(x, y) { Modified: trunk/projects/bos/web/simple-sat-map.lisp =================================================================== --- trunk/projects/bos/web/simple-sat-map.lisp 2008-12-03 22:48:32 UTC (rev 4111) +++ trunk/projects/bos/web/simple-sat-map.lisp 2008-12-04 15:02:57 UTC (rev 4112) @@ -9,83 +9,114 @@ ;; having one image and four children. (define-persistent-class tree () - ((name :read) - (size :read) - (root :read))) + ((root :read))) -(defun tree-with-name (name) - (find name (class-instances 'tree) - :key #'tree-name - :test #'string-equal)) +(defmethod destroy-object :before ((tree tree)) + (labels + ((descend (node) + (when (node-children node) + (dolist (child (node-children node)) + (descend child))) + (delete-object node))) + (descend (tree-root tree)))) -(defun tree-depth (tree) - (values (- (ceiling (log (tree-size tree) 2)) 8))) +(defparameter *levels* 6) +(defparameter *tree-size* 16384) +(defparameter *tile-size* 256) -(defmethod print-object ((tree tree) stream) - (print-store-object (tree stream :type t) - (format stream "name ~S size ~D" (tree-name tree) (tree-size tree)))) +(defun make-tree () + (labels + ((make-quad (level) + (apply #'make-instance 'node + (when (< level *levels*) + (let ((next-level (1+ level))) + (list :children + (list (make-quad next-level) + (make-quad next-level) + (make-quad next-level) + (make-quad next-level)))))))) + (make-instance 'tree + :root (make-quad 0)))) +(defun get-tree () + (or (first (class-instances 'tree)) + (make-tree))) + (define-persistent-class node () - ((image :read) + ((images :read :initform (make-hash-table :test #'equal)) (children :read :initform nil))) -(defun import-image (image-filename &key (tile-size 256)) - (assert (= (log tile-size 2) (round (log tile-size 2))) - () "TILE-SIZE needs to be power of two") +(defmethod destroy-object :before ((node node)) + (loop + for image being the hash-values of (node-images node) + do (unless (object-destroyed-p image) + (delete-object image)))) + +(defun node-image (node layer-name) + (gethash layer-name (node-images node))) + +(defun (setf node-image) (new-image node layer-name) + (setf (gethash layer-name (node-images node)) new-image)) + +(defun import-image (image-filename layer-name) (cl-gd:with-image-from-file (map-image image-filename) (format t "~&; read image ~A, width ~A height ~A~%" image-filename (cl-gd:image-width map-image) (cl-gd:image-height map-image)) - (let* ((basename (pathname-name image-filename)) - (pow (ceiling (log (max (cl-gd:image-height map-image) - (cl-gd:image-width map-image)) 2))) - (size (expt 2 pow)) - (levels (floor (- pow (log tile-size 2))))) - (format t "~&; pow ~A size ~A levels ~A~%" pow size levels) + (let* ((basename (pathname-name image-filename))) (labels - ((write-quad (x y level) + ((make-image (node x y level) (format t "; ~A ~A ~A~%" x y level) - (cl-gd:with-image (tile tile-size tile-size t) - (let ((tile-source-size (/ size (expt 2 level)))) + (cl-gd:with-image (tile *tile-size* *tile-size* t) + (let ((tile-source-size (/ *tree-size* (expt 2 level))) + (image-name (format nil "~A-~A-~A-~A" basename level x y))) (cl-gd:copy-image map-image tile x y 0 0 tile-source-size tile-source-size - :dest-width tile-size :dest-height tile-size + :dest-width *tile-size* :dest-height *tile-size* :resample t :resize t) - (apply #'make-instance 'node - :image (bknr.images:make-store-image :image tile - :name (format nil "~A-~A-~A-~A" - basename level x y)) - (when (< level levels) - (let ((next-tile-source-size (/ tile-source-size 2)) - (next-level (1+ level))) - (list :children - (list (write-quad x y next-level) - (write-quad (+ x next-tile-source-size) y next-level) - (write-quad x (+ y next-tile-source-size) next-level) - (write-quad (+ x next-tile-source-size) (+ y next-tile-source-size) next-level)))))))))) - (make-instance 'tree - :name basename - :root (write-quad 0 0 0)))))) + (when-let (old-image (bknr.images:store-image-with-name image-name)) + (delete-object old-image)) + (setf (node-image node layer-name) + (bknr.images:make-store-image :image tile + :name image-name)) + (when (< level *levels*) + (let ((next-tile-source-size (/ tile-source-size 2)) + (next-level (1+ level))) + (destructuring-bind (one two three four) (node-children node) + (make-image one x y next-level) + (make-image two (+ x next-tile-source-size) y next-level) + (make-image three x (+ y next-tile-source-size) next-level) + (make-image four (+ x next-tile-source-size) (+ y next-tile-source-size) next-level)))))))) + (make-image (tree-root (get-tree)) 0 0 0))))) +(defun transparent-image () + (or (bknr.images:store-image-with-name "transparent") + (cl-gd:with-image* (*tile-size* *tile-size* nil) + (setf (cl-gd:transparent-color) + (cl-gd:allocate-color 0 0 0 :alpha 127)) + (bknr.images:make-store-image :name "transparent" :type :gif)))) + (defclass simple-map-handler (bknr.images::imageproc-handler) ()) (defmethod bknr.web:object-handler-get-object ((handler simple-map-handler)) - (let* ((tree (tree-with-name (bknr.web:parse-url))) + (let* ((layer (bknr.web:parse-url)) + (tree (get-tree)) (node (tree-root tree)) (path (or (bknr.web:query-param "path") ""))) - (dotimes (i (min (length path) - (tree-depth tree))) - (setf node (nth (parse-integer path :start i :end (1+ i)) - (node-children node)))) - (when (> (length path) (tree-depth tree)) - (setf (hunchentoot:aux-request-value 'zoom-path) - (subseq path (tree-depth tree)))) - (node-image node))) + (dotimes (i (min (length path) + *levels*)) + (setf node (nth (parse-integer path :start i :end (1+ i)) + (node-children node)))) + (when (> (length path) *levels*) + (setf (hunchentoot:aux-request-value 'zoom-path) + (subseq path *levels*))) + (or (node-image node layer) + (transparent-image)))) (defun zoom-image (store-image zoom-path) - (let ((source-size (expt 2 (- 8 (length zoom-path)))) + (let ((source-size (floor (expt 2 (- (log *tile-size* 2) (length zoom-path))))) (x 0) (y 0) (bit 128)) @@ -97,16 +128,17 @@ (incf y bit)) (setf bit (/ bit 2)))) (bknr.images:with-store-image (source-image store-image) - (cl-gd:with-image (zoomed-image 256 256 t) + (cl-gd:with-image (zoomed-image *tile-size* *tile-size* t) (cl-gd:copy-image source-image zoomed-image x y 0 0 source-size source-size :resize t - :dest-width 256 :dest-height 256) + :dest-width *tile-size* :dest-height *tile-size*) (bknr.images:emit-image-to-browser zoomed-image :png))))) -(defmethod bknr.web:handle-object ((handler simple-map-handler) image) +(defmethod bknr.web:handle-object ((handler simple-map-handler) (image bknr.images:store-image)) (if-let (zoom-path (hunchentoot:aux-request-value 'zoom-path)) (zoom-image image zoom-path) - (call-next-method))) \ No newline at end of file + (call-next-method))) +

1 0

[bknr-cvs] hans changed trunk/libraries/ccl-profiler/
by BKNR Commits 03 Dec '08

03 Dec '08

Revision: 4111 Author: hans URL: http://bknr.net/trac/changeset/4111 This lives in the CCL svn D trunk/libraries/ccl-profiler/

1 0

[bknr-cvs] hans changed trunk/projects/bos/
by BKNR Commits 03 Dec '08

03 Dec '08

Revision: 4110 Author: hans URL: http://bknr.net/trac/changeset/4110 more google maps goodness U trunk/projects/bos/payment-website/static/poi-ms.css U trunk/projects/bos/payment-website/static/poi-ms.html U trunk/projects/bos/payment-website/static/poi-ms.js U trunk/projects/bos/web/simple-sat-map.lisp Modified: trunk/projects/bos/payment-website/static/poi-ms.css =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.css 2008-12-03 21:17:12 UTC (rev 4109) +++ trunk/projects/bos/payment-website/static/poi-ms.css 2008-12-03 21:19:43 UTC (rev 4110) @@ -35,7 +35,15 @@ position: absolute; } -#google-map { +#map { +} + +#map.large { + width: 600px; + height: 600px; +} + +#map.small { width: 400px; - height: 300px; -} \ No newline at end of file + height: 150px; +} Modified: trunk/projects/bos/payment-website/static/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.html 2008-12-03 21:17:12 UTC (rev 4109) +++ trunk/projects/bos/payment-website/static/poi-ms.html 2008-12-03 21:19:43 UTC (rev 4110) @@ -18,6 +18,10 @@ <div id="bd"> <div id="yui-main"> <div class="yui-b" id="content"> + <div id="map"> + </div> + <div id="content-body"> + </div> </div> </div> <div class="yui-b"> @@ -29,7 +33,6 @@ <select id="poi-selector" size="1"> <option value="overview">Übersicht</option> <option value="sponsors">Sponsoren</option> - <option value="map">Google Map</option> </select> <div id="left-bar"> </div> Modified: trunk/projects/bos/payment-website/static/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.js 2008-12-03 21:17:12 UTC (rev 4109) +++ trunk/projects/bos/payment-website/static/poi-ms.js 2008-12-03 21:19:43 UTC (rev 4110) @@ -5,6 +5,7 @@ var googleMapKey = "ABQIAAAA5meUSZ1F7u46UjJHEXSlJhQkkdysj0TmG3bX_n9aMEXHvIwNeRQLmdjbjYpAetJRis7naMxi-fqMRQ"; var pois = {}; var sponsors = []; +var mainMap; Date.prototype.renderDate = function() { return this.getDate() + '.' + this.getMonth() + '.' + (this.getYear() > 2000 ? this.getYear() : (1900 + this.getYear())); @@ -86,7 +87,7 @@ $('#media-list *').removeClass('active'); $(e.target).addClass('active'); - $('#content') + $('#content-body') .empty() .append(H2(null, medium.title), mediaHandlers[medium.mediumType].makeViewer(medium), @@ -118,49 +119,16 @@ return path; } -function makeMap(centerX, centerY) { - var rows = []; - - for (var y = -1; y < 3; y++) { - var tiles = []; - for (var x = -1; x < 3; x++) { - tiles.push(IMG({ 'class': 'map-tile', - src: '/overview/' - + (Math.floor(centerX / 90) + x) * 90 - + '/' - + (Math.floor(centerY / 90) + y) * 90, - width: 90, height: 90 })); - } - rows.push(DIV(null, tiles)); - } - - return DIV(null, rows); -} - -function positionMapIcon(img, x, y) { - img.style.left = (x - (Math.floor(x / 90) - 1) * 90) + 'px'; - img.style.top = (y - (Math.floor(y / 90) - 1) * 90) + 'px'; - return img; -} - function loadMainInfo(poi) { - $('#content') + $('#content-body') .empty() .append(H2(null, poi.subtitle), - DIV({ 'class': 'map' }, - makeMap(poi.x, poi.y), - positionMapIcon(IMG({ 'class': 'icon', - src: '/images/' + poi.icon + '.gif', - width: 16, height: 16}), - poi.x - 8, poi.y - 8)), P(null, poi.description)); } -function showPOI(e) { - var poi = pois[(e.target && e.target.value) || e.data]; +function showPOI(poi) { - $('#left-bar') .empty() .append(UL({ id: 'media-list' })); @@ -181,6 +149,8 @@ .bind('click', medium, showMedium)); } }, poi.media); + + mainMap.zoomTo(poi.x, poi.y); } function pointToPath(point, level) { @@ -195,19 +165,20 @@ return path; } -function showGoogleMap() { - var mapDiv = DIV({ id: 'google-map' }); - $('#content') - +function showOverview() { + $('#content-body') .empty() - .append(H2(null, NLS('Google Map')), - mapDiv); + .append(H2(null, NLS('Google Map'))); $('#left-bar') .empty(); - var map = new GMap2(mapDiv); + mainMap.overview(); +} +function Map() { + this.map = new GMap2($('#map')[0]); + var copyright = new GCopyright(1, new GLatLngBounds(new GLatLng(-90, -180), new GLatLng(90, 180)), @@ -215,10 +186,10 @@ "Copyright BOS Deutschland e.V."); var copyrightCollection = new GCopyrightCollection('Map'); copyrightCollection.addCopyright(copyright); - var tileLayers = [new GTileLayer(copyrightCollection, 0, 7)]; - var projection = new GMercatorProjection(7); + var tileLayers = [new GTileLayer(copyrightCollection, 0, 12)]; + var projection = new GMercatorProjection(12); tileLayers[0].getTileUrl = function(point, level) { - if (level < 7) { + if (level < 15) { var path = pointToPath(point, level); log('getTileUrl: x:' + point.x + ' y:' + point.y + ' level:' + level + ' path: ' + path); return '/simple-map/sl_utm50s-0?path=' + path; @@ -227,22 +198,63 @@ } } var customMap = new GMapType(tileLayers, projection, 'Map', { errorMessage: NLS("Keine Daten in dieser Zoomstufe") }); - map.addMapType(customMap); - map.addControl(new GLargeMapControl()); - map.setCenter(new GLatLng(0, 0), 1, customMap); + this.map.addMapType(customMap); + + this.controls = [ new GLargeMapControl() ]; + + this.addControls = function() { + for (var i in this.controls) { + this.map.addControl(this.controls[i]); + } + } + this.removeControls = function() { + for (var i in this.controls) { + this.map.removeControl(this.controls[i]); + } + } + + this.map.enableContinuousZoom(); + this.map.enableScrollWheelZoom(); + + this.overview = function() { + $('#map').removeClass('small'); + $('#map').addClass('large'); + this.addControls(); + this.map.setCenter(projection.fromPixelToLatLng(new GPoint(7000, 6350), 6), 2, customMap); + this.map.checkResize(); + } + + this.zoomTo = function (x, y) { + $('#map').removeClass('large'); + $('#map').addClass('small'); + this.removeControls(); + this.map.setCenter(projection.fromPixelToLatLng(new GPoint(x, y), 6), 6); + this.map.checkResize(); + } + + this.overview(); + + function pointToLatLng(x, y) { + return projection.fromPixelToLatLng(new GPoint(x, y), 6); + } + + for (var i in pois) { + var marker = new GMarker(pointToLatLng(pois[i].x, pois[i].y)); + GEvent.addListener(marker, "click", partial(showPOI, pois[i])); + this.map.addOverlay(marker); + } } var pages = { overview: showOverview, - map: showGoogleMap } function selectPage(e) { var value = e.target.value; if (value.match(/^\d+/)) { - showPOI(e); + showPOI(pois[value]); } else if (pages[value]) { pages[value](e); } @@ -251,46 +263,11 @@ function showSponsor(e) { var sponsor = e.data; var contract = sponsor.contracts[0]; - $('#content') + $('#content-body') .empty() - .append(H2(null, sponsor.name), - DIV({ 'class': 'map' }, - makeMap(contract.left, contract.top), - positionMapIcon(IMG({ 'class': 'contract', - src: '/contract-image/' + contract.id, - width: contract.width, height: contract.height}), - contract.left, contract.top)) - ); + .append(H2(null, sponsor.name)); } -function showOverview() { - - $('#poi-selector').val('overview'); - - var elements = []; - elements.push(IMG({ src: '/infosystem/bilder/karte_uebersicht.jpg', width: 360, height: 360 })); - for (var i in pois) { - var poi = pois[i]; - var link = A({ href: '#' }, - IMG({ 'class': 'icon', - src: '/images/' + poi.icon + '.gif', - width: 16, height: 16, - title: poi.title, - style: 'left: ' + (Math.round(poi.x / 30) - 8) + 'px; ' - + 'top: ' + (Math.round(poi.y / 30) - 8) + 'px' })); - $(link).bind('click', poi.id, showPOI); - elements.push(link); - } - - $('#content') - .empty() - .append(H2(null, NLS('Übersicht')), - DIV({ 'class': 'map' }, elements)); - - $('#left-bar') - .empty(); -} - function showSponsors() { $('#left-bar') @@ -320,7 +297,7 @@ var poi_id = document.location.hash.replace(/#/, ""); if (poi_id) { - showPOI({ data: poi_id }); + showPOI(pois[poi_id]); } else { showOverview(); } @@ -339,6 +316,8 @@ } $('#poi-selector').bind('change', null, selectPage); + mainMap = new Map(); + loadJSONDoc('/sponsors-json').addCallback(loadSponsors); } catch (e) { @@ -347,7 +326,7 @@ } function init() { - $('#small-map a').bind('click', showPOI); + $('#small-map a').bind('click', showOverview); loadJSONDoc('/poi-json').addCallback(loadPOIs); } \ No newline at end of file Modified: trunk/projects/bos/web/simple-sat-map.lisp =================================================================== --- trunk/projects/bos/web/simple-sat-map.lisp 2008-12-03 21:17:12 UTC (rev 4109) +++ trunk/projects/bos/web/simple-sat-map.lisp 2008-12-03 21:19:43 UTC (rev 4110) @@ -10,6 +10,7 @@ (define-persistent-class tree () ((name :read) + (size :read) (root :read))) (defun tree-with-name (name) @@ -17,6 +18,13 @@ :key #'tree-name :test #'string-equal)) +(defun tree-depth (tree) + (values (- (ceiling (log (tree-size tree) 2)) 8))) + +(defmethod print-object ((tree tree) stream) + (print-store-object (tree stream :type t) + (format stream "name ~S size ~D" (tree-name tree) (tree-size tree)))) + (define-persistent-class node () ((image :read) (children :read :initform nil))) @@ -64,9 +72,41 @@ ()) (defmethod bknr.web:object-handler-get-object ((handler simple-map-handler)) - (let ((node (tree-root (tree-with-name (bknr.web:parse-url)))) - (path (or (bknr.web:query-param "path") ""))) - (dotimes (i (length path)) + (let* ((tree (tree-with-name (bknr.web:parse-url))) + (node (tree-root tree)) + (path (or (bknr.web:query-param "path") ""))) + (dotimes (i (min (length path) + (tree-depth tree))) (setf node (nth (parse-integer path :start i :end (1+ i)) (node-children node)))) - (node-image node))) + (when (> (length path) (tree-depth tree)) + (setf (hunchentoot:aux-request-value 'zoom-path) + (subseq path (tree-depth tree)))) + (node-image node))) + +(defun zoom-image (store-image zoom-path) + (let ((source-size (expt 2 (- 8 (length zoom-path)))) + (x 0) + (y 0) + (bit 128)) + (dotimes (i (length zoom-path)) + (let ((path-bits (- (char-code (aref zoom-path i)) #.(char-code #\0)))) + (when (plusp (logand 1 path-bits)) + (incf x bit)) + (when (plusp (logand 2 path-bits)) + (incf y bit)) + (setf bit (/ bit 2)))) + (bknr.images:with-store-image (source-image store-image) + (cl-gd:with-image (zoomed-image 256 256 t) + (cl-gd:copy-image source-image zoomed-image + x y + 0 0 + source-size source-size + :resize t + :dest-width 256 :dest-height 256) + (bknr.images:emit-image-to-browser zoomed-image :png))))) + +(defmethod bknr.web:handle-object ((handler simple-map-handler) image) + (if-let (zoom-path (hunchentoot:aux-request-value 'zoom-path)) + (zoom-image image zoom-path) + (call-next-method))) \ No newline at end of file

1 0

[bknr-cvs] hans changed trunk/bknr/datastore/src/
by BKNR Commits 03 Dec '08

03 Dec '08

Revision: 4109 Author: hans URL: http://bknr.net/trac/changeset/4109 add print-store-object macro, fix dependencies U trunk/bknr/datastore/src/bknr.datastore.asd U trunk/bknr/datastore/src/data/object.lisp U trunk/bknr/datastore/src/data/package.lisp Modified: trunk/bknr/datastore/src/bknr.datastore.asd =================================================================== --- trunk/bknr/datastore/src/bknr.datastore.asd 2008-12-03 21:16:32 UTC (rev 4108) +++ trunk/bknr/datastore/src/bknr.datastore.asd 2008-12-03 21:17:12 UTC (rev 4109) @@ -22,6 +22,7 @@ :unit-test :bknr.utils :bknr.indices + :yason :trivial-utf-8) :components ((:module "data" :components ((:file "package") Modified: trunk/bknr/datastore/src/data/object.lisp =================================================================== --- trunk/bknr/datastore/src/data/object.lisp 2008-12-03 21:16:32 UTC (rev 4108) +++ trunk/bknr/datastore/src/data/object.lisp 2008-12-03 21:17:12 UTC (rev 4109) @@ -282,6 +282,12 @@ ;; running the transaction log. (initialize-transient-instance object)) +(defmacro print-store-object ((object stream &key type) &body body) + ;; variable capture accepted here. + `(print-unreadable-object (,object ,stream :type ,type) + (format stream "ID: ~D " (store-object-id ,object)) + ,@body)) + (defmethod print-object ((object store-object) stream) (print-unreadable-object (object stream :type t) (format stream "ID: ~D" (store-object-id object)))) Modified: trunk/bknr/datastore/src/data/package.lisp =================================================================== --- trunk/bknr/datastore/src/data/package.lisp 2008-12-03 21:16:32 UTC (rev 4108) +++ trunk/bknr/datastore/src/data/package.lisp 2008-12-03 21:17:12 UTC (rev 4109) @@ -56,6 +56,7 @@ #:store-object-id #:store-object-last-change #:store-object-touch + #:print-store-object #:delete-object #:delete-objects

1 0

[bknr-cvs] hans changed trunk/projects/quickhoney/src/handlers.lisp
by BKNR Commits 03 Dec '08

03 Dec '08

Revision: 4108 Author: hans URL: http://bknr.net/trac/changeset/4108 adapt to current yason api U trunk/projects/quickhoney/src/handlers.lisp Modified: trunk/projects/quickhoney/src/handlers.lisp =================================================================== --- trunk/projects/quickhoney/src/handlers.lisp 2008-12-02 22:16:07 UTC (rev 4107) +++ trunk/projects/quickhoney/src/handlers.lisp 2008-12-03 21:16:32 UTC (rev 4108) @@ -45,7 +45,7 @@ () (:default-initargs :query-function #'store-image-with-name)) -(defmethod json:encode ((object symbol) stream) +(defmethod json:encode ((object symbol) &optional stream) (json:encode (string-downcase (symbol-name object)) stream)) @@ -598,4 +598,4 @@ (defmethod handle ((handler shutdown-handler)) (hunchentoot:stop-server hunchentoot:*server*) - "Shutting down HTTP server") \ No newline at end of file + "Shutting down HTTP server")

1 0

[bknr-cvs] hans changed trunk/projects/bos/
by BKNR Commits 02 Dec '08

02 Dec '08

Revision: 4107 Author: hans URL: http://bknr.net/trac/changeset/4107 fix compilation problems U trunk/projects/bos/m2/bos.m2.asd U trunk/projects/bos/m2/packages.lisp D trunk/projects/bos/m2/simple-sat-map.lisp U trunk/projects/bos/web/bos.web.asd U trunk/projects/bos/web/packages.lisp A trunk/projects/bos/web/simple-sat-map.lisp U trunk/projects/bos/web/webserver.lisp Modified: trunk/projects/bos/m2/bos.m2.asd =================================================================== --- trunk/projects/bos/m2/bos.m2.asd 2008-12-02 22:00:36 UTC (rev 4106) +++ trunk/projects/bos/m2/bos.m2.asd 2008-12-02 22:16:07 UTC (rev 4107) @@ -3,10 +3,18 @@ (in-package :cl-user) (asdf:defsystem :bos.m2 - :depends-on (:bknr.datastore :bknr.modules :cl-smtp :cl-mime - :kmrcl :iterate :arnesi - :cl-pdf :cl-pdf-parser :screamer :cl-fad - :yason) + :depends-on (:bknr.datastore + :bknr.modules + :cl-smtp + :cl-mime + :kmrcl + :iterate + :arnesi + :cl-pdf + :cl-pdf-parser + :screamer + :cl-fad + :yason) :components ((:file "packages") (:file "geo-utm" :depends-on ("packages")) (:file "geometry" :depends-on ("packages")) Modified: trunk/projects/bos/m2/packages.lisp =================================================================== --- trunk/projects/bos/m2/packages.lisp 2008-12-02 22:00:36 UTC (rev 4106) +++ trunk/projects/bos/m2/packages.lisp 2008-12-02 22:16:07 UTC (rev 4107) @@ -293,13 +293,4 @@ #:add-area #:count-cache-entries #:pprint-cache - #:allocation-cache-subsystem)) - -(defpackage :simple-sat-map - (:use :cl - :bknr.indices - :bknr.datastore - :alexandria) - (:shadowing-import-from :alexandria #:array-index) - (:nicknames :ssm) - ) \ No newline at end of file + #:allocation-cache-subsystem)) \ No newline at end of file Deleted: trunk/projects/bos/m2/simple-sat-map.lisp =================================================================== --- trunk/projects/bos/m2/simple-sat-map.lisp 2008-12-02 22:00:36 UTC (rev 4106) +++ trunk/projects/bos/m2/simple-sat-map.lisp 2008-12-02 22:16:07 UTC (rev 4107) @@ -1,72 +0,0 @@ -(in-package :ssm) - -;; Simple Sat Map - -;; This satellite map interface works with square tiles of 256 pixels. -;; The original image is extended so that the number of pixels is a -;; power of two. The same dimensions are assumed in x and y -;; directions. It is then stored in a quad tree, with each node -;; having one image and four children. - -(define-persistent-class tree () - ((name :read) - (root :read))) - -(defun tree-with-name (name) - (find name (class-instances 'tree) - :key #'tree-name - :test #'string-equal)) - -(define-persistent-class node () - ((image :read) - (children :read :initform nil))) - -(defun import-image (image-filename &key (tile-size 256)) - (assert (= (log tile-size 2) (round (log tile-size 2))) - () "TILE-SIZE needs to be power of two") - (cl-gd:with-image-from-file (map-image image-filename) - (format t "~&; read image ~A, width ~A height ~A~%" - image-filename (cl-gd:image-width map-image) (cl-gd:image-height map-image)) - (let* ((basename (pathname-name image-filename)) - (pow (ceiling (log (max (cl-gd:image-height map-image) - (cl-gd:image-width map-image)) 2))) - (size (expt 2 pow)) - (levels (floor (- pow (log tile-size 2))))) - (format t "~&; pow ~A size ~A levels ~A~%" pow size levels) - (labels - ((write-quad (x y level) - (format t "; ~A ~A ~A~%" x y level) - (cl-gd:with-image (tile tile-size tile-size t) - (let ((tile-source-size (/ size (expt 2 level)))) - (cl-gd:copy-image map-image tile - x y - 0 0 - tile-source-size tile-source-size - :dest-width tile-size :dest-height tile-size - :resample t :resize t) - (apply #'make-instance 'node - :image (bknr.images:make-store-image :image tile - :name (format nil "~A-~A-~A-~A" - basename level x y)) - (when (< level levels) - (let ((next-tile-source-size (/ tile-source-size 2)) - (next-level (1+ level))) - (list :children - (list (write-quad x y next-level) - (write-quad (+ x next-tile-source-size) y next-level) - (write-quad x (+ y next-tile-source-size) next-level) - (write-quad (+ x next-tile-source-size) (+ y next-tile-source-size) next-level)))))))))) - (make-instance 'tree - :name basename - :root (write-quad 0 0 0)))))) - -(defclass simple-map-handler (bknr.images::imageproc-handler) - ()) - -(defmethod bknr.web:object-handler-get-object ((handler simple-map-handler)) - (let ((node (tree-root (tree-with-name (bknr.web:parse-url)))) - (path (or (bknr.web:query-param "path") ""))) - (dotimes (i (length path)) - (setf node (nth (parse-integer path :start i :end (1+ i)) - (node-children node)))) - (node-image node))) Modified: trunk/projects/bos/web/bos.web.asd =================================================================== --- trunk/projects/bos/web/bos.web.asd 2008-12-02 22:00:36 UTC (rev 4106) +++ trunk/projects/bos/web/bos.web.asd 2008-12-02 22:16:07 UTC (rev 4107) @@ -16,7 +16,10 @@ :description "worldpay test web server" :long-description "" - :depends-on (:bknr.web :bknr.modules :bos.m2 :cxml) + :depends-on (:bknr.web + :bknr.modules + :bos.m2 + :cxml) :components ((:file "packages") (:file "utf-8" :depends-on ("packages")) @@ -25,6 +28,7 @@ (:file "web-macros" :depends-on ("packages")) (:file "web-utils" :depends-on ("packages")) (:file "cms-links" :depends-on ("packages")) + (:file "simple-sat-map" :depends-on ("packages")) (:file "map-handlers" :depends-on ("packages" "web-macros")) (:file "map-browser-handler" :depends-on ("packages" "web-macros")) (:file "poi-handlers" :depends-on ("dictionary" "packages" "web-macros")) Modified: trunk/projects/bos/web/packages.lisp =================================================================== --- trunk/projects/bos/web/packages.lisp 2008-12-02 22:00:36 UTC (rev 4106) +++ trunk/projects/bos/web/packages.lisp 2008-12-02 22:16:07 UTC (rev 4107) @@ -25,3 +25,13 @@ (:shadowing-import-from :cl-interpol #:quote-meta-chars) (:shadowing-import-from :alexandria #:array-index) (:export)) + +(defpackage :simple-sat-map + (:use :cl + :bknr.indices + :bknr.datastore + :alexandria) + (:shadowing-import-from :alexandria #:array-index) + (:nicknames :ssm) + (:export #:simple-map-handler + #:import)) \ No newline at end of file Copied: trunk/projects/bos/web/simple-sat-map.lisp (from rev 4106, trunk/projects/bos/m2/simple-sat-map.lisp) =================================================================== --- trunk/projects/bos/web/simple-sat-map.lisp (rev 0) +++ trunk/projects/bos/web/simple-sat-map.lisp 2008-12-02 22:16:07 UTC (rev 4107) @@ -0,0 +1,72 @@ +(in-package :ssm) + +;; Simple Sat Map + +;; This satellite map interface works with square tiles of 256 pixels. +;; The original image is extended so that the number of pixels is a +;; power of two. The same dimensions are assumed in x and y +;; directions. It is then stored in a quad tree, with each node +;; having one image and four children. + +(define-persistent-class tree () + ((name :read) + (root :read))) + +(defun tree-with-name (name) + (find name (class-instances 'tree) + :key #'tree-name + :test #'string-equal)) + +(define-persistent-class node () + ((image :read) + (children :read :initform nil))) + +(defun import-image (image-filename &key (tile-size 256)) + (assert (= (log tile-size 2) (round (log tile-size 2))) + () "TILE-SIZE needs to be power of two") + (cl-gd:with-image-from-file (map-image image-filename) + (format t "~&; read image ~A, width ~A height ~A~%" + image-filename (cl-gd:image-width map-image) (cl-gd:image-height map-image)) + (let* ((basename (pathname-name image-filename)) + (pow (ceiling (log (max (cl-gd:image-height map-image) + (cl-gd:image-width map-image)) 2))) + (size (expt 2 pow)) + (levels (floor (- pow (log tile-size 2))))) + (format t "~&; pow ~A size ~A levels ~A~%" pow size levels) + (labels + ((write-quad (x y level) + (format t "; ~A ~A ~A~%" x y level) + (cl-gd:with-image (tile tile-size tile-size t) + (let ((tile-source-size (/ size (expt 2 level)))) + (cl-gd:copy-image map-image tile + x y + 0 0 + tile-source-size tile-source-size + :dest-width tile-size :dest-height tile-size + :resample t :resize t) + (apply #'make-instance 'node + :image (bknr.images:make-store-image :image tile + :name (format nil "~A-~A-~A-~A" + basename level x y)) + (when (< level levels) + (let ((next-tile-source-size (/ tile-source-size 2)) + (next-level (1+ level))) + (list :children + (list (write-quad x y next-level) + (write-quad (+ x next-tile-source-size) y next-level) + (write-quad x (+ y next-tile-source-size) next-level) + (write-quad (+ x next-tile-source-size) (+ y next-tile-source-size) next-level)))))))))) + (make-instance 'tree + :name basename + :root (write-quad 0 0 0)))))) + +(defclass simple-map-handler (bknr.images::imageproc-handler) + ()) + +(defmethod bknr.web:object-handler-get-object ((handler simple-map-handler)) + (let ((node (tree-root (tree-with-name (bknr.web:parse-url)))) + (path (or (bknr.web:query-param "path") ""))) + (dotimes (i (length path)) + (setf node (nth (parse-integer path :start i :end (1+ i)) + (node-children node)))) + (node-image node))) Modified: trunk/projects/bos/web/webserver.lisp =================================================================== --- trunk/projects/bos/web/webserver.lisp 2008-12-02 22:00:36 UTC (rev 4106) +++ trunk/projects/bos/web/webserver.lisp 2008-12-02 22:16:07 UTC (rev 4107) @@ -183,7 +183,7 @@ ("/poi-kml-look-at" poi-kml-look-at-handler) ("/poi-kml" poi-kml-handler) ("/map-browser" map-browser-handler) - ("/simple-map" ssm::simple-map-handler) + ("/simple-map" ssm:simple-map-handler) ("/poi-javascript" poi-javascript-handler) ("/m2-javascript" m2-javascript-handler) ("/poi-json" poi-json-handler)

1 0