bknr-cvs

bknr-cvs@common-lisp.net

1964 discussions

[bknr-cvs] hans changed trunk/thirdparty/usocket/
by BKNR Commits 10 Dec '08

10 Dec '08

Revision: 4126 Author: hans URL: http://bknr.net/trac/changeset/4126 moving to usocket trunk D trunk/thirdparty/usocket/

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms/poi-ms.
by BKNR Commits 09 Dec '08

09 Dec '08

Revision: 4125 Author: hans URL: http://bknr.net/trac/changeset/4125 Maps tweaks U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css 2008-12-09 20:04:01 UTC (rev 4124) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css 2008-12-09 21:47:02 UTC (rev 4125) @@ -143,6 +143,6 @@ height: 505px; } #map.small { - width: 400px; - height: 150px; + width: 505px; + height: 200px; } Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html 2008-12-09 20:04:01 UTC (rev 4124) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html 2008-12-09 21:47:02 UTC (rev 4125) @@ -23,9 +23,10 @@ </div> </div> <div id="content"> + <h1 id="title"></h1> + <div id="map"><img src="fake-map.jpg" width="505" height="505"/></div> <div id="content-body"> </div> - <div id="map"><img src="fake-map.jpg" width="505" height="505"/></div> </div> </div> </body> Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js 2008-12-09 20:04:01 UTC (rev 4124) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js 2008-12-09 21:47:02 UTC (rev 4125) @@ -79,6 +79,8 @@ var poi = e.data[0]; var medium = e.data[1]; + mainMap.hide(); + /* Work around jQuery bug when trying to remove applet from DOM with IE. */ var applet = $("#applet")[0]; if (applet) { @@ -88,10 +90,10 @@ $('#media-list *').removeClass('active'); $(e.target).addClass('active'); + $('#title').text(poi.title); $('#content-body') .empty() - .append(H1(null, poi.title), - H2(null, medium.title), + .append(H2(null, medium.title), mediaHandlers[medium.mediumType].makeViewer(medium), H3(null, medium.subtitle), P(null, medium.description)); @@ -134,6 +136,8 @@ poi = poi.data; } + mainMap.poiDetail(poi.x, poi.y); + $('#back').css('visibility', 'inherit'); $('#left-bar') .empty() @@ -142,10 +146,11 @@ document.title = poi.title; + $('#title').text(poi.title); + $('#content-body') .empty() - .append(H1(null, poi.title), - H2(null, poi.subtitle), + .append(H2(null, poi.subtitle), P(null, poi.description)); map(function (medium) { if (mediaHandlers[medium.mediumType]) { @@ -158,7 +163,6 @@ } }, poi.media.sort(compareMedia)); - mainMap.hide(); } function pointToPath(point, level) { @@ -175,9 +179,11 @@ function showOverview() { $('#back').css('visibility', 'hidden'); + + $('#title').text(NLS('Übersicht')); + $('#content-body') - .empty() - .append(H1(null, NLS('Übersicht'))); + .empty(); $('#left-bar') .empty() @@ -282,16 +288,16 @@ $('#map').removeClass('small'); $('#map').addClass('large'); this.addControls(); + this.map.checkResize(); this.map.setCenter(projection.fromPixelToLatLng(new GPoint(6500, 6350), 6), 2, customMap); - this.map.checkResize(); } this.poiDetail = function (x, y) { $('#map').removeClass('large'); $('#map').addClass('small'); this.removeControls(); + this.map.checkResize(); this.map.setCenter(projection.fromPixelToLatLng(new GPoint(x, y), 6), 6); - this.map.checkResize(); } this.zoomTo = function (x, y, level) {

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms/poi-ms.
by BKNR Commits 09 Dec '08

09 Dec '08

Revision: 4124 Author: hans URL: http://bknr.net/trac/changeset/4124 Re-enable Google Maps U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css 2008-12-09 17:01:00 UTC (rev 4123) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css 2008-12-09 20:04:01 UTC (rev 4124) @@ -139,8 +139,8 @@ float:left; } #map.large { - width: 600px; - height: 600px; + width: 505px; + height: 505px; } #map.small { width: 400px; Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html 2008-12-09 17:01:00 UTC (rev 4123) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html 2008-12-09 20:04:01 UTC (rev 4124) @@ -6,7 +6,7 @@ <script src="/static/MochiKit/MochiKit.js" type="text/javascript"> </script> <script src="/static/jquery-nightly.js" type="text/javascript"> </script> <script src="poi-ms.js" type="text/javascript"> </script> - + <script src="http://maps.google.com/maps?file=api&v=2&key=ABQIAAAA5meUSZ1F7u46Uj…" type="text/javascript"> </script> <meta http-equiv="content-type" content="text/html; charset=utf-8" /> </head> <body> @@ -16,7 +16,7 @@ <div class="navigation"> <div id="small-map" class="map"> <a href="#"><img src="uebersichtskarte_klein.gif" width="118" height="58" border="0"/></a><br /> - <a href="#" id="back">zurueck</a> + <a href="#" id="back">zurück</a> </div> <div id="left-bar"> </div> Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js 2008-12-09 17:01:00 UTC (rev 4123) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js 2008-12-09 20:04:01 UTC (rev 4124) @@ -219,10 +219,11 @@ this.map = new GMap2($('#map')[0]); var copyrightCollection = new GCopyrightCollection('Map'); - copyrightCollection.addCopyright(new GCopyright(1, - new GLatLngBounds(new GLatLng(-90, -180), new GLatLng(90, 180)), - 3, - "Copyright BOS Deutschland e.V.")); + copyrightCollection + .addCopyright(new GCopyright(1, + new GLatLngBounds(new GLatLng(-90, -180), new GLatLng(90, 180)), + 3, + "Copyright BOS Deutschland e.V.")); this.layers = {}; @@ -280,8 +281,8 @@ this.show(); $('#map').removeClass('small'); $('#map').addClass('large'); -// this.addControls(); - this.map.setCenter(projection.fromPixelToLatLng(new GPoint(7000, 6350), 6), 3, customMap); + this.addControls(); + this.map.setCenter(projection.fromPixelToLatLng(new GPoint(6500, 6350), 6), 2, customMap); this.map.checkResize(); } @@ -420,7 +421,7 @@ pois[poi.id] = poi; } - mainMap = new FakeMap(); + mainMap = new Map(); loadJSONDoc('/sponsors-json').addCallback(loadSponsors); }

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms/poi-ms.
by BKNR Commits 09 Dec '08

09 Dec '08

Revision: 4123 Author: hans URL: http://bknr.net/trac/changeset/4123 Cleanup. Sort POI media by type, date. U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html U trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css 2008-12-09 16:25:20 UTC (rev 4122) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css 2008-12-09 17:01:00 UTC (rev 4123) @@ -7,6 +7,7 @@ background-image: url(bg.gif); background-repeat: repeat-y; } + h1 { font-size: 19px; font-weight: bold; @@ -14,37 +15,41 @@ height:62px; margin:0px; } + h2 { font-size:15px; margin:0px; font-weight: bold; } + h3 { font-size:12px; font-weight:bold; margin:0px; } -.yui-t3 { +#doc { float:left; width:740px; } + #left-bar { background-color:#B2B774; padding-top:10px; height:500px; } -.yui-b { + +.navigation { float:left; width:190px; margin-right:20px; } - -.yui-main { +#content { float:left; width:506px; } + #content-body { width:506px; float:left; @@ -55,6 +60,7 @@ #content-body img { padding-top:15px; } + a#back { color:#AFAFAF; text-decoration: none; @@ -90,6 +96,7 @@ height:37px; background-color:#FFFFFF } + ul#poi-list li { position: relative; height: 44px; Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html 2008-12-09 16:25:20 UTC (rev 4122) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html 2008-12-09 17:01:00 UTC (rev 4123) @@ -10,29 +10,22 @@ <meta http-equiv="content-type" content="text/html; charset=utf-8" /> </head> <body> - <div id="doc" class="yui-t3"> + <div id="doc"> <div id="hd"><img src="site_header-de.jpg" /></div> <div id="bd"> - - <div class="yui-b"> + <div class="navigation"> <div id="small-map" class="map"> <a href="#"><img src="uebersichtskarte_klein.gif" width="118" height="58" border="0"/></a><br /> - <a href="#" id="back">zurueck</a> + <a href="#" id="back">zurueck</a> </div> <div id="left-bar"> </div> </div> </div> - - - <div id="yui-main"> - <div id="content"> - <div id="content-body"> - </div> + <div id="content"> + <div id="content-body"> + </div> <div id="map"><img src="fake-map.jpg" width="505" height="505"/></div> - </div> - </div> - <div id="ft"> </div> </div> </body> Modified: trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js 2008-12-09 16:25:20 UTC (rev 4122) +++ trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js 2008-12-09 17:01:00 UTC (rev 4123) @@ -121,6 +121,14 @@ return path; } +function compareMedia (a, b) { + if (a.mediumType == b.mediumType) { + return (b.timestamp < a.timestamp) ? -1 : 1; + } else { + return (a.mediumType < b.mediumType) ? -1 : 1; + } +} + function showPOI(poi) { if (poi.data) { poi = poi.data; @@ -148,7 +156,7 @@ B(null, medium.title || medium.name)))) .bind('click', [ poi, medium ], showMedium)); } - }, poi.media); + }, poi.media.sort(compareMedia)); mainMap.hide(); }

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms
by BKNR Commits 09 Dec '08

09 Dec '08

Revision: 4122 Author: hans URL: http://bknr.net/trac/changeset/4122 Add new POI microsite with design by Sven Springer A trunk/projects/bos/payment-website/static/poi-ms/ A trunk/projects/bos/payment-website/static/poi-ms/bg.gif A trunk/projects/bos/payment-website/static/poi-ms/fake-map.jpg A trunk/projects/bos/payment-website/static/poi-ms/film-icon.jpg A trunk/projects/bos/payment-website/static/poi-ms/panorama-icon.jpg A trunk/projects/bos/payment-website/static/poi-ms/poi-ms.css A trunk/projects/bos/payment-website/static/poi-ms/poi-ms.html A trunk/projects/bos/payment-website/static/poi-ms/poi-ms.js A trunk/projects/bos/payment-website/static/poi-ms/site_header-de.jpg A trunk/projects/bos/payment-website/static/poi-ms/site_header-en.jpg A trunk/projects/bos/payment-website/static/poi-ms/uebersichtskarte_klein.gif D trunk/projects/bos/payment-website/static/poi-ms.css D trunk/projects/bos/payment-website/static/poi-ms.html D trunk/projects/bos/payment-website/static/poi-ms.js Change set too large, please see URL above

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/poi-ms.html
by BKNR Commits 09 Dec '08

09 Dec '08

Revision: 4121 Author: hans URL: http://bknr.net/trac/changeset/4121 disable google maps for the moment U trunk/projects/bos/payment-website/static/poi-ms.html Modified: trunk/projects/bos/payment-website/static/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.html 2008-12-09 06:41:00 UTC (rev 4120) +++ trunk/projects/bos/payment-website/static/poi-ms.html 2008-12-09 06:58:11 UTC (rev 4121) @@ -7,7 +7,7 @@ <script src="MochiKit/MochiKit.js" type="text/javascript"> </script> <script src="jquery-nightly.js" type="text/javascript"> </script> <script src="poi-ms.js" type="text/javascript"> </script> - <script src="http://maps.google.com/maps?file=api&v=2&key=ABQIAAAA5meUSZ1F7u46Uj…" type="text/javascript"> </script> + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> </head> <body>

1 0

[bknr-cvs] hans changed trunk/projects/bos/payment-website/static/
by BKNR Commits 09 Dec '08

09 Dec '08

Revision: 4120 Author: hans URL: http://bknr.net/trac/changeset/4120 Add fake map for easier deployment. A trunk/projects/bos/payment-website/static/fake-map.jpg U trunk/projects/bos/payment-website/static/poi-ms.html U trunk/projects/bos/payment-website/static/poi-ms.js Added: trunk/projects/bos/payment-website/static/fake-map.jpg =================================================================== (Binary files differ) Property changes on: trunk/projects/bos/payment-website/static/fake-map.jpg ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Modified: trunk/projects/bos/payment-website/static/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.html 2008-12-09 05:50:48 UTC (rev 4119) +++ trunk/projects/bos/payment-website/static/poi-ms.html 2008-12-09 06:41:00 UTC (rev 4120) @@ -19,6 +19,7 @@ <div id="yui-main"> <div class="yui-b" id="content"> <div id="map"> + <img src="fake-map.jpg" width="600" height="600"/> </div> <div id="content-body"> </div> Modified: trunk/projects/bos/payment-website/static/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.js 2008-12-09 05:50:48 UTC (rev 4119) +++ trunk/projects/bos/payment-website/static/poi-ms.js 2008-12-09 06:41:00 UTC (rev 4120) @@ -188,6 +188,25 @@ mainMap.overview(); } +function FakeMap() { + + this.hide = function () { + $('#map').css('display', 'none'); + } + + this.overview = function () { + $('#map').css('display', 'block'); + } + + var index = 0; + for (var i in pois) { + var poi = pois[i]; + var letter = String.fromCharCode("A".charCodeAt(0) + index++); + + poi.mapIcon = "http://www.google.com/mapfiles/marker" + letter + ".png"; + } +} + function Map() { this.map = new GMap2($('#map')[0]); @@ -393,7 +412,7 @@ pois[poi.id] = poi; } - mainMap = new Map(); + mainMap = new FakeMap(); loadJSONDoc('/sponsors-json').addCallback(loadSponsors); }

1 0

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/util.lisp
by BKNR Commits 09 Dec '08

09 Dec '08

Revision: 4119 Author: hans URL: http://bknr.net/trac/changeset/4119 Fix from Anton Vodonosov to ensure that MD5:MD5SUM-SEQUENCE is always passed a simple string. U trunk/thirdparty/hunchentoot/util.lisp Modified: trunk/thirdparty/hunchentoot/util.lisp =================================================================== --- trunk/thirdparty/hunchentoot/util.lisp 2008-12-08 22:05:57 UTC (rev 4118) +++ trunk/thirdparty/hunchentoot/util.lisp 2008-12-09 05:50:48 UTC (rev 4119) @@ -144,7 +144,7 @@ (defun md5-hex (string) "Calculates the md5 sum of the string STRING and returns it as a hex string." (with-output-to-string (s) - (loop for code across (md5:md5sum-sequence string) + (loop for code across (md5:md5sum-sequence (coerce string 'simple-string)) do (format s "~2,'0x" code)))) (defun escape-for-html (string)

1 0

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

08 Dec '08

Revision: 4118 Author: hans URL: http://bknr.net/trac/changeset/4118 Snapshot before designer gets the work. 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-08 15:15:24 UTC (rev 4117) +++ trunk/projects/bos/payment-website/static/poi-ms.css 2008-12-08 22:05:57 UTC (rev 4118) @@ -4,17 +4,29 @@ ul#media-list li { position: relative; + height: 64px; + margin-left: 62px; +} + +ul#media-list li img { + position: absolute; + left: -62px; + top: 2px; +} + +ul#poi-list li { + position: relative; height: 44px; margin-left: 42px; } -ul#media-list li img { +ul#poi-list li img { position: absolute; left: -42px; top: 2px; } -ul#media-list .active { +ul#media-list .active, ul#poi-list .active { background-color: #0f0; } Modified: trunk/projects/bos/payment-website/static/poi-ms.html =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.html 2008-12-08 15:15:24 UTC (rev 4117) +++ trunk/projects/bos/payment-website/static/poi-ms.html 2008-12-08 22:05:57 UTC (rev 4118) @@ -30,10 +30,6 @@ <img src="/infosystem/bilder/uebersichtskarte_klein.gif" width="118" height="62"/> </a> </div> - <select id="poi-selector" size="1"> - <option value="overview">Übersicht</option> - <option value="sponsors">Sponsoren</option> - </select> <div id="left-bar"> </div> </div> Modified: trunk/projects/bos/payment-website/static/poi-ms.js =================================================================== --- trunk/projects/bos/payment-website/static/poi-ms.js 2008-12-08 15:15:24 UTC (rev 4117) +++ trunk/projects/bos/payment-website/static/poi-ms.js 2008-12-08 22:05:57 UTC (rev 4118) @@ -28,7 +28,7 @@ var mediaHandlers = { image: { icon: function (medium) { - return IMG({ src: '/image/' + medium.id + '/thumbnail,,40,40', width: 40, height: 40 }) + return IMG({ src: '/image/' + medium.id + '/thumbnail,,60,60', width: 60, height: 60 }) }, makeViewer: function (medium) { return IMG({ src: '/image/' + medium.id, @@ -38,7 +38,7 @@ }, panorama: { icon: function (medium) { - return IMG({ src: '/static/panorama-icon.gif', width: 40, height: 40 }) + return IMG({ src: '/static/panorama-icon.gif', width: 60, height: 60 }) }, makeViewer: function (medium) { return APPLET({ id: 'applet', @@ -52,7 +52,7 @@ }, movie: { icon: function (medium) { - return IMG({ src: '/static/movie-icon.gif', width: 40, height: 40 }) + return IMG({ src: '/static/movie-icon.gif', width: 60, height: 60 }) }, makeViewer: function (medium) { /* can't use DOM objects like below because IE does not grok it @@ -128,6 +128,9 @@ } function showPOI(poi) { + if (poi.data) { + poi = poi.data; + } $('#left-bar') .empty() @@ -140,11 +143,9 @@ map(function (medium) { if (mediaHandlers[medium.mediumType]) { $('#media-list') - .append($(A({ href: '#' }, - LI(null, + .append($(LI(null, + A({ href: '#' }, mediaHandlers[medium.mediumType].icon(medium), - (new Date(medium.timestamp)).renderDate(), - BR(), B(null, medium.title || medium.name)))) .bind('click', medium, showMedium)); } @@ -168,11 +169,22 @@ function showOverview() { $('#content-body') .empty() - .append(H2(null, NLS('Google Map'))); + .append(H2(null, NLS('Übersicht'))); $('#left-bar') - .empty(); + .empty() + .append(UL({ id: 'poi-list' })); + for (var i in pois) { + var poi = pois[i]; + $('#poi-list') + .append($(LI(null, + A({ href: '#' }, + IMG({ src: poi.mapIcon }), + B(poi.title)))) + .bind('click', poi, showPOI)); + } + mainMap.overview(); } @@ -188,7 +200,7 @@ this.layers = {}; this.makeLayer = function (name) { - var tileLayer = new GTileLayer(copyrightCollection, 0, 12); + var tileLayer = new GTileLayer(copyrightCollection, 0, 14); tileLayer.getTileUrl = function(point, level) { if (level < 15) { var path = pointToPath(point, level); @@ -202,7 +214,7 @@ return tileLayer; } - var projection = new GMercatorProjection(12); + var projection = new GMercatorProjection(14); var customMap = new GMapType( [ this.makeLayer('sat-2002'), this.makeLayer('contracts') ], @@ -223,8 +235,8 @@ } } - this.map.enableContinuousZoom(); - this.map.enableScrollWheelZoom(); +// this.map.enableContinuousZoom(); +// this.map.enableScrollWheelZoom(); this.mapClicked = function (overlay, latlng, overlaylatlng) { log('map clicked, overlay: ' + overlay + ' latlng: ' + latlng + ' overlaylatlng: ' + overlaylatlng); @@ -241,7 +253,7 @@ this.show(); $('#map').removeClass('small'); $('#map').addClass('large'); - this.addControls(); +// this.addControls(); this.map.setCenter(projection.fromPixelToLatLng(new GPoint(7000, 6350), 6), 3, customMap); this.map.checkResize(); } @@ -272,9 +284,25 @@ return projection.fromPixelToLatLng(new GPoint(x, y), 6); } + var poiBaseIcon = new GIcon(G_DEFAULT_ICON); + + poiBaseIcon.shadow = "http://www.google.com/mapfiles/shadow50.png"; + poiBaseIcon.iconSize = new GSize(20, 34); + poiBaseIcon.shadowSize = new GSize(37, 34); + poiBaseIcon.iconAnchor = new GPoint(9, 34); + poiBaseIcon.infoWindowAnchor = new GPoint(9, 2); + + var index = 0; for (var i in pois) { - var marker = new GMarker(pointToLatLng(pois[i].x, pois[i].y)); - GEvent.addListener(marker, "click", partial(showPOI, pois[i])); + var poi = pois[i]; + var letter = String.fromCharCode("A".charCodeAt(0) + index++); + var letteredIcon = new GIcon(poiBaseIcon); + + poi.mapIcon = + letteredIcon.image = "http://www.google.com/mapfiles/marker" + letter + ".png"; + + var marker = new GMarker(pointToLatLng(poi.x, poi.y), { icon: letteredIcon }); + GEvent.addListener(marker, "click", partial(showPOI, poi)); this.map.addOverlay(marker); } @@ -326,8 +354,8 @@ map(function (sponsor) { $('#sponsor-list') - .append($(A({ href: '#' }, - LI(null, + .append($(LI(null, + A({ href: '#' }, IMG({ src: '/images/flags/' + sponsor.country.toLowerCase() + '.gif'}), (new Date(sponsor.contracts[0].timestamp)).renderDate(), BR(), @@ -363,9 +391,7 @@ for (var i in data.pois) { var poi = data.pois[i]; pois[poi.id] = poi; - $('#poi-selector').append(OPTION({ value: poi.id }, poi.title)); } - $('#poi-selector').bind('change', null, selectPage); mainMap = new Map(); Modified: trunk/projects/bos/web/simple-sat-map.lisp =================================================================== --- trunk/projects/bos/web/simple-sat-map.lisp 2008-12-08 15:15:24 UTC (rev 4117) +++ trunk/projects/bos/web/simple-sat-map.lisp 2008-12-08 22:05:57 UTC (rev 4118) @@ -8,9 +8,18 @@ ;; 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 *tree-levels* 12 + "Total number of levels in the tree.") + +(defparameter *tree-size* 16384 + "Width and height of the tree's base image.") + +(defparameter *tile-size* 256 + "Width and height of the tiles in the tree.") + +(defvar *image-levels* (floor (- (log *tree-size* 2) (log *tile-size* 2))) + "Number of levels in the tree with images attached. Below that, images are zoomed.") + (defparameter *tile-pow* (floor (log *tile-size* 2))) (define-persistent-class tree () @@ -35,7 +44,7 @@ ((make-quad (x y level) (apply #'make-instance 'node :x x :y y :level level - (when (< level *levels*) + (when (< level *image-levels*) (let* ((next-level (1+ level)) (next-tile-size (/ *tree-size* (expt 2 next-level)))) (list :children @@ -55,6 +64,7 @@ (y :read) (level :read) (images :read :initform (make-hash-table)) + (contracts :read :initform nil) (children :read :initform nil))) (defun node-pixel-size (node) @@ -86,7 +96,7 @@ (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))))) + (factor (expt 2 (- *image-levels* (node-level node))))) (cl-gd:do-rows (y) (cl-gd:do-pixels-in-row (x) (let ((m2 (find-m2 (+ (node-x node) @@ -138,7 +148,7 @@ (bknr.images:make-store-image :image tile :name image-name :if-exists :kill))) - (when (< level *levels*) + (when (< level *image-levels*) (let ((next-tile-source-size (/ tile-source-size 2)) (next-level (1+ level))) (destructuring-bind (one two three four) (node-children node) @@ -167,12 +177,12 @@ (node (tree-root tree)) (path (or (bknr.web:query-param "path") ""))) (dotimes (i (min (length path) - *levels*)) + *image-levels*)) (setf node (nth (parse-integer path :start i :end (1+ i)) (node-children node)))) - (when (> (length path) *levels*) + (when (> (length path) *image-levels*) (setf (hunchentoot:aux-request-value 'zoom-path) - (subseq path *levels*))) + (subseq path *image-levels*))) (or (node-image node layer) (when (find layer (tree-layers tree)) (transparent-image)))))

1 0

[bknr-cvs] hans changed trunk/thirdparty/hunchentoot/misc.lisp
by BKNR Commits 08 Dec '08

08 Dec '08

Revision: 4117 Author: hans URL: http://bknr.net/trac/changeset/4117 Handle wildcarded filenames properly. Requests for files containing wildcard characters will be responded to with a 404 response code instead of an error. U trunk/thirdparty/hunchentoot/misc.lisp Modified: trunk/thirdparty/hunchentoot/misc.lisp =================================================================== --- trunk/thirdparty/hunchentoot/misc.lisp 2008-12-05 13:37:32 UTC (rev 4116) +++ trunk/thirdparty/hunchentoot/misc.lisp 2008-12-08 15:15:24 UTC (rev 4117) @@ -129,8 +129,9 @@ denoted by PATH. Send a content type header corresponding to CONTENT-TYPE or \(if that is NIL) tries to determine the content type via the file's suffix." - (unless (and (fad:file-exists-p path) - (not (fad:directory-exists-p path))) + (when (or (wild-pathname-p path) + (not (fad:file-exists-p path)) + (fad:directory-exists-p path)) ;; does not exist (setf (return-code) +http-not-found+) (throw 'handler-done nil))

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

bknr-cvs