From 0fa68242a3390435f705910014ebcbb9fafe224b Mon Sep 17 00:00:00 2001 From: Nathaniel Kelso Date: Sun, 1 Aug 2021 15:30:06 -0700 Subject: [PATCH] China 9-dash is maritime boundary claim not land --- ...in_0_boundary_lines_disputed_areas_chn.dbf | Bin 19613 -> 0 bytes ...in_0_boundary_lines_disputed_areas_chn.qpj | 1 - ..._boundary_lines_maritime_indicator_chn.cpg | 1 + ..._boundary_lines_maritime_indicator_chn.dbf | Bin 0 -> 14048 bytes ...boundary_lines_maritime_indicator_chn.prj} | 0 ...boundary_lines_maritime_indicator_chn.shp} | Bin ...boundary_lines_maritime_indicator_chn.shx} | Bin Makefile | 20 +++++++++--------- 8 files changed, 11 insertions(+), 11 deletions(-) delete mode 100644 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.dbf delete mode 100644 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.qpj create mode 100644 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.cpg create mode 100644 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.dbf rename 10m_cultural/{ne_10m_admin_0_boundary_lines_disputed_areas_chn.prj => ne_10m_admin_0_boundary_lines_maritime_indicator_chn.prj} (100%) rename 10m_cultural/{ne_10m_admin_0_boundary_lines_disputed_areas_chn.shp => ne_10m_admin_0_boundary_lines_maritime_indicator_chn.shp} (100%) rename 10m_cultural/{ne_10m_admin_0_boundary_lines_disputed_areas_chn.shx => ne_10m_admin_0_boundary_lines_maritime_indicator_chn.shx} (100%) diff --git a/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.dbf b/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.dbf deleted file mode 100644 index b73310a1cc2720aa4e53a4377d88df3d2f2a93be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 19613 zcmeHO&2F1O5T;7isFnHxIdNJcz@iTM-YRO$s`o5ZLtuCUX}eY>h})l+u? zw=o8$*s-$ESw*q4-_Gp(Ec5LWIPp%;o^u@cKeaqNdoQG0gJ!B8Tg$;e9ksoph)9eX>2EPga)Wc&cNj^YhyMv*foXqqf`ihmjd0X7y_}&ijpd$$a`Dwf_nFFpLe)FTYc(a!u0xz6* zMo}D07PnFOJ(w10d2C#bRzV#3t8fwd^S@Q()z=^nZ`QB*$F>jWXM6qp@A-jBHpQVB zA%z!J#%A?p6i!&2errW@CVo6##EZMz8E*%{O)H$L=LAwXi5FD95J!q;d5a6JPpD*5 z9MXXlUazpSI69^9?xobdWYN5RY;wND{%XGF)#dp<;%$&Y3MW~F$`|5D;fNI^!h_A7^9xly@k_p!{+33zck&Lpi`3 z>9w{2Ob*5y=}e~OK%?*!P67y(FT{^aF&N+D#urcFwW?&>PvQ7DTdn25`e3ARq;TBA sFn$;6&@B#9c&#$rataslrLtPff%U;i;Yi^~;ccgI;631fd8zE|H#BqKvj6}9 diff --git a/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.qpj b/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.qpj deleted file mode 100644 index 5fbc831e..00000000 --- a/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.qpj +++ /dev/null @@ -1 +0,0 @@ -GEOGCS["WGS 84",DATUM["WGS_1984",SPHEROID["WGS 84",6378137,298.257223563,AUTHORITY["EPSG","7030"]],AUTHORITY["EPSG","6326"]],PRIMEM["Greenwich",0,AUTHORITY["EPSG","8901"]],UNIT["degree",0.0174532925199433,AUTHORITY["EPSG","9122"]],AUTHORITY["EPSG","4326"]] diff --git a/10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.cpg b/10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.cpg new file mode 100644 index 00000000..3ad133c0 --- /dev/null +++ b/10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.cpg @@ -0,0 +1 @@ +UTF-8 \ No newline at end of file diff --git a/10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.dbf b/10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.dbf new file mode 100644 index 0000000000000000000000000000000000000000..514639cc6fa9fb182cce4be753715014412b8cd3 GIT binary patch literal 14048 zcmeHNPfx-y6rWKOHSr60>Jcx73kQ#54l-qbvTmAqAq5I7nVT7?!4Khg^lNys%o*dD zuLnX_;q5}!U*Dg;w!c^2y1zKuJJvMq{ow6T{H#13Qx8JlGE9v z$44dHaRakx%JGj9P7S?h`nq$YY0eTlDdD!|^zU8Q7R@<+u=l$|M|ehQ-=c1{e+3@W z!awp`Tr2R75959a!K;oUZjwp!ptp8Rrzk$TQbp`A9B=PUc^h@I7Nc2<5`f5x3 z5C57!PdB>08;bCM@k5Cov{PclEP5b=^eGv!Y(Z8YV;UuV#>piavDuWw;%%kRx((kp zhPf||fJHAXIbT=nzmji})T)TgjYf37bc0!s4Gb(|G1tG+vyO zy8T1@YOf!hA9#M6DzY&hvTTrM>Ca1Pyi=j%osxBT8_Hug wgR&X2aryjN(>vCUMc|RGkgXuL+V=IKCL7}oH>?|1WyNjZjX1vD&PL6%PoLa86aWAK literal 0 HcmV?d00001 diff --git a/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.prj b/10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.prj similarity index 100% rename from 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.prj rename to 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.prj diff --git a/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.shp b/10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.shp similarity index 100% rename from 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.shp rename to 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.shp diff --git a/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.shx b/10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.shx similarity index 100% rename from 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.shx rename to 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.shx diff --git a/Makefile b/Makefile index 0cec9d1f..d2445b98 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,7 @@ zips/housekeeping/ne_themes_versions.zip: zips/10m_cultural/10m_cultural.zip: \ zips/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas.zip \ - zips/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.zip \ + zips/10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.zip \ zips/10m_cultural/ne_10m_admin_0_boundary_lines_land.zip \ zips/10m_cultural/ne_10m_admin_0_boundary_lines_map_units.zip \ zips/10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator.zip \ @@ -399,7 +399,7 @@ build_a8_ne_10m_physical_land: intermediate/ne_10m_physical_building_blocks.shp build_a1_ne_10m_admin_0_scale_rank: 10m_cultural/ne_10m_admin_0_boundary_lines_land.shp \ 10m_cultural/ne_10m_admin_0_boundary_lines_map_units.shp \ 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas.shp \ - 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.shp \ + 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.shp \ 10m_cultural/ne_10m_admin_0_seams.shp \ 10m_physical/ne_10m_coastline.shp \ 10m_physical/ne_10m_minor_islands_coastline.shp \ @@ -408,7 +408,7 @@ build_a1_ne_10m_admin_0_scale_rank: 10m_cultural/ne_10m_admin_0_boundary_lines_l 10m_cultural/ne_10m_admin_0_boundary_lines_land.shp \ 10m_cultural/ne_10m_admin_0_boundary_lines_map_units.shp \ 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas.shp \ - 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.shp \ + 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.shp \ 10m_cultural/ne_10m_admin_0_seams.shp \ 10m_physical/ne_10m_coastline.shp \ 10m_physical/ne_10m_minor_islands_coastline.shp \ @@ -1289,11 +1289,11 @@ zips/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas.zip: 10m_cultural ogr2ogr -f GeoJSON -lco COORDINATE_PRECISION=6 -lco WRITE_BBOX=YES /dev/stdout $(subst zips/, ,$(basename $@)).shp \ | jq -c . > geojson/$(subst zips/10m_cultural/,,$(basename $@)).geojson -zips/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.zip: 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.shp 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.dbf +zips/10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.zip: 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.shp 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.dbf cp VERSION $(subst zips/, ,$(basename $@)).VERSION.txt - curl http://www.naturalearthdata.com/downloads/10m-cultural-vectors/10m-admin-0-breakaway-disputed-areas/ > $(subst zips/, ,$(basename $@)).README.html + curl http://www.naturalearthdata.com/downloads/10m-cultural-vectors/10m-admin-0-boundary-lines/ > $(subst zips/, ,$(basename $@)).README.html zip -j -r $@ $(subst zips/, ,$(basename $@)).* - cp $@ archive/ne_10m_admin_0_boundary_lines_disputed_areas_chn$(VERSION_PREFIXED).zip + cp $@ archive/ne_10m_admin_0_boundary_lines_maritime_indicator_chn$(VERSION_PREFIXED).zip ogr2ogr -f GeoJSON -lco COORDINATE_PRECISION=6 -lco WRITE_BBOX=YES /dev/stdout $(subst zips/, ,$(basename $@)).shp \ | jq -c . > geojson/$(subst zips/10m_cultural/,,$(basename $@)).geojson @@ -1535,13 +1535,13 @@ zips/10m_cultural/ne_10m_cultural_building_blocks_all.zip: \ zips/10m_cultural/ne_10m_admin_1_label_points.zip \ zips/10m_cultural/ne_10m_admin_1_seams.zip \ zips/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas.zip \ - zips/10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.zip \ + zips/10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.zip \ zips/10m_cultural/ne_10m_admin_0_boundary_lines_land.zip \ zips/10m_cultural/ne_10m_admin_0_boundary_lines_map_units.zip \ zips/10m_physical/ne_10m_coastline.zip \ zips/10m_physical/ne_10m_minor_islands_coastline.zip - zip -j -r $@ 10m_cultural/ne_10m_admin_0_label_points.* 10m_cultural/ne_10m_admin_0_seams.* 10m_cultural/ne_10m_admin_1_label_points.* 10m_cultural/ne_10m_admin_1_seams.* 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas.* 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.* 10m_cultural/ne_10m_admin_0_boundary_lines_land.* 10m_cultural/ne_10m_admin_0_boundary_lines_map_units.* 10m_physical/ne_10m_coastline.* 10m_physical/ne_10m_minor_islands_coastline.* + zip -j -r $@ 10m_cultural/ne_10m_admin_0_label_points.* 10m_cultural/ne_10m_admin_0_seams.* 10m_cultural/ne_10m_admin_1_label_points.* 10m_cultural/ne_10m_admin_1_seams.* 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas.* 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.* 10m_cultural/ne_10m_admin_0_boundary_lines_land.* 10m_cultural/ne_10m_admin_0_boundary_lines_map_units.* 10m_physical/ne_10m_coastline.* 10m_physical/ne_10m_minor_islands_coastline.* cp $@ archive/ne_10m_cultural_building_blocks_all$(VERSION_PREFIXED).zip @@ -2674,7 +2674,7 @@ zips/110m_physical/ne_110m_wgs84_bounding_box.zip: 110m_physical/ne_110m_graticu # copy the master assets into position for 10m_cultural: packages/Natural_Earth_quick_start/10m_cultural/status.txt: \ 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas.shp 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas.dbf \ - 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.shp 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.dbf \ + 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.shp 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.dbf \ 10m_cultural/ne_10m_admin_0_boundary_lines_land.shp 10m_cultural/ne_10m_admin_0_boundary_lines_land.dbf \ 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator.shp 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator.dbf \ 10m_cultural/ne_10m_admin_0_boundary_lines_map_units.shp 10m_cultural/ne_10m_admin_0_boundary_lines_map_units.dbf \ @@ -2696,7 +2696,7 @@ packages/Natural_Earth_quick_start/10m_cultural/status.txt: \ mkdir -p packages/Natural_Earth_quick_start/10m_cultural cp 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas.* packages/Natural_Earth_quick_start/10m_cultural/ - cp 10m_cultural/ne_10m_admin_0_boundary_lines_disputed_areas_chn.* packages/Natural_Earth_quick_start/10m_cultural/ + cp 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator_chn.* packages/Natural_Earth_quick_start/10m_cultural/ cp 10m_cultural/ne_10m_admin_0_boundary_lines_land.* packages/Natural_Earth_quick_start/10m_cultural/ cp 10m_cultural/ne_10m_admin_0_boundary_lines_maritime_indicator.* packages/Natural_Earth_quick_start/10m_cultural/ cp 10m_cultural/ne_10m_admin_0_boundary_lines_map_units.* packages/Natural_Earth_quick_start/10m_cultural/