[PATCH needs rework] updated cleaned defaultpresets.xml with improved usability

[kr12]

subj↑

main:

• combine related tags (e.g. prison and sub_station commonly have some sort of barriers around)
• update enums from wiki
• clean mixed unix\win line ends, reformat
• add diagrams to sport pitch select

---

in progress: add diagrams to power tower design select

[Don-vip]

Please have a look to DevelopersGuide/PatchGuide to see how to submit a patch to JOSM core.

[skyper]

Replying to kr12:

• add diagrams to sport pitch select

---

in progress: add diagrams to power tower design select

If possible please use .svg and not .png . Thanks

[kr12]

Replying to skyper:

If possible please use .svg and not .png . Thanks

I dont found any svg in JOSM distr and it does not mentioned in defaultpresets.xml . I mention it.. Updated file in Attachment with minor fixes and diagrams to power tower design list items

[Don-vip]

Please attach a real patch as described in my first comment, we don't take entire files, especially for presets.

[kr12]

fix

[kr12]

patch attached. Also if you cant handle it, you can create it yourself from last version and attached file, it does not take many time if you have copyed repository, or you can unpack it from josm-latest.jar - defaultpresets does not changing often, so that may not be conflicts

[stoecker]

We know how to handle new files or patches, but we're a few people and have to take care of many tickets and thus we value our time high.

A proper diff in unified format (you diff file is in pretty useless standard diff format) can be reviewed directly in the ticket and applied fast, whereas for any other format we need lot of time even to have a first look. E.g. for a attached XML we first need to find the revision you started from, so we can make a proper diff.

So if you want your changes to have a chance make a unified diff and attach the file with (.diff or .patch) as name, so it gets displayed like this one: build-source-zip.patch:ticket:8747​

P.S. Even in its unreadable form your diff shows lots of changes, which don't seem to be right. Some of them look like inversions of recent changes.

[kr12]

This is because ticket was created 11 days ago and you was not enough agile to use it or to lock file. But this is not a problem, I dont know about SVN but GIT software has prety tools to fix conflicts, I think you can use it, also Araxis Merge has excelent 3-way compare - it will help. Or you can recreate all changes manually. It will a bit boring, but most of job is done, and you can get main used templates from this file. Or you can use description of ticket as hint and try to improve it yourself. Good luck!

[stoecker]

As said, we know how to use the development tools, but usually we don't spend time for this, as we have many other tasks to do. It is your decision, if you want your changes included or not - our minimum requirements are identical to most open source projects.

[bastiK]

Replying to kr12:

This is because ticket was created 11 days ago and you was not enough agile to use it or to lock file.

Within one hour after your first submission, you have been directed to the patch guidelines. It can't get much faster, can it?

But this is not a problem, I dont know about SVN but GIT software has prety tools to fix conflicts, I think you can use it, also Araxis Merge has excelent 3-way compare - it will help. Or you can recreate all changes manually. It will a bit boring, but most of job is done, and you can get main used templates from this file. Or you can use description of ticket as hint and try to improve it yourself.

You seem know a lot about conflict resolution. That's good, because you'll need this, if you want your changes included. :)

[Don-vip]

Can you provide a new patch ?

[Don-vip]

It's been 3 months we asked for information. Without any news from you this ticket will be closed.