Piirikasti suuruse muutmine bb -> bb2. Nüüd on piirikast leitud epk2t ruudustikust lähtuvalt.

R/gpkg_piirkonnale_joonte_lisamine.R

@@ -43,8 +43,7 @@ gpkg_piirkonnale_joonte_lisamine <- function(obj = NULL, gpkg_home = "/tmp") {
   # cat(qgisprocess::qgis_show_help(algorithm = algorithm))
 
   ## -------------------- Loop -----------------------
-  intersect_layers <- c("piir", "bb")
-  intersect_layers <- c("bb")
+  intersect_layers <- c("bb2") # c("piir", "bb", "bb2")
   andmed <- data.frame("schema" = character(0), "table" = character(0))
   andmed <- rbind(andmed, data.frame("schema" = "teeregister_wfs", "table" = "n_alusdokumendid_ja_lepingud"))
   andmed <- rbind(andmed, data.frame("schema" = "teeregister_wfs", "table" = "pohimaantee"))

R/gpkg_piirkonnale_polygoonide_lisamine.R

@@ -43,8 +43,7 @@ gpkg_piirkonnale_polygoonide_lisamine <- function(obj = NULL, gpkg_home = "/tmp"
   # cat(ruut::qgis_show_help(algorithm = algorithm))
 
   ## -------------------- Loop -----------------------
-  intersect_layers <- c("piir", "bb")
-  intersect_layers <- c("bb")
+  intersect_layers <- c("bb2") # c("piir", "bb", "bb2")
   andmed <- data.frame("schema" = character(0), "table" = character(0))
   andmed <- rbind(andmed, data.frame("schema" = "osm_shp", "table" = "landuse_a"))
   andmed <- rbind(andmed, data.frame("schema" = "maaamet", "table" = "asustusyksus"))

R/gpkg_piirkonnale_punktide_lisamine.R

@@ -43,8 +43,7 @@ gpkg_piirkonnale_punktide_lisamine <- function(obj = NULL, gpkg_home = "/tmp") {
   # cat(qgisprocess::qgis_show_help(algorithm = algorithm))
 
   ## -------------------- Loop -----------------------
-  intersect_layers <- c("piir", "bb")
-  intersect_layers <- c("bb")
+  intersect_layers <- c("bb2") # c("piir", "bb", "bb2")
   andmed <- data.frame("schema" = character(0), "table" = character(0))
   andmed <- rbind(andmed, data.frame("schema" = "maaamet", "table" = "aadressandmed")) # POINT
   andmed <- rbind(andmed, data.frame("schema" = "osm_shp", "table" = "pofw"))

R/gpkg_piirkonnale_ruudustike_lisamine.R

@@ -34,9 +34,8 @@ gpkg_piirkonnale_ruudustike_lisamine <- function(obj = NULL, gpkg_home = "/tmp")
   algorithm <- "native:extractbylocation"
   # cat(ruut::qgis_show_help(algorithm = algorithm))
   ## -------------------- Loop -----------------------
-  intersect_layers <- c("piir", "bb")
-  intersect_layers <- c("bb")
-  ruudud <- c("epk10t_grid", "epk2t_grid", "epk02t_grid", "epk10t", "epk2t")
+  intersect_layers <- c("bb2") # c("piir", "bb", "bb2")
+  ruudud <- c("epk10t_grid", "epk2t_grid", "epk02t_grid")  #"epk10t", "epk2t"
   conf$schema <- "maaamet"
   # ruudud <- c("epk02t_grid")
   for (intersect in intersect_layers) {

R/gpkg_sellest_alustame_gpkg_loomist.R

@@ -41,6 +41,10 @@ gpkg_sellest_alustame_gpkg_loomist <- function(pk = NULL, obj = NULL, gpkg_home
   conf$gpkg_home <- gpkg_home
   conf$gpkg_file <- obj
 
+  tmp_gpkg_file <- tempfile(fileext = ".gpkg")
+  tmp_gpkg_file_output <- ruut::construct_to_gpkg_output_file_str(conf = conf, is_input_str = F)
+  tmp_gpkg_file_input <- ruut::construct_to_gpkg_output_file_str(conf = conf, is_input_str = T)
+
   ## ----------- argumentide vastavuse kontroll -----------
   if (is.null(pk) || !sf::st_is_valid(pk)) {
     cat("\nPalun kontrolli geomeetrilise kujundi \u00F%igsust.\n")
@@ -77,6 +81,37 @@ gpkg_sellest_alustame_gpkg_loomist <- function(pk = NULL, obj = NULL, gpkg_home
   cmd <- sprintf("qgis_process run %s --CRS=\"EPSG:3301\" --EXTENT=\"%s\" --HOVERLAY=0 --HSPACING=%s --TYPE=2 --VOVERLAY=0 --VSPACING=%s --OUTPUT=\"%s\"", algorithm, extent, hspacing, vspacing, output)
   cat(sprintf("\n%s\n", cmd))
   system(cmd)
+  ## 3. epk2t piirikasti konstrueerimine ja salvestamine s.t kuhu mahuvad sisse
+  ## meie piirkonna epk2t (1x1km) ruudud.
+  ## 3.1 Leiame piirikastiga seotud epk2t ruudud
+  str <- "{ 'INPUT' : 'postgres://dbname=\'data\' host=localhost port=6432 user=\'osm\' sslmode=disable authcfg=0i30k14 key=\'id\' srid=3301 type=MultiPolygon checkPrimaryKeyUnicity=\'1\' table=\"maaamet\".\"epk2t_grid\" (geom)', 'INTERSECT' : '/data/gpkg/artiklid/artikkel_210127_valga_matsalu_lahemaa/marja.gpkg|layername=bb', 'OUTPUT' : 'TEMPORARY_OUTPUT', 'PREDICATE' : [5,6] }"
+  # ruut::qgis_algorithm_search_by_word(str = "extract")
+  algorithm <- "native:extractbylocation"
+  # cat(ruut::qgis_show_help(algorithm = algorithm))
+  conf$table <- "epk2t_grid"
+  conf$schema <- "maaamet"
+  input <- ruut::construct_to_gpkg_output_postgres_str(
+    conf = conf, geometry_type = "Polygon", srid = 3301,
+    checkPrimaryKeyUnicity = TRUE, key = "id", geometry_field = "geom"
+  )
+  conf$gpkg_table <- "bb"
+  intersect <- ruut::construct_to_gpkg_output_file_str(conf = conf, is_input_str = TRUE)
+  str <- sprintf("{ 'INPUT' : '%s', 'INTERSECT' : '%s', 'OUTPUT' : '%s', 'PREDICATE' : [5,6] }", input, intersect, tmp_gpkg_file_output)
+  cmd <- ruut::construct_qgis_output_result_to_better_format(str, algorithm)
+  system(cmd)
+  test_layer_obj <- sf::read_sf(dsn = dsn, layer = "test_layer")
+  pk_attributes <- attributes(test_layer_obj$geom)
+  extent <- sprintf("%s,%s,%s,%s [EPSG:3301]", round((pk_attributes$bbox["xmin"] / 100), digits = 0) * 100, ceiling((pk_attributes$bbox["xmax"] / 100)) * 100, round((pk_attributes$bbox["ymin"] / 100), digits = 0) * 100, ceiling((pk_attributes$bbox["ymax"] / 100)) * 100)
+  hspacing <- (ceiling((pk_attributes$bbox["xmax"] / 100)) * 100) - (round((pk_attributes$bbox["xmin"] / 100), digits = 0) * 100)
+  vspacing <- (ceiling((pk_attributes$bbox["ymax"] / 100)) * 100) - (round((pk_attributes$bbox["ymin"] / 100), digits = 0) * 100)
+  conf$gpkg_table <- "bb2"
+  output <- ruut::construct_to_gpkg_output_file_str(conf = conf, is_input_str = F)
+  # ruut::qgis_algorithm_search_by_word(str = "grid")
+  algorithm <- "native:creategrid"
+  # cat(ruut::qgis_show_help(algorithm = algorithm))
+  cmd <- sprintf("qgis_process run %s --CRS=\"EPSG:3301\" --EXTENT=\"%s\" --HOVERLAY=0 --HSPACING=%s --TYPE=2 --VOVERLAY=0 --VSPACING=%s --OUTPUT=\"%s\"", algorithm, extent, hspacing, vspacing, output)
+  cat(sprintf("\n%s\n", cmd))
+  system(cmd)
   # Layers list
   sf::st_layers(dsn = dsn)
 }

R/gpkg_teisendame_jooni.R

@@ -41,7 +41,7 @@ gpkg_teisendame_jooni <- function(obj = NULL, gpkg_home = "/tmp") {
   # Layers list
   gpkg_info <- sf::st_layers(dsn = dsn)
   layer_names <- gpkg_info$name
-  layer_names <- layer_names[!layer_names %in% c("bb", "bb_epk10t_grid", "bb_epk02t_grid", "bb_epk2t_grid", "bb_epk10t", "bb_epk02t")]
+  layer_names <- layer_names[!layer_names %in% c("bb2", "bb2_epk10t_grid", "bb2_epk02t_grid", "bb2_epk2t_grid")] # c("bb", "bb2", "bb_epk10t_grid", "bb_epk02t_grid", "bb_epk2t_grid", "bb_epk10t", "bb_epk02t")]
   for (layer_name in layer_names) {
     ruumiline_obj <- sf::read_sf(dsn = dsn, layer = layer_name)
     ## Kontlrollime kas geomeetriline objekt on polügoon.
@@ -56,7 +56,7 @@ gpkg_teisendame_jooni <- function(obj = NULL, gpkg_home = "/tmp") {
       input <- ruut::construct_to_gpkg_output_file_str(conf = conf, geometry_field = "geom", is_input_str = T)
       conf$gpkg_table <- sprintf("%s", "test_layer")
       output <- ruut::construct_to_gpkg_output_file_str(conf = conf, geometry_field = "geom", is_input_str = F)
-      conf$gpkg_table <- sprintf("%s", "bb_epk02t_grid")
+      conf$gpkg_table <- sprintf("%s", "bb2_epk02t_grid")
       overlay <- ruut::construct_to_gpkg_output_file_str(conf = conf, geometry_field = "geom", is_input_str = T)
       str <- sprintf("{ 'INPUT' : '%s', 'INPUT_FIELDS' : ['fid'], 'OUTPUT' : '%s', 'OVERLAY' : '%s', 'OVERLAY_FIELDS' : [], 'OVERLAY_FIELDS_PREFIX' : '' }", input, output, overlay)
       cmd <- ruut::construct_qgis_output_result_to_better_format(str = str, algorithm = algorithm)

R/gpkg_teisendame_polygoone.R

@@ -41,7 +41,7 @@ gpkg_teisendame_polygoone <- function(obj = NULL, gpkg_home = "/tmp") {
   # Layers list
   gpkg_info <- sf::st_layers(dsn = dsn)
   layer_names <- gpkg_info$name
-  layer_names <- layer_names[!layer_names %in% c("bb", "bb_epk10t_grid", "bb_epk02t_grid", "bb_epk2t_grid", "bb_epk10t", "bb_epk02t")]
+  layer_names <- layer_names[!layer_names %in% c("bb2", "bb2_epk10t_grid", "bb2_epk02t_grid", "bb2_epk2t_grid")] # c("bb", "bb2", "bb_epk10t_grid", "bb_epk02t_grid", "bb_epk2t_grid", "bb_epk10t", "bb_epk02t")]
   for (layer_name in layer_names) {
     ruumiline_obj <- sf::read_sf(dsn = dsn, layer = layer_name)
     ## Kontlrollime kas geomeetriline objekt on polügoon.
@@ -56,7 +56,7 @@ gpkg_teisendame_polygoone <- function(obj = NULL, gpkg_home = "/tmp") {
       input <- ruut::construct_to_gpkg_output_file_str(conf = conf, geometry_field = "geom", is_input_str = T)
       conf$gpkg_table <- sprintf("%s", "test_layer")
       output <- ruut::construct_to_gpkg_output_file_str(conf = conf, geometry_field = "geom", is_input_str = F)
-      conf$gpkg_table <- sprintf("%s", "bb_epk02t_grid")
+      conf$gpkg_table <- sprintf("%s", "bb2_epk02t_grid")
       overlay <- ruut::construct_to_gpkg_output_file_str(conf = conf, geometry_field = "geom", is_input_str = T)
       str <- sprintf("{ 'INPUT' : '%s', 'INPUT_FIELDS' : ['fid'], 'OUTPUT' : '%s', 'OVERLAY' : '%s', 'OVERLAY_FIELDS' : [], 'OVERLAY_FIELDS_PREFIX' : '' }", input, output, overlay)
       cmd <- ruut::construct_qgis_output_result_to_better_format(str = str, algorithm = algorithm)

R/gpkg_teisendame_punkte.R

@@ -41,7 +41,7 @@ gpkg_teisendame_punkte <- function(obj = NULL, gpkg_home = "/tmp") {
   # Layers list
   gpkg_info <- sf::st_layers(dsn = dsn)
   layer_names <- gpkg_info$name
-  layer_names <- layer_names[!layer_names %in% c("bb", "bb_epk10t_grid", "bb_epk02t_grid", "bb_epk2t_grid", "bb_epk10t", "bb_epk02t")]
+  layer_names <- layer_names[!layer_names %in% c("bb2", "bb2_epk10t_grid", "bb2_epk02t_grid", "bb2_epk2t_grid")] # c("bb", "bb2", "bb_epk10t_grid", "bb_epk02t_grid", "bb_epk2t_grid", "bb_epk10t", "bb_epk02t")]
   for (layer_name in layer_names) {
     ruumiline_obj <- sf::read_sf(dsn = dsn, layer = layer_name)
     ## Punktide arv ruudus
@@ -54,7 +54,7 @@ gpkg_teisendame_punkte <- function(obj = NULL, gpkg_home = "/tmp") {
       output <- ruut::construct_to_gpkg_output_file_str(conf = conf, geometry_field = "geom", is_input_str = F)
       conf$gpkg_table <- sprintf("%s", layer_name)
       points <- ruut::construct_to_gpkg_output_file_str(conf = conf, geometry_field = "geom", is_input_str = T)
-      conf$gpkg_table <- sprintf("%s", "bb_epk02t_grid")
+      conf$gpkg_table <- sprintf("%s", "bb2_epk02t_grid")
       polygons <- ruut::construct_to_gpkg_output_file_str(conf = conf, geometry_field = "geom", is_input_str = T)
       str <- sprintf("{ 'CLASSFIELD' : '', 'FIELD' : 'numpoints', 'OUTPUT' : '%s', 'POINTS' : '%s', 'POLYGONS' : '%s', 'WEIGHT' : '' }", output, points, polygons)
       cmd <- ruut::construct_qgis_output_result_to_better_format(str = str, algorithm = algorithm)