Re: [mkgmap-dev] StandardCharsets and try (with-resources)

2020-01-17 Thread Ticker Berkin
Hi Gerd The line.trim() deletion wasn't intended - I'll put it back. I think it best to change sortForCode IOException to throw ExitException. Maybe they meant to return some default "Sort", ie sortForCodepage(1252), but this seems wrong. I started looking at CombinedStyleFileLoader. It does it

Re: [mkgmap-dev] TYP files and character encoding

2020-01-17 Thread Ticker Berkin
Hi Gerd That looks fine. I'll add something to ./doc/typ-compiler.txt sometime soon that describes the source/destination charset/codepage behaviour. Ticker On Fri, 2020-01-17 at 15:21 +, Gerd Petermann wrote: > Hi Ticker, > > thanks, I've committed the patch with 4423, please check if

Re: [mkgmap-dev] StandardCharsets and try (with-resources)

2020-01-17 Thread Gerd Petermann
Hi Ticker, - I think there is a small change in the handling of lines in OsmMapDataSource.readDeleteTagsFile. The old code used line = line.trim(); This is missing now. Is that intended? - I also don't understand the line with your comment "// ??? I don't understand this" . Looks like an endles

[mkgmap-dev] Commit r4425: Fix problems introduced with changes in the NET-no-NOD branch reg. routable maps at resolution 23 (merge in r4360):

2020-01-17 Thread svn commit
Version mkgmap-r4425 was committed by gerd on Fri, 17 Jan 2020 Fix problems introduced with changes in the NET-no-NOD branch reg. routable maps at resolution 23 (merge in r4360): - Don't use --levels option given on command line when reading the style or processing the --check-styles option, onl

[mkgmap-dev] Commit r4424: see r4423, forgot changed unit test

2020-01-17 Thread svn commit
Version mkgmap-r4424 was committed by gerd on Fri, 17 Jan 2020 see r4423, forgot changed unit test http://www.mkgmap.org.uk/websvn/revision.php?repname=mkgmap&rev=4424 ___ mkgmap-dev mailing list mkgmap-dev@lists.mkgmap.org.uk http://www.mkgmap.org.uk/m

Re: [mkgmap-dev] TYP files and character encoding

2020-01-17 Thread Gerd Petermann
Hi Ticker, thanks, I've committed the patch with 4423, please check if my svn log message. Gerd Von: mkgmap-dev im Auftrag von Ticker Berkin Gesendet: Freitag, 17. Januar 2020 13:43 An: mkgmap development Betreff: Re: [mkgmap-dev] TYP files and charac

[mkgmap-dev] Commit r4423: improve *.typ file handling (Patch typCodePage_v4.patch by Ticker Berkin with small modifications)

2020-01-17 Thread svn commit
Version mkgmap-r4423 was committed by gerd on Fri, 17 Jan 2020 improve *.typ file handling (Patch typCodePage_v4.patch by Ticker Berkin with small modifications) - revert changes from r4395 - implement various BOM checks - don't warn if codePage in *.typ differs from --code-page option - don't s

[mkgmap-dev] StandardCharsets and try (with-resources)

2020-01-17 Thread Ticker Berkin
Hi Gerd Attached patch - uses StandardCharsets.* where possible. - notes some usage of the java local DefaultCharset. - changed a couple of these to force utf-8 instead. - if --read-config file gives decoding errors, names the charset used to read the file (ie DefaultCharset) instead of 'utf-8

Re: [mkgmap-dev] TYP files and character encoding

2020-01-17 Thread Ticker Berkin
Hi Gerd Here is typCodePage_v4 that uses try () in both CharsetProbe and compile, getting rid of Utils.closeFile(). The patch includes the change in typCodePage-test.patch My javac doesn't seem to have an option to detect unused imports, but when I run it with -Xlint I get a variety of errors -