Correction to PR's comment

This commit is contained in:
miku0
2023-07-26 09:50:25 +00:00
parent 0722495434
commit 848e5ac5de
2 changed files with 42 additions and 32 deletions

View File

@@ -0,0 +1,36 @@
# SPDX-License-Identifier: GPL-3.0-or-later
#
# This file is part of Nominatim. (https://nominatim.org)
#
# Copyright (C) 2022 by the Nominatim developer community.
# For a full list of authors see the git log.
"""
This is a file for a function that converts Kanji (Japanese) numerals to Arabic numerals.
"""
def convert_kanji_sequence_to_number(sequence: str) -> str:
"""Converts Kanji numbers to Arabic numbers
"""
kanji_map = {
'': '0',
'': '1',
'': '2',
'': '3',
'': '4',
'': '5',
'': '6',
'': '7',
'': '8',
'': '9'
}
converted = ''
current_number = ''
for char in sequence:
if char in kanji_map:
current_number += kanji_map[char]
else:
converted += current_number
current_number = ''
converted += char
converted += current_number
return converted

View File

@@ -12,11 +12,12 @@ and quarter and neighbourhood with place.
from typing import Callable from typing import Callable
from typing import List from typing import List, Optional
from nominatim.tokenizer.sanitizers.base import ProcessInfo from nominatim.tokenizer.sanitizers.base import ProcessInfo
from nominatim.tokenizer.sanitizers.config import SanitizerConfig from nominatim.tokenizer.sanitizers.config import SanitizerConfig
from nominatim.data.place_name import PlaceName from nominatim.data.place_name import PlaceName
from nominatim.tokenizer.sanitizers.kanji_utils import convert_kanji_sequence_to_number
def create(_: SanitizerConfig) -> Callable[[ProcessInfo], None]: def create(_: SanitizerConfig) -> Callable[[ProcessInfo], None]:
#def create(config: SanitizerConfig) -> Callable[[ProcessInfo],None]: #def create(config: SanitizerConfig) -> Callable[[ProcessInfo],None]:
@@ -25,37 +26,10 @@ def create(_: SanitizerConfig) -> Callable[[ProcessInfo], None]:
return tag_japanese return tag_japanese
#return tag_japanese(config) #return tag_japanese(config)
def convert_kanji_sequence_to_number(sequence: str) -> str:
"""Converts Kanji numbers to Arabic numbers
"""
kanji_map = {
'': '0',
'': '1',
'': '2',
'': '3',
'': '4',
'': '5',
'': '6',
'': '7',
'': '8',
'': '9'
}
converted = ''
current_number = ''
for char in sequence:
if char in kanji_map:
current_number += kanji_map[char]
else:
converted += current_number
current_number = ''
converted += char
converted += current_number
return converted
def reconbine_housenumber( def reconbine_housenumber(
new_address: List[PlaceName], new_address: List[PlaceName],
tmp_housenumber: str | None, tmp_housenumber: Optional[str],
tmp_blocknumber: str | None tmp_blocknumber: Optional[str]
) -> List[PlaceName]: ) -> List[PlaceName]:
""" Recombine the tag of housenumber by using housenumber and blocknumber """ Recombine the tag of housenumber by using housenumber and blocknumber
""" """
@@ -87,8 +61,8 @@ def reconbine_housenumber(
def reconbine_place( def reconbine_place(
new_address: List[PlaceName], new_address: List[PlaceName],
tmp_neighbourhood: str | None, tmp_neighbourhood: Optional[str],
tmp_quarter: str | None tmp_quarter: Optional[str]
) -> List[PlaceName]: ) -> List[PlaceName]:
""" Recombine the tag of place by using neighbourhood and quarter """ Recombine the tag of place by using neighbourhood and quarter
""" """