Revert "Merge pull request #4552 from tchak/champ-communes"

This reverts commit 4cec26f73a, reversing
changes made to 0ef25ef36c.

config/env.example

@@ -105,7 +105,3 @@ LOGRAGE_ENABLED="disabled"
 # Service externe d'horodatage des changements de statut des dossiers (effectué quotidiennement)
 UNIVERSIGN_API_URL=""
 UNIVERSIGN_USERPWD=""
-
-# API Geo / Adresse
-API_ADRESSE_URL="https://api-adresse.data.gouv.fr"
-API_GEO_URL="https://geo.api.gouv.fr"

config/initializers/assets.rb

@@ -5,7 +5,6 @@ Rails.application.config.assets.version = '1.0'
 
 # Add additional assets to the asset load path
 Rails.application.config.assets.paths << Rails.root.join('node_modules', 'trix', 'dist')
-Rails.application.config.assets.paths << Rails.root.join('node_modules', 'select2', 'dist', 'css')
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.

config/initializers/content_security_policy.rb

@@ -13,7 +13,7 @@ Rails.application.config.content_security_policy do |policy|
   # c'est trop compliqué pour être rectifié immédiatement (et sans valeur ajoutée:
   # c'est hardcodé dans les vues, donc pas injectable).
   policy.style_src :self, "*.crisp.chat", "crisp.chat", :unsafe_inline
-  policy.connect_src :self, "wss://*.crisp.chat", "*.crisp.chat", "*.demarches-simplifiees.fr", "in-automate.sendinblue.com", "app.franceconnect.gouv.fr", "sentry.io", "geo.api.gouv.fr", "api-adresse.data.gouv.fr"
+  policy.connect_src :self, "wss://*.crisp.chat", "*.crisp.chat", "*.demarches-simplifiees.fr", "in-automate.sendinblue.com", "app.franceconnect.gouv.fr", "sentry.io"
   # Pour tout le reste, par défaut on accepte uniquement ce qui vient de chez nous
   # et dans la notification on inclue la source de l'erreur
   policy.default_src :self, :data, :report_sample, "fonts.gstatic.com", "in-automate.sendinblue.com", "player.vimeo.com", "app.franceconnect.gouv.fr", "sentry.io", "static.demarches-simplifiees.fr", "*.crisp.chat", "crisp.chat", "*.crisp.help", "*.sibautomation.com", "sibautomation.com", "data"

config/initializers/urls.rb

@@ -1,6 +1,9 @@
 # API URLs
+API_ADRESSE_URL = ENV.fetch("API_ADRESSE_URL", "https://api-adresse.data.gouv.fr")
 API_CARTO_URL = ENV.fetch("API_CARTO_URL", "https://sandbox.geo.api.gouv.fr/apicarto")
 API_ENTREPRISE_URL = ENV.fetch("API_ENTREPRISE_URL", "https://entreprise.api.gouv.fr/v2")
+API_GEO_URL = ENV.fetch("API_GEO_URL", "https://geo.api.gouv.fr")
+API_GEO_SANDBOX_URL = ENV.fetch("API_GEO_SANDBOX_URL", "https://sandbox.geo.api.gouv.fr")
 HELPSCOUT_API_URL = ENV.fetch("HELPSCOUT_API_URL", "https://api.helpscout.net/v2")
 PIPEDRIVE_API_URL = ENV.fetch("PIPEDRIVE_API_URL", "https://api.pipedrive.com/v1")
 SENDINBLUE_API_URL = ENV.fetch("SENDINBLUE_API_URL", "https://in-automate.sendinblue.com/api/v2")

config/locales/models/type_de_champ/fr.yml

@@ -24,7 +24,6 @@ fr:
           pays: 'Pays'
           regions: 'Régions'
           departements: 'Départements'
-          communes: 'Communes'
           engagement: 'Engagement'
           header_section: 'Titre de section'
           explication: 'Explication'

config/routes.rb

@@ -209,6 +209,13 @@ Rails.application.routes.draw do
     resources :instructeurs, only: [:index, :create, :destroy]
   end
 
+  #
+  # Addresses
+  #
+
+  get 'address/suggestions' => 'address#suggestions'
+  get 'address/geocode' => 'address#geocode'
+
   resources :invites, only: [:show] do
     collection do
       post 'dossier/:dossier_id', to: 'invites#create', as: :dossier
@@ -387,14 +394,6 @@ Rails.application.routes.draw do
     end
   end
 
-  if Rails.env.test?
-    scope 'test/api_geo' do
-      get 'regions' => 'api_geo_test#regions'
-      get 'communes' => 'api_geo_test#communes'
-      get 'departements' => 'api_geo_test#departements'
-    end
-  end
-
   #
   # Legacy routes
   #

config/secrets.yml

@@ -68,9 +68,6 @@ defaults: &defaults
     client_key: <%= ENV['CRISP_CLIENT_KEY'] %>
   universign:
     userpwd: <%= ENV['UNIVERSIGN_USERPWD'] %>
-  autocomplete:
-    api_geo_url: <%= ENV['API_GEO_URL'] %>
-    api_adresse_url: <%= ENV['API_ADRESSE_URL'] %>
 
 
 
@@ -101,8 +98,6 @@ test:
     logout_endpoint: https://bidon.com/endpoint
   universign:
     userpwd: 'fake:fake'
-  autocomplete:
-    api_geo_url: /test/api_geo
 
 # Do not keep production secrets in the repository,
 # instead read values from the environment.