[patch] Fix jrenderpgsql build errors

[oobayly]

A previous commit - ​https://github.com/JOSM/josm-plugins/commit/edd4b35b37f324f49f2a39a15cb1f5a3aff441e7 - changed the signature of S57osm.OSMmap to only accept a File object. This has made it pretty inflexible as we now have to pass a physical file.

The jrenderpgsql package generates OSM XML from a Postgres Query in-memory, and therefore is no longer able use pass the data to the OSMmap method.

I suggest overloading the S57osm.OSMmap method to make it more flexible by allowing it to accept InputStream and Document objects as well.

The reason for the Document overload is that at the moment jrenderpgsql generates hand written XML, which isn't ideal. It would be better that it instead creates an Document directly and pass it to S57osm.OSMmap without the overhead of it having to be parsed. The extra overload prepares the method for that future change which I'd also like to implement.

I've attached a diff of my changes and would welcome any comments.

[oobayly]

A few more things to note. I've forked and created a branch where I've modified the seachart plugin, making the following changes:

• Removed explicit version for the postgis-jdbc.jar class
• Fixed the build errors, as per the diff attached in my initial post
• This is the major change, refactored the code to generate the OSM using org.w3c.dom.Document which has the following benefits:
  • No XML parse errors due to unescaped special characters in attribute values or unclosed elements
  • Quicker - I saw rendering go from .5s to .35s (YMMV), which I was pleasantly surprised by

I've been running this on a personal docker image in conjunction with tirex and it's running pretty smoothly out to Z=7

The repo is here - ​https://github.com/oobayly/josm-plugins/tree/seachart-jrender
And this is a comparison of my branch to master - ​https://github.com/JOSM/josm-plugins/compare/master...oobayly:josm-plugins:seachart-jrender

[taylor.smock]

In 36169/osm:

Fix #23157: Change S57osm.OSMmap to accept either a file or inputstream (patch by oobayly)

[taylor.smock]

@oobayly: I'm working on converting the JOSM Plugin SVN repo to git. Do you have a preferred name and email for that?

EDIT: I'm going to assume (for now) that what you used in your fork is "OK".