Merge pull request #220 from gtt-project/next

Release updates for 4.3.0

Author: smellman

README.md

@@ -14,7 +14,8 @@ The Geo-Task-Tracker (GTT) plugin adds spatial capabilities to Redmine:
 
 ## Requirements
 
-Redmine GTT plugins **require PostgreSQL/PostGIS** and will not work with SQLite or MariaDB/MySQL!!!
+Redmine GTT plugins **require PostgreSQL/PostGIS** and will not work with SQLite
+or MariaDB/MySQL!!!
 
 - Redmine >= 4.2.0
 - PostgreSQL >= 10
@@ -31,7 +32,8 @@ createdb -U postgres -O redmine redmine
 psql -U postgres -d redmine -c "CREATE EXTENSION postgis;"
 ```
 
-To install Redmine GTT plugin, download or clone this repository in your Redmine installation plugins directory!
+To install Redmine GTT plugin, download or clone this repository in your Redmine
+installation plugins directory!
 
 ```sh
 cd path/to/plugin/directory
@@ -51,11 +53,14 @@ bundle install
 bundle exec rake redmine:plugins:migrate
 ```
 
-Before restarting Redmine, you need to set `postgis` adapter instead of `postgres` adapter in your `config/database.yml`.
+Before restarting Redmine, you need to set `postgis` adapter instead of
+`postgres` adapter in your `config/database.yml`.
 
-After restarting Redmine, you should be able to see the Redmine GTT plugin in the Plugins page.
+After restarting Redmine, you should be able to see the Redmine GTT plugin in
+the Plugins page.
 
-More information on installing (and uninstalling) Redmine plugins can be found in the [Redmine Plugin docs](http://www.redmine.org/wiki/redmine/Plugins).
+More information on installing (and uninstalling) Redmine plugins can be found
+in the [Redmine Plugin docs](http://www.redmine.org/wiki/redmine/Plugins).
 
 ## How to use
 
@@ -65,15 +70,17 @@ More information on installing (and uninstalling) Redmine plugins can be found i
 4. Define the project boundary in `GTT` project settings
 5. Create a new issue with a point, line or polygon
 
-For more information with screenshots see the [Getting Started](doc/getting-started.md) guide.
+For more information with screenshots see the [Getting Started](doc/getting-started.md)
+guide.
 
 ## Plugin API
 
 For more information see the [Redmine GTT API](doc/api.md) docs.
 
 ## Contributing and Support
 
-The GTT Project appreciates any [contributions](https://github.com/gtt-project/.github/blob/main/CONTRIBUTING.md)! Feel free to contact us for [reporting problems and support](https://github.com/gtt-project/.github/blob/main/CONTRIBUTING.md).
+The GTT Project appreciates any [contributions](https://github.com/gtt-project/.github/blob/main/CONTRIBUTING.md)!
+Feel free to contact us for [reporting problems and support](https://github.com/gtt-project/.github/blob/main/CONTRIBUTING.md).
 
 Help us to translate GTT Project using [OSGeo Weblate](https://weblate.osgeo.org/engage/gtt-project/):
 
@@ -100,7 +107,8 @@ RAILS_ENV=test NAME=redmine_gtt bundle exec rake redmine:plugins:test
 
 ## Version History
 
-See [all releases](https://github.com/gtt-project/redmine_gtt/releases) with release notes.
+See [all releases](https://github.com/gtt-project/redmine_gtt/releases) with
+release notes.
 
 ## Authors
 

app/controllers/.keep

@@ -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/helpers/.keep

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

app/helpers/gtt_map_helper.rb

@@ -1,12 +1,13 @@
 class GttMap
 
-  attr_reader :layers, :json, :bounds
+  attr_reader :layers, :json, :bounds, :rotation
 
-  def initialize(geom: nil, json: nil, layers:, bounds: nil)
+  def initialize(geom: nil, json: nil, layers:, bounds: nil, rotation: nil)
     unless @json = json
       @json = RedmineGtt::Conversions.geom_to_json geom if geom
     end
 
+    @rotation = rotation || 0
     @bounds = bounds || @json
     @layers = layers
   end

app/models/.keep

@@ -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/models/gtt_configuration.rb

@@ -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/models/gtt_map.rb

@@ -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