reorder, comment out adm1, add comments for derived, fix 50m disputed

This commit is contained in:
Nathaniel Kelso 2018-05-20 22:01:24 -07:00
parent 20435b7060
commit 3c753432d5

View File

@ -33,31 +33,31 @@ rm -f $logmd
# | mode |LetterCase| shape_path | shape filename
# == 10m ================= |=========== |==========| ============| ================================================
function run10m {
./tools/wikidata/update.sh fetch_write uppercase 10m_cultural ne_10m_admin_0_countries_lakes
./tools/wikidata/update.sh fetch_write uppercase 10m_cultural ne_10m_admin_0_countries
./tools/wikidata/update.sh fetch_write uppercase 10m_cultural ne_10m_admin_0_disputed_areas
./tools/wikidata/update.sh fetch_write uppercase 10m_cultural ne_10m_admin_0_map_subunits
./tools/wikidata/update.sh fetch_write uppercase 10m_cultural ne_10m_admin_0_map_units
./tools/wikidata/update.sh fetch_write uppercase 10m_cultural ne_10m_admin_0_sovereignty
./tools/wikidata/update.sh fetch_write lowercase 10m_cultural ne_10m_admin_1_states_provinces_lakes
./tools/wikidata/update.sh fetch_write uppercase 10m_cultural ne_10m_admin_0_countries
./tools/wikidata/update.sh fetch_write uppercase 10m_cultural ne_10m_admin_0_countries_lakes
./tools/wikidata/update.sh fetch_write uppercase 10m_cultural ne_10m_admin_0_map_units
./tools/wikidata/update.sh fetch_write uppercase 10m_cultural ne_10m_admin_0_map_subunits
./tools/wikidata/update.sh fetch_write uppercase 10m_cultural ne_10m_admin_0_disputed_areas
./tools/wikidata/update.sh fetch_write lowercase 10m_cultural ne_10m_admin_1_states_provinces
./tools/wikidata/update.sh fetch_write lowercase 10m_cultural ne_10m_admin_1_states_provinces_lakes
./tools/wikidata/update.sh fetch_write lowercase 10m_cultural ne_10m_airports
./tools/wikidata/update.sh fetch_write lowercase 10m_cultural ne_10m_populated_places
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_geographic_lines
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_geography_marine_polys
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_geography_regions_elevation_points
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_geography_regions_points
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_geography_regions_polys
./tools/wikidata/update.sh fetch_write lowercase 10m_cultural ne_10m_populated_places # this should be build before derived Makefile themes run
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_geographic_lines # this should be build before derived Makefile themes run
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_geography_marine_polys # this should be build before derived Makefile themes run
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_geography_regions_elevation_points # this should be build before derived Makefile themes run
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_geography_regions_points # this should be build before derived Makefile themes run
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_geography_regions_polys # this should be build before derived Makefile themes run
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_lakes
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_lakes_europe
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_lakes_historic
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_lakes_north_america
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_lakes
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_playas
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_rivers_europe
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_rivers_lake_centerlines_scale_rank
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_rivers_lake_centerlines
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_rivers_lake_centerlines_scale_rank
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_rivers_europe
./tools/wikidata/update.sh fetch_write lowercase 10m_physical ne_10m_rivers_north_america
./tools/wikidata/update.sh fetch_write lowercase 10m_cultural ne_10m_admin_1_label_points_details
#./tools/wikidata/update.sh fetch_write lowercase 10m_cultural ne_10m_admin_1_label_points_details # geometry errors
}
function run50m {
@ -67,9 +67,8 @@ function run50m {
./tools/wikidata/update.sh fetch_write uppercase 50m_cultural ne_50m_admin_0_countries_lakes
./tools/wikidata/update.sh fetch_write uppercase 50m_cultural ne_50m_admin_0_map_units
./tools/wikidata/update.sh fetch_write uppercase 50m_cultural ne_50m_admin_0_map_subunits
./tools/wikidata/update.sh fetch_write uppercase 50m_cultural ne_50m_admin_0_tiny_countries
#./tools/wikidata/update.sh fetch_write uppercase 50m_cultural ne_50m_admin_0_breakaway_disputed_areas # KeyError: 'WIKIDATAID'
#./tools/wikidata/update.sh fetch_write uppercase 50m_cultural ne_50m_admin_0_breakaway_disputed_areas_scale_rank # KeyError: 'WIKIDATAID'
./tools/wikidata/update.sh fetch_write uppercase 50m_cultural ne_50m_admin_0_tiny_countries # this should be build before derived Makefile themes run
./tools/wikidata/update.sh fetch_write uppercase 50m_cultural ne_50m_admin_0_breakaway_disputed_areas
./tools/wikidata/update.sh fetch_write lowercase 50m_cultural ne_50m_admin_1_states_provinces
./tools/wikidata/update.sh fetch_write lowercase 50m_cultural ne_50m_admin_1_states_provinces_lakes
./tools/wikidata/update.sh fetch_write lowercase 50m_physical ne_50m_lakes
@ -99,8 +98,8 @@ if [[ "$runmode" == "all" ]]
then
# =========================================================
# run all steps !
# =========================================================
run10m
# =========================================================
run10m
run50m
run110m
@ -124,7 +123,7 @@ then
else
# =========================================================
# fast test !
# =========================================================
# =========================================================
# travis osx hack - run a minimal test
run110m
# show summary