Changes between Version 98 and Version 99 of UserGuidelines/GIS/Data

Timestamp:

09/18/10 07:23:39 (14 years ago)

Author:

Fran Boon

Comment:

--

UserGuidelines/GIS/Data

@@ -118 +118 @@
 # L4
 db(table.name == "Noorpur Tehsil").update(name="Noorpur Thal Tehsil")
-jhang = db(table.name == "Jhang").select(table.id, limitby=(0, 1)).first().id
+jhang = db((table.name == "Jhang") & (table.level==L2)).select(table.id, limitby=(0, 1)).first().id
 table.insert(name="Ahmadpur Sial", parent=jhang, level="L3", url="http://en.wikipedia.org/wiki/Ahmedpur_Sial_Tehsil")
 gis.import_csv("punjab_l4.csv", check_duplicates=False)
@@ -124 +124 @@
 db(table.name == "Mirwah Taluka").update(name="Thari Mirwah Taluka")
 db(table.name == "Shah Bunder Taluka").update(name="Shah Bandar Taluka")
-badin = db(table.name == "Badin").select(table.id, limitby=(0, 1)).first().id
+badin = db((table.name == "Badin") & (table.level==L2)).select(table.id, limitby=(0, 1)).first().id
 table.insert(name="Talhar", parent=badin, level="L3", url="http://en.wikipedia.org/wiki/Talhar")
-jamshoro = db(table.name == "Jamshoro").select(table.id, limitby=(0, 1)).first().id
+jamshoro = db((table.name == "Jamshoro") & (table.level==L2)).select(table.id, limitby=(0, 1)).first().id
 table.insert(name="Manjhand Taluka", parent=jamshoro, level="L3", url="http://en.wikipedia.org/wiki/Jamshoro_District")
 gis.import_csv("sindh_l4.csv", check_duplicates=False)
@@ -132 +132 @@
 db(table.name == "F.r Kala Dhaka").update(name="F.R. Kala Dhaka")
 db(table.name == "Martoong Tehsil").update(name="Martung Tehsil")
-dikhan = db(table.name == "D. I. Khan").select(table.id, limitby=(0, 1)).first().id
+dikhan = db((table.name == "D. I. Khan") & (table.level==L2)).select(table.id, limitby=(0, 1)).first().id
 table.insert(name="Daraban Tehsil", parent=dikhan, level="L3")
 table.insert(name="Paroa Tehsil", parent=dikhan, level="L3")
+upperdir = db((table.name == "Upper Dir") & (table.level==L2)).select(table.id, limitby=(0, 1)).first().id
+table.insert(name="Barawal Tehsil", parent=upperdir, level="L3")
+table.insert(name="Chapar Tehsil", parent=upperdir, level="L3")
+table.insert(name="Dir Tehsil", parent=upperdir, level="L3")
+table.insert(name="Khal Tehsil", parent=upperdir, level="L3")
+table.insert(name="Kalkot Tehsil", parent=upperdir, level="L3")
+table.insert(name="Wari Tehsil", parent=upperdir, level="L3")
 gis.import_csv("khyber_l4.csv", check_duplicates=False)
 db.commit()