Add filter and icon for map types

[stoecker]

See #16103

The list of imagery in prefs should allow to filter for the types.

If possible the different types should be displayed with a small icon.

Category is already added to all entries in the wiki.

[Klumbumbus]

And a filter by text please too, (similar to the filterbox for projections), which allows to e.g. filter entries by country (filtertext "de") or city (filtertext "berlin").

[Klumbumbus]

Ticket #16136 has been marked as a duplicate of this ticket.

[Don-vip]

Why 18.08?

[stoecker]

June is too early (first data needs to be added to Maps) and in July I will have no time...

[Klumbumbus]

The wiki doesn't yet allow the category attribute.
Warnung: Ungültige Wiki-Seite: XML validation for map failed: Element '{http://josm.openstreetmap.de/maps-1.0}entry', attribute 'category': The attribute 'category' is not allowed.

[stoecker]

Replying to Klumbumbus:

The wiki doesn't yet allow the category attribute.
Warnung: Ungültige Wiki-Seite: XML validation for map failed: Element '{http://josm.openstreetmap.de/maps-1.0}entry', attribute 'category': The attribute 'category' is not allowed.

Tried
<category>xxx</category>
and it worked fine. Where exactly did you try?

[Klumbumbus]

I tried <entry category="photo"> cause it is listed under attributes at wiki:Maps

[Klumbumbus]

first pages done:

• https://josm.openstreetmap.de/wiki/Maps/Worldwide?action=diff&version=29
• https://josm.openstreetmap.de/wiki/Maps/Germany?sfp_email=&sfph_mail=&action=diff&version=163&old_version=160&sfp_email=&sfph_mail=

[stoecker]

We should icons now (also to honor Klumbumbus work). Any proposals for icons?

[Don-vip]

Ideas. Licenses to check:

• photo aerial or satellite photo
• map a map
• historicmap historic or otherwise outdated map
• osmbasedmap map based on OSM data
• historicphoto historic or otherwise outdated aerial or satellite photo
• other any other type

[Klumbumbus]

Replying to Don-vip:

Ideas.

Nice.
That one is not recognizable at 16px though. At least I didn't understand what that is until I opened the full size.

What about using the same icons for photo and historicphoto and for map and historicmap while the normal variant is coloured and the historic variant greyscale?

[stoecker]

Replying to Klumbumbus:

Replying to Don-vip:

Ideas.

Nice.
That one is not recognizable at 16px though. At least I didn't understand what that is until I opened the full size.

Same for me. Also the historicmap is not really obvious.

What about using the same icons for photo and historicphoto and for map and historicmap while the normal variant is coloured and the historic variant greyscale?

I like that.

[Klumbumbus]

All categories are added. We have:

303x photo
70x historicphoto
63x map
93x historicmap
42x osmbasedmap
154x other

In total 725 active (i.e. not disabled) entries.

[Klumbumbus]

Can we please have a check either in SyncEditorLayerIndex.groovy or make it mandatory in the xml checks in the wiki that every entry has an category property?

[Don-vip]

154 other? That's a huge number, do you think we could add a new category? What are all these sources about?

[Klumbumbus]

Replying to Don-vip:

154 other? That's a huge number, do you think we could add a new category? What are all these sources about?

Mostly overlays of one feature (streets, buildings, administrative boundaries,...), but also elevation modells (hill shading), contour lines, OSM validation overlays, WMTS/wms_endpoint sources containing layers of different categories.

[Don-vip]

In 14541/josm:

see #16301 - make category mandatory

[Klumbumbus]

In 14552/josm:

• see #16301 - make id mandatory
• see #17058 - add asserts to territories.mapcss

[stoecker]

I'm not so happy to make these attributes mandatory. That may be true for our wiki, but not necessary elsewhere. Making them mandatory prevents loading when the attributes aren't there.

I'd rather test them with the Sync script.

[stoecker]

Hmm, seems minOccurs does not do anything at all. You can remove all these arguments without an error.

[stoecker]

In 14554/josm:

see #16301 - make sync script stable against missing data

[Klumbumbus]

Replying to stoecker:

I'm not so happy to make these attributes mandatory.

OK, I thought maps.xsd is only for the wiki. Please change it to a better solution.

[stoecker]

Replying to Klumbumbus:

Replying to stoecker:

I'm not so happy to make these attributes mandatory.

OK, I thought maps.xsd is only for the wiki. Please change it to a better solution.

No. These XSD are the files JOSM uses for validation.

But as said it seems minOccurs doesn't have an effect. The Sync script now screams if these fields are missing :-)

[Don-vip]

@Dirk: do you plan to work on this? I didn't touch it because I thought when you created the ticket that it was your intention.

[stoecker]

Please go on, when you have time for this.

[Don-vip]

@Stefan: I'd like to use ​https://www.iconfinder.com/icons/1587506/internet_line_satellite_icon for the first icon but the SVG file is 2Mb. I can't reduce it using svg-cleaner, do you know how we can improve it? It shouldn't be more than a few kilobytes.

[Don-vip]

Ah, the SVG includes a font. WTF. without it it's only 4Kb :)

[Don-vip]

In 15049/josm:

see #16301 - add category icons in imagery preferences

[Don-vip]

TODO:

• add tooltip above icon, displaying name and description of the imagery category. Probably requires custom renderers
• add tooltip above country, using Java Locale class
• add filter text field searching on all columns (category, country, title, url)

[Don-vip]

@Dirk the icon script is not happy with my dynamic loading:
https://josm.openstreetmap.de/jenkins/job/JOSM-Integration/3078/warnings4Result/

How can we ignore these warnings?

[stoecker]

Simply add /* ICON(data/imagery/) */ in front of the names in ImageryInfo.java ;-)

[Don-vip]

OK thanks :)

[Don-vip]

In 15057/josm:

see #16301 - suppress icon warning

[Don-vip]

It's worse now: https://josm.openstreetmap.de/jenkins/job/JOSM-Integration/3082/warnings4Result/
What did I do wrong?

[stoecker]

You took ImageryType enum. You should have used ImageryCategory enum. :-)

I saw your commit first and though: Ah, he implemented type image display as well. Fine. But found no related change :-)

[Don-vip]

Appfff I was so tired I shouldn't have committed this xD My eyes were probably half-closed already :)

[Don-vip]

In 15059/josm:

see #16301 - suppress icon warning (on the correct enum this time)

[stoecker]

You should go to your boss and say: "I make silly mistakes in my open source free time coding - I need a vacation". He sure will grant it :-)

[stoecker]

Replying to stoecker:

You should go to your boss and say: "I make silly mistakes in my open source free time coding - I need a vacation". He sure will grant it :-)

Or maybe not when you use your free time coding for JOSM...

[Don-vip]

:D I was on vacation and exhausted because of it, just got back to work today so it does not work ;)

[Don-vip]

In 15114/josm:

see #16301 - display tooltips for all columns

[Don-vip]

In 15115/josm:

see #16301 - extract ImageryProvidersPanel

[Don-vip]

In 15116/josm:

fix #16301 - add filter for default imagery entries

[Klumbumbus]

Thats great, thanks!
One thing: the map on the right side in the preferences displays only error tiles for me. It seems that got broken.

[Don-vip]

I didn't touch this part. Probably a network error or something.

[Klumbumbus]

the console says Failed loading https://c.tile.openstreetmap.org/3/5/2.png: class java.io.IOException: Server returned HTTP response code: 429 for URL: https://a.tile.openstreetmap.org/3/5/2.png however in browser i can load ​https://a.tile.openstreetmap.org/3/5/2.png without problems.

[stoecker]

429 is "rate limit".

[Klumbumbus]

Replying to stoecker:

429 is "rate limit".

Seems justified. JOSM is doing strange things. See attached gifs.

[stoecker]

Seems justified. JOSM is doing strange things. See attached gifs.

Please open a ticket for that for the TMS image loader (assigned to wiktorn?).

[Klumbumbus]

Ahh, I think we need a hotfix:

What steps will reproduce the problem?

1. type "cy" in the filter box above the list in the imagery preferences
2. select the cyprus entry on position 5
3. click activate

What is the expected result?

the cyprus entry is added to the list below

What happens instead?

the entry which is on position 5 in the unfiltered list is added (Digital Globe Standard Imagery)

[Don-vip]

Problem of HTTP 429 fixed in #17772.
Also deleting the big gif files, I did some cleanup of giant attachments with #17757 because it complexifies #16857.

I'm fixing the "Cyprus" selection problem plus also the problem reported in #17779.

[Don-vip]

In 15153/josm:

see #16301 - fix activation problem when filtering imagery sources

[Klumbumbus]

BTW, not only the "Activate" button but also the "Edit" button from the xml bounds plugin is affected. Not sure if the plugin needs an own fix.

[Don-vip]

Replying to Klumbumbus:

also the "Edit" button from the xml bounds plugin is affected.

Thanks, plugin fixed in [o35023:35024].

[Don-vip]

Hotfix released: r15155

[Klumbumbus]

Thanks. Works fine for me.

[Klumbumbus]

Replying to Don-vip:

Hotfix released: r15155

Also nice that you managed to use a fancy number for the hotfix too, similar to the stable release. I'm very pleased. :)

[Don-vip]

I wanted 15151 initially. It's a palindrome.

[Klumbumbus]

--> follow up in #18172