]> git.openstreetmap.org Git - rails.git/commitdiff
projects / rails.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5ddab68 ad368d1)
Merge branch 'master' into redesign
authorJohn Firebaugh <john.firebaugh@gmail.com>
Sat, 16 Nov 2013 00:47:49 +0000 (16:47 -0800)
committerJohn Firebaugh <john.firebaugh@gmail.com>
Sat, 16 Nov 2013 00:47:49 +0000 (16:47 -0800)
Conflicts:
app/controllers/browse_controller.rb
app/views/layouts/_head.html.erb
config/environments/production.rb
config/routes.rb

1  2 
app/controllers/geocoder_controller.rb patch | diff1 | diff2 | blob | history
app/controllers/site_controller.rb patch | diff1 | diff2 | blob | history
app/views/layouts/_head.html.erb patch | diff1 | diff2 | blob | history
config/environments/production.rb patch | diff1 | diff2 | blob | history
config/locales/en.yml patch | diff1 | diff2 | blob | history
config/routes.rb patch | diff1 | diff2 | blob | history

diff --cc app/controllers/geocoder_controller.rb
index 592ff020abd2e9e4852de984aea25bb4f29cd18d,6db70a6f37fc3ca21dbf72d8de37e1401e34403d..87eb329abfe9fc998c271af4ad1b328ae807bfd6
--- 1/app/controllers/geocoder_controller.rb
--- 2/app/controllers/geocoder_controller.rb
+++ b/app/controllers/geocoder_controller.rb
@@@ -28,10 -29,26 +29,28 @@@ class GeocoderController < ApplicationC
        @sources.push "osm_nominatim"
        @sources.push "geonames" if defined?(GEONAMES_USERNAME)
      end
 +
 +    render :layout => map_layout
    end
  
+   def search_latlon
+     lat = params[:lat].to_f
+     lon = params[:lon].to_f
+     if lat < -90 or lat > 90
+       @error = "Latitude #{lat} out of range"
+       render :action => "error"
+     elsif lon < -180 or lon > 180
+       @error = "Longitude #{lon} out of range"
+       render :action => "error"
+     else
+       @results = [{:lat => lat, :lon => lon,
+                    :zoom => params[:zoom],
+                    :name => "#{lat}, #{lon}"}]
+ 
+       render :action => "results"
+     end
+   end
+ 
    def search_us_postcode
      # get query parameters
      query = params[:query]
diff --cc app/controllers/site_controller.rb
Simple merge
diff --cc app/views/layouts/_head.html.erb
index 46fe40f04227dfb3e75c102758758daa13bf6950,93b48c3155ff56cf570acb94cc680ce49f9260a3..9951737bc1e89ef607942a98373aedb2a2c5b537
--- 1/app/views/layouts/_head.html.erb
--- 2/app/views/layouts/_head.html.erb
+++ b/app/views/layouts/_head.html.erb
@@@ -1,10 -1,9 +1,10 @@@
  <head>
+   <meta http-equiv="X-UA-Compatible" content="IE=edge"/>
    <meta name="viewport" content="width=device-width, minimum-scale=1.0, maximum-scale=1.0"/>
 +  <!--[if lt IE 9]><%= javascript_include_tag "html5shiv" %><![endif]-->
    <%= javascript_include_tag "application" %>
-   <!--[if lt IE 7]><%= javascript_include_tag "pngfix" %><![endif]--> <!-- thanks, microsoft! -->
 -  <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:641px)" %>
 -  <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 642px)" %>
 +  <%= stylesheet_link_tag "small-#{dir}", :media => "only screen and (max-width:721px)" %>
 +  <%= stylesheet_link_tag "large-#{dir}", :media => "screen and (min-width: 722px)" %>
    <%= stylesheet_link_tag "print-#{dir}", :media => "print" %>
    <%= stylesheet_link_tag "leaflet-all", :media => "screen, print" %>
    <!--[if IE]>
diff --cc config/environments/production.rb
index bbc06aac5a6b463d98954dd227b53aaa669b8595,47358b387847d5620e3afcbfb69d95fb761f43c5..2db9f23662f176092c4c898c48efa89e470c2085
--- 1/config/environments/production.rb
--- 2/config/environments/production.rb
+++ b/config/environments/production.rb
@@@ -69,13 -69,12 +69,13 @@@ OpenStreetMap::Application.configure d
  
    # Precompile additional assets.
    # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
 -  config.assets.precompile += %w( index.js edit.js browse.js changeset.js welcome.js )
 +  config.assets.precompile += %w( index.js browse.js welcome.js )
-   config.assets.precompile += %w( user.js diary_entry.js pngfix.js swfobject.js )
+   config.assets.precompile += %w( user.js diary_entry.js swfobject.js )
    config.assets.precompile += %w( large-ltr.css small-ltr.css print-ltr.css )
    config.assets.precompile += %w( large-rtl.css small-rtl.css print-rtl.css )
 -  config.assets.precompile += %w( browse.css leaflet-all.css leaflet.ie.css )
 +  config.assets.precompile += %w( leaflet-all.css leaflet.ie.css )
    config.assets.precompile += %w( embed.js embed.css )
 +  config.assets.precompile += %w( html5shiv.js )
    config.assets.precompile += %w( images/marker-*.png img/*-handle.png )
    config.assets.precompile += %w( potlatch2.swf )
    config.assets.precompile += %w( potlatch2/assets.zip )
diff --cc config/locales/en.yml
Simple merge
diff --cc config/routes.rb
index 9eda73015d74cf470b03e74ed145269dd21172ec,81548af12107e0cb68139462065b703c1187da96..59c5b6803011617f27cc54e00aa3b86387bacc83
--- 1/config/routes.rb
--- 2/config/routes.rb
+++ b/config/routes.rb
@@@ -216,7 -213,8 +216,8 @@@ OpenStreetMap::Application.routes.draw 
    match '/users/:status' => 'user#list', :via => [:get, :post]
  
    # geocoder
 -  match '/geocoder/search' => 'geocoder#search', :via => :post
 +  match '/search' => 'geocoder#search', :via => :get, :as => :search
+   match '/geocoder/search_latlon' => 'geocoder#search_latlon', :via => :get
    match '/geocoder/search_us_postcode' => 'geocoder#search_us_postcode', :via => :get
    match '/geocoder/search_uk_postcode' => 'geocoder#search_uk_postcode', :via => :get
    match '/geocoder/search_ca_postcode' => 'geocoder#search_ca_postcode', :via => :get
The OpenStreetMap web site