Merge branch 'develop' of hub.georepublic.net:gtt/redmine_gtt

Author: dkastl

app/helpers/gtt_map_helper.rb

@@ -11,17 +11,24 @@ def map_form_field(form, map, field: :geojson, edit_mode:)
 
   def map_tag(map: nil, layers: map&.layers,
               geom: map.json, bounds: map.bounds,
-              edit: nil)
+              edit: nil, popup: nil)
 
     data = {
-      geom: geom,
-      layers: layers
+      geom: geom.is_a?(String) ? geom : geom.to_json
     }
-    data[:bounds] = bounds if bounds
+
+    if layers
+      data[:layers] = layers.is_a?(String) ? layers : layers.to_json
+    end
+
+    if bounds
+      data[:bounds] = bounds.is_a?(String) ? bounds : bounds.to_json
+    end
+
     data[:edit]   = edit   if edit
+    data[:popup]  = popup  if popup
 
-    map_id = rand(36**8).to_s(36)
-    content_tag(:div, "", data: data, id: "ol-#{map_id}", class: 'ol-map')
+    content_tag(:div, "", data: data, id: "ol-#{rand(36**8).to_s(36)}", class: 'ol-map')
   end
 
 end

app/overrides/issues.rb

@@ -12,19 +12,6 @@
   :partial => "issues/index/geojson"
 )
 
-Deface::Override.new(
-  :virtual_path => "issues/new",
-  :name => "deface_view_issues_new_map",
-  :insert_before => "div.box",
-  :partial => "issues/form/map"
-)
-
-Deface::Override.new(
-  :virtual_path => "issues/_edit",
-  :name => "deface_view_issues_edit_map",
-  :insert_before => "div.box",
-  :partial => "issues/form/map"
-)
 
 Deface::Override.new(
   :virtual_path => "issues/show",

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

@@ -20,11 +20,10 @@ api.array :issues, api_meta(:total_count => @issue_count, :offset => @offset, :l
       api.is_private  issue.is_private
       api.estimated_hours issue.estimated_hours
 
-      unless issue.geom.nil?
-        api.geom RGeo::GeoJSON.encode RGeo::GeoJSON::EntityFactory.instance.feature(
-                    RGeo::WKRep::WKBParser.new().parse(issue.geom), issue.id)
+      if issue.geom
+        api.geojson issue.geojson
       else
-        api.geom ""
+        api.geojson ""
       end
 
       render_api_custom_values issue.visible_custom_field_values, api

app/views/issues/index.api.rsb

@@ -1,19 +1,9 @@
-<% return '' if @project.nil? %>
-<% return '' unless User.current.allowed_to?(:view_issues, @project) %>
+<% if @project and @project.module_enabled?(:gtt) %>
 
-<% if @project.nil? or @project.module_enabled?(:gtt) %>
 <fieldset id="location" class="collapsible">
   <legend onclick="toggleFieldset(this);"><%= l(:field_location) %></legend>
 
-  <%= tag(:div, :data => {
-      # TODO: Don't know where to extend "Issues"
-      :geom => IssuesHelper.get_geojson(@issues),
-      :bounds => @project.geojson,
-      :layers => @project.gtt_tile_sources,
-      :popup => {
-        :href => '/issues/[id]'
-      }
-    }, :id => 'ol-' + rand(36**8).to_s(36), :class => 'ol-map')
-  %>
+  <%= map_tag map: @project.map, geom: Issue.array_to_geojson(@issues, include_properties: { only: %i(id subject) }), popup: { href: '/issues/[id]' } %>
 </fieldset>
+
 <% end %>

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

@@ -23,11 +23,10 @@ api.issue do
     api.total_spent_hours(@issue.total_spent_hours)
   end
 
-  unless @issue.geom.nil?
-    api.geom RGeo::GeoJSON.encode RGeo::GeoJSON::EntityFactory.instance.feature(
-                RGeo::WKRep::WKBParser.new().parse(@issue.geom), @issue.id)
+  if @issue.geom
+    api.geojson @issue.geojson
   else
-    api.geom ""
+    api.geojson ""
   end
 
   render_api_custom_values @issue.visible_custom_field_values, api

app/views/issues/show.api.rsb

@@ -9,11 +9,10 @@ api.array :projects, api_meta(:total_count => @project_count, :offset => @offset
       api.status      project.status
       api.is_public   project.is_public?
 
-      unless project.geom.nil?
-        api.geom RGeo::GeoJSON.encode RGeo::GeoJSON::EntityFactory.instance.feature(
-                    RGeo::WKRep::WKBParser.new().parse(project.geom), project.id)
+      if project.geom
+        api.geojson project.geojson
       else
-        api.geom ""
+        api.geojson ""
       end
 
       render_api_custom_values project.visible_custom_field_values, api

app/views/projects/index.api.rsb

@@ -8,11 +8,10 @@ api.project do
   api.status      @project.status
   api.is_public   @project.is_public?
 
-  unless @project.geom.nil?
-    api.geom RGeo::GeoJSON.encode RGeo::GeoJSON::EntityFactory.instance.feature(
-                RGeo::WKRep::WKBParser.new().parse(@project.geom), @project.id)
+  if @project.geom
+    api.geojson @project.geojson
   else
-    api.geom ""
+    api.geojson ""
   end
 
   render_api_custom_values @project.visible_custom_field_values, api

app/views/projects/show.api.rsb

@@ -0,0 +1,7 @@
+<% 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))
+%>
+  <%= map_form_field form, issue.map, edit_mode: 'Point LineString Polygon' %>
+<% end %>
+

app/views/redmine_gtt/hooks/_view_issues_form_details_top.html.erb

@@ -9,11 +9,10 @@ api.array :users, api_meta(:total_count => @user_count, :offset => @offset, :lim
       api.created_on user.created_on
       api.last_login_on user.last_login_on
 
-      unless user.geom.nil?
-        api.geom RGeo::GeoJSON.encode RGeo::GeoJSON::EntityFactory.instance.feature(
-                    RGeo::WKRep::WKBParser.new().parse(user.geom), user.id)
+      if user.geom
+        api.geojson user.geojson
       else
-        api.geom ""
+        api.geojson ""
       end
 
       render_api_custom_values user.visible_custom_field_values, api