[bknr-cvs] hans changed trunk/projects/bos/
BKNR Commits
bknr at bknr.net
Wed Dec 3 21:19:43 UTC 2008
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
More information about the Bknr-cvs
mailing list