worlddb-models 2.2.2 → 2.3.0

data/lib/worlddb/schema.rb

@@ -1,7 +1,7 @@
 
 module WorldDb
 
-class CreateDb 
+class CreateDb
 
 def up
 
@@ -17,13 +17,14 @@ create_table :places do |t|
   #  SUPR - supra (e.g. European Union)
   #  CNTY - country
   #  TERR - terr
-  # region:
-  #  ADM1 - e.g. region/state/province
-  #  ADM2 - e.g. county/district/
-  #  ADM3 - e.g. 
+  # state:
+  #  ADM1 - e.g. state/province
+  #  ADM2 - e.g. county/bezirk/kreis
+  #  ADM3 - e.g. municipality/gemeinde
+  #  ADM4
   # city:
   #  MTRO - metro
-  #  CITY - city/town/
+  #  CITY - city/town/village/hamlet //(de)ort/stadt/markt
   #  DIST - district/
   #
   #  add new table for zones (e.g. informal regions e.g. tourism, wine regions, etc.) ??
@@ -33,7 +34,8 @@ create_table :places do |t|
   t.float   :lat   # optional for now (latitude)
   t.float   :lng   # optional for now (longitude)
 
-  ## todo: add parent for hierachy ?? or keep it in country/region/city etc. table ??
+  ## todo: add parent for hierachy ?? or keep it in country/state/city etc. table
+  ##    or use extra hierachy join table ??
 
   ## timestamp at last
   t.timestamps
@@ -43,7 +45,7 @@ end
 #############
 # todo: use many-to-many assoc w/ join table  for name and place ???
 #  why? why not?
-#    - wien -> city n region n metro ?  collect more samples of names used more than once
+#    - wien -> city n state n metro ?  collect more samples of names used more than once
 
 ### alternative names for places
 create_table :names do |t|
@@ -128,23 +130,10 @@ 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 ?? or use states ???
-#
 # used for state/provice/land/regioni/etc.
-create_table :regions do |t|
+create_table :states do |t|
   t.string     :name,   null: false
   t.string     :key,    null: false
   t.references :place,  null: false
@@ -152,19 +141,18 @@ create_table :regions do |t|
   t.string :abbr     # optional conventional abbrevation (e.g. Stmk., Gto., etc.)
   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.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.references :state      ## parent state (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.boolean :s,  null: false, default: false   # state flag (use adm1? or a1)
+  ## t.boolean :p,  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)
@@ -172,16 +160,100 @@ create_table :regions do |t|
 end
 
 ### fix: add kind to unique ???
-add_index :regions, [:key, :country_id], unique: true
+add_index :states, [:key, :country_id], unique: true
 
 
+####
+#  todo: use a view (of states/admins) instead - why? why not??
+#  parts used for regierungsbezirke
+create_table :parts do |t|
+  t.string     :name,   null: false
+  t.string     :key,    null: false
+  t.references :place,  null: false
+  t.string :code     # short two or three letter code e.g. NY, OAX, etc.
+  t.string :abbr     # optional conventional abbrevation (e.g. Stmk., Gto., etc.)
+  t.string :iso      # iso code  -- check in use/possible - ???
+  t.string :nuts     # nuts code (europe/eu only)
+  t.string :alt_names  # comma separated list of alternate names (synonyms)
+
+  t.references :state,  null: false
+  t.integer    :level,  null: false, default: 2  # default assumes 2
+  ### change to l (instead of level)!!!! - shorter, why, why not???
 
-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???
+  t.integer :pop     # optional population count
+  t.integer :area    # optional area in square km (sq. km)
+  t.timestamps
 end
 
+####
+#  todo: use a view (of states/admins) instead - why? why not??
+#    counties used for kreise, bezirke, etc.
+
+create_table :counties do |t|
+  t.string     :name,   null: false
+  t.string     :key,    null: false
+  t.references :place,  null: false
+  t.string :code     # short two or three letter code e.g. NY, OAX, etc.
+  t.string :abbr     # optional conventional abbrevation (e.g. Stmk., Gto., etc.)
+  t.string :iso      # iso code  -- check in use/possible - ???
+  t.string :nuts     # nuts code (europe/eu only)
+  t.string :alt_names  # comma separated list of alternate names (synonyms)
+
+  t.references :state,  null: false
+  t.references :part    # optional part (e.g. regierungsbezirk, etc.)
+  t.integer    :level,  null: false, default: 2  # default assumes 2 - note: is (change to) 3 if parts incl.
+  ### change to l (instead of level)!!!! - shorter, why, why not???
+
+  t.integer :pop     # optional population count
+  t.integer :area    # optional area in square km (sq. km)
+  t.timestamps
+end
+
+
+####
+#  todo: use a view (of states/admins) instead - why? why not??
+#    counties used for kreise, bezirke, etc.
+
+create_table :munis do |t|
+  t.string     :name,   null: false
+  t.string     :key,    null: false
+  t.references :place,  null: false
+  t.string :code     # short two or three letter code e.g. NY, OAX, etc.
+  t.string :abbr     # optional conventional abbrevation (e.g. Stmk., Gto., etc.)
+  t.string :iso      # iso code  -- check in use/possible - ???
+  t.string :nuts     # nuts code (europe/eu only)
+  t.string :alt_names  # comma separated list of alternate names (synonyms)
+
+  t.references :state,  null: false
+  t.references :county   # optional county (e.g. bezirk,kreis, etc.)
+  t.integer    :level,  null: false, default: 3  # default assumes 3 - note: is (change to) 4 if parts incl.
+  ### change to l (instead of level)!!!! - shorter, why, why not???
+
+  t.integer :pop     # optional population count
+  t.integer :area    # optional area in square km (sq. km)
+  t.timestamps
+end
+
+
+
+## kind of regions but not hierachical (used for tourist/colloquial zones etc.)
+#    uses many-to-many join tables w/ cities n states/admins
+#
+#  examples:
+#    Salzkammergut (part of Salzburg and Oberoesterreich)
+#  others
+#   Oberfranken -> Fichtelgebierge/Fraenkische Schweiz/etc.
+create_table :zones do |t|
+  # to be done
+end
+
+## create_table :city_rels do |t|   ## city relationships (w/ states/admins) -- part of state/zone
+##   t.references :city,   null: false
+##   t.references :state  ## optional ?? either state/admin 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
@@ -189,26 +261,53 @@ create_table :cities do |t|
   t.string     :code     # short three letter code (ITAT/airport code e.g. NYC or VIE)
   t.string     :alt_names  # comma separated list of alternate names (synonyms)
   t.references :country,  null: false
-  t.references :region    # optional for now
-  t.references :city  # optional parent (e.g. metro for city, or city for district)
-  t.integer :pop     # optional population count (city proper)
-  t.integer :popm    # optional population count (metropolitan/aglomeration)
+  t.references :state    # optional for now (e.g. state, bundesland, etc.)  -- ADM1
+  t.references :part     # optional for now (e.g. regierungsbezirk, etc.)   -- x   /ADM2
+  t.references :county   # optional for now (e.g. landkreis, bezirk, etc.)  -- ADM2/ADM3
+  t.references :muni     # optional for now (e.g. gemeinde, etc.)           -- ADM3/ADM4
+
+  t.references :metro    # optional for now (part of metro e.g. Ruhrgebiet or Vienna Metro(politean) Area etc.)
+
+  t.integer :pop     # optional population count (city proper); see metro for metro pop
   t.integer :area    # optional area in square km (sq. km)
 
   ## t.float   :lat   # optional for now  --  FIX: remove?? moved to places
   ## 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
-
   ### t.boolean :capital, null: false, default: false  # is national captial?
 
   t.timestamps
 end
 
+create_table :metros do |t|
+  t.string     :name,   null: false
+  t.string     :key,    null: false
+  t.references :place,  null: false
+  t.string     :code     # short three letter code (ITAT/airport code e.g. NYC or VIE)
+  t.string     :alt_names  # comma separated list of alternate names (synonyms)
+  t.references :country,  null: false
+
+  t.integer :pop     # optional population count
+  t.integer :area    # optional area in square km (sq. km)
+
+  t.timestamps
+end
+
+create_table :districts do |t|
+  t.string     :name,   null: false
+  t.string     :key,    null: false
+  t.references :place,  null: false
+  t.string     :code     # short three letter code (ITAT/airport code e.g. NYC or VIE)
+  t.string     :alt_names  # comma separated list of alternate names (synonyms)
+  t.references :city,  null: false
+
+  t.integer :pop     # optional population count
+  t.integer :area    # optional area in square km (sq. km)
+
+  t.timestamps
+end
+
+
 
 create_table :langs do |t|  # langs == languages (e.g. en/English, de/Deutsch, etc.)
   t.string :key,   null: false

data/lib/worlddb/stats.rb

@@ -9,10 +9,13 @@ module WorldDb
       puts "Stats:"
       puts " #{'%5d' % Continent.count} continents"
       puts " #{'%5d' % Country.count} countries (#{Country.where(s: true).count} supras, #{Country.where(d:true).count} deps), #{Country.where(m:true).count} miscs)"
-      puts " #{'%5d' % Region.count} regions"
-      puts " #{'%5d' % City.where(m: true).where(c: false).count} metros"
-      puts " #{'%5d' % City.where(c: true).count} cities (#{City.where(c: true).where(m: true).count} metros)"
-      puts " #{'%5d' % City.where(d: true).count} districts"
+      puts " #{'%5d' % State.count} states (ADM1)"
+      puts " #{'%5d' % Part.count} parts (x/ADM2)"
+      puts " #{'%5d' % County.count} counties (ADM2/ADM3)"
+      puts " #{'%5d' % Muni.count} munis (ADM3/ADM4)"
+      puts " #{'%5d' % Metro.count} metros"
+      puts " #{'%5d' % City.count} cities"
+      puts " #{'%5d' % District.count} districts"
       puts " #{'%5d' % Place.count} places"
       puts " #{'%5d' % Name.count} names"
 

data/lib/worlddb/tree_reader.rb

@@ -0,0 +1,97 @@
+# encoding: utf-8
+
+
+# fix: move into TextUtils namespace/module!!
+
+class TreeReader
+
+  include LogUtils::Logging
+
+  def self.from_file( path )
+    ## nb: assume/enfore utf-8 encoding (with or without BOM - byte order mark)
+    ## - see textutils/utils.rb
+   text = File.read_utf8( path )
+   self.from_string( text )
+  end
+
+  def self.from_string( text )
+    self.new( text )
+  end
+
+  def initialize( text )
+    @text = text
+  end
+
+  TreeItem = Struct.new( :level, :key, :value )
+
+  KEY_REGEX     = /
+                      ([0-9][0-9A-Za-z]*)   ## key starting with a nummer
+                        |
+                      ([a-z]+)   ## key all lowercase e.g. bt,n,etc.
+                        |
+                      ([A-Z]+)   ## key all uppercase e.g. BT,N,etc
+                  /x
+
+  LEVEL_REGEX   = /\.+/     ## e.g. .. or .... etc.
+
+
+  def each_line  
+    stack    = []     # note: last_level  => stack.size; starts w/ 0
+    times    = 2      # assume two indents factor (e.g. .. =2, ....=3 etc. ) for now
+
+    reader = LineReader.from_string( @text )
+    reader.each_line do |line|
+
+      logger.debug "[TreeReader]  line (before) => >#{line}<"
+
+      s = StringScanner.new( line )
+      s.skip( /[ \t]+/ )   # remove whitespace
+
+      key = s.scan( KEY_REGEX )
+      if key
+        s.skip( /[ \t]+/ )   # remove whitespace
+      end
+
+      level_str = s.scan( LEVEL_REGEX )
+      if level_str
+        ## FIX!! todo/check: make sure level_str.size is a multiple of two !! (e.g. 2,4,6,etc.)
+        level = (level_str.size/times)+1
+        s.skip( /[ \t]+/ )   # remove whitespace
+      else
+        level = 1   ## no level found; assume top level (start w/ 1)
+      end
+
+      ## assume rest is record
+      rest = s.rest  ## was: s.scan( /.+/ )
+
+      level_diff = level - stack.size
+
+      if level_diff > 0
+        logger.debug "[TreeReader]    up  +#{level_diff}"
+        ## FIX!!! todo/check/verify/assert: always must be +1
+      elsif level_diff < 0
+        logger.debug "[TreeReader]    down #{level_diff}"
+        level_diff.abs.times { stack.pop }
+        stack.pop
+      else
+        ## same level
+        stack.pop
+      end
+
+      item = TreeItem.new
+      item.level = level
+      item.key   = key
+      item.value = rest
+
+      stack.push( item )
+
+      ## for debugging - show tree item (note) hierarchy 
+      names = stack.map { |it| "(#{it.level}) #{it.value}" }
+      logger.debug "[TreeReader]    #{names.join( ' › ' )}  -- key: >#{key}<, level: >#{level}<, rest: >#{rest}<"
+
+      yield( stack )
+    end
+  end # method each_line
+
+end # class TreeReader
+

data/lib/worlddb/version.rb

@@ -4,8 +4,8 @@ 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 = 2
+  MINOR = 3
+  PATCH = 0
   VERSION = [MAJOR,MINOR,PATCH].join('.')
 
   def self.version

data/test/adm/test_fixture_matcher_adm2.rb

@@ -0,0 +1,73 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/adm/test_fixture_matcher_adm2.rb
+
+
+require 'helper'
+
+
+class TestFixtureMatcherAdm2 < MiniTest::Test
+
+  include WorldDb::Matcher
+
+  def test_de
+    de = [
+       'de-deutschland!/by-bayern/parts',
+       'de-deutschland/by-bayern/parts',
+       'de-deutschland!/3--by-bayern/parts',
+       'de-deutschland/3--by-bayern/parts',
+       'europe/de-deutschland!/3--by-bayern/parts',
+       'europe/de-deutschland/3--by-bayern/parts',
+    ]
+    assert_match_adm2_parts_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_counties_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_counties_for_country( b, 'at', 'b' )
+    assert_match_adm2_counties_for_country( n, 'at', 'n' )
+    assert_match_adm2_counties_for_country( w, 'at', 'w' )
+  end
+
+
+private
+  def assert_match_adm2_parts_for_country( ary, expected_country_key, expected_state_key )
+    ary.each do |name|
+      found = match_adm2_parts_for_country( name ) do |country_key,state_key|
+        assert_equal country_key, expected_country_key,  "#{expected_country_key} expected is #{country_key}"
+        assert_equal state_key,   expected_state_key,    "#{expected_state_key} expected is #{state_key}"
+      end
+      assert found, "no match for '#{name}'"
+    end
+  end
+
+  def assert_match_adm2_counties_for_country( ary, expected_country_key, expected_state_key )
+    ary.each do |name|
+      found = match_adm2_counties_for_country( name ) do |country_key,state_key|
+        assert_equal country_key, expected_country_key,  "#{expected_country_key} expected is #{country_key}"
+        assert_equal state_key,   expected_state_key,    "#{expected_state_key} expected is #{state_key}"
+      end
+      assert found, "no match for '#{name}'"
+    end
+  end
+
+end # class TestFixtureMatcherAdm2

data/test/{test_fixture_matcher_adm3.rb → adm/test_fixture_matcher_adm3.rb}

@@ -2,7 +2,7 @@
 
 ###
 #  to run use
-#     ruby -I ./lib -I ./test test/test_fixture_matcher_adm3.rb
+#     ruby -I ./lib -I ./test test/adm/test_fixture_matcher_adm3.rb
 
 
 require 'helper'
@@ -21,17 +21,17 @@ class TestFixtureMatcherAdm3 < MiniTest::Test
        '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' )
+    assert_match_adm3_counties_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 )
+  def assert_match_adm3_counties_for_country( ary, expected_country_key, expected_state_key, expected_part_name )
     ary.each do |name|
-      found = match_adm3_for_country( name ) do |country_key,region_key,adm2|
+      found = match_adm3_counties_for_country( name ) do |country_key,state_key,part_name|
         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}"
+        assert_equal state_key,   expected_state_key,    "#{expected_state_key} expected is #{state_key}"
+        assert_equal part_name,   expected_part_name,    "#{expected_part_name} expected is #{part_name}"
       end
       assert found, "no match for '#{name}'"
     end

data/test/adm/test_fixture_matcher_tree.rb

@@ -0,0 +1,52 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/adm/test_fixture_matcher_tree.rb
+
+
+require 'helper'
+
+
+class TestFixtureMatcherTree < MiniTest::Test
+
+  include WorldDb::Matcher
+
+  def test_de
+    de = [
+       'de-deutschland!/orte',
+       'de-deutschland!/3--by-bayern/orte',
+       'de-deutschland/3--by-bayern/orte',
+       'de-deutschland!/3--by-bayern/4--oberfranken/orte',
+       'europe/de-deutschland!/3--by-bayern/orte',
+       'europe/de-deutschland/3--by-bayern/orte',
+       'europe/de-deutschland!/orte',
+    ]
+    assert_match_tree_for_country( de, 'de' )
+  end # method test_de
+
+
+  def test_at
+    at = [
+       'at-austria!/n-niederoesterreich/orte',
+       'at-austria/n-niederoesterreich/orte',
+       'at-austria!/1--n-niederoesterreich/orte',
+       'at-austria!/orte',
+       'at-austria/orte',
+       'europe/at-austria/1--n-niederoesterreich/orte',
+    ]
+    assert_match_tree_for_country( at, 'at' )
+  end # method test_at
+
+
+private
+  def assert_match_tree_for_country( ary, expected_country_key )
+    ary.each do |name|
+      found = match_tree_for_country( name ) do |country_key|
+        assert_equal country_key, expected_country_key,  "#{expected_country_key} expected is #{country_key}"
+      end
+      assert found, "no match for '#{name}'"
+    end
+  end
+
+end # class TestFixtureMatcherTree

data/test/{test_read_adm.rb → adm/test_read_adm.rb}

@@ -2,7 +2,7 @@
 
 ###
 #  to run use
-#     ruby -I ./lib -I ./test test/test_read_adm.rb
+#     ruby -I ./lib -I ./test test/adm/test_read_adm.rb
 
 
 require 'helper'
@@ -10,7 +10,7 @@ require 'helper'
 class TestReadAdm < MiniTest::Test
 
   def setup
-    #  delete all countries, regions, cities in in-memory only db
+    #  delete all countries, states, cities in in-memory only db
     WorldDb.delete!
   end
 
@@ -24,9 +24,7 @@ class TestReadAdm < MiniTest::Test
     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
+    assert_equal 9, at.states.count
   end
 
 
@@ -41,27 +39,22 @@ class TestReadAdm < MiniTest::Test
     reader.load_setup( 'setups/adm' )
 
 
-    ###
-    ## todo/fix: shorten level to l -- why, why not???
+    assert_equal 16, de.states.count
 
-    assert_equal 16, de.regions.where(level:1).count
-    ## assert_equal 16+??, de.regions.count
+    by = State.find_by_key!( 'by' )
+    assert_equal 7, by.parts.count
+    ## assert_equal 23+, by.counties.count
 
-    by = Region.find_by_key!( 'by' )
-    assert_equal 7, by.regions.where(level:2).count
-    ## assert_equal 7+??, by.regions.count
+    ## pp by.parts
 
-    ## pp by.regions
-
-    ob = Region.find_by_key!( 'ob' )
+    ob = Part.find_by_key!( 'ob' )
     assert_equal 'Oberbayern', ob.name
-    assert_equal 23, ob.regions.where(level:3).count
-    assert_equal 23, ob.regions.count
+    assert_equal 23, ob.counties.count
 
-    ofr = Region.find_by_key!( 'ofr' )
+    ofr = Part.find_by_key!( 'ofr' )
     assert_equal 'Oberfranken', ofr.name
-    assert_equal 13, ofr.regions.where(level:3).count
-    assert_equal 13, ofr.regions.count
+    assert_equal 13, ofr.counties.count
   end
 
 end # class TestReadAdm
+

data/test/adm/test_read_tree.rb

@@ -0,0 +1,63 @@
+# encoding: utf-8
+
+###
+#  to run use
+#     ruby -I ./lib -I ./test test/adm/test_read_tree.rb
+
+
+require 'helper'
+
+class TestReadTree < MiniTest::Test
+
+  def setup
+    #  delete all countries, states, 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/tree' )
+
+    assert_equal 9, at.states.count
+
+    ## todo: add more asserts
+  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/tree' )
+
+
+    assert_equal 16, de.states.count
+
+    by = State.find_by_key!( 'by' )
+    assert_equal 7, by.parts.count
+    ## assert_equal 23+, by.counties.count
+
+    ## pp by.parts
+
+    ob = Part.find_by_key!( 'ob' )
+    assert_equal 'Oberbayern', ob.name
+    assert_equal 23, ob.counties.count
+
+    ofr = Part.find_by_key!( 'ofr' )
+    assert_equal 'Oberfranken', ofr.name
+    assert_equal 13, ofr.counties.count
+
+    ## todo: add more asserts
+  end
+
+end # class TestReadTree