Vahekoopia.

00_algandmed.R

@@ -48,9 +48,9 @@ for (i in 1:length(objektid)) {
 
   sf::st_geometry(pk) %>% plot()
   gpkg_home <- "/data/gpkg/artiklid/artikkel_210127_valga_matsalu_lahemaa"
-  # piirkonnale_ruudustike_lisamine(obj = obj, pk = pk, gpkg_home = gpkg_home)
-  # piirkonnale_polygoonide_lisamine(obj = obj, pk = pk, gpkg_home = gpkg_home)
-  # piirkonnale_punktide_lisamine(obj = obj, pk = pk, gpkg_home = gpkg_home)
+  piirkonnale_ruudustike_lisamine(obj = obj, pk = pk, gpkg_home = gpkg_home)
+  piirkonnale_polygoonide_lisamine(obj = obj, pk = pk, gpkg_home = gpkg_home)
+  piirkonnale_punktide_lisamine(obj = obj, pk = pk, gpkg_home = gpkg_home)
   piirkonnale_joonte_lisamine(obj = obj, pk = pk, gpkg_home = gpkg_home)
 }
 

gpkg/02_piirkonnale_polygoonide_lisamine.R

@@ -142,6 +142,21 @@ piirkonnale_polygoonide_lisamine <- function(obj = NULL, pk = NULL, gpkg_home =
     result
     # assign(as.character(andmed.df$table[j]), sf::read_sf(qgisprocess::qgis_output(result, "OUTPUT")))
     system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s -t_srs \"EPSG:3301\"", dsn, tmp_gpkg_file, output_layer_name))
+
+
+    # -------------------- alamkihtide filtreerimine -----------------
+    ## Maakasutus lahti kirjutada!!
+    if (output_layer_name == "landuse_a") {
+      system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_forest -t_srs \"EPSG:3301\" -where \"code = '7201'\"  ", dsn, tmp_gpkg_file, output_layer_name))
+      system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_residential -t_srs \"EPSG:3301\" -where \"code = '7203'\"  ", dsn, tmp_gpkg_file, output_layer_name))
+      system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_grass -t_srs \"EPSG:3301\" -where \"code = '7218'\"  ", dsn, tmp_gpkg_file, output_layer_name))
+      system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_park -t_srs \"EPSG:3301\" -where \"code = '7202'\"  ", dsn, tmp_gpkg_file, output_layer_name))
+      system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_farmland -t_srs \"EPSG:3301\" -where \"code = '7229'\"  ", dsn, tmp_gpkg_file, output_layer_name))
+      system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_scrub -t_srs \"EPSG:3301\" -where \"code = '7217'\"  ", dsn, tmp_gpkg_file, output_layer_name))
+      system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_meadow -t_srs \"EPSG:3301\" -where \"code = '7208'\"  ", dsn, tmp_gpkg_file, output_layer_name))
+      system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_cemetery -t_srs \"EPSG:3301\" -where \"code = '7206'\"  ", dsn, tmp_gpkg_file, output_layer_name))
+      system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_military -t_srs \"EPSG:3301\" -where \"code = '7213'\"  ", dsn, tmp_gpkg_file, output_layer_name))
+    }
   }
 
 

gpkg/03_piirkonnale_punktide_lisamine.R

@@ -29,11 +29,9 @@ piirkonnale_punktide_lisamine <- function(obj = NULL, pk = NULL, gpkg_home = "/t
     conf$dbname, conf$host, conf$port, conf$user, conf$sslmode, conf$password, "Point"
   )
   dsn <- sprintf("%s/%s.gpkg", gpkg_home, obj) # Polygon
-  dsn_p <- sprintf("%s/%s_p.gpkg", gpkg_home, obj) # Point
-  dsn_l <- sprintf("%s/%s_l.gpkg", gpkg_home, obj) # Linestring
   ogr <- sprintf(
     "ogr:dbname='%s'",
-    dsn_p
+    dsn
   )
   tmp_gpkg_file <- tempfile(fileext = ".gpkg")
 
@@ -88,10 +86,10 @@ piirkonnale_punktide_lisamine <- function(obj = NULL, pk = NULL, gpkg_home = "/t
     )
     result
     # assign(as.character(andmed.df$table[j]), sf::read_sf(qgisprocess::qgis_output(result, "OUTPUT")))
-    system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s -t_srs \"EPSG:3301\"", dsn_p, tmp_gpkg_file, output_layer_name))
+    system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s -t_srs \"EPSG:3301\"", dsn, tmp_gpkg_file, output_layer_name))
     ## AINULT ELAMUD aadressandmetest!!
     if (output_layer_name == "aadressandmed") {
-      system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_ee -t_srs \"EPSG:3301\" -where \"adob_liik = 'EE'\"  ", dsn_p, tmp_gpkg_file, output_layer_name))
+      system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_ee -t_srs \"EPSG:3301\" -where \"adob_liik = 'EE'\"  ", dsn, tmp_gpkg_file, output_layer_name))
     }
   }
 
@@ -99,6 +97,5 @@ piirkonnale_punktide_lisamine <- function(obj = NULL, pk = NULL, gpkg_home = "/t
   ## ---------------------- vaata layer'id ----------------------
   # Vaata layer'eid
   sf::st_layers(dsn = dsn)
-  sf::st_layers(dsn = dsn_p)
 }
 # piirkonnale_punktide_lisamine(obj = NULL, pk = NULL, gpkg_home = "/tmp")

gpkg/04_piirkonnale_joonte_lisamine.R

@@ -33,11 +33,9 @@ piirkonnale_joonte_lisamine <- function(obj = NULL, pk = NULL, gpkg_home = "/tmp
     conf$dbname, conf$host, conf$port, conf$user, conf$sslmode, conf$password, "Linestring"
   )
   dsn <- sprintf("%s/%s.gpkg", gpkg_home, obj) # Polygon
-  dsn_p <- sprintf("%s/%s_p.gpkg", gpkg_home, obj) # Point
-  dsn_l <- sprintf("%s/%s_l.gpkg", gpkg_home, obj) # Linestring
   ogr <- sprintf(
     "ogr:dbname='%s'",
-    dsn_l
+    dsn
   )
   tmp_gpkg_file <- tempfile(fileext = ".gpkg")
 
@@ -87,10 +85,10 @@ piirkonnale_joonte_lisamine <- function(obj = NULL, pk = NULL, gpkg_home = "/tmp
     )
     result
     # assign(as.character(andmed.df$table[j]), sf::read_sf(qgisprocess::qgis_output(result, "OUTPUT")))
-    system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s -t_srs \"EPSG:3301\"", dsn_l, tmp_gpkg_file, output_layer_name))
+    system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s -t_srs \"EPSG:3301\"", dsn, tmp_gpkg_file, output_layer_name))
     ## AINULT ELAMUD aadressandmetest!!
     # if (output_layer_name == "aadressandmed") {
-    #   system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_ee -t_srs \"EPSG:3301\" -where \"adob_liik = 'EE'\"  ", dsn_p, tmp_gpkg_file, output_layer_name))
+    #   system(sprintf("ogr2ogr -f GPKG -overwrite  %s %s -nln %s_ee -t_srs \"EPSG:3301\" -where \"adob_liik = 'EE'\"  ", dsn, tmp_gpkg_file, output_layer_name))
     # }
   }
 
@@ -98,7 +96,5 @@ piirkonnale_joonte_lisamine <- function(obj = NULL, pk = NULL, gpkg_home = "/tmp
   ## ---------------------- vaata layer'id ----------------------
   # Vaata layer'eid
   sf::st_layers(dsn = dsn)
-  sf::st_layers(dsn = dsn_p)
-  sf::st_layers(dsn = dsn_l)
 }
 # piirkonnale_joonte_lisamine(obj = NULL, pk = NULL, gpkg_home = "/tmp")