Skip to content

Commit a177cb2

Browse files
sahrkmsahrkm
committed
Merge branch 'z7' into v3
2 parents cc0dffd + d95a389 commit a177cb2

File tree

155 files changed

+91532
-217
lines changed

Some content is hidden

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

155 files changed

+91532
-217
lines changed

‎.gitignore

+3-1
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
*.d
33
*.depends
44

5-
# Build directory
5+
# Build and working directories
66
build/
7+
xcode/
8+
examples/WORKING
79

810
# Compiled Object files
911
*.slo

‎CHANGELOG.md

+10
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,16 @@ 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+
## [8.3] - 2024-07-03
7+
### Added
8+
- new hierarchical index address types Z7 and Z7_STRING to parameters input_address_type and output_address_type
9+
- new DGGS preset IGEO7
10+
- added new examples quads, z7CellClip, z7Nums, z7WholeEarth, z7Collection and z7Transform
11+
### Changed
12+
- changed example z3Transform so that it takes non-GEO input
13+
### Fixed
14+
- yet more bugs binning some points that are very close to certain icosahedron edges into odd aperture 7 resolutions
15+
616
## [8.2] - 2024-06-15
717
### Fixed
818
- bug binning some points that are very close to certain icosahedron edges into odd aperture 7 resolutions

‎examples/examples.lst

+6
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,11 @@ gridgenPureKML
1515
hiRes
1616
holes
1717
icosahedron
18+
igeo7WholeEarth
1819
isea4d
1920
isea4t
2021
isea7hGen
22+
quads
2123
mixedAperture
2224
multipleOrientations
2325
planetRiskClipHiRes
@@ -35,6 +37,10 @@ z3Collection
3537
z3Nums
3638
z3Transform
3739
z3WholeEarth
40+
z7CellClip
41+
z7Collection
42+
z7Nums
43+
z7Transform
3844
zCellClip
3945
zCollection
4046
zNums

‎examples/examplesNoGDAL.lst

+5
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@ gridgenMixedSHP
88
gridgenPureKML
99
hiRes
1010
icosahedron
11+
igeo7WholeEarth
1112
isea4d
1213
isea4t
1314
isea7hGen
15+
quads
1416
mixedAperture
1517
planetRiskTable
1618
seqnums
@@ -21,6 +23,9 @@ z3CellClip
2123
z3Nums
2224
z3Transform
2325
z3WholeEarth
26+
z7CellClip
27+
z7Nums
28+
z7Transform
2429
zCellClip
2530
zNums
2631
zTransform

‎examples/icosahedron/icosahedron.meta

+4-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
dggrid_operation GENERATE_GRID
1212

1313
# specify the DGG
14-
dggs_type FULLER4T
14+
dggs_type ISEA4T
1515
dggs_res_spec 0
1616

1717
# control the generation
@@ -21,9 +21,11 @@ geodetic_densify 0.0
2121
# specify the output
2222
cell_output_type KML
2323
cell_output_file_name outputfiles/icosa
24+
point_output_type KML
25+
point_output_file_name outputfiles/icosaPts
2426
kml_default_color ffff0000
2527
kml_default_width 6
26-
kml_name Spherical Icosahedron
28+
kml_name ISEA Spherical Icosahedron
2729
kml_description www.discreteglobalgrids.org
2830
kml_default_width 6
2931
densification 0

‎examples/igeo7WholeEarth/igeo7WholeEarth.meta

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
################################################################################
2+
# igeo7WholeEarth.meta - example of generating a whole earth igeo7 DGG res 3.
3+
#
4+
################################################################################
5+
6+
# specify the operation
7+
dggrid_operation GENERATE_GRID
8+
9+
# specify the DGG
10+
dggs_type IGEO7
11+
dggs_res_spec 3
12+
13+
# specify the output
14+
output_cell_label_type OUTPUT_ADDRESS_TYPE
15+
cell_output_type KML
16+
cell_output_file_name outputfiles/igeo7cells
17+
point_output_type KML
18+
point_output_file_name outputfiles/igeo7pts
19+
densification 0
20+
precision 6
21+
kml_default_color ffff0000
22+
kml_name igeo7 Res 3
23+
kml_description www.discreteglobalgrids.org
24+
kml_default_width 3
25+

‎examples/igeo7WholeEarth/outputfiles/.keep

Whitespace-only changes.

‎examples/quads/outputfiles/.keep

Whitespace-only changes.

‎examples/quads/quads.meta

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
################################################################################
2+
#
3+
# quads.meta - example of a DGGRID metafile that generates a res 0
4+
# quadrilateral DGGS in KML format.
5+
#
6+
################################################################################
7+
8+
# specify the operation
9+
dggrid_operation GENERATE_GRID
10+
11+
# specify the DGG
12+
# res 0 FULLER and ISEA diamonds are the same
13+
dggs_type FULLER4D
14+
dggs_res_spec 0
15+
16+
# control the generation
17+
clip_subset_type WHOLE_EARTH
18+
geodetic_densify 0.0
19+
20+
# specify the output
21+
cell_output_type KML
22+
cell_output_file_name outputfiles/quads
23+
point_output_type KML
24+
point_output_file_name outputfiles/quadsP
25+
kml_default_color ffff0000
26+
kml_default_width 6
27+
kml_name Res 0 Quadrilaterals
28+
kml_description www.discreteglobalgrids.org
29+
kml_default_width 6
30+
densification 0

‎examples/sampleOutput/aigenerate/aigenerate.txt

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

44
** using meta file aigenerate.meta...
@@ -51,7 +51,7 @@ shapefile_id_field_length 11 (default)
5151
kml_default_width 4 (default)
5252
kml_default_color ffffffff (default)
5353
kml_name (default)
54-
kml_description Generated by DGGRID 8.1b (default)
54+
kml_description Generated by DGGRID 8.3 (default)
5555
neighbor_output_type NONE (default)
5656
neighbor_output_file_name nbr (default)
5757
children_output_type NONE (default)

‎examples/sampleOutput/binpres/binpres.txt

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

44
** using meta file binpres.meta...
@@ -51,7 +51,7 @@ shapefile_id_field_length 11 (default)
5151
kml_default_width 4 (default)
5252
kml_default_color ffffffff (default)
5353
kml_name (default)
54-
kml_description Generated by DGGRID 8.1b (default)
54+
kml_description Generated by DGGRID 8.3 (default)
5555
neighbor_output_type NONE (default)
5656
neighbor_output_file_name nbr (default)
5757
children_output_type NONE (default)

‎examples/sampleOutput/binpresV8/binpresV8.txt

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

44
** using meta file binpresV8.meta...
@@ -51,7 +51,7 @@ shapefile_id_field_length 11 (default)
5151
kml_default_width 4 (default)
5252
kml_default_color ffffffff (default)
5353
kml_name (default)
54-
kml_description Generated by DGGRID 8.1b (default)
54+
kml_description Generated by DGGRID 8.3 (default)
5555
neighbor_output_type NONE (default)
5656
neighbor_output_file_name nbr (default)
5757
children_output_type NONE (default)

‎examples/sampleOutput/binvals/binvals.txt

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

44
** using meta file binvals.meta...
@@ -51,7 +51,7 @@ shapefile_id_field_length 11 (default)
5151
kml_default_width 4 (default)
5252
kml_default_color ffffffff (default)
5353
kml_name (default)
54-
kml_description Generated by DGGRID 8.1b (default)
54+
kml_description Generated by DGGRID 8.3 (default)
5555
neighbor_output_type NONE (default)
5656
neighbor_output_file_name nbr (default)
5757
children_output_type NONE (default)

‎examples/sampleOutput/binvalsV8/binvalsV8.txt

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

44
** using meta file binvalsV8.meta...
@@ -51,7 +51,7 @@ shapefile_id_field_length 11 (default)
5151
kml_default_width 4 (default)
5252
kml_default_color ffffffff (default)
5353
kml_name (default)
54-
kml_description Generated by DGGRID 8.1b (default)
54+
kml_description Generated by DGGRID 8.3 (default)
5555
neighbor_output_type NONE (default)
5656
neighbor_output_file_name nbr (default)
5757
children_output_type NONE (default)

‎examples/sampleOutput/binvalsV8/cells/cells.dbf

-34.2 KB
Binary file not shown.

‎examples/sampleOutput/binvalsV8/points/points.dbf

-34.2 KB
Binary file not shown.

‎examples/sampleOutput/determineRes/determineRes.txt

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

44
** using meta file determineRes.meta...
@@ -53,7 +53,7 @@ shapefile_id_field_length 11 (default)
5353
kml_default_width 4 (default)
5454
kml_default_color ffffffff (default)
5555
kml_name (default)
56-
kml_description Generated by DGGRID 8.1b (default)
56+
kml_description Generated by DGGRID 8.3 (default)
5757
neighbor_output_type NONE (default)
5858
neighbor_output_file_name nbr (default)
5959
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 8.1b</description>
5+
<description>Generated by DGGRID 8.3</description>
66
<Style id="lineStyle1">
77
<LineStyle id="lineStyle2">
88
<color>ffffffff</color>

‎examples/sampleOutput/gdalCollection/gdalCollection.txt

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

44
** using meta file gdalCollection.meta...
@@ -51,7 +51,7 @@ shapefile_id_field_length 11 (default)
5151
kml_default_width 4 (default)
5252
kml_default_color ffffffff (default)
5353
kml_name (default)
54-
kml_description Generated by DGGRID 8.1b (default)
54+
kml_description Generated by DGGRID 8.3 (default)
5555
neighbor_output_type GDAL_COLLECTION (user set)
5656
neighbor_output_file_name nbr (default)
5757
children_output_type GDAL_COLLECTION (user set)

‎examples/sampleOutput/gdalExample/gdalExample.txt

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

44
** using meta file gdalExample.meta...
@@ -51,7 +51,7 @@ shapefile_id_field_length 11 (default)
5151
kml_default_width 4 (default)
5252
kml_default_color ffffffff (default)
5353
kml_name (default)
54-
kml_description Generated by DGGRID 8.1b (default)
54+
kml_description Generated by DGGRID 8.3 (default)
5555
neighbor_output_type NONE (default)
5656
neighbor_output_file_name nbr (default)
5757
children_output_type NONE (default)

‎examples/sampleOutput/genPtsV8/genPtsV8.txt

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

44
** using meta file genPtsV8.meta...
@@ -51,7 +51,7 @@ shapefile_id_field_length 11 (default)
5151
kml_default_width 4 (default)
5252
kml_default_color ffffffff (default)
5353
kml_name (default)
54-
kml_description Generated by DGGRID 8.1b (default)
54+
kml_description Generated by DGGRID 8.3 (default)
5555
neighbor_output_type NONE (default)
5656
neighbor_output_file_name nbr (default)
5757
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 8.1b</description>
5+
<description>Generated by DGGRID 8.3</description>
66
<Style id="lineStyle1">
77
<LineStyle id="lineStyle2">
88
<color>ffffffff</color>

‎examples/sampleOutput/gridgenCellClip/gridgenCellClip.txt

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

44
** using meta file gridgenCellClip.meta...
@@ -51,7 +51,7 @@ shapefile_id_field_length 11 (default)
5151
kml_default_width 4 (default)
5252
kml_default_color ffffffff (default)
5353
kml_name (default)
54-
kml_description Generated by DGGRID 8.1b (default)
54+
kml_description Generated by DGGRID 8.3 (default)
5555
neighbor_output_type NONE (default)
5656
neighbor_output_file_name nbr (default)
5757
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 8.1b</description>
5+
<description>Generated by DGGRID 8.3</description>
66
<Style id="lineStyle1">
77
<LineStyle id="lineStyle2">
88
<color>ffffffff</color>

‎examples/sampleOutput/gridgenDiamond/gridgenDiamond.txt

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

44
** using meta file gridgenDiamond.meta...

‎examples/sampleOutput/gridgenGeoJSON/gridgenGeoJSON.txt

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

44
** using meta file gridgenGeoJSON.meta...
@@ -51,7 +51,7 @@ shapefile_id_field_length 11 (default)
5151
kml_default_width 4 (default)
5252
kml_default_color ffffffff (default)
5353
kml_name (default)
54-
kml_description Generated by DGGRID 8.1b (default)
54+
kml_description Generated by DGGRID 8.3 (default)
5555
neighbor_output_type NONE (default)
5656
neighbor_output_file_name nbr (default)
5757
children_output_type NONE (default)

‎examples/sampleOutput/gridgenMixedSHP/gridgenMixedSHP.txt

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

44
** using meta file gridgenMixedSHP.meta...
@@ -51,7 +51,7 @@ shapefile_id_field_length 5 (user set)
5151
kml_default_width 4 (default)
5252
kml_default_color ffffffff (default)
5353
kml_name (default)
54-
kml_description Generated by DGGRID 8.1b (default)
54+
kml_description Generated by DGGRID 8.3 (default)
5555
neighbor_output_type NONE (default)
5656
neighbor_output_file_name nbr (default)
5757
children_output_type NONE (default)

‎examples/sampleOutput/gridgenPureKML/gridgenPureKML.txt

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

44
** using meta file gridgenPureKML.meta...
@@ -51,7 +51,7 @@ shapefile_id_field_length 11 (default)
5151
kml_default_width 2 (user set)
5252
kml_default_color ff0000ff (user set)
5353
kml_name (default)
54-
kml_description Generated by DGGRID 8.1b (default)
54+
kml_description Generated by DGGRID 8.3 (default)
5555
neighbor_output_type NONE (default)
5656
neighbor_output_file_name nbr (default)
5757
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 8.1b</description>
5+
<description>Generated by DGGRID 8.3</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 8.1b</description>
5+
<description>Generated by DGGRID 8.3</description>
66
<Style id="lineStyle1">
77
<LineStyle id="lineStyle2">
88
<color>ff0000ff</color>

0 commit comments

Comments
 (0)