define type earlier

[rails.git] / app / views / diary_entry / new.rhtml

diff --git a/app/views/diary_entry/new.rhtml b/app/views/diary_entry/new.rhtml
index 69995d00e14e3f34f08b25f0118243ed5a9d3c12..b46bb4d9ff14c68866ee80ca577f271f8b29fe75 100644 (file)
--- a/app/views/diary_entry/new.rhtml
+++ b/app/views/diary_entry/new.rhtml
@@ -12,7 +12,7 @@
     </tr>
     <tr valign="top">
            <th>Location</th>
     </tr>
     <tr valign="top">
            <th>Location</th>

-           <td><a name="map"></a><div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 300px; display: none;"></div>
+           <td><a name="map"></a><div id="map" style="border: 1px solid black; position: relative; width : 90%; height : 400px; display: none;"></div>

                  <span class="location">Latitude: <%= f.text_field :latitude, :size => 20, :id => "latitude" %> Longitude: <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span> <a href="#map" id="usemap" onclick="document.getElementById('map').style.display = 'block'; document.getElementById('usemap').style.display = 'none';">use map</a> </td>
          </tr>
     <tr>
                  <span class="location">Latitude: <%= f.text_field :latitude, :size => 20, :id => "latitude" %> Longitude: <%= f.text_field :longitude, :size => 20, :id => "longitude" %></span> <a href="#map" id="usemap" onclick="document.getElementById('map').style.display = 'block'; document.getElementById('usemap').style.display = 'none';">use map</a> </td>
          </tr>
     <tr>


@@ -23,16 +23,17 @@
 <% end %>
 
 <% if @user.home_lat.nil? or @user.home_lon.nil? %>
 <% end %>
 
 <% if @user.home_lat.nil? or @user.home_lon.nil? %>

-  <% lon =  params['lon'] || '-0.1' %>
-  <% lat =  params['lat'] || '51.5' %>
-  <% zoom =  params['zoom'] || '4' %> 
+  <% lon = h(params['lon'] || '-0.1') %>
+  <% lat = h(params['lat'] || '51.5') %>
+  <% zoom = h(params['zoom'] || '4') %> 

 <% else %>
 <% else %>

-  <% lon =  @user.home_lon %>
-  <% lat =  @user.home_lat %>
-  <% zoom =  '12' %>
+  <% lon = @user.home_lon %>
+  <% lat = @user.home_lat %>
+  <% zoom = '12' %>

 <% end %>
 
 <% end %>
 

-<script type="text/javascript" src="/openlayers/OpenLayers.js"></script>
+<%= javascript_include_tag '/openlayers/OpenLayers.js' %>
+<%= javascript_include_tag '/openlayers/OpenStreetMap.js' %>

 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">
 <%= javascript_include_tag 'map.js' %>
 
 <script type="text/javascript">


@@ -40,12 +41,12 @@
   var marker;
 
   function init(){
   var marker;
 
   function init(){

-    var centre = lonLatToMercator(new OpenLayers.LonLat(<%= lon %>, <%= lat %>));
+    var centre = new OpenLayers.LonLat(<%= lon %>, <%= lat %>);

     var zoom = <%= zoom %>;
 
     var map = createMap("map");
 
     var zoom = <%= zoom %>;
 
     var map = createMap("map");
 

-    map.setCenter(centre, zoom);
+    setMapCenter(centre, zoom);

 
     map.events.register("click", map, setLocation);
   }        
 
     map.events.register("click", map, setLocation);
   }        


@@ -53,8 +54,7 @@
   function setLocation( e ) { 
     closeMapPopup();
 
   function setLocation( e ) { 
     closeMapPopup();
 

-    var merc = map.getLonLatFromViewPortPx(e.xy);
-    var lonlat = mercatorToLonLat(merc);
+    var lonlat = getEventPosition(e);

 
     document.getElementById('latitude').value = lonlat.lat;
     document.getElementById('longitude').value = lonlat.lon;
 
     document.getElementById('latitude').value = lonlat.lat;
     document.getElementById('longitude').value = lonlat.lon;


@@ -68,4 +68,4 @@
 
   window.onload = init;
 // -->
 
   window.onload = init;
 // -->

-</script>
\ No newline at end of file
+</script>