Merge pull request #159 from gtt-project/fix/editing-polygon-causes-500-error

Fix/editing polygon causes 500 error

Author: dkastl

init.rb

@@ -8,7 +8,7 @@
   author_url 'https://github.com/georepublic'
   url 'https://github.com/gtt-project/redmine_gtt'
   description 'Adds location-based task management and maps'
-  version '4.1.0'
+  version '4.1.1'
 
   requires_redmine :version_or_higher => '4.2.0'
 

lib/redmine_gtt/patches/issue_patch.rb

@@ -38,6 +38,8 @@ def ignore_small_geom_change
               if old_value.length != new_value.length
                 return true
               end
+              old_value = old_value.flatten
+              new_value = new_value.flatten
             end
             self.geom = geom_change[0] if new_value.zip(old_value).map { |a, b| (a-b).abs }.map {|x| x < 0.00000001}.all?
           end

test/test_helper.rb

@@ -14,6 +14,14 @@ def point_geojson(coordinates)
     {'type'=>'Feature','geometry'=>{ 'type'=>'Point','coordinates'=> coordinates}}.to_json
   end
 
+  def linestring_geojson(coordinates)
+    {'type'=>'Feature','geometry'=>{ 'type'=>'LineString','coordinates'=> coordinates}}.to_json
+  end
+
+  def polygon_geojson(coordinates)
+    {'type'=>'Feature','geometry'=>{ 'type'=>'Polygon','coordinates'=> coordinates}}.to_json
+  end
+
   def multipolygon_geojson(coordinates)
     {'type'=>'Feature','geometry'=>{ 'type'=>'MultiPolygon','coordinates'=> coordinates}}.to_json
   end

test/unit/issue_test.rb

@@ -63,19 +63,69 @@ class IssueTest < GttTest
     assert_geojson_collection Issue.geojson
   end
 
-  test 'should ignore small geom changes' do
+  test 'should ignore small point geom changes' do
     coordinates = [135.220734222412, 34.7056906000311]
 
-    @issue.geojson = point_geojson(coordinates)
-    old_coordinates = JSON.parse(@issue.geojson).fetch("geometry").fetch("coordinates")
-    new_coordinates = old_coordinates.each{|c| c + 0.00000001}
+    @issue.update_attribute :geojson, point_geojson(coordinates)
+    @issue.instance_variable_set "@geojson", nil
+    old_coordinates = @issue.geojson["geometry"]["coordinates"]
+
+    new_coordinates = old_coordinates.map{|c| c + 0.000000001}
     @issue.update_attribute :geojson, point_geojson(new_coordinates)
-    @issue.reload
-    assert_equal old_coordinates, JSON.parse(@issue.geojson).fetch("geometry").fetch("coordinates")
+    @issue.instance_variable_set "@geojson", nil
+    assert_equal old_coordinates, @issue.geojson["geometry"]["coordinates"]
 
     new_coordinates = [old_coordinates[0] + 0.2, old_coordinates[1]]
     @issue.update_attribute :geojson, point_geojson(new_coordinates)
-    @issue.reload
-    assert_equal new_coordinates, JSON.parse(@issue.geojson).fetch("geometry").fetch("coordinates")
+    @issue.instance_variable_set "@geojson", nil
+    assert_equal new_coordinates, @issue.geojson["geometry"]["coordinates"]
+  end
+
+  test 'should ignore small linestring geom changes' do
+    coordinates = test_coordinates[0]
+
+    @issue.update_attribute :geojson, linestring_geojson(coordinates)
+    @issue.instance_variable_set "@geojson", nil
+    old_coordinates = @issue.geojson["geometry"]["coordinates"]
+
+    new_coordinates = old_coordinates.map{|c| [c[0] + 0.000000001, c[1] + 0.000000001]}
+    @issue.update_attribute :geojson, linestring_geojson(new_coordinates)
+    @issue.instance_variable_set "@geojson", nil
+    assert_equal old_coordinates, @issue.geojson["geometry"]["coordinates"]
+
+    new_coordinates = old_coordinates.map{|c| [c[0] + 0.2, c[1]]}
+    @issue.update_attribute :geojson, linestring_geojson(new_coordinates)
+    @issue.instance_variable_set "@geojson", nil
+    assert_equal new_coordinates, @issue.geojson["geometry"]["coordinates"]
+
+    new_coordinates = old_coordinates.map{|c| [c[0], c[1]]}
+    new_coordinates.delete_at(1)
+    @issue.update_attribute :geojson, linestring_geojson(new_coordinates)
+    @issue.instance_variable_set "@geojson", nil
+    assert_equal new_coordinates, @issue.geojson["geometry"]["coordinates"]
+  end
+
+  test 'should ignore small polygon geom changes' do
+    coordinates = test_coordinates
+
+    @issue.update_attribute :geojson, polygon_geojson(coordinates)
+    @issue.instance_variable_set "@geojson", nil
+    old_coordinates = @issue.geojson["geometry"]["coordinates"]
+
+    new_coordinates = [old_coordinates[0].map{|c| [c[0] + 0.000000001, c[1] + 0.000000001]}]
+    @issue.update_attribute :geojson, polygon_geojson(new_coordinates)
+    @issue.instance_variable_set "@geojson", nil
+    assert_equal old_coordinates, @issue.geojson["geometry"]["coordinates"]
+
+    new_coordinates = [old_coordinates[0].map{|c| [c[0] + 0.2, c[1]]}]
+    @issue.update_attribute :geojson, polygon_geojson(new_coordinates)
+    @issue.instance_variable_set "@geojson", nil
+    assert_equal new_coordinates, @issue.geojson["geometry"]["coordinates"]
+
+    new_coordinates = [old_coordinates[0].map{|c| [c[0], c[1]]}]
+    new_coordinates[0].delete_at(1)
+    @issue.update_attribute :geojson, polygon_geojson(new_coordinates)
+    @issue.instance_variable_set "@geojson", nil
+    assert_equal new_coordinates, @issue.geojson["geometry"]["coordinates"]
   end
 end