Skip to content

Commit 1f2a38b

Browse files
sahrkmsahrkm
committed
Merge branch 'v77'
2 parents ea1d18a + 8d07db2 commit 1f2a38b

File tree

103 files changed

+93535
-547
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+93535
-547
lines changed

‎.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@ gg
5151
g2
5252
g1
5353
out
54+
goop
5455
JUNK
5556
junk
5657
.*.swp

‎CHANGELOG.md

+7
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,13 @@ All notable changes to this project will be documented in this file.
33

44
All changes are by Kevin Sahr, unless otherwise noted.
55

6+
## [7.7] - 2022-12-08
7+
### Added
8+
- handles holes in input clipping polygons. Uses new parameter clip_using_holes and example named holes
9+
### Fixed
10+
- replaced deprecated sprintf with snprintf throughout
11+
- suppressed unused parameter compiler warnings
12+
613
## [7.521] - 2022-03-03
714
### Fixed
815
- refactor DgHexIDGG class hierarchy to avoid potential memory errors

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
## General Information
44

5-
__DGGRID__ version 7.5 released February 8, 2022
5+
__DGGRID__ version 7.7 released December 8, 2022
66

77
__Southern Terra Cognita Laboratory__
88
www.discreteglobalgrids.org

‎dggridManualV75.pdf ‎dggridManualV77.pdf

3.82 MB
Binary file not shown.

‎examples/examples.lst

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ gridgenGeoJSON
1010
gridgenMixedSHP
1111
gridgenPureKML
1212
hiRes
13+
holes
1314
icosahedron
1415
isea7hGen
1516
mixedAperture

‎examples/holes/holes.meta

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
################################################################################
2+
#
3+
# holes.meta - example of a DGGRID metafile that generates a ISEA3H
4+
# resolution 17 grid using an input clipping polygon with holes.
5+
#
6+
# Kevin Sahr, 06/20/22
7+
#
8+
################################################################################
9+
10+
# specify the operation
11+
dggrid_operation GENERATE_GRID
12+
13+
# specify the DGG
14+
dggs_type ISEA3H
15+
dggs_res_spec 17
16+
17+
# control the generation
18+
clip_subset_type GDAL
19+
clip_region_files ./inputfiles/holes00.geojson
20+
clip_using_holes TRUE
21+
geodetic_densify 0.01
22+
23+
# specify the output
24+
cell_output_type KML
25+
cell_output_file_name ./outputfiles/res17
26+
densification 1

‎examples/holes/inputfiles/holes00.geojson

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
{
2+
"type": "Polygon",
3+
"coordinates": [
4+
[
5+
[-123.602898, 44.710941],
6+
[-123.601303, 44.641960],
7+
[-123.734703, 44.379749],
8+
[-123.774200, 44.274921],
9+
[-123.201797, 44.283680],
10+
[-123.236504, 44.368851],
11+
[-123.215202, 44.521091],
12+
[-123.171402, 44.617279],
13+
[-123.602898, 44.710941]
14+
],
15+
[
16+
[-123.60, 44.40],
17+
[-123.45, 44.41],
18+
[-123.50, 44.45],
19+
[-123.60, 44.40]
20+
],
21+
[
22+
[-123.30, 44.55],
23+
[-123.25, 44.58],
24+
[-123.24, 44.59],
25+
[-123.28, 44.60],
26+
[-123.29, 44.56],
27+
[-123.30, 44.55]
28+
]
29+
]
30+
}

‎examples/holes/outputfiles/.keep

Whitespace-only changes.

‎examples/sampleOutput/aigenerate/aigenerate.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
** executing DGGRID version 7.5 **
1+
** executing DGGRID version 7.7 **
22
type sizes: big int: 64 bits / big double: 128 bits
33

44
** loading meta file aigenerate.meta...
@@ -38,6 +38,7 @@ randpts_output_type NONE (default)
3838
cell_output_gdal_format GeoJSON (default)
3939
point_output_gdal_format GeoJSON (default)
4040
collection_output_gdal_format GeoJSON (default)
41+
clip_using_holes false (default)
4142
cell_output_file_name ./outputfiles/orCells (user set)
4243
point_output_file_name ./outputfiles/orPts (user set)
4344
randpts_output_file_name randPts (default)
@@ -46,7 +47,7 @@ shapefile_id_field_length 11 (default)
4647
kml_default_width 4 (default)
4748
kml_default_color ffffffff (default)
4849
kml_name (default)
49-
kml_description Generated by DGGRID 7.5 (default)
50+
kml_description Generated by DGGRID 7.7 (default)
5051
neighbor_output_type NONE (default)
5152
neighbor_output_file_name nbr (default)
5253
children_output_type NONE (default)

‎examples/sampleOutput/binpres/binpres.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
** executing DGGRID version 7.5 **
1+
** executing DGGRID version 7.7 **
22
type sizes: big int: 64 bits / big double: 128 bits
33

44
** loading meta file binpres.meta...

‎examples/sampleOutput/binvals/binvals.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
** executing DGGRID version 7.5 **
1+
** executing DGGRID version 7.7 **
22
type sizes: big int: 64 bits / big double: 128 bits
33

44
** loading meta file binvals.meta...

‎examples/sampleOutput/determineRes/determineRes.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
** executing DGGRID version 7.5 **
1+
** executing DGGRID version 7.7 **
22
type sizes: big int: 64 bits / big double: 128 bits
33

44
** loading meta file determineRes.meta...
@@ -40,6 +40,7 @@ randpts_output_type NONE (default)
4040
cell_output_gdal_format GeoJSON (default)
4141
point_output_gdal_format GeoJSON (default)
4242
collection_output_gdal_format GeoJSON (default)
43+
clip_using_holes false (default)
4344
cell_output_file_name outputfiles/earth120k (user set)
4445
point_output_file_name centers (default)
4546
randpts_output_file_name randPts (default)
@@ -48,7 +49,7 @@ shapefile_id_field_length 11 (default)
4849
kml_default_width 4 (default)
4950
kml_default_color ffffffff (default)
5051
kml_name (default)
51-
kml_description Generated by DGGRID 7.5 (default)
52+
kml_description Generated by DGGRID 7.7 (default)
5253
neighbor_output_type NONE (default)
5354
neighbor_output_file_name nbr (default)
5455
children_output_type NONE (default)

‎examples/sampleOutput/determineRes/earth120k.kml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<kml xmlns="http://earth.google.com/kml/2.1">
33
<Folder>
44
<name>outputfiles/earth120k.kml</name>
5-
<description>Generated by DGGRID 7.5</description>
5+
<description>Generated by DGGRID 7.7</description>
66
<Style id="lineStyle1">
77
<LineStyle id="lineStyle2">
88
<color>ffffffff</color>

‎examples/sampleOutput/gdalCollection/gdalCollection.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
** executing DGGRID version 7.5 **
1+
** executing DGGRID version 7.7 **
22
type sizes: big int: 64 bits / big double: 128 bits
33

44
** loading meta file gdalCollection.meta...
@@ -38,6 +38,7 @@ randpts_output_type NONE (default)
3838
cell_output_gdal_format GeoJSON (default)
3939
point_output_gdal_format GeoJSON (default)
4040
collection_output_gdal_format GeoJSON (user set)
41+
clip_using_holes false (default)
4142
cell_output_file_name cells (default)
4243
point_output_file_name centers (default)
4344
randpts_output_file_name randPts (default)
@@ -46,7 +47,7 @@ shapefile_id_field_length 11 (default)
4647
kml_default_width 4 (default)
4748
kml_default_color ffffffff (default)
4849
kml_name (default)
49-
kml_description Generated by DGGRID 7.5 (default)
50+
kml_description Generated by DGGRID 7.7 (default)
5051
neighbor_output_type GDAL_COLLECTION (user set)
5152
neighbor_output_file_name nbr (default)
5253
children_output_type GDAL_COLLECTION (user set)

‎examples/sampleOutput/gdalExample/gdalExample.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
** executing DGGRID version 7.5 **
1+
** executing DGGRID version 7.7 **
22
type sizes: big int: 64 bits / big double: 128 bits
33

44
** loading meta file gdalExample.meta...
@@ -38,6 +38,7 @@ randpts_output_type NONE (default)
3838
cell_output_gdal_format KML (user set)
3939
point_output_gdal_format GeoJSON (user set)
4040
collection_output_gdal_format GeoJSON (default)
41+
clip_using_holes false (default)
4142
cell_output_file_name ./outputfiles/corvallisCells.kml (user set)
4243
point_output_file_name ./outputfiles/corvallisPts.geojson (user set)
4344
randpts_output_file_name randPts (default)
@@ -46,7 +47,7 @@ shapefile_id_field_length 11 (default)
4647
kml_default_width 4 (default)
4748
kml_default_color ffffffff (default)
4849
kml_name (default)
49-
kml_description Generated by DGGRID 7.5 (default)
50+
kml_description Generated by DGGRID 7.7 (default)
5051
neighbor_output_type NONE (default)
5152
neighbor_output_file_name nbr (default)
5253
children_output_type NONE (default)

‎examples/sampleOutput/gridgenCellClip/cells.kml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<kml xmlns="http://earth.google.com/kml/2.1">
33
<Folder>
44
<name>outputfiles/cells.kml</name>
5-
<description>Generated by DGGRID 7.5</description>
5+
<description>Generated by DGGRID 7.7</description>
66
<Style id="lineStyle1">
77
<LineStyle id="lineStyle2">
88
<color>ffffffff</color>

‎examples/sampleOutput/gridgenCellClip/gridgenCellClip.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
** executing DGGRID version 7.5 **
1+
** executing DGGRID version 7.7 **
22
type sizes: big int: 64 bits / big double: 128 bits
33

44
** loading meta file gridgenCellClip.meta...
@@ -38,6 +38,7 @@ randpts_output_type NONE (default)
3838
cell_output_gdal_format GeoJSON (default)
3939
point_output_gdal_format GeoJSON (default)
4040
collection_output_gdal_format GeoJSON (default)
41+
clip_using_holes false (default)
4142
cell_output_file_name outputfiles/cells (user set)
4243
point_output_file_name outputfiles/points (user set)
4344
randpts_output_file_name randPts (default)
@@ -46,7 +47,7 @@ shapefile_id_field_length 11 (default)
4647
kml_default_width 4 (default)
4748
kml_default_color ffffffff (default)
4849
kml_name (default)
49-
kml_description Generated by DGGRID 7.5 (default)
50+
kml_description Generated by DGGRID 7.7 (default)
5051
neighbor_output_type NONE (default)
5152
neighbor_output_file_name nbr (default)
5253
children_output_type NONE (default)

‎examples/sampleOutput/gridgenCellClip/points.kml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<kml xmlns="http://earth.google.com/kml/2.1">
33
<Folder>
44
<name>outputfiles/points.kml</name>
5-
<description>Generated by DGGRID 7.5</description>
5+
<description>Generated by DGGRID 7.7</description>
66
<Style id="lineStyle1">
77
<LineStyle id="lineStyle2">
88
<color>ffffffff</color>

‎examples/sampleOutput/gridgenDiamond/gridgenDiamond.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
** executing DGGRID version 7.5 **
1+
** executing DGGRID version 7.7 **
22
type sizes: big int: 64 bits / big double: 128 bits
33

44
** loading meta file gridgenDiamond.meta...
@@ -38,6 +38,7 @@ randpts_output_type NONE (default)
3838
cell_output_gdal_format GeoJSON (default)
3939
point_output_gdal_format GeoJSON (default)
4040
collection_output_gdal_format GeoJSON (default)
41+
clip_using_holes false (default)
4142
cell_output_file_name outputfiles/dmd (user set)
4243
point_output_file_name centers (default)
4344
randpts_output_file_name randPts (default)

‎examples/sampleOutput/gridgenGeoJSON/gridgenGeoJSON.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
** executing DGGRID version 7.5 **
1+
** executing DGGRID version 7.7 **
22
type sizes: big int: 64 bits / big double: 128 bits
33

44
** loading meta file gridgenGeoJSON.meta...
@@ -38,6 +38,7 @@ randpts_output_type NONE (default)
3838
cell_output_gdal_format GeoJSON (default)
3939
point_output_gdal_format GeoJSON (default)
4040
collection_output_gdal_format GeoJSON (default)
41+
clip_using_holes false (default)
4142
cell_output_file_name outputfiles/corvallis_cell (user set)
4243
point_output_file_name outputfiles/corvallis_point (user set)
4344
randpts_output_file_name randPts (default)
@@ -46,7 +47,7 @@ shapefile_id_field_length 11 (default)
4647
kml_default_width 4 (default)
4748
kml_default_color ffffffff (default)
4849
kml_name (default)
49-
kml_description Generated by DGGRID 7.5 (default)
50+
kml_description Generated by DGGRID 7.7 (default)
5051
neighbor_output_type NONE (default)
5152
neighbor_output_file_name nbr (default)
5253
children_output_type NONE (default)

‎examples/sampleOutput/gridgenMixedSHP/gridgenMixedSHP.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
** executing DGGRID version 7.5 **
1+
** executing DGGRID version 7.7 **
22
type sizes: big int: 64 bits / big double: 128 bits
33

44
** loading meta file gridgenMixedSHP.meta...
@@ -38,6 +38,7 @@ randpts_output_type NONE (default)
3838
cell_output_gdal_format GeoJSON (default)
3939
point_output_gdal_format GeoJSON (default)
4040
collection_output_gdal_format GeoJSON (default)
41+
clip_using_holes false (default)
4142
cell_output_file_name outputfiles/benton10 (user set)
4243
point_output_file_name centers (default)
4344
randpts_output_file_name randPts (default)
@@ -46,7 +47,7 @@ shapefile_id_field_length 5 (user set)
4647
kml_default_width 4 (default)
4748
kml_default_color ffffffff (default)
4849
kml_name (default)
49-
kml_description Generated by DGGRID 7.5 (default)
50+
kml_description Generated by DGGRID 7.7 (default)
5051
neighbor_output_type NONE (default)
5152
neighbor_output_file_name nbr (default)
5253
children_output_type NONE (default)

‎examples/sampleOutput/gridgenPureKML/gridgenPureKML.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
** executing DGGRID version 7.5 **
1+
** executing DGGRID version 7.7 **
22
type sizes: big int: 64 bits / big double: 128 bits
33

44
** loading meta file gridgenPureKML.meta...
@@ -38,6 +38,7 @@ randpts_output_type NONE (default)
3838
cell_output_gdal_format GeoJSON (default)
3939
point_output_gdal_format GeoJSON (default)
4040
collection_output_gdal_format GeoJSON (default)
41+
clip_using_holes false (default)
4142
cell_output_file_name outputfiles/isea3h5 (user set)
4243
point_output_file_name outputfiles/isea3h5p (user set)
4344
randpts_output_file_name randPts (default)
@@ -46,7 +47,7 @@ shapefile_id_field_length 11 (default)
4647
kml_default_width 2 (user set)
4748
kml_default_color ff0000ff (user set)
4849
kml_name (default)
49-
kml_description Generated by DGGRID 7.5 (default)
50+
kml_description Generated by DGGRID 7.7 (default)
5051
neighbor_output_type NONE (default)
5152
neighbor_output_file_name nbr (default)
5253
children_output_type NONE (default)

‎examples/sampleOutput/gridgenPureKML/isea3h5.kml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<kml xmlns="http://earth.google.com/kml/2.1">
33
<Folder>
44
<name>outputfiles/isea3h5.kml</name>
5-
<description>Generated by DGGRID 7.5</description>
5+
<description>Generated by DGGRID 7.7</description>
66
<Style id="lineStyle1">
77
<LineStyle id="lineStyle2">
88
<color>ff0000ff</color>

‎examples/sampleOutput/gridgenPureKML/isea3h5p.kml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<kml xmlns="http://earth.google.com/kml/2.1">
33
<Folder>
44
<name>outputfiles/isea3h5p.kml</name>
5-
<description>Generated by DGGRID 7.5</description>
5+
<description>Generated by DGGRID 7.7</description>
66
<Style id="lineStyle1">
77
<LineStyle id="lineStyle2">
88
<color>ff0000ff</color>

‎examples/sampleOutput/hiRes/hiRes.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
** executing DGGRID version 7.5 **
1+
** executing DGGRID version 7.7 **
22
type sizes: big int: 64 bits / big double: 128 bits
33

44
** loading meta file hiRes.meta...
@@ -38,6 +38,7 @@ randpts_output_type NONE (default)
3838
cell_output_gdal_format GeoJSON (default)
3939
point_output_gdal_format GeoJSON (default)
4040
collection_output_gdal_format GeoJSON (default)
41+
clip_using_holes false (default)
4142
cell_output_file_name outputfiles/littleTri31 (user set)
4243
point_output_file_name centers (default)
4344
randpts_output_file_name randPts (default)
@@ -46,7 +47,7 @@ shapefile_id_field_length 21 (user set)
4647
kml_default_width 4 (default)
4748
kml_default_color ffffffff (default)
4849
kml_name (default)
49-
kml_description Generated by DGGRID 7.5 (default)
50+
kml_description Generated by DGGRID 7.7 (default)
5051
neighbor_output_type NONE (default)
5152
neighbor_output_file_name nbr (default)
5253
children_output_type NONE (default)

‎examples/sampleOutput/holes/.keep

Whitespace-only changes.

0 commit comments

Comments
 (0)