| 修訂 | 87 (tree) |
|---|---|
| 時間 | 2008-04-23 23:01:18 |
| 作者 | junkikuchi |
updated.
trunk/webapp/Widget/Content/GMap.rb (diff) trunk/webapp/Content.rb (diff)| @@ -32,6 +32,16 @@ | ||
| 32 | 32 | xml.tag('script', 'type' => 'text/javascript') do |js| |
| 33 | 33 | js.code <<-END |
| 34 | 34 | $(document).ready(function() { |
| 35 | + function createMarker(latlng, info) { | |
| 36 | + var marker = new GMarker(latlng); | |
| 37 | + | |
| 38 | + GEvent.addListener(marker, 'click', function() { | |
| 39 | + marker.openInfoWindowHtml(info); | |
| 40 | + }); | |
| 41 | + | |
| 42 | + return marker; | |
| 43 | + } | |
| 44 | + | |
| 35 | 45 | if(GBrowserIsCompatible()) { |
| 36 | 46 | var map = new GMap2(document.getElementById('#{html_id}')); |
| 37 | 47 | map.addControl(new GLargeMapControl()); |
| @@ -39,10 +49,13 @@ | ||
| 39 | 49 | map.addControl(new GMapTypeControl()); |
| 40 | 50 | map.addControl(new GOverviewMapControl()); |
| 41 | 51 | map.enableScrollWheelZoom(); |
| 52 | + | |
| 53 | + var bound = new GLatLngBounds(); | |
| 42 | 54 | END |
| 43 | 55 | |
| 44 | - first = resource.content.trackpoint.first | |
| 45 | - last = resource.content.trackpoint.last | |
| 56 | + resource.content.traverse do |content| | |
| 57 | + first = content.trackpoint.first | |
| 58 | + last = content.trackpoint.last | |
| 46 | 59 | |
| 47 | 60 | unless last.nil? || first.nil? |
| 48 | 61 | js.code <<-END |
| @@ -49,10 +62,8 @@ | ||
| 49 | 62 | var first = new GLatLng(#{first.lat}, #{first.lng}); |
| 50 | 63 | var last = new GLatLng(#{last.lat}, #{last.lng}); |
| 51 | 64 | |
| 52 | - var bound = new GLatLngBounds(first, last); | |
| 53 | - if(!bound.isFullLat() || !bound.isFullLng()) { | |
| 54 | - bound = new GLatLngBounds(last, first); | |
| 55 | - } | |
| 65 | + bound.extend(first); | |
| 66 | + bound.extend(last); | |
| 56 | 67 | |
| 57 | 68 | map.setCenter(bound.getCenter(), map.getBoundsZoomLevel(bound)); |
| 58 | 69 | END |
| @@ -60,25 +71,19 @@ | ||
| 60 | 71 | |
| 61 | 72 | if first |
| 62 | 73 | js.code <<-END |
| 63 | - var first_marker = new GMarker(first); | |
| 64 | - map.addOverlay(first_marker); | |
| 65 | - GEvent.addListener(first_marker, 'click', function() { | |
| 66 | - first_marker.openInfoWindowHtml( | |
| 67 | - '出発地点<br />#{first.date.strftime("%Y年%m月%d日 %H:%M:%S")}' | |
| 68 | - ); | |
| 69 | - }); | |
| 74 | + var marker = createMarker( | |
| 75 | + first, '出発地点<br />#{first.date.strftime("%Y年%m月%d日 %H:%M:%S")}' | |
| 76 | + ); | |
| 77 | + map.addOverlay(marker); | |
| 70 | 78 | END |
| 71 | 79 | end |
| 72 | 80 | |
| 73 | 81 | if last |
| 74 | 82 | js.code <<-END |
| 75 | - var last_marker = new GMarker(last); | |
| 76 | - map.addOverlay(last_marker); | |
| 77 | - GEvent.addListener(last_marker, 'click', function() { | |
| 78 | - last_marker.openInfoWindowHtml( | |
| 79 | - '到着地点<br />#{last.date.strftime("%Y年%m月%d日 %H:%M:%S")}' | |
| 80 | - ); | |
| 81 | - }); | |
| 83 | + var marker = createMarker( | |
| 84 | + last, '到着地点<br />#{last.date.strftime("%Y年%m月%d日 %H:%M:%S")}' | |
| 85 | + ); | |
| 86 | + map.addOverlay(marker); | |
| 82 | 87 | END |
| 83 | 88 | else |
| 84 | 89 | js.code <<-END |
| @@ -86,7 +91,7 @@ | ||
| 86 | 91 | END |
| 87 | 92 | end |
| 88 | 93 | |
| 89 | - resource.content.tracklog.each do |log| | |
| 94 | + content.tracklog.each do |log| | |
| 90 | 95 | js.code <<-END |
| 91 | 96 | var polyline = new GPolyline.fromEncoded({ |
| 92 | 97 | opacity: 0.6, |
| @@ -98,6 +103,7 @@ | ||
| 98 | 103 | map.addOverlay(polyline); |
| 99 | 104 | END |
| 100 | 105 | end |
| 106 | + end | |
| 101 | 107 | |
| 102 | 108 | js.code <<-END |
| 103 | 109 | } |
| @@ -10,7 +10,8 @@ | ||
| 10 | 10 | class TrackPoint < Tenarai::DB::Reference::Multiple |
| 11 | 11 | def first |
| 12 | 12 | @link.dst_table.query( |
| 13 | - 'WHERE %s ORDER BY date LIMIT 1' % @link.dst_col | |
| 13 | + 'WHERE %s = ? ORDER BY date LIMIT 1' % @link.dst_col, | |
| 14 | + @row.id | |
| 14 | 15 | ) do |row| |
| 15 | 16 | return row |
| 16 | 17 | end |
| @@ -18,7 +19,8 @@ | ||
| 18 | 19 | |
| 19 | 20 | def last |
| 20 | 21 | @link.dst_table.query( |
| 21 | - 'WHERE %s ORDER BY date DESC LIMIT 1' % @link.dst_col | |
| 22 | + 'WHERE %s = ? ORDER BY date DESC LIMIT 1' % @link.dst_col, | |
| 23 | + @row.id | |
| 22 | 24 | ) do |row| |
| 23 | 25 | return row |
| 24 | 26 | end |
