From 5ec0a5a61fab514ba2aa2ffd7bdc9dda13f3a274 Mon Sep 17 00:00:00 2001 From: typebrook Date: Sun, 17 Nov 2019 12:27:15 +0800 Subject: update --- scripts/osm/osm.village.nat_ref.makefile | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'scripts/osm') diff --git a/scripts/osm/osm.village.nat_ref.makefile b/scripts/osm/osm.village.nat_ref.makefile index 3937144..f763c19 100755 --- a/scripts/osm/osm.village.nat_ref.makefile +++ b/scripts/osm/osm.village.nat_ref.makefile @@ -33,14 +33,19 @@ matched.csv: data/VILLAGE_MOI_1081007.shp village.no_nat_ref.csv FROM 'village.no_nat_ref' osm, '$<'.VILLAGE_MOI_1081007 gov \ WHERE osm.name = gov.VILLNAME AND Intersects(gov.geometry, osm.geometry)" -matched.by_ref.csv: data/VILLAGE_MOI_1081007.shp village.with_nat_ref.csv +village.gov.csv: data/VILLAGE_MOI_1081007.shp + ogr2ogr $@ $< + +matched.by_ref.csv: village.gov.csv village.with_nat_ref.csv ogr2ogr $@ $(word 2,$^) \ - -oo X_POSSIBLE_NAMES=X -oo Y_POSSIBLE_NAMES=Y \ -dialect sqlite \ -sql "SELECT osm.osm_id, gov.* \ - FROM 'village.with_nat_ref' osm, '$<'.VILLAGE_MOI_1081007 gov \ + FROM 'village.with_nat_ref' osm, '$<'.'village.gov' gov \ WHERE osm.nat_ref = gov.VILLCODE" +diff: matched.by_ref.csv + awk -F',' -v q='"' '{print (, "is_in:county", q{q, "is_in:town", q{})}" q, "name:en", q$6q }' $< + confilct.list: matched.csv cat $< | cut -d',' -f2 | sort | uniq -d | xargs -I {} grep {} $< -- cgit v1.2.3-70-g09d2