refactoring - use new helper for issue form #50

Author: jkraemer

app/helpers/gtt_map_helper.rb

@@ -5,12 +5,13 @@ 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)
+      map_tag(map: map, bounds: map.bounds, edit: edit_mode)
     ]
   end
 
-  def map_tag(map: nil,
-              geom: map.json, layers: map&.layers, bounds: geom, edit: nil)
+  def map_tag(map: nil, layers: map&.layers,
+              geom: map.json, bounds: map.bounds,
+              edit: nil)
 
     data = {
       geom: geom,

app/models/gtt_map.rb

@@ -1,12 +1,13 @@
 class GttMap
 
-  attr_reader :layers, :json
+  attr_reader :layers, :json, :bounds
 
-  def initialize(wkb: nil, json: nil, layers:)
+  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
 

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

@@ -3,14 +3,6 @@
         User.current.allowed_to?(:edit_issues, @issue.project))
 %>
 <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 %>

lib/redmine_gtt.rb

@@ -33,11 +33,12 @@ def self.setup
     RedmineGtt::Patches::ProjectsHelperPatch.apply
     RedmineGtt::Patches::UsersControllerPatch.apply
 
-    [ ProjectsController, MyController, UsersController ].each do |c|
-      c.class_eval do
-        helper 'gtt_map'
-      end
-    end
+    [
+      IssuesController,
+      MyController,
+      ProjectsController,
+      UsersController,
+    ].each{ |c| c.send :helper, 'gtt_map' }
 
     # unless IssueQuery.included_modules.include?(RedmineGtt::Patches::IssueQueryPatch)
     # 	IssueQuery.send(:include, RedmineGtt::Patches::IssueQueryPatch)

lib/redmine_gtt/patches/geojson_attribute.rb

@@ -8,10 +8,13 @@ def geojson_additional_properties
         as_json except: [:geom]
       end
 
-      def geojson
+      # use simple: true to skip inclusion of record's properties
+      def geojson(simple: false)
         @geojson ||= if geom.present?
           Conversions.wkb_to_json(
-            geom, id: id, properties: geojson_additional_properties
+            geom,
+            id: id,
+            properties: (simple ? {} : geojson_additional_properties)
           )
         end
       end

lib/redmine_gtt/patches/issue_patch.rb

@@ -8,14 +8,15 @@ def self.apply
           Issue.prepend self
           Issue.prepend GeojsonAttribute
           Issue.class_eval do
-            safe_attributes "geom",
+            safe_attributes "geojson",
               if: ->(issue, user){ user.allowed_to?(:edit_issues, issue.project)}
           end
         end
       end
 
       def map
-        GttMap.new json: geojson, layers: project.gtt_tile_sources
+        GttMap.new json: geojson, layers: project.gtt_tile_sources,
+          bounds: (new_record? ? project.map.json : geojson(simple: true))
       end
 
     end