diff --git a/scripts/geodata/geoplanet/cleanup_geoplanet_db.sql b/scripts/geodata/geoplanet/cleanup_geoplanet_db.sql
new file mode 100644
index 00000000..e9b260dd
--- /dev/null
+++ b/scripts/geodata/geoplanet/cleanup_geoplanet_db.sql
@@ -0,0 +1,431 @@
+-- Worldwide
+    update places
+    -- Aruba, Burundi, Nicaragua and Paraguay are listed as "Nationality"
+    set place_type = "Country"
+    where place_type = "Nationality";
+
+-- United Kingdom
+
+    -- City of London
+    update places
+    set place_type = "Town"
+    where id = 12695806;
+
+    -- Isle of Man
+    update admins
+    set country_code = "IM",
+    country_id = 0
+    where id = 23424847;
+
+    update places
+    set country_code = "IM",
+    place_type = "Country"
+    where id = 23424847;
+
+    update admins
+    set country_code = "IM",
+    country_id = state_id, -- Isle of Man is a "state" in GeoPlanet
+    state_id = county_id, -- States in Isle of Man are labeled counties
+    county_id = 0
+    where state_id = 23424847;
+
+    update places
+    set country_code = "IM",
+    place_type = "State"
+    where parent_id = 23424847;
+
+    update postal_codes set country_code = "IM"
+    where parent_id in (select id from places where country_code = "IM");
+
+    -- Guernsey
+    update admins
+    set country_code = "GG",
+    country_id = 0
+    where id = 23424827;
+
+    update admins
+    set country_code = "GG",
+    country_id = county_id, -- Guernsey is a "county" in GeoPlanet
+    state_id = local_admin_id, -- States in Guernsey are labeled local_admins
+    county_id = 0,
+    local_admin_id = 0
+    where county_id = 23424827;
+
+    update places
+    set country_code = "GG",
+    place_type = "Country"
+    where id = 23424827;
+
+    update places
+    set country_code = "GG",
+    place_type = "State"
+    where parent_id = 23424827;
+
+    update postal_codes set country_code = "GG"
+    where parent_id in (select id from places where country_code = "GG");
+
+    -- Jersey
+    update admins
+    set country_code = "JE",
+    country_id = 0
+    where id = 23424857;
+
+    update admins
+    set country_code = "JE",
+    country_id = county_id, -- Jersey is a "county" in GeoPlanet
+    state_id = local_admin_id, -- States in Jersey are labeled local_admins
+    county_id = 0,
+    local_admin_id = 0
+    where county_id = 23424857;
+
+    update places
+    set country_code = "JE",
+    place_type = "Country"
+    where id = 23424857;
+
+    update places
+    set country_code = "JE",
+    place_type = "State"
+    where parent_id = 23424857;
+
+    update postal_codes set country_code = "JE"
+    where parent_id in (select id from places where country_code = "JE");
+
+    -- shire districts with City in the name are cities
+    update places
+    set place_type = "City"
+    where country_code = "GB"
+    and place_type = "LocalAdmin"
+    and name like  "%City%"
+    -- except for City of Westminster in London
+    and parent_id != 44418;
+
+    -- shire districts 
+    update places
+    set place_type = "County"
+    where country_code = "GB"
+    and place_type = "LocalAdmin"
+    -- except for boroughs of London
+    and parent_id != 44418;
+
+-- Canada
+
+    -- Alberta
+    -- listead as both county and state
+    update places
+    set parent_id = 2344915
+    where parent_id = 29375228;
+
+    update admins
+    set county_id = 0
+    where state_id = 2344915;
+
+    -- Manitoba
+    -- listead as both county and state
+    update places
+    set parent_id = 2344917
+    where parent_id = 29375231;
+
+    update admins
+    set county_id = 0
+    where state_id = 2344917;
+
+    -- Newfoundland and Labrador
+    -- listead as both county and state
+    update places
+    set parent_id = 2344919
+    where parent_id = 29375216;
+
+    update admins
+    set county_id = 0
+    where state_id = 2344919;
+
+    -- Northwest Territories
+    -- listed as both county and state
+    update places
+    set parent_id = 2344920
+    where parent_id = 29375229;
+
+    update admins
+    set county_id = 0
+    where state_id = 2344920;
+
+    -- Saskatchewan
+    -- listed as both county and state
+    update places
+    set parent_id = 2344925
+    where parent_id = 29375232;
+
+    update admins
+    set county_id = 0
+    where state_id = 2344925;
+
+    -- Yukon Territory
+    -- listed as both county and state
+    update places
+    set parent_id = 2344926
+    where parent_id = 29375157;
+
+    update admins
+    set county_id = 0
+    where state_id = 2344926;
+
+    -- Nunavut
+    -- listed as both county and state
+    update places
+    set parent_id = 20069920
+    where parent_id = 29375230;
+
+    update admins
+    set county_id = 0
+    where state_id = 20069920;
+
+-- Portugal
+    -- "County" in GeoPlanet is admin_level=7 (municipio) in OSM, switch to Town
+    update places
+    set place_type = "Town"
+    where country_code = "PT"
+    and place_type = "County";
+
+    -- there are now Towns parented by Towns, so make their parent_id point to their parent's parent
+    -- Note: SQLite can only do correlated subqueries, no joined updates, hence the clunky syntax
+    update places
+    set parent_id = (select p_sub.parent_id from places p_sub where p_sub.id = places.parent_id)
+    where id in (select p1.id from places p1 join places p2 on p1.parent_id = p2.id 
+                 where p1.country_code = "PT" and p1.place_type = "Town" and p2.place_type = "Town");
+
+    -- "State" in GeoPlanet is admin_level=6 in OSM, switch to County
+    -- except for Azores and Madeira
+    update places
+    set place_type = "County"
+    where country_code = "PT"
+    and place_type = "State"
+    and id not in (15021776, 2346570);
+
+    update admins
+    set county_id = state_id
+    where country_code = "PT"
+    and state_id not in (15021776, 2346570);
+
+    update admins
+    set county_id = 0
+    where country_code = "PT"
+    and state_id in (15021776, 2346570);
+
+    update admins
+    set state_id = 0
+    where country_code = "PT"
+    and state_id not in (15021776, 2346570);
+
+-- Japan
+    update places
+    set place_type = "LocalAdmin"
+    where country_code = "JP"
+    and name like "%区";
+
+    update places
+    set place_type = "Suburb"
+    where country_code = "JP"
+    and name like "%丁目";
+
+-- United States
+    -- DC
+    -- listed as both county and state
+    update places
+    set parent_id = 2347567
+    where parent_id = 12587802;
+
+    update admins
+    set county_id = 0
+    where state_id = 2347567;
+
+    -- Boroughs of NYC
+    -- listed as counties, make them LocalAdmin
+    update places
+    set place_type = "LocalAdmin"
+    where id in (
+        12589314, -- Bronx
+        12589335, -- Brooklyn
+        12589342, -- Manhattan
+        12589352, -- Queens
+        12589354 -- Staten Island
+    );
+
+    update admins
+    set local_admin_id = county_id,
+    county_id = 0
+    where county_id in (
+        12589314, -- Bronx
+        12589335, -- Brooklyn
+        12589342, -- Manhattan
+        12589352, -- Queens
+        12589354 -- Staten Island
+    );
+
+-- Germany
+
+    -- "LocalAdmin" level are usually Gemeindes (municipalities) when they are parented by counties
+    -- and city districts when parented by towns
+    update places
+    set place_type = "Town"
+    where country_code = "DE"
+    and place_type = "LocalAdmin"
+    and parent_id in (select id from places where country_code = "DE" and place_type = "County");
+
+
+-- India - OK
+
+-- France
+    -- "LocalAdmin" level are cities except for the Arondissements
+    -- of Paris, Marseille, and Lyon
+    update places
+    set place_type = "Town"
+    where country_code = "FR"
+    and place_type = "LocalAdmin"
+    and parent_id not in (
+        615702, -- Paris
+        610264, -- Marseille
+        609125 -- Lyon
+    );
+
+-- Poland
+    -- "LocalAdmin" level is either gmina (municipality) or city in OSM.
+    -- Since the "gmina" prefix is not used, we'll say city
+    update places
+    set place_type = "Town"
+    where country_code = "PL"
+    and place_type = "LocalAdmin";
+
+-- Sweden
+    -- "County" level is admin_level=7 in OSM (kommun) which are municipalities
+    update places
+    set place_type = "Town"
+    where country_code = "SE"
+    and place_type = "County";
+
+    -- fix Towns parented by Towns
+    update places
+    set parent_id = (select p_sub.parent_id from places p_sub where p_sub.id = places.parent_id)
+    where id in (select p1.id from places p1 join places p2 on p1.parent_id = p2.id 
+                 where p1.country_code = "SE" and p1.place_type = "Town" and p2.place_type = "Town");
+
+    update admins
+    set county_id = 0
+    where country_code = "SE";
+
+-- Brasil
+    -- Many admin levels in Brasil, but in GeoPlanet "County" simply repeats the city name
+    update places
+    set place_type = "Town"
+    where country_code = "BR"
+    and place_type = "County";
+
+    -- fix Towns parented by Towns
+    update places
+    set parent_id = (select p_sub.parent_id from places p_sub where p_sub.id = places.parent_id)
+    where id in (select p1.id from places p1 join places p2 on p1.parent_id = p2.id 
+                 where p1.country_code = "BR" and p1.place_type = "Town" and p2.place_type = "Town");
+
+    update admins
+    set county_id = 0
+    where country_code = "BR";
+
+-- Romania - OK
+
+-- Spain
+    update places
+    set place_type = "Town"
+    where country_code = "ES"
+    and place_type = "LocalAdmin";
+
+-- Taiwan
+    update places
+    set place_type = "Town"
+    where country_code = "TW"
+    and place_type = "State"
+    and name like "%市";
+
+    -- Places with place_type=Town ending in 鎮 should be city_district
+    update places
+    set place_type = "LocalAdmin"
+    where country_code = "TW"
+    and place_type = "Town"
+    and name like "%鎮"
+    and parent_id in (select id from places where country_code = "TW" and place_type = "Town");
+
+
+    -- update cities within top-level cities to be city_district (ending with 區/qu, not 市/shi)
+    update places
+    set place_type = "LocalAdmin",
+    name = printf("%s區", substr(name, 1, length(name) - 1))
+    where country_code = "TW"
+    and place_type = "Town"
+    and name like "%市"
+    -- top-level cities in Taiwan
+    and parent_id in (select id from places where parent_id = 23424971 and name like "%市");
+
+
+    -- Places ending with qu (區) should be city_district
+    update places
+    set place_type = "LocalAdmin"
+    where country_code = "TW"
+    and place_type = "County"
+    and name like "%區";
+
+    -- Places ending with xiàn (縣) should be state_district
+    update places
+    set place_type = "County"
+    where country_code = "TW"
+    and place_type = "State"
+    and name like "%縣";
+
+    -- Places ending with xiāng (鄉) should be city
+    update places
+    set place_type = "Town"
+    where country_code = "TW"
+    and place_type = "County"
+    and name like "%鄉";
+
+    -- Places ending with lǐ (里) should be suburb
+    update places
+    set place_type = "Suburb"
+    where country_code = "TW"
+    and place_type = "County"
+    and name like "%里";
+
+-- Italy
+    update places
+    set place_type = "Town"
+    where country_code = "IT"
+    and place_type = "LocalAdmin";
+
+-- Netherlands
+    -- boroughs of Amsterdam should be city_district
+    update places
+    set place_type = "LocalAdmin"
+    where id in (
+        734698, -- Westpoort
+        727281 -- Amsterdam Zuidoost
+    );
+
+    -- municipalities (cities) in OSM
+    update places
+    set place_type = "Town"
+    where country_code = "NL"
+    and place_type = "County";
+
+-- Norway
+    -- suburbs of Oslo
+    update places
+    set place_type = "LocalAdmin"
+    where country_code = "NO"
+    and place_type = "County"
+    and parent_id = 862592;
+
+    -- the rest are municipalities (cities) in OSM
+    update places
+    set place_type = "Town"
+    where country_code = "NO"
+    and place_type = "County"
+    and parent_id in (select id from places where country_code = "NO" and place_type = "State");
+