소스 검색

varundus 2026-09-12 08:00

ardo 1 개월 전
부모
커밋
49b8810ad7

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
.copilot/model-catalog-cache.json


+ 1 - 28
.stignore.bak-20260911

@@ -1,29 +1,2 @@
-# Iga seadme .obsidian on ainult lokaalne
 (?d).obsidian
-
-# SQLite ajutised failid - ära sünkroniseeri
-(?d)**/*-shm
-(?d)**/*-wal
-(?d)**/*-journal
-(?d)**/sync-conflict-*
-
-# Opencode
-(?d)opencode.db
-(?d)opencode.db-journal
-(?d)storage/
-
-# Git repo - ainult lokaalne varundus
-(?d).git
-# ===== Baasignore (OpenClaw 2026-09-10) =====
-(?d).DS_Store
-(?d)Thumbs.db
-(?d)desktop.ini
-(?d)*-wal
-(?d)*-shm
-(?d)*-journal
-(?d)*sync-conflict*
-(?d)*.swp
-(?d)*.swo
-(?d)*~
-(?d)~$*
-(?d).stversions
+.opencode

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 0 - 0
.stversions/.copilot/model-catalog-cache~20260912-074221.json


+ 29 - 0
.stversions/.stignore~20260911-201744.bak-20260911

@@ -0,0 +1,29 @@
+# Iga seadme .obsidian on ainult lokaalne
+(?d).obsidian
+
+# SQLite ajutised failid - ära sünkroniseeri
+(?d)**/*-shm
+(?d)**/*-wal
+(?d)**/*-journal
+(?d)**/sync-conflict-*
+
+# Opencode
+(?d)opencode.db
+(?d)opencode.db-journal
+(?d)storage/
+
+# Git repo - ainult lokaalne varundus
+(?d).git
+# ===== Baasignore (OpenClaw 2026-09-10) =====
+(?d).DS_Store
+(?d)Thumbs.db
+(?d)desktop.ini
+(?d)*-wal
+(?d)*-shm
+(?d)*-journal
+(?d)*sync-conflict*
+(?d)*.swp
+(?d)*.swo
+(?d)*~
+(?d)~$*
+(?d).stversions

+ 4 - 4
Doktoritöö/001_artiklid/OSM/OSM gravitatsiooni kaart.md

@@ -65,12 +65,12 @@ Et luua pgRouting graaf sinu OSM teede andmete põhjal, tuleb järgida järgmisi
 destination_host='localhost'
 destination_port='5432'
 destination_user='osm'
-destination_password='osm'
+destination_password=${PGPASSWORD:-<vaata ~/.config/osm/env.sh>}
 destination_dbname='data'
 destination_schema='aaa_osm'
 table_name='osm_roads'
 
-export PGPASSWORD=${destination_password}
+export PGPASSWORD=${PGPASSWORD:-<vaata ~/.config/osm/env.sh>}
 CONNECTION_NAME="-h ${destination_host} -p ${destination_port} -d ${destination_dbname} -U ${destination_user}"
 
 # Loome pgRoutingu jaoks sobiva teetabeli
@@ -162,12 +162,12 @@ Suurepärane! Lisame nüüd liiklusklasside põhised kaalud, et pgRouting arvest
 destination_host='localhost'
 destination_port='5432'
 destination_user='osm'
-destination_password='osm'
+destination_password=${PGPASSWORD:-<vaata ~/.config/osm/env.sh>}
 destination_dbname='data'
 destination_schema='aaa_osm'
 table_name='osm_roads'
 
-export PGPASSWORD=${destination_password}
+export PGPASSWORD=${PGPASSWORD:-<vaata ~/.config/osm/env.sh>}
 CONNECTION_NAME="-h ${destination_host} -p ${destination_port} -d ${destination_dbname} -U ${destination_user}"
 
 # Loome pgRoutingu jaoks sobiva teetabeli koos kaaludega

+ 7 - 7
Doktoritöö/001_artiklid/OSM/OSM kaardid.md

@@ -11,14 +11,14 @@ Siin on sinu OSM andmete importimise skript PostGIS andmebaasi **korralikult vor
 destination_host='localhost'
 destination_port='5432'
 destination_user='osm'
-destination_password='osm'
+destination_password=${PGPASSWORD:-<vaata ~/.config/osm/env.sh>}
 destination_dbname='data'
 destination_schema='aaa_osm'
 destination_SRS='EPSG:3301'
 
 # PostgreSQL ühenduse string
-destination="host='${destination_host}' port='${destination_port}' dbname='${destination_dbname}' user='${destination_user}' password='${destination_password}'"
-export PGPASSWORD=${destination_password}
+destination="host='${destination_host}' port='${destination_port}' dbname='${destination_dbname}' user='${destination_user}' password='${PGPASSWORD:-<vaata ~/.config/osm/env.sh>}'"
+export PGPASSWORD=${PGPASSWORD:-<vaata ~/.config/osm/env.sh>}
 CONNECTION_NAME="-h ${destination_host} -p ${destination_port} -d ${destination_dbname} -U ${destination_user}"
 ```
 
@@ -158,7 +158,7 @@ psql ${CONNECTION_NAME} -c "DROP TABLE IF EXISTS ${SCHEMA}.${TABLE_NAME};"
 # Impordi GPKG PostGIS andmebaasi, teisendades koordinaadid EPSG:3301
 ogr2ogr \
   --config PG_USE_COPY YES \
-  -f PostgreSQL PG:"dbname='${destination_dbname}' host='${destination_host}' port='${destination_port}' user='${destination_user}' password='${destination_password}' sslmode=disable active_schema=${SCHEMA}" \
+  -f PostgreSQL PG:"dbname='${destination_dbname}' host='${destination_host}' port='${destination_port}' user='${destination_user}' password='${PGPASSWORD:-<vaata ~/.config/osm/env.sh>}' sslmode=disable active_schema=${SCHEMA}" \
   -nln ${TABLE_NAME} \
   -s_srs EPSG:4326 \
   -t_srs EPSG:3301 \
@@ -189,12 +189,12 @@ https://geoportaal.maaamet.ee/wfs/katastriuksused
 destination_host='localhost'
 destination_port='5432'
 destination_user='osm'
-destination_password='osm'
+destination_password=${PGPASSWORD:-<vaata ~/.config/osm/env.sh>}
 destination_dbname='data'
 destination_schema='aaa_osm'
 table_name='katastriuksused'
 
-export PGPASSWORD=${destination_password}
+export PGPASSWORD=${PGPASSWORD:-<vaata ~/.config/osm/env.sh>}
 CONNECTION_NAME="-h ${destination_host} -p ${destination_port} -d ${destination_dbname} -U ${destination_user}"
 
 # WFS teenuse URL
@@ -206,7 +206,7 @@ psql ${CONNECTION_NAME} -c "DROP TABLE IF EXISTS ${destination_schema}.${table_n
 # Impordime katastriüksused PostGIS andmebaasi
 ogr2ogr \
   --config PG_USE_COPY YES \
-  -f "PostgreSQL" PG:"host=${destination_host} dbname=${destination_dbname} user=${destination_user} password=${destination_password} active_schema=${destination_schema}" \
+  -f "PostgreSQL" PG:"host=${destination_host} dbname=${destination_dbname} user=${destination_user} password=${PGPASSWORD:-<vaata ~/.config/osm/env.sh>} active_schema=${destination_schema}" \
   "${wfs_url}" \
   -nln ${table_name} \
   -t_srs EPSG:3301

+ 8 - 14
Doktoritöö/001_artiklid/OSM/shell/env.sh

@@ -1,15 +1,9 @@
 #!/usr/bin/env bash
-
-# Ühenduse andmed
-export destination_host=100.83.169.78
-export destination_port=5432
-export destination_user=osm
-export destination_password=osm
-export destination_dbname=data
-export destination_schema=osm
-export destination_SRS='EPSG:3301'
-
-# PostgreSQL ühenduse string
-export destination="host=${destination_host} port=${destination_port} dbname=${destination_dbname} user=${destination_user} password=${destination_password}"
-export CONNECTION_NAME="-h ${destination_host} -p ${destination_port} -d ${destination_dbname} -U ${destination_user}"
-export PGPASSWORD=${destination_password}
+# NB: saladused EI ole enam vault'is (Syncthing sünkrooniks neid kõigisse seadmetesse).
+# Tegelikud väärtused: ~/.config/osm/env.sh  (ainult ohmu-l, ei sünkroniseerita)
+if [ -f "$HOME/.config/osm/env.sh" ]; then
+  # shellcheck disable=SC1091
+  source "$HOME/.config/osm/env.sh"
+else
+  echo "HOIATUS: ~/.config/osm/env.sh puudub — loo see uuesti (vt JUHEND)." >&2
+fi

이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.