worlddb-models 2.2.1 → 2.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7166c33111b731ecc3e9199970da99ff49b725e
-  data.tar.gz: 230f400cbcc9d7586ffc12558aacdac894ae3947
+  metadata.gz: e9b1bdb5484b5c74ef690b349dfd92dbb7fbd5d2
+  data.tar.gz: ed1e496ec5d29624d915dd9e93559eda99ead12e
 SHA512:
-  metadata.gz: 0e9eeaa6e6803d5ae28d531f805ba38bf93f11c614fbbbd994e2c17321ed2f442376f851277befb1a156625ca8eb33a3991083b0a1d713185ef393dfce16c972
-  data.tar.gz: f7fb67fd482e3909c51fcd7bee5aa8f61da3dc34c270bb17021d3775ccff7518687f98a606310901d895d39626b722f6f89ede93d4c2989bbf13c33fecb7745e
+  metadata.gz: 9ddd1c5c80416d77525a33cf1a54a79d953c2bc4303f7d305e0790b9d578990be7cfaf76576b5e2d9fc17ebc46f2bf3d353aa25d68771a8fb13a68f074a944e4
+  data.tar.gz: 8098bfbbbdaf6e23f47fe26a02315747581130c97455b2521cf4264d352c0d95f435dab6d8fe128b410ec1d839e6d423e1f937effef8a42771f51d7a72cadf68

data/Manifest.txt

@@ -34,7 +34,19 @@ lib/worlddb/readers/usage.rb
 lib/worlddb/schema.rb
 lib/worlddb/stats.rb
 lib/worlddb/version.rb
+test/data/at-austria/1--b-burgenland/counties.txt
+test/data/at-austria/2--n-niederoesterreich/counties.txt
+test/data/at-austria/3--w-wien/counties.txt
+test/data/at-austria/setups/adm.txt
+test/data/at-austria/states.txt
+test/data/de-deutschland/3--by-bayern/1--oberbayern/counties.txt
+test/data/de-deutschland/3--by-bayern/4--oberfranken/counties.txt
+test/data/de-deutschland/3--by-bayern/districts.txt
+test/data/de-deutschland/setups/adm.txt
+test/data/de-deutschland/states.txt
 test/helper.rb
+test/test_fixture_matcher_adm2.rb
+test/test_fixture_matcher_adm3.rb
 test/test_fixture_matchers.rb
 test/test_fixture_matchers_ii.rb
 test/test_model_city.rb
@@ -42,3 +54,4 @@ test/test_model_comp.rb
 test/test_model_country.rb
 test/test_model_region.rb
 test/test_models.rb
+test/test_read_adm.rb

data/lib/worlddb/matcher.rb

@@ -4,14 +4,19 @@ module WorldDb
 
 module Matcher
 
+  # note: returns code as capture
   WORLD_COUNTRY_CODE_PATTERN    = '([a-z]{2,3})'
   WORLD_COUNTRY_CLASSIC_PATTERN = "#{WORLD_COUNTRY_CODE_PATTERN}-[^\\/]+"          ## note: if you use "" need to double escape backslash!!!
   WORLD_COUNTRY_MODERN_PATTERN  = "[0-9]+--#{WORLD_COUNTRY_CODE_PATTERN}-[^\\/]+"  ## note: if you use "" need to double escape backslash!!!
 
+  # note: returns code as capture
   WORLD_REGION_CODE_PATTERN     = '([a-z]{1,3})'
   WORLD_REGION_CLASSIC_PATTERN  = "#{WORLD_REGION_CODE_PATTERN}-[^\\/]+"
   WORLD_REGION_MODERN_PATTERN   = "[0-9]+--#{WORLD_REGION_CODE_PATTERN}-[^\\/]+"
 
+  # note: returns name as capture (no code required)
+  WORLD_ADMIN_MODERN_PATTERN    = "[0-9]+--([^\\/]+)"
+
     ## allow optional folders -- TODO: add restriction ?? e.g. must be 4+ alphas ???
   WORLD_OPT_FOLDERS_PATTERN      = "(?:\\/[^\\/]+)*"     ## check: use double \\ or just \ ??
 
@@ -100,6 +105,68 @@ module Matcher
   end
 
 
+
+  def match_xxx_for_country_n_adm1( name, xxx ) # xxx e.g. districts|counties|etc.
+
+    # auto-add required country n regions (from folder structure)
+    #
+    #  e.g.  de-deutschland!/3--by-bayern/districts  (regierungsbezirke)
+    #        europe/de-deutschland!/3--by-bayern/districts
+    #
+    #    at-austria!/1--n-niederoesterreich/counties  (bezirke)
+
+    xxx_pattern           = "#{xxx}"
+
+    if name =~ /(?:^|\/)#{WORLD_COUNTRY_CLASSIC_PATTERN}\/#{WORLD_REGION_MODERN_PATTERN}\/#{xxx_pattern}/  ||
+       name =~ /(?:^|\/)#{WORLD_COUNTRY_CLASSIC_PATTERN}\/#{WORLD_REGION_CLASSIC_PATTERN}\/#{xxx_pattern}/
+
+      country_key = $1.dup
+      region_key  = $2.dup
+      yield( country_key, region_key )
+      true # bingo - match found
+    else
+      false # no match found
+    end
+  end
+
+
+  def match_xxx_for_country_n_adm1_n_adm2( name, xxx ) # xxx e.g. districts|counties|etc.
+
+    # auto-add required country n regions (from folder structure)
+    #
+    #  e.g.  de-deutschland!/3--by-bayern/4--oberfranken/counties  (landkreise)
+    #        europe/de-deutschland!/3--by-bayern/4--oberfranken/counties
+
+    xxx_pattern           = "#{xxx}"
+
+    if name =~ /(?:^|\/)#{WORLD_COUNTRY_CLASSIC_PATTERN}\/#{WORLD_REGION_MODERN_PATTERN}\/#{WORLD_ADMIN_MODERN_PATTERN}\/#{xxx_pattern}/  ||
+       name =~ /(?:^|\/)#{WORLD_COUNTRY_CLASSIC_PATTERN}\/#{WORLD_REGION_CLASSIC_PATTERN}\/#{WORLD_ADMIN_MODERN_PATTERN}\/#{xxx_pattern}/
+
+      country_key = $1.dup
+      region_key  = $2.dup
+      adm2        = $3.dup   # lowercase name e.g. oberfranken, oberbayern, etc.
+      yield( country_key, region_key, adm2 )
+      true # bingo - match found
+    else
+      false # no match found
+    end
+  end
+
+
+  def match_adm2_for_country( name, &blk )
+    ## note: also try synonyms e.g. districts|counties
+    ## note: counties might also be an adm3 match
+    found = match_xxx_for_country_n_adm1( name, 'districts', &blk )
+    found = match_xxx_for_country_n_adm1( name, 'counties', &blk ) unless found
+    found
+  end
+
+  def match_adm3_for_country( name, &blk )
+    match_xxx_for_country_n_adm1_n_adm2( name, 'counties', &blk )
+  end
+
+
+
   def match_cities_for_country( name, &blk )
     ## todo: check if there's a better (more ruby way) to pass along code block ??
     ## e.g. try

data/lib/worlddb/models/country.rb

@@ -29,6 +29,9 @@ class Country < ActiveRecord::Base
   ## self referencing hierachy within countries e.g. EU > GB > EN
   belongs_to :parent,    class_name: 'Country', foreign_key: 'country_id'
   has_many   :countries, class_name: 'Country', foreign_key: 'country_id'
+  ### recursive self-reference - use node??
+  ## has_many :nodes, class_name: 'Region', foregin_key: 'region_id'
+
 
   has_many_tags
 

data/lib/worlddb/models/region.rb

@@ -22,6 +22,11 @@ class Region < ActiveRecord::Base
   validates :key,  format: { with: /#{REGION_KEY_PATTERN}/,  message: REGION_KEY_PATTERN_MESSAGE }
   validates :code, format: { with: /#{REGION_CODE_PATTERN}/, message: REGION_CODE_PATTERN_MESSAGE }, allow_nil: true
 
+  ### recursive self-reference - use "generic" node??
+  ## has_many :nodes, class_name: 'Region', foregin_key: 'region_id'
+  belongs_to :parent,  class_name: 'Region', foreign_key: 'region_id'
+  has_many   :regions, class_name: 'Region', foreign_key: 'region_id'  ## subregions
+
 
   before_create :on_create
   before_update :on_update
@@ -36,8 +41,18 @@ class Region < ActiveRecord::Base
     place.update_attributes!( name: name, kind: place_kind )
   end
 
+  def is_district?()  d? == true; end
+  def is_county?()    c? == true; end
+
   def place_kind   # use place_kind_of_code ??
-    'ADM1'
+    ### fix: use "generic" level counter - make it a database field (default/top level is 1)
+    if is_district?
+      'ADM2'
+    elsif is_county?
+      'ADM3'
+    else
+      'ADM1'
+    end
   end
 
 

data/lib/worlddb/reader.rb

@@ -94,12 +94,41 @@ class ReaderBase
     elsif match_regions_nuts_for_country( name ) do |country_key|  # name =~ /\/([a-z]{2})\/regions\.nuts/
             load_regions_xxx( country_key, 'nuts', name )
           end
+    elsif match_adm3_for_country( name ) do |country_key,region_key,adm2_name|
+            ## auto-add required country code (from folder structure)
+            country = Country.find_by_key!( country_key )
+            logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
+            region  = Region.find_by_key_and_country_id!( region_key, country.id )
+            logger.debug "Region (Adm1) #{region.key} >#{region.title}<"
+            ### todo: move find adm2 to model for (re)use !!!
+            adm2    = Region.where( "lower(name) = ? AND country_id = ?",
+                                     adm2_name, country.id ).first   ## check - first needed? returns ary??
+            if adm2.nil?
+              puts "*** error/warn: fix - skipping adm3 - adm2 '#{adm2_name}' not found"
+              next
+            end
+            logger.debug "Region (Adm2) #{adm2.key} >#{adm2.title}<"
+
+            r = create_region_reader( name, country_id: country.id, region_id: adm2.id, level:3, c:true )
+            r.read()
+          end
+    elsif match_adm2_for_country( name ) do |country_key,region_key|
+            ## auto-add required country code (from folder structure)
+            country = Country.find_by_key!( country_key )
+            logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
+            region  = Region.find_by_key_and_country_id!( region_key, country.id )
+            logger.debug "Region (Adm1) #{region.key} >#{region.title}<"
+
+            r = create_region_reader( name, country_id: country.id, region_id: region.id, level:2, d:true )
+            r.read()
+          end
+    ### fix: change to match_adm1_for_country()
     elsif match_regions_for_country( name ) do |country_key|  # name =~ /\/([a-z]{2})\/regions/
             ## auto-add required country code (from folder structure)
             country = Country.find_by_key!( country_key )
             logger.debug "Country #{country.key} >#{country.title} (#{country.code})<"
 
-            r = create_region_reader( name, country_id: country.id )
+            r = create_region_reader( name, country_id: country.id, region_id: nil, level:1, s:true )
             r.read()
           end
     else

data/lib/worlddb/reader_file.rb

@@ -19,14 +19,14 @@ class Reader < ReaderBase
   end
 
   def create_lang_reader( name )
-    path = "#{@include_path}/#{name}.yml"   ## hash reader - use .yml??
+    path = "#{@include_path}/#{path_to_real_path(name)}.yml"   ## hash reader - use .yml??    
     logger.info "parsing data (lang) '#{name}' (#{path})..."
 
     LangReader.from_file( path )
   end
 
   def create_usage_reader( name )
-    path = "#{@include_path}/#{name}.yml"   ## hash reader - use .yml??
+    path = "#{@include_path}/#{path_to_real_path(name)}.yml"   ## hash reader - use .yml??
     logger.info "parsing data (usage) '#{name}' (#{path})..."
 
     UsageReader.from_file( path )
@@ -34,21 +34,22 @@ class Reader < ReaderBase
 
 
   def create_country_reader( name, more_attribs={} )
-    path = "#{@include_path}/#{name}.txt"
+    path = "#{@include_path}/#{path_to_real_path(name)}.txt"
     logger.info "parsing data (country) '#{name}' (#{path})..."
 
     CountryReader.from_file( path, more_attribs )
   end
 
   def create_region_reader( name, more_attribs={} )
-    path = "#{@include_path}/#{name}.txt"
+    path = "#{@include_path}/#{path_to_real_path(name)}.txt"
+
     logger.info "parsing data (region) '#{name}' (#{path})..."
 
     RegionReader.from_file( path, more_attribs )
   end
 
   def create_city_reader( name, more_attribs={} )
-    path = "#{@include_path}/#{name}.txt"
+    path = "#{@include_path}/#{path_to_real_path(name)}.txt"
     logger.info "parsing data (city) '#{name}' (#{path})..."
 
     CityReader.from_file( path, more_attribs )
@@ -56,21 +57,21 @@ class Reader < ReaderBase
 
 
   def create_hash_reader( name )
-    path = "#{@include_path}/#{name}.yml"
+    path = "#{@include_path}/#{path_to_real_path(name)}.yml"
     logger.info "parsing data (hash) '#{name}' (#{path})..."
 
     HashReader.from_file( path )
   end
 
   def create_values_reader( name, more_attribs={} )
-    path = "#{@include_path}/#{name}.txt"
+    path = "#{@include_path}/#{path_to_real_path(name)}.txt"
     logger.info "parsing data (values) '#{name}' (#{path})..."
 
     ValuesReader.from_file( path, more_attribs )
   end
 
   def create_line_reader( name )
-    path = "#{@include_path}/#{name}.txt"
+    path = "#{@include_path}/#{path_to_real_path(name)}.txt"
     logger.info "parsing data (line) '#{name}' (#{path})..."
 
     LineReader.from_file( path )
@@ -82,5 +83,22 @@ class Reader < ReaderBase
 #  end
 
 
+private
+
+  def path_to_real_path( path )
+    # map name to name_real_path
+    # name might include !/ for virtual path (gets cut off)
+    # e.g. at-austria!/w-wien/beers becomse w-wien/beers
+    pos = path.index( '!/')
+    if pos.nil?
+      path # not found; real path is the same as name
+    else
+      # cut off everything until !/ e.g.
+      # at-austria!/w-wien/beers becomes
+      # w-wien/beers
+      path[ (pos+2)..-1 ]
+    end
+  end
+
 end # class Reader
 end # module WorldDb

data/lib/worlddb/schema.rb

@@ -98,6 +98,7 @@ create_table :countries do |t|
   t.references :country    # for supra(nationals) n depend(encies)
 
   ## flags (use single int named flags - why? why not?  
+  ### fix: use a generic kind string type flag!!!!!!
   t.boolean :s,  null: false, default: false   # supra(national) flag e.g. eu
   t.boolean :c,  null: false, default: false   # country flag (is this needed?)
   t.boolean :d,  null: false, default: false   # dependency flag
@@ -127,8 +128,20 @@ add_index :countries, :key,  unique: true
 add_index :countries, :code, unique: true
 
 
+## kind of regions/states but not hierachical (used for tourist/colloquial zones etc.)
+#    uses many-to-many join tables w/ cities n regions
+#
+#  examples:
+#    Salzkammergut (part of Salzburg and Oberoesterreich)
+#  others
+#   Oberfranken -> Fichtelgebierge/Fraenkische Schweiz/etc.
+create_table :zones do |t|
+  # to be done
+end
+
+
 ######
-# NB: rename to adms/admins ??
+# NB: rename to adms/admins ?? or use states ???
 #
 # used for state/provice/land/regioni/etc.
 create_table :regions do |t|
@@ -140,15 +153,35 @@ create_table :regions do |t|
   t.string :iso      # iso code
   t.string :nuts     # nuts code (europe/eu only)
   t.string     :alt_names  # comma separated list of alternate names (synonyms)
+
   t.references :country,  null: false
+  t.references :region    ## parent region (optional for now - may be null for top level e.g. state/province)
+  t.integer    :level,    null: false, default: 1  # default assumes 1 e.g. state/province/etc.
+  ### change to l (instead of level)!!!! - shorter, why, why not???
+
+  ## flags (use single int named flags - why? why not?  
+  ### fix: use a generic kind string type flag!!!!!!
+  t.boolean :s,  null: false, default: false   # state flag (use adm1? or a1)
+  t.boolean :d,  null: false, default: false   # governmental district falg (use adm2? or a2)  - check is Oberfranken/Oberbayern admin2 in Bayern (DE) ?? - note: might be optional (than adm3 becomes adm2)
+  t.boolean :c,  null: false, default: false   # county (or bezirk etc.) (use adm3? or a3?)
+
+
   t.integer :pop     # optional population count
   t.integer :area    # optional area in square km (sq. km)
   t.timestamps
 end
 
+### fix: add kind to unique ???
 add_index :regions, [:key, :country_id], unique: true
 
 
+
+create_table :city_rels do |t|   ## city relationships (w/ regions) -- part of region/zone
+  t.references :city,   null: false
+  t.references :region  ## optional ?? either region or zone ?? use polymorphic assoc or use node w/ kind for place?
+  t.references :zone    ## tourist zone e.g. fraenkische schweiz, wachau, steigerwald, etc. - use own join table???
+end
+
 create_table :cities do |t|
   t.string     :name,   null: false
   t.string     :key,    null: false
@@ -166,6 +199,7 @@ create_table :cities do |t|
   ## t.float   :lng   # optional for now  --  FIX: remove?? moved to places
 
   ## flags (use single int named flags - why? why not?    
+  ### fix: use a generic kind string type flag!!!!!!
   t.boolean :m,  null: false, default: false   # metro flag
   t.boolean :c,  null: false, default: false   # city flag (is this needed?)
   t.boolean :d,  null: false, default: false   # district flag

data/lib/worlddb/version.rb

@@ -5,7 +5,7 @@ module WorldDb
   # sync version w/ sport.db n friends - why? why not?
   MAJOR = 2 ## todo: namespace inside version or something - why? why not??
   MINOR = 2
-  PATCH = 1
+  PATCH = 2
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/data/at-austria/1--b-burgenland/counties.txt

@@ -0,0 +1,20 @@
+##  Burgenland (B)
+#
+## 2 Statutarstädte  - Eisenstadt, Rust
+## 7 Bezirke
+##
+##  13 Städte
+##  171 Gemeinden
+##  328 Ortschaften
+
+
+e,    Eisenstadt,          Eisenstadt,         43 km²
+eu,   Eisenstadt-Umgebung, Eisenstadt,        453 km²
+gs,   Güssing,             Güssing,           485 km²
+je,   Jennersdorf,         Jennersdorf,       253 km²
+ma,   Mattersburg,         Mattersburg,       238 km²
+nd,   Neusiedl am See,     Neusiedl am See,  1039 km²
+op,   Oberpullendorf,      Oberpullendorf,    701 km²    ## also known as =>  Mittelburgenland
+ow,   Oberwart,            Oberwart,          733 km²
+eii,  Rust,                Rust,               20 km²    ## also uses E  - what to do for key??
+

data/test/data/at-austria/2--n-niederoesterreich/counties.txt

@@ -0,0 +1,35 @@
+##  Niederoesterreich (N)
+#
+##  ?? Statutarstädte  - 
+##  ?? Bezirke
+##
+##  ?? Städte
+##  ?? Gemeinden
+##  ?? Ortschaften
+
+Krems an der Donau,                 52 km²,   24_085  # KS
+St. Pölten,                        108 km²,   52_145 # P
+Waidhofen an der Ybbs,             132 km²,   11_341 # WY
+Wiener Neustadt,                    61 km²,   42_273  # WN
+Amstetten,                        1188 km²,   112_944 # AM 
+Baden,                             753 km²,   140_078 # BN
+Bruck an der Leitha,               495 km²,   43_615  # BL
+Gänserndorf,                      1271 km²,   97_460  # GF
+Gmünd,                             786 km²,   37_420  # GD
+Hollabrunn,                       1011 km²,   50_065  # HL
+Horn,                              784 km²,   31_273  # HO
+Korneuburg,                        627 km²,   76_370  # KO
+Krems-Land (Krems an der Donau),   924 km²,   55_945  # KR
+Lilienfeld,                        932 km²,   26_040  # LF 
+Melk,                             1014 km²,   76_369  # ME
+Mistelbach,                       1291 km²,   74_150  # MI
+Mödling,                           277 km²,   115_677 # MD   
+Neunkirchen,                      1146 km²,   85_539  # NK 
+St. Pölten-Land (St. Pölten),     1122 km²,   97_365  #  PL
+Scheibbs,                         1023 km²,   41_073   # SB   
+Tulln (Tulln an der Donau),        658 km²,   72_104  # TU  
+Waidhofen an der Thaya,            669 km²,   26_424   # WT
+Wiener Neustadt-Land (Wiener Neustadt),  970 km²,    75_285   # WB  
+Wien-Umgebung (Klosterneuburg),          484 km²,   117_343   # WU, SW (f. Schwechat) 
+Zwettl,                                 1400 km²,    43_102   # ZT
+

data/test/data/at-austria/3--w-wien/counties.txt

@@ -0,0 +1,39 @@
+###
+# use district.txt for name - why, why not??
+#   move to wien.db - why, why not ??
+#
+#  include command \, -- why, why not?? change to - or something ?
+#  use ; as separator - why, why not??
+
+
+## fix: cannot handle comma in title for autokey
+##  e.g.  Wien 1.\, Innere Stadt
+##          becomes
+##        wien1,innerestadt
+
+
+Innere Stadt (Wien 1.)  ### fix/use: Wien 1.\, Innere Stadt
+Leopoldstadt (Wien 2.)  ### fix/use: Wien 2.\, Leopoldstadt
+Landstraße (Wien 3.)    ### fix/use: Wien 3.\, Landstraße
+
+### fix/use: Wien 4.\, Wieden
+### fix/use: Wien 5.\, Margareten
+### fix/use: Wien 6.\, Mariahilf
+### fix/use: Wien 7.\, Neubau
+### fix/use: Wien 8.\, Josefstadt
+### fix/use: Wien 9.\, Alsergrund
+### fix/use: Wien 10.\, Favoriten
+### fix/use: Wien 11.\, Simmering
+### fix/use: Wien 12.\, Meidling
+### fix/use: Wien 13.\, Hietzing
+### fix/use: Wien 14.\, Penzing
+### fix/use: Wien 15.\, Rudolfsheim-Fünfhaus
+### fix/use: Wien 16.\, Ottakring
+### fix/use: Wien 17.\, Hernals
+### fix/use: Wien 18.\, Währing
+### fix/use: Wien 19.\, Döbling
+### fix/use: Wien 20.\, Brigittenau
+### fix/use: Wien 21.\, Floridsdorf
+### fix/use: Wien 22.\, Donaustadt
+### fix/use: Wien 23.\, Liesing
+

data/test/data/at-austria/setups/adm.txt

@@ -0,0 +1,7 @@
+
+at-austria!/states
+at-austria!/1--b-burgenland/counties
+at-austria!/2--n-niederoesterreich/counties
+at-austria!/3--w-wien/counties
+
+

data/test/data/at-austria/states.txt

@@ -0,0 +1,18 @@
+#############################
+# Austria / Österreich (at)
+
+
+# -- 9 Bundesländer
+
+b,  Burgenland,                        Eisenstadt,   3_962 km²,    284_000
+n,  Niederösterreich [Lower Austria],  St. Pölten,  19_186 km²,  1_609_800
+w,  Wien [Vienna],                     Wien,           415 km²,  1_707_000
+
+st, Steiermark [Styria],               Graz,        16_401 km²,  1_208_900
+k,  Kärnten [Carinthia],               Klagenfurt,   9_538 km²,    560_700
+
+o,  Oberösterreich [Upper Austria],    Linz,        11_980 km²,  1_412_300
+s,  Salzburg,                          Salzburg,     7_156 km²,    531_800
+t,  Tirol [Tyrol],                     Innsbruck,   12_640 km²,    708_900
+v,  Vorarlberg,                        Bregenz,      2_601 km²,    370_200
+

data/test/data/de-deutschland/3--by-bayern/1--oberbayern/counties.txt

@@ -0,0 +1,51 @@
+###
+# Oberbayern > Bayern
+#
+# Verwaltungssitz: München
+#
+# Größte Städte: München (1.4m), Ingolstadt (128_300), Rosenheim (61_800),
+#                Freising (45_600), Dachau (44_000), Germering (38_400)
+#
+# Der Regierungsbezirk Oberbayern umfasst
+#
+#  3 kreisfreie Städte - München, Ingolstadt Rosenheim
+#  20 Landkreise
+
+
+m,  München (Kreisefreie Stadt)   ## use (Stadt) ???
+in, Ingolstadt
+ro, Rosenheim (Kreisefreie Stadt)    ## use (Stadt) ???
+
+
+aoe, Altötting
+Bad Tölz-Wolfratshausen,  Bad Tölz,  1_111 km²
+  ## Kfz-Kennzeichen: TÖL, WOR  - what to use ??
+
+bgl, Berchtesgadener Land
+dah, Dachau
+ebe, Ebersberg
+ei,  Eichstätt
+ed,  Erding,    Erding,     870 km²
+fs,  Freising,  Freising,   802 km²
+ffb, Fürstenfeldbruck
+gap, Garmisch-Partenkirchen
+ll,  Landsberg am Lech
+mb,  Miesbach
+mue, Mühldorf am Inn
+
+München (Landkreis), München,  667 km²     ### todo - use different key - see kreisfrei stadt muenchen
+  ## Kfz-Kennzeichen: M, AIB, WOR - what to use ??
+
+Neuburg-Schrobenhausen
+  ## Kfz-Kennzeichen: ND, SOB  - what to use ??
+  
+paf, Pfaffenhofen an der Ilm
+
+Rosenheim  (Landkreis)  ### todo - use different key - see kreisfrei stadt rosenheim
+   ## Kfz-Kennzeichen: RO, AIB, WS - what to use ??
+
+sta, Starnberg   ## kfz-kennzeichen: STA, WOR
+ts,  Traunstein
+Weilheim-Schongau
+   ## Kfz-Kennzeichen: WM, SOG  - what to use ??
+

data/test/data/de-deutschland/3--by-bayern/4--oberfranken/counties.txt

@@ -0,0 +1,42 @@
+################################################
+# Der Regierungsbezirk Oberfranken umfasst
+#
+#    4 kreisfreie Städte und
+#        Bamberg
+#        Bayreuth
+#        Coburg
+#        Hof
+#    9 Landkreise
+#        Landkreis Bamberg
+#        Landkreis Bayreuth
+#        Landkreis Coburg
+#        Landkreis Forchheim
+#        Landkreis Hof
+#        Landkreis Kronach
+#        Landkreis Kulmbach
+#        Landkreis Lichtenfels
+#        Landkreis Wunsiedel im Fichtelgebirge
+
+
+# 4 kreisfreie Städte und
+
+Bamberg (Kreisfreie Stadt)
+Bayreuth (Kreisfreie Stadt)
+Coburg (Kreisfreie Stadt)
+Hof (Kreisfreie Stadt)
+
+
+# 9 Landkreise
+## how to deal w/ same name?? (same keys)
+##  - use bambergland, bayreuthland etc. for key ??
+
+Bamberg-Landkreis   ## (Landkreis)
+Bayreuth-Landkreis  ## (Landkreis)
+Coburg-Landkreis    ## (Landkreis)
+Hof-Landkreis       ## (Landkreis)
+
+Forchheim (Landkreis)
+Kronach (Landkreis)
+Kulmbach (Landkreis)
+Lichtenfels (Landkreis)
+Wunsiedel im Fichtelgebirge (Landkreis)

data/test/data/de-deutschland/3--by-bayern/districts.txt

@@ -0,0 +1,13 @@
+########################################
+#  Bayern
+#
+#  7 Regierungsbezirke  (administrative districts or governmental districts - use unit/division?)
+
+ob,   Oberbayern,    München,     17_530 km²      # 091 OB
+nb,   Niederbayern,  Landshut,    10_329 km²      # 092 NB
+opf,  Oberpfalz,     Regensburg,   9_690 km²      # 093 OPf
+ofr,  Oberfranken,   Bayreuth,     7_231 km²      # 094 Ofr.
+mfr,  Mittelfranken, Ansbach,      7_245 km²      # 095 Mfr.
+ufr,  Unterfranken,  Würzburg,     8_531 km²      # 096 Ufr.
+schw, Schwaben,      Augsburg,     9_993 km²      # 097 Schw.
+

data/test/data/de-deutschland/setups/adm.txt

@@ -0,0 +1,8 @@
+################################
+# test region reader/matcher
+
+
+de-deutschland!/states
+de-deutschland!/3--by-bayern/districts
+de-deutschland!/3--by-bayern/1--oberbayern/counties
+de-deutschland!/3--by-bayern/4--oberfranken/counties

data/test/data/de-deutschland/states.txt

@@ -0,0 +1,23 @@
+################################
+# German / Deutschland (de)
+
+# -- 16 Länder
+
+
+bw, Baden-Württemberg,   Stuttgart,   35_752 km²,  10_755_000
+by, Bayern [Bavaria],    München,     70_552 km²,  12_542_000
+be, Berlin,              Berlin,         892 km²,   3_469_000
+bb, Brandenburg,         Potsdam,     29_479 km²,   2_500_000
+hb, Bremen,              Bremen,         419 km²,     661_000
+hh, Hamburg,             Hamburg,        755 km²,   1_788_000
+he, Hessen [Hesse],      Wiesbaden,   21_115 km²,   6_066_000
+mv, Mecklenburg-Vorpommern [Mecklenburg-Western Pomerania], Schwerin,  23_180 km²,  1_639_000
+ni, Niedersachsen [Lower Saxony], Hannover,   47_609 km²,  7_914_000
+nw, Nordrhein-Westfalen [North Rhine-Westphalia], Düsseldorf,  34_085 km²,  17_837_000
+rp, Rheinland-Pfalz [Rhineland-Palatinate],       Mainz,       19_853 km²,   3_999_000
+sl, Saarland,            Saarbrücken,       2_569 km²,     1_018_000
+sn, Sachsen [Saxony],    Dresden,          18_416 km²,     4_143_000
+st, Sachsen-Anhalt [Saxony-Anhalt],  Magdeburg,  20_446 km²,  2_331_000
+sh, Schleswig-Holstein,              Kiel,       15_799 km²,  2_833_000
+th, Thüringen [Thuringia],           Erfurt,     16_172 km²,  2_231_000
+

data/test/test_fixture_matcher_adm2.rb

@@ -0,0 +1,62 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_fixture_matcher_adm2.rb
+
+
+require 'helper'
+
+
+class TestFixtureMatcherAdm2 < MiniTest::Test
+
+  include WorldDb::Matcher
+
+  def test_de
+    de = [
+       'de-deutschland!/by-bayern/districts',
+       'de-deutschland/by-bayern/districts',
+       'de-deutschland!/3--by-bayern/districts',
+       'de-deutschland/3--by-bayern/districts',
+       'europe/de-deutschland!/3--by-bayern/districts',
+       'europe/de-deutschland/3--by-bayern/districts',
+    ]
+    assert_match_adm2_for_country( de, 'de', 'by' )
+  end # method test_de
+
+  def test_at
+    at = [
+       'at-austria!/n-niederoesterreich/counties',
+       'at-austria/n-niederoesterreich/counties',
+       'at-austria!/1--n-niederoesterreich/counties',
+       'at-austria/1--n-niederoesterreich/counties',
+       'at-austria!/1--n-niederoesterreich/counties',
+       'europe/at-austria/1--n-niederoesterreich/counties',
+    ]
+    assert_match_adm2_for_country( at, 'at', 'n' )
+  end # method test_at
+
+
+  def test_at_more
+    b = [ 'at-austria!/1--b-burgenland/counties' ]
+    n = [ 'at-austria!/2--n-niederoesterreich/counties' ]
+    w = [ 'at-austria!/3--w-wien/counties' ]
+
+    assert_match_adm2_for_country( b, 'at', 'b' )
+    assert_match_adm2_for_country( n, 'at', 'n' )
+    assert_match_adm2_for_country( w, 'at', 'w' )
+  end
+
+
+private
+  def assert_match_adm2_for_country( ary, expected_country_key, expected_region_key )
+    ary.each do |name|
+      found = match_adm2_for_country( name ) do |country_key,region_key|
+        assert_equal country_key, expected_country_key,  "#{expected_country_key} expected is #{country_key}"
+        assert_equal region_key,  expected_region_key,   "#{expected_region_key} expected is #{region_key}"
+      end
+      assert found, "no match for '#{name}'"
+    end
+  end
+
+end # class TestFixtureMatcherAdm2

data/test/test_fixture_matcher_adm3.rb

@@ -0,0 +1,41 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_fixture_matcher_adm3.rb
+
+
+require 'helper'
+
+
+class TestFixtureMatcherAdm3 < MiniTest::Test
+
+  include WorldDb::Matcher
+
+  def test_oberfranken
+    oberfranken = [
+       'de-deutschland!/by-bayern/4--oberfranken/counties',
+       'de-deutschland/by-bayern/4--oberfranken/counties',
+       'de-deutschland!/3--by-bayern/4--oberfranken/counties',
+       'de-deutschland/3--by-bayern/4--oberfranken/counties',
+       'europe/de-deutschland!/3--by-bayern/4--oberfranken/counties',
+       'europe/de-deutschland/3--by-bayern/4--oberfranken/counties',
+    ]
+    assert_match_adm3_for_country( oberfranken, 'de', 'by', 'oberfranken' )
+  end # method test_oberfranken
+
+
+private
+  def assert_match_adm3_for_country( ary, expected_country_key, expected_region_key, expected_adm2 )
+    ary.each do |name|
+      found = match_adm3_for_country( name ) do |country_key,region_key,adm2|
+        assert_equal country_key, expected_country_key,  "#{expected_country_key} expected is #{country_key}"
+        assert_equal region_key,  expected_region_key,   "#{expected_region_key} expected is #{region_key}"
+        assert_equal adm2,        expected_adm2,         "#{expected_adm2} expected is #{adm2}"
+      end
+      assert found, "no match for '#{name}'"
+    end
+  end
+
+end # class TestFixtureMatcherAdm3
+

data/test/test_read_adm.rb

@@ -0,0 +1,67 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/test_read_adm.rb
+
+
+require 'helper'
+
+class TestReadAdm < MiniTest::Test
+
+  def setup
+    #  delete all countries, regions, cities in in-memory only db
+    WorldDb.delete!
+  end
+
+  def test_at
+    at = Country.create!( key: 'at',
+                          name: 'Austria',
+                          code: 'AUT',
+                          pop: 0,
+                          area: 0 )
+
+    reader = WorldDb::Reader.new( "#{WorldDb.root}/test/data/at-austria" )
+    reader.load_setup( 'setups/adm' )
+
+    ###
+    ## todo/fix: shorten level to l -- why, why not???
+    assert_equal 9, at.regions.where(level:1).count
+  end
+
+
+  def test_de
+    de = Country.create!( key: 'de',
+                          name: 'Germany',
+                          code: 'GER',
+                          pop: 0,
+                          area: 0 )
+
+    reader = WorldDb::Reader.new( "#{WorldDb.root}/test/data/de-deutschland" )
+    reader.load_setup( 'setups/adm' )
+
+
+    ###
+    ## todo/fix: shorten level to l -- why, why not???
+
+    assert_equal 16, de.regions.where(level:1).count
+    ## assert_equal 16+??, de.regions.count
+
+    by = Region.find_by_key!( 'by' )
+    assert_equal 7, by.regions.where(level:2).count
+    ## assert_equal 7+??, by.regions.count
+
+    ## pp by.regions
+
+    ob = Region.find_by_key!( 'ob' )
+    assert_equal 'Oberbayern', ob.name
+    assert_equal 23, ob.regions.where(level:3).count
+    assert_equal 23, ob.regions.count
+
+    ofr = Region.find_by_key!( 'ofr' )
+    assert_equal 'Oberfranken', ofr.name
+    assert_equal 13, ofr.regions.where(level:3).count
+    assert_equal 13, ofr.regions.count
+  end
+
+end # class TestReadAdm

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: worlddb-models
 version: !ruby/object:Gem::Version
-  version: 2.2.1
+  version: 2.2.2
 platform: ruby
 authors:
 - Gerald Bauer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: props
@@ -210,7 +210,19 @@ files:
 - lib/worlddb/schema.rb
 - lib/worlddb/stats.rb
 - lib/worlddb/version.rb
+- test/data/at-austria/1--b-burgenland/counties.txt
+- test/data/at-austria/2--n-niederoesterreich/counties.txt
+- test/data/at-austria/3--w-wien/counties.txt
+- test/data/at-austria/setups/adm.txt
+- test/data/at-austria/states.txt
+- test/data/de-deutschland/3--by-bayern/1--oberbayern/counties.txt
+- test/data/de-deutschland/3--by-bayern/4--oberfranken/counties.txt
+- test/data/de-deutschland/3--by-bayern/districts.txt
+- test/data/de-deutschland/setups/adm.txt
+- test/data/de-deutschland/states.txt
 - test/helper.rb
+- test/test_fixture_matcher_adm2.rb
+- test/test_fixture_matcher_adm3.rb
 - test/test_fixture_matchers.rb
 - test/test_fixture_matchers_ii.rb
 - test/test_model_city.rb
@@ -218,6 +230,7 @@ files:
 - test/test_model_country.rb
 - test/test_model_region.rb
 - test/test_models.rb
+- test/test_read_adm.rb
 homepage: https://github.com/worlddb/world.db.models
 licenses:
 - Public Domain
@@ -247,8 +260,11 @@ summary: worlddb -  world.db schema 'n' models for easy (re)use
 test_files:
 - test/test_model_comp.rb
 - test/test_models.rb
+- test/test_read_adm.rb
 - test/test_model_city.rb
 - test/test_fixture_matchers.rb
 - test/test_model_country.rb
 - test/test_model_region.rb
+- test/test_fixture_matcher_adm2.rb
+- test/test_fixture_matcher_adm3.rb
 - test/test_fixture_matchers_ii.rb