layers_of_london-booth-map_tool 0.1.1 → 0.1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2daab147177435f92cebb04bf6ee9257116a48411ebf1b3820ec5989d98286c0
-  data.tar.gz: 7d52d522f8dee4ca6cd10d119cc67a5fbe207015cdb51273164427c74cd0a968
+  metadata.gz: 4495369b72bcfe877a3d6ef77ffb8812216250d308c8a243450fd64559060b55
+  data.tar.gz: 11d34c7bc762629c885a6ac34502cfecee850bcde736b872f26b4da148c35596
 SHA512:
-  metadata.gz: 883e534dbd5892c982543b44a1d5e8d5b2d680cfc20a60e22f1e3e0de22c838f021663af45eb81b9fe3ff2b0a743034c8a06ec0ed2b0bfba7dd9a5780285e264
-  data.tar.gz: 3484e6d0cca603529db010aab0a222f30f5dceb95bc8c6b0e0fe1ce60dbf7b9c10d5671e2fae5f53afe12963c05c487135a66baf4eba4a4751e010db35f2aece
+  metadata.gz: bd1ff2b16202496c6d1a6ba70f69ffac89c2b06bad2a2503b084815818e5a634285c42ac5546fecc7499ef23e236af923b8de0026c3a61d5fb36ebe6885b9b57
+  data.tar.gz: c98879375683029aed48d52a986232e1a2d2649b99724986c6282dbd4fa4c79280eedbce213e79b2057e0571e940d4701d3f2be93ae17f94d760c9852dda5bbd

data/app/controllers/layers_of_london/booth/map_tool/squares_controller.rb

@@ -5,7 +5,7 @@ module LayersOfLondon::Booth::MapTool
     skip_after_action :verify_authorized rescue nil
 
     def index
-      squares = LayersOfLondon::Booth::MapTool::Square.where.not(aasm_state: :not_started)
+      squares = LayersOfLondon::Booth::MapTool::Square.all
       render json: {
         type: "FeatureCollection",
         features: squares.collect(&:to_geojson)
@@ -43,10 +43,7 @@ module LayersOfLondon::Booth::MapTool
     end
 
     def polygons
-      features = LayersOfLondon::Booth::MapTool::Polygon.all.collect do |polygon|
-        user_can_edit = LayersOfLondon::Booth::MapTool::PolygonPolicy.new(current_user, polygon).update?
-        polygon.to_json(user_can_edit: user_can_edit)
-      end
+      features = LayersOfLondon::Booth::MapTool::PolygonPolicy::Scope.new(current_user, LayersOfLondon::Booth::MapTool::Polygon).resolve
 
       feature_collection = {
         type: "FeatureCollection",

data/app/models/layers_of_london/booth/map_tool/square.rb

@@ -89,24 +89,24 @@ module LayersOfLondon::Booth::MapTool
       {
         type: "Feature",
         geometry: {
-          type: "MultiPolygon",
+          type: "Polygon",
           coordinates: [
-            [
+            # [
               [
-                north_west_padded.to_a.reverse,
-                south_west_padded.to_a.reverse,
-                south_east_padded.to_a.reverse,
-                north_east_padded.to_a.reverse,
-                north_west_padded.to_a.reverse
-              ],
-              [
-                LayersOfLondon::Booth::MapTool.configuration.north_west.to_a.reverse,
-                LayersOfLondon::Booth::MapTool.configuration.north_east.to_a.reverse,
-                LayersOfLondon::Booth::MapTool.configuration.south_east.to_a.reverse,
-                LayersOfLondon::Booth::MapTool.configuration.south_west.to_a.reverse,
-                LayersOfLondon::Booth::MapTool.configuration.north_west.to_a.reverse,
-              ]
-            ]
+                north_west.to_a.reverse,
+                south_west.to_a.reverse,
+                south_east.to_a.reverse,
+                north_east.to_a.reverse,
+                north_west.to_a.reverse
+              ]#,
+            #   [
+            #     LayersOfLondon::Booth::MapTool.configuration.north_west.to_a.reverse,
+            #     LayersOfLondon::Booth::MapTool.configuration.north_east.to_a.reverse,
+            #     LayersOfLondon::Booth::MapTool.configuration.south_east.to_a.reverse,
+            #     LayersOfLondon::Booth::MapTool.configuration.south_west.to_a.reverse,
+            #     LayersOfLondon::Booth::MapTool.configuration.north_west.to_a.reverse,
+            #   ]
+            # ]
 
           ]
         },

data/app/policies/layers_of_london/booth/map_tool/polygon_policy.rb

@@ -18,7 +18,10 @@ module LayersOfLondon::Booth::MapTool
 
     class Scope < Scope
       def resolve
-        scope.all
+        features = scope.limit(10).includes(:user, square: [:user]).all.collect do |poly|
+          # user_can_edit = LayersOfLondon::Booth::MapTool::PolygonPolicy.new(user, poly).update?
+          poly.to_json(user_can_edit: user.present?)
+        end
       end
     end
   end

data/lib/layers_of_london/booth/map_tool/version.rb

@@ -1,7 +1,7 @@
 module LayersOfLondon
   module Booth
     module MapTool
-      VERSION = '0.1.1'
+      VERSION = '0.1.2.1'
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: layers_of_london-booth-map_tool
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2.1
 platform: ruby
 authors:
 - Paul Hendrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-11 00:00:00.000000000 Z
+date: 2019-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails