Update decidim-geo to 0.3.6

Author: carlobeltrame

Gemfile

@@ -61,8 +61,7 @@ gem 'decidim-decidim_awesome',
     ref: 'f2c7152'
 gem 'decidim-decidim_geo',
     git: 'https://git.octree.ch/decidim/decidim-module-geo',
-    branch: 'main',
-    ref: 'df43d9e'
+    tag: 'v0.3.6'
 gem 'decidim-guest_meeting_registration',
     github: 'OpenSourcePolitics/guest-meeting-registration',
     branch: 'bump/module_to_0.29',

Gemfile.lock

@@ -1,10 +1,9 @@
 GIT
   remote: https://git.octree.ch/decidim/decidim-module-geo
-  revision: df43d9e1032581c0c9673113222622f166e7f46e
-  ref: df43d9e
-  branch: main
+  revision: 84176a44e4650795a4b134e9b328cb71197475cb
+  tag: v0.3.6
   specs:
-    decidim-decidim_geo (0.3.5)
+    decidim-decidim_geo (0.3.6)
       activerecord-postgis-adapter
       decidim-admin (>= 0.29)
       decidim-api (>= 0.29)

db/migrate/20260107122143_replace_geo_enable_with_geo_mode.decidim_geo.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+# This migration comes from decidim_geo (originally 20251107143529)
+class ReplaceGeoEnableWithGeoMode < ActiveRecord::Migration[7.0]
+  def up
+    add_column :decidim_geo_geo_settings,
+               :geo_mode,
+               :string,
+               default: "enabled_empty",
+               null: false
+
+    Decidim::Organization.find_each do |org|
+      Decidim::Geo::GeoSettings.create!(organization: org, geo_mode: "enabled_empty") unless org.respond_to?(:geo_settings)
+    end
+
+    Decidim::Geo::GeoSettings.find_each do |geo_setting|
+      geo_enabled_value = geo_setting.geo_enabled
+      geo_setting.update(geo_mode: geo_enabled_value ? "enabled_empty" : "disabled")
+    end
+
+    remove_column :decidim_geo_geo_settings, :geo_enabled, :boolean
+  end
+
+  def down
+    add_column :decidim_geo_geo_settings,
+               :geo_enabled,
+               :boolean,
+               default: true,
+               null: false
+
+    Decidim::Geo::GeoSettings.find_each do |geo_setting|
+      geo_enabled_value = geo_setting.geo_enabled
+      geo_setting.update(geo_enabled: geo_enabled_value != "disabled")
+    end
+
+    remove_column :decidim_geo_geo_settings, :geo_mode, :string
+  end
+end

db/migrate/20260107122144_add_esri_tile.decidim_geo.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+# This migration comes from decidim_geo (originally 20251211103145)
+class AddEsriTile < ActiveRecord::Migration[7.0]
+  def change
+    add_column :decidim_geo_configs, :esri_tile_enabled, :boolean, default: false, null: false
+  end
+end

db/schema.rb

@@ -10,7 +10,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema[7.0].define(version: 2025_09_10_162910) do
+ActiveRecord::Schema[7.0].define(version: 2026_01_07_122144) do
   # These are extensions that must be enabled in order to support this database
   enable_extension "fuzzystrmatch"
   enable_extension "ltree"
@@ -921,14 +921,15 @@
     t.string "maptiler_api_key", default: ""
     t.string "maptiler_style_id", default: ""
     t.bigint "decidim_organization_id", null: false
+    t.boolean "esri_tile_enabled", default: false, null: false
     t.index ["decidim_organization_id"], name: "index_decidim_geo_configs_on_organization_id"
   end
 
   create_table "decidim_geo_geo_settings", force: :cascade do |t|
-    t.boolean "geo_enabled", default: true, null: false
     t.bigint "decidim_organization_id"
     t.datetime "created_at", null: false
     t.datetime "updated_at", null: false
+    t.string "geo_mode", default: "enabled_empty", null: false
     t.index ["decidim_organization_id"], name: "index_decidim_geo_geo_settings_on_decidim_organization_id"
   end