From ce13d24055bc43526f598da7404051578c2ce518 Mon Sep 17 00:00:00 2001 From: geographybuff Date: Thu, 8 Oct 2026 14:33:33 +0000 Subject: [PATCH] Fix typos in comments and test-style error message Co-Authored-By: Claude Opus 5.5 --- flex-config/generic.lua | 2 +- flex-config/labelpoint.lua | 2 +- scripts/osm2pgsql-test-style | 6 +++--- src/db-copy.hpp | 4 ++-- src/expire-config.hpp | 2 +- src/expire-output.hpp | 2 +- src/gen/gen-discrete-isolation.cpp | 2 +- src/geom-functions.cpp | 2 +- src/options.hpp | 2 +- src/ordered-index.hpp | 2 +- src/osmdata.hpp | 2 +- src/output-flex.hpp | 2 +- src/output-pgsql.cpp | 2 +- src/pgsql.hpp | 2 +- src/tagtransform-c.cpp | 2 +- src/tile.hpp | 2 +- 16 files changed, 19 insertions(+), 19 deletions(-) diff --git a/flex-config/generic.lua b/flex-config/generic.lua index e3c27d4a3..49985bfff 100644 --- a/flex-config/generic.lua +++ b/flex-config/generic.lua @@ -155,7 +155,7 @@ local delete_keys = { 'dcgis:gis_id', -- Building Identification Number (New York, US) 'nycdoitt:bin', - -- Chicago Building Inport (US) + -- Chicago Building Import (US) 'chicago:building_id', -- Louisville, Kentucky/Building Outlines Import (US) 'lojic:bgnum', diff --git a/flex-config/labelpoint.lua b/flex-config/labelpoint.lua index 228c00ae0..032c10705 100644 --- a/flex-config/labelpoint.lua +++ b/flex-config/labelpoint.lua @@ -35,7 +35,7 @@ local function add(tags, geom) -- factor when calculating the result. This can make sense, because -- labels are usually written horizontally so you need more space in -- that direction. (Use a value > 1 to stretch horizontally or values - -- between 0 and 1 to stretch vertically. The value 0 ist not allowed.) + -- between 0 and 1 to stretch vertically. The value 0 is not allowed.) poi2 = geom:pole_of_inaccessibility({ stretch = 3 }), }) end diff --git a/scripts/osm2pgsql-test-style b/scripts/osm2pgsql-test-style index 5f7e9c4b6..f8966ba4c 100755 --- a/scripts/osm2pgsql-test-style +++ b/scripts/osm2pgsql-test-style @@ -481,7 +481,7 @@ def execute_osm2pgsql(context, output): if context.table: assert not any('<' in h for h in context.table.headings), \ - "Substition in the first line of a table are not supported." + "Substitutions in the first line of a table are not supported." cmdline.extend(_template(h) for h in context.table.headings if h) for row in context.table: cmdline.extend(_template(c) for c in row if c) @@ -525,7 +525,7 @@ def execute_osm2pgsql_expire(context): if context.table: assert not any('<' in h for h in context.table.headings), \ - "Substition in the first line of a table are not supported." + "Substitutions in the first line of a table are not supported." cmdline.extend(_template(h) for h in context.table.headings if h) for row in context.table: cmdline.extend(_template(c) for c in row if c) @@ -623,7 +623,7 @@ def execute_osm2pgsql_replication(context): if context.table: assert not any('<' in h for h in context.table.headings), \ - "Substition in the first line of a table are not supported." + "Substitutions in the first line of a table are not supported." cmdline.extend(_template(h) for h in context.table.headings if h) for row in context.table: cmdline.extend(_template(c) for c in row if c) diff --git a/src/db-copy.hpp b/src/db-copy.hpp index 84faf8515..7c7233e6e 100644 --- a/src/db-copy.hpp +++ b/src/db-copy.hpp @@ -85,7 +85,7 @@ class db_deleter_by_id_t { /** * There is a trade-off here between sending as few DELETE SQL as - * possible and keeping the size of the deletable vector managable. + * possible and keeping the size of the deletable vector manageable. */ static constexpr std::size_t MAX_ENTRIES = 1000000; @@ -111,7 +111,7 @@ class db_deleter_by_type_and_id_t { /** * There is a trade-off here between sending as few DELETE SQL as - * possible and keeping the size of the deletable vector managable. + * possible and keeping the size of the deletable vector manageable. */ static constexpr std::size_t MAX_ENTRIES = 1000000; diff --git a/src/expire-config.hpp b/src/expire-config.hpp index e6acf043c..7224a9bd2 100644 --- a/src/expire-config.hpp +++ b/src/expire-config.hpp @@ -35,7 +35,7 @@ struct expire_config_t double buffer = 0.1; /** - * Maximum width/heigth of bbox of a (multi)polygon before hybrid mode + * Maximum width/height of bbox of a (multi)polygon before hybrid mode * expiry switches from full-area to boundary-only expire. */ double full_area_limit = 0.0; diff --git a/src/expire-output.hpp b/src/expire-output.hpp index 312ed7de4..b24791c18 100644 --- a/src/expire-output.hpp +++ b/src/expire-output.hpp @@ -118,7 +118,7 @@ class expire_output_t /** * Access to the m_tiles collection of expired tiles must go through - * this mutex, because it can happend from several threads at the same + * this mutex, because it can happen from several threads at the same * time. Mutex is wrapped in a shared_ptr to make this class movable so * we can store instances in std::vector. */ diff --git a/src/gen/gen-discrete-isolation.cpp b/src/gen/gen-discrete-isolation.cpp index eed211e5c..cbd4ec57d 100644 --- a/src/gen/gen-discrete-isolation.cpp +++ b/src/gen/gen-discrete-isolation.cpp @@ -37,7 +37,7 @@ void gen_di_t::process() // input: unique id of the feature uint64_t id; - // input: importance of the feature (positive, larger is more imporant) + // input: importance of the feature (positive, larger is more important) double importance; // input: x/y coordinate of the feature diff --git a/src/geom-functions.cpp b/src/geom-functions.cpp index d0aaf20d5..8dc70def1 100644 --- a/src/geom-functions.cpp +++ b/src/geom-functions.cpp @@ -657,7 +657,7 @@ void line_merge(geometry_t *output, geometry_t const &input) std::sort(endpoints.begin(), endpoints.end()); - // Now fill the connection list based on the sorted enpoints list. + // Now fill the connection list based on the sorted endpoints list. for (auto it = std::adjacent_find(endpoints.cbegin(), endpoints.cend()); it != endpoints.cend(); it = std::adjacent_find(it + 2, endpoints.cend())) { diff --git a/src/options.hpp b/src/options.hpp index 4f56bfb88..0f8119855 100644 --- a/src/options.hpp +++ b/src/options.hpp @@ -136,7 +136,7 @@ struct options_t bool enable_hstore_index = false; ///< add an index on the hstore column - /// Output multi-geometries intead of several simple geometries + /// Output multi-geometries instead of several simple geometries bool enable_multi = false; bool reproject_area = false; diff --git a/src/ordered-index.hpp b/src/ordered-index.hpp index 53d16198a..57713e999 100644 --- a/src/ordered-index.hpp +++ b/src/ordered-index.hpp @@ -50,7 +50,7 @@ * * To conserve memory, the id and offset in the second level blocks are 32 * bit unsigned integers relative to the id and offset of the first id of a * block which is stored in the first level entry. Compared to the 64 bit - * integers we would need without the two-level design, this halfs the + * integers we would need without the two-level design, this halves the * memory use. */ class ordered_index_t diff --git a/src/osmdata.hpp b/src/osmdata.hpp index fa7e1f129..a3968569c 100644 --- a/src/osmdata.hpp +++ b/src/osmdata.hpp @@ -33,7 +33,7 @@ struct options_t; /** * This class guides the processing of the OSM data through its multiple - * stages. It calls upon the the middle and the output to do their work. + * stages. It calls upon the middle and the output to do their work. * * It also does the dependency management, keeping track of the dependencies * between OSM objects (nodes in ways and members of relations). diff --git a/src/output-flex.hpp b/src/output-flex.hpp index 362904c5b..c39343b78 100644 --- a/src/output-flex.hpp +++ b/src/output-flex.hpp @@ -189,7 +189,7 @@ class output_flex_t : public output_t void call_lua_function(prepared_lua_function_t func, osmium::OSMObject const &object); - /// Aquire the lua_mutex and then call `call_lua_function()`. + /// Acquire the lua_mutex and then call `call_lua_function()`. void get_mutex_and_call_lua_function(prepared_lua_function_t func); void get_mutex_and_call_lua_function(prepared_lua_function_t func, diff --git a/src/output-pgsql.cpp b/src/output-pgsql.cpp index 6b250a696..de7e73175 100644 --- a/src/output-pgsql.cpp +++ b/src/output-pgsql.cpp @@ -372,7 +372,7 @@ void output_pgsql_t::delete_from_output_and_expire(osmid_t id) } } -/* Seperated out because we use it elsewhere */ +/* Separated out because we use it elsewhere */ void output_pgsql_t::pgsql_delete_way_from_output(osmid_t osm_id) { /* Optimisation: we only need this is slim mode */ diff --git a/src/pgsql.hpp b/src/pgsql.hpp index febe6e59a..ceb5ddb4c 100644 --- a/src/pgsql.hpp +++ b/src/pgsql.hpp @@ -305,7 +305,7 @@ class pg_conn_t * Run the named prepared SQL statement and return the results. * * \param stmt The name of the prepared statement. - * \param result_as_binary Ask for the resuls to be returned in binary + * \param result_as_binary Ask for the results to be returned in binary * format. * \param params Any number of arguments (will be converted to strings * if necessary). diff --git a/src/tagtransform-c.cpp b/src/tagtransform-c.cpp index bfbd7fe37..cc49cdf70 100644 --- a/src/tagtransform-c.cpp +++ b/src/tagtransform-c.cpp @@ -331,7 +331,7 @@ bool c_tagtransform_t::filter_rel_member_tags(taglist_t const &rel_tags, /* Boundaries will get converted into multiple geometries: - Linear features will end up in the line and roads tables (useful for admin boundaries) - Polygon features also go into the polygon table (useful for national_forests) - The edges of the polygon also get treated as linear fetaures allowing these to be rendered seperately. */ + The edges of the polygon also get treated as linear features allowing these to be rendered separately. */ *make_boundary = true; } else if (is_multipolygon) { *make_polygon = true; diff --git a/src/tile.hpp b/src/tile.hpp index 3eea2a7f8..d1d3ba3df 100644 --- a/src/tile.hpp +++ b/src/tile.hpp @@ -183,7 +183,7 @@ class tile_t /** * Get bounding box from tile with margin on all sides. The margin is * specified as a fraction of the tile extent. So margin==0.5 (50%) makes - * the bounding box twice as wide and twice as heigh. + * the bounding box twice as wide and twice as high. * * The bounding box is clamped to the extent of the earth, so there will * be no coordinates smaller than -HALF_EARTH_CIRCUMFERENCE or larger than