map_layers 0.0.3 → 0.0.4

data/Gemfile.lock

@@ -98,7 +98,7 @@ DEPENDENCIES
   autotest-notification
   autotest-rails
   map_layers!
-  rails (>= 3.0.0)
+  rails (>= 2.3.8)
   rake
   rspec (~> 2.0.0)
   rspec-rails (~> 2.0.0)

data/{README → README.md}

@@ -1,27 +1,41 @@
-=MapLayers plugin for Rails
+# MapLayers
 
 MapLayers makes it easy to integrate a dynamic map in a Rails application. It can display map tiles and markers loaded from many different data sources.
-The included map viewer is OpenLayers[http://www.openlayers.org/].
-With MapLayers you can display and publish ActiveRecord models with geographic data.
+The included map viewer is [OpenLayers](http://www.openlayers.org/).
+With MapLayers you can :  
+- display and publish ActiveRecord models with geographic data.
+- make your own map model
 
-
-==Getting Started
+Getting Started
+---------------
 
 Install the latest version of the plugin:
-  ./script/plugin install git://github.com/pka/map_layers.git
+  sudo gem install map_layers
+Or with bundler add to your Gemfile : 
+gem "map_layers"
 
 Create a controller and a view
+
+``` bash
   ./script/generate controller Map index
+```
+
+Initialization of the map
+-------------------------
 
-===Initialization of the map
 Add the map viewer initialization to the index action in the controller:
+
+``` ruby  
   @map = MapLayers::Map.new("map") do |map, page|
     page << map.add_layer(MapLayers::GOOGLE)
     page << map.zoom_to_max_extent()
   end
+```
 
+``` ruby 
 Add this to the head of your view:
   <%= map_layers_includes :google => "ABQIAAAA3HdfrnxFAPWyY-aiJUxmqRTJQa0g3IQ9GZqIMmInSLzwtGDKaBQ0KYLwBEKSM7F9gCevcsIf6WPuIQ" %>
+```
 
 Put a map in the body your view:
   <div id="map" style="width: 512px; height: 256px;"></div>
@@ -30,8 +44,12 @@ Put a map in the body your view:
 
 Test your basic map with <tt>http://localhost:3000/map</tt>
 
-===Multiple layers
+Multiple layers
+---------------
+
 Add a second layer and some more controls in the controller action:
+
+``` ruby
   @map = MapLayers::Map.new("map") do |map, page|
     page << map.add_layer(MapLayers::GOOGLE)
     page << map.add_layer(MapLayers::YAHOO_HYBRID)
@@ -42,119 +60,172 @@ Add a second layer and some more controls in the controller action:
 
     page << map.zoom_to_max_extent()
   end
+```
 
 Add the Yahoo Javascript library to the includes:
+
+``` ruby
   <%= map_layers_includes :google => "ABQIAAAA3HdfrnxFAPWyY-aiJUxmqRTJQa0g3IQ9GZqIMmInSLzwtGDKaBQ0KYLwBEKSM7F9gCevcsIf6WPuIQ", :yahoo => "euzuro-openlayers" %>
+```
 
 There are many more predefined layer types available:
 GOOGLE_SATELLITE, GOOGLE_HYBRID, GOOGLE_PHYSICAL, VE_ROAD, VE_AERIAL, VE_HYBRID, YAHOO, YAHOO_SATELLITE, YAHOO_HYBRID, MULTIMAP, OSM_MAPNIK, OSM_TELASCIENCE, GEOPOLE_OSM, NASA_GLOBAL_MOSAIC, BLUE_MARBLE_NG, WORLDWIND, WORLDWIND_URBAN, WORLDWIND_BATHY
 
 To include all Javascript APIs, insert your API keys in the following statement:
+
+``` ruby
   <%= map_layers_includes :google => "ABQIAAAA3HdfrnxFAPWyY-aiJUxmqRTJQa0g3IQ9GZqIMmInSLzwtGDKaBQ0KYLwBEKSM7F9gCevcsIf6WPuIQ", :multimap => "metacarta_04", :virtualearth => true, :yahoo => "euzuro-openlayers" %>
+```
 
+Updating the map
+----------------
 
-===Updating the map
 Now we want to add some simple markers in an Ajax action.
 First we add a link in the view:
 
+``` ruby
   <%= link_to_remote "Add marker", :url => { :action => "add_marker" } %>
+```
 
 This requires including the prototype library:
 
+``` ruby
   <%= javascript_include_tag 'prototype' %>
+```
 
 Then we include a marker layer in the map. Put this after the add_layer statements in the controller:
 
+``` ruby
   page.assign("markers", Layer::Markers.new('Markers'))
   page << map.addLayer(:markers)
+```
 
 and then we implement the Ajax action:
 
+``` ruby
   def add_marker
     render :update do |page|
       @markers = JsVar.new('markers')
       page << @markers.add_marker(OpenLayers::Marker.new(OpenLayers::LonLat.new(rand*50,rand*50)))
     end
   end
+```
 
 For accessing the marker layer in the Ajax action, we declare a Javascript variable with <tt>page.assign</tt> and access the variable later with the +JsVar+ wrapper.
 
 
-===OpenStreetMap in WGS84
+OpenStreetMap in WGS84
+----------------------
 
 To overlay data in WGS84 projection you can use a customized Open Street Map:
 
+``` ruby
   @map = MapLayers::Map.new("map") do |map, page|
     page << map.add_layer(MapLayers::GEOPOLE_OSM)
     page << map.zoom_to_max_extent()
   end
+```
 
-
-=Publish your own data
+Publish your own data
+---------------------
 
 Create a model:
+
+``` bash
   ./script/generate model --skip-timestamps --skip-fixture Place placeName:string countryCode:string postalCode:string lat:float lng:float
   rake db:migrate
+```
 
 Import some places:
+
+``` bash
   ./script/runner "Geonames::Postalcode.search('Sidney').each { |pc| Place.create(pc.attributes.slice('placeName', 'postalCode', 'countryCode', 'lat', 'lng')) }"
+```
 
 Add a new controller with a map_layer:
 
+``` ruby
   class PlacesController < ApplicationController
 
     map_layer :place, :text => :placeName
 
   end
+```
 
 And add a layer to the map:
 
+``` ruby
   page << map.addLayer(Layer::GeoRSS.new("GeoRSS", "/places/georss"))
-
+```
 
 Other types of served layers:
 
+``` ruby
   page << map.add_layer(Layer::GML.new("Places KML", "/places/kml", {:format=> JsExpr.new("OpenLayers.Format.KML")}))
 
   page << map.add_layer(Layer::WFS.new("Places WFS", "/places/wfs", {:typename => "places"}, {:featureClass => JsExpr.new("OpenLayers.Feature.WFS")}))
+```
 
 
-==Spatial database support
+Spatial database support
+------------------------
 
 Using a spatial database requires GeoRuby[http://georuby.rubyforge.org/] and the Spatial Adapter for Rails:
 
+``` bash
   sudo gem install georuby
   ruby script/plugin install svn://rubyforge.org/var/svn/georuby/SpatialAdapter/trunk/spatial_adapter
+```
 
 Install spatial functions in your DB (e.g. Postgis 8.1):
+
+``` bash
   DB=map_layers_dev
   createlang plpgsql $DB
   psql -d $DB -q -f /usr/share/postgresql-8.1-postgis/lwpostgis.sql
+```
 
 Create a model:
+
+``` bash
   ./script/generate model --skip-timestamps --skip-fixture WeatherStation name:string geom:point
   rake db:migrate
+```
 
 Import some weather stations:
+
+``` bash
   ./script/runner "Geonames::Weather.weather(:north => 44.1, :south => -9.9, :east => -22.4, :west => 55.2).each { |st| WeatherStation.create(:name => st.stationName, :geom => Point.from_x_y(st.lng, st.lat)) }"
+```
 
 Add a new controller with a map_layer:
 
+``` ruby
   class WeatherStationsController < ApplicationController
 
     map_layer :weather_stations, :geometry => :geom
 
   end
+```
 
 And add a WFS layer to the map:
 
+``` ruby
   page << map.add_layer(Layer::WFS.new("Weather Stations", "/weather_stations/wfs", {:typename => "weather_stations"}, {:featureClass => JsExpr.new("OpenLayers.Feature.WFS")}))
+```
+
+License
+-------
 
-==License
 The MapLayers plugin for Rails is released under the MIT license.
 
-==Support
-For any questions, enhancement proposals, bug notifications or corrections visit http://rubyforge.org/projects/map-layers/ or send a mail to pka[at]sourcepole[dot]ch.
+Development
+-----------
+
+* Source hosted at [GitHub](https://github.com/ldonnet/map_layers).
+* Report issues and feature requests to [GitHub Issues](https://github.com/ldonnet/map_layers/issues).
+
+Pull requests are very welcome! Make sure your patches are well tested. Please create a topic branch for every separate change you make. Please **do not change** the version in your pull-request.
 
 
-<em>Copyright (c) 2008 Pirmin Kalberer, Sourcepole AG</em>
+<em>Copyright (c) 2011 Luc Donnet, Dryade</em>

data/init.rb

@@ -1,8 +1,4 @@
-require 'map_layers'
-require 'map_layers/view_helpers'
+require File.join(File.dirname(__FILE__), "lib", "map_layers")
+require 'map_layers/railtie'
 
-ActionController::Base.send(:include, MapLayers)
-ActionView::Base.send(:include, MapLayers)
-ActionView::Base.send(:include, MapLayers::ViewHelpers)
-
-Mime::Type.register "application/vnd.google-earth.kml+xml", :kml
+MapLayers::Railtie.insert

data/lib/map_layers.rb

@@ -1,18 +1,11 @@
-require 'active_support/core_ext'
+require 'map_layers/version'
+require 'map_layers/config'
+require 'map_layers/js_wrapper'
+require 'map_layers/open_layers'
+require 'map_layers/map'
+require 'map_layers/railtie'
 
 module MapLayers # :nodoc:
-
-  #Include helpers in the given scope to AC and AV.
-  # def self.include_helpers(scope)
-  #   ActiveSupport.on_load(:action_controller) do
-  #     include scope::MapLayers
-  #   end
-    
-  #   ActiveSupport.on_load(:action_view) do
-  #     include scope::MapLayers
-  #     include scope::MapLayers::ViewHelpers
-  #   end
-  # end
   
   # extend the class that include this with the methods in ClassMethods
   def self.included(base)
@@ -34,13 +27,13 @@ module MapLayers # :nodoc:
       # create the configuration
       @map_layers_config = MapLayers::Config::new(model_id, options)
 
-      module_eval do
-        include MapLayers::KML
-        include MapLayers::WFS
-        include MapLayers::GeoRSS
-        include MapLayers::Proxy
-        include MapLayers::Rest
-      end
+      # module_eval do
+      #   include MapLayers::KML
+      #   include MapLayers::WFS
+      #   include MapLayers::GeoRSS
+      #   include MapLayers::Proxy
+      #   include MapLayers::Rest
+      # end
 
       #session :off, :only => [:kml, :wfs, :georss]
 
@@ -51,308 +44,5 @@ module MapLayers # :nodoc:
     end
   
   end
-
-
-  class Config
-    attr_reader :model_id, :id, :lat, :lon, :geometry, :text
-    
-    def initialize(model_id, options)
-      @model_id = model_id.to_s.pluralize.singularize
-      @id = options[:id] || :id
-      @lat = options[:lat] || :lat
-      @lon = options[:lon] || :lng
-      @geometry = options[:geometry]
-      @text = options[:text] || :name
-    end
-    
-    def model
-      @model ||= @model_id.to_s.camelize.constantize
-    end
-  end
-
-  
-  class Feature < Struct.new(:text, :x, :y, :id)
-    attr_accessor :geometry
-    def self.from_geom(text, geom, id = nil)
-      f = new(text, geom.x, geom.y, id)
-      f.geometry = geom
-      f
-    end
-  end
-
-  # KML Server methods
-  module KML
-    
-    # Publish layer in KML format
-    def kml
-      rows = map_layers_config.model.find(:all, :limit => KML_FEATURE_LIMIT)
-      @features = rows.collect do |row|
-        if map_layers_config.geometry
-          Feature.from_geom(row.send(map_layers_config.text), row.send(map_layers_config.geometry))
-        else
-          Feature.new(row.send(map_layers_config.text), row.send(map_layers_config.lon), row.send(map_layers_config.lat))
-        end
-      end
-      @folder_name = map_layers_config.model_id.to_s.pluralize.humanize
-      logger.info "MapLayers::KML: returning #{@features.size} features"
-      render :inline => KML_XML_ERB, :content_type => "text/xml"
-    rescue Exception => e
-      logger.error "MapLayers::KML: returning no features - Caught exception '#{e}'"
-      render :text => KML_EMPTY_RESPONSE, :content_type => "text/xml"
-    end
-    
-    protected
-
-    KML_FEATURE_LIMIT = 1000
-    
-    KML_XML_ERB = <<EOS # :nodoc:
-<?xml version="1.0" encoding="UTF-8" ?>
-<kml xmlns="http://earth.google.com/kml/2.0">
-  <Document>
-  <Folder><name><%= @folder_name %></name>
-  <% for feature in @features -%>
-    <Placemark>
-      <description><%= feature.text %></description>
-      <Point><coordinates><%= feature.x %>,<%= feature.y %></coordinates></Point>
-    </Placemark>
-  <% end -%>
-  </Folder>
-  </Document>
-</kml>
-EOS
-
-    KML_EMPTY_RESPONSE = <<EOS # :nodoc:
-<?xml version="1.0" encoding="UTF-8" ?>
-<kml xmlns="http://earth.google.com/kml/2.0">
-  <Document>
-  </Document>
-</kml>
-EOS
-    
-  end
-  
-  # WFS Server methods
-  module WFS
-    
-    WGS84 = 4326
-    
-    # Publish layer in WFS format
-    def wfs
-      minx, miny, maxx, maxy = extract_params
-      model = map_layers_config.model
-      if map_layers_config.geometry
-        db_srid = model.columns_hash[map_layers_config.geometry.to_s].srid
-        if db_srid != @srid && !db_srid.nil? && db_srid != -1
-          #Transform geometry from db_srid to requested srid (not possible for undefined db_srid)
-          geom = "Transform(#{geom},#{@srid}) AS #{geom}"
-        end
-        
-        spatial_cond = if model.respond_to?(:sanitize_sql_hash_for_conditions)
-          model.sanitize_sql_hash_for_conditions(map_layers_config.geometry => [[minx, miny],[maxx, maxy], db_srid])
-        else # Rails < 2
-          model.sanitize_sql_hash(map_layers_config.geometry => [[minx, miny],[maxx, maxy], db_srid])
-        end
-        #spatial_cond = "Transform(#{spatial_cond}, #{db_srid}) )" Not necessary: bbox is always WGS84 !?
-
-        rows = model.find(:all, :conditions => spatial_cond, :limit => @maxfeatures)
-        @features = rows.collect do |row|
-          Feature.from_geom(row.send(map_layers_config.text), row.send(map_layers_config.geometry.to_s))
-        end
-      else
-        rows = model.find(:all, :limit => @maxfeatures)
-        @features = rows.collect do |row|
-          Feature.new(row.send(map_layers_config.text), row.send(map_layers_config.lon), row.send(map_layers_config.lat))
-        end
-      end
-      logger.info "MapLayers::WFS: returning #{@features.size} features"
-      render :inline => WFS_XML_ERB, :content_type => "text/xml"
-    rescue Exception => e
-      logger.error "MapLayers::WFS: returning no features - Caught exception '#{e}'"
-      render :text => WFS_EMPTY_RESPONSE, :content_type => "text/xml"
-    end
-    
-    protected
-
-    WFS_FEATURE_LIMIT = 1000
-    
-    def extract_params # :nodoc:
-      @maxfeatures = (params[:maxfeatures] || WFS_FEATURE_LIMIT).to_i
-      @srid = params['SRS'].split(/:/)[1].to_i rescue WGS84
-      req_bbox = params['BBOX'].split(/,/).collect {|n| n.to_f } rescue nil
-      @bbox = req_bbox || [-180.0, -90.0, 180.0, 90.0]
-    end
-
-    WFS_XML_ERB = <<EOS # :nodoc:
-<?xml version='1.0' encoding="UTF-8" ?>
-<wfs:FeatureCollection
-   xmlns:ms="http://mapserver.gis.umn.edu/mapserver"
-   xmlns:wfs="http://www.opengis.net/wfs"
-   xmlns:gml="http://www.opengis.net/gml"
-   xmlns:ogc="http://www.opengis.net/ogc"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengeospatial.net/wfs/1.0.0/WFS-basic.xsd 
-                       http://mapserver.gis.umn.edu/mapserver http://www.geopole.org/map/wfs?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=geopole&amp;OUTPUTFORMAT=XMLSCHEMA">
-  <gml:boundedBy>
-    <gml:Box srsName="EPSG:<%= @srid %>">
-      <gml:coordinates><%= @bbox[0] %>,<%= @bbox[1] %> <%= @bbox[2] %>,<%= @bbox[3] %></gml:coordinates>
-    </gml:Box>
-  </gml:boundedBy>
-  <% for feature in @features -%>
-    <gml:featureMember>
-      <ms:geopole>
-        <gml:boundedBy>
-          <gml:Box srsName="EPSG:<%= @srid %>">
-            <gml:coordinates><%= feature.x %>,<%= feature.y %> <%= feature.x %>,<%= feature.y %></gml:coordinates>
-          </gml:Box>
-        </gml:boundedBy>
-        <ms:msGeometry>
-        <gml:Point srsName="EPSG:<%= @srid %>">
-          <gml:coordinates><%= feature.x %>,<%= feature.y %></gml:coordinates>
-        </gml:Point>
-        </ms:msGeometry>
-        <ms:text><%= feature.text %></ms:text>
-      </ms:geopole>
-    </gml:featureMember>
-  <% end -%>
-</wfs:FeatureCollection>
-EOS
-
-    WFS_EMPTY_RESPONSE = <<EOS # :nodoc:
-<?xml version='1.0' encoding="UTF-8" ?>
-<wfs:FeatureCollection
-   xmlns:wfs="http://www.opengis.net/wfs"
-   xmlns:gml="http://www.opengis.net/gml"
-   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-   xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengeospatial.net/wfs/1.0.0/WFS-basic.xsd">
-   <gml:boundedBy>
-      <gml:null>missing</gml:null>
-   </gml:boundedBy>
-</wfs:FeatureCollection>
-EOS
-    
-  end
-
-  # GeoRSS Server methods
-  # http://www.georss.org/1
-  
-  module GeoRSS
-    
-    # Publish layer in GeoRSS format
-    def georss
-      rows = map_layers_config.model.find(:all, :limit => GEORSS_FEATURE_LIMIT)
-      @features = rows.collect do |row|
-        if map_layers_config.geometry
-          Feature.from_geom(row.send(map_layers_config.text), row.send(map_layers_config.geometry), row.send(map_layers_config.id))
-        else
-          Feature.new(row.send(map_layers_config.text), row.send(map_layers_config.lon), row.send(map_layers_config.lat))
-        end
-      end
-      @base_url = "http://#{request.env["HTTP_HOST"]}/"
-      @item_url = "#{@base_url}#{map_layers_config.model_id.to_s.pluralize}"
-      @title = map_layers_config.model_id.to_s.pluralize.humanize
-      logger.info "MapLayers::GEORSS: returning #{@features.size} features"
-      render :inline => GEORSS_XML_ERB, :content_type => "text/xml"
-    rescue Exception => e
-      logger.error "MapLayers::GEORSS: returning no features - Caught exception '#{e}'"
-      render :text => GEORSS_EMPTY_RESPONSE, :content_type => "text/xml"
-    end
-    
-    protected
-
-    GEORSS_FEATURE_LIMIT = 1000
-    
-    GEORSS_XML_ERB = <<EOS # :nodoc:
-<?xml version="1.0" encoding="UTF-8"?>
-<rdf:RDF  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns="http://purl.org/rss/1.0/"
-  xmlns:dc="http://purl.org/dc/elements/1.1/"
-  xmlns:georss="http://www.georss.org/georss">
-<docs>This is an RSS file.  Copy the URL into your aggregator of choice.  If you don't know what this means and want to learn more, please see: <span>http://platial.typepad.com/news/2006/04/really_simple_t.html</span> for more info.</docs>
-<channel rdf:about="<%= @base_url %>">
-<link><%= @base_url %></link>
-<title><%= @title %></title>
-<description></description>
-<items>
-<rdf:Seq>
-<% for feature in @features -%>
-<rdf:li resource="<%= @item_url %>/<%= feature.id %>"/>
-<% end -%>
-</rdf:Seq>
-</items>
-</channel>
-<% ts=Time.now.rfc2822 -%>
-<% for feature in @features -%>
-<item rdf:about="<%= @item_url %>/<%= feature.id %>">
-<!--<link><%= @item_url %>/<%= feature.id %></link>-->
-<title><%= @title %></title>
-<description><![CDATA[<%= feature.text %>]]></description>
-<georss:point><%= feature.y %> <%= feature.x %></georss:point>
-<dc:creator>map-layers</dc:creator>
-<dc:date><%= ts %></dc:date>
-</item>
-<% end -%>
-</rdf:RDF>
-EOS
-
-    GEORSS_EMPTY_RESPONSE = <<EOS # :nodoc:
-<?xml version="1.0" encoding="UTF-8"?>
-<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-  xmlns="http://purl.org/rss/1.0/">
-<docs></docs>
-<channel rdf:about="http://purl.org/rss/1.0/">
-<link>http://purl.org/rss/1.0/</link>
-<title>Empty GeoRSS</title>
-<description></description>
-<items>
-<rdf:Seq>
-</rdf:Seq>
-</items>
-</channel>
-</rdf:RDF>
-EOS
-    
-  end
-  
-  # Remote http Proxy
-  module Proxy
-    
-    # Register an url, before the proxy is called
-    def register_remote_url(url)
-      session[:proxy_url] ||= []
-      session[:proxy_url] << url      
-    end
-    
-    # Proxy for accessing remote files like GeoRSS, which is not allowed directly from the browser
-    def proxy
-      if session[:proxy_url].nil? || !session[:proxy_url].include?(params["url"])
-        logger.warn "Proxy request not in session: #{params["url"]}"
-        render :nothing => true
-        return
-      end
-      
-      url = URI.parse(URI.encode(params[:url]))
-      logger.debug "Proxy request for #{url.scheme}://#{url.host}#{url.path}"
-      
-      result = Net::HTTP.get_response(url)
-      render :text => result.body, :status => result.code, :content_type => "text/xml"
-    end
-  end
-
-  # Restful feture Server methods (http://featureserver.org/)
-  module Rest
-    
-    def index
-      respond_to do |format|
-        format.xml { wfs }
-        format.kml { kml }
-      end
-    end
-    
-  end
   
 end
-
-require 'map_layers/version'
-require 'map_layers/js_wrapper'
-require 'map_layers/open_layers'
-require 'map_layers/map'

data/lib/map_layers/config.rb

@@ -0,0 +1,20 @@
+module MapLayers 
+
+ class Config
+    attr_reader :model_id, :id, :lat, :lon, :geometry, :text
+    
+    def initialize(model_id, options)
+      @model_id = model_id.to_s.pluralize.singularize
+      @id = options[:id] || :id
+      @lat = options[:lat] || :lat
+      @lon = options[:lon] || :lng
+      @geometry = options[:geometry]
+      @text = options[:text] || :name
+    end
+    
+    def model
+      @model ||= @model_id.to_s.camelize.constantize
+    end
+  end
+
+end

data/lib/map_layers/feature.rb

@@ -0,0 +1,12 @@
+module MapLayers
+ 
+ class Feature < Struct.new(:text, :x, :y, :id)
+    attr_accessor :geometry
+    def self.from_geom(text, geom, id = nil)
+      f = new(text, geom.x, geom.y, id)
+      f.geometry = geom
+      f
+    end
+  end
+
+end

data/lib/map_layers/georss.rb

@@ -0,0 +1,120 @@
+module MapLayers
+
+  # GeoRSS Server methods
+  # http://www.georss.org/1
+  module GeoRSS
+    
+    # Publish layer in GeoRSS format
+    def georss
+      rows = map_layers_config.model.find(:all, :limit => GEORSS_FEATURE_LIMIT)
+      @features = rows.collect do |row|
+        if map_layers_config.geometry
+          Feature.from_geom(row.send(map_layers_config.text), row.send(map_layers_config.geometry), row.send(map_layers_config.id))
+        else
+          Feature.new(row.send(map_layers_config.text), row.send(map_layers_config.lon), row.send(map_layers_config.lat))
+        end
+      end
+      @base_url = "http://#{request.env["HTTP_HOST"]}/"
+      @item_url = "#{@base_url}#{map_layers_config.model_id.to_s.pluralize}"
+      @title = map_layers_config.model_id.to_s.pluralize.humanize
+      logger.info "MapLayers::GEORSS: returning #{@features.size} features"
+      render :inline => GEORSS_XML_ERB, :content_type => "text/xml"
+    rescue Exception => e
+      logger.error "MapLayers::GEORSS: returning no features - Caught exception '#{e}'"
+      render :text => GEORSS_EMPTY_RESPONSE, :content_type => "text/xml"
+    end
+    
+    protected
+
+    GEORSS_FEATURE_LIMIT = 1000
+    
+    GEORSS_XML_ERB = <<EOS # :nodoc:
+<?xml version="1.0" encoding="UTF-8"?>
+<rdf:RDF  xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns="http://purl.org/rss/1.0/"
+  xmlns:dc="http://purl.org/dc/elements/1.1/"
+  xmlns:georss="http://www.georss.org/georss">
+<docs>This is an RSS file.  Copy the URL into your aggregator of choice.  If you don't know what this means and want to learn more, please see: <span>http://platial.typepad.com/news/2006/04/really_simple_t.html</span> for more info.</docs>
+<channel rdf:about="<%= @base_url %>">
+<link><%= @base_url %></link>
+<title><%= @title %></title>
+<description></description>
+<items>
+<rdf:Seq>
+<% for feature in @features -%>
+<rdf:li resource="<%= @item_url %>/<%= feature.id %>"/>
+<% end -%>
+</rdf:Seq>
+</items>
+</channel>
+<% ts=Time.now.rfc2822 -%>
+<% for feature in @features -%>
+<item rdf:about="<%= @item_url %>/<%= feature.id %>">
+<!--<link><%= @item_url %>/<%= feature.id %></link>-->
+<title><%= @title %></title>
+<description><![CDATA[<%= feature.text %>]]></description>
+<georss:point><%= feature.y %> <%= feature.x %></georss:point>
+<dc:creator>map-layers</dc:creator>
+<dc:date><%= ts %></dc:date>
+</item>
+<% end -%>
+</rdf:RDF>
+EOS
+
+
+    GEORSS_EMPTY_RESPONSE = <<EOS # :nodoc:
+<?xml version="1.0" encoding="UTF-8"?>
+<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+  xmlns="http://purl.org/rss/1.0/">
+<docs></docs>
+<channel rdf:about="http://purl.org/rss/1.0/">
+<link>http://purl.org/rss/1.0/</link>
+<title>Empty GeoRSS</title>
+<description></description>
+<items>
+<rdf:Seq>
+</rdf:Seq>
+</items>
+</channel>
+</rdf:RDF>
+EOS
+    
+  end
+  
+  # Remote http Proxy
+  module Proxy
+    
+    # Register an url, before the proxy is called
+    def register_remote_url(url)
+      session[:proxy_url] ||= []
+      session[:proxy_url] << url      
+    end
+    
+    # Proxy for accessing remote files like GeoRSS, which is not allowed directly from the browser
+    def proxy
+      if session[:proxy_url].nil? || !session[:proxy_url].include?(params["url"])
+        logger.warn "Proxy request not in session: #{params["url"]}"
+        render :nothing => true
+        return
+      end
+      
+      url = URI.parse(URI.encode(params[:url]))
+      logger.debug "Proxy request for #{url.scheme}://#{url.host}#{url.path}"
+      
+      result = Net::HTTP.get_response(url)
+      render :text => result.body, :status => result.code, :content_type => "text/xml"
+    end
+  end
+
+  # Restful feture Server methods (http://featureserver.org/)
+  module Rest
+    
+    def index
+      respond_to do |format|
+        format.xml { wfs }
+        format.kml { kml }
+      end
+    end
+    
+  end
+end

data/lib/map_layers/js_wrapper.rb

@@ -125,6 +125,9 @@ module MapLayers
     def to_s
       @variable
     end
+    def to_str
+      @variable
+    end
 
     UNDEFINED = JsExpr.new("undefined")
   end

data/lib/map_layers/kml.rb

@@ -0,0 +1,53 @@
+module MapLayers
+ 
+  # KML Server methods
+  module KML
+    
+    # Publish layer in KML format
+    def kml
+      rows = map_layers_config.model.find(:all, :limit => KML_FEATURE_LIMIT)
+      @features = rows.collect do |row|
+        if map_layers_config.geometry
+          Feature.from_geom(row.send(map_layers_config.text), row.send(map_layers_config.geometry))
+        else
+          Feature.new(row.send(map_layers_config.text), row.send(map_layers_config.lon), row.send(map_layers_config.lat))
+        end
+      end
+      @folder_name = map_layers_config.model_id.to_s.pluralize.humanize
+      logger.info "MapLayers::KML: returning #{@features.size} features"
+      render :inline => KML_XML_ERB, :content_type => "text/xml"
+    rescue Exception => e
+      logger.error "MapLayers::KML: returning no features - Caught exception '#{e}'"
+      render :text => KML_EMPTY_RESPONSE, :content_type => "text/xml"
+    end
+    
+    protected
+
+    KML_FEATURE_LIMIT = 1000
+    
+    KML_XML_ERB = <<EOS # :nodoc:
+<?xml version="1.0" encoding="UTF-8" ?>
+<kml xmlns="http://earth.google.com/kml/2.0">
+  <Document>
+  <Folder><name><%= @folder_name %></name>
+  <% for feature in @features -%>
+    <Placemark>
+      <description><%= feature.text %></description>
+      <Point><coordinates><%= feature.x %>,<%= feature.y %></coordinates></Point>
+    </Placemark>
+  <% end -%>
+  </Folder>
+  </Document>
+</kml>
+EOS
+
+    KML_EMPTY_RESPONSE = <<EOS # :nodoc:
+<?xml version="1.0" encoding="UTF-8" ?>
+<kml xmlns="http://earth.google.com/kml/2.0">
+  <Document>
+  </Document>
+</kml>
+EOS    
+  end
+
+end

data/lib/map_layers/railtie.rb

@@ -0,0 +1,27 @@
+# encoding: utf-8
+
+require 'map_layers'
+require 'map_layers/view_helpers'
+
+module MapLayers
+  # Rails 3 initialization
+  if defined? Rails::Railtie
+    require 'rails'
+    class Railtie < Rails::Railtie
+      initializer 'map_layers.initialize' do
+        MapLayers::Railtie.insert
+      end
+    end
+
+  end
+
+  class Railtie
+    def self.insert
+      ActionController::Base.send(:include, MapLayers)
+      ActionView::Base.send(:include, MapLayers)
+      ActionView::Base.send(:include, MapLayers::ViewHelpers)
+      Mime::Type.register "application/vnd.google-earth.kml+xml", :kml
+    end
+  end
+
+end

data/lib/map_layers/version.rb

@@ -1,3 +1,3 @@
 module MapLayers
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/map_layers/wfs.rb

@@ -0,0 +1,104 @@
+module MapLayers
+
+  # WFS Server methods
+  module WFS
+    
+    WGS84 = 4326
+    
+    # Publish layer in WFS format
+    def wfs
+      minx, miny, maxx, maxy = extract_params
+      model = map_layers_config.model
+      if map_layers_config.geometry
+        db_srid = model.columns_hash[map_layers_config.geometry.to_s].srid
+        if db_srid != @srid && !db_srid.nil? && db_srid != -1
+          #Transform geometry from db_srid to requested srid (not possible for undefined db_srid)
+          geom = "Transform(#{geom},#{@srid}) AS #{geom}"
+        end
+        
+        spatial_cond = if model.respond_to?(:sanitize_sql_hash_for_conditions)
+          model.sanitize_sql_hash_for_conditions(map_layers_config.geometry => [[minx, miny],[maxx, maxy], db_srid])
+        else # Rails < 2
+          model.sanitize_sql_hash(map_layers_config.geometry => [[minx, miny],[maxx, maxy], db_srid])
+        end
+        #spatial_cond = "Transform(#{spatial_cond}, #{db_srid}) )" Not necessary: bbox is always WGS84 !?
+
+        rows = model.find(:all, :conditions => spatial_cond, :limit => @maxfeatures)
+        @features = rows.collect do |row|
+          Feature.from_geom(row.send(map_layers_config.text), row.send(map_layers_config.geometry.to_s))
+        end
+      else
+        rows = model.find(:all, :limit => @maxfeatures)
+        @features = rows.collect do |row|
+          Feature.new(row.send(map_layers_config.text), row.send(map_layers_config.lon), row.send(map_layers_config.lat))
+        end
+      end
+      logger.info "MapLayers::WFS: returning #{@features.size} features"
+      render :inline => WFS_XML_ERB, :content_type => "text/xml"
+    rescue Exception => e
+      logger.error "MapLayers::WFS: returning no features - Caught exception '#{e}'"
+      render :text => WFS_EMPTY_RESPONSE, :content_type => "text/xml"
+    end
+    
+    protected
+
+    WFS_FEATURE_LIMIT = 1000
+    
+    def extract_params # :nodoc:
+      @maxfeatures = (params[:maxfeatures] || WFS_FEATURE_LIMIT).to_i
+      @srid = params['SRS'].split(/:/)[1].to_i rescue WGS84
+      req_bbox = params['BBOX'].split(/,/).collect {|n| n.to_f } rescue nil
+      @bbox = req_bbox || [-180.0, -90.0, 180.0, 90.0]
+    end
+
+    WFS_XML_ERB = <<EOS # :nodoc:
+<?xml version='1.0' encoding="UTF-8" ?>
+<wfs:FeatureCollection
+   xmlns:ms="http://mapserver.gis.umn.edu/mapserver"
+   xmlns:wfs="http://www.opengis.net/wfs"
+   xmlns:gml="http://www.opengis.net/gml"
+   xmlns:ogc="http://www.opengis.net/ogc"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengeospatial.net/wfs/1.0.0/WFS-basic.xsd 
+                       http://mapserver.gis.umn.edu/mapserver http://www.geopole.org/map/wfs?SERVICE=WFS&amp;VERSION=1.0.0&amp;REQUEST=DescribeFeatureType&amp;TYPENAME=geopole&amp;OUTPUTFORMAT=XMLSCHEMA">
+  <gml:boundedBy>
+    <gml:Box srsName="EPSG:<%= @srid %>">
+      <gml:coordinates><%= @bbox[0] %>,<%= @bbox[1] %> <%= @bbox[2] %>,<%= @bbox[3] %></gml:coordinates>
+    </gml:Box>
+  </gml:boundedBy>
+  <% for feature in @features -%>
+    <gml:featureMember>
+      <ms:geopole>
+        <gml:boundedBy>
+          <gml:Box srsName="EPSG:<%= @srid %>">
+            <gml:coordinates><%= feature.x %>,<%= feature.y %> <%= feature.x %>,<%= feature.y %></gml:coordinates>
+          </gml:Box>
+        </gml:boundedBy>
+        <ms:msGeometry>
+        <gml:Point srsName="EPSG:<%= @srid %>">
+          <gml:coordinates><%= feature.x %>,<%= feature.y %></gml:coordinates>
+        </gml:Point>
+        </ms:msGeometry>
+        <ms:text><%= feature.text %></ms:text>
+      </ms:geopole>
+    </gml:featureMember>
+  <% end -%>
+</wfs:FeatureCollection>
+EOS
+
+    WFS_EMPTY_RESPONSE = <<EOS # :nodoc:
+<?xml version='1.0' encoding="UTF-8" ?>
+<wfs:FeatureCollection
+   xmlns:wfs="http://www.opengis.net/wfs"
+   xmlns:gml="http://www.opengis.net/gml"
+   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+   xsi:schemaLocation="http://www.opengis.net/wfs http://schemas.opengeospatial.net/wfs/1.0.0/WFS-basic.xsd">
+   <gml:boundedBy>
+      <gml:null>missing</gml:null>
+   </gml:boundedBy>
+</wfs:FeatureCollection>
+EOS
+    
+  end
+
+end

data/map_layers.gemspec

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "map_layers"
   s.version     = MapLayers::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Luc Donnet", "Alban Peignier"]
-  s.email       = ["luc.donnet@dryade.net", "alban.peignier@dryade.net"]
+  s.authors     = ["Luc Donnet", "Alban Peignier", "Pirmin Kalberer"] 
+  s.email       = ["luc.donnet@free.fr", "alban.peignier@free.fr", "pka@sourcepole.ch"]
   s.homepage    = "http://github.com/ldonnet/map_layers"
   s.summary     = %q{library dedicated to generate OSM javascript}
   s.description = %q{library dedicated to generate OSM javascript}
@@ -19,10 +19,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]	
 
-  if ENV['RAILS_2']        
-    s.add_development_dependency(%q<rails>, ["~> 2.3.8"])
+  if ENV['RAILS_3']        
+    s.add_development_dependency(%q<rails>, ["~> 3.0.0"])
   else
-    s.add_development_dependency(%q<rails>, [">= 3.0.0"])
+    s.add_development_dependency(%q<rails>, [">= 2.3.8"])
   end
   s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
   s.add_development_dependency(%q<rspec-rails>, ["~> 2.0.0"])

metadata

@@ -1,42 +1,45 @@
 --- !ruby/object:Gem::Specification 
 name: map_layers
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 23
   prerelease: false
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Luc Donnet
 - Alban Peignier
+- Pirmin Kalberer
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2011-08-24 00:00:00 +02:00
+date: 2011-09-30 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+  name: rails
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 7
+        hash: 19
         segments: 
+        - 2
         - 3
-        - 0
-        - 0
-        version: 3.0.0
-  requirement: *id001
+        - 8
+        version: 2.3.8
   type: :development
-  name: rails
-  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  name: rspec
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -47,12 +50,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id002
   type: :development
-  name: rspec
-  prerelease: false
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  name: rspec-rails
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -63,12 +66,12 @@ dependencies:
         - 0
         - 0
         version: 2.0.0
-  requirement: *id003
   type: :development
-  name: rspec-rails
-  prerelease: false
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  name: rake
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -77,12 +80,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id004
   type: :development
-  name: rake
-  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  name: autotest-rails
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -91,12 +94,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id005
   type: :development
-  name: autotest-rails
-  prerelease: false
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  name: autotest-notification
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -105,14 +108,13 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  requirement: *id006
   type: :development
-  name: autotest-notification
-  prerelease: false
+  version_requirements: *id006
 description: library dedicated to generate OSM javascript
 email: 
-- luc.donnet@dryade.net
-- alban.peignier@dryade.net
+- luc.donnet@free.fr
+- alban.peignier@free.fr
+- pka@sourcepole.ch
 executables: []
 
 extensions: []
@@ -126,19 +128,24 @@ files:
 - Gemfile
 - Gemfile.lock
 - MIT-LICENSE
-- README
+- README.md
 - Rakefile
 - autotest/discover.rb
 - init.rb
 - install.rb
 - lib/map_layers.rb
-- lib/map_layers/#geonames.rb#
+- lib/map_layers/config.rb
+- lib/map_layers/feature.rb
 - lib/map_layers/geonames.rb
+- lib/map_layers/georss.rb
 - lib/map_layers/js_wrapper.rb
+- lib/map_layers/kml.rb
 - lib/map_layers/map.rb
 - lib/map_layers/open_layers.rb
+- lib/map_layers/railtie.rb
 - lib/map_layers/version.rb
 - lib/map_layers/view_helpers.rb
+- lib/map_layers/wfs.rb
 - map_layers.gemspec
 - rails/init.rb
 - spec/lib/map_layers/js_wrapper_spec.rb

data/lib/map_layers/#geonames.rb#

@@ -1,66 +0,0 @@
-rere# GeoNames REST services
-# 
-# http://www.geonames.org/export/web-services.html
-#
-module Geonames
-
-  module JsonFormat # :nodoc:
-    extend self
-
-    def extension
-      "json"
-    end
-
-    def mime_type
-      "application/json"
-    end
-
-    def encode(hash)
-      hash.to_json
-    end
-
-    def decode(json)
-      h = ActiveSupport::JSON.decode(json)
-      h.values.flatten # Return type must be an array of hashes
-    end
-  end
-
-  # GeoNames REST services base class
-  class GeonamesResource < ActiveResource::Base
-    self.site = "http://ws.geonames.org/"
-    self.format = JsonFormat
-  end
-
-  # GeoNames Postalode REST services
-  class Postalcode < GeonamesResource
-    # Postal code search
-    # 
-    # http://www.geonames.org/export/web-services.html#postalCodeSearch
-    #
-    def self.search(placename, options = {:maxRows => 50})
-      self.find(:all, :from => "/postalCodeSearchJSON", :params => { :placename => placename }.merge(options))
-    end
-  end
-
-  # GeoNames Weather REST services
-  class Weather < GeonamesResource
-    # Weather stations with the most recent weather observation
-    # 
-    # Example: Geonames::Weather.weather(:north => 44.1, :south => -9.9, :east => -22.4, :west => 55.2)
-    # 
-    # http://www.geonames.org/export/JSON-webservices.html#weatherJSON
-    #
-    def self.weather(options)
-      self.find(:all, :from => "/weatherJSON", :params => options)
-    end
-
-    # Weather station and the most recent weather observation for the ICAO code
-    # 
-    # http://www.geonames.org/export/JSON-webservices.html#weatherIcaoJSON
-    #
-    def self.weatherIcao(icao, options = {})
-      self.find(:all, :from => "/weatherIcaoJSON", :params => { :ICAO => icao }.merge(options))
-    end
-  end
- 
-end