demolocation: update (#1285)

remove dummy vector layers, change attribute encoding to utf8, add PROJ_EPSG and PROJ_SRID files
OSGeo · Feb 4, 2021 · 18a31bd · 18a31bd
1 parent 59dc7cf
commit 18a31bd
Show file tree

Hide file tree

Showing 24 changed files with 6 additions and 44 deletions.
diff --git a/demolocation/Makefile b/demolocation/Makefile
@@ -2,15 +2,13 @@ MODULE_TOPDIR = ..
 
 include $(MODULE_TOPDIR)/include/Make/Other.make
 
-SRCFILES = WIND DEFAULT_WIND VAR PROJ_INFO PROJ_UNITS MYNAME
-DBFMAPS = mysites point
+SRCFILES = WIND DEFAULT_WIND VAR PROJ_INFO PROJ_UNITS PROJ_SRID PROJ_EPSG MYNAME
 SQLITEMAPS = country_boundaries
 MAPFILES = dbln coor topo head cidx sidx hist
-DBFFILES := $(foreach map,$(DBFMAPS),dbf/$(map).dbf)
 SQLITEFILES = sqlite/sqlite.db
-VECTFILES := $(foreach map,$(DBFMAPS),$(foreach file,$(MAPFILES),vector/$(map)/$(file))) $(foreach map,$(SQLITEMAPS),$(foreach file,$(MAPFILES),vector/$(map)/$(file)))
-SRC := $(SRCFILES) $(DBFFILES) $(SQLITEFILES) $(VECTFILES)
-SRCDIRS := PERMANENT PERMANENT/vector PERMANENT/dbf PERMANENT/sqlite $(patsubst %,PERMANENT/vector/%,$(DBFMAPS)) $(patsubst %,PERMANENT/vector/%,$(SQLITEMAPS))
+VECTFILES := $(foreach map,$(SQLITEMAPS),$(foreach file,$(MAPFILES),vector/$(map)/$(file)))
+SRC := $(SRCFILES) $(SQLITEFILES) $(VECTFILES)
+SRCDIRS := PERMANENT PERMANENT/vector PERMANENT/sqlite $(patsubst %,PERMANENT/vector/%,$(SQLITEMAPS))
 
 DSTDIR = $(ARCH_DISTDIR)/demolocation
 DST := $(patsubst %,$(DSTDIR)/PERMANENT/%,$(SRC))

diff --git a/demolocation/PERMANENT/PROJ_EPSG b/demolocation/PERMANENT/PROJ_EPSG
@@ -0,0 +1 @@
+epsg: 4326
diff --git a/demolocation/PERMANENT/PROJ_SRID b/demolocation/PERMANENT/PROJ_SRID
@@ -0,0 +1 @@
+EPSG:4326
diff --git a/demolocation/PERMANENT/dbf/mysites.dbf b/demolocation/PERMANENT/dbf/mysites.dbf
diff --git a/demolocation/PERMANENT/dbf/point.dbf b/demolocation/PERMANENT/dbf/point.dbf
diff --git a/demolocation/PERMANENT/sqlite/sqlite.db b/demolocation/PERMANENT/sqlite/sqlite.db
diff --git a/demolocation/PERMANENT/vector/country_boundaries/cidx b/demolocation/PERMANENT/vector/country_boundaries/cidx
diff --git a/demolocation/PERMANENT/vector/country_boundaries/coor b/demolocation/PERMANENT/vector/country_boundaries/coor
diff --git a/demolocation/PERMANENT/vector/country_boundaries/sidx b/demolocation/PERMANENT/vector/country_boundaries/sidx
diff --git a/demolocation/PERMANENT/vector/country_boundaries/topo b/demolocation/PERMANENT/vector/country_boundaries/topo
diff --git a/demolocation/PERMANENT/vector/mysites/cidx b/demolocation/PERMANENT/vector/mysites/cidx
diff --git a/demolocation/PERMANENT/vector/mysites/coor b/demolocation/PERMANENT/vector/mysites/coor
diff --git a/demolocation/PERMANENT/vector/mysites/dbln b/demolocation/PERMANENT/vector/mysites/dbln
diff --git a/demolocation/PERMANENT/vector/mysites/head b/demolocation/PERMANENT/vector/mysites/head
diff --git a/demolocation/PERMANENT/vector/mysites/hist b/demolocation/PERMANENT/vector/mysites/hist
diff --git a/demolocation/PERMANENT/vector/mysites/sidx b/demolocation/PERMANENT/vector/mysites/sidx
diff --git a/demolocation/PERMANENT/vector/mysites/topo b/demolocation/PERMANENT/vector/mysites/topo
diff --git a/demolocation/PERMANENT/vector/point/cidx b/demolocation/PERMANENT/vector/point/cidx
diff --git a/demolocation/PERMANENT/vector/point/coor b/demolocation/PERMANENT/vector/point/coor
diff --git a/demolocation/PERMANENT/vector/point/dbln b/demolocation/PERMANENT/vector/point/dbln
diff --git a/demolocation/PERMANENT/vector/point/head b/demolocation/PERMANENT/vector/point/head
diff --git a/demolocation/PERMANENT/vector/point/hist b/demolocation/PERMANENT/vector/point/hist
diff --git a/demolocation/PERMANENT/vector/point/sidx b/demolocation/PERMANENT/vector/point/sidx
diff --git a/demolocation/PERMANENT/vector/point/topo b/demolocation/PERMANENT/vector/point/topo