Add B/W locations. #375

English and Japanese. Woo!

The text dump contained a bunch of duplicate location names (possibly
for the Entralink?).  I've merged them in the locations table, but
location_game_indices still has the duplicates—that is, a location can
now have multiple game_index values in one generation (necessitating a
small schema change).

diff --git a/pokedex/data/csv/location_game_indices.csv b/pokedex/data/csv/location_game_indices.csv
index 798db39..51d03d6 100644 (file)
--- a/pokedex/data/csv/location_game_indices.csv
+++ b/pokedex/data/csv/location_game_indices.csv
@@ -324,3 +324,118 @@ location_id,generation_id,game_index
 341,4,3076
 342,4,2013
 343,4,2014
 341,4,3076
 342,4,2013
 343,4,2014

+344,5,1
+345,5,2
+346,5,4
+346,5,81
+347,5,5
+348,5,6
+349,5,7
+350,5,8
+351,5,9
+351,5,76
+352,5,10
+352,5,77
+353,5,11
+353,5,78
+354,5,12
+354,5,79
+355,5,13
+355,5,80
+356,5,14
+357,5,15
+358,5,16
+359,5,17
+360,5,18
+360,5,93
+361,5,19
+361,5,94
+362,5,20
+362,5,95
+363,5,21
+363,5,96
+364,5,22
+364,5,97
+365,5,23
+366,5,24
+366,5,98
+367,5,25
+367,5,99
+368,5,26
+368,5,100
+369,5,27
+369,5,101
+370,5,28
+370,5,102
+371,5,29
+371,5,103
+372,5,30
+373,5,31
+374,5,32
+375,5,33
+376,5,34
+377,5,35
+378,5,36
+378,5,84
+379,5,37
+379,5,85
+380,5,38
+380,5,86
+381,5,39
+381,5,87
+382,5,40
+383,5,41
+383,5,104
+384,5,42
+384,5,105
+385,5,43
+386,5,44
+387,5,45
+388,5,46
+389,5,47
+390,5,48
+391,5,49
+392,5,50
+392,5,83
+393,5,51
+393,5,82
+394,5,52
+395,5,53
+396,5,54
+397,5,55
+398,5,56
+399,5,57
+400,5,58
+401,5,59
+402,5,60
+403,5,61
+403,5,88
+404,5,62
+405,5,63
+406,5,64
+407,5,65
+407,5,89
+408,5,66
+408,5,90
+409,5,67
+409,5,91
+410,5,68
+410,5,92
+411,5,69
+412,5,70
+413,5,71
+414,5,72
+415,5,73
+416,5,74
+417,5,75
+418,5,106
+419,5,107
+420,5,108
+421,5,109
+422,5,110
+423,5,111
+424,5,112
+425,5,113
+426,5,114
+427,5,115
+428,5,116

diff --git a/pokedex/data/csv/location_names.csv b/pokedex/data/csv/location_names.csv
index ae74b6a..c8d607d 100644 (file)
--- a/pokedex/data/csv/location_names.csv
+++ b/pokedex/data/csv/location_names.csv
@@ -331,3 +331,173 @@ location_id,local_language_id,name
 341,9,Concert Event
 342,9,Mr. Pokémon
 343,9,Primo
 341,9,Concert Event
 342,9,Mr. Pokémon
 343,9,Primo

+344,1,なぞの場所
+344,9,Mystery Zone
+345,1,遠い場所
+345,9,Faraway place
+346,1,カノコタウン
+346,9,Nuvema Town
+347,1,カラクサタウン
+347,9,Accumula Town
+348,1,サンヨウシティ
+348,9,Striaton City
+349,1,シッポウシティ
+349,9,Nacrene City
+350,1,ヒウンシティ
+350,9,Castelia City
+351,1,ライモンシティ
+351,9,Nimbasa City
+352,1,ホドモエシティ
+352,9,Driftveil City
+353,1,フキヨセシティ
+353,9,Mistralton City
+354,1,セッカシティ
+354,9,Icirrus City
+355,1,ソウリュウシティ
+355,9,Opelucid City
+356,1,１番道路
+356,9,Route 1
+357,1,２番道路
+357,9,Route 2
+358,1,３番道路
+358,9,Route 3
+359,1,４番道路
+359,9,Route 4
+360,1,５番道路
+360,9,Route 5
+361,1,６番道路
+361,9,Route 6
+362,1,７番道路
+362,9,Route 7
+363,1,８番道路
+363,9,Route 8
+364,1,９番道路
+364,9,Route 9
+365,1,１０番道路
+365,9,Route 10
+366,1,１１番道路
+366,9,Route 11
+367,1,１２番道路
+367,9,Route 12
+368,1,１３番道路
+368,9,Route 13
+369,1,１４番道路
+369,9,Route 14
+370,1,１５番道路
+370,9,Route 15
+371,1,１６番道路
+371,9,Route 16
+372,1,１７番水道
+372,9,Route 17
+373,1,１８番道路
+373,9,Route 18
+374,1,夢の跡地
+374,9,Dreamyard
+375,1,ヤグルマの森
+375,9,Pinwheel Forest
+376,1,リゾートデザート
+376,9,Desert Resort
+377,1,古代の城
+377,9,Relic Castle
+378,1,冷凍コンテナ
+378,9,Cold Storage
+379,1,電気石の洞穴
+379,9,Chargestone Cave
+380,1,ネジ山
+380,9,Twist Mountain
+381,1,リュウラセンの塔
+381,9,Dragonspiral Tower
+382,1,チャンピオンロード
+382,9,Victory Road
+383,1,カゴメタウン
+383,9,Lacunosa Town
+384,1,サザナミタウン
+384,9,Undella Town
+385,1,カナワタウン
+385,9,Anville Town
+386,1,ポケモンリーグ
+386,9,Pokémon League
+387,1,Ｎの城
+387,9,N's Castle
+388,1,ロイヤルイッシュ号
+388,9,Royal Unova
+389,1,ギアステーション
+389,9,Gear Station
+390,1,バトルサブウェイ
+390,9,Battle Subway
+391,1,ミュージカルホール
+391,9,Musical Theater
+392,1,ブラックシティ
+392,9,Black City
+393,1,ホワイトフォレスト
+393,9,White Forest
+394,1,ユナイテッドタワー
+394,9,Unity Tower
+395,1,地下水脈の穴
+395,9,Wellspring Cave
+396,1,フキヨセの洞穴
+396,9,Mistralton Cave
+397,1,思索の原
+397,9,Rumination Field
+398,1,タワーオブヘブン
+398,9,Celestial Tower
+399,1,セッカの湿原
+399,9,Moor of Icirrus
+400,1,ショッピングモール
+400,9,Shopping Mall
+401,1,修行の岩屋
+401,9,Challenger's Cave
+402,1,シフトファクトリー
+402,9,Poké Transfer Lab
+403,1,ジャイアントホール
+403,9,Giant Chasm
+404,1,リバティガーデン島
+404,9,Liberty Garden
+405,1,Ｐ２ラボ
+405,9,P2 Laboratory
+406,1,スカイアローブリッジ
+406,9,Skyarrow Bridge
+407,1,ホドモエの跳ね橋
+407,9,Driftveil Drawbridge
+408,1,シリンダーブリッジ
+408,9,Tubeline Bridge
+409,1,ビレッジブリッジ
+409,9,Village Bridge
+410,1,ワンダーブリッジ
+410,9,Marvelous Bridge
+411,1,ハイリンク
+411,9,Entralink
+412,1,ほうじょうの社
+412,9,Abundant Shrine
+413,1,サザナミ湾
+413,9,Undella Bay
+414,1,迷いの森
+414,9,Lostlorn Forest
+415,1,試練の室
+415,9,Trial Chamber
+416,1,導の間
+416,9,Guidance Chamber
+417,1,ハイリンクの森
+417,9,Entree Forest
+418,1,カラクサゲート
+418,9,Accumula Gate
+419,1,サザナミゲート
+419,9,Undella Gate
+420,1,シッポウゲート
+420,9,Nacrene Gate
+421,1,ヒウンゲート
+421,9,Castelia Gate
+422,1,ライモンゲート
+422,9,Nimbasa Gate
+423,1,ソウリュウゲート
+423,9,Opelucid Gate
+424,1,ブラックゲート
+424,9,Black Gate
+425,1,ホワイトゲート
+425,9,White Gate
+426,1,ブリッジゲート
+426,9,Bridge Gate
+427,1,ロードゲート
+427,9,Route Gate
+428,1,海底遺跡
+428,9,Abyssal Ruins

diff --git a/pokedex/data/csv/locations.csv b/pokedex/data/csv/locations.csv
index bca61c5..9215e81 100644 (file)
--- a/pokedex/data/csv/locations.csv
+++ b/pokedex/data/csv/locations.csv
@@ -331,3 +331,88 @@ id,region_id,identifier
 341,,concert-event
 342,,mr-pokemon
 343,,primo
 341,,concert-event
 342,,mr-pokemon
 343,,primo

+344,5,mystery-zone
+345,5,faraway-place
+346,5,nuvema-town
+347,5,accumula-town
+348,5,striaton-city
+349,5,nacrene-city
+350,5,castelia-city
+351,5,nimbasa-city
+352,5,driftveil-city
+353,5,mistralton-city
+354,5,icirrus-city
+355,5,opelucid-city
+356,5,route-1
+357,5,route-2
+358,5,route-3
+359,5,route-4
+360,5,route-5
+361,5,route-6
+362,5,route-7
+363,5,route-8
+364,5,route-9
+365,5,route-10
+366,5,route-11
+367,5,route-12
+368,5,route-13
+369,5,route-14
+370,5,route-15
+371,5,route-16
+372,5,route-17
+373,5,route-18
+374,5,dreamyard
+375,5,pinwheel-forest
+376,5,desert-resort
+377,5,relic-castle
+378,5,cold-storage
+379,5,chargestone-cave
+380,5,twist-mountain
+381,5,dragonspiral-tower
+382,5,victory-road
+383,5,lacunosa-town
+384,5,undella-town
+385,5,anville-town
+386,5,pokemon-league
+387,5,ns-castle
+388,5,royal-unova
+389,5,gear-station
+390,5,battle-subway
+391,5,musical-theater
+392,5,black-city
+393,5,white-forest
+394,5,unity-tower
+395,5,wellspring-cave
+396,5,mistralton-cave
+397,5,rumination-field
+398,5,celestial-tower
+399,5,moor-of-icirrus
+400,5,shopping-mall
+401,5,challengers-cave
+402,5,poke-transfer-lab
+403,5,giant-chasm
+404,5,liberty-garden
+405,5,p2-laboratory
+406,5,skyarrow-bridge
+407,5,driftveil-drawbridge
+408,5,tubeline-bridge
+409,5,village-bridge
+410,5,marvelous-bridge
+411,5,entralink
+412,5,abundant-shrine
+413,5,undella-bay
+414,5,lostlorn-forest
+415,5,trial-chamber
+416,5,guidance-chamber
+417,5,entree-forest
+418,5,accumula-gate
+419,5,undella-gate
+420,5,nacrene-gate
+421,5,castelia-gate
+422,5,nimbasa-gate
+423,5,opelucid-gate
+424,5,black-gate
+425,5,white-gate
+426,5,bridge-gate
+427,5,route-gate
+428,5,abyssal-ruins

diff --git a/pokedex/db/tables.py b/pokedex/db/tables.py
index 0f0ef73..8e4ca42 100644 (file)
--- a/pokedex/db/tables.py
+++ b/pokedex/db/tables.py
@@ -668,7 +668,7 @@ class LocationGameIndex(TableBase):
         info=dict(description="Database ID of the locaion"))
     generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False, primary_key=True,
         info=dict(description="ID of the generation this entry to"))
         info=dict(description="Database ID of the locaion"))
     generation_id = Column(Integer, ForeignKey('generations.id'), nullable=False, primary_key=True,
         info=dict(description="ID of the generation this entry to"))

-    game_index = Column(Integer, nullable=False,
+    game_index = Column(Integer, nullable=False, primary_key=True, autoincrement=False,

         info=dict(description="Internal game ID of the location"))
 
 class Machine(TableBase):
         info=dict(description="Internal game ID of the location"))
 
 class Machine(TableBase):