geo_master_jp 0.1.29 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 792aee56124d3e9f0267333ba66bf7e5429ad6c281013efe1c2a3b23557cbd36
-  data.tar.gz: 4bcefa376a8fe95065214fb025ee4cd40bf33e81baedff8de8347cee88f16680
+  metadata.gz: 3e79b95487f5cc5171afc0efc091c33d13d9939833b17a218d2f37adc1c0eb24
+  data.tar.gz: bf967e1b4d4ed2a649aff000f60aed84982fa5b58030ed7ccab8b4073c146dae
 SHA512:
-  metadata.gz: 7f5af00e3bd7ed49ed3acb9669b03a7b19f5df9a2c16918b460e9d7296e15a32ad996a98be753400c01d83b17c6ac3db160fc25f590cb6ce8d94d24b1b2bfd8d
-  data.tar.gz: 7d6c998a40c969fba255c4ad086afca0799e959f91ee1f722ae53239ea71e69e2bb5f5aac66d01fef3c048916883ab5d72a4869921977a6f06d73c79d9763c2d
+  metadata.gz: d4ca29393e1fc2e6b9c5374c005c1103be2fc8fdfbdbeee9257b3746327d92b03bb1fe2be3dc057222be89a215c9cd45dad2ecc53dd33ba3f06f6c9137da397b
+  data.tar.gz: 4243a30e79e11ad4b9de803115ffd6d28cb06762d299ce6bd00f3ae67c39b68fab683ac4ecaf97cd2baee80196210a52a83fbbd0ae5314aecfd22b02721b090d

data/README.md

@@ -74,6 +74,12 @@ Then you can use the following API:
 - `/geo_master_jp/api/prefectures`
 - `/geo_master_jp/api/cities?prefecture_code=13`
 - `/geo_master_jp/api/towns?city_code=13104`
+- `/geo_master_jp/api/railway_companies`
+- `/geo_master_jp/api/lines?prefecture_code=13`
+- `/geo_master_jp/api/lines?railway_company_code=002`
+- `/geo_master_jp/api/stations?line_code=11302`
+- `/geo_master_jp/api/stations?line_code=11302&prefecture_code=13`
+- `/geo_master_jp/api/same_stations?same_stations=1130225`
 
 ## Contributing
 Contribution directions go here.

data/app/controllers/geo_master_jp/area_api_controller.rb

@@ -50,9 +50,5 @@ module GeoMasterJp
         initials: towns.sort_by(&:name_kana).group_by(&:head_kana).sort_by(&:first).to_h
       }
     end
-
-    def self.aaa(text)
-      puts text
-    end
   end
 end

data/app/controllers/geo_master_jp/railway_api_controller.rb

@@ -0,0 +1,96 @@
+module GeoMasterJp
+  class RailwayApiController < ApplicationController
+    def railway_companies
+      railway_companies = GeoMasterJp::RailwayCompany.all
+
+      if params[:status].present?
+        railway_companies = railway_companies.where(status: params[:status].split(','))
+      else
+        railway_companies = railway_companies.where(status: 0)
+      end
+
+      render json: {
+        railway_companies: railway_companies.map{|railway_company|
+          railway_company.as_json(only: [:status, :company_type, :group_code, :code, :name, :name_kana, :name_full, :name_short, :url])
+        },
+        initials: railway_companies.sort_by(&:name_kana).group_by(&:head_kana).sort_by(&:first).to_h
+      }
+    end
+
+    def lines
+      if params[:prefecture_code].blank? && params[:railway_company_code].blank?
+        return render json: {
+          message: 'prefecture_code or railway_company_code is required.'
+        }, status: 400
+      end
+
+      if params[:prefecture_code].present?
+        lines = GeoMasterJp::Prefecture.find_by(code: params[:prefecture_code]).lines
+      else
+        lines = GeoMasterJp::RailwayCompany.find_by(code: params[:railway_company_code]).lines
+      end
+
+      if params[:status].present?
+        lines = lines.where(status: params[:status].split(','))
+      else
+        lines = lines.where(status: 0)
+      end
+
+      render json: {
+        lines: lines.map{|line|
+          line.as_json(only: [:status, :code, :name, :name_kana, :name_full, :longitude, :latitude, :sort_order])
+        },
+        initials: lines.sort_by(&:name_kana).group_by(&:head_kana).sort_by(&:first).to_h
+      }
+    end
+
+    def stations
+      if params[:line_code].blank?
+        return render json: {
+          message: 'line_code is required.'
+        }, status: 400
+      end
+
+      stations = GeoMasterJp::Line.find_by(code: params[:line_code]).stations.joins(:station_connections)
+
+      if params[:prefecture_code].present?
+        stations = stations.where(geo_master_jp_prefecture_code: params[:prefecture_code])
+      end
+
+      if params[:status].present?
+        stations = stations.where(status: params[:status].split(','))
+      else
+        stations = stations.where(status: 0)
+      end
+
+      render json: {
+        stations: stations.map{|station|
+          station.as_json(
+            only: [:status, :code, :group_code, :name, :zip_code, :address, :longitude, :latitude, :open_date, :close_date, :sort_order],
+            methods: :neighbor_station_codes,
+          )
+        }
+      }
+    end
+
+    def same_stations
+      if params[:station_code].blank?
+        return render json: {
+          message: 'station_code is required.'
+        }, status: 400
+      end
+
+      stations = GeoMasterJp::Station.find_by(code: params[:station_code]).same_stations
+
+      if params[:status].present?
+        stations = stations.where(status: params[:status].to_i)
+      end
+
+      render json: {
+        stations: stations.map{|station|
+          line.as_json(only: [:status, :code, :group_code, :name, :zip_code, :address, :longitude, :latitude, :open_date, :close_date, :sort_order])
+        }
+      }
+    end
+  end
+end

data/app/models/geo_master_jp/line.rb

@@ -5,17 +5,41 @@ module GeoMasterJp
     belongs_to :railway_company, class_name: 'GeoMasterJp::RailwayCompany', foreign_key: :geo_master_jp_railway_company_code, primary_key: :code
     has_many   :stations,        class_name: 'GeoMasterJp::Station',        foreign_key: :geo_master_jp_line_code,            primary_key: :code
 
+    if GeoMasterJp.config.use_models.include?(:area)
+      has_many :prefectures_lines, class_name: 'GeoMasterJp::PrefecturesLine', foreign_key: :geo_master_jp_line_code, primary_key: :code
+      has_many :prefectures, through: :prefectures_lines, class_name: 'GeoMasterJp::Prefecture'
+    end
+
     enum status: {
       running:  0,
       will_run: 1,
       deleted:  2
     }
 
+    def head_kana
+      return '' if self.name_kana.blank?
+      head_kanas = ['ア', 'カ', 'サ', 'タ', 'ナ', 'ハ', 'マ', 'ヤ', 'ラ', 'ワ']
+      head_kanas[head_kanas.index{|i| i > self.name_kana[0] }.to_i - 1]
+    end
+
     def self.inherited(child)
       child.belongs_to :railway_company, class_name: GeoMasterJp.config.alternative_class_name(:railway_company), foreign_key: :geo_master_jp_railway_company_code, primary_key: :code
       child.has_many   :stations,        class_name: GeoMasterJp.config.alternative_class_name(:station),         foreign_key: :geo_master_jp_line_code,            primary_key: :code
 
+      if GeoMasterJp.config.use_models.include?(:area)
+        child.has_many :prefectures_lines, class_name: GeoMasterJp.config.alternative_class_name(:prefectures_line), foreign_key: :geo_master_jp_line_code, primary_key: :code
+        child.has_many :prefectures, through: :prefectures_lines, class_name: GeoMasterJp.config.alternative_class_name(:prefecture)
+      end
+
       super
     end
+
+    def station_select_options
+      self.stations.map{|station| [station.name, station.code] }
+    end
+
+    def self.select_options(transactions=nil)
+      (transactions || all).map{|line| [line.name, line.code] }
+    end
   end
 end

data/app/models/geo_master_jp/prefecture.rb

@@ -5,6 +5,12 @@ module GeoMasterJp
     has_many :cities, class_name: 'GeoMasterJp::City', foreign_key: :geo_master_jp_prefecture_code, primary_key: :code
     has_many :towns,  class_name: 'GeoMasterJp::Town', foreign_key: :geo_master_jp_prefecture_code, primary_key: :code
 
+    if GeoMasterJp.config.use_models.include?(:railway)
+      has_many :stations, class_name: 'GeoMasterJp::Station', foreign_key: :geo_master_jp_prefecture_code, primary_key: :code
+      has_many :prefectures_lines, class_name: 'GeoMasterJp::PrefecturesLine', foreign_key: :geo_master_jp_prefecture_code, primary_key: :code
+      has_many :lines, through: :prefectures_lines
+    end
+
     def head_kana
       return '' if self.name_kana.blank?
       head_kanas = ['ア', 'カ', 'サ', 'タ', 'ナ', 'ハ', 'マ', 'ヤ', 'ラ', 'ワ']
@@ -15,6 +21,12 @@ module GeoMasterJp
       child.has_many :cities, class_name: GeoMasterJp.config.alternative_class_name(:city), foreign_key: :geo_master_jp_prefecture_code, primary_key: :code
       child.has_many :towns,  class_name: GeoMasterJp.config.alternative_class_name(:town), foreign_key: :geo_master_jp_prefecture_code, primary_key: :code
 
+      if GeoMasterJp.config.use_models.include?(:railway)
+        child.has_many :stations, class_name: GeoMasterJp.config.alternative_class_name(:station), foreign_key: :geo_master_jp_prefecture_code, primary_key: :code
+        child.has_many :prefectures_lines, class_name: GeoMasterJp.config.alternative_class_name(:prefectures_line), foreign_key: :geo_master_jp_prefecture_code, primary_key: :code
+        child.has_many :lines, through: :prefectures_lines, class_name: GeoMasterJp.config.alternative_class_name(:line)
+      end
+
       super
     end
 

data/app/models/geo_master_jp/prefectures_line.rb

@@ -0,0 +1,15 @@
+module GeoMasterJp
+  class PrefecturesLine < ActiveRecord::Base
+    self.table_name = 'geo_master_jp_prefectures_lines'
+
+    belongs_to :prefecture, class_name: 'GeoMasterJp::Prefecture', foreign_key: :geo_master_jp_prefecture_code, primary_key: :code
+    belongs_to :line,       class_name: 'GeoMasterJp::Line',       foreign_key: :geo_master_jp_line_code,       primary_key: :code
+
+    def self.inherited(child)
+      child.belongs_to :prefecture, class_name: GeoMasterJp.config.alternative_class_name(:prefecture), foreign_key: :geo_master_jp_prefecture_code, primary_key: :code
+      child.belongs_to :line,       class_name: GeoMasterJp.config.alternative_class_name(:line),       foreign_key: :geo_master_jp_line_code,       primary_key: :code
+
+      super
+    end
+  end
+end

data/app/models/geo_master_jp/railway_company.rb

@@ -10,10 +10,24 @@ module GeoMasterJp
       deleted:  2
     }
 
+    def head_kana
+      return '' if self.name_kana.blank?
+      head_kanas = ['ア', 'カ', 'サ', 'タ', 'ナ', 'ハ', 'マ', 'ヤ', 'ラ', 'ワ']
+      head_kanas[head_kanas.index{|i| i > self.name_kana[0] }.to_i - 1]
+    end
+
     def self.inherited(child)
       child.has_many :lines, class_name: GeoMasterJp.config.alternative_class_name(:line), foreign_key: :geo_master_jp_railway_company_code, primary_key: :code
 
       super
     end
+
+    def line_select_options
+      self.lines.map{|line| [line.name, line.code] }
+    end
+
+    def self.select_options(transactions=nil)
+      (transactions || all).map{|railway_company| [railway_company.name, railway_company.code] }
+    end
   end
 end

data/app/models/geo_master_jp/station.rb

@@ -2,9 +2,14 @@ module GeoMasterJp
   class Station < ActiveRecord::Base
     self.table_name = 'geo_master_jp_stations'
 
-    belongs_to :line,          class_name: 'GeoMasterJp::Line',    foreign_key: :geo_master_jp_line_code, primary_key: :code
-    has_many   :same_stations, class_name: 'GeoMasterJp::Station', foreign_key: :group_code,              primary_key: :group_code
-    # has_many :connections, class_name: GeoMasterJp.config.alternative_class_name(:station_connection), foreign_key: :geo_master_jp_line_id
+    belongs_to :line, class_name: 'GeoMasterJp::Line', foreign_key: :geo_master_jp_line_code, primary_key: :code
+    has_many :same_stations, class_name: 'GeoMasterJp::Station', foreign_key: :group_code, primary_key: :group_code
+    has_many :station_connections, class_name: 'GeoMasterJp::StationConnection', foreign_key: :geo_master_jp_station_1_code, primary_key: :code
+    has_many :neighbors, class_name: 'GeoMasterJp::Station', through: :station_connections, source: :station_2
+
+    if GeoMasterJp.config.use_models.include?(:area)
+      belongs_to :prefecture, class_name: 'GeoMasterJp::Prefecture', foreign_key: :geo_master_jp_prefecture_code, primary_key: :code
+    end
 
     enum status: {
       running:  0,
@@ -12,11 +17,23 @@ module GeoMasterJp
       deleted:  2
     }
 
+    def neighbor_station_codes
+      station_connections.pluck(:geo_master_jp_station_2_code)
+    end
+
     def self.inherited(child)
       child.belongs_to :line,          class_name: GeoMasterJp.config.alternative_class_name(:line),    foreign_key: :geo_master_jp_line_code, primary_key: :code
       child.has_many   :same_stations, class_name: GeoMasterJp.config.alternative_class_name(:station), foreign_key: :group_code,              primary_key: :group_code
 
+      if GeoMasterJp.config.use_models.include?(:area)
+        child.belongs_to :prefecture, class_name: GeoMasterJp.config.alternative_class_name(:prefecture), foreign_key: :geo_master_jp_prefecture_code, primary_key: :code
+      end
+
       super
     end
+
+    def self.select_options(transactions=nil)
+      (transactions || all).map{|station| [station.name, line.code] }
+    end
   end
 end

data/config/routes.rb

@@ -1,7 +1,18 @@
 GeoMasterJp::Engine.routes.draw do
-  scope :api, as: 'api' do
-    get 'prefectures', to: 'area_api#prefectures'
-    get 'cities', to: 'area_api#cities'
-    get 'towns', to: 'area_api#towns'
+  if GeoMasterJp.config.use_apis.include?(:area)
+    scope :api, as: 'api' do
+      get 'prefectures', to: 'area_api#prefectures'
+      get 'cities', to: 'area_api#cities'
+      get 'towns', to: 'area_api#towns'
+    end
+  end
+
+  if GeoMasterJp.config.use_apis.include?(:railway)
+    scope :api, as: 'api' do
+      get 'railway_companies', to: 'railway_api#railway_companies'
+      get 'lines', to: 'railway_api#lines'
+      get 'stations', to: 'railway_api#stations'
+      get 'same_stations', to: 'railway_api#same_stations'
+    end
   end
 end

data/lib/generators/geo_master_jp/install_area_data_generator.rb

@@ -19,7 +19,7 @@ module GeoMasterJp
           return
         end
         YAML.load_file("#{__dir__}/data/prefectures.yml").each do |prefecture|
-          GeoMasterJp::Prefecture.create(prefecture)
+          GeoMasterJp::Prefecture.create!(prefecture)
         end
 
         puts "Set Prefecture is complete."
@@ -45,13 +45,13 @@ module GeoMasterJp
               if town_rows[0][26] == '2' # 変更
                 city = set_city(city, town_rows[0])
 
-                city.save
+                city.save!
               end
             else # 新規
               city = prefecture.cities.build(code: city_code)
               city = set_city(city, town_rows[0])
 
-              city.save
+              city.save!
             end
 
             towns[city.code] = []
@@ -63,7 +63,7 @@ module GeoMasterJp
                   town = set_town(town, row)
                   town.city = city
 
-                  town.save
+                  town.save!
                 elsif town_row[26] == '3' # 廃止
                   town.update!(deleted_at: Time.current)
                 end

data/lib/generators/geo_master_jp/install_migration_generator.rb

@@ -17,11 +17,14 @@ module GeoMasterJp
       def create_migration_file
         templates = ['create_versions']
         if GeoMasterJp.config.use_models.include?(:area)
-          templates += ['create_prefectures', 'create_cities', 'create_towns', 'create_versions']
+          templates += ['create_prefectures', 'create_cities', 'create_towns']
         end
         if GeoMasterJp.config.use_models.include?(:railway)
           templates += ['create_prefectures', 'create_cities', 'create_towns', 'create_railway_companies', 'create_lines', 'create_stations', 'create_station_connections']
         end
+        if GeoMasterJp.config.use_models.include?(:area) && GeoMasterJp.config.use_models.include?(:railway)
+          templates += ['create_prefectures_lines']
+        end
 
         migration_dir = File.expand_path("db/migrate")
         templates.each do |template|

data/lib/generators/geo_master_jp/install_railway_data_generator.rb

@@ -24,7 +24,7 @@ module GeoMasterJp
         csv_data.each do |row|
           railway_company = GeoMasterJp::RailwayCompany.find_by(code: format('%03d', row[0].to_i)) || GeoMasterJp::RailwayCompany.new
           railway_company = set_railway_company(railway_company, row)
-          railway_company.save
+          railway_company.save!
         end
 
         GeoMasterJp::Version.create!(model_name_string: GeoMasterJp::RailwayCompany.to_s, version: Date.parse(RAILWAY_COMPANY_VERSION))
@@ -48,7 +48,7 @@ module GeoMasterJp
           rows.each do |row|
             line = GeoMasterJp::Line.find_by(code: format('%05d', row[0].to_i)) || railway_company.lines.build
             line = set_line(line, row)
-            line.save
+            line.save!
           end
         end
 
@@ -73,7 +73,7 @@ module GeoMasterJp
           rows.each do |row|
             station = GeoMasterJp::Station.find_by(code: format('%07d', row[0].to_i)) || line.stations.build
             station = set_station(station, row)
-            station.save
+            station.save!
           end
         end
 
@@ -89,25 +89,31 @@ module GeoMasterJp
           return
         end
 
+        # 接続にはステータスがないため、全削除して再登録
+        GeoMasterJp::StationConnection.delete_all
+
         csv_data = get_railway_data("join#{STATION_CONNECTION_VERSION}.csv")
 
         csv_data_each_line_code = csv_data.group_by{|row| format('%05d', row[0].to_i)}
         csv_data_each_line_code.each_with_index do |(line_code, rows), idx|
           print "Setting StationConnection ...#{idx+1}/#{csv_data_each_line_code.count}\r"
 
-          line = GeoMasterJp::Line.find_by(code: line_code)
           rows.each do |row|
-            station_1 = GeoMasterJp::Station.find_by(code: format('%07d', row[1].to_i))
-            station_2 = GeoMasterJp::Station.find_by(code: format('%07d', row[2].to_i))
-
-            next if station_1.blank? || station_2.blank?
-
-            station_connection = GeoMasterJp::StationConnection.new
-            station_connection.line = line
-            station_connection.station_1 = station_1
-            station_connection.station_2 = station_2
-
-            station_connection.save
+            station_1_code = format('%07d', row[1].to_i)
+            station_2_code = format('%07d', row[2].to_i)
+
+            next if GeoMasterJp::Station.find_by(code: station_1_code).blank? || GeoMasterJp::Station.find_by(code: station_2_code).blank?
+
+            station_connection = GeoMasterJp::StationConnection.new(
+              geo_master_jp_line_code: line_code,
+              geo_master_jp_station_1_code: station_1_code,
+              geo_master_jp_station_2_code: station_2_code,
+            ).save!
+            station_connection = GeoMasterJp::StationConnection.new(
+              geo_master_jp_line_code: line_code,
+              geo_master_jp_station_1_code: station_2_code,
+              geo_master_jp_station_2_code: station_1_code,
+            ).save!
           end
         end
 
@@ -117,6 +123,30 @@ module GeoMasterJp
         puts "Set StationConnection is complete."
       end
 
+      def set_prefectures_lines
+        return unless GeoMasterJp.config.use_models.include?(:area)
+        if GeoMasterJp::Prefecture.count == 0
+          puts "PrefectureLines is skipped as Prefecture is not imported."
+          return
+        end
+
+        if GeoMasterJp::Version.last_version('GeoMasterJp::PrefecturesLine').present? && GeoMasterJp::Version.last_version(GeoMasterJp::Line) >= Date.parse(LINE_VERSION)
+          puts "PrefectureLines is already latest version and skip."
+          return
+        end
+
+        GeoMasterJp::Line.all.each_with_index do |line, idx|
+          print "Setting PrefecturesLine ...#{idx+1}/#{GeoMasterJp::Line.count}\r"
+          prefecture_codes = line.stations.group(:geo_master_jp_prefecture_code).pluck(:geo_master_jp_prefecture_code)
+          prefecture_codes.each {|prefecture_code| line.prefectures_lines.create(geo_master_jp_prefecture_code: prefecture_code)}
+        end
+
+        GeoMasterJp::Version.create!(model_name_string: 'GeoMasterJp::PrefecturesLine', version: Date.parse(LINE_VERSION))
+
+        print "\n"
+        puts "Set PrefecturesLine is complete."
+      end
+
       private
 
         def set_railway_company(railway_company, row)

data/lib/generators/geo_master_jp/templates/create_prefectures_lines.rb.erb

@@ -0,0 +1,12 @@
+class CreatePrefecturesLines < ActiveRecord::Migration<%= migration_version %>
+  def change
+    create_table :geo_master_jp_prefectures_lines do |t|
+      t.string :geo_master_jp_line_code,       null: false, index: true, foreign_key: true
+      t.string :geo_master_jp_prefecture_code, null: false, index: true, foreign_key: true
+
+      t.timestamps index: true
+    end
+    add_foreign_key :geo_master_jp_prefectures_lines, :geo_master_jp_lines,       column: :geo_master_jp_line_code,       primary_key: :code
+    add_foreign_key :geo_master_jp_prefectures_lines, :geo_master_jp_prefectures, column: :geo_master_jp_prefecture_code, primary_key: :code
+  end
+end

data/lib/generators/geo_master_jp/templates/geo_master_jp.rb

@@ -13,6 +13,9 @@ GeoMasterJp.configure do |config|
   # Use Models
   # config.use_models = [:area, :railway]
 
+  # Use APIs
+  # config.use_apis = [:area, :railway]
+
   # API Filters
   # config.api.prefectures_filter = ->(prefectures) {
   #   prefecture_codes = ['11', '12', '13', '14']

data/lib/geo_master_jp/config.rb

@@ -9,11 +9,12 @@ module GeoMasterJp
 
   class Config
     # Variables detail is writen in lib/generators/templates/geo_master_jp.rb.
-    attr_accessor :alternative_class_names, :use_models, :api
+    attr_accessor :alternative_class_names, :use_models, :use_apis, :api
 
     def initialize
       @alternative_class_names = {}
       @use_models = [:area, :railway]
+      @use_apis = [:area, :railway]
       @api = API.new
     end
 

data/lib/geo_master_jp/version.rb

@@ -1,3 +1,3 @@
 module GeoMasterJp
-  VERSION = '0.1.29'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: geo_master_jp
 version: !ruby/object:Gem::Version
-  version: 0.1.29
+  version: 0.2.0
 platform: ruby
 authors:
 - ykogure
@@ -92,9 +92,11 @@ files:
 - Rakefile
 - app/controllers/geo_master_jp/application_controller.rb
 - app/controllers/geo_master_jp/area_api_controller.rb
+- app/controllers/geo_master_jp/railway_api_controller.rb
 - app/models/geo_master_jp/city.rb
 - app/models/geo_master_jp/line.rb
 - app/models/geo_master_jp/prefecture.rb
+- app/models/geo_master_jp/prefectures_line.rb
 - app/models/geo_master_jp/railway_company.rb
 - app/models/geo_master_jp/station.rb
 - app/models/geo_master_jp/station_connection.rb
@@ -113,6 +115,7 @@ files:
 - lib/generators/geo_master_jp/templates/create_cities.rb.erb
 - lib/generators/geo_master_jp/templates/create_lines.rb.erb
 - lib/generators/geo_master_jp/templates/create_prefectures.rb.erb
+- lib/generators/geo_master_jp/templates/create_prefectures_lines.rb.erb
 - lib/generators/geo_master_jp/templates/create_railway_companies.rb.erb
 - lib/generators/geo_master_jp/templates/create_station_connections.rb.erb
 - lib/generators/geo_master_jp/templates/create_stations.rb.erb