Modify

Opened 11 months ago

Closed 10 months ago

Last modified 10 months ago

#13084 closed enhancement (fixed)

sort out unused icons and move icons from osm svn to josm svn

Reported by: Klumbumbus Owned by: team
Priority: normal Milestone: 16.07
Component: Core Version:
Keywords: icon svn Cc: yopaseopor

Description (last modified by Klumbumbus)

To get a better overview about our icons (and to know which icons don't need to get transformed to svg) I suggest to move the unused ones to the images_nodist folder.

I compared the images folder in svn with the images folder from dezipped josm-latest r10501 and it revealed 23 unused sub folders and 243 unused icons (see complete list at the bottom).

The 243 icons in the list at the bottom are all from the osm svn. Is there a way to find out the unused icons which are in our svn? There are for sure some but unlike the icons from the osm svn they are included in the jar file. => geticons.pl
Examples I never discovered within JOSM:


data\projection\Departements_Lambert4Zones.png
data\projection\LambertCC9Zones.png
markers\Bridge.png
markers\web.png

Our icons in the osm svn are not used by anyone else. (There is no changeset comment containing "icon" in the last years which is not JOSM related and Tom Hughes doesn't know about anyone using these icons. I asked him some time ago about this.) So it should be safe to move all the unused icons to our images_nodist folder. (Any concerns?)

What is actually the reason that our icons are split into two different repositories? Could we move them all (folder styles/standard) from the osm svn to our svn? That would make the work with icons a lot easier!


status after icon moving:

icons paths adapted:

outstanding external icon paths:


list of unused osm svn icons:

styles\standard\geocache
styles\standard\incomming
styles\standard\people
styles\standard\routing
styles\standard\waypoint
styles\standard\wlan
styles\standard\education.png
styles\standard\empty.png
styles\standard\food.png
styles\standard\geocache.png
styles\standard\health.png
styles\standard\leisure.png
styles\standard\misc.png
styles\standard\money.png
styles\standard\nautical.png
styles\standard\people.png
styles\standard\place.png
styles\standard\rendering.png
styles\standard\service.png
styles\standard\sport.png
styles\standard\transport.png
styles\standard\unknown.png
styles\standard\waypoint.png
styles\standard\accommodation\hotel
styles\standard\accommodation\alpine_hut.png
styles\standard\accommodation\shelter-bw.png
styles\standard\accommodation\camping\dump-station.png
styles\standard\accommodation\camping\gas-refill.png
styles\standard\accommodation\camping\hookup.png
styles\standard\accommodation\camping\trash.png
styles\standard\accommodation\camping\wastewater.png
styles\standard\accommodation\hotel\five_star.png
styles\standard\accommodation\hotel\four_star.png
styles\standard\accommodation\hotel\one_star.png
styles\standard\accommodation\hotel\three_star.png
styles\standard\accommodation\hotel\two_star.png
styles\standard\craft\stonemason.png
styles\standard\education\school
styles\standard\education\school\primary.png
styles\standard\food\fastfood
styles\standard\food\restaurant
styles\standard\food\snacks
styles\standard\food\bacon_and_eggs.png
styles\standard\food\snacks.png
styles\standard\food\teashop.png
styles\standard\food\wine_tavern.png
styles\standard\food\fastfood\burger-king.png
styles\standard\food\fastfood\mc-donalds.png
styles\standard\food\restaurant\japanese.png
styles\standard\food\snacks\pizza.png
styles\standard\incomming\amenity.png
styles\standard\incomming\aroad.png
styles\standard\incomming\bridleway.png
styles\standard\incomming\Broad.png
styles\standard\incomming\byway.png
styles\standard\incomming\contours.png
styles\standard\incomming\footpath.png
styles\standard\incomming\fwpbr.png
styles\standard\incomming\industry.png
styles\standard\incomming\interest.png
styles\standard\incomming\london-tube-24.png
styles\standard\incomming\minorroad.png
styles\standard\incomming\motorway_shield2.png
styles\standard\incomming\motorway_shield3.png
styles\standard\incomming\OLmarker.png
styles\standard\incomming\one.png
styles\standard\incomming\pbridleway.png
styles\standard\incomming\place.png
styles\standard\incomming\railway.png
styles\standard\incomming\road.png
styles\standard\incomming\station.png
styles\standard\incomming\stationnew.png
styles\standard\incomming\three.png
styles\standard\incomming\two.png
styles\standard\leisure\bicycling.png
styles\standard\leisure\music.png
styles\standard\leisure\shelter.png
styles\standard\leisure\theater.png
styles\standard\misc\bunny.png
styles\standard\misc\butterfly.png
styles\standard\misc\city_wall.png
styles\standard\misc\door.png
styles\standard\misc\drinking_water.png
styles\standard\misc\error.png
styles\standard\misc\fence.png
styles\standard\misc\fixme.png
styles\standard\misc\hedge.png
styles\standard\misc\landmark.png
styles\standard\misc\lock_closed.png
styles\standard\misc\lock_open.png
styles\standard\misc\no_smoking.png
styles\standard\misc\note.png
styles\standard\misc\proposed.png
styles\standard\misc\retaining_wall.png
styles\standard\misc\wall.png
styles\standard\misc\landmark\barn.png
styles\standard\misc\landmark\farm.png
styles\standard\misc\landmark\glacier.png
styles\standard\misc\landmark\glacier_small.png
styles\standard\misc\landmark\peak_small.png
styles\standard\misc\landmark\power.png
styles\standard\misc\landmark\volcano.png
styles\standard\misc\landuse\greenhouse_horticulture.png
styles\standard\misc\landuse\residential.png
styles\standard\money\bank
styles\standard\money\bank\vr-bank.png
styles\standard\nautical\alpha_flag.png
styles\standard\nautical\anchor.png
styles\standard\nautical\boat.png
styles\standard\nautical\buoy.svg
styles\standard\people\friends.png
styles\standard\people\friendsd.png
styles\standard\people\work.png
styles\standard\place\peak.png
styles\standard\place\settlement.png
styles\standard\place\settlement\openGeoDB.png
styles\standard\power\catenary_mast.svg
styles\standard\power\heliostat.svg
styles\standard\power\location_transition.svg
styles\standard\power\terminal.svg
styles\standard\religion\christian
styles\standard\religion\church
styles\standard\religion\chapel.png
styles\standard\religion\christian\catholic.png
styles\standard\religion\christian\mormon.png
styles\standard\religion\christian\orthodox.png
styles\standard\religion\christian\protestant.png
styles\standard\rendering\shield
styles\standard\rendering\track
styles\standard\rendering\quarry.png
styles\standard\rendering\quarry2.png
styles\standard\rendering\rail_preserved.png
styles\standard\rendering\station_small.png
styles\standard\rendering\shield\motorway_shield.png
styles\standard\rendering\shield\motorway_shield1.png
styles\standard\rendering\shield\motorway_shield2.png
styles\standard\rendering\shield\motorway_shield3.png
styles\standard\rendering\shield\motorway_shield4.png
styles\standard\rendering\shield\motorway_shield5.png
styles\standard\rendering\shield\motorway_shield6.png
styles\standard\rendering\shield\primary_shield1.png
styles\standard\rendering\shield\primary_shield2.png
styles\standard\rendering\shield\primary_shield3.png
styles\standard\rendering\shield\primary_shield4.png
styles\standard\rendering\shield\primary_shield5.png
styles\standard\rendering\shield\primary_shield6.png
styles\standard\rendering\shield\primary_shield7.png
styles\standard\rendering\shield\primary_shield8.png
styles\standard\rendering\shield\secondary_shield1.png
styles\standard\rendering\shield\secondary_shield2.png
styles\standard\rendering\shield\secondary_shield3.png
styles\standard\rendering\shield\secondary_shield4.png
styles\standard\rendering\shield\secondary_shield5.png
styles\standard\rendering\shield\secondary_shield6.png
styles\standard\rendering\shield\secondary_shield7.png
styles\standard\rendering\shield\secondary_shield8.png
styles\standard\rendering\shield\tertiary_shield1.png
styles\standard\rendering\shield\tertiary_shield2.png
styles\standard\rendering\shield\tertiary_shield3.png
styles\standard\rendering\shield\tertiary_shield4.png
styles\standard\rendering\shield\tertiary_shield5.png
styles\standard\rendering\shield\tertiary_shield6.png
styles\standard\rendering\shield\tertiary_shield7.png
styles\standard\rendering\shield\tertiary_shield8.png
styles\standard\rendering\shield\trunk_shield1.png
styles\standard\rendering\shield\trunk_shield2.png
styles\standard\rendering\shield\trunk_shield3.png
styles\standard\rendering\shield\trunk_shield4.png
styles\standard\rendering\shield\trunk_shield5.png
styles\standard\rendering\shield\trunk_shield6.png
styles\standard\rendering\shield\trunk_shield7.png
styles\standard\rendering\shield\trunk_shield8.png
styles\standard\rendering\track\arrow.png
styles\standard\rendering\track\arrow_back.png
styles\standard\rendering\track\mini_round.png
styles\standard\rendering\track\rail.png
styles\standard\rendering\track\station_small.png
styles\standard\shop\supermarket
styles\standard\shop\shoe_repair.png
styles\standard\shop\groceries\fruits.png
styles\standard\shop\supermarket\aldi.png
styles\standard\shop\supermarket\aldi_nord.png
styles\standard\shop\supermarket\kaufland.png
styles\standard\shop\supermarket\lidl.png
styles\standard\sport\dart.png
styles\standard\sport\gymnastics.png
styles\standard\sport\indoor_pool.png
styles\standard\sport\kiteflying.png
styles\standard\sport\mountain_bike.png
styles\standard\sport\swimming.png
styles\standard\sport\golf\tee_area.svg
styles\standard\transport\ferry
styles\standard\transport\aerialway.png
styles\standard\transport\bridge.png
styles\standard\transport\ferry.png
styles\standard\transport\funicular.png
styles\standard\transport\handicapped.png
styles\standard\transport\harbour.png
styles\standard\transport\park_ride.png
styles\standard\transport\pedestrian.png
styles\standard\transport\rapid_train.png
styles\standard\transport\steps.png
styles\standard\transport\track.png
styles\standard\transport\turntable.png
styles\standard\transport\bridge\bridge-car.png
styles\standard\transport\bridge\bridge-pedestrian.png
styles\standard\transport\bridge\drawbridge.png
styles\standard\transport\ferry\ferry-car.png
styles\standard\transport\ferry\ferry-pedestrian.png
styles\standard\transport\railway\crossing2.svg
styles\standard\transport\railway\level_crossing2.svg
styles\standard\vehicle\caution.png
styles\standard\vehicle\crossing.png
styles\standard\vehicle\rental.png
styles\standard\vehicle\restriction.png
styles\standard\vehicle\tank.png
styles\standard\vehicle\tunnel.png
styles\standard\vehicle\fuel\agip.png
styles\standard\vehicle\fuel\aral.png
styles\standard\vehicle\fuel\elf.png
styles\standard\vehicle\fuel\esso.png
styles\standard\vehicle\fuel\jet.png
styles\standard\vehicle\fuel\omv.png
styles\standard\vehicle\fuel\shell.png
styles\standard\vehicle\fuel\texaco.png
styles\standard\vehicle\fuel\total.png
styles\standard\vehicle\parking\car.png
styles\standard\vehicle\parking\hiking.png
styles\standard\vehicle\parking\restarea.png
styles\standard\vehicle\parking\restarea_toilets.png
styles\standard\vehicle\rental\car
styles\standard\vehicle\rental\car\sixt.png
styles\standard\vehicle\restriction\speed
styles\standard\vehicle\restriction\bicycle_road.svg
styles\standard\vehicle\restriction\incline.png
styles\standard\vehicle\restriction\parking.png
styles\standard\vehicle\restriction\play_street.png
styles\standard\vehicle\restriction\road_works.png
styles\standard\vehicle\restriction\traffic_jam.png
styles\standard\vehicle\restriction\speed\30-end.png
styles\standard\waypoint\pin
styles\standard\waypoint\pin.png
styles\standard\waypoint\wpt1.png
styles\standard\waypoint\wpt2.png
styles\standard\waypoint\wpt3.png
styles\standard\waypoint\wpt4.png
styles\standard\waypoint\wpt5.png
styles\standard\waypoint\wpt6.png
styles\standard\waypoint\wpt7.png
styles\standard\waypoint\wpt8.png
styles\standard\waypoint\wpt9.png
styles\standard\waypoint\wptblue.png
styles\standard\waypoint\wptgreen.png
styles\standard\waypoint\wptorange.png
styles\standard\waypoint\wptred.png
styles\standard\waypoint\wptyellow.png
styles\standard\waypoint\pin\green.png
styles\standard\waypoint\pin\red.png
styles\standard\waypoint\pin\yellow.png
styles\standard\wlan\closed
styles\standard\wlan\nonfree
styles\standard\wlan\closed.png
styles\standard\wlan\nonfree.png
styles\standard\wlan\open.png
styles\standard\wlan\closed\wep.png
styles\standard\wlan\nonfree\fon.png

Attachments (0)

Change History (51)

comment:1 Changed 11 months ago by Klumbumbus

Description: modified (diff)

comment:2 Changed 11 months ago by stoecker

Unused icons are easy to find. Call ./geticons.pl in josm/core directory. Currently only one is displayed: "presets/tram.png".

For the styles-icons: there have been other tools using these files (don't aks me which ones). That's probably history. Maybe we could copy the files to JOSM SVN. The used ones into images, the others into images_nodist. If you want to do so I have no objections.

comment:3 Changed 11 months ago by Don-vip

+1 for copying icons into JOSM repository, it's simpler.

I don't understand what you mean with French Lambert projection images? Please don't remove them, they are used in LambertCC9ZonesProjectionChoice.java and LambertProjectionChoice.java

comment:4 in reply to:  2 ; Changed 11 months ago by Klumbumbus

Replying to stoecker:

Unused icons are easy to find. Call ./geticons.pl in josm/core directory. Currently only one is displayed: "presets/tram.png".

Ah, nice. However the script gives me also openrecent.png. Isn't this used for Help/Action/OpenRecent?

comment:5 in reply to:  3 Changed 11 months ago by Klumbumbus

Replying to Don-vip:

French Lambert projection images?

OK, now I found them :)

comment:6 in reply to:  4 ; Changed 11 months ago by stoecker

Replying to Klumbumbus:

Replying to stoecker:

Unused icons are easy to find. Call ./geticons.pl in josm/core directory. Currently only one is displayed: "presets/tram.png".

Ah, nice. However the script gives me also openrecent.png. Isn't this used for Help/Action/OpenRecent?

"svn up"!

comment:7 in reply to:  6 ; Changed 11 months ago by Klumbumbus

Replying to stoecker:

"svn up"!

I don't understand what you mean.

comment:8 in reply to:  7 ; Changed 11 months ago by Klumbumbus

Replying to Klumbumbus:

Replying to stoecker:

"svn up"!

I don't understand what you mean.

I just noticed that you updated the script. openrecent.png disappeared but now I get the following errors for all the folders:

File cursor(.svg|.png) does not exist!
File data(.svg|.png) does not exist!
File data/projection(.svg|.png) does not exist!
File dialogs(.svg|.png) does not exist!
File dialogs/autoscale(.svg|.png) does not exist!
File dialogs/changeset(.svg|.png) does not exist!
File dialogs/mappaint(.svg|.png) does not exist!
File dialogs/notes(.svg|.png) does not exist!
File dialogs/relation(.svg|.png) does not exist!
File layer(.svg|.png) does not exist!
File mapmode(.svg|.png) does not exist!
File misc(.svg|.png) does not exist!
File oauth(.svg|.png) does not exist!
File preferences(.svg|.png) does not exist!
File statusline/(.svg|.png) does not exist!

comment:9 in reply to:  8 ; Changed 11 months ago by stoecker

Replying to Klumbumbus:

I just noticed that you updated the script. openrecent.png disappeared but now I get the following errors for all the folders:

Did you call it from outside the directory? The script only works if you are in the right directory, josm-svn root.

comment:10 in reply to:  9 Changed 11 months ago by Klumbumbus

Replying to stoecker:

The script only works if you are in the right directory, josm-svn root.

I think I did it right becasue the tram and all the osm svn icons are correctly detected.

With "josm-svn root" you mean the folder where the geticons.pl file is saved, right?

It's the first time I execute perl scripts :)

What I did (on windows):

  • installed strawberry perl
  • opened cmd.exe
  • D:
  • cd D:\Stefan\OSM\JOSMSVN
  • geticons.pl

comment:11 Changed 11 months ago by bastiK

I get the same errors. Could be a regression of [10503] as it makes the script ignore the second argument, which is the image name.

comment:12 in reply to:  11 ; Changed 11 months ago by Klumbumbus

Replying to bastiK:

regression of [10503]

Seems so. With the old version of the script before r10503 the errors are gone (but the openrecent.png is displayed).

comment:13 Changed 11 months ago by stoecker

In 10514/josm:

see #13084, fix geticons.pl

comment:14 in reply to:  12 Changed 11 months ago by stoecker

regression of [10503]

Seems so. With the old version of the script before r10503 the errors are gone (but the openrecent.png is displayed).

Strange. Anyway I was to lazy to search the real reason, so I simply changed the last fix a bit :-)

comment:15 Changed 11 months ago by Klumbumbus

Works for me now.

comment:16 Changed 11 months ago by Klumbumbus

Cc: yopaseopor added

comment:17 Changed 10 months ago by Klumbumbus

In 10532/josm:

see #13084 - move unused icons from osm svn to josm svn images_nodist/presets

comment:18 Changed 10 months ago by Klumbumbus

see also [o32660]

comment:19 Changed 10 months ago by Klumbumbus

In 10533/josm:

see #13084 - move unused icons from osm svn to josm svn images_nodist/presets

comment:20 Changed 10 months ago by Klumbumbus

(Part two. I forgot some in first commit)

see also [o32661]

comment:21 Changed 10 months ago by Klumbumbus

In 10565/josm:

see #13084 - move all (602) icons from osm svn to josm svn images/presets; adapt default style, potlatch2 style and internal preset

comment:22 Changed 10 months ago by stoecker

In 10566/josm:

see #13084 - fix some errors in icon move

comment:23 Changed 10 months ago by stoecker

You simply could have removed the styles/standard and copy the icons there. What you did may cause a bit more trouble, but it's the cleaner solution at the end :-)

Last edited 10 months ago by stoecker (previous) (diff)

comment:24 Changed 10 months ago by stoecker

In 10567/josm:

see #13084 - remove workaround - it will probably cause more trouble than it will help

comment:25 Changed 10 months ago by Klumbumbus

The goal was to have all icons at one place. Until now you often needed two commits when changing something icon related and it was all a bit confusing with the paths (in styles styles/standard was stripped but not in presets)

comment:26 Changed 10 months ago by Klumbumbus

Thanks for your clean up :)

comment:27 Changed 10 months ago by Klumbumbus

Description: modified (diff)

comment:28 Changed 10 months ago by Klumbumbus

Description: modified (diff)

comment:29 Changed 10 months ago by Don-vip

thanks for this. I always were too lazy to even considerate merging icons at a single place :)

comment:30 Changed 10 months ago by Klumbumbus

Description: modified (diff)

comment:31 Changed 10 months ago by bastiK

In 10573/josm:

only keep higher resolution image for duplicate images (see #13084)

comment:32 Changed 10 months ago by bastiK

In 10574/josm:

fix presets (see #13084)

comment:33 Changed 10 months ago by bastiK

While we are breaking image paths, this is a good opportunity to sort the original preset images into directories and unify styles and presets even more. :)

comment:34 Changed 10 months ago by Klumbumbus

Yes, I planed to do so. Also I plan to replace icons by svg where we already have the svg source at https://trac.openstreetmap.org/browser/subversion/applications/share/map-icons/svg

comment:35 Changed 10 months ago by bastiK

Okay great, then I won't interfere. :)

comment:36 Changed 10 months ago by Klumbumbus

Description: modified (diff)

comment:37 Changed 10 months ago by Klumbumbus

In 10575/josm:

see #13084 - fix preset icon path
see #13158 - fix viewbox of bird_hide icon and rename food court icon

comment:38 Changed 10 months ago by Klumbumbus

In 10579/josm:

see #13084 - fix preset icon

comment:39 Changed 10 months ago by Klumbumbus

It would be nice if the presets jenkins test would print also the name of the affected preset in the last part of the page: https://josm.openstreetmap.de/jenkins/job/JOSM/1561/jdk=JDK8/testReport/org.openstreetmap.josm.gui.preferences.map/TaggingPresetPreferenceTestIT/testValidityOfAvailablePresets/

(similar to the styles jenkins test)

ATM it is hard to find out which preset generated a specific error.

Last edited 10 months ago by Klumbumbus (previous) (diff)

comment:40 Changed 10 months ago by Klumbumbus

Description: modified (diff)

comment:41 Changed 10 months ago by Klumbumbus

Description: modified (diff)

comment:42 Changed 10 months ago by Klumbumbus

Description: modified (diff)

comment:43 Changed 10 months ago by stoecker

Description: modified (diff)

comment:44 in reply to:  43 ; Changed 10 months ago by Klumbumbus

Replying to stoecker:
How did you notice this?

comment:45 in reply to:  44 ; Changed 10 months ago by stoecker

Replying to Klumbumbus:

Replying to stoecker:
How did you notice this?

Because I get an e-mail every 10 minutes which tells me so :-)

Last edited 10 months ago by stoecker (previous) (diff)

comment:46 in reply to:  45 Changed 10 months ago by Klumbumbus

Replying to stoecker:

Because I get an e-mail every 10 minutes which tells me so :-)

Nice :D

comment:47 Changed 10 months ago by Klumbumbus

Description: modified (diff)

comment:48 Changed 10 months ago by Klumbumbus

Keywords: icon svn added
Resolution: fixed
Status: newclosed
Summary: sort out unused iconssort out unused icons and move icons from osm svn to josm svn

Main point of this ticket is fixed (two external presets still need an adjustment). I have a big patch with icon rework (a lot of png replaced by svg and icon reordering), however I have no time for it this week, so this will maybe part of next milestone. See #13217 for follow up

comment:49 Changed 10 months ago by Klumbumbus

--deleted-- (typo in commit comment)

Last edited 10 months ago by Klumbumbus (previous) (diff)

comment:50 Changed 10 months ago by Klumbumbus

Description: modified (diff)

comment:51 Changed 10 months ago by Klumbumbus

Description: modified (diff)

Modify Ticket

Change Properties
Set your email in Preferences
Action
as closed The owner will remain team.
as The resolution will be set. Next status will be 'closed'.
The resolution will be deleted. Next status will be 'reopened'.

Add Comment


E-mail address and name can be saved in the Preferences.

 
Note: See TracTickets for help on using tickets.