Merge branch 'next' into ftr/rotate-map

Author: dkastl

.github/workflows/test-postgis.yml

@@ -25,7 +25,7 @@ jobs:
       fail-fast: false
       matrix:
         redmine_version: [4.2-stable, 5.0-stable, master]
-        ruby_version: [2.7, 3.0, 3.1]
+        ruby_version: ['2.7', '3.0', '3.1']
         db_version: [11-2.5, 14-3.2]
         exclude:
           - redmine_version: 4.2-stable
@@ -45,14 +45,14 @@ jobs:
 
     steps:
       - name: Checkout Redmine
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: redmine/redmine
           ref: ${{ matrix.redmine_version }}
           path: redmine
 
       - name: Checkout Plugin
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           path: redmine/plugins/${{ env.PLUGIN_NAME }}
 

.markdownlint.json

@@ -0,0 +1,6 @@
+{
+  "MD029": false,
+  "MD033": false,
+  "MD038": false,
+  "MD041": false
+}

Gemfile

@@ -2,7 +2,7 @@ source 'https://rubygems.org'
 
 gem 'deface'
 gem 'immutable-struct'
-gem "rgeo"
+gem "rgeo", "~> 2.4.0"
 gem "rgeo-geojson"
 gem "pg", (ENV['GEM_PG_VERSION'] ? "~> #{ENV['GEM_PG_VERSION']}" : "~> 1.2.2") # make sure we use a version compatible with AR
 gem "rgeo-activerecord", (ENV['GEM_RGEO_ACTIVERECORD_VERSION'] ? "~> #{ENV['GEM_RGEO_ACTIVERECORD_VERSION']}" : "~> 7.0.1") # same as above

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/views/issues/index.api.rsb

@@ -21,9 +21,9 @@ api.array :issues, api_meta(:total_count => @issue_count, :offset => @offset, :l
       api.estimated_hours issue.estimated_hours
 
       if issue.geom
-        api.geojson issue.geojson.to_json
+        api.geojson (params[:format] == "json") ? issue.geojson : issue.geojson.to_json
       else
-        api.geojson ""
+        api.geojson nil
       end
 
       if issue.distance

app/views/issues/show.api.rsb

@@ -24,9 +24,9 @@ api.issue do
   end
 
   if @issue.geom
-    api.geojson @issue.geojson
+    api.geojson (params[:format] == "json") ? @issue.geojson : @issue.geojson.to_json
   else
-    api.geojson ""
+    api.geojson nil
   end
 
   render_api_custom_values @issue.visible_custom_field_values, api

app/views/projects/index.api.rsb

@@ -11,9 +11,9 @@ api.array :projects, api_meta(:total_count => @project_count, :offset => @offset
 
       if @include_geometry
         if project.geom
-          api.geojson project.geojson.to_json
+          api.geojson (params[:format] == "json") ? project.geojson : project.geojson.to_json
         else
-          api.geojson ""
+          api.geojson nil
         end
       end
 

app/views/projects/show.api.rsb

@@ -9,9 +9,9 @@ api.project do
   api.is_public   @project.is_public?
 
   if @project.geom
-    api.geojson @project.geojson
+    api.geojson (params[:format] == "json") ? @project.geojson : @project.geojson.to_json
   else
-    api.geojson ""
+    api.geojson nil
   end
 
   render_api_custom_values @project.visible_custom_field_values, api

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

@@ -1,4 +1,4 @@
-<div id="dialog-geojson-upload" title="<%= l(:title_geojson_upload) %>">
+<div id="dialog-geojson-upload" title="<%= l(:title_geojson_upload) %>" style="display:none;">
   <textarea placeholder="<%= l(:placeholder_geojson_upload) %>" class="ui-widget ui-state-default ui-corner-all"></textarea>
   <input type="file" id="file-selector" accept=".json,.geojson">
 </div>

app/views/users/index.api.rsb

@@ -10,9 +10,9 @@ api.array :users, api_meta(:total_count => @user_count, :offset => @offset, :lim
       api.last_login_on user.last_login_on
 
       if user.geom
-        api.geojson user.geojson
+        api.geojson (params[:format] == "json") ? user.geojson : user.geojson.to_json
       else
-        api.geojson ""
+        api.geojson nil
       end
 
       render_api_custom_values user.visible_custom_field_values, api