@@ -71,9 +71,13 @@ def handle(self, *args, **options):
7171
7272 # loop through each feature in the shapefile
7373 for feature in data [0 ]:
74- code = feature .get ("pcode" )
74+ code = feature .get ("code" ) if 'code' in feature . fields else feature . get ( " pcode" )
7575 name = feature .get ("name" ) if 'name' in feature .fields else feature .get ("shapeName" )
7676 admin1_id = feature .get ("district_id" ) if "district_id" in feature .fields else feature .get ("admin1_id" )
77+ local_name = feature .get ("local_name" ) if "local_name" in feature .fields else None
78+ local_name_code = feature .get ("local_name_code" ) if "local_name_code" in feature .fields else None
79+ alternate_name = feature .get ("alternate_name" ) if "alternate_name" in feature .fields else None
80+ alternate_name_code = feature .get ("alternate_name_code" ) if "alternate_name_code" in feature .fields else None
7781
7882 #FIXME: must make sure code and admin1_id are not null before continuing
7983
@@ -112,14 +116,23 @@ def handle(self, *args, **options):
112116
113117 @transaction .atomic
114118 def add_admin2 (self , options , import_missing , feature , geom , centroid , bbox ):
115- code = feature .get ("pcode" )
119+ code = feature .get ("code" ) if 'code' in feature . fields else feature . get ( " pcode" )
116120 name = feature .get ("name" ) if 'name' in feature .fields else feature .get ("shapeName" )
117121 admin1_id = feature .get ("district_id" ) if "district_id" in feature .fields else feature .get ("admin1_id" )
122+ local_name = feature .get ("local_name" ) if "local_name" in feature .fields else None
123+ local_name_code = feature .get ("local_name_code" ) if "local_name_code" in feature .fields else None
124+ alternate_name = feature .get ("alternate_name" ) if "alternate_name" in feature .fields else None
125+ alternate_name_code = feature .get ("alternate_name_code" ) if "alternate_name_code" in feature .fields else None
118126 admin2 = Admin2 ()
119127 admin2 .code = code
120128 admin2 .name = name
121129 admin2 .centroid = centroid
122130 admin2 .bbox = bbox
131+ admin2 .local_name = local_name
132+ admin2 .local_name_code = local_name_code
133+ admin2 .alternate_name = alternate_name
134+ admin2 .alternate_name_code = alternate_name_code
135+
123136 try :
124137 admin1 = District .objects .get (id = admin1_id )
125138 admin2 .admin1_id = admin1 .id
@@ -132,7 +145,7 @@ def add_admin2(self, options, import_missing, feature, geom, centroid, bbox):
132145 try :
133146 print ("importing" , admin2 .name )
134147 admin2 .save ()
135- if options ["update-geom " ]:
148+ if options ["update_geom " ]:
136149 self .update_geom (admin2 , geom )
137150 except IntegrityError as e :
138151 print (f"Duplicate object { admin2 .name } " )
0 commit comments