diff --git a/PREBERIME.md b/PREBERIME.md
index 6f5e066..3eff12b 100644
--- a/PREBERIME.md
+++ b/PREBERIME.md
@@ -1,4 +1,4 @@
-## [GeoCoordinateConverter]
+## Geo Coordinate Converter http://geocoordinateconverter.tk
For English version of this file see [README.md].
**gk-slo** je konverter med geografskimi kartezičnimi koordinatami
@@ -7,10 +7,20 @@ For English version of this file see [README.md].
nadomestilo za uradni program za konverzijo [SiTra] (s Helmertovimi
parametri za vso Slovenijo, brez regionalnih parametrov) ali natančnejši,
če se uporabi vgrajena afina/trikotniška transformacija z referenčnimi
-[virtualnimi veznimi točkami] (za natančen opis glej [AFT.md]).
+[virtualnimi veznimi točkami v3.0] (za natančen opis glej [AFT.md]).
-
-
+
+
+Program lahko bere datoteke v formatu [SiTraNet] (ASCII XYZ) ali
+[ESRI shapefile] (ArcGIS .shp format, uporabi **gk-shp**).
+
+Na razpolago so naslednje transformacije (v obe smeri):
+
+1. xy (D96/TM) **⇔** φλ (ETRS89)
+2. xy (D48/GK) **⇔** xy (D96/TM) Helmertova transformacija
+3. xy (D48/GK) **⇔** φλ (ETRS89) Helmertova transformacija
+4. xy (D48/GK) **⇔** xy (D96/TM) Afina transformacija
+5. xy (D48/GK) **⇔** φλ (ETRS89) Afina transformacija
Pri računanju višin s pomočjo modela geoida sta na razpolago dva absolutna
modela geoida za Slovenijo: Slo2000 in [EGM2008].
@@ -26,8 +36,8 @@ Natančnejši opis podprogramov za konverzijo koordinat in njihov API
Spisek uporabljene literature (s povezavami do dokumentov) je v datoteki
[literature.md].
-Prevedeno verzijo **gk-slo za Windows** (32-bitna, prevedena z MinGW)
-lahko dobite na [gk-slo-7.01.zip].
+Prevedeno verzijo **gk-slo/gk-shp za Windows** (32-bitna, prevedena z MinGW)
+lahko dobite na [gk-slo-8.00.zip].
### Oznake
@@ -55,18 +65,32 @@ Ng = geoidna višina
- **[geo.c]**
Zbirka podprogramov za konverzijo koordinat
- **[gk-slo.c]**
- Glavni program za konverzijo koordinat za uporabo iz ukazne vrstice
+ Glavni program za konverzijo koordinat iz XYZ datotek
+- **[gk-shp.c]**
+ Glavni program za konverzijo koordinat iz shapefile datotek
+- **[shapelib]**
+ Datoteke iz [Shapefile C Library], potrebne za branje in pisanje ESRI
+ Shapefile datotek
### Kako prevesti program
#### Unix
-```$ cc -O2 -Wall -msse2 -mfpmath=sse gk-slo.c util.c geo.c -o gk-slo -lm -lrt``` ali
+```$ cc -O2 -Wall -msse2 -mfpmath=sse gk-slo.c util.c geo.c -o gk-slo -lm -lrt```
+```$ cc -O2 -Wall -msse2 -mfpmath=sse -Ishapelib gk-shp.c util.c geo.c \ ```
+ ```shapelib\shpopen.c shapelib\dbfopen.c shapelib\safileio.c shapelib\shptree.c -o gk-shp -lm -rt```
+ali
```$ make -f Makefile.unix```
#### MinGW na Windows
-```$ gcc -O2 -Wall -msse2 -mfpmath=sse gk-slo.c util.c geo.c -o gk-slo.exe``` ali
+```$ gcc -O2 -Wall -msse2 -mfpmath=sse -D_WCHAR gk-slo.c util.c geo.c -o gk-slo.exe```
+```$ gcc -O2 -Wall -msse2 -mfpmath=sse -Ishapelib gk-shp.c util.c geo.c \ ```
+ ```shapelib\shpopen.c shapelib\dbfopen.c shapelib\safileio.c shapelib\shptree.c -o gk-shp.exe```
+ali
```$ make -f Makefile.mingw```
#### Microsoft C
-```$ cl /O2 /Wall gk-slo.c util.c geo.c``` ali
+```$ cl /O2 /Wall -D_WCHAR gk-slo.c util.c geo.c```
+```$ cl /O2 /Wall /Ishapelib gk-shp.c util.c geo.c \ ```
+ ```shapelib\shpopen.c shapelib\dbfopen.c shapelib\safileio.c shapelib\shptree.c```
+ali
```$ make -f Makefile.msc```
Opciji ```-msse2 -mfpmath=sse``` sta potrebni, ker drugače dobimo različne
@@ -77,11 +101,6 @@ rezultate na različnih sistemih (za podrobnejšo razlago glej [StackOverflow]).
$ gk-slo [<opcije>] [<vhodime> ...]
-d omogoči debug izpis
- -x izpiši referenčni test in končaj
- -gd <n> zgeneriraj podatke (znotraj Slovenije) in končaj
- 1: zgeneriraj xy (d96tm) podatke
- 2: zgeneriraj fila (etrs89) podatke
- 3: zgeneriraj xy (d48gk) podatke
-ht izračunaj izhodno višino s 7-param. Helmertovo trans.
-hc kopiraj vhodno višino nespremenjeno na izhod
-hg izračunaj izhodno višino s pomočjo modela geoida (privzeto)
@@ -89,28 +108,60 @@ $ gk-slo [<opcije>] [<vhodime> ...]
privzeto: Slo2000
-dms prikaži fila v SMS formatu za višino
-t <n> izberi transformacijo:
- 1: xy (d96tm) --> fila (etrs89), hg?, privzeto
- 2: fila (etrs89) --> xy (d96tm), hg
- 3: xy (d48gk) --> fila (etrs89), ht
- 4: fila (etrs89) --> xy (d48gk), hg
- 5: xy (d48gk) --> xy (d96tm), hg(hc)
- 6: xy (d96tm) --> xy (d48gk), ht(hc)
- 7: xy (d48gk) --> xy (d96tm), hc, afina trans.
- 8: xy (d96tm) --> xy (d48gk), hc, afina trans.
+ 1: xy (d96tm) --> fila (etrs89), hg?, privzeto
+ 2: fila (etrs89) --> xy (d96tm), hg
+ 3: xy (d48gk) --> fila (etrs89), ht
+ 4: fila (etrs89) --> xy (d48gk), hg
+ 5: xy (d48gk) --> xy (d96tm), hg(hc)
+ 6: xy (d96tm) --> xy (d48gk), ht(hc)
+ 7: xy (d48gk) --> xy (d96tm), hc, affine trans.
+ 8: xy (d96tm) --> xy (d48gk), hc, affine trans.
+ 9: xy (d48gk) --> fila (etrs89), hg, affine trans.
+ 10: fila (etrs89) --> xy (d48gk), hg, affine trans.
-r obrni vrstni red branja xy/fila
- (opozorilo se izpiše če je y < 200000)
+ (opozorilo se izpiše če je y < 200000 ali la > 17.0)
<vhodime> preberi in konvertiraj vhodne podatke iz datoteke <vhodime>
<vhodime> "-" pomeni stdin, prej uporabi "--"
-o -|=|<izhodime> zapiši izhodne podatke na:
-: stdout (privzeto)
=: prilepi ".out" k imenu vsake datoteke <vhodime> in
zapiši izhodne podatke na te ločene datoteke
- <izhodime>: zapiši vse izhodne podatke na 1 datoteko <izhodime>
+ <izhodime>: zapiši vse izhodne podatke na eno datoteko <izhodime>
Tipični format vhodnih podatkov (SiTra):
[<oznaka>] <fi|x> <la|y> <h|H>
+Nov program **gk-shp**, ki lahko bere [ESRI shapefile] (ArcGIS .shp format),
+ima podobno sintakso:
+
+$ gk-shp [<options>] <vhodime> <izhodime>
+ -d omogoči podrobnejši izpis
+ -ht izračunaj izhodno višino s 7-param. Helmertovo trans.
+ -hc kopiraj vhodno višino nespremenjeno na izhod
+ -hg izračunaj izhodno višino s pomočjo modela geoida (privzeto)
+ -g slo|egm izberi model geoida (Slo2000 ali EGM2008)
+ privzeto: Slo2000
+ -t <n> izberi transformacijo:
+ 1: xy (d96tm) --> fila (etrs89), hg?, privzeto
+ 2: fila (etrs89) --> xy (d96tm), hg
+ 3: xy (d48gk) --> fila (etrs89), ht
+ 4: fila (etrs89) --> xy (d48gk), hg
+ 5: xy (d48gk) --> xy (d96tm), hg(hc)
+ 6: xy (d96tm) --> xy (d48gk), ht(hc)
+ 7: xy (d48gk) --> xy (d96tm), hc, afina trans.
+ 8: xy (d96tm) --> xy (d48gk), hc, afina trans.
+ 9: xy (d48gk) --> fila (etrs89), hg, afina trans.
+ 10: fila (etrs89) --> xy (d48gk), hg, afina trans.
+ -r obrni vrstni red branja xy/fila
+ (opozorilo se izpiše če je y < 200000 oz. la > 17.0)
+ <vhodime> preberi in konvertiraj vhodne podatke iz datoteke <vhodime>
+ <izhodime> zapiši izhodne podatke na datoteko <izhodime>
+
+Input data format:
+ESRI Shapefile (ArcGIS)
+
+
#### Primer 1 (D48)
Vhodna datoteka VTG2225.XYZ (DMV, v formatu [SiTraNet], Gauss-Krueger/D48):
@@ -123,12 +174,12 @@ Konvertiraj v nov koordinatni sistem (Transverzalni Merkator/D96); višine se
kopirajo, ne preračunavajo:
$ gk-slo -t 5 -hc VTG2225.XYZ
-VTG2225.XYZ: possibly reversed xy
+VTG2225.XYZ: possibly reversed x/y
0000001 509487.490 575640.546 343.300
0000002 509492.490 575640.546 342.800
0000003 509497.490 575640.546 342.300
-Če dobiš opozorilo "**possibly reversed xy**", uporabi opcijo "**-r**"
+Če dobiš opozorilo "**possibly reversed x/y**", uporabi opcijo "**-r**"
da dobiš pravilno konverzijo:
$ gk-slo -t 5 -hc -r VTG2225.XYZ
@@ -242,16 +293,39 @@ VTH0722.XYZ.out
...
-[GeoCoordinateConverter]: http://geocoordinateconverter.tk/indeks.html
+
+#### Example 5 (ESRI shapefiles)
+Vhodna datoteka file RABA_20151031.shp ([GERK], v formatu [ESRI shapefile],
+Gauss-Krueger/D48), konvertiraj v ETRS89/WGS84 koordinate z uporabo afine
+transformacije (s podrobnejšim izpisom):
+
+$ gk-shp -t 9 -dd RABA_20151031.shp raba_conv.shp
+Processing RABA_20151031
+Shapefile type: Polygon, number of shapes: 1601832
+Shape: 678 (0.04%) ...
+
+Rezultat konverzije je skupek datotek kot jih določa format [ESRI shapefile]:
+
+raba_conv.cpg
+raba_conv.dbf
+raba_conv.prj
+raba_conv.shp
+raba_conv.shx
+
+V datoteki raba_conv.prj je shranjena izhodna projekcija (WGS84), kar omogoča
+lažje odpiranje v GIS programih.
+
+[Geo Coordinate Converter]: http://geocoordinateconverter.tk/indeks.html
[README.md]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/README.md
[SiTra]: http://sitra.sitranet.si
[SiTraNet]: http://sitranet.si
-[virtualnimi veznimi točkami]: http://www.e-prostor.gov.si/si/zbirke_prostorskih_podatkov/drzavni_koordinatni_sistem/horizontalni_drzavni_koordinatni_sistem_d96tm/d96tm/transformacijski_parametri/
+[virtualnimi veznimi točkami v3.0]: http://www.e-prostor.gov.si/si/zbirke_prostorskih_podatkov/drzavni_koordinatni_sistem/horizontalni_drzavni_koordinatni_sistem_d96tm/d96tm/transformacijski_parametri/
[AFT.md]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/aft/PREBERIME.md
+[ESRI shapefile]: https://en.wikipedia.org/wiki/Shapefile
[EGM2008]: http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008/egm08_wgs84.html
[geo_api.md]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/geo_api.md
[literature.md]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/literature.md
-[gk-slo-7.01.zip]: https://app.box.com/s/vyj1mlghsuevcy921zhs
+[gk-slo-8.00.zip]: https://app.box.com/s/wqsc06i49i8phwsd2g7rci6qhy6qwix1
[common.h]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/common.h
[util.c]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/util.c
[geoid_slo.h]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/geoid_slo.h
@@ -261,4 +335,8 @@ VTH0722.XYZ.out
[geo.h]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/geo.h
[geo.c]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/geo.c
[gk-slo.c]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/gk-slo.c
+[gk-shp.c]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/gk-shp.c
+[shapelib]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/shapelib/
+[Shapefile C Library]: http://shapelib.maptools.org
[StackOverflow]: http://stackoverflow.com/questions/13571073/how-to-ensure-same-float-numbers-on-different-systems
+[GERK]: http://rkg.gov.si/GERK/
diff --git a/README.md b/README.md
index 19cfd82..7bafcf3 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-## [GeoCoordinateConverter]
+## Geo Coordinate Converter http://geocoordinateconverter.tk
Za slovensko verzijo te datoteke glej [PREBERIME.md].
**gk-slo** is a converter between geographic cartesian coordinates
@@ -7,11 +7,21 @@ Za slovensko verzijo te datoteke glej [PREBERIME.md].
as a replacement for the official conversion program [SiTra] (with
Helmert parameters for the whole Slovenia, no regional parameters)
or more precise when used with the built-in affine/triangle-based
-transformation using the reference [virtual tie points] (for
+transformation using the reference [virtual tie points v3.0] (for
detailed description see [AFT.md]).
-
-
+
+
+Program can read files in [SiTraNet] format (ASCII XYZ) or [ESRI shapefile]
+(ArcGIS .shp format, use **gk-shp**).
+
+The following transformations are available (in both directions):
+
+1. xy (D96/TM) **⇔** φλ (ETRS89)
+2. xy (D48/GK) **⇔** xy (D96/TM) Helmert transformation
+3. xy (D48/GK) **⇔** φλ (ETRS89) Helmert transformation
+4. xy (D48/GK) **⇔** xy (D96/TM) Affine transformation
+5. xy (D48/GK) **⇔** φλ (ETRS89) Affine transformation
For calculating heights with the help of geoid model two absolute
geoid models for Slovenia are available: Slo2000 and [EGM2008].
@@ -26,8 +36,8 @@ Detailed description of coordinate conversion routines and their API
List of literature used (with links to documents) is in file [literature.md].
-Precompiled version of **gk-slo for Windows** (32-bit, compiled with MinGW)
-can be downloaded from [gk-slo-7.01.zip].
+Precompiled version of **gk-slo/gk-shp for Windows** (32-bit, compiled with
+MinGW) can be downloaded from [gk-slo-8.00.zip].
### Conventions
@@ -55,18 +65,32 @@ Ng = geoid height
- **[geo.c]**
Collection of coordinate conversion routines
- **[gk-slo.c]**
- Main cmd-line program for converting coordinates
+ Main cmd-line program for converting coordinates from XYZ files
+- **[gk-shp.c]**
+ Main cmd-line program for converting coordinates from shapefiles
+- **[shapelib]**
+ Files from [Shapefile C Library] needed for reading and writing ESRI
+ Shapefiles
### How to compile
#### Unix
-```$ cc -O2 -Wall -msse2 -mfpmath=sse gk-slo.c util.c geo.c -o gk-slo -lm -lrt``` or
+```$ cc -O2 -Wall -msse2 -mfpmath=sse gk-slo.c util.c geo.c -o gk-slo -lm -lrt```
+```$ cc -O2 -Wall -msse2 -mfpmath=sse -Ishapelib gk-shp.c util.c geo.c \ ```
+ ```shapelib\shpopen.c shapelib\dbfopen.c shapelib\safileio.c shapelib\shptree.c -o gk-shp -lm -rt```
+or
```$ make -f Makefile.unix```
#### MinGW on Windows
-```$ gcc -O2 -Wall -msse2 -mfpmath=sse gk-slo.c util.c geo.c -o gk-slo.exe``` or
+```$ gcc -O2 -Wall -msse2 -mfpmath=sse -D_WCHAR gk-slo.c util.c geo.c -o gk-slo.exe```
+```$ gcc -O2 -Wall -msse2 -mfpmath=sse -Ishapelib gk-shp.c util.c geo.c \ ```
+ ```shapelib\shpopen.c shapelib\dbfopen.c shapelib\safileio.c shapelib\shptree.c -o gk-shp.exe```
+or
```$ make -f Makefile.mingw```
#### Microsoft C
-```$ cl /O2 /Wall gk-slo.c util.c geo.c``` or
+```$ cl /O2 /Wall -D_WCHAR gk-slo.c util.c geo.c```
+```$ cl /O2 /Wall /Ishapelib gk-shp.c util.c geo.c \ ```
+ ```shapelib\shpopen.c shapelib\dbfopen.c shapelib\safileio.c shapelib\shptree.c```
+or
```$ make -f Makefile.msc```
Options ```-msse2 -mfpmath=sse``` are needed because otherwise we'll get
@@ -78,11 +102,6 @@ different results on different systems (for more explanation see
$ gk-slo [<options>] [<inpname> ...]
-d enable debug output
- -x print reference test and exit
- -gd <n> generate data (inside Slovenia) and exit
- 1: generate xy (d96tm) data
- 2: generate fila (etrs89) data
- 3: generate xy (d48gk) data
-ht calculate output height with 7-params Helmert trans.
-hc copy input height unchanged to output
-hg calculate output height from geoid model (default)
@@ -90,16 +109,18 @@ $ gk-slo [<options>] [<inpname> ...]
default: Slo2000
-dms display fila in DMS format after height
-t <n> select transformation:
- 1: xy (d96tm) --> fila (etrs89), hg?, default
- 2: fila (etrs89) --> xy (d96tm), hg
- 3: xy (d48gk) --> fila (etrs89), ht
- 4: fila (etrs89) --> xy (d48gk), hg
- 5: xy (d48gk) --> xy (d96tm), hg(hc)
- 6: xy (d96tm) --> xy (d48gk), ht(hc)
- 7: xy (d48gk) --> xy (d96tm), hc, affine trans.
- 8: xy (d96tm) --> xy (d48gk), hc, affine trans.
+ 1: xy (d96tm) --> fila (etrs89), hg?, default
+ 2: fila (etrs89) --> xy (d96tm), hg
+ 3: xy (d48gk) --> fila (etrs89), ht
+ 4: fila (etrs89) --> xy (d48gk), hg
+ 5: xy (d48gk) --> xy (d96tm), hg(hc)
+ 6: xy (d96tm) --> xy (d48gk), ht(hc)
+ 7: xy (d48gk) --> xy (d96tm), hc, affine trans.
+ 8: xy (d96tm) --> xy (d48gk), hc, affine trans.
+ 9: xy (d48gk) --> fila (etrs89), hg, affine trans.
+ 10: fila (etrs89) --> xy (d48gk), hg, affine trans.
-r reverse parsing order of xy/fila
- (warning displayed if y < 200000)
+ (warning is displayed if y < 200000 or la > 17.0)
<inpname> parse and convert input data from <inpname>
<inpname> "-" means stdin, use "--" before
-o -|=|<outname> write output data to:
@@ -112,6 +133,37 @@ Typical input data format (SiTra):
[<label>] <fi|x> <la|y> <h|H>
+A new program **gk-shp**, able to read [ESRI shapefiles] (ArcGIS .shp format),
+has similar syntax:
+
+$ gk-shp [<options>] <inpname> <outname>
+ -d enable debug output
+ -ht calculate output height with 7-params Helmert trans.
+ -hc copy input height unchanged to output
+ -hg calculate output height from geoid model (default)
+ -g slo|egm select geoid model (Slo2000 or EGM2008)
+ default: Slo2000
+ -dms display fila in DMS format after height
+ -t <n> select transformation:
+ 1: xy (d96tm) --> fila (etrs89), hg?, default
+ 2: fila (etrs89) --> xy (d96tm), hg
+ 3: xy (d48gk) --> fila (etrs89), ht
+ 4: fila (etrs89) --> xy (d48gk), hg
+ 5: xy (d48gk) --> xy (d96tm), hg(hc)
+ 6: xy (d96tm) --> xy (d48gk), ht(hc)
+ 7: xy (d48gk) --> xy (d96tm), hc, affine trans.
+ 8: xy (d96tm) --> xy (d48gk), hc, affine trans.
+ 9: xy (d48gk) --> fila (etrs89), hg, affine trans.
+ 10: fila (etrs89) --> xy (d48gk), hg, affine trans.
+ -r reverse parsing order of xy/fila
+ (warning is displayed if y < 200000 or la > 17.0)
+ <inpname> parse and convert input data from <inpname>
+ <outname> write output data to <outname>
+
+Input data format:
+ESRI Shapefile (ArcGIS)
+
+
#### Example 1 (D48)
Input file VTG2225.XYZ (DMV, in [SiTraNet] format, Gauss-Krueger/D48):
@@ -124,12 +176,12 @@ Convert to new coordinate system (Transverse Mercator/D96); heights should
be copied, not calculated:
$ gk-slo -t 5 -hc VTG2225.XYZ
-VTG2225.XYZ: possibly reversed xy
+VTG2225.XYZ: possibly reversed x/y
0000001 509487.490 575640.546 343.300
0000002 509492.490 575640.546 342.800
0000003 509497.490 575640.546 342.300
-If you see the warning "**possibly reversed xy**", use the option "**-r**"
+If you see the warning "**possibly reversed x/y**", use the option "**-r**"
to get the correct conversion:
$ gk-slo -t 5 -hc -r VTG2225.XYZ
@@ -241,16 +293,39 @@ VTH0722.XYZ.out
...
-[GeoCoordinateConverter]: http://geocoordinateconverter.tk
+
+#### Example 5 (ESRI shapefiles)
+Input file RABA_20151031.shp ([GERK], in [ESRI shapefile] format,
+Gauss-Krueger/D48), convert to ETRS89/WGS84 coordinates using affine
+transformation (with debug info):
+
+$ gk-shp -t 9 -dd RABA_20151031.shp raba_conv.shp
+Processing RABA_20151031
+Shapefile type: Polygon, number of shapes: 1601832
+Shape: 678 (0.04%) ...
+
+Result of conversion is a set of files according to [ESRI shapefile] format:
+
+raba_conv.cpg
+raba_conv.dbf
+raba_conv.prj
+raba_conv.shp
+raba_conv.shx
+
+In file raba_conv.prj an output projection (WGS84) is stored, so converted
+files can be easily opened by GIS programs.
+
+[Geo Coordinate Converter]: http://geocoordinateconverter.tk
[PREBERIME.md]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/PREBERIME.md
[SiTra]: http://sitra.sitranet.si
[SiTraNet]: http://sitranet.si
-[virtual tie points]: http://www.e-prostor.gov.si/si/zbirke_prostorskih_podatkov/drzavni_koordinatni_sistem/horizontalni_drzavni_koordinatni_sistem_d96tm/d96tm/transformacijski_parametri/
+[virtual tie points v3.0]: http://www.e-prostor.gov.si/si/zbirke_prostorskih_podatkov/drzavni_koordinatni_sistem/horizontalni_drzavni_koordinatni_sistem_d96tm/d96tm/transformacijski_parametri/
[AFT.md]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/aft/README.md
+[ESRI shapefile]: https://en.wikipedia.org/wiki/Shapefile
[EGM2008]: http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008/egm08_wgs84.html
[geo_api.md]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/geo_api.md
[literature.md]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/literature.md
-[gk-slo-7.01.zip]: https://app.box.com/s/vyj1mlghsuevcy921zhs
+[gk-slo-8.00.zip]: https://app.box.com/s/wqsc06i49i8phwsd2g7rci6qhy6qwix1
[common.h]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/common.h
[util.c]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/util.c
[geoid_slo.h]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/geoid_slo.h
@@ -260,4 +335,8 @@ VTH0722.XYZ.out
[geo.h]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/geo.h
[geo.c]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/geo.c
[gk-slo.c]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/gk-slo.c
+[gk-shp.c]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/gk-shp.c
+[shapelib]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/shapelib/
+[Shapefile C Library]: http://shapelib.maptools.org
[StackOverflow]: http://stackoverflow.com/questions/13571073/how-to-ensure-same-float-numbers-on-different-systems
+[GERK]: http://rkg.gov.si/GERK/
\ No newline at end of file
diff --git a/aft/PREBERIME.md b/aft/PREBERIME.md
index 8f38c38..3faf629 100644
--- a/aft/PREBERIME.md
+++ b/aft/PREBERIME.md
@@ -9,8 +9,8 @@ izvornem sistemu in ```Xt,Yt``` koordinati v ciljnem sistemu.
Za vsako novo točko ```Xi,Yi``` se transformacija izračuna po naslednji enačbi:
-Xo = a∗Xi + b∗Yi + c
-Yo = d∗Xi + e∗Yi + f
+Xo = a⁎Xi + b⁎Yi + c
+Yo = d⁎Xi + e⁎Yi + f
kjer imajo parametri ```a..f``` naslednji pomen:
@@ -52,11 +52,8 @@ natančne Delaunayeve triangulacije.
#### Natančen opis procesa
- pridobi referenčne [virtualne vezne točke] (že priložene):
⇒ datoteka ```virtualne_vezne_tocke_v3.0.txt```
-- ekstraktaj GK in TM koordinate iz datoteke z uporabo ```awk```:
- ⇒ datoteki ```vvt-gk.node``` and ```vvt-tm.node```
-- uporabi program [triangle] za kreiranje trikotnikov:
- ⇒ datoteki ```vvt-gk.1.ele``` and ```vvt-tm.1.ele```
- Ti dve datoteki bi morali biti enaki razen vrstnega reda trikotnikov.
+- ekstraktaj GK in TM koordinate iz referenčne datoteke
+- uporabi program [triangle] za kreiranje trikotnikov
- uporabi priložen program ```ctt``` za kreiranje tabel, ki se bodo vključile v program:
⇒ datoteki ```aft_gktm.h``` and ```aft_tmgk.h```
```ctt``` rešuje zgoraj omenjen sistem linearnih enačb za vsak trikotnik.
diff --git a/aft/README.md b/aft/README.md
index d3404e3..dfc806a 100644
--- a/aft/README.md
+++ b/aft/README.md
@@ -10,8 +10,8 @@ and ```Xt,Yt``` coordinates in the target system.
For each new point ```Xi,Yi``` transformation is calculated via the
following equation:
-Xo = a∗Xi + b∗Yi + c
-Yo = d∗Xi + e∗Yi + f
+Xo = a⁎Xi + b⁎Yi + c
+Yo = d⁎Xi + e⁎Yi + f
where parameters ```a..f``` have the following meaning:
@@ -53,11 +53,8 @@ exact Delaunay triangulations.
#### Exact description of process
- get the reference [virtual tie points] (already supplied):
⇒ file ```virtualne_vezne_tocke_v3.0.txt```
-- extract GK and TM coordinates from the file using ```awk```:
- ⇒ files ```vvt-gk.node``` and ```vvt-tm.node```
-- use [triangle] program to create triangles:
- ⇒ files ```vvt-gk.1.ele``` and ```vvt-tm.1.ele```
- These should be the same except for the order of triangles.
+- extract GK and TM coordinates from the reference file
+- use [triangle] program to create triangles
- use the supplied program ```ctt``` to create tables to be included in a program:
⇒ files ```aft_gktm.h``` and ```aft_tmgk.h```
```ctt``` solves the above mentioned system of linear equations for each
diff --git a/geo_api.md b/geo_api.md
index e992e86..f59972e 100644
--- a/geo_api.md
+++ b/geo_api.md
@@ -149,11 +149,15 @@
Mercator *n,e,H* on WGS84 using affine/triangle-based transformation
with 899 reference virtual tie points (already built-in).
+ Input height is copied to the output height.
+
- **tmxy2gkxy_aft**
Transforms Transverse Mercator *n,e,H* coordinates on WGS84 to Gauss-Krueger
*x,y,H* on Bessel 1841 using affine/triangle-based transformation
with 899 reference virtual tie points (already built-in).
+ Input height is copied to the output height.
+
- **tmxy2fila_wgs**
Transforms Transverse Mercator *n,e,H* coordinates on WGS84 to *fi,la,h* on
WGS84 using the following steps:
@@ -170,6 +174,25 @@
In the end the correct height is calculated according to selected type of
output height (only copied or geoid height possible).
+- **gkxy2fila_wgs_aft**
+ Transforms Gauss-Krueger *x,y,H* coordinates on Bessel 1841 to *fi,la,h* on
+ WGS84 using affine/triangle-based transformation:
+ - converts GK *x,y,H* on Bessel 1841 to TM *n,e,H* on WGS84 using gkxy2tmxy_aft()
+ - converts TM *n,e,H* on WGS84 to *fi,la,h* on WGS84 using tmxy2fila_wgs()
+
+ Correct height is calculated in tmxy2fila_wgs() according to selected type of
+ output height (only copied or geoid height possible).
+
+- **fila_wgs2gkxy_aft**
+ Transforms *fi,la,h* coordinates on WGS84 to Gauss-Krueger *x,y,H* on Bessel
+ 1841 using affine/triangle-based transformation:
+ - converts *fi,la,h* on WGS84 to to TM *n,e,H* on WGS84 using fila_wgs2tmxy()
+ - converts TM *n,e,H* on WGS84 to GK *x,y,H* on Bessel 1841 using tmxy2gkxy_aft()
+
+ Correct height is calculated in fila_wgs2tmxy() according to selected type of
+ output height (only copied or geoid height possible).
+
+
#### Additional routines:
- **xy2fila_ellips_loop**
Transforms *x,y,H* coordinates (GK or TM) to *fi,la,h* on specified
@@ -190,6 +213,15 @@
These two routines are included for curiosity only.
+#### Supporting libraries:
+- **shapelib v1.3.0**
+ The [Shapefile C Library] provides routines needed for reading and writing
+ ESRI Shapefiles (.shp) and the associated attribute files (.dbf):
+
+ - SHPOpen, DBFOpen, SHPGetInfo, SHPCreate, DBFCloneEmpty, SHPComputeExtents,
+ SHPWriteObject, DBFWriteTuple, ...
[geo.c]: https://github.com/mrihtar/GeoCoordinateConverter/blob/master/geo.c
[EGM2008]: http://earth-info.nga.mil/GandG/wgs84/gravitymod/egm2008/egm08_wgs84.html
+[Shapefile C Library]: http://shapelib.maptools.org
+
diff --git a/literature.md b/literature.md
index 36460af..a18b01e 100644
--- a/literature.md
+++ b/literature.md
@@ -1,121 +1,117 @@
## Literature
-1. Podobnikar, 2001: **_Digitalni model reliefa iz geodetskih podatkov
- različne kakovosti_**, Doktorska disertacija, FGG Ljubljana, [Link1]
-[Link1]: http://www.geospace.si/Portals/6/Podobnikar_PhD_2001.pdf
+1. Podobnikar, 2001: **_[Digitalni model reliefa iz geodetskih podatkov različne kakovosti]_**, Doktorska disertacija, FGG Ljubljana
+[Digitalni model reliefa iz geodetskih podatkov različne kakovosti]: http://www.geospace.si/Portals/6/Podobnikar_PhD_2001.pdf
-2. Berk, 2008: **_Stari in novi državni horizontalni koordinatni sistem_**, [Link2]
-[Link2]: http://www.e-prostor.gov.si/fileadmin/ogs/Nova_drz_karto_projekcija.pdf
+2. Berk, 2008: **_[Stari in novi državni horizontalni koordinatni sistem]_**
+[Stari in novi državni horizontalni koordinatni sistem]: http://www.e-prostor.gov.si/fileadmin/ogs/Nova_drz_karto_projekcija.pdf
-3. Rezo, 2007: **_Geodezija_**, Predavanje, Sveučilište u Zagrebu/Geotehnički
- fakultet Varaždin, [Link3]
-[Link3]: http://www.scribd.com/doc/53800722/PREDAVANJE-GEODEZIJA-GFV-01
+3. Rezo, 2007: **_[Geodezija]_**, Predavanje, Sveučilište u Zagrebu/Geotehnički fakultet Varaždin
+[Geodezija]: http://www.scribd.com/doc/53800722/PREDAVANJE-GEODEZIJA-GFV-01
-4. Hooijberg, 2008: **_Geometrical Geodesy_**, Springer, [Link4]
-[Link4]: https://books.google.si/books?id=c4wRAQAAIAAJ&printsec=frontcover
+4. Hooijberg, 2008: **_[Geometrical Geodesy]_**, Springer
+[Geometrical Geodesy]: https://books.google.si/books?id=c4wRAQAAIAAJ&printsec=frontcover
-5. Hofmann-Wellenhof, Moritz, 2005: **_Physical Geodesy_**, Springer, [Link5]
-[Link5]: http://books.google.si/books?id=yTbFyZVLIk4C&printsec=frontcover
+5. Hofmann-Wellenhof, Moritz, 2005: **_[Physical Geodesy]_**, Springer
+[Physical Geodesy]: http://books.google.si/books?id=yTbFyZVLIk4C&printsec=frontcover
-6. Zhiping Lu, Qu, Qiao, 2014: **_Geodesy - Introduction to Geodetic Datum and
- Geodetic Systems_**, Springer, [Link6]
-[Link6]: https://books.google.si/books?id=pdglBAAAQBAJ&printsec=frontcover
+6. Zhiping Lu, Qu, Qiao, 2014: **_[Geodesy - Introduction to Geodetic Datum and Geodetic Systems]_**, Springer
+[Geodesy - Introduction to Geodetic Datum and Geodetic Systems]: https://books.google.si/books?id=pdglBAAAQBAJ&printsec=frontcover
-7. AdV, 2012: **_Bundeseinheitliche Transformation für ATKIS (BeTA2007)_**, [Link7]
-[Link7]: http://crs.bkg.bund.de/crseu/crs/descrtrans/BeTA/BETA2007dokumentationV15.pdf
+7. AdV, 2012: **_[Bundeseinheitliche Transformation für ATKIS (BeTA2007)]_**
+[Bundeseinheitliche Transformation für ATKIS (BeTA2007)]: http://crs.bkg.bund.de/crseu/crs/descrtrans/BeTA/BETA2007dokumentationV15.pdf
-8. Kawase, 2011: **_A General Formula for Calculating Meridian Arc Length_**, [Link8]
-[Link8]: http://www.gsi.go.jp/common/000062452.pdf
+8. Kawase, 2011: **_[A General Formula for Calculating Meridian Arc Length]_**
+[A General Formula for Calculating Meridian Arc Length]: http://www.gsi.go.jp/common/000062452.pdf
-9. Hofmann-Wellenhof, Lichtenegger, Wasle, 2008: **_GNSS - Global Navigation
- Satellite Systems_**, Springer, [Link9]
-[Link9]: http://www2.pv.infn.it/~genova/gps/GpsGalileoGlonass.pdf
+9. Hofmann-Wellenhof, Lichtenegger, Wasle, 2008: **_[GNSS - Global Navigation Satellite Systems]_**, Springer
+[GNSS - Global Navigation Satellite Systems]: https://books.google.com/books?id=Np7y43HU_m8C&printsec=frontcover
-10. Watson, 2005: **_Computing Helmert transformations_**, [Link10]
-[Link10]: http://www.maths.dundee.ac.uk/~gawatson/helmertrev.pdf
+10. Watson, 2005: **_[Computing Helmert transformations]_**
+[Computing Helmert transformations]: http://www.maths.dundee.ac.uk/~gawatson/helmertrev.pdf
-11. Seemkooei, 2002: **_Comparison of different algorithms to transform geocentric
- to geodetic coordinates_**, [Link11]
-[Link11]: http://www.researchgate.net/profile/A_Amiri-Simkooei/publication/233681872_COMPARISON_OF_DIFFERENT_ALGORITHMS_TO_TRANSFORM_GEOCENTRIC_TO_GEODETIC_COORDINATES/links/0046352b50af94176a000000.pdf
+11. Seemkooei, 2002: **_[Comparison of different algorithms to transform geocentric to geodetic coordinates]_**
+[Comparison of different algorithms to transform geocentric to geodetic coordinates]: http://www.researchgate.net/profile/A_Amiri-Simkooei/publication/233681872_COMPARISON_OF_DIFFERENT_ALGORITHMS_TO_TRANSFORM_GEOCENTRIC_TO_GEODETIC_COORDINATES/links/0046352b50af94176a000000.pdf
-12. Ordnance Survey, 2013: **_A guide to coordinate systems in Great Britain_**, [Link12]
-[Link12]: http://www.ordnancesurvey.co.uk/docs/support/guide-coordinate-systems-great-britain.pdf
+12. Ordnance Survey, 2013: **_[A guide to coordinate systems in Great Britain]_**
+[A guide to coordinate systems in Great Britain]: http://www.ordnancesurvey.co.uk/docs/support/guide-coordinate-systems-great-britain.pdf
-13. Esri, 2012: **_ArcGIS 10.1 Geographic and Vertical Transformation Tables_**, [Link13]
-[Link13]: http://resources.arcgis.com/en/help/main/10.1/003r/pdf/geographic_transformations.pdf
+13. ESRI, 2012: **_[ArcGIS 10.1 Geographic and Vertical Transformation Tables]_**
+[ArcGIS 10.1 Geographic and Vertical Transformation Tables]: http://resources.arcgis.com/en/help/main/10.1/003r/pdf/geographic_transformations.pdf
-14. LINZ, 2009: **_Datum and Projection Transformations (LINZG25703: v2)_**, [Link14]
-[Link14]: http://www.linz.govt.nz/system/files_force/media/regulatory-documents/25703-Datum%20and%20Projection%20Transformations%20-%20LINZG25703%20_0_0.pdf
+14. ESRI, 1998: **_[ESRI Shapefile Technical Description]_**, White Paper
+[ESRI Shapefile Technical Description]: https://www.esri.com/library/whitepapers/pdfs/shapefile.pdf
-15. Đonlagić, 1999: **_Datumska transformacija_**, [Link15]
-[Link15]: http://www.suggsbih.ba/GEODETSKI%20GLASNIK/GLASNIK%2033/Eldin%20Djonlagic_Datumska%20transformacija.pdf
+15. LINZ, 2009: **_[Datum and Projection Transformations (LINZG25703: v2)]_**
+[Datum and Projection Transformations (LINZG25703: v2)]: http://www.linz.govt.nz/system/files_force/media/regulatory-documents/25703-Datum%20and%20Projection%20Transformations%20-%20LINZG25703%20_0_0.pdf
-16. Kuhar, Prešeren, 2000: **_Evropski in globalni model geoida na območju Slovenije_**, GV 44, [Link16]
-[Link16]: http://www.geodetski-vestnik.com/44/gv44-3.pdf
+16. Đonlagić, 1999: **_[Datumska transformacija]_**
+[Datumska transformacija]: http://www.suggsbih.ba/GEODETSKI%20GLASNIK/GLASNIK%2033/Eldin%20Djonlagic_Datumska%20transformacija.pdf
-17. FGI, NLS, 2004: **_The Finnish coordinate reference systems_**, [Link17]
-[Link17]: http://www.maanmittauslaitos.fi/sites/default/files/Finnish_Coordinate_Systems.pdf
+17. Kuhar, Prešeren, 2000: **_[Evropski in globalni model geoida na območju Slovenije]_**, GV 44
+[Evropski in globalni model geoida na območju Slovenije]: http://www.geodetski-vestnik.com/44/gv44-3.pdf
-18. Mohamed, Mamatas, 2012: **_Fundamentals of GNSS-Aided Inertial Navigation_**, [Link18]
-[Link18]: http://cdn.intechopen.com/pdfs-wm/26014.pdf
+18. FGI, NLS, 2004: **_[The Finnish coordinate reference systems]_**
+[The Finnish coordinate reference systems]: http://www.maanmittauslaitos.fi/sites/default/files/Finnish_Coordinate_Systems.pdf
-19. Kovačič, 2004: **_Geodezija za gradbene inženirje_**, Učbenik, FGG Maribor, [Link19]
-[Link19]: https://gradbenik.files.wordpress.com/2010/01/geodezija-geodezija-za-gradbene-inzenirje-stari-ucbenik.pdf
+19. Mohamed, Mamatas, 2012: **_[Fundamentals of GNSS-Aided Inertial Navigation]_**
+[Fundamentals of GNSS-Aided Inertial Navigation]: http://cdn.intechopen.com/pdfs-wm/26014.pdf
-20. Isioye, Youngu, 2009: **_Global geoid modeling and height determination for engineering applications_**, [Link20]
-[Link20]: http://www.abu.edu.ng/publications/2009-07-11-122210_2930.pdf
+20. Kovačič, 2004: **_[Geodezija za gradbene inženirje]_**, Učbenik, FGG Maribor
+[Geodezija za gradbene inženirje]: https://gradbenik.files.wordpress.com/2010/01/geodezija-geodezija-za-gradbene-inzenirje-stari-ucbenik.pdf
-21. GURS, 2007: **_Transformacijski parametri_**, [Link21]
-[Link21]: http://www.gu.gov.si/fileadmin/gu.gov.si/pageuploads/ogs/transformacijski_parametri.pdf
+21. Isioye, Youngu, 2009: **_[Global geoid modeling and height determination for engineering applications]_**
+[Global geoid modeling and height determination for engineering applications]: http://www.abu.edu.ng/publications/2009-07-11-122210_2930.pdf
-22. Berdajs, Ulbl, 2010: **_Inženirska geodezija_**, [Link22]
-[Link22]: http://www.mizs.gov.si/fileadmin/mizs.gov.si/pageuploads/podrocje/vs/Gradiva_ESS/Impletum/IMPLETUM_157GRADBENISTVO_Inzenirska_Ulbl.pdf
+22. GURS, 2007: **_[Transformacijski parametri]_**
+[Transformacijski parametri]: http://www.gu.gov.si/fileadmin/gu.gov.si/pageuploads/ogs/transformacijski_parametri.pdf
-23. Stopar, 2010: **_Koordinatni sistemi in transformacije koordinatnih sistemov v geodeziji_**, Prezentacija, [Link23]
-[Link23]: http://www.gis.si/isg/gradivo_perm_izo_transformacije_prost_pod1.pdf
+23. Berdajs, Ulbl, 2010: **_[Inženirska geodezija]_**
+[Inženirska geodezija]: http://www.mizs.gov.si/fileadmin/mizs.gov.si/pageuploads/podrocje/vs/Gradiva_ESS/Impletum/IMPLETUM_157GRADBENISTVO_Inzenirska_Ulbl.pdf
-24. GIS, FGG, GURS, 2010: **_Navodilo za določanje višin z uporabo GNSS v2.0_**, [Link24]
-[Link24]: http://www.e-prostor.gov.si/fileadmin/projekti/DGS/2010p/Navodilo_za_GNSS-visinomerstvo_r2.pdf
+24. Stopar, 2010: **_[Koordinatni sistemi in transformacije koordinatnih sistemov v geodeziji]_**, Prezentacija
+[Koordinatni sistemi in transformacije koordinatnih sistemov v geodeziji]: http://www.gis.si/isg/gradivo_perm_izo_transformacije_prost_pod1.pdf
-25. Press, Teukolsky, Vetterling, Flannery, 1992: **_Numerical Recipes in C, 2nd Ed._**, [Link25]
-[Link25]: http://www2.units.it/ipl/students_area/imm2/files/Numerical_Recipes.pdf
+25. GIS, FGG, GURS, 2010: **_[Navodilo za določanje višin z uporabo GNSS v2.0]_**
+[Navodilo za določanje višin z uporabo GNSS v2.0]: http://www.e-prostor.gov.si/fileadmin/projekti/DGS/2010p/Navodilo_za_GNSS-visinomerstvo_r2.pdf
-26. Urbanč, 2008: **_Ocena natančnosti geoidnega modela Slovenije_**, Diplomska naloga, FGG Ljubljana, [Link26]
-[Link26]: http://drugg.fgg.uni-lj.si/478/1/GEV_0252_Urbanc.pdf
+26. Press, Teukolsky, Vetterling, Flannery, 1992: **_[Numerical Recipes in C, 2nd Ed.]_**
+[Numerical Recipes in C, 2nd Ed.]: http://www2.units.it/ipl/students_area/imm2/files/Numerical_Recipes.pdf
-27. Kozmus Trajkovski, Stopar, 2009: **_SiTra v2.10 - Navodila za uporabo programa_**, [Link27]
-[Link27]: http://www.e-prostor.gov.si/fileadmin/projekti/DGS/2008p/SiTra2.10-navodila.pdf
+27. Urbanč, 2008: **_[Ocena natančnosti geoidnega modela Slovenije]_**, Diplomska naloga, FGG Ljubljana
+[Ocena natančnosti geoidnega modela Slovenije]: http://drugg.fgg.uni-lj.si/478/1/GEV_0252_Urbanc.pdf
-28. Kozmus Trajkovski, Stopar, 2008: **_SiTraNet v2.10 - Navodila za uporabo spletne aplikacije_**, [Link28]
-[Link28]: http://193.2.92.129/SiTraNet2.10-navodila.pdf
+28. Kozmus Trajkovski, Stopar, 2009: **_[SiTra v2.10 - Navodila za uporabo programa]_**
+[SiTra v2.10 - Navodila za uporabo programa]: http://www.e-prostor.gov.si/fileadmin/projekti/DGS/2008p/SiTra2.10-navodila.pdf
-29. Kete, Berk, 2012: **_Stari in novi državni koordinatni sistem v RS ter koordinatni sistem zveze Nato_**, [Link29]
-[Link29]: http://www.transformacije.si/media/Kete_Berk_2012_Geoprostorska_podpora.pdf
+29. Kozmus Trajkovski, Stopar, 2008: **_[SiTraNet v2.10 - Navodila za uporabo spletne aplikacije]_**
+[SiTraNet v2.10 - Navodila za uporabo spletne aplikacije]: http://193.2.92.129/SiTraNet2.10-navodila.pdf
-30. Mozetič, Komadina, 2006: **_Transformacija!?_**, GV 50, [Link30]
-[Link30]: http://www.geodetski-vestnik.com/50/1/gv50-1_105-107.pdf
+30. Kete, Berk, 2012: **_[Stari in novi državni koordinatni sistem v RS ter koordinatni sistem zveze Nato]_**
+[Stari in novi državni koordinatni sistem v RS ter koordinatni sistem zveze Nato]: http://www.transformacije.si/media/Kete_Berk_2012_Geoprostorska_podpora.pdf
-31. Berk, Duhovnik, 2007: **_Transformacija podatkov Geodetske uprave RS v novi državni koordinatni sistem_**, GV 51, [Link31]
-[Link31]: http://www.geodetski-vestnik.com/51/4/gv51-4_803-826.pdf
+31. Mozetič, Komadina, 2006: **_[Transformacija!?]_**, GV 50
+[Transformacija!?]: http://www.geodetski-vestnik.com/50/1/gv50-1_105-107.pdf
-32. Berk, 2010: **_Transformacije prostorskih podatkov med D48/GK in D96/TM_**, Prezentacija, [Link32]
-[Link32]: http://www.gis.si/isg/gradivo_perm_izo_transformacije_prost_pod2.pdf
+32. Berk, Duhovnik, 2007: **_[Transformacija podatkov Geodetske uprave RS v novi državni koordinatni sistem]_**, GV 51
+[Transformacija podatkov Geodetske uprave RS v novi državni koordinatni sistem]: http://www.geodetski-vestnik.com/51/4/gv51-4_803-826.pdf
-33. Berk, Komadina, 2010: **_Trikotniško zasnovana transformacija med starim in
- novim državnim koordinatnim sistemom Slovenije_**, [Link33]
-[Link33]: http://www.transformacije.si/media/Berk_Komadina_2010_GISS_10.pdf
+33. Berk, 2010: **_[Transformacije prostorskih podatkov med D48/GK in D96/TM]_**, Prezentacija
+[Transformacije prostorskih podatkov med D48/GK in D96/TM]: http://www.gis.si/isg/gradivo_perm_izo_transformacije_prost_pod2.pdf
-34. GIS, 2009: **_Razvoj DGS 2009 - Prehod na nov koordinatni sistem_**, Končno poročilo, [Link34]
-[Link34]: http://e-prostor.gov.si/fileadmin/projekti/DGS/2009/Razvoj_DGS_2009_koncno_porocilo.pdf
+34. Berk, Komadina, 2010: **_[Trikotniško zasnovana transformacija med starim in novim državnim koordinatnim sistemom Slovenije]_**
+[Trikotniško zasnovana transformacija med starim in novim državnim koordinatnim sistemom Slovenije]: http://www.transformacije.si/media/Berk_Komadina_2010_GISS_10.pdf
-35. Civicioglu, 2012: **_Transforming geocentric cartesian coordinates to geodetic
- coordinates by using differential search algorithm_**, [Link35]
-[Link35]: http://www.sciencedirect.com/science/article/pii/S0098300411004353
+35. GIS, 2009: **_[Razvoj DGS 2009 - Prehod na nov koordinatni sistem]_**, Končno poročilo
+[Razvoj DGS 2009 - Prehod na nov koordinatni sistem]: http://e-prostor.gov.si/fileadmin/projekti/DGS/2009/Razvoj_DGS_2009_koncno_porocilo.pdf
-36. Guowei Cai, Chen, Lee, 2011: **_Unmanned Rotorcraft Systems_**, Springer, [Link36a]
- Chapter 2: **_Coordinate Systems and Transformations_**, [Link36b]
-[Link36a]: http://books.google.si/books?id=RJYtO51KZ6kC&printsec=frontcover
-[Link36b]: http://www.springer.com/cda/content/document/cda_downloaddocument/9780857296344-c2.pdf?SGWID=0-0-45-1143141-p174116371
+36. Civicioglu, 2012: **_[Transforming geocentric cartesian coordinates to geodetic coordinates by using differential search algorithm]_**
+[Transforming geocentric cartesian coordinates to geodetic coordinates by using differential search algorithm]: http://www.sciencedirect.com/science/article/pii/S0098300411004353
-37. Ganić, Milutinović, Meri, 2014: **_User defined function for transformation of ellipsoidal coordinates_**, [Link37]
-[Link37]: http://www.rgf.bg.ac.rs/publikacije/PodzemniRadovi/radovi/jun2014/eng/04%20PR%2024_02%20ENG.pdf
+37. Guowei Cai, Chen, Lee, 2011: **_[Unmanned Rotorcraft Systems]_**, Springer
+ Chapter 2: **_[Coordinate Systems and Transformations]_**
+[Unmanned Rotorcraft Systems]: http://books.google.si/books?id=RJYtO51KZ6kC&printsec=frontcover
+[Coordinate Systems and Transformations]: http://www.springer.com/cda/content/document/cda_downloaddocument/9780857296344-c2.pdf?SGWID=0-0-45-1143141-p174116371
+
+38. Ganić, Milutinović, Meri, 2014: **_[User defined function for transformation of ellipsoidal coordinates]_**
+[User defined function for transformation of ellipsoidal coordinates]: http://www.rgf.bg.ac.rs/publikacije/PodzemniRadovi/radovi/jun2014/eng/04%20PR%2024_02%20ENG.pdf