List of selected (GRASS related) shell environment variables
available are RLE, ZLIB, and LZ4. The compressors BZIP2 and ZSTD must be enabled when configuring GRASS for compilation. ++ specifies root path for GRASS configuration directory. + If not specified, the default placement of the + configuration directory is used: $HOME on GNU/Linux, + $HOME/Library on Mac OS X, and %APPDATA% on MS Windows.
encoding for vector attribute data (utf-8, ascii, iso8859-1, koi8-r)
"
+ f"{message_content}"
+ "
"
+ )
+ )
+
+ popup = self._ipyleaflet.Popup(
+ location=lonlat,
+ child=scrollable_container,
+ close_button=False,
+ auto_close=True,
+ close_on_escape_key=False,
+ )
+ self.map.add(popup)
+
+ def clear_popups(self):
+ """Clears the popups."""
+ for item in reversed(list(self.map.layers)):
+ if isinstance(item, self._ipyleaflet.Popup):
+ self.map.remove(item)
diff --git a/python/grass/jupyter/seriesmap.py b/python/grass/jupyter/seriesmap.py
index 9e470babb70..8615ad488fb 100644
--- a/python/grass/jupyter/seriesmap.py
+++ b/python/grass/jupyter/seriesmap.py
@@ -1,11 +1,12 @@
# MODULE: grass.jupyter.seriesmap
#
# AUTHOR(S): Caitlin Haedrich | Raster: {raster} | |
|---|---|
| Value | +{value} | +
")) + final_output = "".join(output_list) + return _style_table(final_output) + + +def _process_vector_output(vector, coord, distance): + """ + Process the output of a vector query. + + :param vector: Name of the vector map to query. + :param coord: Coordinates given as a tuple for querying. + :param distance: Distance within which to query the vector attributes. + + :return: str: HTML formatted string containing the vector output, including regular + attributes and any nested attribute tables. + """ + vector_output = gs.vector.vector_what(map=vector, coord=coord, distance=distance) + if len(vector_output[0]) <= 2: + return "" + + items = list(vector_output[0].items()) + attributes_output = "" + regular_output = _format_regular_output(items) + + for key, value in items: + if key == "Attributes" and isinstance(value, dict): + attributes_output = _format_nested_table(value) + + vector_html = f""" +
")) + final_output = "".join(output_list) + return _style_table(final_output) + + def estimate_resolution(raster, mapset, location, dbase, env): """Estimates resolution of reprojected raster. @@ -201,8 +417,48 @@ def get_rendering_size(region, width, height, default_width=600, default_height= return (default_width, round(default_width * region_height / region_width)) +def save_vector(name, geo_json): + """Saves the user drawn vector. + + :param geo_json: name of the geojson file to be saved + :param name: name with which vector should be saved + """ + with tempfile.NamedTemporaryFile( + suffix=".geojson", delete=False, mode="w" + ) as temp_file: + temp_filename = temp_file.name + for each in geo_json["features"]: + each["properties"].clear() + json.dump(geo_json, temp_file) + gs.run_command("v.import", input=temp_filename, output=name) + os.remove(temp_filename) + + +def get_number_of_cores(requested, env=None): + """Get the number of cores to use for multiprocessing. + + :param int requested: Desired number of cores. + :param dict env: Optional process environment. + + :return int: Number of cores to use, constrained by system availability. + """ + nprocs = gs.gisenv(env).get("NPROCS") + if nprocs is not None: + return int(nprocs) + + try: + num_cores = len(os.sched_getaffinity(0)) + except AttributeError: + num_cores = multiprocessing.cpu_count() + return min(requested, max(1, num_cores - 1)) + + def get_region_bounds_latlon(): - """Gets the current computational region bounds in latlon.""" + """Gets the current computational region bounds in latlon. + + :return list of tuples: represent the southwest and northeast + corners of the region in (latitude, longitude) format. + """ region = gs.parse_command("g.region", flags="gbp") return [ (float(region["ll_s"]), float(region["ll_w"])), @@ -213,6 +469,7 @@ def get_region_bounds_latlon(): def update_region(region): """Updates the computational region bounds. + :param dict region: region dictionary :return: the new region """ current = gs.region() @@ -238,8 +495,7 @@ def save_gif( text_size=12, text_color="gray", ): - """ - Creates a GIF animation + """Creates a GIF animation param list input_files: list of paths to source param str output_filename: destination gif filename diff --git a/python/grass/pydispatch/PKG-INFO b/python/grass/pydispatch/PKG-INFO index 19752eec0fe..2ad96bdff66 100644 --- a/python/grass/pydispatch/PKG-INFO +++ b/python/grass/pydispatch/PKG-INFO @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: PyDispatcher -Version: 2.0.3 +Version: 2.0.8 Summary: Multi-producer-multi-consumer signal dispatching mechanism Home-page: http://pydispatcher.sourceforge.net Author: Mike C. Fletcher diff --git a/python/grass/pydispatch/__init__.py b/python/grass/pydispatch/__init__.py index 30f1af7fd21..beee0d6101e 100644 --- a/python/grass/pydispatch/__init__.py +++ b/python/grass/pydispatch/__init__.py @@ -16,10 +16,9 @@ PyDispatcher because it provides very general API which enables to implement Signal API, wide and robust functionality which makes implementation and use of Signals easier. - -PyDispatcher metadata: - -:version: 2.0.3 -:author: Patrick K. O'Brien -:license: BSD-style, see license.txt for details """ + +__version__ = "2.0.8" +__author__ = "Patrick K. O'Brien" +__maintainer__ = "Mike C. Fletcher" +__license__ = "BSD" diff --git a/python/grass/pydispatch/dispatcher.py b/python/grass/pydispatch/dispatcher.py index 0915629fdd9..4757acf36cf 100644 --- a/python/grass/pydispatch/dispatcher.py +++ b/python/grass/pydispatch/dispatcher.py @@ -27,11 +27,7 @@ """ import weakref -from grass.pydispatch import saferef, robustapply, errors - -__author__ = "Patrick K. O'Brien
Input parameters:
raster coordinates (e.g., for latitude-longitude buffers are measured in degrees). -METHOD
+NOTES
+ +Method
The calculation method is based on the method used in r.sun to calculate shadows. It starts at a very shallow angle and walks @@ -145,6 +147,34 @@METHOD
All horizon values are positive (or zero). While negative values are in theory possible, r.horizon currently does not support them. + +
Performance
+Parallel processing is implemented for the raster mode. +To enable parallel processing, the user can specify the number of threads +to be used with the nprocs parameter. +Figures below show benchmark results running on +Intel® Core™ i5-13600K CPU @ 3.5GHz. +See benchmark scripts +in the source code for more details. + ++The iterations of the algorithm used in r.horizon +depends on the topography. As a result, the benchmark results may vary +depending on the topography of the study area. + +
+ 
+ 
+ 
+
+ Figure: Benchmark shows execution time, parallel speedup and + efficiency for different numbers of cells (1M, 2M, 4M, and 8M). +
+
+
+
+
+ + Figure: Benchmark shows execution time, parallel speedup and + efficiency for different numbers of cells (1M, 2M, 4M, and 8M). +
EXAMPLES
The examples are intended for the North Carolina sample dataset. diff --git a/raster/r.horizon/rhorizon_raster_efficiency.png b/raster/r.horizon/rhorizon_raster_efficiency.png new file mode 100644 index 00000000000..7b37d1fff46 Binary files /dev/null and b/raster/r.horizon/rhorizon_raster_efficiency.png differ diff --git a/raster/r.horizon/rhorizon_raster_speedup.png b/raster/r.horizon/rhorizon_raster_speedup.png new file mode 100644 index 00000000000..7609a75c163 Binary files /dev/null and b/raster/r.horizon/rhorizon_raster_speedup.png differ diff --git a/raster/r.horizon/rhorizon_raster_time.png b/raster/r.horizon/rhorizon_raster_time.png new file mode 100644 index 00000000000..d02f8f4450d Binary files /dev/null and b/raster/r.horizon/rhorizon_raster_time.png differ diff --git a/raster/r.horizon/testsuite/test_r_horizon_parallel.py b/raster/r.horizon/testsuite/test_r_horizon_parallel.py new file mode 100644 index 00000000000..605f94365b2 --- /dev/null +++ b/raster/r.horizon/testsuite/test_r_horizon_parallel.py @@ -0,0 +1,528 @@ +""" +TEST: test_r_horizon.py + +AUTHOR(S): Anna PetrasovaEXAMPLE
+-----------------------------------------------------------------------------+ +The output from r.report can be output in JSON by passing the format=json option. + ++r.report -n -a map=towns,elevation units=miles,meters,kilometers,acres,hectares,cells,percent nsteps=2 format=json +
+{
+ "location": "nc_spm_08_grass7",
+ "created": "2024-07-24T14:59:09+0530",
+ "region": {
+ "north": 320000,
+ "south": 10000,
+ "east": 935000,
+ "west": 120000,
+ "ew_res": 500,
+ "ns_res": 500
+ },
+ "mask": null,
+ "maps": [
+ {
+ "name": "towns",
+ "label": "South West Wake: Cities and towns derived from zipcodes",
+ "type": "raster",
+ },
+ {
+ "name": "zipcodes",
+ "label": "South West Wake: Zipcode areas derived from vector map",
+ "type": "raster",
+ }
+ ],
+ "categories": [
+ {
+ "category": 1,
+ "label": "CARY",
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 10.231707201374819
+ },
+ {
+ "unit": "square meters",
+ "value": 26500000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 26.5
+ },
+ {
+ "unit": "acres",
+ "value": 6548.2926088798722
+ },
+ {
+ "unit": "hectares",
+ "value": 2650
+ },
+ {
+ "unit": "cell counts",
+ "value": 106
+ },
+ {
+ "unit": "% cover",
+ "value": 13.086419753086419
+ }
+ ],
+ "categories": [
+ {
+ "category": 1,
+ "label": "from to",
+ "range": {
+ "from": 55.578792572021484,
+ "to": 105.9543285369873
+ },
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 0.8687298567205034
+ },
+ {
+ "unit": "square meters",
+ "value": 2250000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 2.25
+ },
+ {
+ "unit": "acres",
+ "value": 555.98710830112122
+ },
+ {
+ "unit": "hectares",
+ "value": 225
+ },
+ {
+ "unit": "cell counts",
+ "value": 9
+ },
+ {
+ "unit": "% cover",
+ "value": 8.4905660377358494
+ }
+ ]
+ },
+ {
+ "category": 2,
+ "label": "from to",
+ "range": {
+ "from": 105.9543285369873,
+ "to": 156.32986450195312
+ },
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 9.3629773446543147
+ },
+ {
+ "unit": "square meters",
+ "value": 24250000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 24.25
+ },
+ {
+ "unit": "acres",
+ "value": 5992.305500578751
+ },
+ {
+ "unit": "hectares",
+ "value": 2425
+ },
+ {
+ "unit": "cell counts",
+ "value": 97
+ },
+ {
+ "unit": "% cover",
+ "value": 91.509433962264154
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "category": 2,
+ "label": "GARNER",
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 5.5019557592298556
+ },
+ {
+ "unit": "square meters",
+ "value": 14250000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 14.25
+ },
+ {
+ "unit": "acres",
+ "value": 3521.2516859071011
+ },
+ {
+ "unit": "hectares",
+ "value": 1425
+ },
+ {
+ "unit": "cell counts",
+ "value": 57
+ },
+ {
+ "unit": "% cover",
+ "value": 7.0370370370370372
+ }
+ ],
+ "categories": [
+ {
+ "category": 1,
+ "label": "from to",
+ "range": {
+ "from": 55.578792572021484,
+ "to": 105.9543285369873
+ },
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 4.3436492836025176
+ },
+ {
+ "unit": "square meters",
+ "value": 11250000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 11.25
+ },
+ {
+ "unit": "acres",
+ "value": 2779.9355415056061
+ },
+ {
+ "unit": "hectares",
+ "value": 1125
+ },
+ {
+ "unit": "cell counts",
+ "value": 45
+ },
+ {
+ "unit": "% cover",
+ "value": 78.94736842105263
+ }
+ ]
+ },
+ {
+ "category": 2,
+ "label": "from to",
+ "range": {
+ "from": 105.9543285369873,
+ "to": 156.32986450195312
+ },
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 1.158306475627338
+ },
+ {
+ "unit": "square meters",
+ "value": 3000000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 3
+ },
+ {
+ "unit": "acres",
+ "value": 741.31614440149497
+ },
+ {
+ "unit": "hectares",
+ "value": 300
+ },
+ {
+ "unit": "cell counts",
+ "value": 12
+ },
+ {
+ "unit": "% cover",
+ "value": 21.05263157894737
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "category": 3,
+ "label": "APEX",
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 0.9652553963561149
+ },
+ {
+ "unit": "square meters",
+ "value": 2500000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 2.5
+ },
+ {
+ "unit": "acres",
+ "value": 617.76345366791247
+ },
+ {
+ "unit": "hectares",
+ "value": 250
+ },
+ {
+ "unit": "cell counts",
+ "value": 10
+ },
+ {
+ "unit": "% cover",
+ "value": 1.2345679012345678
+ }
+ ],
+ "categories": [
+ {
+ "category": 1,
+ "label": "from to",
+ "range": {
+ "from": 55.578792572021484,
+ "to": 105.9543285369873
+ },
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 0.096525539635611488
+ },
+ {
+ "unit": "square meters",
+ "value": 250000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 0.25
+ },
+ {
+ "unit": "acres",
+ "value": 61.776345366791247
+ },
+ {
+ "unit": "hectares",
+ "value": 25
+ },
+ {
+ "unit": "cell counts",
+ "value": 1
+ },
+ {
+ "unit": "% cover",
+ "value": 10
+ }
+ ]
+ },
+ {
+ "category": 2,
+ "label": "from to",
+ "range": {
+ "from": 105.9543285369873,
+ "to": 156.32986450195312
+ },
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 0.8687298567205034
+ },
+ {
+ "unit": "square meters",
+ "value": 2250000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 2.25
+ },
+ {
+ "unit": "acres",
+ "value": 555.98710830112122
+ },
+ {
+ "unit": "hectares",
+ "value": 225
+ },
+ {
+ "unit": "cell counts",
+ "value": 9
+ },
+ {
+ "unit": "% cover",
+ "value": 90
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "category": 4,
+ "label": "RALEIGH-CITY",
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 6.0811089970435237
+ },
+ {
+ "unit": "square meters",
+ "value": 15750000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 15.75
+ },
+ {
+ "unit": "acres",
+ "value": 3891.9097581078486
+ },
+ {
+ "unit": "hectares",
+ "value": 1575
+ },
+ {
+ "unit": "cell counts",
+ "value": 63
+ },
+ {
+ "unit": "% cover",
+ "value": 7.7777777777777777
+ }
+ ],
+ "categories": [
+ {
+ "category": 1,
+ "label": "from to",
+ "range": {
+ "from": 55.578792572021484,
+ "to": 105.9543285369873
+ },
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 5.3089046799586326
+ },
+ {
+ "unit": "square meters",
+ "value": 13750000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 13.75
+ },
+ {
+ "unit": "acres",
+ "value": 3397.6989951735186
+ },
+ {
+ "unit": "hectares",
+ "value": 1375
+ },
+ {
+ "unit": "cell counts",
+ "value": 55
+ },
+ {
+ "unit": "% cover",
+ "value": 87.301587301587304
+ }
+ ]
+ },
+ {
+ "category": 2,
+ "label": "from to",
+ "range": {
+ "from": 105.9543285369873,
+ "to": 156.32986450195312
+ },
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 0.7722043170848919
+ },
+ {
+ "unit": "square meters",
+ "value": 2000000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 2
+ },
+ {
+ "unit": "acres",
+ "value": 494.21076293432998
+ },
+ {
+ "unit": "hectares",
+ "value": 200
+ },
+ {
+ "unit": "cell counts",
+ "value": 8
+ },
+ {
+ "unit": "% cover",
+ "value": 12.698412698412698
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "category": 5,
+ "label": "RALEIGH-SOUTH",
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 47.394039961085241
+ },
+ {
+ "unit": "square meters",
+ "value": 122750000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 122.75
+ },
+ {
+ "unit": "acres",
+ "value": 30332.185575094503
+ },
+ {
+ "unit": "hectares",
+ "value": 12275
+ },
+ {
+ "unit": "cell counts",
+ "value": 491
+ },
+ {
+ "unit": "% cover",
+ "value": 60.617283950617285
+ }
+ ],
+ "categories": [
+ {
+ "category": 1,
+ "label": "from to",
+ "range": {
+ "from": 55.578792572021484,
+ "to": 105.9543285369873
+ },
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 25.579268003437047
+ },
+ {
+ "unit": "square meters",
+ "value": 66250000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 66.25
+ },
+ {
+ "unit": "acres",
+ "value": 16370.731522199681
+ },
+ {
+ "unit": "hectares",
+ "value": 6625
+ },
+ {
+ "unit": "cell counts",
+ "value": 265
+ },
+ {
+ "unit": "% cover",
+ "value": 53.971486761710793
+ }
+ ]
+ },
+ {
+ "category": 2,
+ "label": "from to",
+ "range": {
+ "from": 105.9543285369873,
+ "to": 156.32986450195312
+ },
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 21.814771957648198
+ },
+ {
+ "unit": "square meters",
+ "value": 56500000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 56.5
+ },
+ {
+ "unit": "acres",
+ "value": 13961.454052894822
+ },
+ {
+ "unit": "hectares",
+ "value": 5650
+ },
+ {
+ "unit": "cell counts",
+ "value": 226
+ },
+ {
+ "unit": "% cover",
+ "value": 46.028513238289207
+ }
+ ]
+ }
+ ]
+ },
+ {
+ "category": 6,
+ "label": "RALEIGH-WEST",
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 8.0116197897557537
+ },
+ {
+ "unit": "square meters",
+ "value": 20750000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 20.75
+ },
+ {
+ "unit": "acres",
+ "value": 5127.4366654436735
+ },
+ {
+ "unit": "hectares",
+ "value": 2075
+ },
+ {
+ "unit": "cell counts",
+ "value": 83
+ },
+ {
+ "unit": "% cover",
+ "value": 10.246913580246913
+ }
+ ],
+ "categories": [
+ {
+ "category": 1,
+ "label": "from to",
+ "range": {
+ "from": 55.578792572021484,
+ "to": 105.9543285369873
+ },
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 0.096525539635611488
+ },
+ {
+ "unit": "square meters",
+ "value": 250000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 0.25
+ },
+ {
+ "unit": "acres",
+ "value": 61.776345366791247
+ },
+ {
+ "unit": "hectares",
+ "value": 25
+ },
+ {
+ "unit": "cell counts",
+ "value": 1
+ },
+ {
+ "unit": "% cover",
+ "value": 1.2048192771084338
+ }
+ ]
+ },
+ {
+ "category": 2,
+ "label": "from to",
+ "range": {
+ "from": 105.9543285369873,
+ "to": 156.32986450195312
+ },
+ "units": [
+ {
+ "unit": "square miles",
+ "value": 7.9150942501201422
+ },
+ {
+ "unit": "square meters",
+ "value": 20500000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 20.5
+ },
+ {
+ "unit": "acres",
+ "value": 5065.6603200768823
+ },
+ {
+ "unit": "hectares",
+ "value": 2050
+ },
+ {
+ "unit": "cell counts",
+ "value": 82
+ },
+ {
+ "unit": "% cover",
+ "value": 98.795180722891573
+ }
+ ]
+ }
+ ]
+ }
+ ],
+ "totals": [
+ {
+ "unit": "square miles",
+ "value": 78.185687104845314
+ },
+ {
+ "unit": "square meters",
+ "value": 202500000
+ },
+ {
+ "unit": "square kilometers",
+ "value": 202.5
+ },
+ {
+ "unit": "acres",
+ "value": 50038.839747100916
+ },
+ {
+ "unit": "hectares",
+ "value": 20250
+ },
+ {
+ "unit": "cell counts",
+ "value": 810
+ },
+ {
+ "unit": "% cover",
+ "value": 100
+ }
+ ]
+}
+