hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-12 05:44:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3342 from mtmail/tyops

Browse Source 
Correct some typos
This commit is contained in:
Sarah Hoffmann
2024-02-28 14:25:16 +01:00
committed by GitHub
parent 9a84adef59 7205491b84
commit 247065ff6f
45 changed files with 80 additions and 80 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
nominatim/api/core.py
View File

@@ -374,7 +374,7 @@ class NominatimAPI:
""" Close all active connections to the database.
This function also closes the asynchronous worker loop making
the NominatimAPI object unusuable.
the NominatimAPI object unusable.
"""
self._loop.run_until_complete(self._async_api.close())
self._loop.close()
@@ -447,7 +447,7 @@ class NominatimAPI:
place. Only meaning full for POI-like objects (places with a
rank_address of 30).
linked_place_id (Optional[int]): Internal ID of the place this object
linkes to. When this ID is set then there is no guarantee that
links to. When this ID is set then there is no guarantee that
the rest of the result information is complete.
admin_level (int): Value of the `admin_level` OSM tag. Only meaningful
for administrative boundary objects.

2
nominatim/api/logging.py
View File

@@ -84,7 +84,7 @@ class BaseLogger:
def format_sql(self, conn: AsyncConnection, statement: 'sa.Executable',
extra_params: Union[Mapping[str, Any],
Sequence[Mapping[str, Any]], None]) -> str:
""" Return the comiled version of the statement.
""" Return the compiled version of the statement.
"""
compiled = cast('sa.ClauseElement', statement).compile(conn.sync_engine)

2
nominatim/api/result_formatting.py
View File

@@ -5,7 +5,7 @@
# Copyright (C) 2023 by the Nominatim developer community.
# For a full list of authors see the git log.
"""
Helper classes and functions for formating results into API responses.
Helper classes and functions for formatting results into API responses.
"""
from typing import Type, TypeVar, Dict, List, Callable, Any, Mapping
from collections import defaultdict

2
nominatim/api/results.py
View File

@@ -466,7 +466,7 @@ async def add_result_details(conn: SearchConnection, results: List[BaseResultT],
def _result_row_to_address_row(row: SaRow, isaddress: Optional[bool] = None) -> AddressLine:
""" Create a new AddressLine from the results of a datbase query.
""" Create a new AddressLine from the results of a database query.
"""
extratags: Dict[str, str] = getattr(row, 'extratags', {}) or {}
if 'linked_place' in extratags:

2
nominatim/api/reverse.py
View File

@@ -175,7 +175,7 @@ class ReverseGeocoder:
t = self.conn.t.placex
# PostgreSQL must not get the distance as a parameter because
# there is a danger it won't be able to proberly estimate index use
# there is a danger it won't be able to properly estimate index use
# when used with prepared statements
diststr = sa.text(f"{distance}")

2
nominatim/api/search/db_search_fields.py
View File

@@ -94,7 +94,7 @@ class RankedTokens:
def with_token(self, t: Token, transition_penalty: float) -> 'RankedTokens':
""" Create a new RankedTokens list with the given token appended.
The tokens penalty as well as the given transision penalty
The tokens penalty as well as the given transition penalty
are added to the overall penalty.
"""
return RankedTokens(self.penalty + t.penalty + transition_penalty,

2
nominatim/api/search/db_searches.py
View File

@@ -5,7 +5,7 @@
# Copyright (C) 2023 by the Nominatim developer community.
# For a full list of authors see the git log.
"""
Implementation of the acutal database accesses for forward search.
Implementation of the actual database accesses for forward search.
"""
from typing import List, Tuple, AsyncIterator, Dict, Any, Callable, cast
import abc

2
nominatim/api/search/legacy_tokenizer.py
View File

@@ -44,7 +44,7 @@ class LegacyToken(qmod.Token):
@property
def info(self) -> Dict[str, Any]:
""" Dictionary of additional propoerties of the token.
""" Dictionary of additional properties of the token.
Should only be used for debugging purposes.
"""
return {'category': self.category,

2
nominatim/api/search/query.py
View File

@@ -169,7 +169,7 @@ class TokenList:
@dataclasses.dataclass
class QueryNode:
""" A node of the querry representing a break between terms.
""" A node of the query representing a break between terms.
"""
btype: BreakType
ptype: PhraseType

2
nominatim/api/search/query_analyzer_factory.py
View File

@@ -19,7 +19,7 @@ if TYPE_CHECKING:
from nominatim.api.search.query import Phrase, QueryStruct
class AbstractQueryAnalyzer(ABC):
""" Class for analysing incomming queries.
""" Class for analysing incoming queries.
Query analyzers are tied to the tokenizer used on import.
"""

12
nominatim/api/search/token_assignment.py
View File

@@ -72,7 +72,7 @@ class TokenAssignment: # pylint: disable=too-many-instance-attributes
class _TokenSequence:
""" Working state used to put together the token assignements.
""" Working state used to put together the token assignments.
Represents an intermediate state while traversing the tokenized
query.
@@ -132,7 +132,7 @@ class _TokenSequence:
# Name tokens are always acceptable and don't change direction
if ttype == qmod.TokenType.PARTIAL:
# qualifiers cannot appear in the middle of the qeury. They need
# qualifiers cannot appear in the middle of the query. They need
# to be near the next phrase.
if self.direction == -1 \
and any(t.ttype == qmod.TokenType.QUALIFIER for t in self.seq[:-1]):
@@ -238,10 +238,10 @@ class _TokenSequence:
def recheck_sequence(self) -> bool:
""" Check that the sequence is a fully valid token assignment
and addapt direction and penalties further if necessary.
and adapt direction and penalties further if necessary.
This function catches some impossible assignments that need
forward context and can therefore not be exluded when building
forward context and can therefore not be excluded when building
the assignment.
"""
# housenumbers may not be further than 2 words from the beginning.
@@ -277,10 +277,10 @@ class _TokenSequence:
# <address>,<postcode> should give preference to address search
if base.postcode.start == 0:
penalty = self.penalty
self.direction = -1 # name searches are only possbile backwards
self.direction = -1 # name searches are only possible backwards
else:
penalty = self.penalty + 0.1
self.direction = 1 # name searches are only possbile forwards
self.direction = 1 # name searches are only possible forwards
yield dataclasses.replace(base, penalty=penalty)

2
nominatim/api/status.py
View File

@@ -5,7 +5,7 @@
# Copyright (C) 2023 by the Nominatim developer community.
# For a full list of authors see the git log.
"""
Classes and function releated to status call.
Classes and function related to status call.
"""
from typing import Optional
import datetime as dt

6
nominatim/api/types.py
View File

@@ -316,7 +316,7 @@ class DataLayer(enum.Flag):
for reverse and forward search.
"""
ADDRESS = enum.auto()
""" The address layer contains all places relavant for addresses:
""" The address layer contains all places relevant for addresses:
fully qualified addresses with a house number (or a house name equivalent,
for some addresses) and places that can be part of an address like
roads, cities, states.
@@ -415,7 +415,7 @@ class LookupDetails:
more the geometry gets simplified.
"""
locales: Locales = Locales()
""" Prefered languages for localization of results.
""" Preferred languages for localization of results.
"""
@classmethod
@@ -544,7 +544,7 @@ class SearchDetails(LookupDetails):
def layer_enabled(self, layer: DataLayer) -> bool:
""" Check if the given layer has been choosen. Also returns
""" Check if the given layer has been chosen. Also returns
true when layer restriction has been disabled completely.
"""
return self.layers is None or bool(self.layers & layer)

4
nominatim/api/v1/classtypes.py
View File

@@ -5,7 +5,7 @@
# Copyright (C) 2023 by the Nominatim developer community.
# For a full list of authors see the git log.
"""
Hard-coded information about tag catagories.
Hard-coded information about tag categories.
These tables have been copied verbatim from the old PHP code. For future
version a more flexible formatting is required.
@@ -44,7 +44,7 @@ def get_label_tag(category: Tuple[str, str], extratags: Optional[Mapping[str, st
def bbox_from_result(result: Union[napi.ReverseResult, napi.SearchResult]) -> napi.Bbox:
""" Compute a bounding box for the result. For ways and relations
a given boundingbox is used. For all other object, a box is computed
around the centroid according to dimensions dereived from the
around the centroid according to dimensions derived from the
search rank.
"""
if (result.osm_object and result.osm_object[0] == 'N') or result.bbox is None:

2
nominatim/api/v1/helpers.py
View File

@@ -155,7 +155,7 @@ COORD_REGEX = [re.compile(r'(?:(?P<pre>.*?)\s+)??' + r + r'(?:\s+(?P<post>.*))?'
)]
def extract_coords_from_query(query: str) -> Tuple[str, Optional[float], Optional[float]]:
""" Look for something that is formated like a coordinate at the
""" Look for something that is formatted like a coordinate at the
beginning or end of the query. If found, extract the coordinate and
return the remaining query (or the empty string if the query
consisted of nothing but a coordinate).

4
nominatim/api/v1/server_glue.py
View File

@@ -240,7 +240,7 @@ class ASGIAdaptor(abc.ABC):
def parse_geometry_details(self, fmt: str) -> Dict[str, Any]:
""" Create details strucutre from the supplied geometry parameters.
""" Create details structure from the supplied geometry parameters.
"""
numgeoms = 0
output = napi.GeometryFormat.NONE
@@ -531,7 +531,7 @@ async def deletable_endpoint(api: napi.NominatimAPIAsync, params: ASGIAdaptor) -
async def polygons_endpoint(api: napi.NominatimAPIAsync, params: ASGIAdaptor) -> Any:
""" Server glue for /polygons endpoint.
This is a special endpoint that shows polygons that have changed
thier size but are kept in the Nominatim database with their
their size but are kept in the Nominatim database with their
old area to minimize disruption.
"""
fmt = params.parse_format(RawDataList, 'json')

2
nominatim/db/async_core_library.py
View File

@@ -5,7 +5,7 @@
# Copyright (C) 2023 by the Nominatim developer community.
# For a full list of authors see the git log.
"""
Import the base libary to use with asynchronous SQLAlchemy.
Import the base library to use with asynchronous SQLAlchemy.
"""
# pylint: disable=invalid-name

2
nominatim/db/sql_preprocessor.py
View File

@@ -127,7 +127,7 @@ class SQLPreprocessor:
def run_parallel_sql_file(self, dsn: str, name: str, num_threads: int = 1,
**kwargs: Any) -> None:
""" Execure the given SQL files using parallel asynchronous connections.
""" Execute the given SQL files using parallel asynchronous connections.
The keyword arguments may supply additional parameters for
preprocessing.

2
nominatim/db/sqlite_functions.py
View File

@@ -26,7 +26,7 @@ def weigh_search(search_vector: Optional[str], rankings: str, default: float) ->
class ArrayIntersectFuzzy:
""" Compute the array of common elements of all input integer arrays.
Very large input paramenters may be ignored to speed up
Very large input parameters may be ignored to speed up
computation. Therefore, the result is a superset of common elements.
Input and output arrays are given as comma-separated lists.

2
nominatim/server/falcon/server.py
View File

@@ -128,7 +128,7 @@ class FileLoggingMiddleware:
resource: Optional[EndpointWrapper],
req_succeeded: bool) -> None:
""" Callback after requests writes to the logfile. It only
writes logs for sucessful requests for search, reverse and lookup.
writes logs for successful requests for search, reverse and lookup.
"""
if not req_succeeded or resource is None or resp.status != 200\
or resource.name not in ('reverse', 'search', 'lookup', 'details'):

2
nominatim/tokenizer/icu_tokenizer.py
View File

@@ -286,7 +286,7 @@ class ICUTokenizer(AbstractTokenizer):
def _create_lookup_indices(self, config: Configuration, table_name: str) -> None:
""" Create addtional indexes used when running the API.
""" Create additional indexes used when running the API.
"""
with connect(self.dsn) as conn:
sqlp = SQLPreprocessor(conn, config)

2
nominatim/tokenizer/sanitizers/base.py
View File

@@ -60,5 +60,5 @@ class SanitizerHandler(Protocol):
Return:
The result must be a callable that takes a place description
and transforms name and address as reuqired.
and transforms name and address as required.
"""

2
nominatim/tools/check_database.py
View File

@@ -127,7 +127,7 @@ def _get_indexes(conn: Connection) -> List[str]:
# CHECK FUNCTIONS
#
# Functions are exectured in the order they appear here.
# Functions are executed in the order they appear here.
@_check(hint="""\
{error}

2
nominatim/tools/collect_os_info.py
View File

@@ -78,7 +78,7 @@ def from_file_find_line_portion(
filename: str, start: str, sep: str, fieldnum: int = 1
) -> Optional[str]:
"""open filename, finds the line starting with the 'start' string.
Splits the line using seperator and returns a "fieldnum" from the split."""
Splits the line using separator and returns a "fieldnum" from the split."""
with open(filename, encoding='utf8') as file:
result = ""
for line in file: