move project map configuration to GTT settings tab #71

- also more refactoring, introduces helper methods for map rendering in both
  show and edit modes

Author: jkraemer

app/helpers/gtt_map_helper.rb

@@ -0,0 +1,26 @@
+# 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, edit: edit_mode)
+    ]
+  end
+
+  def map_tag(map: nil,
+              geom: map.json, layers: map&.layers, bounds: geom, 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,13 @@
+class GttMap
+
+  attr_reader :layers, :json
+
+  def initialize(wkb: nil, json: nil, layers:)
+    unless @json = json
+      @json = RedmineGtt::Conversions.wkb_to_json wkb if wkb
+    end
+
+    @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/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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Global Hooks
 require 'redmine_gtt/hooks/view_layouts_base_html_head_hook'
 
@@ -30,6 +32,10 @@ def self.setup
     RedmineGtt::Patches::ProjectsHelperPatch.apply
     RedmineGtt::Patches::UsersControllerPatch.apply
 
+    ProjectsController.class_eval do
+      helper 'gtt_map'
+    end
+
     # unless IssueQuery.included_modules.include?(RedmineGtt::Patches::IssueQueryPatch)
     # 	IssueQuery.send(:include, RedmineGtt::Patches::IssueQueryPatch)
     # end

lib/redmine_gtt.rb

@@ -4,17 +4,33 @@ class UpdateProjectSettings < Base
 
       Result = ImmutableStruct.new(:settings_saved?, :error)
 
-      def initialize(project, params)
-        @project = project
-        @parameters = params.symbolize_keys
+      def initialize(form)
+        @form = form
+        @project = form.project
       end
 
       def call
-        if tile_source_ids = @parameters.delete(:gtt_tile_source_ids)
+        @project.transaction do
+          if update_project
+            Result.new settings_saved: true
+          else
+            Result.new settings_saved: false,
+                       error: @project.errors.full_messages
+          end
+        end
+      end
+
+      private
+
+      def update_project
+        if tile_source_ids = @form.gtt_tile_source_ids
           @project.gtt_tile_source_ids = tile_source_ids
         end
-        Result.new settings_saved: true
+        @project.geojson = @form.geojson
+
+        @project.save
       end
+
     end
   end
 end

lib/redmine_gtt/actions/update_project_settings.rb

@@ -9,18 +9,19 @@ def geojson_additional_properties
       end
 
       def geojson
-        if geom.present?
+        @geojson ||= if geom.present?
           Conversions.wkb_to_json(
             geom, id: id, properties: geojson_additional_properties
           )
         end
       end
 
-      def geom=(geometry)
+      def geojson=(geometry)
+        @geojson = geometry
         if (geometry.present?)
-          self[:geom] = Conversions.to_wkb geometry
+          self.geom = Conversions.to_wkb geometry
         else
-          self[:geom] = nil
+          self.geom = nil
         end
       end