gb_mapfish_appserver 0.9.4 → 0.9.5

data/app/controllers/application_controller.rb

@@ -80,7 +80,7 @@ class ApplicationController < ActionController::Base
 # lookups:
 
   
-  # For this example, we are simply using token authentication
+  # We are using token authentication
   # via parameters. However, anyone could use Rails's token
   # authentication features to get the token from a header.
   def authenticate_user_from_token!
@@ -88,11 +88,11 @@ class ApplicationController < ActionController::Base
     user       = user_token && User.find_by_authentication_token(user_token.to_s)
 
    if user
-      # Notice we are passing store false, so the user is not
+      # Notice when passing store false, the user is not
       # actually stored in the session and a token is needed
       # for every request. If you want the token to work as a
       # sign in token, you can simply remove store: false.
-      sign_in user, :store => false
+      sign_in user, :store => true
     end
   end
 

data/app/controllers/apps_controller.rb

@@ -23,6 +23,11 @@ class AppsController < ApplicationController
     @selproperty = params['selproperty']
     @selvalues = params['selvalues'].nil? ? [] : params['selvalues'].split('$')
 
+    @filt_topic = params['filttopic']
+    @filt_param = params['filtparam']
+    @filt_values = params['filtvalues'].nil? ? [] : params['filtvalues'].split('$')
+    @filt_typestring = params['filttypestring'].nil? ? 0 : params['filttypestring']
+
     @redlining = params['redlining'].blank? ? nil : params['redlining']
     @centermarker = params['centermarker']
 

data/app/controllers/geo_controller.rb

@@ -44,6 +44,8 @@ class GeoController < ApplicationController
       logger.info "#{geo_model.table_name}.update_attributes_from_feature: #{feature.inspect}"
       if new_feature.update_attributes_from_geojson_feature(feature, current_user)
         @features << new_feature
+      else
+        head :unprocessable_entity
       end
     end
 

data/app/controllers/print_controller.rb

@@ -208,18 +208,16 @@ class PrintController < ApplicationController
   def add_sld_body(topic, layer)
     # add SLD for selection
     unless layer["customParams"]["SELECTION[LAYER]"].blank?
-      sld_body = Wms.sld_selection(topic,
-        layer["customParams"]["SELECTION[LAYER]"],
+      sellayer = topic.layers.find_by_name(layer["customParams"]["SELECTION[LAYER]"])
+      if sellayer.nil?
+        logger.info "Selection layer '#{layer["customParams"]["SELECTION[LAYER]"]}' not found in topic '#{topic.name}'"
+        return
+      end
+      sld_body = Wms.sld_selection(sellayer,
         layer["customParams"]["SELECTION[PROPERTY]"],
         layer["customParams"]["SELECTION[VALUES]"].split(',')
       )
-
-      unless sld_body.nil?
-        # add serverside SLD for selection
-        layer["customParams"]["SLD_BODY"] = sld_body
-      else
-        logger.info "Selection layer '#{layer["customParams"]["SELECTION[LAYER]"]}' not found in topic '#{topic.name}'"
-      end
+      layer["customParams"]["SLD_BODY"] = sld_body
 
       # remove non-WMS params
       layer["customParams"].delete("SELECTION[LAYER]")

data/app/controllers/search_controller.rb

@@ -2,13 +2,26 @@ class SearchController < ApplicationController
 
   def index
     @rule =  SEARCHRULES[params[:rule]]
-    result = @rule.model.query(@rule.fields, params)
-    @features = result[:features]
-    @quality = result[:quality]
+    if @rule.nil? then
+      respond_to do |format|
+        format.html # index.html.erb
+        format.json { render :json => {:success => false,  :quality => -9999, :msg => "ERROR: #{params[:rule]} model missing"} }
+      end
+    else
+      result = @rule.model.query(@rule.fields, params)
+      @features = result[:features]
+      @quality = result[:quality]
+      @success = @quality >= 0 
 
-    respond_to do |format|
-      format.html # index.html.erb
-      format.json { render :json => {:success => true, :features => features_for_json_reader(@features), :quality => @quality} }
+      respond_to do |format|
+        format.html # index.html.erb
+        if @success then
+          format.json { render :json => {:success => @success, :features => features_for_json_reader(@features), :quality => @quality} }
+        else
+          @msg = result[:msg]
+          format.json { render :json => {:success => @success, :features => features_for_json_reader(@features), :quality => @quality, :msg => @msg} }
+        end
+      end
     end
   end
 

data/app/controllers/wms_controller.rb

@@ -117,47 +117,15 @@ class WmsController < ApplicationController
         logger.info "Selection layer '#{params[:SELECTION][:LAYER]}' not found in topic '#{topic.name}'"
         return
       end
-      sld_body = sld_selection(layer, params[:SELECTION][:PROPERTY], params[:SELECTION][:VALUES].split(','))
+      sld_body = Wms.sld_selection(layer, params[:SELECTION][:PROPERTY], params[:SELECTION][:VALUES].split(','))
       # Remove non-WMS params
       request.env["QUERY_STRING"].gsub!(/(^|&)SELECTION.+?(?=(&|$))/, '')
+      #params.delete(:SELECTION)
       # add serverside SLD for selection
       request.env["QUERY_STRING"] += "&SLD_BODY=" + URI.escape(sld_body)
-      params.delete[:SELECTION]
     end
   end
 
-  def sld_selection(layer, filter_property, filter_values)
-    sld = '<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" version="1.0.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml">'
-    sld <<  "<NamedLayer>"
-    sld <<    "<Name>#{layer.name}</Name>"
-    sld <<    "<UserStyle>"
-    sld <<      "<Name>default</Name>"
-    sld <<      "<FeatureTypeStyle>"
-
-    filter_values.each do |value|
-      # NOTE: use a separate rule for each value as workaround, as combined filter with <ogc:Or> does not work as expected
-      sld <<      "<Rule>"
-      sld <<        "<Name>show-#{value}</Name>"
-      sld <<        '<ogc:Filter>'
-      sld <<          "<ogc:PropertyIsEqualTo>"
-      sld <<            "<ogc:PropertyName>#{filter_property}</ogc:PropertyName>"
-      sld <<            "<ogc:Literal>#{value}</ogc:Literal>"
-      sld <<          "</ogc:PropertyIsEqualTo>"
-      sld <<        "</ogc:Filter>"
-      sld << layer.selection_symbolizer
-      sld <<        "<MinScaleDenominator>0</MinScaleDenominator>"
-      sld <<        "<MaxScaleDenominator>999999999</MaxScaleDenominator>"
-      sld <<      "</Rule>"
-    end
-
-    sld <<      "</FeatureTypeStyle>"
-    sld <<    "</UserStyle>"
-    sld <<  "</NamedLayer>"
-    sld << "</StyledLayerDescriptor>"
-
-    sld
-  end
-
   def add_filter(topic_name)
     unless params[:LAYERS].blank?
       filters = Wms.access_filters(current_ability, current_user, topic_name, params[:LAYERS].split(','))

data/app/models/geo_model.rb

@@ -84,7 +84,7 @@ class GeoModel < ActiveRecord::Base
       filter = filter.where("ST_Intersects(#{table_name}.#{connection.quote_column_name(geometry_column_name)}, ST_SetSRID(#{filter_geom}, #{srid}))")
     end
 
-    filter
+    filter.limit(1000)
   end
 
   def self.geojson_decode(json)
@@ -111,7 +111,7 @@ class GeoModel < ActiveRecord::Base
 
   def update_attributes_from_geojson_feature(feature, user)
     attr = feature.properties
-    attr[self.class.geometry_column_name] = feature.geometry
+    attr[self.class.geometry_column_name] = feature.geometry unless feature.geometry.nil?
     ok = update_attributes(attr)
     modified_by(user)
     ok

data/app/models/topic.rb

@@ -85,7 +85,8 @@ class Topic < ActiveRecord::Base
               "background_layer" => topic.background_layer,
               "main_layer" => topic.main_layer,
               "overlay_layer" => topic.overlay_layer,
-              "minscale" => topic.minscale
+              "minscale" => topic.minscale,
+              "gb1_params" => topic.gb1_params  #TODO: generalized param for custom viewers
             }
           end
         end

data/app/models/wms.rb

@@ -9,6 +9,39 @@ class Wms
     @name = name
   end
 
+  # return SLD for selection
+  def self.sld_selection(layer, filter_property, filter_values)
+    sld = '<StyledLayerDescriptor xmlns="http://www.opengis.net/sld" version="1.0.0" xmlns:ogc="http://www.opengis.net/ogc" xmlns:gml="http://www.opengis.net/gml">'
+    sld <<  "<NamedLayer>"
+    sld <<    "<Name>#{layer.name}</Name>"
+    sld <<    "<UserStyle>"
+    sld <<      "<Name>default</Name>"
+    sld <<      "<FeatureTypeStyle>"
+
+    filter_values.each do |value|
+      # NOTE: use a separate rule for each value as workaround, as combined filter with <ogc:Or> does not work as expected
+      sld <<      "<Rule>"
+      sld <<        "<Name>show-#{value}</Name>"
+      sld <<        '<ogc:Filter>'
+      sld <<          "<ogc:PropertyIsEqualTo>"
+      sld <<            "<ogc:PropertyName>#{filter_property}</ogc:PropertyName>"
+      sld <<            "<ogc:Literal>#{value}</ogc:Literal>"
+      sld <<          "</ogc:PropertyIsEqualTo>"
+      sld <<        "</ogc:Filter>"
+      sld << layer.selection_symbolizer
+      sld <<        "<MinScaleDenominator>0</MinScaleDenominator>"
+      sld <<        "<MaxScaleDenominator>999999999</MaxScaleDenominator>"
+      sld <<      "</Rule>"
+    end
+
+    sld <<      "</FeatureTypeStyle>"
+    sld <<    "</UserStyle>"
+    sld <<  "</NamedLayer>"
+    sld << "</StyledLayerDescriptor>"
+
+    sld
+  end
+
   def self.access_filters(ability, user, topic_name, layers)
     access_filters = {}
     unless topic_name.blank?

data/lib/gb_mapfish_appserver/core_extensions.rb

@@ -0,0 +1,35 @@
+#
+# Copyright (C) 2008 Pirmin Kalberer, Sourcepole AG
+#
+# This file is part of MapFish Server
+#
+# MapFish Server is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# MapFish Server is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with MapFish Server.  If not, see <http://www.gnu.org/licenses/>.
+#
+
+module GbMapfishAppserver
+  module Array
+
+    def to_geojson(options = {})
+      geojson = '{"type": "FeatureCollection", "features": ['
+      geojson << collect {|e| e.to_geojson(options) }.join(',')
+      geojson << ']}'
+      geojson
+    end
+
+  end
+end
+
+Array.class_eval do
+  include GbMapfishAppserver::Array
+end

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

data/lib/gb_mapfish_appserver.rb

@@ -1,4 +1,6 @@
 require "gb_mapfish_appserver/engine"
+require "gb_mapfish_appserver/core_extensions"
+
 
 module GbMapfishAppserver
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gb_mapfish_appserver
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-03 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &21600120 !ruby/object:Gem::Requirement
+  requirement: &13079460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.13
   type: :runtime
   prerelease: false
-  version_requirements: *21600120
+  version_requirements: *13079460
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &21599620 !ruby/object:Gem::Requirement
+  requirement: &13091140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21599620
+  version_requirements: *13091140
 - !ruby/object:Gem::Dependency
   name: acts_as_tree
-  requirement: &21598800 !ruby/object:Gem::Requirement
+  requirement: &13088220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *21598800
+  version_requirements: *13088220
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &21597760 !ruby/object:Gem::Requirement
+  requirement: &13102320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *21597760
+  version_requirements: *13102320
 - !ruby/object:Gem::Dependency
   name: cancan
-  requirement: &21597280 !ruby/object:Gem::Requirement
+  requirement: &13099000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.8
   type: :runtime
   prerelease: false
-  version_requirements: *21597280
+  version_requirements: *13099000
 - !ruby/object:Gem::Dependency
   name: rails_admin
-  requirement: &21596760 !ruby/object:Gem::Requirement
+  requirement: &13095780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *21596760
+  version_requirements: *13095780
 - !ruby/object:Gem::Dependency
   name: fastercsv
-  requirement: &21596160 !ruby/object:Gem::Requirement
+  requirement: &13109120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21596160
+  version_requirements: *13109120
 - !ruby/object:Gem::Dependency
   name: sass
-  requirement: &21595320 !ruby/object:Gem::Requirement
+  requirement: &13106760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 3.2.12
   type: :runtime
   prerelease: false
-  version_requirements: *21595320
+  version_requirements: *13106760
 - !ruby/object:Gem::Dependency
   name: GeoRuby
-  requirement: &21594500 !ruby/object:Gem::Requirement
+  requirement: &12738520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: 0.1.4
   type: :runtime
   prerelease: false
-  version_requirements: *21594500
+  version_requirements: *12738520
 - !ruby/object:Gem::Dependency
   name: rgeo
-  requirement: &21593740 !ruby/object:Gem::Requirement
+  requirement: &12816320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.3.20
   type: :runtime
   prerelease: false
-  version_requirements: *21593740
+  version_requirements: *12816320
 - !ruby/object:Gem::Dependency
   name: rgeo-geojson
-  requirement: &21593180 !ruby/object:Gem::Requirement
+  requirement: &12810900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *21593180
+  version_requirements: *12810900
 - !ruby/object:Gem::Dependency
   name: hpricot
-  requirement: &21592700 !ruby/object:Gem::Requirement
+  requirement: &12829520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *21592700
+  version_requirements: *12829520
 - !ruby/object:Gem::Dependency
   name: pg
-  requirement: &21592120 !ruby/object:Gem::Requirement
+  requirement: &12836620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -153,10 +153,10 @@ dependencies:
         version: 0.14.0
   type: :runtime
   prerelease: false
-  version_requirements: *21592120
+  version_requirements: *12836620
 - !ruby/object:Gem::Dependency
   name: activerecord-postgis-adapter
-  requirement: &21591580 !ruby/object:Gem::Requirement
+  requirement: &12860020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -164,7 +164,7 @@ dependencies:
         version: 0.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *21591580
+  version_requirements: *12860020
 description: Mapfish Appserver is a framework for web mapping applications using OGC
   standards and the Mapfish protocol.
 email:
@@ -274,6 +274,7 @@ files:
 - db/seeds.rb
 - gb_mapfish_appserver.gemspec
 - lib/gb_mapfish_appserver.rb
+- lib/gb_mapfish_appserver/core_extensions.rb
 - lib/gb_mapfish_appserver/engine.rb
 - lib/gb_mapfish_appserver/version.rb
 - lib/generators/mapfish/install/install_generator.rb