Merge branch 'develop' into 'master'

Develop

See merge request !6

Author: dkastl

Gemfile

@@ -1,6 +1,7 @@
 source 'https://rubygems.org'
 
 gem 'deface'
+gem 'immutable-struct'
 gem "rgeo"
 gem "rgeo-geojson"
 gem "rgeo-activerecord"

app/controllers/gtt_tile_sources_controller.rb

@@ -0,0 +1,56 @@
+class GttTileSourcesController < ApplicationController
+  layout 'admin'
+
+  before_action :require_admin
+
+  self.main_menu = false
+
+  def index
+    @tile_sources = GttTileSource.order name: :asc
+  end
+
+  def new
+    @tile_source = GttTileSource.new
+  end
+
+  def create
+    r = RedmineGtt::Actions::CreateTileSource.(tile_source_params)
+    if r.tile_source_created?
+      redirect_to gtt_tile_sources_path
+    else
+      @tile_source = r.tile_source
+      render 'new'
+    end
+  end
+
+  def edit
+    @tile_source = GttTileSource.find params[:id]
+  end
+
+  def update
+    ts = GttTileSource.find params[:id]
+    r = RedmineGtt::Actions::UpdateTileSource.(ts, tile_source_params)
+    if r.tile_source_updated?
+      redirect_to gtt_tile_sources_path
+    else
+      @tile_source = r.tile_source
+      render 'edit'
+    end
+  end
+
+  def destroy
+    ts = GttTileSource.find params[:id]
+    ts.destroy
+    redirect_to gtt_tile_sources_path
+  end
+
+
+  private
+
+  def tile_source_params
+    return {} unless params[:tile_source]
+
+    params[:tile_source].permit( :name, :type, :global,
+                                :default, :options_string )
+  end
+end

app/helpers/gtt_tile_sources_helper.rb

@@ -0,0 +1,13 @@
+module GttTileSourcesHelper
+  def pretty_tile_source_options(tile_source)
+    JSON.pretty_generate tile_source.options if Hash === tile_source.options
+  end
+
+  def tile_source_options(tile_source)
+    safe_join tile_source.options.to_a.select{
+      |k,v| v.present?
+    }.map{|k,v|
+      "#{k}: #{v}"
+    }, "<br />".html_safe
+  end
+end

app/models/gtt_configuration.rb

@@ -0,0 +1,17 @@
+class GttConfiguration
+  include ActiveModel::Model
+
+  attr_accessor :project, :gtt_tile_source_ids
+
+  def self.for(project)
+    new project: project
+  end
+
+  def gtt_tile_source_ids
+    project.gtt_tile_source_ids
+  end
+
+  def gtt_tile_source_ids=(ids)
+    project.gtt_tile_source_ids = ids
+  end
+end

app/models/gtt_tile_source.rb

@@ -0,0 +1,31 @@
+# Tile source model
+#
+# Configuration is stored as json
+class GttTileSource < ActiveRecord::Base
+  self.inheritance_column = 'none'
+
+  validates :name, presence: true
+  validates :type, presence: true
+  validate :take_json_options
+
+  # globally available tile sources
+  scope :global, ->{ where global: true }
+
+  # default tile sources for new projects
+  scope :default, ->{ where default: true }
+
+  attr_writer :options_string
+  def options_string
+    @options_string ||= JSON.pretty_generate(options || {})
+  end
+
+  private
+
+  def take_json_options
+    self.options = JSON.parse options_string
+  rescue JSON::ParserError
+    errors.add :options_string, I18n.t(:error_invalid_json)
+  end
+
+end
+

app/views/gtt_tile_sources/_form.html.erb

@@ -0,0 +1,13 @@
+<%= error_messages_for 'tile_source' %>
+
+
+<div class="box tabular">
+  <p><%= f.text_field :name, required: true, size: 25  %></p>
+  <p><%= f.text_field :type, required: true, size: 25  %></p>
+  <p><%= f.check_box :global %></p>
+  <p><%= f.check_box :default %></p>
+  <p> <%= f.text_area :options_string, rows: 10, cols: 80 %> </p>
+</div>
+
+
+

app/views/gtt_tile_sources/_tile_source.html.erb

@@ -0,0 +1,11 @@
+<tr class="<%= cycle("odd", "even") %>">
+  <td><%= tile_source.type %></td>
+  <td><%= link_to tile_source.name, edit_gtt_tile_source_path(tile_source) %></td>
+  <td><%= checked_image tile_source.global? %></td>
+  <td><%= checked_image tile_source.default? %></td>
+  <td><%= tile_source_options tile_source %></td>
+  <td class="buttons">
+    <%= delete_link gtt_tile_source_path(tile_source) %>
+  </td>
+</tr>
+

app/views/gtt_tile_sources/edit.html.erb

@@ -0,0 +1,10 @@
+<%= title [l(:label_gtt_tile_source_plural), gtt_tile_sources_path], @tile_source.name %>
+
+<%= labelled_form_for :tile_source, @tile_source, url: gtt_tile_source_path(@tile_source), method: :patch do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+  <p>
+    <%= submit_tag l :button_save %>
+  </p>
+<% end %>
+
+

app/views/gtt_tile_sources/index.html.erb

@@ -0,0 +1,28 @@
+<div class="contextual">
+<%= link_to l(:label_gtt_tile_source_new), new_gtt_tile_source_path, :class => 'icon icon-add' %>
+</div>
+
+<h2><%= l :label_gtt_tile_source_plural %></h2>
+
+<% if @tile_sources.any? %>
+<table class="list">
+  <thead>
+    <tr>
+      <th><%= l :label_type %></th>
+      <th><%= l :label_name %></th>
+      <th><%= l :label_global %></th>
+      <th><%= l :label_default %></th>
+      <th><%= l :label_config %></th>
+      <th></th>
+    </tr>
+  </thead>
+  <tbody>
+    <%= render collection: @tile_sources, partial: 'tile_source' %>
+  </tbody>
+</table>
+
+<% else %>
+<p class="nodata"><%= l :label_no_data %></p>
+<% end %>
+
+<% html_title l :label_gtt_tile_source_plural -%>

app/views/gtt_tile_sources/new.html.erb

@@ -0,0 +1,10 @@
+<%= title [l(:label_gtt_tile_source_plural), gtt_tile_sources_path], l(:label_gtt_tile_source_new) %>
+
+<%= labelled_form_for :tile_source, @tile_source, url: gtt_tile_sources_path do |f| %>
+  <%= render partial: 'form', locals: { f: f } %>
+  <p>
+    <%= submit_tag l :button_create %>
+    <%= submit_tag l(:button_create_and_continue), name: 'continue' %>
+  </p>
+<% end %>
+