瀏覽代碼

Minu teed eesti indeksi muutmine.

Ardo Kubjas 5 年之前
父節點
當前提交
5b4d5ef7e0
共有 1 個文件被更改,包括 2 次插入2 次删除
  1. 2 2
      R/minu_teed_eesti.R

+ 2 - 2
R/minu_teed_eesti.R

@@ -42,7 +42,7 @@ minu_teed_eesti <- function(conf = NULL) {
   # ruut::qgis_show_help(algorithm = algorithm)
   input <- vars$tmp_gpkg_file_input_1
   output <- vars$tmp_gpkg_file_output_2
-  cmd <- sprintf("qgis_process run %s  --COLUMN='mnimi' --COLUMN='mkood' --COLUMN='fid' --INPUT='%s' --OUTPUT='%s' ", algorithm, input, output)
+  cmd <- sprintf("qgis_process run %s  --COLUMN='mnimi' --COLUMN='mkood' --COLUMN='id' --INPUT='%s' --OUTPUT='%s' ", algorithm, input, output)
   system(cmd)
   cat(sprintf("\n-------------\nLoodi andmebaas '%s'.\n", output))
 
@@ -94,7 +94,7 @@ minu_teed_eesti <- function(conf = NULL) {
   conf$schema <- "minu_teed"
   conf$table <- "eesti"
   PG <- ruut::construct_ogr2ogr_PG_connect_str(conf = conf)
-  cmd <- sprintf("ogr2ogr -progress --config PG_USE_COPY YES -f PostgreSQL %s -lco DIM=2 %s %s -overwrite -nlt %s -lco GEOMETRY_NAME=geom -lco FID=fid -nln %s.%s -nlt PROMOTE_TO_MULTI", PG, vars$tmp_gpkg_file, vars$layer_6, "MULTIPOLYGON", conf$schema, conf$table)
+  cmd <- sprintf("ogr2ogr -progress --config PG_USE_COPY YES -f PostgreSQL %s -lco DIM=2 %s %s -overwrite -nlt %s -lco GEOMETRY_NAME=geom -lco FID=id -nln %s.%s -nlt PROMOTE_TO_MULTI", PG, vars$tmp_gpkg_file, vars$layer_6, "MULTIPOLYGON", conf$schema, conf$table)
   system(cmd)
   cat(sprintf("\n-------------\nLoodi andmebaas '%s'.\n", conf$table))
 }