Lisatud eesti põhikaardi kõikide kihtide ja mullastikukihi andmed.

R/gpkg_piirkonnale_joonte_lisamine.R

@@ -44,6 +44,7 @@ gpkg_piirkonnale_joonte_lisamine <- function(obj = NULL, gpkg_home = "/tmp") {
 
   ## -------------------- Loop -----------------------
   intersect_layers <- c("piir", "bb")
+  intersect_layers <- c("bb")
   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"))
@@ -56,6 +57,27 @@ 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_polygoonide_lisamine.R

@@ -44,6 +44,7 @@ gpkg_piirkonnale_polygoonide_lisamine <- function(obj = NULL, gpkg_home = "/tmp"
 
   ## -------------------- Loop -----------------------
   intersect_layers <- c("piir", "bb")
+  intersect_layers <- c("bb")
   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"))
@@ -53,6 +54,24 @@ gpkg_piirkonnale_polygoonide_lisamine <- function(obj = NULL, gpkg_home = "/tmp"
   andmed <- rbind(andmed, data.frame("schema" = "osm_shp", "table" = "pofw_a"))
   andmed <- rbind(andmed, data.frame("schema" = "osm_shp", "table" = "pois_a"))
   andmed <- rbind(andmed, data.frame("schema" = "osm_shp", "table" = "natural_a"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_201_meri_a"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_202_seisuveekogu_a"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_203_vooluveekogu_a"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_301_muu_kolvik_a"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_301_muu_kolvik_ka"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_302_ou_a"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_303_haritav_maa_a"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_304_lage_a"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_305_puittaimestik_a"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_306_margala_a"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_306_margala_ka"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_307_turbavali_a"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_401_hoone_ka"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_403_muu_rajatis_ka"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_404_maaalune_hoone_ka"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_501_tee_a"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_505_liikluskorralduslik_rajatis_ka"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "mullakaart"))
   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

@@ -44,6 +44,7 @@ gpkg_piirkonnale_punktide_lisamine <- function(obj = NULL, gpkg_home = "/tmp") {
 
   ## -------------------- Loop -----------------------
   intersect_layers <- c("piir", "bb")
+  intersect_layers <- c("bb")
   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"))
@@ -60,6 +61,19 @@ 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"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_402_korgrajatis_p"))
+  andmed <- rbind(andmed, data.frame("schema" = "eesti", "table" = "e_403_muu_rajatis_p"))
+  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

@@ -35,6 +35,7 @@ gpkg_piirkonnale_ruudustike_lisamine <- function(obj = NULL, gpkg_home = "/tmp")
   # 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")
   conf$schema <- "maaamet"
   # ruudud <- c("epk02t_grid")