Add polygon geographies to Budgets' map #3907

microweb10 · 2020-01-24T09:38:03Z

References

Closes Add polygon geographies to /Budgets/ map #3045
Replaces the original pull request Add polygon geographies to Budgets' map #3266

Objectives

Add feature to create Geographies. This geographies may have GeoJSON's attributtes and be plotted as polygon on Budgets' map.

Visual Changes

On Administration section, at Settings area, there is now an option to Manage Geographies.

It is possible to create Geographies, defining its color and the Headings related to this geography. Also it's possible to paste a GeoJSON file to define polygon to be drawed.

The name of related headings are shown for each geography. "No related Headings" is shown for geographies without related headings.

The name of related geography is shown for each heading. "No related geography" is shown when there is no associated geography;

Notes

The GeoJSON file format is validated according to the ;
It's not possible to set GeoJSON by uploading files. Paperclip is good for simple file upload, but can be a little overhead for processing files' contents, and for Geographies it's necessary to process the content of uploaded file, to validade it's content and process the coordinates;
As a geography can be related to many headings, when clicked on, it will show you links from all the heading;
Geographies that are not related to "active headings" are drawed without filling;

spec/features/admin/geographies_spec.rb

app/assets/javascripts/map.js

spec/features/admin/geographies_spec.rb

github-actions · 2021-11-13T16:10:27Z

spec/system/admin/geographies_spec.rb

+
+    expect(page).not_to have_content "Geography created successfully!"
+    expect(page).to have_css(".is-invalid-label", text: "Geojson")
+    expect(page).to have_css("small.form-error", text: "The GeoJSON provided does not follow the correct format. " \


Layout/LineLength: Line is too long. [116/110] (https://rubystyle.guide#max-line-length)

github-actions · 2021-11-13T16:10:28Z

spec/system/admin/geographies_spec.rb

+    expect(page).not_to have_content "Geography created successfully!"
+    expect(page).to have_css(".is-invalid-label", text: "Geojson")
+    expect(page).to have_css("small.form-error", text: "The GeoJSON provided does not follow the correct format. " \
+                                                       'It must follow the "Polygon" or "MultiPolygon" type format.')


Layout/LineLength: Line is too long. [117/110] (https://rubystyle.guide#max-line-length)

github-actions · 2021-11-13T16:10:29Z

spec/system/admin/geographies_spec.rb

+
+    expect(page).not_to have_content "Geography updated successfully!"
+    expect(page).to have_css(".is-invalid-label", text: "Geojson")
+    expect(page).to have_css("small.form-error", text: "The GeoJSON provided does not follow the correct format. " \


Layout/LineLength: Line is too long. [116/110] (https://rubystyle.guide#max-line-length)

github-actions · 2021-11-13T16:10:29Z

spec/system/admin/geographies_spec.rb

+    expect(page).not_to have_content "Geography updated successfully!"
+    expect(page).to have_css(".is-invalid-label", text: "Geojson")
+    expect(page).to have_css("small.form-error", text: "The GeoJSON provided does not follow the correct format. " \
+                                                       'It must follow the "Polygon" or "MultiPolygon" type format.')


Layout/LineLength: Line is too long. [117/110] (https://rubystyle.guide#max-line-length)

github-actions · 2023-04-26T17:12:53Z

app/controllers/concerns/admin/budget_headings_actions.rb

@@ -59,7 +59,7 @@ def budget_heading_params
    end

    def allowed_params
-      valid_attributes = [:price, :population, :allow_custom_content, :latitude, :longitude, :max_ballot_lines]
+      valid_attributes = [:price, :population, :allow_custom_content, :latitude, :longitude, :max_ballot_lines, :geozone_id]


Layout/LineLength: Line is too long. [124/110] (https://rubystyle.guide#max-line-length)

github-actions · 2023-04-26T17:12:54Z

app/models/geozone.rb

@@ -4,7 +4,9 @@ class Geozone < ApplicationRecord
  has_many :proposals
  has_many :debates
  has_many :users
+  has_many :headings, class_name: "Budget::Heading"


Rails/HasManyOrHasOneDependent: Specify a :dependent option. (https://rails.rubystyle.guide#has_many-has_one-dependent-option)

That way it'll be easier to refactor it.

This way it'll be easier to test it.

This way we simplify the header and it will be easier to add more code and tests.

Not sure why it was added in commit 9fb5019, but it made the table look funny on some screens, particularly after adding the extra field we're about to add.

This way we remove some logic from the (huge) investments controller class.

github-actions · 2023-05-29T18:02:55Z

spec/components/admin/budget_headings/form_component_spec.rb

+
+      render_inline component
+
+      expect(page).not_to have_select "Scope of operation", options: ["All City", "Under the sea", "Above the skies"]


Layout/LineLength: Line is too long. [117/110] (https://rubystyle.guide#max-line-length)

github-actions · 2023-05-29T18:02:56Z

spec/components/admin/geozones/index_component_spec.rb

+      geozones = [
+        create(:geozone, :with_geojson, name: "GeoJSON", external_code: "1", census_code: "2"),
+        create(:geozone, :with_html_coordinates, name: "HTML", external_code: "3", census_code: "4"),
+        create(:geozone, :with_geojson, :with_html_coordinates, name: "With both", external_code: "6", census_code: "7"),


Layout/LineLength: Line is too long. [121/110] (https://rubystyle.guide#max-line-length)

github-actions · 2023-05-29T18:02:57Z

spec/factories/administration.rb

+    end
+
+    trait :with_geojson do
+      geojson { '{ "geometry": { "type": "Polygon", "coordinates": [[-0.117,51.513],[-0.118,51.512],[-0.119,51.514]] } }' }


Layout/LineLength: Line is too long. [123/110] (https://rubystyle.guide#max-line-length)

github-actions · 2023-05-29T18:02:59Z

spec/system/admin/geozones_spec.rb

+  describe "polygons" do
+    before { Setting["feature.map"] = true }
+
+    let!(:geojson) { '{ "geometry": { "type": "Polygon", "coordinates": [[-0.1,51.5],[-0.2,51.4],[-0.3,51.6]] } }' }


Layout/LineLength: Line is too long. [116/110] (https://rubystyle.guide#max-line-length)

github-actions · 2023-05-29T18:03:00Z

spec/system/budgets/investments_spec.rb

@@ -1698,6 +1698,27 @@ def investments_order
      end
    end

+    scenario "Shows the polygon associated to the current heading" do
+      triangle = '{ "geometry": { "type": "Polygon", "coordinates": [[-0.1,51.5],[-0.2,51.4],[-0.3,51.6]] } }'
+      rectangle = '{ "geometry": { "type": "Polygon", "coordinates": [[-0.1,51.5],[-0.2,51.5],[-0.2,51.6],[-0.1,51.6]] } }'


Layout/LineLength: Line is too long. [123/110] (https://rubystyle.guide#max-line-length)

The `map` class is applied to the map element by LeafletJS; using it in the container led to hacks like adding an `inline` class to fix the fact that the container was using the `height` rule of the `.map` elements. Even though we don't add styles for them, I'm adding the `budgets-map` and `budget-investments-map` HTML classes so these elements can still be easily selected with CSS and JavaScript.

This check isn't necessary since commit 7e3dd47, since now we check that the budget is present before creating the components which call this method.

Just like we do in pretty much every section in the admin area.

Note that in the budgets wizard test we now create district with no associated geozone, so the text "all city" will appear in the districts table too, meaning we can't use `within "section", text: "All city" do` anymore since it would result in an ambiguous match. Co-Authored-By: Julian Herrero <microweb10@gmail.com> Co-Authored-By: Javi Martín <javim@elretirao.net>

Note that, in this case, we aren't binding a popup to the polygon because the link would point to the same page we're already in.

github-actions · 2023-05-31T15:19:35Z

spec/components/admin/budget_headings/form_component_spec.rb

+
+      render_inline component
+
+      expect(page).to have_select "Scope of operation", options: ["All city", "Under the sea", "Above the skies"]


Layout/LineLength: Line is too long. [113/110] (https://rubystyle.guide#max-line-length)

javierm · 2023-05-31T15:46:21Z

Huge thanks to @MatheusMiranda and @microweb10 for this pull request! 🙏 Sorry it took so long, but we finally got there 🎉.

microweb10 added Budgets post 1.1 labels Jan 24, 2020

microweb10 self-assigned this Jan 24, 2020

houndci-bot reviewed Jan 24, 2020

View reviewed changes

javierm removed the post 1.1 label Mar 11, 2020

javierm force-pushed the polygon_geographies branch from ea0b5c3 to 38a6f47 Compare October 5, 2020 19:18

houndci-bot reviewed Oct 5, 2020

View reviewed changes

javierm mentioned this pull request Aug 18, 2021

Add polygon geographies to Budgets' map #3266

Closed

javierm added the post-1.4 label Oct 7, 2021

javierm removed the post-1.4 label Nov 6, 2021

javierm force-pushed the polygon_geographies branch 2 times, most recently from 13fcd0e to 46119e8 Compare November 13, 2021 16:09

github-actions bot reviewed Nov 13, 2021

View reviewed changes

taitus self-assigned this Feb 28, 2022

javierm unassigned taitus Mar 22, 2022

javierm self-assigned this Mar 4, 2023

javierm force-pushed the polygon_geographies branch from 46119e8 to ff800ec Compare March 4, 2023 00:47

javierm force-pushed the polygon_geographies branch from ff800ec to 198c4d6 Compare April 24, 2023 17:11

javierm changed the base branch from master to map_refactoring April 24, 2023 17:12

javierm force-pushed the polygon_geographies branch 2 times, most recently from 6fb9c63 to d956c40 Compare April 26, 2023 17:11

github-actions bot reviewed Apr 26, 2023

View reviewed changes

javierm mentioned this pull request Apr 26, 2023

Simplify the code rendering the map #5108

Merged

javierm added 5 commits May 29, 2023 17:46

Move geozone form partial to a component

c6c0907

That way it'll be easier to refactor it.

Move budget headings form partial to a component

ca013cf

This way it'll be easier to test it.

Move geozones index view to a component

882cc85

This way we simplify the header and it will be easier to add more code and tests.

Remove text-center class in heading price header

60d5268

Not sure why it was added in commit 9fb5019, but it made the table look funny on some screens, particularly after adding the extra field we're about to add.

Move investments sidebar map view to a component

727e849

This way we remove some logic from the (huge) investments controller class.

javierm force-pushed the polygon_geographies branch 2 times, most recently from 5b3066e to 3e9339d Compare May 29, 2023 18:01

javierm marked this pull request as ready for review May 29, 2023 18:02

github-actions bot reviewed May 29, 2023

View reviewed changes

javierm and others added 5 commits May 31, 2023 16:56

Remove obsolete check for the budget presence

fb0caa3

This check isn't necessary since commit 7e3dd47, since now we check that the budget is present before creating the components which call this method.

Add notices when creating and updating geozones

d1f1e1d

Just like we do in pretty much every section in the admin area.

Include heading geozone in investments sidebar map

a9029be

Note that, in this case, we aren't binding a popup to the polygon because the link would point to the same page we're already in.

javierm force-pushed the polygon_geographies branch from 3e9339d to a9029be Compare May 31, 2023 15:18

github-actions bot reviewed May 31, 2023

View reviewed changes

taitus approved these changes May 31, 2023

View reviewed changes

javierm merged commit 1392733 into master May 31, 2023

javierm deleted the polygon_geographies branch May 31, 2023 15:46

javierm mentioned this pull request May 31, 2023

Assign investments to headings based on their location #5120

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add polygon geographies to Budgets' map #3907

Add polygon geographies to Budgets' map #3907

microweb10 commented Jan 24, 2020 •

edited by javierm

Loading

github-actions bot Nov 13, 2021

github-actions bot Nov 13, 2021

github-actions bot Nov 13, 2021

github-actions bot Nov 13, 2021

github-actions bot Apr 26, 2023

github-actions bot Apr 26, 2023

github-actions bot May 29, 2023

github-actions bot May 29, 2023

github-actions bot May 29, 2023

github-actions bot May 29, 2023

github-actions bot May 29, 2023

github-actions bot May 31, 2023

javierm commented May 31, 2023


		render_inline component

		expect(page).not_to have_select "Scope of operation", options: ["All City", "Under the sea", "Above the skies"]


		render_inline component

		expect(page).to have_select "Scope of operation", options: ["All city", "Under the sea", "Above the skies"]

Add polygon geographies to Budgets' map #3907

Add polygon geographies to Budgets' map #3907

Conversation

microweb10 commented Jan 24, 2020 • edited by javierm Loading

References

Objectives

Visual Changes

Notes

github-actions bot Nov 13, 2021

Choose a reason for hiding this comment

github-actions bot Nov 13, 2021

Choose a reason for hiding this comment

github-actions bot Nov 13, 2021

Choose a reason for hiding this comment

github-actions bot Nov 13, 2021

Choose a reason for hiding this comment

github-actions bot Apr 26, 2023

Choose a reason for hiding this comment

github-actions bot Apr 26, 2023

Choose a reason for hiding this comment

github-actions bot May 29, 2023

Choose a reason for hiding this comment

github-actions bot May 29, 2023

Choose a reason for hiding this comment

github-actions bot May 29, 2023

Choose a reason for hiding this comment

github-actions bot May 29, 2023

Choose a reason for hiding this comment

github-actions bot May 29, 2023

Choose a reason for hiding this comment

github-actions bot May 31, 2023

Choose a reason for hiding this comment

javierm commented May 31, 2023

microweb10 commented Jan 24, 2020 •

edited by javierm

Loading