Merge pull request #152 from denis1011101/fix/court-picker-country-city

feat: pick a court by country and city in the game form

Author: denis1011101

app/controllers/concerns/location_filters.rb

@@ -130,25 +130,40 @@ module LocationFilters
     "ZW" => "Zimbabwe"
   }.freeze
 
+  # Геокодер иногда отдаёт район города или название, которого нет в справочнике
+  # City, — тогда страну для фильтров подставляем вручную.
   CITY_COUNTRY_OVERRIDES = {
-    "Koto" => "JP"
+    "Acapulco" => "MX",
+    "Chaoyang District" => "CN",
+    "Futian District" => "CN",
+    "Greater London" => "GB",
+    "Hua Hin City Municipality" => "TH",
+    "Jiang'an District" => "CN",
+    "Klagenfurt" => "AT",
+    "Koto" => "JP",
+    "Montreal" => "CA",
+    "New York" => "US",
+    "Pak Kret City Municipality" => "TH",
+    "Palilula Urban Municipality" => "RS",
+    "Pudong" => "CN",
+    "Yuexiu District" => "CN"
   }.freeze
 
   CITY_ALIASES = {
     "yekaterinburg" => "ekaterinburg"
   }.freeze
 
   included do
-    helper_method :country_name_for, :location_filter_labels, :country_cities_map_for_select
+    helper_method :country_name_for, :location_filter_labels, :country_cities_map_for_select,
+                  :city_country_map_for, :normalized_city
   end
 
   private
 
   def prepare_location_filters(city_names)
     city_names = Array(city_names).map(&:to_s).reject(&:blank?).uniq.sort
 
-    @city_country_map = City.country_codes_for(city_names)
-      .merge(CITY_COUNTRY_OVERRIDES.slice(*city_names))
+    @city_country_map = city_country_map_for(city_names)
 
     @country_names_by_code = @city_country_map.values.uniq.compact.sort.each_with_object({}) do |country_code, names|
       names[country_code] = country_name_for(country_code)
@@ -157,6 +172,15 @@ def prepare_location_filters(city_names)
     @cities = params[:country].present? ? cities_for_country(params[:country]) : city_names
   end
 
+  # Города-тёзки живут в разных странах, поэтому берём самый населённый (City),
+  # а районы и альтернативные написания добираем из CITY_COUNTRY_OVERRIDES.
+  def city_country_map_for(city_names)
+    city_names = Array(city_names).map(&:to_s).reject(&:blank?).uniq
+    return {} if city_names.empty?
+
+    City.country_codes_for(city_names).merge(CITY_COUNTRY_OVERRIDES.slice(*city_names))
+  end
+
   def cities_for_country(country_code)
     @city_country_map.select { |_, code| code == country_code }.keys.sort
   end

app/helpers/games_helper.rb

@@ -14,4 +14,31 @@ def format_duration_minutes(minutes)
     parts << "#{rest}m" if rest > 0
     parts.join(" ")
   end
+
+  # Мини-фильтр «страна → город» над списком кортов в форме игры: справочник
+  # стран, города каждой страны и город/страна каждого корта для JS.
+  def court_picker_locations(courts)
+    city_names = courts.filter_map { |court| court.city_name.presence }.uniq.sort
+    city_country = city_country_map_for(city_names)
+
+    cities_by_country = city_names.group_by { |name| city_country[name].to_s }
+    countries = cities_by_country.keys.reject(&:blank?)
+      .map { |code| [ country_name_for(code), code ] }.sort_by(&:first)
+
+    {
+      countries: countries,
+      # Пустой ключ — «любая страна»: города без страны видны только там.
+      cities_by_country: cities_by_country.merge("" => city_names),
+      city_country: city_country
+    }
+  end
+
+  # Город пользователя записан свободным текстом ("Ekaterinburg" против
+  # "Yekaterinburg" у кортов), поэтому сравниваем нормализованные названия.
+  def default_court_city(city_names, user)
+    target = normalized_city(user&.city_name)
+    return nil if target.blank?
+
+    city_names.find { |name| normalized_city(name) == target }
+  end
 end

app/javascript/controllers/court_picker_controller.js

@@ -1,9 +1,11 @@
 import { Controller } from "@hotwired/stimulus"
 
 export default class extends Controller {
-  static targets = ["map", "select", "surfaceSelect", "environmentSelect"]
+  static targets = ["map", "select", "surfaceSelect", "environmentSelect", "countrySelect", "citySelect"]
   static values = {
     courts: Array,
+    countryCities: Object,
+    cityPlaceholder: String,
     surfaceLabels: Object,
     environmentLabels: Object,
     surfaceSelected: String,
@@ -14,6 +16,7 @@ export default class extends Controller {
   }
 
   connect() {
+    this.filterCourts()
     this.initMap()
     this.updateSurfaceOptions({ initial: true })
   }
@@ -48,14 +51,50 @@ export default class extends Controller {
       this.markersById.set(String(c.id), marker)
     })
 
+    this._syncMarkers()
     if (this.selectTarget.value) this._focusSelected()
   }
 
+  // Смена страны или города: пересобираем города под страну и список кортов.
+  locationChanged(event) {
+    if (this.hasCountrySelectTarget && event.target === this.countrySelectTarget) this._syncCityOptions()
+    this.filterCourts()
+  }
+
   selectChanged() {
     this._focusSelected()
     this.updateSurfaceOptions()
   }
 
+  // Оставляет в списке корты выбранной страны/города, группируя их по городам.
+  // Если выбранный корт отфильтровался, берём первый доступный.
+  filterCourts() {
+    const country = this.hasCountrySelectTarget ? this.countrySelectTarget.value : ""
+    const city = this.hasCitySelectTarget ? this.citySelectTarget.value : ""
+    const previous = this.selectTarget.value
+    const courts = (this.courtsValue || []).filter(c => this._matchesLocation(c, country, city))
+    const groups = this._groupByCity(courts)
+    // Города разделяем заголовками только когда их несколько — иначе это лишний шум.
+    const grouped = groups.length > 1
+
+    this.selectTarget.innerHTML = ""
+    groups.forEach(([cityName, cityCourts]) => {
+      const parent = grouped && cityName ? this._appendGroup(cityName) : this.selectTarget
+      cityCourts.forEach(c => parent.appendChild(this._buildOption(String(c.id), c.name)))
+    })
+
+    // Порядок опций задают группы, поэтому запасной вариант берём из самого списка.
+    const stillListed = courts.some(c => String(c.id) === String(previous))
+    if (stillListed) this.selectTarget.value = previous
+    else this.selectTarget.selectedIndex = 0
+
+    this._syncMarkers()
+    if (!stillListed) {
+      this.updateSurfaceOptions()
+      this._focusSelected()
+    }
+  }
+
   // Заполняет селекты покрытия и среды вариантами выбранного корта.
   // preselect (сохранённое значение игры) применяется только при initial connect;
   // после смены корта пользователем ориентируемся только на текущее значение селекта.
@@ -81,6 +120,59 @@ export default class extends Controller {
     }
   }
 
+  _matchesLocation(court, country, city) {
+    if (city) return court.city === city
+    if (country) return court.country === country
+    return true
+  }
+
+  _groupByCity(courts) {
+    const groups = new Map()
+    courts.forEach(c => {
+      const key = c.city || ""
+      if (!groups.has(key)) groups.set(key, [])
+      groups.get(key).push(c)
+    })
+
+    return [...groups.entries()]
+      .sort((a, b) => a[0].localeCompare(b[0]))
+      .map(([cityName, cityCourts]) => [cityName, cityCourts.sort((a, b) => a.name.localeCompare(b.name))])
+  }
+
+  _appendGroup(label) {
+    const group = document.createElement("optgroup")
+    group.label = label
+    this.selectTarget.appendChild(group)
+    return group
+  }
+
+  _syncCityOptions() {
+    if (!this.hasCitySelectTarget) return
+
+    const selectedCity = this.citySelectTarget.value
+    const cities = (this.countryCitiesValue || {})[this.countrySelectTarget.value] || []
+
+    this.citySelectTarget.innerHTML = ""
+    this.citySelectTarget.appendChild(this._buildOption("", this.cityPlaceholderValue))
+    cities.forEach(city => this.citySelectTarget.appendChild(this._buildOption(city, city)))
+    this.citySelectTarget.value = cities.includes(selectedCity) ? selectedCity : ""
+  }
+
+  // Маркеры отфильтрованных кортов убираем с карты, чтобы она совпадала со списком.
+  _syncMarkers() {
+    if (!this.markersById || !this.map) return
+
+    const listed = new Set([...this.selectTarget.options].map(option => option.value))
+    this.markersById.forEach((marker, id) => marker.setMap(listed.has(id) ? this.map : null))
+  }
+
+  _buildOption(value, label) {
+    const option = document.createElement("option")
+    option.value = value
+    option.textContent = label
+    return option
+  }
+
   _fillSelect(select, values, labels, preselect) {
     const previous = select.value || preselect || ""
     const blank = select.querySelector('option[value=""]')
@@ -99,15 +191,16 @@ export default class extends Controller {
   }
 
   _focusSelected() {
-    const marker = this.markersById.get(String(this.selectTarget.value))
+    const marker = this.markersById && this.markersById.get(String(this.selectTarget.value))
     if (!marker || !this.map) return
     this.map.setCenter(marker.getPosition())
     this.map.setZoom(Math.max(this.map.getZoom(), 14))
     // Можно открыть infoWindow, но для простоты пропустим
   }
 
   _center() {
-    const withCoords = (this.courtsValue || []).find(this._valid)
+    const selected = (this.courtsValue || []).find(c => String(c.id) === String(this.selectTarget.value))
+    const withCoords = this._valid(selected) ? selected : (this.courtsValue || []).find(this._valid)
     return withCoords ? [withCoords.lat, withCoords.lng] : [this.defaultLatValue, this.defaultLngValue]
   }
 
@@ -118,4 +211,4 @@ export default class extends Controller {
   disconnect() {
     // Очистка не требуется
   }
-}
+}

app/models/court.rb

@@ -30,7 +30,8 @@ class Court < ApplicationRecord
   scope :indoor_only, -> { where(indoor: true) }
 
   def self.sorted_for_user(user)
-    courts = all.to_a
+    # По id корты идут вперемешку, поэтому раскладываем их по городу и названию.
+    courts = all.to_a.sort_by { |court| [ court.city_name.to_s, court.name.to_s ] }
     user_city = user&.city_name.to_s.strip.downcase.presence
     return courts unless user_city
 

app/views/games/_form.html.erb

@@ -165,18 +165,47 @@
     </div>
 
     <% sorted_courts = tournament&.courts&.any? ? tournament.courts.to_a : Court.sorted_for_user(current_user) %>
+    <% locations = court_picker_locations(sorted_courts) %>
+    <%# Кортов много и они из разных стран, поэтому список сужаем парой селектов.
+        Стартуем с города выбранного корта, а для новой игры — с города игрока. %>
+    <% selected_city = game.court&.city_name.presence || default_court_city(locations[:cities_by_country][""], current_user) %>
+    <% selected_country = locations[:city_country][selected_city].to_s %>
+    <% location_filter = locations[:countries].size > 1 || locations[:cities_by_country][""].size > 1 %>
     <div class="space-y-3"
          data-controller="court-picker"
          data-court-picker-default-lat-value="56.838011"
          data-court-picker-default-lng-value="60.597465"
          data-court-picker-courts-value="<%= json_escape(sorted_courts.map { |c|
            lat, lng = c.coordinates.to_s.split(',').map(&:to_f)
-           { id: c.id, name: c.name, lat: lat, lng: lng, surfaces: c.surfaces, environments: c.environments }
+           { id: c.id, name: c.name, lat: lat, lng: lng, surfaces: c.surfaces, environments: c.environments,
+             city: c.city_name.to_s, country: locations[:city_country][c.city_name].to_s }
          }.to_json) %>"
+         data-court-picker-country-cities-value="<%= json_escape(locations[:cities_by_country].to_json) %>"
+         data-court-picker-city-placeholder-value="<%= t("games.form.court_city_any") %>"
          data-court-picker-surface-labels-value="<%= json_escape(Court::SURFACES.index_with { |s| t("courts.surfaces.#{s}") }.to_json) %>"
          data-court-picker-environment-labels-value="<%= json_escape(Game::ENVIRONMENTS.index_with { |e| t("courts.index.#{e}_badge") }.to_json) %>"
          data-court-picker-surface-selected-value="<%= game.surface %>"
          data-court-picker-environment-selected-value="<%= game.environment %>">
+      <% if location_filter %>
+        <div class="grid grid-cols-1 sm:grid-cols-2 gap-4">
+          <div>
+            <%= label_tag :court_country, t("games.form.court_country"), class: "block text-sm font-medium text-gray-700 dark:text-slate-300" %>
+            <%# Фильтры не уходят на сервер: без name они не попадают в параметры игры. %>
+            <%= select_tag nil, options_for_select(locations[:countries], selected_country),
+                  include_blank: t("games.form.court_country_any"), id: "court_country",
+                  class: "mt-2 block w-full rounded-md border border-gray-300 dark:border-white/15 dark:bg-slate-700 dark:text-slate-100 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-indigo-500",
+                  data: { "court-picker-target": "countrySelect", action: "court-picker#locationChanged" } %>
+          </div>
+          <div>
+            <%= label_tag :court_city, t("games.form.court_city"), class: "block text-sm font-medium text-gray-700 dark:text-slate-300" %>
+            <%= select_tag nil, options_for_select(locations[:cities_by_country][selected_country] || [], selected_city),
+                  include_blank: t("games.form.court_city_any"), id: "court_city",
+                  class: "mt-2 block w-full rounded-md border border-gray-300 dark:border-white/15 dark:bg-slate-700 dark:text-slate-100 px-3 py-2 focus:outline-none focus:ring-2 focus:ring-indigo-500",
+                  data: { "court-picker-target": "citySelect", action: "court-picker#locationChanged" } %>
+          </div>
+        </div>
+      <% end %>
+
       <div>
         <%= form.label :court_id, t("games.form.court"), class: "block text-sm font-medium text-gray-700 dark:text-slate-300" %>
         <%= form.collection_select :court_id, sorted_courts, :id, :name,

config/locales/en.yml

@@ -297,6 +297,10 @@ en:
         one: "👥 %{count} spot left"
         other: "👥 %{count} spots left"
     form:
+      court_country: "Country"
+      court_country_any: "— any country —"
+      court_city: "City"
+      court_city_any: "— any city —"
       surface: "Surface"
       surface_any: "— any surface —"
       surface_hint: "Choose from surfaces available at the selected court."

config/locales/es.yml

@@ -272,6 +272,10 @@ es:
         one: "👥 falta %{count} jugador"
         other: "👥 faltan %{count} jugadores"
     form:
+      court_country: "País"
+      court_country_any: "— cualquier país —"
+      court_city: "Ciudad"
+      court_city_any: "— cualquier ciudad —"
       surface: "Superficie"
       surface_any: "— cualquier superficie —"
       surface_hint: "Elige entre las superficies disponibles en la pista seleccionada."

config/locales/ru.yml

@@ -269,6 +269,10 @@ ru:
         many: "👥 нужно %{count} игроков"
         other: "👥 %{count} игроков"
     form:
+      court_country: "Страна"
+      court_country_any: "— любая страна —"
+      court_city: "Город"
+      court_city_any: "— любой город —"
       surface: "Покрытие"
       surface_any: "— любое покрытие —"
       surface_hint: "Выберите из покрытий выбранного корта."