Vahekoopia.

R/gpkg_piirkonnale_joonte_lisamine.R

@@ -57,27 +57,16 @@ gpkg_piirkonnale_joonte_lisamine <- function(obj = NULL, gpkg_home = "/tmp") {
   andmed <- rbind(andmed, data.frame("schema" = "teeregister_wfs", "table" = "n_liiklussagedus"))
   andmed <- rbind(andmed, data.frame("schema" = "teeregister_wfs", "table" = "n_omand"))
   andmed <- rbind(andmed, data.frame("schema" = "gtfs", "table" = "shapes"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_102_nolv_j"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_103_pinnavorm_j"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_203_vooluveekogu_j"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_204_kaldajoon_j"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_205_hudrotehniline_rajatis_j"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_206_truup_j"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_305_puittaimestik_j"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_405_piire_j"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_501_tee_j"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_502_roobastee_j"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_503_siht_j"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_505_liikluskorralduslik_rajatis_j"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_601_elektriliin_j"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_603_torujuhe_j"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "kolvikupiir_j"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "korgus_j"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "langujoon_j"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "piir_j"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "sild_j"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "sygavus_j"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "voolusuund_j"))
   for (intersect in intersect_layers) {
     conf$gpkg_table <- intersect
     intersect_layer <- ruut::construct_to_gpkg_output_file_str(conf = conf, is_input_str = T)

R/gpkg_piirkonnale_punktide_lisamine.R

@@ -61,8 +61,6 @@ gpkg_piirkonnale_punktide_lisamine <- function(obj = NULL, gpkg_home = "/tmp") {
   andmed <- rbind(andmed, data.frame("schema" = "teeregister_wfs", "table" = "n_sild"))
   andmed <- rbind(andmed, data.frame("schema" = "teeregister_wfs", "table" = "n_teeosa_points"))
   andmed <- rbind(andmed, data.frame("schema" = "teeregister_wfs", "table" = "n_ylek"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_101_kivi_p"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_103_pinnavorm_p"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_202_seisuveekogu_p"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_301_muu_kolvik_p"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_305_puittaimestik_p"))
@@ -71,9 +69,6 @@ gpkg_piirkonnale_punktide_lisamine <- function(obj = NULL, gpkg_home = "/tmp") {
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_602_tehnopaigaldis_p"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "kirik_p"))
   andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "kohanimi"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "korgus_p"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "roostik_p"))
-  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "sygavus_p"))
   for (intersect in intersect_layers) {
     conf$gpkg_table <- intersect
     intersect_layer <- ruut::construct_to_gpkg_output_file_str(conf = conf, is_input_str = T)

R/gpkg_piirkonnale_ruudustike_lisamine.R

@@ -52,7 +52,7 @@ gpkg_piirkonnale_ruudustike_lisamine <- function(obj = NULL, gpkg_home = "/tmp")
         checkPrimaryKeyUnicity = TRUE, key = "id"
       )
       ## ------------------- QGIS: qgisprocess ----------------------
-      str <- paste0("{ 'INPUT' : '", input, "', 'INTERSECT' : '", intersect_layer, "', 'OUTPUT' : '", output, "', 'PREDICATE' : [0] }")
+      str <- paste0("{ 'INPUT' : '", input, "', 'INTERSECT' : '", intersect_layer, "', 'OUTPUT' : '", output, "', 'PREDICATE' : [5,6] }")
       cmd <- ruut::construct_qgis_output_result_to_better_format(str = str, algorithm = algorithm)
       cat(sprintf("\n%s\n", cmd))
       system(cmd)