Merge branch 'main' into develop

Author: sanak

Gemfile

@@ -4,7 +4,7 @@ gem 'deface'
 gem 'immutable-struct'
 gem "rgeo"
 gem "rgeo-geojson"
-gem "rgeo-activerecord"
 gem "pg", (ENV['GEM_PG_VERSION'] ? "~> #{ENV['GEM_PG_VERSION']}" : "~> 1.1.4") # make sure we use a version compatible with AR
-gem 'activerecord-postgis-adapter'
+gem "rgeo-activerecord", (ENV['GEM_RGEO_ACTIVERECORD_VERSION'] ? "~> #{ENV['GEM_RGEO_ACTIVERECORD_VERSION']}" : "~> 6.2.2") # same as above
+gem 'activerecord-postgis-adapter', (ENV['GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION'] ? "~> #{ENV['GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION']}" : "~> 5.2.3") # same as above
 gem 'rails-controller-testing' # This gem brings back assigns to your controller tests as well as assert_template to both controller and integration tests.

README.md

@@ -45,6 +45,8 @@ Then run
 
 ```
 export GEM_PG_VERSION=your-pg-version # skip this line if redmine use pg 1.1.4.
+export GEM_RGEO_ACTIVERECORD_VERSION=your-rgeo-activerecord-version # skip this line if using rgeo-activerecord 6.2.2.
+export GEM_ACTIVERECORD_POSTGIS_ADAPTER_VERSION=your-activerecord-postgis-adapter-version # skip this line if using activerecord-postgis-adapter 5.2.3.
 bundle install
 bundle exec rake redmine:plugins:migrate
 ```
@@ -55,6 +57,14 @@ After restarting Redmine, you should be able to see the Redmine GTT plugin in th
 
 More information on installing (and uninstalling) Redmine plugins can be found here: http://www.redmine.org/wiki/redmine/Plugins
 
+## How to run test
+
+After the installation, you can run the plugin test by the following command:
+
+```
+RAILS_ENV=test NAME=redmine_gtt bundle exec rake redmine:plugins:test
+```
+
 ## How to use
 
 1. Go to plugin configuration for global settings

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

@@ -1,7 +1,7 @@
 <% if @project and @project.module_enabled?(:gtt) %>
 
-<fieldset id="location" class="collapsible collapsed">
-<legend class="icon icon-collapsed"><%= l(:field_location) %></legend>
+<fieldset id="location" class="collapsible">
+  <legend class="icon 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]' } %>
 </fieldset>

config/locales/en.yml

@@ -1,6 +1,7 @@
 # English strings go here for Rails i18n
 en:
   error_invalid_json: must be valid JSON
+  error_unable_to_update_project_gtt_settings: "Unable to update project GTT settings (%{value})"
 
   field_default: Default for new projects
   field_geometry: "Geometry"

config/locales/ja.yml

@@ -1,6 +1,7 @@
 # Japanese strings go here for Rails i18n
 ja:
   error_invalid_json: "正しいJSONにしてください"
+  error_unable_to_update_project_gtt_settings: "プロジェクトのGTTの設定を更新できません (%{value})"
 
   field_default: "新規プロジェクトのデフォルト"
   field_geometry: "所在地"

lib/redmine_gtt/actions/update_project_settings.rb

@@ -26,7 +26,13 @@ def update_project
         if tile_source_ids = @form.gtt_tile_source_ids
           @project.gtt_tile_source_ids = tile_source_ids
         end
-        @project.geojson = @form.geojson
+
+        begin
+          @project.geojson = @form.geojson
+        rescue RGeo::Error::InvalidGeometry => e
+          @project.errors.add(:geom, :invalid)
+          return false
+        end
 
         @project.save
       end

lib/redmine_gtt/patches/projects_controller_patch.rb

@@ -47,7 +47,7 @@ def update_gtt_configuration
             if r.settings_saved?
               flash.now[:notice] = l(:notice_successful_update)
             else
-              flash.now[:error] = r.error
+              flash.now[:error] = l(:error_unable_to_update_project_gtt_settings, "#{r.error}")
             end
 
           end

src/stylesheets/app.scss

@@ -34,6 +34,6 @@ div.usermap h3 {
 }
 
 /* hide Map on issues list by default  */
-fieldset#location > div.ol-map{
-  display: none;
-}
+//fieldset#location > div.ol-map{
+//  display: none;
+//}

test/test_helper.rb

@@ -14,6 +14,10 @@ def point_geojson(coordinates)
     {'type'=>'Feature','geometry'=>{ 'type'=>'Point','coordinates'=> coordinates}}.to_json
   end
 
+  def multipolygon_geojson(coordinates)
+    {'type'=>'Feature','geometry'=>{ 'type'=>'MultiPolygon','coordinates'=> coordinates}}.to_json
+  end
+
   def test_geom
     RedmineGtt::Conversions::WkbToGeom.("01030000000100000006000000C84B374110E76040381DD011545A4140C84B3739ACE96040F07E6DCC7A594140C84B37F199E960403CBC2D58E2554140C84B373917E8604098CBC3E188564140C84B37FD36E66040F24C2E959D564140C84B374110E76040381DD011545A4140")
   end

test/unit/update_project_settings_test.rb

@@ -1,6 +1,6 @@
 require_relative '../test_helper'
 
-class UpdateProjectSettingsTest < ActiveSupport::TestCase
+class UpdateProjectSettingsTest < GttTest
   fixtures :projects
 
   test 'should save tile sources' do
@@ -15,6 +15,49 @@ class UpdateProjectSettingsTest < ActiveSupport::TestCase
     p.reload
     assert_equal [ts], p.gtt_tile_sources.to_a
   end
+
+  test 'should validate invalid multipolygon geometry' do
+    p = Project.find 'ecookbook'
+    coordinates = [
+      [
+        [[135.0, 35.0], [136.0, 35.0], [136.0, 36.0], [135.0, 36.0], [135.0, 35.0]]
+      ],
+      [
+        [[136.0, 35.0], [137.0, 35.0], [137.0, 36.0], [136.0, 36.0], [136.0, 35.0]]
+      ]
+    ]
+
+    form = GttConfiguration.from_params geojson: multipolygon_geojson(coordinates)
+    form.project = p
+    r = RedmineGtt::Actions::UpdateProjectSettings.( form )
+
+    assert_not r.settings_saved?
+
+    p.reload
+    assert_include 'Geometry is invalid', p.errors.full_messages
+  end
+
+  test 'should save valid multipolygon geometry' do
+    p = Project.find 'ecookbook'
+    coordinates = [
+      [
+        [[135.0, 35.0], [136.0, 35.0], [136.0, 36.0], [135.0, 36.0], [135.0, 35.0]]
+      ],
+      [
+        [[137.0, 35.0], [138.0, 35.0], [138.0, 36.0], [137.0, 36.0], [137.0, 35.0]]
+      ]
+    ]
+
+    form = GttConfiguration.from_params geojson: multipolygon_geojson(coordinates)
+    form.project = p
+    r = RedmineGtt::Actions::UpdateProjectSettings.( form )
+
+    assert r.settings_saved?
+
+    p.reload
+    assert_equal coordinates, JSON.parse(p.geojson)['geometry']['coordinates']
+  end
+
 end