Adds project rotation to map/api

Signed-off-by: Daniel Kastl <[email protected]>

Author: dkastl

app/helpers/gtt_map_helper.rb

@@ -2,20 +2,21 @@
 
 module GttMapHelper
 
-  def map_form_field(form, map, field: :geojson, bounds: nil, edit_mode: nil, upload: true)
+  def map_form_field(form, map, field: :geojson, bounds: nil, edit_mode: nil, upload: true, rotation: 0)
     safe_join [
       form.hidden_field(field, id: 'geom'),
-      map_tag(map: map, bounds: bounds, edit: edit_mode, upload: upload)
+      map_tag(map: map, bounds: bounds, edit: edit_mode, upload: upload, rotation: rotation)
     ]
   end
 
   def map_tag(map: nil, layers: map&.layers,
               geom: map.json, bounds: map.bounds,
               edit: nil, popup: nil, upload: true,
-              collapsed: false)
+              collapsed: false, rotation: map&.rotation)
 
     data = {
-      geom: geom.is_a?(String) ? geom : geom.to_json
+      geom: geom.is_a?(String) ? geom : geom.to_json,
+      rotation: rotation
     }
 
     if layers

app/models/gtt_configuration.rb

@@ -19,7 +19,7 @@ def self.from_params(params)
   end
 
   def map
-    GttMap.new json: geojson, layers: project.gtt_tile_sources.sorted, rotation: map_rotation
+    GttMap.new json: geojson, layers: project.gtt_tile_sources.sorted, rotation: project.map_rotation
   end
 
 end

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

@@ -4,7 +4,7 @@
     <legend class="<%= "icon " + (collapsed ? "icon-collapsed" : "icon-expended") %>"><%= l(:field_location) %></legend>
 
     <%= map_tag map: @project.map, geom: (Issue.array_to_geojson(@issues, include_properties: { only: %i(id subject tracker_id status_id) }) if @issues),
-      popup: { href: '/issues/[id]' }, collapsed: collapsed %>
+      popup: { href: '/issues/[id]' }, collapsed: collapsed, rotation: @project.map_rotation %>
   </fieldset>
 
 <% end %>

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

@@ -1,3 +1,3 @@
 <% if @project.nil? or @project.module_enabled?(:gtt) %>
-  <%= map_tag map: @issue.map, geom: (@issue.as_geojson(include_properties: { only: %i(tracker_id status_id) }) if @issue) %>
+  <%= map_tag map: @issue.map, geom: (@issue.as_geojson(include_properties: { only: %i(tracker_id status_id) }) if @issue), rotation: @project.map_rotation %>
 <% end %>

app/views/projects/index.api.rsb

@@ -8,6 +8,7 @@ api.array :projects, api_meta(:total_count => @project_count, :offset => @offset
       api.parent(:id => project.parent.id, :name => project.parent.name) if project.parent && project.parent.visible?
       api.status      project.status
       api.is_public   project.is_public?
+      api.rotation    project.map_rotation
 
       if @include_geometry
         if project.geom

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

@@ -20,7 +20,7 @@
   </div>
 
   <div class="box">
-    <%= map_form_field f, @form.map, bounds: nil, edit_mode: 'Polygon' %>
+    <%= map_form_field f, @form.map, bounds: nil, edit_mode: 'Polygon', rotation: @project.map_rotation %>
   </div>
 
   <%= submit_tag l(:button_save) %>

app/views/projects/show.api.rsb

@@ -7,6 +7,7 @@ api.project do
   api.parent(:id => @project.parent.id, :name => @project.parent.name) if @project.parent && @project.parent.visible?
   api.status      @project.status
   api.is_public   @project.is_public?
+  api.rotation    @project.map_rotation
 
   if @project.geom
     api.geojson (params[:format] == "json") ? @project.geojson : @project.geojson.to_json

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

@@ -2,6 +2,6 @@
 <div class="projectmap box">
   <h3 class="icon icon-gtt-map"><%= l(:label_project_map) %></h3>
 
-  <%= map_tag map: @project.map %>
+  <%= map_tag map: @project.map, rotation: @project.map_rotation %>
 </div>
 <% end %>

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

@@ -2,7 +2,7 @@
       ((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, bounds: issue.project.map.bounds,
+  <%= map_form_field form, issue.map, bounds: issue.project.map.bounds, rotation: @project.map_rotation,
         edit_mode: Setting.plugin_redmine_gtt['editable_geometry_types_on_issue_map'] && Setting.plugin_redmine_gtt['editable_geometry_types_on_issue_map'].join(' '),
         upload: Setting.plugin_redmine_gtt['enable_geojson_upload_on_issue_map'] == "true" %>
 <% end %>