Merge branch 'develop' into 'master'

Develop

See merge request gtt/redmine_gtt!10

Author: dkastl

app/helpers/gtt_map_helper.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module GttMapHelper
+
+  def map_form_field(form, map, field: :geojson, edit_mode:)
+    safe_join [
+      form.hidden_field(field, id: 'geom'),
+      map_tag(map: map, bounds: map.bounds, edit: edit_mode)
+    ]
+  end
+
+  def map_tag(map: nil, layers: map&.layers,
+              geom: map.json, bounds: map.bounds,
+              edit: nil)
+
+    data = {
+      geom: geom,
+      layers: layers
+    }
+    data[:bounds] = bounds if bounds
+    data[:edit]   = edit   if edit
+
+    map_id = rand(36**8).to_s(36)
+    content_tag(:div, "", data: data, id: "ol-#{map_id}", class: 'ol-map')
+  end
+
+end

app/models/gtt_configuration.rb

@@ -1,17 +1,23 @@
 class GttConfiguration
   include ActiveModel::Model
 
-  attr_accessor :project, :gtt_tile_source_ids
+  attr_accessor :project, :geojson, :gtt_tile_source_ids
 
   def self.for(project)
-    new project: project
+    new(
+      project: project,
+      geojson: project.geojson,
+      gtt_tile_source_ids: project.gtt_tile_source_ids
+    )
   end
 
-  def gtt_tile_source_ids
-    project.gtt_tile_source_ids
+  def self.from_params(params)
+    new geojson: params[:geojson],
+      gtt_tile_source_ids: params[:gtt_tile_source_ids]
   end
 
-  def gtt_tile_source_ids=(ids)
-    project.gtt_tile_source_ids = ids
+  def map
+    GttMap.new json: geojson, layers: project.gtt_tile_sources
   end
+
 end

app/models/gtt_map.rb

@@ -0,0 +1,14 @@
+class GttMap
+
+  attr_reader :layers, :json, :bounds
+
+  def initialize(wkb: nil, json: nil, layers:, bounds: nil)
+    unless @json = json
+      @json = RedmineGtt::Conversions.wkb_to_json wkb if wkb
+    end
+
+    @bounds = bounds || @json
+    @layers = layers
+  end
+
+end

app/overrides/projects.rb

@@ -1,10 +1,3 @@
-Deface::Override.new(
-  :virtual_path => "projects/_form",
-  :name => "deface_view_projects_form_map",
-  :insert_after => "div.box",
-  :partial => "projects/form/map"
-)
-
 Deface::Override.new(
   :virtual_path => "projects/show",
   :name => "deface_view_projects_show_map",

app/overrides/users.rb

@@ -1,24 +1,3 @@
-Deface::Override.new(
-  :virtual_path => "my/account",
-  :name => "deface_view_users_account_map",
-  :insert_after => "div.splitcontentleft fieldset.box",
-  :partial => "users/form/map"
-)
-
-Deface::Override.new(
-  :virtual_path => "users/_form",
-  :name => "deface_view_users_form_map",
-  :insert_bottom => "div.splitcontentleft",
-  :partial => "users/form/map"
-)
-
-Deface::Override.new(
-  :virtual_path => "users/show",
-  :name => "deface_view_users_show_map",
-  :insert_bottom => "div.splitcontentleft",
-  :partial => "users/show/map"
-)
-
 Deface::Override.new(
   :virtual_path => "users/show",
   :name => "deface_view_users_show_other_formats",

app/views/issues/form/_map.html.erb

@@ -1,24 +1,8 @@
-<% return '' if @issue.nil? || @issue.project.nil? %>
-<% return '' unless User.current.allowed_to?(:view_issues, @issue.project) %>
-
-<%
-  if @issue.new_record?
-    return '' unless User.current.allowed_to?(:add_issues, @issue.project)
-  else
-    return '' unless User.current.allowed_to?(:edit_issues, @issue.project)
-  end
+<% if (@project.nil? or @project.module_enabled?(:gtt)) &&
+      ((@issue.new_record? && User.current.allowed_to?(:add_issues, @issue.project)) ||
+        User.current.allowed_to?(:edit_issues, @issue.project))
 %>
-
-<% if @project.nil? or @project.module_enabled?(:gtt) %>
 <div class="box">
-  <%= f.hidden_field(:geom, :value => @issue.geojson, :id => 'geom') %>
-
-  <%= content_tag(:div, "", :data => {
-      :geom => @issue.geojson,
-      :bounds => @project.geojson,
-      :layers => @project.gtt_tile_sources,
-      :edit => 'Point LineString Polygon'
-    }, :id => 'ol-' + rand(36**8).to_s(36), :class => 'ol-map')
-  %>
+  <%= map_form_field f, @issue.map, edit_mode: 'Point LineString Polygon' %>
 </div>
 <% end %>

app/views/projects/form/_map.html.erb

@@ -1,18 +1,24 @@
-<% @gtt_configuration ||= GttConfiguration.for(@project) %>
-<%= labelled_form_for @gtt_configuration,
+<% @form ||= GttConfiguration.for(@project) %>
+<%= labelled_form_for @form,
       url: update_gtt_configuration_path(@project),
       html: { method: :put } do |f| %>
 
   <h3><%= t :label_gtt_settings_headline %></h3>
+
   <div class="box tabular">
     <p>
       <%= f.select :gtt_tile_source_ids,
-        options_from_collection_for_select(GttTileSource.all.order(name: :asc), :id, :name, selected: @gtt_configuration.gtt_tile_source_ids),
+        options_from_collection_for_select(GttTileSource.all.order(name: :asc), :id, :name, selected: @form.gtt_tile_source_ids),
         {}, { multiple: true, size: 5 } %>
       <br /><em><%= t :gtt_tile_sources_info %></em>
     </p>
   </div>
 
+  <div class="box">
+    <%= map_form_field f, @form.map, edit_mode: 'Polygon' %>
+  </div>
+
+
   <%= submit_tag l(:button_save) %>
 
 <% end %>

app/views/projects/settings/_gtt.html.erb

@@ -2,11 +2,6 @@
 <div class="usermap box">
   <h3><%= l(:label_project_map) %></h3>
 
-  <%= content_tag(:div, "",:data => {
-      :geom => @project.geojson,
-      :bounds => @project.geojson,
-      :layers => @project.gtt_tile_sources
-    }, :id => 'ol-' + rand(36**8).to_s(36), :class => 'ol-map')
-  %>
+  <%= map_tag map: @project.map %>
 </div>
 <% end %>

app/views/projects/show/_map.html.erb

@@ -0,0 +1,5 @@
+</fieldset>
+<fieldset class="box tabular">
+  <legend><%= l(:label_user_map) %></legend>
+  <%= map_form_field form, user.map, edit_mode: 'Point' %>
+