mirror of
https://gitlab.com/Trygve/contour-creator.git
synced 2024-11-23 07:40:17 +00:00
Compare commits
No commits in common. "b3936ae649e34bafe881917802dfa3a93e80fae8" and "7037874923b56e0a1b2208e90c048f924ad916de" have entirely different histories.
b3936ae649
...
7037874923
@ -5,7 +5,7 @@ project(
|
||||
LANGUAGES CXX)
|
||||
|
||||
add_executable(${PROJECT_NAME}
|
||||
src/HeightMap.cpp src/main.cpp
|
||||
src/HeightMap.cpp src/CellMap.cpp src/main.cpp
|
||||
)
|
||||
|
||||
# Argh is a simple argrument parser
|
||||
|
||||
11
README.md
11
README.md
@ -4,17 +4,13 @@ This is our project for the INF205: Resource-efficient programming course
|
||||
## Status
|
||||
- [x] Read .tif file into memory using gdal
|
||||
- [x] Run the marching squares algorithm and produce a "cellmap"
|
||||
- [x] Use a lookuptable to produce a vector file from the "cellmap"
|
||||
- [ ] Use a lookuptable to produce a vector file from the "cellmap"
|
||||
## Dependencies
|
||||
- GDAL >= 3.5
|
||||
- OpenMP
|
||||
- CMake
|
||||
|
||||
If you want to clone the repo with the example files you need [git-lfs](https://git-lfs.com/) installed and activated with ´git lfs install´
|
||||
You also need to clone with submodules to get the argh library:
|
||||
```
|
||||
git clone --recurse-submodules https://gitlab.com/Trygve/contour-creator
|
||||
```
|
||||
If you want to clone the repo with the example files you need [git-lfs](https://git-lfs.com/) installed and activated with ´git lfs install´
|
||||
To install the packages on Fedora run
|
||||
```
|
||||
dnf install g++ git-lfs cmake gdal-devel
|
||||
@ -31,7 +27,8 @@ cmake -DCMAKE_BUILD_TYPE=Debug ..
|
||||
cmake --build . --parallel
|
||||
```
|
||||
Then you can run `./contour-creator PATH/TO/HEIGTHMAP.TIF`
|
||||
Run an example file: `./contour-creator "../example_files/ås.tif"`
|
||||
Run an example file: `./contour-creator "../example_files/Follo 2014-dtm.tif"`
|
||||
Currently the program outputs to ´out.shp´ in the current directory.
|
||||
|
||||
## Docs
|
||||
[Doxygen output](https://trygve.gitlab.io/contour-creator/)
|
||||
@ -3,4 +3,4 @@ rm -rf build
|
||||
mkdir build
|
||||
cmake -DCMAKE_BUILD_TYPE=Debug -B build
|
||||
cmake --build build --parallel
|
||||
build/contour-creator --interval=1 --blur --stats example_files/ås_crop.tif
|
||||
build/contour-creator --interval=1 --blur example_files/crop.tif
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<gaphor xmlns="http://gaphor.sourceforge.net/model" version="3.0" gaphor-version="2.25.1">
|
||||
<gaphor xmlns="http://gaphor.sourceforge.net/model" version="3.0" gaphor-version="2.25.0">
|
||||
<StyleSheet id="58d6989a-66f8-11ec-b4c8-0456e5e540ed"/>
|
||||
<Package id="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed">
|
||||
<name>
|
||||
@ -13,7 +13,7 @@
|
||||
<ownedType>
|
||||
<reflist>
|
||||
<ref refid="0c22379b-e76f-11ee-8193-8bb162b1502a"/>
|
||||
<ref refid="1754a50e-0cac-11ef-86ae-59b56c446183"/>
|
||||
<ref refid="4a8d98db-e76f-11ee-9ded-8bb162b1502a"/>
|
||||
</reflist>
|
||||
</ownedType>
|
||||
</Package>
|
||||
@ -27,7 +27,7 @@
|
||||
<ownedPresentation>
|
||||
<reflist>
|
||||
<ref refid="0c228e70-e76f-11ee-90ec-8bb162b1502a"/>
|
||||
<ref refid="1754dd05-0cac-11ef-824e-59b56c446183"/>
|
||||
<ref refid="4a8ddfb4-e76f-11ee-b091-8bb162b1502a"/>
|
||||
</reflist>
|
||||
</ownedPresentation>
|
||||
</Diagram>
|
||||
@ -47,8 +47,6 @@
|
||||
<ref refid="f72f1442-f674-11ee-b3f4-756c0364fd19"/>
|
||||
<ref refid="033b1fcf-f675-11ee-8fa9-756c0364fd19"/>
|
||||
<ref refid="79fcf06c-0171-11ef-b98e-75fbb1f7e3ee"/>
|
||||
<ref refid="56cb7284-0cac-11ef-8675-59b56c446183"/>
|
||||
<ref refid="77a8bf26-0cac-11ef-9642-59b56c446183"/>
|
||||
</reflist>
|
||||
</ownedAttribute>
|
||||
<package>
|
||||
@ -71,7 +69,7 @@
|
||||
<val>311.0</val>
|
||||
</width>
|
||||
<height>
|
||||
<val>185.0</val>
|
||||
<val>151.0</val>
|
||||
</height>
|
||||
<diagram>
|
||||
<ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
|
||||
@ -113,6 +111,80 @@
|
||||
<val></val>
|
||||
</name>
|
||||
</Property>
|
||||
<Class id="4a8d98db-e76f-11ee-9ded-8bb162b1502a">
|
||||
<name>
|
||||
<val>Cell</val>
|
||||
</name>
|
||||
<ownedAttribute>
|
||||
<reflist>
|
||||
<ref refid="58a782c4-e76f-11ee-af59-8bb162b1502a"/>
|
||||
<ref refid="59eb8e6d-e76f-11ee-9d79-8bb162b1502a"/>
|
||||
<ref refid="625d120c-e76f-11ee-aeac-8bb162b1502a"/>
|
||||
<ref refid="8f3e5d14-0171-11ef-91b0-75fbb1f7e3ee"/>
|
||||
</reflist>
|
||||
</ownedAttribute>
|
||||
<package>
|
||||
<ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
|
||||
</package>
|
||||
<presentation>
|
||||
<reflist>
|
||||
<ref refid="4a8ddfb4-e76f-11ee-b091-8bb162b1502a"/>
|
||||
</reflist>
|
||||
</presentation>
|
||||
</Class>
|
||||
<ClassItem id="4a8ddfb4-e76f-11ee-b091-8bb162b1502a">
|
||||
<matrix>
|
||||
<val>(1.0, 0.0, 0.0, 1.0, 567.9247472572557, 154.04296875)</val>
|
||||
</matrix>
|
||||
<top-left>
|
||||
<val>(0.0, 0.0)</val>
|
||||
</top-left>
|
||||
<width>
|
||||
<val>311.0</val>
|
||||
</width>
|
||||
<height>
|
||||
<val>117.0</val>
|
||||
</height>
|
||||
<diagram>
|
||||
<ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
|
||||
</diagram>
|
||||
<show_operations>
|
||||
<val>0</val>
|
||||
</show_operations>
|
||||
<subject>
|
||||
<ref refid="4a8d98db-e76f-11ee-9ded-8bb162b1502a"/>
|
||||
</subject>
|
||||
</ClassItem>
|
||||
<Property id="58a782c4-e76f-11ee-af59-8bb162b1502a">
|
||||
<class_>
|
||||
<ref refid="4a8d98db-e76f-11ee-9ded-8bb162b1502a"/>
|
||||
</class_>
|
||||
<name>
|
||||
<val>width</val>
|
||||
</name>
|
||||
<typeValue>
|
||||
<val>int</val>
|
||||
</typeValue>
|
||||
</Property>
|
||||
<Property id="59eb8e6d-e76f-11ee-9d79-8bb162b1502a">
|
||||
<class_>
|
||||
<ref refid="4a8d98db-e76f-11ee-9ded-8bb162b1502a"/>
|
||||
</class_>
|
||||
<name>
|
||||
<val>height</val>
|
||||
</name>
|
||||
<typeValue>
|
||||
<val>int</val>
|
||||
</typeValue>
|
||||
</Property>
|
||||
<Property id="625d120c-e76f-11ee-aeac-8bb162b1502a">
|
||||
<class_>
|
||||
<ref refid="4a8d98db-e76f-11ee-9ded-8bb162b1502a"/>
|
||||
</class_>
|
||||
<name>
|
||||
<val>+ cells: int*</val>
|
||||
</name>
|
||||
</Property>
|
||||
<Property id="f1a417ac-f674-11ee-8f46-756c0364fd19">
|
||||
<class_>
|
||||
<ref refid="0c22379b-e76f-11ee-8193-8bb162b1502a"/>
|
||||
@ -151,116 +223,15 @@
|
||||
<val>reference_system</val>
|
||||
</typeValue>
|
||||
</Property>
|
||||
<Diagram id="14a35e81-0cac-11ef-8c1c-59b56c446183">
|
||||
<diagramType>
|
||||
<val>cls</val>
|
||||
</diagramType>
|
||||
<name>
|
||||
<val>New Diagram</val>
|
||||
</name>
|
||||
</Diagram>
|
||||
<Class id="1754a50e-0cac-11ef-86ae-59b56c446183">
|
||||
<name>
|
||||
<val>Point</val>
|
||||
</name>
|
||||
<ownedAttribute>
|
||||
<reflist>
|
||||
<ref refid="34feac8d-0cac-11ef-85b7-59b56c446183"/>
|
||||
<ref refid="3768ce02-0cac-11ef-9b57-59b56c446183"/>
|
||||
<ref refid="3eeba789-0cac-11ef-b42f-59b56c446183"/>
|
||||
<ref refid="46c075e3-0cac-11ef-8e54-59b56c446183"/>
|
||||
</reflist>
|
||||
</ownedAttribute>
|
||||
<package>
|
||||
<ref refid="58d6c2e8-66f8-11ec-b4c8-0456e5e540ed"/>
|
||||
</package>
|
||||
<presentation>
|
||||
<reflist>
|
||||
<ref refid="1754dd05-0cac-11ef-824e-59b56c446183"/>
|
||||
</reflist>
|
||||
</presentation>
|
||||
</Class>
|
||||
<ClassItem id="1754dd05-0cac-11ef-824e-59b56c446183">
|
||||
<matrix>
|
||||
<val>(1.0, 0.0, 0.0, 1.0, 584.7889709472656, 160.69140625)</val>
|
||||
</matrix>
|
||||
<top-left>
|
||||
<val>(0.0, 0.0)</val>
|
||||
</top-left>
|
||||
<width>
|
||||
<val>130.0</val>
|
||||
</width>
|
||||
<height>
|
||||
<val>125.0</val>
|
||||
</height>
|
||||
<diagram>
|
||||
<ref refid="58d6c536-66f8-11ec-b4c8-0456e5e540ed"/>
|
||||
</diagram>
|
||||
<show_operations>
|
||||
<val>0</val>
|
||||
</show_operations>
|
||||
<subject>
|
||||
<ref refid="1754a50e-0cac-11ef-86ae-59b56c446183"/>
|
||||
</subject>
|
||||
</ClassItem>
|
||||
<Property id="34feac8d-0cac-11ef-85b7-59b56c446183">
|
||||
<Property id="8f3e5d14-0171-11ef-91b0-75fbb1f7e3ee">
|
||||
<class_>
|
||||
<ref refid="1754a50e-0cac-11ef-86ae-59b56c446183"/>
|
||||
<ref refid="4a8d98db-e76f-11ee-9ded-8bb162b1502a"/>
|
||||
</class_>
|
||||
<name>
|
||||
<val>x</val>
|
||||
<val>OGRSpatialReference</val>
|
||||
</name>
|
||||
<typeValue>
|
||||
<val>int</val>
|
||||
<val>reference_system</val>
|
||||
</typeValue>
|
||||
</Property>
|
||||
<Property id="3768ce02-0cac-11ef-9b57-59b56c446183">
|
||||
<class_>
|
||||
<ref refid="1754a50e-0cac-11ef-86ae-59b56c446183"/>
|
||||
</class_>
|
||||
<name>
|
||||
<val>y</val>
|
||||
</name>
|
||||
<typeValue>
|
||||
<val>int</val>
|
||||
</typeValue>
|
||||
</Property>
|
||||
<Property id="3eeba789-0cac-11ef-b42f-59b56c446183">
|
||||
<class_>
|
||||
<ref refid="1754a50e-0cac-11ef-86ae-59b56c446183"/>
|
||||
</class_>
|
||||
<name>
|
||||
<val>mscase</val>
|
||||
</name>
|
||||
<typeValue>
|
||||
<val>int</val>
|
||||
</typeValue>
|
||||
</Property>
|
||||
<Property id="46c075e3-0cac-11ef-8e54-59b56c446183">
|
||||
<class_>
|
||||
<ref refid="1754a50e-0cac-11ef-86ae-59b56c446183"/>
|
||||
</class_>
|
||||
<name>
|
||||
<val>allocated</val>
|
||||
</name>
|
||||
<typeValue>
|
||||
<val>bool</val>
|
||||
</typeValue>
|
||||
</Property>
|
||||
<Property id="56cb7284-0cac-11ef-8675-59b56c446183">
|
||||
<class_>
|
||||
<ref refid="0c22379b-e76f-11ee-8193-8bb162b1502a"/>
|
||||
</class_>
|
||||
<name>
|
||||
<val>geotransform: double*</val>
|
||||
</name>
|
||||
</Property>
|
||||
<Property id="77a8bf26-0cac-11ef-9642-59b56c446183">
|
||||
<class_>
|
||||
<ref refid="0c22379b-e76f-11ee-8193-8bb162b1502a"/>
|
||||
</class_>
|
||||
<name>
|
||||
<val>filepath: char*</val>
|
||||
</name>
|
||||
</Property>
|
||||
</gaphor>
|
||||
@ -1,5 +1,5 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="520" height="204" viewBox="0 0 520 204">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="684" height="170" viewBox="0 0 684 170">
|
||||
<defs>
|
||||
<g>
|
||||
<g id="glyph-0-0">
|
||||
@ -30,13 +30,10 @@
|
||||
<path d="M 3.625 -1.109375 L 3.625 2.90625 L 1.171875 2.90625 L 1.171875 -7.65625 L 3.625 -7.65625 L 3.625 -6.53125 C 3.957031 -6.976562 4.328125 -7.304688 4.734375 -7.515625 C 5.148438 -7.734375 5.625 -7.84375 6.15625 -7.84375 C 7.101562 -7.84375 7.878906 -7.46875 8.484375 -6.71875 C 9.085938 -5.96875 9.390625 -5.003906 9.390625 -3.828125 C 9.390625 -2.640625 9.085938 -1.671875 8.484375 -0.921875 C 7.878906 -0.171875 7.101562 0.203125 6.15625 0.203125 C 5.625 0.203125 5.148438 0.0976562 4.734375 -0.109375 C 4.328125 -0.328125 3.957031 -0.660156 3.625 -1.109375 Z M 5.25 -6.0625 C 4.726562 -6.0625 4.328125 -5.867188 4.046875 -5.484375 C 3.765625 -5.097656 3.625 -4.546875 3.625 -3.828125 C 3.625 -3.097656 3.765625 -2.539062 4.046875 -2.15625 C 4.328125 -1.769531 4.726562 -1.578125 5.25 -1.578125 C 5.769531 -1.578125 6.164062 -1.769531 6.4375 -2.15625 C 6.71875 -2.539062 6.859375 -3.097656 6.859375 -3.828125 C 6.859375 -4.554688 6.71875 -5.109375 6.4375 -5.484375 C 6.164062 -5.867188 5.769531 -6.0625 5.25 -6.0625 Z M 5.25 -6.0625 "/>
|
||||
</g>
|
||||
<g id="glyph-0-9">
|
||||
<path d="M 1.28125 -10.203125 L 5.65625 -10.203125 C 6.957031 -10.203125 7.953125 -9.914062 8.640625 -9.34375 C 9.335938 -8.769531 9.6875 -7.945312 9.6875 -6.875 C 9.6875 -5.800781 9.335938 -4.976562 8.640625 -4.40625 C 7.953125 -3.832031 6.957031 -3.546875 5.65625 -3.546875 L 3.921875 -3.546875 L 3.921875 0 L 1.28125 0 Z M 3.921875 -8.296875 L 3.921875 -5.453125 L 5.375 -5.453125 C 5.882812 -5.453125 6.273438 -5.570312 6.546875 -5.8125 C 6.828125 -6.0625 6.96875 -6.414062 6.96875 -6.875 C 6.96875 -7.332031 6.828125 -7.679688 6.546875 -7.921875 C 6.273438 -8.171875 5.882812 -8.296875 5.375 -8.296875 Z M 3.921875 -8.296875 "/>
|
||||
<path d="M 9.375 -0.5625 C 8.894531 -0.3125 8.390625 -0.125 7.859375 0 C 7.335938 0.132812 6.796875 0.203125 6.234375 0.203125 C 4.523438 0.203125 3.175781 -0.269531 2.1875 -1.21875 C 1.195312 -2.175781 0.703125 -3.46875 0.703125 -5.09375 C 0.703125 -6.726562 1.195312 -8.019531 2.1875 -8.96875 C 3.175781 -9.914062 4.523438 -10.390625 6.234375 -10.390625 C 6.796875 -10.390625 7.335938 -10.328125 7.859375 -10.203125 C 8.390625 -10.078125 8.894531 -9.882812 9.375 -9.625 L 9.375 -7.515625 C 8.882812 -7.847656 8.398438 -8.09375 7.921875 -8.25 C 7.453125 -8.40625 6.957031 -8.484375 6.4375 -8.484375 C 5.5 -8.484375 4.757812 -8.179688 4.21875 -7.578125 C 3.6875 -6.972656 3.421875 -6.144531 3.421875 -5.09375 C 3.421875 -4.039062 3.6875 -3.210938 4.21875 -2.609375 C 4.757812 -2.003906 5.5 -1.703125 6.4375 -1.703125 C 6.957031 -1.703125 7.453125 -1.78125 7.921875 -1.9375 C 8.398438 -2.09375 8.882812 -2.335938 9.375 -2.671875 Z M 9.375 -0.5625 "/>
|
||||
</g>
|
||||
<g id="glyph-0-10">
|
||||
<path d="M 4.8125 -6.09375 C 4.269531 -6.09375 3.859375 -5.894531 3.578125 -5.5 C 3.296875 -5.113281 3.15625 -4.554688 3.15625 -3.828125 C 3.15625 -3.085938 3.296875 -2.519531 3.578125 -2.125 C 3.859375 -1.738281 4.269531 -1.546875 4.8125 -1.546875 C 5.351562 -1.546875 5.765625 -1.738281 6.046875 -2.125 C 6.328125 -2.519531 6.46875 -3.085938 6.46875 -3.828125 C 6.46875 -4.554688 6.328125 -5.113281 6.046875 -5.5 C 5.765625 -5.894531 5.351562 -6.09375 4.8125 -6.09375 Z M 4.8125 -7.84375 C 6.132812 -7.84375 7.164062 -7.484375 7.90625 -6.765625 C 8.644531 -6.054688 9.015625 -5.078125 9.015625 -3.828125 C 9.015625 -2.566406 8.644531 -1.578125 7.90625 -0.859375 C 7.164062 -0.148438 6.132812 0.203125 4.8125 0.203125 C 3.5 0.203125 2.46875 -0.148438 1.71875 -0.859375 C 0.976562 -1.578125 0.609375 -2.566406 0.609375 -3.828125 C 0.609375 -5.078125 0.976562 -6.054688 1.71875 -6.765625 C 2.46875 -7.484375 3.5 -7.84375 4.8125 -7.84375 Z M 4.8125 -7.84375 "/>
|
||||
</g>
|
||||
<g id="glyph-0-11">
|
||||
<path d="M 8.875 -4.65625 L 8.875 0 L 6.40625 0 L 6.40625 -3.5625 C 6.40625 -4.226562 6.390625 -4.6875 6.359375 -4.9375 C 6.335938 -5.1875 6.289062 -5.367188 6.21875 -5.484375 C 6.125 -5.648438 5.992188 -5.773438 5.828125 -5.859375 C 5.660156 -5.953125 5.472656 -6 5.265625 -6 C 4.753906 -6 4.351562 -5.800781 4.0625 -5.40625 C 3.769531 -5.007812 3.625 -4.460938 3.625 -3.765625 L 3.625 0 L 1.171875 0 L 1.171875 -7.65625 L 3.625 -7.65625 L 3.625 -6.53125 C 3.988281 -6.976562 4.378906 -7.304688 4.796875 -7.515625 C 5.210938 -7.734375 5.671875 -7.84375 6.171875 -7.84375 C 7.054688 -7.84375 7.726562 -7.570312 8.1875 -7.03125 C 8.644531 -6.488281 8.875 -5.695312 8.875 -4.65625 Z M 8.875 -4.65625 "/>
|
||||
<path d="M 1.171875 -10.640625 L 3.625 -10.640625 L 3.625 0 L 1.171875 0 Z M 1.171875 -10.640625 "/>
|
||||
</g>
|
||||
<g id="glyph-1-0">
|
||||
<path d="M 6.4375 -8.78125 L 6.4375 -4.96875 L 10.25 -4.96875 L 10.25 -3.8125 L 6.4375 -3.8125 L 6.4375 0 L 5.296875 0 L 5.296875 -3.8125 L 1.484375 -3.8125 L 1.484375 -4.96875 L 5.296875 -4.96875 L 5.296875 -8.78125 Z M 6.4375 -8.78125 "/>
|
||||
@ -124,18 +121,9 @@
|
||||
<g id="glyph-1-28">
|
||||
<path d="M 4.5 0.71875 C 4.144531 1.625 3.796875 2.210938 3.453125 2.484375 C 3.117188 2.765625 2.671875 2.90625 2.109375 2.90625 L 1.109375 2.90625 L 1.109375 1.859375 L 1.84375 1.859375 C 2.1875 1.859375 2.453125 1.773438 2.640625 1.609375 C 2.835938 1.453125 3.050781 1.066406 3.28125 0.453125 L 3.515625 -0.125 L 0.421875 -7.65625 L 1.75 -7.65625 L 4.140625 -1.671875 L 6.53125 -7.65625 L 7.875 -7.65625 Z M 4.5 0.71875 "/>
|
||||
</g>
|
||||
<g id="glyph-1-29">
|
||||
<path d="M 1.1875 -3.015625 L 1.1875 -7.65625 L 2.453125 -7.65625 L 2.453125 -3.0625 C 2.453125 -2.34375 2.59375 -1.800781 2.875 -1.4375 C 3.15625 -1.070312 3.578125 -0.890625 4.140625 -0.890625 C 4.816406 -0.890625 5.351562 -1.101562 5.75 -1.53125 C 6.144531 -1.96875 6.34375 -2.5625 6.34375 -3.3125 L 6.34375 -7.65625 L 7.609375 -7.65625 L 7.609375 0 L 6.34375 0 L 6.34375 -1.171875 C 6.039062 -0.710938 5.6875 -0.367188 5.28125 -0.140625 C 4.875 0.0859375 4.40625 0.203125 3.875 0.203125 C 3 0.203125 2.332031 -0.0664062 1.875 -0.609375 C 1.414062 -1.160156 1.1875 -1.960938 1.1875 -3.015625 Z M 4.359375 -7.84375 Z M 4.359375 -7.84375 "/>
|
||||
</g>
|
||||
<g id="glyph-1-30">
|
||||
<path d="M 6.8125 -3.828125 C 6.8125 -4.742188 6.617188 -5.460938 6.234375 -5.984375 C 5.859375 -6.515625 5.335938 -6.78125 4.671875 -6.78125 C 4.003906 -6.78125 3.476562 -6.515625 3.09375 -5.984375 C 2.71875 -5.460938 2.53125 -4.742188 2.53125 -3.828125 C 2.53125 -2.898438 2.71875 -2.171875 3.09375 -1.640625 C 3.476562 -1.117188 4.003906 -0.859375 4.671875 -0.859375 C 5.335938 -0.859375 5.859375 -1.117188 6.234375 -1.640625 C 6.617188 -2.171875 6.8125 -2.898438 6.8125 -3.828125 Z M 2.53125 -6.5 C 2.800781 -6.945312 3.132812 -7.28125 3.53125 -7.5 C 3.9375 -7.726562 4.421875 -7.84375 4.984375 -7.84375 C 5.910156 -7.84375 6.664062 -7.472656 7.25 -6.734375 C 7.832031 -5.992188 8.125 -5.023438 8.125 -3.828125 C 8.125 -2.617188 7.832031 -1.644531 7.25 -0.90625 C 6.664062 -0.164062 5.910156 0.203125 4.984375 0.203125 C 4.421875 0.203125 3.9375 0.09375 3.53125 -0.125 C 3.132812 -0.351562 2.800781 -0.695312 2.53125 -1.15625 L 2.53125 0 L 1.265625 0 L 1.265625 -10.640625 L 2.53125 -10.640625 Z M 2.53125 -6.5 "/>
|
||||
</g>
|
||||
<g id="glyph-1-31">
|
||||
<path d="M 7.5 -7.65625 L 7.5 0 L 6.234375 0 L 6.234375 -6.671875 L 2.796875 -6.671875 L 2.796875 0 L 1.53125 0 L 1.53125 -6.671875 L 0.328125 -6.671875 L 0.328125 -7.65625 L 1.53125 -7.65625 L 1.53125 -8.1875 C 1.53125 -9.019531 1.722656 -9.632812 2.109375 -10.03125 C 2.503906 -10.4375 3.113281 -10.640625 3.9375 -10.640625 L 5.203125 -10.640625 L 5.203125 -9.59375 L 4 -9.59375 C 3.539062 -9.59375 3.222656 -9.5 3.046875 -9.3125 C 2.878906 -9.132812 2.796875 -8.804688 2.796875 -8.328125 L 2.796875 -7.65625 Z M 6.234375 -10.625 L 7.5 -10.625 L 7.5 -9.03125 L 6.234375 -9.03125 Z M 6.234375 -10.625 "/>
|
||||
</g>
|
||||
</g>
|
||||
</defs>
|
||||
<path fill="none" stroke-width="2" stroke-linecap="butt" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="10" d="M 0.00016626 0 L 311.000166 0 L 311.000166 185 L 0.00016626 185 Z M 0.00016626 0 Z M 0.00016626 0 " transform="matrix(1, 0, 0, 1, 9.898271, 9.042969)"/>
|
||||
<path fill="none" stroke-width="2" stroke-linecap="butt" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="10" d="M 0.00016626 0 L 311.000166 0 L 311.000166 151 L 0.00016626 151 Z M 0.00016626 0 Z M 0.00016626 0 " transform="matrix(1, 0, 0, 1, 9.898271, 9.042969)"/>
|
||||
<g fill="rgb(0%, 0%, 0%)" fill-opacity="1">
|
||||
<use xlink:href="#glyph-0-0" x="122.898438" y="40.042969"/>
|
||||
<use xlink:href="#glyph-0-1" x="134.898438" y="40.042969"/>
|
||||
@ -258,110 +246,97 @@
|
||||
<use xlink:href="#glyph-1-9" x="293.898438" y="152.042969"/>
|
||||
<use xlink:href="#glyph-1-11" x="302.898438" y="152.042969"/>
|
||||
</g>
|
||||
<path fill="none" stroke-width="2" stroke-linecap="butt" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="10" d="M 0.00103399 0 L 311.001034 0 L 311.001034 117 L 0.00103399 117 Z M 0.00103399 0 Z M 0.00103399 0 " transform="matrix(1, 0, 0, 1, 363.924747, 26.042969)"/>
|
||||
<g fill="rgb(0%, 0%, 0%)" fill-opacity="1">
|
||||
<use xlink:href="#glyph-1-0" x="13.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-1" x="25.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-10" x="29.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="38.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-13" x="47.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-5" x="56.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-24" x="61.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-14" x="67.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-8" x="76.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-27" x="85.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-23" x="92.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-13" x="97.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-24" x="106.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-11" x="112.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-7" x="126.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-1" x="131.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-4" x="135.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-13" x="144.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-29" x="153.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-30" x="162.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-22" x="171.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="175.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-1-16" x="184.898438" y="169.042969"/>
|
||||
<use xlink:href="#glyph-0-9" x="504.925781" y="57.042969"/>
|
||||
<use xlink:href="#glyph-0-1" x="514.925781" y="57.042969"/>
|
||||
<use xlink:href="#glyph-0-10" x="523.925781" y="57.042969"/>
|
||||
<use xlink:href="#glyph-0-10" x="528.925781" y="57.042969"/>
|
||||
</g>
|
||||
<path fill="none" stroke-width="2" stroke-linecap="butt" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="10" d="M 0.00103399 41 L 311.001034 41 " transform="matrix(1, 0, 0, 1, 363.924747, 26.042969)"/>
|
||||
<g fill="rgb(0%, 0%, 0%)" fill-opacity="1">
|
||||
<use xlink:href="#glyph-1-0" x="367.925781" y="84.042969"/>
|
||||
<use xlink:href="#glyph-1-1" x="379.925781" y="84.042969"/>
|
||||
<use xlink:href="#glyph-1-2" x="383.925781" y="84.042969"/>
|
||||
<use xlink:href="#glyph-1-3" x="394.925781" y="84.042969"/>
|
||||
<use xlink:href="#glyph-1-4" x="398.925781" y="84.042969"/>
|
||||
<use xlink:href="#glyph-1-5" x="407.925781" y="84.042969"/>
|
||||
<use xlink:href="#glyph-1-6" x="412.925781" y="84.042969"/>
|
||||
<use xlink:href="#glyph-1-7" x="421.925781" y="84.042969"/>
|
||||
<use xlink:href="#glyph-1-1" x="426.925781" y="84.042969"/>
|
||||
<use xlink:href="#glyph-1-3" x="430.925781" y="84.042969"/>
|
||||
<use xlink:href="#glyph-1-8" x="434.925781" y="84.042969"/>
|
||||
<use xlink:href="#glyph-1-5" x="443.925781" y="84.042969"/>
|
||||
</g>
|
||||
<g fill="rgb(0%, 0%, 0%)" fill-opacity="1">
|
||||
<use xlink:href="#glyph-1-0" x="13.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-1" x="25.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-31" x="29.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-22" x="38.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="42.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-21" x="51.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-14" x="60.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-5" x="69.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-6" x="74.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-7" x="83.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-1" x="88.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-25" x="92.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-6" x="100.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-14" x="109.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-24" x="118.898438" y="186.042969"/>
|
||||
<use xlink:href="#glyph-1-16" x="124.898438" y="186.042969"/>
|
||||
</g>
|
||||
<path fill="none" stroke-width="2" stroke-linecap="butt" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="10" d="M 0.0000915527 0 L 130.000092 0 L 130.000092 125 L 0.0000915527 125 Z M 0.0000915527 0 Z M 0.0000915527 0 " transform="matrix(1, 0, 0, 1, 380.788971, 32.691406)"/>
|
||||
<g fill="rgb(0%, 0%, 0%)" fill-opacity="1">
|
||||
<use xlink:href="#glyph-0-9" x="424.789062" y="63.691406"/>
|
||||
<use xlink:href="#glyph-0-10" x="434.789062" y="63.691406"/>
|
||||
<use xlink:href="#glyph-0-2" x="444.789062" y="63.691406"/>
|
||||
<use xlink:href="#glyph-0-11" x="449.789062" y="63.691406"/>
|
||||
<use xlink:href="#glyph-0-5" x="459.789062" y="63.691406"/>
|
||||
</g>
|
||||
<path fill="none" stroke-width="2" stroke-linecap="butt" stroke-linejoin="round" stroke="rgb(0%, 0%, 0%)" stroke-opacity="1" stroke-miterlimit="10" d="M 0.0000915527 41 L 130.000092 41 " transform="matrix(1, 0, 0, 1, 380.788971, 32.691406)"/>
|
||||
<g fill="rgb(0%, 0%, 0%)" fill-opacity="1">
|
||||
<use xlink:href="#glyph-1-0" x="384.789062" y="90.691406"/>
|
||||
<use xlink:href="#glyph-1-1" x="396.789062" y="90.691406"/>
|
||||
<use xlink:href="#glyph-1-15" x="400.789062" y="90.691406"/>
|
||||
<use xlink:href="#glyph-1-7" x="408.789062" y="90.691406"/>
|
||||
<use xlink:href="#glyph-1-1" x="413.789062" y="90.691406"/>
|
||||
<use xlink:href="#glyph-1-3" x="417.789062" y="90.691406"/>
|
||||
<use xlink:href="#glyph-1-8" x="421.789062" y="90.691406"/>
|
||||
<use xlink:href="#glyph-1-5" x="430.789062" y="90.691406"/>
|
||||
<use xlink:href="#glyph-1-0" x="367.925781" y="101.042969"/>
|
||||
<use xlink:href="#glyph-1-1" x="379.925781" y="101.042969"/>
|
||||
<use xlink:href="#glyph-1-6" x="383.925781" y="101.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="392.925781" y="101.042969"/>
|
||||
<use xlink:href="#glyph-1-3" x="401.925781" y="101.042969"/>
|
||||
<use xlink:href="#glyph-1-10" x="405.925781" y="101.042969"/>
|
||||
<use xlink:href="#glyph-1-6" x="414.925781" y="101.042969"/>
|
||||
<use xlink:href="#glyph-1-5" x="423.925781" y="101.042969"/>
|
||||
<use xlink:href="#glyph-1-7" x="428.925781" y="101.042969"/>
|
||||
<use xlink:href="#glyph-1-1" x="433.925781" y="101.042969"/>
|
||||
<use xlink:href="#glyph-1-3" x="437.925781" y="101.042969"/>
|
||||
<use xlink:href="#glyph-1-8" x="441.925781" y="101.042969"/>
|
||||
<use xlink:href="#glyph-1-5" x="450.925781" y="101.042969"/>
|
||||
</g>
|
||||
<g fill="rgb(0%, 0%, 0%)" fill-opacity="1">
|
||||
<use xlink:href="#glyph-1-0" x="384.789062" y="107.691406"/>
|
||||
<use xlink:href="#glyph-1-1" x="396.789062" y="107.691406"/>
|
||||
<use xlink:href="#glyph-1-28" x="400.789062" y="107.691406"/>
|
||||
<use xlink:href="#glyph-1-7" x="407.789062" y="107.691406"/>
|
||||
<use xlink:href="#glyph-1-1" x="412.789062" y="107.691406"/>
|
||||
<use xlink:href="#glyph-1-3" x="416.789062" y="107.691406"/>
|
||||
<use xlink:href="#glyph-1-8" x="420.789062" y="107.691406"/>
|
||||
<use xlink:href="#glyph-1-5" x="429.789062" y="107.691406"/>
|
||||
<use xlink:href="#glyph-1-0" x="367.925781" y="118.042969"/>
|
||||
<use xlink:href="#glyph-1-1" x="379.925781" y="118.042969"/>
|
||||
<use xlink:href="#glyph-1-25" x="383.925781" y="118.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="391.925781" y="118.042969"/>
|
||||
<use xlink:href="#glyph-1-22" x="400.925781" y="118.042969"/>
|
||||
<use xlink:href="#glyph-1-22" x="404.925781" y="118.042969"/>
|
||||
<use xlink:href="#glyph-1-27" x="408.925781" y="118.042969"/>
|
||||
<use xlink:href="#glyph-1-7" x="415.925781" y="118.042969"/>
|
||||
<use xlink:href="#glyph-1-1" x="420.925781" y="118.042969"/>
|
||||
<use xlink:href="#glyph-1-3" x="424.925781" y="118.042969"/>
|
||||
<use xlink:href="#glyph-1-8" x="428.925781" y="118.042969"/>
|
||||
<use xlink:href="#glyph-1-5" x="437.925781" y="118.042969"/>
|
||||
<use xlink:href="#glyph-1-16" x="442.925781" y="118.042969"/>
|
||||
</g>
|
||||
<g fill="rgb(0%, 0%, 0%)" fill-opacity="1">
|
||||
<use xlink:href="#glyph-1-0" x="384.789062" y="124.691406"/>
|
||||
<use xlink:href="#glyph-1-1" x="396.789062" y="124.691406"/>
|
||||
<use xlink:href="#glyph-1-11" x="400.789062" y="124.691406"/>
|
||||
<use xlink:href="#glyph-1-27" x="414.789062" y="124.691406"/>
|
||||
<use xlink:href="#glyph-1-25" x="421.789062" y="124.691406"/>
|
||||
<use xlink:href="#glyph-1-14" x="429.789062" y="124.691406"/>
|
||||
<use xlink:href="#glyph-1-27" x="438.789062" y="124.691406"/>
|
||||
<use xlink:href="#glyph-1-9" x="445.789062" y="124.691406"/>
|
||||
<use xlink:href="#glyph-1-7" x="454.789062" y="124.691406"/>
|
||||
<use xlink:href="#glyph-1-1" x="459.789062" y="124.691406"/>
|
||||
<use xlink:href="#glyph-1-3" x="463.789062" y="124.691406"/>
|
||||
<use xlink:href="#glyph-1-8" x="467.789062" y="124.691406"/>
|
||||
<use xlink:href="#glyph-1-5" x="476.789062" y="124.691406"/>
|
||||
</g>
|
||||
<g fill="rgb(0%, 0%, 0%)" fill-opacity="1">
|
||||
<use xlink:href="#glyph-1-0" x="384.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-1" x="396.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-14" x="400.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-22" x="409.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-22" x="413.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-13" x="417.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-25" x="426.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-14" x="434.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-5" x="443.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-9" x="448.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-4" x="457.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-7" x="466.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-1" x="471.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-30" x="475.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-13" x="484.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-13" x="493.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-22" x="502.789062" y="141.691406"/>
|
||||
<use xlink:href="#glyph-1-0" x="367.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-1" x="379.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-17" x="383.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-18" x="394.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-19" x="405.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-20" x="415.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-21" x="424.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-14" x="433.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-5" x="442.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-3" x="447.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-14" x="451.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-22" x="460.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-19" x="464.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="473.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-23" x="482.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="487.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-24" x="496.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="501.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-8" x="510.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-25" x="519.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="527.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-7" x="536.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-1" x="541.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-24" x="545.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="550.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-23" x="559.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="564.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-24" x="573.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="578.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-8" x="587.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-25" x="596.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="604.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-26" x="613.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-27" x="620.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-28" x="627.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-27" x="635.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-5" x="642.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-9" x="647.925781" y="135.042969"/>
|
||||
<use xlink:href="#glyph-1-11" x="656.925781" y="135.042969"/>
|
||||
</g>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 45 KiB After Width: | Height: | Size: 41 KiB |
Binary file not shown.
@ -1,53 +1,17 @@
|
||||
% INF205 Project report
|
||||
% Creating contour maps from raster heightmaps
|
||||
% Esther and Trygve 7. May 2024
|
||||
|
||||
|
||||
# Introduction
|
||||
The source code is available on [https://gitlab.com/Trygve/contour-creator](https://gitlab.com/Trygve/contour-creator)
|
||||
The branch 7-5-2024 contains the source code as it was on the day of the deadline.
|
||||
Becouse of the 90/90 rule we had to focus on the core functionality and unfortunatly we have a few bugs and performance issues left. If we fix these issues they will be available on the main branch.
|
||||
## Group: Trygve and Esther
|
||||
# Functionality
|
||||
Our program uses the marching squares algorithm to create a vector contour map from a raster heightmap (DTM).
|
||||
It outputs a geojson file that can be read by gis software. [https://mapshaper.org/](https://mapshaper.org/) is a simple website where you can view geojson files.
|
||||
Our program usees the marching squares algorithm to create a vector contour map from a raster heightmap.
|
||||
The cli interface is `gdal_contour [OPTIONS] <src_filename> <dst_filename>` with these options:
|
||||
```
|
||||
-i <elevation intervall> Interval between contours
|
||||
-f <format> Fileformat to output
|
||||
```
|
||||
# data structure and input/output
|
||||
|
||||
# Responsibilities:
|
||||
Esther will create the algorithm itself with multitreading. This will essentially be a function that takes a grid of pixels as input and returns a similar grid of cells.
|
||||
Trygve will take care of reading in the tiff file into our own datastructure and creating a vector image from the output of the algorithm.
|
||||
|
||||
Instructions on running the program is available in the README.md file
|
||||
# data structures and input/output
|
||||
|
||||
|
||||
|
||||
The [HeightMap](https://trygve.gitlab.io/contour-creator/classHeightMap.html) class stores the heightmap as a array on the heap. It was not nececarry to copy or move this class, so we did not implement copy or move constructors/assignment operators.
|
||||
|
||||
The [Point](https://trygve.gitlab.io/contour-creator/classPoint.html) class represents a point in a line. The points are stored in vectors, wich are again stored in a big vector containing all the lines.
|
||||
The `produce_cellmap` function finds the points for a contour at a given elevation. The `create_lines` uses `produce_cellmap` the get the points and then sorts them into contiguous lines before returning a `std::vector<std::vector<Point>>`{.cpp} thats used by the function `write_output_file` to write them to a geojson file.
|
||||
|
||||
# Performance
|
||||
|
||||
| | 1 | 2 | 3 | 4 | 5 | Avarage |
|
||||
| ---------- | ----- | ----- | ----- | ----- | ----- | ------- |
|
||||
| 12 threads | 7,03 | 6,74 | 6,88 | 6,86 | 6,85 | 6,872 |
|
||||
| 1 thread | 21,48 | 21,27 | 20,82 | 20,35 | 20,81 | 20,946 |
|
||||
| reference | 4,5 | 5,61 | 5,24 | 4,81 | 5,02 | 5,036 |
|
||||
|
||||
| | slowdown |
|
||||
| ---------------------------- | -------- |
|
||||
| ours/gdal | 1,36 |
|
||||
| singlethreaded/multithreaded | 3,05 |
|
||||
|
||||
|
||||
Our program is 1,36 times slower than gdal_contour wich is bad considering ours is multithreaded and gdals is not. On the other hand gdals is has 11 years of development.
|
||||
|
||||
The running on 12 threads yields a nice speedup 3,05 times.
|
||||
|
||||
The program assumes the whole heightmap can fit in memory, this is not a problem for heightmaps from [hoydedata.no](https://hoydedata.no/LaserInnsyn2/) as the maximum tile size is about 700mb.
|
||||
|
||||
# Functionality of special interest
|
||||
|
||||
## Trygve
|
||||
I can created a blur method that performs a simple box blur on the whole heigtmap. This is usefull to smooth out noise and create a more readable output.
|
||||
I wanted to implement a gaussion blur, and the code is ready for that, but in the end we became short on time.
|
||||
The blur is activated by passing the `--blur` flag
|
||||
|
||||
## Esther
|
||||
Calculated some statistical estimates for the average, variance and standard deviation for the pixels in the image. Also tried to calculate the steepness around each pixel. However, we didn't manage to get the Gdal to work for this.
|
||||
Statistics output is activated by passing the `--stats` flag
|
||||
# How do you plan to make it easily verifiable that your objectives are reached?
|
||||
We can compare against the `gdal_contour` cli program which is a implementation widely used in other software. We can compare speed, memory usage and the result itself.
|
||||
Each step in our program also produces a output which we can be worked on and evaluated independently.
|
||||
11
example_files/crop.tif.aux.xml
Normal file
11
example_files/crop.tif.aux.xml
Normal file
@ -0,0 +1,11 @@
|
||||
<PAMDataset>
|
||||
<PAMRasterBand band="1">
|
||||
<Metadata>
|
||||
<MDI key="STATISTICS_MAXIMUM">50.05460357666</MDI>
|
||||
<MDI key="STATISTICS_MEAN">43.851418194979</MDI>
|
||||
<MDI key="STATISTICS_MINIMUM">37.187175750732</MDI>
|
||||
<MDI key="STATISTICS_STDDEV">3.3140235738276</MDI>
|
||||
<MDI key="STATISTICS_VALID_PERCENT">100</MDI>
|
||||
</Metadata>
|
||||
</PAMRasterBand>
|
||||
</PAMDataset>
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:28f96c6f7191c6577bcdb872b5c6f7c0cd73d5431a304f556bf6c66ec7d7650d
|
||||
size 149951469
|
||||
20
src/CellMap.cpp
Normal file
20
src/CellMap.cpp
Normal file
@ -0,0 +1,20 @@
|
||||
#include <cstdint>
|
||||
#include <gdal/ogr_spatialref.h>
|
||||
#include <ogr_spatialref.h>
|
||||
#include "contour_creator.hh"
|
||||
|
||||
|
||||
CellMap::CellMap(int width, int height, uint8_t* cells, OGRSpatialReference reference_system, double* geotransform)
|
||||
{
|
||||
this->width = width;
|
||||
this->height = height;
|
||||
this->cells = cells;
|
||||
this->reference_system = reference_system;
|
||||
this->geotransform = geotransform;
|
||||
}
|
||||
int CellMap::get_cell(int x, int y)
|
||||
{
|
||||
// all the cells are in an array of ints from left to right, top to bottom
|
||||
int offset = ((this->width * y) + x);
|
||||
return *(this->cells + offset);
|
||||
}
|
||||
@ -6,6 +6,7 @@
|
||||
#include <gdal/gdal.h>
|
||||
#include "gdal/gdal_priv.h"
|
||||
#include <gdal/gdal_frmts.h>
|
||||
//#include "matplotlibcpp.h"
|
||||
#include "contour_creator.hh"
|
||||
|
||||
|
||||
@ -30,13 +31,13 @@ HeightMap::HeightMap(const char* filepath)
|
||||
this->min = band->GetMinimum();
|
||||
this->max = band-> GetMaximum();
|
||||
//https://gdal.org/api/gdaldataset_cpp.html#_CPPv4N11GDALDataset15GetGeoTransformEPd
|
||||
this->geotransform = new double[6];
|
||||
this->geotransform = (double *) CPLMalloc(sizeof(double)*6);
|
||||
this->reference_system = *(file->GetSpatialRef());
|
||||
this->filepath = filepath;
|
||||
|
||||
file->GetGeoTransform(this->geotransform);
|
||||
|
||||
this->data = new float[width*height];
|
||||
this->data = (float *) CPLMalloc(sizeof(float)*width*height);
|
||||
CPLErr error = band->RasterIO( GF_Read, 0, 0, width, height,
|
||||
this->data, width, height, GDT_Float32,
|
||||
0, 0 );
|
||||
@ -47,7 +48,9 @@ HeightMap::HeightMap(const char* filepath)
|
||||
float HeightMap::get_pixel(int x, int y)
|
||||
{
|
||||
// all the pixels are in an array of floats from left to right, top to bottom
|
||||
return this->data[((this->width * y) + x)];
|
||||
int offset = ((this->width * y) + x);
|
||||
//std::cout << " offset: " << offset << " " << x << ","<< y;
|
||||
return *(this->data + offset);
|
||||
}
|
||||
|
||||
void HeightMap::blur(float standard_deviation)
|
||||
@ -56,10 +59,10 @@ void HeightMap::blur(float standard_deviation)
|
||||
int kernel_height = 5;
|
||||
int kernel_width = 5;
|
||||
int kernel_size = kernel_height*kernel_width;
|
||||
float* kernel = new float [kernel_size];
|
||||
float* kernel = (float*) CPLMalloc(sizeof(float)*kernel_size);
|
||||
for (int i=0; i<kernel_size; i++)
|
||||
{
|
||||
kernel[i] = 1.0;
|
||||
*(kernel + i) = 1.0;
|
||||
}
|
||||
|
||||
float* blurred = new float[this->width*this->height];
|
||||
@ -84,12 +87,10 @@ void HeightMap::blur(float standard_deviation)
|
||||
}
|
||||
blurred_pixel += this->get_pixel(x, y);
|
||||
}
|
||||
blurred[i] = blurred_pixel/float(kernel_size);
|
||||
*(blurred + i) = blurred_pixel/float(kernel_size);
|
||||
}
|
||||
}
|
||||
|
||||
delete[] kernel;
|
||||
delete[] this->data;
|
||||
free(this->data);
|
||||
this->data = blurred;
|
||||
blurred = nullptr;
|
||||
}
|
||||
@ -132,13 +133,13 @@ void HeightMap::statistics()
|
||||
};
|
||||
|
||||
|
||||
void HeightMap::calculate_steepness(const char* filepath)
|
||||
void HeightMap::calculate_steepness()
|
||||
{
|
||||
int kernel_height = 5;
|
||||
int kernel_width = 5;
|
||||
int kernel_size = kernel_height*kernel_width;
|
||||
|
||||
float* kernel = new float[kernel_size];
|
||||
float* kernel = new float[sizeof(float)*kernel_size];
|
||||
float* steepness = new float[this->width*this->height];
|
||||
#pragma omp parallel
|
||||
{
|
||||
@ -176,11 +177,12 @@ void HeightMap::calculate_steepness(const char* filepath)
|
||||
}
|
||||
}
|
||||
GDALAllRegister();
|
||||
GDALDataset *original_file = (GDALDataset *) GDALOpen( this->filepath, GA_ReadOnly );
|
||||
GDALDataset *original_file = (GDALDataset *) GDALOpen( filepath, GA_ReadOnly );
|
||||
|
||||
const char * filename = "steepness.tif";
|
||||
auto driver = GetGDALDriverManager()->GetDriverByName("GeoRaster");
|
||||
GDALDataset *file;
|
||||
file = driver->CreateCopy(filepath, original_file, FALSE, NULL, NULL, NULL);
|
||||
file = driver->CreateCopy("steepness.tif", original_file, FALSE, NULL, NULL, NULL);
|
||||
|
||||
file->AddBand(GDT_Float32, NULL);
|
||||
GDALRasterBand *band = file->GetRasterBand(0);
|
||||
|
||||
@ -15,18 +15,28 @@ class HeightMap
|
||||
int height; //!< height of image in pixels
|
||||
float min; //!< Minimum value in image
|
||||
float max; //!< Maximum value in image
|
||||
const char* filepath; //!< Where the heightmap was read from
|
||||
OGRSpatialReference reference_system;
|
||||
HeightMap(const char* filepath);
|
||||
~HeightMap()
|
||||
{
|
||||
delete[] data;
|
||||
delete[] geotransform;
|
||||
}
|
||||
const char* filepath;
|
||||
float get_pixel(int x,int y);
|
||||
void blur(float standard_deviation);
|
||||
void statistics(); //!< Print statistical information about the heightmap
|
||||
void calculate_steepness(const char*); //!< Output a raster file with the steepness of each pixel
|
||||
void statistics();
|
||||
void calculate_steepness();
|
||||
};
|
||||
|
||||
/**
|
||||
@brief stores the cells from marching squars for one elevation level
|
||||
*/
|
||||
class CellMap
|
||||
{
|
||||
public:
|
||||
uint8_t* cells; //!< pointer to the first cell in the array. uint8_t is a 8 bit unsigned integer
|
||||
double* geotransform; //!< Six double buffer for storing the affine transformations
|
||||
int width; //!< width of image in cells
|
||||
int height; //!< height of image in cells
|
||||
OGRSpatialReference reference_system;
|
||||
CellMap(int width, int height, uint8_t* cells, OGRSpatialReference reference_system, double* geotransform);
|
||||
int get_cell(int x,int y);
|
||||
};
|
||||
|
||||
class Point
|
||||
@ -34,9 +44,9 @@ class Point
|
||||
public:
|
||||
int x;
|
||||
int y;
|
||||
uint8_t mscase; //!< The case outputted by the algorithm. A number between 0 and 15
|
||||
bool allocated = false; //!< Used when sorting the points to see if it has been sorted
|
||||
Point(int x, int y, uint8_t mscase){
|
||||
int mscase;
|
||||
bool allocated = false;
|
||||
Point(int x, int y, int mscase){
|
||||
this -> x = x;
|
||||
this -> y = y;
|
||||
this -> mscase = mscase;
|
||||
|
||||
26
src/main.cpp
26
src/main.cpp
@ -21,6 +21,7 @@
|
||||
std::vector<Point> produce_cellmap(HeightMap* heightmap, float z)
|
||||
{
|
||||
int length = (heightmap->width-1)*(heightmap->height-1); // Defining length of vector
|
||||
uint8_t *cells = (uint8_t *) CPLMalloc(sizeof(uint8_t)*length);
|
||||
std::vector<Point> points; // Initiating a vector of points
|
||||
for (int i = 0; i<length; i++) {
|
||||
int y = i/(heightmap->width-1);
|
||||
@ -176,7 +177,7 @@ constexpr std::tuple<double, double, double, double> marching_squares_lookup(int
|
||||
case 7:
|
||||
return {0, 0.5, 0.5, 1};
|
||||
case 8:
|
||||
return {0.5, 1, 0, 0.5};
|
||||
return {0.5, 0.5, 0, 0.5};
|
||||
|
||||
|
||||
};
|
||||
@ -251,7 +252,7 @@ void write_output_file(std::vector<std::vector<Point>> all_points, const char *f
|
||||
left_to_right = false;
|
||||
bool top_to_bottom = true;
|
||||
if ((points[k].y - points[k-1].y) < 0)
|
||||
top_to_bottom = false;
|
||||
left_to_right = false;
|
||||
|
||||
|
||||
|
||||
@ -261,14 +262,14 @@ void write_output_file(std::vector<std::vector<Point>> all_points, const char *f
|
||||
|
||||
auto [x1, y1, x2, y2] = marching_squares_lookup(points[k].mscase);
|
||||
|
||||
if (left_to_right or top_to_bottom)
|
||||
if (left_to_right or !top_to_bottom)
|
||||
{
|
||||
geometry->setPoint(geometry->getNumPoints(),x + (x1/4) ,y + (y1/4));
|
||||
geometry->setPoint(geometry->getNumPoints(),x + (x2/4) ,y + (y2/4));
|
||||
geometry->setPoint(geometry->getNumPoints(),x + (x1/6) ,y + (y1/6));
|
||||
geometry->setPoint(geometry->getNumPoints(),x + (x2/6) ,y + (y2/6));
|
||||
}
|
||||
else {
|
||||
geometry->setPoint(geometry->getNumPoints(),x + (x2/4) ,y + (y2/4));
|
||||
geometry->setPoint(geometry->getNumPoints(),x + (x1/4) ,y + (y1/4));
|
||||
geometry->setPoint(geometry->getNumPoints(),x + (x2/6) ,y + (y2/6));
|
||||
geometry->setPoint(geometry->getNumPoints(),x + (x1/6) ,y + (y1/6));
|
||||
}
|
||||
}
|
||||
|
||||
@ -295,16 +296,13 @@ int main(int argc, const char* argv[])
|
||||
if (cmdl[{ "-h", "--help" }])
|
||||
{
|
||||
std::cout << "Usage:\n"
|
||||
<< "contour_creator [OPTIONS] <input_file>\n\n"
|
||||
<< "Arguments in the form --<name>=<value>:"
|
||||
<< "contour_creator [OPTIONS] <input_file>\n"
|
||||
<< "-o; --output <FILENAME.geojson> - File to write output to (Default: contours.geojson)\n"
|
||||
<< "-i; --interval <int> - Set the interval between contours (Default: 5)\n"
|
||||
<< "-b; --blur - Blur the image\n"
|
||||
<< "--stats - Print statistical information about the heightmap\n"
|
||||
<< "--steepness <filename> - Create steepness map\n";
|
||||
<< "--stats - Print statistical information about the heightmap\n";
|
||||
exit(0);
|
||||
}
|
||||
|
||||
int interval;
|
||||
cmdl({"-i", "--interval"}, 5) >> interval;
|
||||
if (interval <= 0)
|
||||
@ -323,10 +321,6 @@ int main(int argc, const char* argv[])
|
||||
if (cmdl[{"--stats"}])
|
||||
map.statistics();
|
||||
|
||||
std::string steepness_output_file;
|
||||
//if (cmdl({"--steepness"}, "steepness.tif") >> steepness_output_file)
|
||||
// map.calculate_steepness(output_file.c_str());
|
||||
|
||||
auto lines = create_lines(&map, interval);
|
||||
write_output_file(lines, output_file.c_str(), &map);
|
||||
std::cout << "Contours written to " << output_file << " 🗺️\n";
|
||||
|
||||
Loading…
Reference in New Issue
Block a user