gb_mapfish_appserver 0.0.6 → 0.0.7

data/.gitignore

@@ -0,0 +1,11 @@
+Gemfile.lock
+.bundle/
+log/*.log
+pkg/
+test/dummy/db/*.sqlite3
+test/dummy/log/*.log
+test/dummy/tmp/
+test/dummy/.sass-cache
+database.yml
+geodatabase.yml
+connection.inc

data/Gemfile

@@ -0,0 +1,18 @@
+source "http://rubygems.org"
+
+# Declare your gem's dependencies in gb_mapfish_appserver.gemspec.
+# Bundler will treat runtime dependencies like base dependencies, and
+# development dependencies will be added by default to the :development group.
+gemspec
+
+# Declare any dependencies that are still in development here instead of in
+# your gemspec. These might include edge Rails or gems from your path or
+# Git. Remember to move these dependencies to your gemspec before releasing
+# your gem to rubygems.org.
+
+# To use debugger
+# gem 'ruby-debug'
+
+gem 'therubyracer', :platforms => :ruby
+gem 'gb_mapfish_print'
+gem 'ruby_mapscript', :platforms => :ruby

data/app/controllers/print_controller.rb

@@ -134,11 +134,11 @@ class PrintController < ApplicationController
       # use temp config file with added custom scales
       print_config = File.read(@configFile)
       print_config.gsub!(/scales:/, "scales:\n#{ scales.collect {|s| "  - #{s.to_s}"}.join("\n") }")
-      config_file = TMP_PREFIX + tempId.to_s + "print.yaml"
+      config_file = TMP_PREFIX + tempId.to_s + "print.yml"
       File.open(config_file, "w") { |file| file << print_config }
 
       temp = TMP_PREFIX + tempId.to_s + TMP_SUFFIX
-      cmd = baseCmd + " --output=" + temp
+      cmd = baseCmd(config_file) + " --output=" + temp
       result = ""
       errors = ""
       status = POpen4::popen4(cmd) do |stdout, stderr, stdin, pid|
@@ -213,8 +213,9 @@ class PrintController < ApplicationController
     out
   end
 
-  def baseCmd
-    "java -cp #{GbMapfishPrint::PRINT_JAR} org.mapfish.print.ShellMapPrinter --config=#{@configFile}"
+  def baseCmd(config_file = nil)
+    config = config_file || @configFile
+    "java -cp #{GbMapfishPrint::PRINT_JAR} org.mapfish.print.ShellMapPrinter --config=#{config}"
   end
 
   def cleanupTempFiles

data/app/models/layer.rb

@@ -171,16 +171,18 @@ EOS
   def get_feature_info(searchgeo)
     logger.debug searchgeo.inspect
     x1, y1, x2, y2 = searchgeo.split(',').collect(&:to_f)
+    #Since we get the query coordinates and not pixels, we have to assume a certain scale
+    dist = (x1*0.01).abs
     params = [
       "FEATURE_COUNT=10",
       "INFO_FORMAT=application/vnd.ogc.gml", #text/xml
       "REQUEST=GetFeatureInfo",
       "SERVICE=WMS",
-      "BBOX=#{x1},#{y1},#{x1*1.01},#{y1*1.01}",
-      "WIDTH=10",
-      "HEIGHT=10",
+      "BBOX=#{x1},#{y1},#{x1+dist},#{y1+dist}",
+      "WIDTH=100",
+      "HEIGHT=100",
       "X=0",
-      "Y=0"
+      "Y=99"
     ]
     url = "#{table}&#{params.join('&')}"
     logger.debug "*** Cascaded GetFeatureInfo: #{url}"

data/app/models/topic.rb

@@ -127,6 +127,20 @@ class Topic < ActiveRecord::Base
     end
   end
 
+  #header template
+  def self.query_header_fname
+    "_query_header.html.erb"
+  end
+
+  def self.query_header_file
+    File.join(Rails.root, 'app', 'views', 'topics', query_header_fname)
+  end
+
+  def self.query_header
+    @query_header ||= File.exist?(query_header_file) ? "topics/#{query_header_fname[1..-10]}" : nil
+  end
+
+  #header template for each topic
   def info_header_fname
     "_#{name.downcase}_info.html.erb"
   end

data/app/views/topics/query.html.erb

@@ -1,4 +1,4 @@
-<div class='infokoord'><b>Informationen</b> f&uuml;r ausgew&auml;hlte Themen bei Koordinate <span id='infoxy'></span>:</div>
+<%= render :partial => Topic.query_header if Topic.query_header %>
 <% @query_topics.each do |query_topic| %>
   <% @topic = query_topic['topicobj'] %>
   <% @results = query_topic['results'] %>

data/gb_mapfish_appserver.gemspec

@@ -0,0 +1,37 @@
+$:.push File.expand_path("../lib", __FILE__)
+
+require "gb_mapfish_appserver/version"
+
+Gem::Specification.new do |s|
+  s.name        = "gb_mapfish_appserver"
+  s.version     = GbMapfishAppserver::VERSION
+  s.authors     = ["Pirmin Kalberer"]
+  s.email       = ["pka@sourcepole.ch"]
+  s.homepage    = "http://mapfish-appserver.github.io/"
+  s.summary     = "Mapfish application server."
+  s.description = "Mapfish Appserver is a framework for web mapping applications using OGC standards and the Mapfish protocol."
+
+  s.files       = `git ls-files`.split($/)
+  s.executables = s.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  s.test_files  = s.files.grep(%r{^(test|spec|features)/})
+
+  s.add_dependency "rails", "~> 3.2.13"
+  s.add_dependency "json"
+  s.add_dependency "acts_as_tree", "0.2.0"
+
+  s.add_dependency "devise", "2.0.4"
+  s.add_dependency "cancan", "1.6.7"
+
+  s.add_dependency "rails_admin", "0.0.5"
+  s.add_dependency "fastercsv"# required for rails_admin and Ruby <= 1.8
+
+  s.add_dependency "GeoRuby", ">= 0.1.4" #used for reading envelope, e.g. in GeoModel#bbox
+
+  s.add_dependency "rgeo", "0.3.20"
+  s.add_dependency "rgeo-geojson", "0.2.1"
+
+  s.add_dependency "hpricot" # Cascaded WMS FeatureInfo parsing
+
+  s.add_dependency "pg", "0.14.0"
+  s.add_dependency "activerecord-postgis-adapter", "0.4.1"
+end

data/lib/gb_mapfish_appserver/version.rb

@@ -1,3 +1,3 @@
 module GbMapfishAppserver
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/lib/generators/mapfish/install/install_generator.rb

@@ -100,6 +100,10 @@ PRINT_URL = nil #'http://localhost:8080/print-servlet-1.1/pdf/print.pdf'
         directory "../../../../../lib/tasks/templates", "lib/tasks/templates", :verbose => false
       end
 
+      def add_query_header_template
+        create_file "app/views/topisc/_query_header.html.erb", ""
+      end
+
     end
   end
 end

data/lib/tasks/mapfile.rake

@@ -51,13 +51,13 @@ namespace :mapfile do
       topic.main_layer = true if topic.main_layer.nil?
       topic.save!
 
-      topic.topics_layers.destroy_all
-      topic.categories_topics.destroy_all
       Layer.unused.destroy_all
       SublayerGroup.unused.destroy_all
 
       category = @map.web.metadata['gb_category'] || 'Uncategorized'
-      topic.categories << Category.find_or_create_by_title(category)
+      if topic.categories.empty?
+        topic.categories << Category.find_or_create_by_title(category)
+      end
 
       sublayer_groups = {}
 
@@ -143,8 +143,9 @@ namespace :mapfile do
           #Info & Legend
           mkdir_p File.dirname(layer.info_file_auto)
 
+          display_only = (mlayer.type == MS_LAYER_RASTER && mlayer.connectiontype != MS_WMS) || mlayer.type == MS_LAYER_ANNOTATION
           if queryable
-            if mlayer.type == MS_LAYER_RASTER || mlayer.type == MS_LAYER_ANNOTATION
+            if display_only
               puts "Warning: Raster/Anntotation layer '#{layer.name}' is queryable (TEMPLATE #{mlayer.template})"
             end
             #puts "Creating #{layer.info_file_auto}"
@@ -156,7 +157,7 @@ namespace :mapfile do
               layer.alias_fields.split(',')
             end
             infotab_template = "_infotable_auto"
-            template = File.open(File.join(File.dirname(__FILE__), 'templates', "#{infotab_template}.html.erb")).read
+            template = File.open(File.join(Rails.root, 'lib', 'tasks', 'templates', "#{infotab_template}.html.erb")).read
             template = ERB.new(template, nil, '<>')
             File.open(layer.info_file_auto, 'w') do |file|
               file << template.result(binding)
@@ -166,7 +167,7 @@ namespace :mapfile do
           # Layer legend
           legend_icon_path = File.join(Rails.root, 'public', 'images', 'custom', topic_name.downcase)
           mkdir_p legend_icon_path
-          if mlayer.type != MS_LAYER_RASTER && mlayer.type != MS_LAYER_ANNOTATION
+          if !display_only
             #puts "Creating #{layer.legend_file_auto}"
             File.open(layer.legend_file_auto, 'w') do |file|
               file << "<table class='legtab'>\n"
@@ -213,12 +214,15 @@ namespace :mapfile do
         end
 
         #topics_layers
-        tl = topic.topics_layers.build(:layer => layer)
+        tl = topic.topics_layers.where(:layer_id => layer).first || topic.topics_layers.build(:layer => layer)
         tl.queryable = queryable
         tl.visini = mlayer.status == MS_ON
         tl.wms_sort = layerno
-        tl.leg_sort = mlayer.metadata['gb_leg_sort'] || layerno*100
-        tl.toc_sort = mlayer.metadata['gb_toc_sort'] || layerno*100
+        #Do now overwrite values changed manually in the DB:
+        tl.leg_sort = mlayer.metadata['gb_leg_sort'] if mlayer.metadata['gb_leg_sort']
+        tl.toc_sort = mlayer.metadata['gb_toc_sort'] if mlayer.metadata['gb_toc_sort']
+        tl.leg_sort ||= layerno*100
+        tl.toc_sort ||= layerno*100
         tl.save!
       end
 

data/lib/tasks/templates/_infotable_auto.html.erb

@@ -9,14 +9,12 @@
 <% aliases.each_with_index do |title, i| %>
      <td class="tabtitle"><%= title %></td>
 <% end %>
-     <td class="tabtitle">Markieren</td>
   </tr>
   <%% for feature in features do -%>
     <tr>
 <% fields.each_with_index do |field, i| %>
     <td class="tabcell"><%%= feature.<%= field %> %></td>
 <% end %>
-    <td class="tabcell"><a class="markfeature" href="Javascript:showID('<%= layer.name %>','<%= layer.pkey %>','<%= layer.pkey %>','','<%%= feature.<%= layer.pkey %> %>')" id="show-<%= layer.name %>-<%%= feature.<%= layer.pkey %> %>" data-topic="<%= topic_name %>" data-layer="<%= layer.name %>" data-pkey="<%= layer.pkey %>" data-id="<%%= feature.<%= layer.pkey %> %>" data-minx="<%%= feature.bbox[0] %>" data-miny="<%%= feature.bbox[1] %>" data-maxx="<%%= feature.bbox[2] %>" data-maxy="<%%= feature.bbox[3] %>">In Karte markieren</a></td>
     </tr>
   <%% end %>
 </table>
@@ -29,15 +27,6 @@
   <%% end %>
   </tr>
 <% end %>
-  <tr><td class="tabtitle">Markieren</td>
-  <%% for feature in features do -%>
-    <td class="tabcell"><a class="markfeature" href="Javascript:showID('<%= layer.name %>','<%= layer.pkey %>','<%= layer.pkey %>','','<%%= feature.<%= layer.pkey %> %>')" id="show-<%= layer.name %>-<%%= feature.<%= layer.pkey %> %>" data-topic="<%= topic_name %>" data-layer="<%= layer.name %>" data-pkey="<%= layer.pkey %>" data-id="<%%= feature.<%= layer.pkey %> %>" data-minx="<%%= feature.bbox[0] %>" data-miny="<%%= feature.bbox[1] %>" data-maxx="<%%= feature.bbox[2] %>" data-maxy="<%%= feature.bbox[3] %>">In Karte markieren</a></td>
-  <%% end %>
-  </tr>
 </table>
 <%% end %>
 <% end %>
-<%% if features.size > 1 -%>
-<%% values = features.collect(&:<%= layer.pkey %>).join('$') %>
-<a class="markfeature" href="Javascript:showID('<%= layer.name %>','<%= layer.pkey %>','<%= layer.pkey %>','','<%%= values %>')" id="show-<%= layer.name %>-<%%= values %>" data-topic="<%= topic_name %>" data-layer="<%= layer.name %>" data-pkey="<%= layer.pkey %>" data-id="<%%= values %>" data-minx="<%%= feature.bbox[0] %>" data-miny="<%%= feature.bbox[1] %>" data-maxx="<%%= feature.bbox[2] %>" data-maxy="<%%= feature.bbox[3] %>">In Karte markieren</a>
-<%% end -%>

data/script/rails

@@ -0,0 +1,8 @@
+#!/usr/bin/env ruby1.9.1
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_ROOT = File.expand_path('../..', __FILE__)
+ENGINE_PATH = File.expand_path('../../lib/gb_mapfish_appserver/engine', __FILE__)
+
+require 'rails/all'
+require 'rails/engine/commands'

data/test/dummy/app/views/layers/custom/cascadingwms/_cascaded_info.html.erb

@@ -1,7 +1,7 @@
 <table class="infotab">
   <tr>
      <td class="tabtitle">Country</td>
-     <td class="tabtitle">sov_a3</td>
+     <td class="tabtitle">Short</td>
   </tr>
   <% for feature in features do -%>
     <tr>

data/test/dummy/app/views/layers/custom/cascadingwms/auto/_cascaded_info.html.erb

@@ -2,14 +2,12 @@
 <table class="infotab">
   <tr>
      <td class="tabtitle">Country</td>
-     <td class="tabtitle">sov_a3</td>
-     <td class="tabtitle">Markieren</td>
+     <td class="tabtitle">Short</td>
   </tr>
   <% for feature in features do -%>
     <tr>
-    <td class="tabcell"><%= feature.sovereignt %></td>
-    <td class="tabcell"><%= feature.sov_a3 %></td>
-    <td class="tabcell"><a class="markfeature" href="Javascript:showID('cascaded','','','','<%= feature. %>')" id="show-cascaded-<%= feature. %>" data-topic="cascadingwms" data-layer="cascaded" data-pkey="" data-id="<%= feature. %>" data-minx="<%= feature.bbox[0] %>" data-miny="<%= feature.bbox[1] %>" data-maxx="<%= feature.bbox[2] %>" data-maxy="<%= feature.bbox[3] %>">In Karte markieren</a></td>
+    <td class="tabcell"><%= feature.ne:sovereignt %></td>
+    <td class="tabcell"><%= feature.ne:sov_a3 %></td>
     </tr>
   <% end %>
 </table>
@@ -17,22 +15,13 @@
 <table class="infotab">
   <tr><td class="tabtitle">Country</td>
   <% for feature in features do -%>
-    <td class="tabcell"><%= feature.sovereignt %></td>
+    <td class="tabcell"><%= feature.ne:sovereignt %></td>
   <% end %>
   </tr>
-  <tr><td class="tabtitle">sov_a3</td>
+  <tr><td class="tabtitle">Short</td>
   <% for feature in features do -%>
-    <td class="tabcell"><%= feature.sov_a3 %></td>
-  <% end %>
-  </tr>
-  <tr><td class="tabtitle">Markieren</td>
-  <% for feature in features do -%>
-    <td class="tabcell"><a class="markfeature" href="Javascript:showID('cascaded','','','','<%= feature. %>')" id="show-cascaded-<%= feature. %>" data-topic="cascadingwms" data-layer="cascaded" data-pkey="" data-id="<%= feature. %>" data-minx="<%= feature.bbox[0] %>" data-miny="<%= feature.bbox[1] %>" data-maxx="<%= feature.bbox[2] %>" data-maxy="<%= feature.bbox[3] %>">In Karte markieren</a></td>
+    <td class="tabcell"><%= feature.ne:sov_a3 %></td>
   <% end %>
   </tr>
 </table>
 <% end %>
-<% if features.size > 1 -%>
-<% values = features.collect(&:).join('$') %>
-<a class="markfeature" href="Javascript:showID('cascaded','','','','<%= values %>')" id="show-cascaded-<%= values %>" data-topic="cascadingwms" data-layer="cascaded" data-pkey="" data-id="<%= values %>" data-minx="<%= feature.bbox[0] %>" data-miny="<%= feature.bbox[1] %>" data-maxx="<%= feature.bbox[2] %>" data-maxy="<%= feature.bbox[3] %>">In Karte markieren</a>
-<% end -%>

data/test/dummy/app/views/layers/custom/cascadingwms/auto/_cascaded_legend.html.erb

@@ -0,0 +1,2 @@
+<table class='legtab'>
+</table>

data/test/dummy/app/views/layers/custom/cascadingwms/auto/_countries_info.html.erb

@@ -3,13 +3,11 @@
   <tr>
      <td class="tabtitle">Name</td>
      <td class="tabtitle">Population</td>
-     <td class="tabtitle">Markieren</td>
   </tr>
   <% for feature in features do -%>
     <tr>
     <td class="tabcell"><%= feature.name %></td>
     <td class="tabcell"><%= feature.pop_est %></td>
-    <td class="tabcell"><a class="markfeature" href="Javascript:showID('countries','ogc_fid','ogc_fid','','<%= feature.ogc_fid %>')" id="show-countries-<%= feature.ogc_fid %>" data-topic="cascadingwms" data-layer="countries" data-pkey="ogc_fid" data-id="<%= feature.ogc_fid %>" data-minx="<%= feature.bbox[0] %>" data-miny="<%= feature.bbox[1] %>" data-maxx="<%= feature.bbox[2] %>" data-maxy="<%= feature.bbox[3] %>">In Karte markieren</a></td>
     </tr>
   <% end %>
 </table>
@@ -25,14 +23,5 @@
     <td class="tabcell"><%= feature.pop_est %></td>
   <% end %>
   </tr>
-  <tr><td class="tabtitle">Markieren</td>
-  <% for feature in features do -%>
-    <td class="tabcell"><a class="markfeature" href="Javascript:showID('countries','ogc_fid','ogc_fid','','<%= feature.ogc_fid %>')" id="show-countries-<%= feature.ogc_fid %>" data-topic="cascadingwms" data-layer="countries" data-pkey="ogc_fid" data-id="<%= feature.ogc_fid %>" data-minx="<%= feature.bbox[0] %>" data-miny="<%= feature.bbox[1] %>" data-maxx="<%= feature.bbox[2] %>" data-maxy="<%= feature.bbox[3] %>">In Karte markieren</a></td>
-  <% end %>
-  </tr>
 </table>
 <% end %>
-<% if features.size > 1 -%>
-<% values = features.collect(&:ogc_fid).join('$') %>
-<a class="markfeature" href="Javascript:showID('countries','ogc_fid','ogc_fid','','<%= values %>')" id="show-countries-<%= values %>" data-topic="cascadingwms" data-layer="countries" data-pkey="ogc_fid" data-id="<%= values %>" data-minx="<%= feature.bbox[0] %>" data-miny="<%= feature.bbox[1] %>" data-maxx="<%= feature.bbox[2] %>" data-maxy="<%= feature.bbox[3] %>">In Karte markieren</a>
-<% end -%>

data/test/dummy/app/views/layers/custom/naturalearth/auto/_countries_info.html.erb

@@ -3,13 +3,11 @@
   <tr>
      <td class="tabtitle">Name</td>
      <td class="tabtitle">Population</td>
-     <td class="tabtitle">Markieren</td>
   </tr>
   <% for feature in features do -%>
     <tr>
     <td class="tabcell"><%= feature.name %></td>
     <td class="tabcell"><%= feature.pop_est %></td>
-    <td class="tabcell"><a class="markfeature" href="Javascript:showID('countries','ogc_fid','ogc_fid','','<%= feature.ogc_fid %>')" id="show-countries-<%= feature.ogc_fid %>" data-topic="naturalearth" data-layer="countries" data-pkey="ogc_fid" data-id="<%= feature.ogc_fid %>" data-minx="<%= feature.bbox[0] %>" data-miny="<%= feature.bbox[1] %>" data-maxx="<%= feature.bbox[2] %>" data-maxy="<%= feature.bbox[3] %>">In Karte markieren</a></td>
     </tr>
   <% end %>
 </table>
@@ -25,14 +23,5 @@
     <td class="tabcell"><%= feature.pop_est %></td>
   <% end %>
   </tr>
-  <tr><td class="tabtitle">Markieren</td>
-  <% for feature in features do -%>
-    <td class="tabcell"><a class="markfeature" href="Javascript:showID('countries','ogc_fid','ogc_fid','','<%= feature.ogc_fid %>')" id="show-countries-<%= feature.ogc_fid %>" data-topic="naturalearth" data-layer="countries" data-pkey="ogc_fid" data-id="<%= feature.ogc_fid %>" data-minx="<%= feature.bbox[0] %>" data-miny="<%= feature.bbox[1] %>" data-maxx="<%= feature.bbox[2] %>" data-maxy="<%= feature.bbox[3] %>">In Karte markieren</a></td>
-  <% end %>
-  </tr>
 </table>
 <% end %>
-<% if features.size > 1 -%>
-<% values = features.collect(&:ogc_fid).join('$') %>
-<a class="markfeature" href="Javascript:showID('countries','ogc_fid','ogc_fid','','<%= values %>')" id="show-countries-<%= values %>" data-topic="naturalearth" data-layer="countries" data-pkey="ogc_fid" data-id="<%= values %>" data-minx="<%= feature.bbox[0] %>" data-miny="<%= feature.bbox[1] %>" data-maxx="<%= feature.bbox[2] %>" data-maxy="<%= feature.bbox[3] %>">In Karte markieren</a>
-<% end -%>

data/test/dummy/app/views/topics/_query_header.html.erb

@@ -0,0 +1,3 @@
+<div class='infokoord'>
+Results at <%= @xx.round(2) %> / <%= @yy.round(2) %>:
+</div>

data/test/dummy/app/views/topics/custom/auto/_cascadingwms_legend.html.erb

@@ -2,3 +2,7 @@
   <p class="layer">Countries</p>
   <%= render :partial => 'layers/custom/cascadingwms/auto/countries_legend', :as => :legend %>
 </div>
+<div class="legpart">
+  <p class="layer">Cascaded</p>
+  <%= render :partial => 'layers/custom/cascadingwms/auto/cascaded_legend', :as => :legend %>
+</div>

data/test/dummy/lib/tasks/templates/_infotable_auto.html.erb

@@ -9,14 +9,12 @@
 <% aliases.each_with_index do |title, i| %>
      <td class="tabtitle"><%= title %></td>
 <% end %>
-     <td class="tabtitle">Markieren</td>
   </tr>
   <%% for feature in features do -%>
     <tr>
 <% fields.each_with_index do |field, i| %>
     <td class="tabcell"><%%= feature.<%= field %> %></td>
 <% end %>
-    <td class="tabcell"><a class="markfeature" href="Javascript:showID('<%= layer.name %>','<%= layer.pkey %>','<%= layer.pkey %>','','<%%= feature.<%= layer.pkey %> %>')" id="show-<%= layer.name %>-<%%= feature.<%= layer.pkey %> %>" data-topic="<%= topic_name %>" data-layer="<%= layer.name %>" data-pkey="<%= layer.pkey %>" data-id="<%%= feature.<%= layer.pkey %> %>" data-minx="<%%= feature.bbox[0] %>" data-miny="<%%= feature.bbox[1] %>" data-maxx="<%%= feature.bbox[2] %>" data-maxy="<%%= feature.bbox[3] %>">In Karte markieren</a></td>
     </tr>
   <%% end %>
 </table>
@@ -29,15 +27,6 @@
   <%% end %>
   </tr>
 <% end %>
-  <tr><td class="tabtitle">Markieren</td>
-  <%% for feature in features do -%>
-    <td class="tabcell"><a class="markfeature" href="Javascript:showID('<%= layer.name %>','<%= layer.pkey %>','<%= layer.pkey %>','','<%%= feature.<%= layer.pkey %> %>')" id="show-<%= layer.name %>-<%%= feature.<%= layer.pkey %> %>" data-topic="<%= topic_name %>" data-layer="<%= layer.name %>" data-pkey="<%= layer.pkey %>" data-id="<%%= feature.<%= layer.pkey %> %>" data-minx="<%%= feature.bbox[0] %>" data-miny="<%%= feature.bbox[1] %>" data-maxx="<%%= feature.bbox[2] %>" data-maxy="<%%= feature.bbox[3] %>">In Karte markieren</a></td>
-  <%% end %>
-  </tr>
 </table>
 <%% end %>
 <% end %>
-<%% if features.size > 1 -%>
-<%% values = features.collect(&:<%= layer.pkey %>).join('$') %>
-<a class="markfeature" href="Javascript:showID('<%= layer.name %>','<%= layer.pkey %>','<%= layer.pkey %>','','<%%= values %>')" id="show-<%= layer.name %>-<%%= values %>" data-topic="<%= topic_name %>" data-layer="<%= layer.name %>" data-pkey="<%= layer.pkey %>" data-id="<%%= values %>" data-minx="<%%= feature.bbox[0] %>" data-miny="<%%= feature.bbox[1] %>" data-maxx="<%%= feature.bbox[2] %>" data-maxy="<%%= feature.bbox[3] %>">In Karte markieren</a>
-<%% end -%>