[sosi2osm] 19/30: Smal fixes with the admin convertion script

[Ruben Undheim]

This is an automated email from the git hooks/post-receive script.

rubund-guest pushed a commit to branch upstream
in repository sosi2osm.

commit 1ef8dde56fa17313369d81c757fb583cb24130cf
Author: Knut Karevoll <gnonthgol at gmail.com>
Date:   Sat Oct 12 22:37:42 2013 +0200

    Smal fixes with the admin convertion script
---
 lua/adm.lua | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lua/adm.lua b/lua/adm.lua
index 438178a..575f5ad 100644
--- a/lua/adm.lua
+++ b/lua/adm.lua
@@ -24,14 +24,14 @@ for i, indent, tokens in tokens, info, 0 do
     		out["border_type"] = "baseline"
     	end
     elseif tokens[1] == "FLATE" then
-    	out["type"] = "administrative"
+    	out["type"] = "boundary"
     elseif tokens[1] == "GRENSETYPESJØ" and tokens[2] == "6" then
     	out["boundary"] = "administrative"
     	out["admin_level"] = "2"
     elseif tokens[1] == "KOMM" or tokens[1] == "FYLKESNR" then
     	out["ref"] = tokens[2]
     elseif tokens[1] == "NAVN" then
-    	name = tokens[2]
+    	name = table.concat(tokens, " ", 2)
     elseif tokens[1] == "SPRÅK" then
     	lang = tokens[2]
     	if lang == "nor" then lang = "no" end

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sosi2osm.git