Changed variable types to make it work

Author: whizsid

README.md

@@ -0,0 +1,64 @@
+# osm-to-sql
+
+---
+
+Simple OSM XML data to SQL converter command. This command will create 7 SQL files with foreign key constraints. You can use these SQL files with MySQL/ SQLite or any other SQL server.
+
+## Usage
+
+This is the default help menu for the command line tool.
+
+```
+
+Usage:
+ osm-to-sql [OPTIONS] -i <xml_file_path.xml> -d <output_directory>
+
+OPTIONS:
+ -i Input open street map file in XML format.
+ -l Default varchar length to using in table creation. [250]
+ -d Output directory to save output sql files.
+ -r Maximum rows per one SQL insert query. [400]
+ -h Prints help information
+
+```
+
+## Table mappings
+
+All tables have foreign key constrations. And please import with the following order when you importing to your database server.
+
+```
+ 1.nodes
+ id,lat,lng,version,changeset,user,uid,visible,date_time
+
+ 2.ways
+ id,version,changeset,user,uid,visible,date_time
+
+ 3.way_nodes
+ way_id,node_id
+ -- way_id = ways(id)
+ -- node_id = nodes(id)
+
+ 4.relations
+ id,version,changeset,user,uid,visible,date_time
+
+ 5.relation_members
+ rm_id,relation_id,node_id,way_id,role
+ -- relation_id = relations(id)
+ -- node_id = nodes(id)
+ -- way_id = ways(id)
+
+ 6.tags
+ id,name
+
+ 7.ref_tags
+ rt_id,tag_id,node_id,relation_id,way_id,value
+ -- tag_id = tags(id)
+ -- node_id = nodes(id)
+ -- relation_id = relations(id)
+ -- way_id = ways(id)
+ 
+```
+
+## Contirbutions
+
+All contibutions and issued are welcome. Please help me to make this tool faster and powerfull.

src/argument.rs

@@ -1,5 +1,7 @@
 use std::path::Path;
+use std::process;
 
+#[derive(Debug, Clone)]
 pub struct Arguments {
  // XML file downloaded from geofabrick
  pub input_file: String,
@@ -40,21 +42,22 @@ impl Default for Arguments {
 
 fn get_arguments_help()->String{
  String::from("
- Usage:
-  osm-to-sql [OPTIONS] -i <xml_file_path.xml> -d <output_directory>
-
- OPTIONS:
-  -i Input open street map file in XML format.
-  -l Default varchar length to using in table creation. [250]
-  -d Output directory to save output sql files.
-  -r Maximum rows per one SQL insert query. [400]
-  -h Prints help information
+Usage:
+ osm-to-sql [OPTIONS] -i <xml_file_path.xml> -d <output_directory>
+
+OPTIONS:
+ -i Input open street map file in XML format.
+ -l Default varchar length to using in table creation. [250]
+ -d Output directory to save output sql files.
+ -r Maximum rows per one SQL insert query. [400]
+ -h Prints help information
  ")
 }
 
 fn show_arguments_error(e:String){
- panic!("Invalid Argument(s) : {}
+ eprintln!("Invalid Argument(s) : {}
  {}",e.clone(),get_arguments_help());
+ process::exit(128);
 }
 
 impl Arguments {
@@ -66,23 +69,24 @@ impl Arguments {
 
  for arg in args {
  match previous_arg.as_ref() {
- "i"=> formated_args.input_file = arg.clone(),
- "l"=> formated_args.varchar_length = arg.clone().parse().unwrap(),
- "d"=> formated_args.output_dir = arg.clone(),
- "r"=> formated_args.maximum_rows_per_query = arg.clone().parse().unwrap(),
- "h"=> formated_args.help = true,
+ "-i"=> formated_args.input_file = arg.clone(),
+ "-l"=> formated_args.varchar_length = arg.clone().parse().unwrap(),
+ "-d"=> formated_args.output_dir = arg.clone(),
+ "-r"=> formated_args.maximum_rows_per_query = arg.clone().parse().unwrap(),
+ "-h"=> formated_args.help = true,
  _=> {},
  }
 
- if arg=="h" {
+ if arg=="-h" {
  formated_args.help = true;
  }
 
  previous_arg = arg;
  }
 
  if formated_args.help {
- panic!("{}",get_arguments_help());
+ println!("{}",get_arguments_help());
+ process::exit(0);
  }
 
  if formated_args.output_dir!=empty_string && !Path::new(&formated_args.output_dir).exists() {

src/main.rs

@@ -35,18 +35,18 @@ fn main() {
 
  let result = Reader::from_file(&Path::new(&formated_arg.input_file));
 
- let mut nodes_table = SqlFile {..SqlFile::new_node_file(formated_arg.output_dir.clone(),formated_arg.maximum_rows_per_query)};
- let mut tags_table = SqlFile {..SqlFile::new_tag_file(formated_arg.output_dir.clone(),formated_arg.maximum_rows_per_query)};
- let mut ways_table = SqlFile {..SqlFile::new_main_file("ways", formated_arg.output_dir.clone(), formated_arg.maximum_rows_per_query)};
- let mut way_nodes_table = SqlFile {..SqlFile::new_way_nodes_file(formated_arg.output_dir.clone(),formated_arg.maximum_rows_per_query)};
- let mut relations_table = SqlFile {..SqlFile::new_main_file("relations", formated_arg.output_dir.clone(), formated_arg.maximum_rows_per_query)};
- let mut relation_members_table = SqlFile {..SqlFile::new_relation_members_file(formated_arg.output_dir.clone(), formated_arg.maximum_rows_per_query)};
- let mut ref_tags_table = SqlFile {..SqlFile::new_ref_tags_file(formated_arg.output_dir.clone(), formated_arg.maximum_rows_per_query)};
+ let mut nodes_table = SqlFile {..SqlFile::new_node_file(formated_arg.clone())};
+ let mut tags_table = SqlFile {..SqlFile::new_tag_file(formated_arg.clone())};
+ let mut ways_table = SqlFile {..SqlFile::new_main_file(formated_arg.clone(),"ways")};
+ let mut way_nodes_table = SqlFile {..SqlFile::new_way_nodes_file(formated_arg.clone())};
+ let mut relations_table = SqlFile {..SqlFile::new_main_file(formated_arg.clone(),"relations")};
+ let mut relation_members_table = SqlFile {..SqlFile::new_relation_members_file(formated_arg.clone())};
+ let mut ref_tags_table = SqlFile {..SqlFile::new_ref_tags_file(formated_arg.clone())};
 
  // let mut count = 0;
  let mut buf = Vec::new();
  let mut used_tags: Vec<String> = vec![];
- let mut last_ref_id: i32 =0;
+ let mut last_ref_id: i64 =0;
  let mut last_ref_type: &str ="node";
 
  match result {
@@ -204,7 +204,7 @@ fn main() {
 
  way_nodes_table.insert_to_way_nodes_file(WayNode {
  way_id:last_ref_id,
- node_id: attr.value.parse::<i32>().unwrap()
+ node_id: attr.value.parse::<i64>().unwrap()
  })
  },
  Err(e)=>panic!("Error reading ref attribute in nd tag: {:?}",e)
@@ -258,7 +258,7 @@ fn main() {
  relation_members_table.insert_to_relation_members_file(RelationMember {
  role:role,
  ref_type: ref_attr.value,
- ref_id: Attr::from_quick_xml(ref_attribute).value.parse::<i32>().unwrap(),
+ ref_id: Attr::from_quick_xml(ref_attribute).value.parse::<i64>().unwrap(),
  relation_id: last_ref_id
  })
  },

src/main_info.rs

@@ -3,8 +3,8 @@ use std::str;
 
 pub struct MainInfo {
  pub changeset:i32,
- pub id: i32,
- pub version: i8,
+ pub id: i64,
+ pub version: i16,
  pub timestamp: String,
  pub user: String,
  pub uid: i32,
@@ -29,11 +29,11 @@ impl MainInfo {
  pub fn set_attribute(&mut self, attr:crate::main_info::Attr)->bool{
  match attr.name.as_ref() {
  "id"=>{
- self.id = attr.value.parse::<i32>().unwrap();
+ self.id = attr.value.parse::<i64>().unwrap();
  return true;
  } ,
  "version" => {
- self.version = attr.value.parse::<i8>().unwrap();
+ self.version = attr.value.parse::<i16>().unwrap();
  return true;
  },
  "changeset"=>{
@@ -93,6 +93,6 @@ pub struct Tag {
 pub struct UsedTag {
  pub tag: Tag,
  pub value: String,
- pub ref_id: i32,
+ pub ref_id: i64,
  pub ref_type:&'static str
 }

src/relation.rs

@@ -13,7 +13,7 @@ impl Default for Relation {
 
 pub struct RelationMember {
  pub ref_type: String,
- pub ref_id: i32,
- pub relation_id: i32,
+ pub ref_id: i64,
+ pub relation_id: i64,
  pub role: String
 }