Small refactoring #32
Conversation
strump
force-pushed
the
kothic-improvements
branch
from
780178d to
bddb74c
Compare
| for i in st.get('casing-dashes', st.get('dashes', [])): | ||
| dr_line.dashdot.dd.extend([float(i)]) | ||
| addPattern(dr_line.dashdot.dd) | ||
| addPattern(patterns, dr_line.dashdot.dd) |
There was a problem hiding this comment.
It appeared that dash patterns are loaded from patterns.txt and extended with patterns from *.mapcss files. After that patterns values are exported back to patterns.txt.
| colors.add(int(colorLine.strip())) | ||
| return colors | ||
|
|
||
| def save_colors(colors:set[int], file_path:str): |
There was a problem hiding this comment.
nit: will code be cleaner with pathlib.Path instead of str?
| def load_patterns(patterns_file_name:str) -> list[list[float]]: | ||
| patterns = [] | ||
|
|
||
| if os.path.exists(patterns_file_name): |
There was a problem hiding this comment.
Should it throw on missing file?
There was a problem hiding this comment.
Funny thing: if you delete data/patterns.txt file from OrganicMaps repo then tools/unix/generate_drules.sh will regenerate the content from *.mapcss rules. And new file content matches 100%.
This happens here: libkomwm.py:763, libkomwm.py:791
There was a problem hiding this comment.
"patterns.txt" is the auto generated file like drules_proto_*.txt/bin
src/libkomwm.py
Outdated
| if int(row[5]) < cnt: | ||
| raise Exception('Wrong type id: {0}'.format(';'.join(row))) | ||
| while int(row[5]) > cnt: | ||
| types.append("mapswithme") # Placeholder |
There was a problem hiding this comment.
This value needs to be changed here too:
https://github.com/organicmaps/organicmaps/blob/master/libs/indexer/classificator.cpp#L362
There was a problem hiding this comment.
Changed to "organicmaps". When we update kothic submodule in main repo let's not forget to chage C++ code and regenerate the files.
| # TODO: row[1] contains multiple tag=value combinations comma-separated. | ||
| # E.g. "[leisure=swimming_pool][access=private],[amenity=swimming_pool][access=private]" | ||
| # But only the first one "[leisure=swimming_pool][access=private]" is parsed here. |
There was a problem hiding this comment.
Make a separate method to properly parse and extract these values? Maybe also write a small test for that method?
There was a problem hiding this comment.
Can it be merged without the implemented todo?
There was a problem hiding this comment.
I put this TODO comment to indicate how parser of mapcss-mapping.csv works now. This behaviour was there for a long time. Let's keep it for now.
There was a problem hiding this comment.
Values after comma are used for the classifier matching (generator).
For the styles definition (kothic) only the first (main) value is needed.
…ated files with organicmaps original files.
Working on splitting huge function
komap_mapswithmeinto smaller parts for better testability and future refactorings.