[josm] 01/02: Merge tag 'debian/0.0.svn10786+dfsg-2' into jessie-backports

Bas Couwenberg sebastic at debian.org
Thu Aug 18 09:24:29 UTC 2016


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch jessie-backports
in repository josm.

commit c56c9bd3594c3462506664c0c6d7e854eb68ab1d
Merge: 7113652 309793b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Aug 18 10:48:50 2016 +0200

    Merge tag 'debian/0.0.svn10786+dfsg-2' into jessie-backports
    
    Conflicts:
    	debian/changelog

 .classpath                                         |    4 +-
 .settings/org.eclipse.jdt.core.prefs               |    7 +-
 .settings/sf.eclipse.javacc.prefs                  |    2 +-
 README                                             |   13 +-
 REVISION                                           |    8 +-
 build.xml                                          |   41 +-
 data/defaultpresets.xml                            | 1735 ++++++-------
 data/validator/combinations.mapcss                 |   37 +-
 data/validator/deprecated.mapcss                   |   10 +
 data/validator/geometry.mapcss                     |    7 +-
 data/validator/ignoretags.cfg                      |    2 +
 data/validator/opening_hours.js                    |   63 +-
 data_nodist/trans/ast.lang                         |  Bin 8985 -> 8848 bytes
 data_nodist/trans/be.lang                          |  Bin 17233 -> 17556 bytes
 data_nodist/trans/bg.lang                          |  Bin 2409 -> 2411 bytes
 data_nodist/trans/ca-valencia.lang                 |  Bin 7819 -> 7791 bytes
 data_nodist/trans/ca.lang                          |  Bin 10610 -> 10470 bytes
 data_nodist/trans/cs.lang                          |  Bin 10579 -> 10730 bytes
 data_nodist/trans/da.lang                          |  Bin 9889 -> 10056 bytes
 data_nodist/trans/de.lang                          |  Bin 11011 -> 11232 bytes
 data_nodist/trans/el.lang                          |  Bin 1411 -> 1413 bytes
 data_nodist/trans/en.lang                          |  Bin 9069 -> 9243 bytes
 data_nodist/trans/en_AU.lang                       |  Bin 1496 -> 1498 bytes
 data_nodist/trans/en_GB.lang                       |  Bin 2128 -> 2130 bytes
 data_nodist/trans/es.lang                          |  Bin 11696 -> 11885 bytes
 data_nodist/trans/et.lang                          |  Bin 1444 -> 1390 bytes
 data_nodist/trans/fi.lang                          |  Bin 3082 -> 3011 bytes
 data_nodist/trans/fr.lang                          |  Bin 10961 -> 11345 bytes
 data_nodist/trans/gl.lang                          |  Bin 2959 -> 2961 bytes
 data_nodist/trans/hu.lang                          |  Bin 11195 -> 11083 bytes
 data_nodist/trans/id.lang                          |  Bin 6731 -> 6701 bytes
 data_nodist/trans/it.lang                          |  Bin 10154 -> 10414 bytes
 data_nodist/trans/ja.lang                          |  Bin 11831 -> 11614 bytes
 data_nodist/trans/km.lang                          |  Bin 16921 -> 16871 bytes
 data_nodist/trans/lt.lang                          |  Bin 2074 -> 2012 bytes
 data_nodist/trans/nb.lang                          |  Bin 1687 -> 1689 bytes
 data_nodist/trans/nl.lang                          |  Bin 11587 -> 11726 bytes
 data_nodist/trans/pl.lang                          |  Bin 2789 -> 2845 bytes
 data_nodist/trans/pt.lang                          |  Bin 13343 -> 12858 bytes
 data_nodist/trans/pt_BR.lang                       |  Bin 10058 -> 10112 bytes
 data_nodist/trans/ru.lang                          |  Bin 17259 -> 17590 bytes
 data_nodist/trans/sk.lang                          |  Bin 9906 -> 10055 bytes
 data_nodist/trans/sv.lang                          |  Bin 1348 -> 1312 bytes
 data_nodist/trans/uk.lang                          |  Bin 17662 -> 18005 bytes
 data_nodist/trans/vi.lang                          |  Bin 10845 -> 10737 bytes
 data_nodist/trans/zh_CN.lang                       |  Bin 6037 -> 7566 bytes
 data_nodist/trans/zh_TW.lang                       |  Bin 4655 -> 4587 bytes
 debian/README.source                               |    4 +-
 debian/changelog                                   |   20 +
 debian/control                                     |   18 +-
 debian/copyright                                   |   12 -
 debian/josm.lintian-overrides                      |    3 +
 debian/patches/00-build.patch                      |   66 +-
 debian/patches/01-bts.patch                        |   93 +-
 debian/patches/02-elemstyles.patch                 |   29 +-
 debian/patches/03-default_look_and_feel.patch      |    2 +-
 debian/patches/08-use_noto_font.patch              |    2 +-
 debian/patches/series                              |    1 +
 debian/patches/svn-r10789-fix-two-svg-files.patch  |   26 +
 eclipse/JOSM (Java 7).launch                       |   21 -
 geticons.pl                                        |   37 +-
 i18n/po/af.po                                      |  404 +--
 i18n/po/am.po                                      |  404 +--
 i18n/po/ar.po                                      |  414 +--
 i18n/po/ast.po                                     |  492 ++--
 i18n/po/az.po                                      |  404 +--
 i18n/po/be.po                                      |  601 +++--
 i18n/po/bg.po                                      |  441 ++--
 i18n/po/bn.po                                      |  404 +--
 i18n/po/br.po                                      |  404 +--
 i18n/po/bs.po                                      |  404 +--
 i18n/po/ca.po                                      |  475 ++--
 i18n/po/ca at valencia.po                             |  452 ++--
 i18n/po/cs.po                                      |  539 ++--
 i18n/po/cy.po                                      |  404 +--
 i18n/po/da.po                                      |  498 ++--
 i18n/po/de.po                                      |  539 ++--
 i18n/po/de_DE.po                                   |  404 +--
 i18n/po/el.po                                      |  434 ++--
 i18n/po/en_AU.po                                   |  453 ++--
 i18n/po/en_CA.po                                   |  404 +--
 i18n/po/en_GB.po                                   |  508 ++--
 i18n/po/eo.po                                      |  408 +--
 i18n/po/es.po                                      |  517 ++--
 i18n/po/et.po                                      |  442 ++--
 i18n/po/eu.po                                      |  424 ++--
 i18n/po/fa.po                                      |  418 +--
 i18n/po/fi.po                                      |  455 ++--
 i18n/po/fil.po                                     |  404 +--
 i18n/po/fo.po                                      |  404 +--
 i18n/po/fr.po                                      |  541 ++--
 i18n/po/ga.po                                      |  404 +--
 i18n/po/gl.po                                      |  444 ++--
 i18n/po/he.po                                      |  418 +--
 i18n/po/hi.po                                      |  404 +--
 i18n/po/hr.po                                      |  426 ++--
 i18n/po/ht.po                                      |  404 +--
 i18n/po/hu.po                                      |  478 ++--
 i18n/po/hy.po                                      |  404 +--
 i18n/po/ia.po                                      |  404 +--
 i18n/po/id.po                                      |  451 ++--
 i18n/po/is.po                                      |  418 +--
 i18n/po/it.po                                      |  541 ++--
 i18n/po/ja.po                                      |  450 ++--
 i18n/po/ka.po                                      |  404 +--
 i18n/po/km.po                                      |  454 ++--
 i18n/po/ko.po                                      |  470 ++--
 i18n/po/ky.po                                      |  404 +--
 i18n/po/lb.po                                      |  404 +--
 i18n/po/lo.po                                      |  404 +--
 i18n/po/lt.po                                      |  552 ++--
 i18n/po/lv.po                                      |  406 +--
 i18n/po/mk.po                                      |  404 +--
 i18n/po/mr.po                                      |  409 +--
 i18n/po/ms.po                                      |  404 +--
 i18n/po/nb.po                                      |  425 ++--
 i18n/po/nds.po                                     |  404 +--
 i18n/po/nl.po                                      |  478 ++--
 i18n/po/nn.po                                      |  404 +--
 i18n/po/oc.po                                      |  404 +--
 i18n/po/pa.po                                      |  404 +--
 i18n/po/pl.po                                      | 2671 ++++++++++----------
 i18n/po/pt.po                                      |  475 ++--
 i18n/po/pt_BR.po                                   |  522 ++--
 i18n/po/rm.po                                      |  404 +--
 i18n/po/ro.po                                      |  412 +--
 i18n/po/ru.po                                      |  515 ++--
 i18n/po/sk.po                                      |  503 ++--
 i18n/po/sl.po                                      |  416 +--
 i18n/po/sq.po                                      |  404 +--
 i18n/po/sr.po                                      |  404 +--
 i18n/po/sv.po                                      |  480 ++--
 i18n/po/ta.po                                      |  406 +--
 i18n/po/te.po                                      |  404 +--
 i18n/po/th.po                                      |  404 +--
 i18n/po/tr.po                                      |  428 ++--
 i18n/po/ug.po                                      |  404 +--
 i18n/po/uk.po                                      |  513 ++--
 i18n/po/ur.po                                      |  404 +--
 i18n/po/vi.po                                      |  459 ++--
 i18n/po/wae.po                                     |  404 +--
 i18n/po/zh_CN.po                                   |  458 ++--
 i18n/po/zh_TW.po                                   |  442 ++--
 images/misc/error.svg                              |    4 +-
 images/presets/accommodation/alpine_hut_blue.png   |  Bin 0 -> 346 bytes
 images/presets/accommodation/basic_hut_blue.png    |  Bin 0 -> 217 bytes
 images/presets/accommodation/camping.svg           |  122 +
 images/presets/accommodation/caravan.svg           |  114 +
 images/presets/accommodation/chalet.svg            |  106 +
 images/presets/accommodation/guest_house.svg       |  129 +
 images/presets/accommodation/hostel.svg            |   14 +
 images/presets/accommodation/hotel.svg             |   14 +
 images/presets/accommodation/motel.svg             |   14 +
 images/presets/accommodation/shelter.svg           |  277 ++
 images/presets/accommodation/shelter_lean_to.svg   |  141 ++
 .../presets/accommodation/shelter_picnic_brown.png |  Bin 0 -> 346 bytes
 .../shelter_public_transport_brown.png             |  Bin 0 -> 242 bytes
 images/presets/accommodation/water.svg             |  116 +
 .../presets/accommodation/wilderness_hut_blue.png  |  Bin 0 -> 212 bytes
 images/presets/adit.png                            |  Bin 622 -> 0 bytes
 images/presets/aerialway.png                       |  Bin 486 -> 0 bytes
 images/presets/aerialway_station.png               |  Bin 284 -> 0 bytes
 images/presets/aeroway_gate.png                    |  Bin 872 -> 0 bytes
 images/presets/apron.png                           |  Bin 448 -> 0 bytes
 images/presets/arts_centre.png                     |  Bin 523 -> 0 bytes
 images/presets/athletics.png                       |  Bin 256 -> 0 bytes
 images/presets/baker.png                           |  Bin 737 -> 0 bytes
 images/presets/{ => barrier}/barrier.png           |  Bin
 images/presets/barrier/block.svg                   |   92 +
 images/presets/barrier/bollard.svg                 |  212 ++
 images/presets/barrier/cattle_grid.png             |  Bin 0 -> 272 bytes
 images/presets/barrier/chain.svg                   |  131 +
 images/presets/barrier/city_wall.svg               |  104 +
 images/presets/barrier/cycle_barrier.svg           |  122 +
 images/presets/{ => barrier}/douane.png            |  Bin
 images/presets/barrier/entrance.svg                |  110 +
 images/presets/barrier/fence.svg                   |  111 +
 images/presets/barrier/gate.png                    |  Bin 0 -> 492 bytes
 images/presets/barrier/hedge.svg                   |   86 +
 images/presets/barrier/kerb.svg                    |   88 +
 images/presets/barrier/lift_gate.svg               |  193 ++
 images/presets/barrier/retaining_wall.svg          |   80 +
 images/presets/barrier/sally_port.svg              |   94 +
 images/presets/barrier/spikes.svg                  |  100 +
 images/presets/barrier/stile.svg                   |  110 +
 images/presets/barrier/swing_gate.svg              |  196 ++
 images/presets/{ => barrier}/toll_station.png      |  Bin
 images/presets/barrier/turnstile.svg               |  102 +
 images/presets/barrier/wall.svg                    |  235 ++
 images/presets/basketball.png                      |  Bin 1920 -> 0 bytes
 images/presets/battlefield.png                     |  Bin 1338 -> 0 bytes
 images/presets/beachvolleyball.png                 |  Bin 296 -> 0 bytes
 images/presets/bed.png                             |  Bin 136 -> 0 bytes
 images/presets/bench.png                           |  Bin 99 -> 0 bytes
 images/presets/bicycle_rental.png                  |  Bin 715 -> 0 bytes
 images/presets/bike.png                            |  Bin 167 -> 0 bytes
 images/presets/board.png                           |  Bin 2422 -> 0 bytes
 images/presets/boatyard.png                        |  Bin 604 -> 0 bytes
 images/presets/bollard.png                         |  Bin 303 -> 0 bytes
 images/presets/boule.png                           |  Bin 258 -> 0 bytes
 images/presets/bus.png                             |  Bin 360 -> 0 bytes
 images/presets/bus_small.png                       |  Bin 367 -> 0 bytes
 images/presets/cable_car.png                       |  Bin 363 -> 0 bytes
 images/presets/car.png                             |  Bin 278 -> 0 bytes
 images/presets/car_rental.png                      |  Bin 459 -> 0 bytes
 images/presets/car_repair.png                      |  Bin 107 -> 0 bytes
 images/presets/car_sharing.png                     |  Bin 574 -> 0 bytes
 images/presets/car_wash.png                        |  Bin 709 -> 0 bytes
 images/presets/cemetery.png                        |  Bin 341 -> 0 bytes
 images/presets/chair_lift.png                      |  Bin 471 -> 0 bytes
 images/presets/cinema.png                          |  Bin 1113 -> 0 bytes
 images/presets/city_wall.png                       |  Bin 287 -> 0 bytes
 images/presets/confectionery.png                   |  Bin 811 -> 0 bytes
 images/presets/construction.png                    |  Bin 180 -> 0 bytes
 images/presets/craft/painter.png                   |  Bin 0 -> 291 bytes
 images/presets/craft/plumber.png                   |  Bin 0 -> 268 bytes
 images/presets/craft/pottery.png                   |  Bin 0 -> 354 bytes
 images/presets/craft/roofer.svg                    |   91 +
 images/presets/craft/tiler.png                     |  Bin 0 -> 90 bytes
 images/presets/craft/window_construction.png       |  Bin 0 -> 275 bytes
 images/presets/crane.png                           |  Bin 252 -> 0 bytes
 images/presets/diy_store.png                       |  Bin 1996 -> 0 bytes
 images/presets/drag_lift.png                       |  Bin 273 -> 0 bytes
 images/presets/education/college.png               |  Bin 0 -> 476 bytes
 images/presets/education/driving_school.png        |  Bin 0 -> 412 bytes
 images/presets/education/kindergarten.svg          |  100 +
 images/presets/{ => education}/school.png          |  Bin
 images/presets/education/university.png            |  Bin 0 -> 305 bytes
 images/presets/{ => emergency}/aed.svg             |    0
 images/presets/emergency/ambulance_station.svg     |   76 +
 images/presets/emergency/assembly_point.svg        |   32 +
 images/presets/emergency/fire_extinguisher.svg     |   11 +
 images/presets/emergency/fire_hose.svg             |   87 +
 images/presets/emergency/siren.svg                 |   67 +
 images/presets/emergency/water_tank.svg            |    9 +
 images/presets/empty.png                           |  Bin 86 -> 0 bytes
 images/presets/fence.png                           |  Bin 458 -> 0 bytes
 images/presets/fire_hydrant.png                    |  Bin 379 -> 0 bytes
 images/presets/firebrigade.png                     |  Bin 630 -> 0 bytes
 images/presets/food/bar.svg                        |  101 +
 images/presets/{ => food}/biergarten.png           |  Bin
 images/presets/{ => food}/cafe.png                 |  Bin
 images/presets/food/drinking_water.png             |  Bin 0 -> 523 bytes
 images/presets/{ => food}/fastfood.png             |  Bin
 images/presets/food/food_court.png                 |  Bin 0 -> 386 bytes
 images/presets/food/icecream.png                   |  Bin 0 -> 664 bytes
 images/presets/{ => food}/pub.png                  |  Bin
 images/presets/food/restaurant.svg                 |   57 +
 images/presets/football.png                        |  Bin 1098 -> 0 bytes
 images/presets/fuel.png                            |  Bin 248 -> 0 bytes
 images/presets/gasometer.png                       |  Bin 435 -> 0 bytes
 images/presets/glacier.png                         |  Bin 118 -> 0 bytes
 images/presets/goods.png                           |  Bin 241 -> 0 bytes
 images/presets/graveyard.png                       |  Bin 113 -> 0 bytes
 images/presets/guidepost.png                       |  Bin 139 -> 0 bytes
 images/presets/hangar.png                          |  Bin 335 -> 0 bytes
 images/presets/health/baby_hatch.svg               |  239 ++
 images/presets/health/clinic.svg                   |  235 ++
 images/presets/health/dentist.svg                  |  235 ++
 images/presets/health/doctors.svg                  |  243 ++
 images/presets/health/hospital.svg                 |  218 ++
 images/presets/health/pharmacy.svg                 |  218 ++
 images/presets/health/veterinary.svg               |  224 ++
 images/presets/hedge.png                           |  Bin 252 -> 0 bytes
 images/presets/hunting_stand.png                   |  Bin 121 -> 0 bytes
 images/presets/ice_hockey.png                      |  Bin 203 -> 0 bytes
 images/presets/informationoffice.png               |  Bin 1322 -> 0 bytes
 images/presets/island.png                          |  Bin 926 -> 0 bytes
 images/presets/islet.png                           |  Bin 407 -> 0 bytes
 images/presets/karting.png                         |  Bin 375 -> 0 bytes
 images/presets/kindergarten.png                    |  Bin 177 -> 0 bytes
 images/presets/kiosk.png                           |  Bin 1327 -> 0 bytes
 images/presets/landmark/adit.svg                   |  171 ++
 images/presets/landmark/beacon.png                 |  Bin 0 -> 149 bytes
 images/presets/landmark/building.svg               |   95 +
 images/presets/landmark/bunker.svg                 |  111 +
 images/presets/landmark/bunker_silo.svg            |  201 ++
 images/presets/{ => landmark}/cave_entrance.png    |  Bin
 images/presets/{ => landmark}/chimney.png          |  Bin
 images/presets/landmark/crane.svg                  |   92 +
 images/presets/landmark/cutline.svg                |   46 +
 images/presets/landmark/forest.svg                 |  700 +++++
 images/presets/landmark/gasometer.svg              |  107 +
 images/presets/landmark/glacier.svg                |   95 +
 images/presets/landmark/hunting_stand.png          |  Bin 0 -> 130 bytes
 images/presets/landmark/lighthouse.svg             |  126 +
 images/presets/landmark/mine.svg                   |   76 +
 images/presets/landmark/mountain_pass.svg          |  236 ++
 images/presets/{ => landmark}/peak.svg             |    0
 images/presets/landmark/plant.svg                  |  147 ++
 images/presets/landmark/reef.svg                   |   83 +
 images/presets/landmark/reservoir_covered.svg      |  109 +
 images/presets/{ => landmark}/ridge.svg            |    0
 images/presets/{ => landmark}/saddle.svg           |    0
 images/presets/landmark/silo.svg                   |  107 +
 images/presets/landmark/spring.svg                 |  103 +
 images/presets/landmark/storage_tank.svg           |  107 +
 images/presets/landmark/survey_point.svg           |  141 ++
 images/presets/landmark/tower.png                  |  Bin 0 -> 183 bytes
 images/presets/landmark/tree_row.svg               |  378 +++
 images/presets/landmark/trees.svg                  |  177 ++
 images/presets/landmark/trees_broad_leaved.svg     |  148 ++
 images/presets/landmark/trees_conifer.svg          |  149 ++
 images/presets/landmark/trees_palm.png             |  Bin 0 -> 487 bytes
 images/presets/{ => landmark}/valley.svg           |    0
 images/presets/landmark/volcano.svg                |   95 +
 images/presets/landmark/wastewater_plant.svg       |  178 ++
 images/presets/landmark/water_tower.svg            |   14 +
 images/presets/landmark/water_well.svg             |  139 +
 images/presets/{ => landmark}/water_works.png      |  Bin
 images/presets/landmark/watermill.svg              |  114 +
 images/presets/landmark/windmill.svg               |  116 +
 images/presets/landmark/works.svg                  |   84 +
 images/presets/landuse/allotments.svg              |  426 ++++
 images/presets/landuse/cemetery.svg                |  132 +
 images/presets/landuse/commercial.svg              |   86 +
 images/presets/landuse/construction.svg            |   84 +
 images/presets/landuse/farmland.png                |  Bin 0 -> 494 bytes
 images/presets/landuse/farmyard.png                |  Bin 0 -> 462 bytes
 images/presets/{ => landuse}/garages.png           |  Bin
 images/presets/landuse/graveyard.svg               |   96 +
 .../{ => landuse}/greenhouse_horticulture.png      |  Bin
 images/presets/landuse/landfill.svg                |  185 ++
 images/presets/{ => landuse}/landuse.png           |  Bin
 images/presets/{ => landuse}/landuse_water.png     |  Bin
 images/presets/landuse/meadow.svg                  |  447 ++++
 images/presets/landuse/military.svg                |  141 ++
 images/presets/landuse/mud.svg                     |  196 ++
 images/presets/landuse/orchard.svg                 |  258 ++
 images/presets/{ => landuse}/rail_light.png        |  Bin
 images/presets/landuse/sand.svg                    |  446 ++++
 images/presets/{ => landuse}/scrub.svg             |    0
 .../presets/{fruits.png => landuse/vineyard.png}   |  Bin
 images/presets/landuse/wetland.svg                 |  196 ++
 images/presets/laundry.png                         |  Bin 639 -> 0 bytes
 images/presets/leisure/advertising_column.svg      |  146 ++
 images/presets/{ => leisure}/bbq.png               |  Bin
 images/presets/leisure/bench.png                   |  Bin 0 -> 116 bytes
 images/presets/leisure/billboard.svg               |  331 +++
 images/presets/leisure/bird_hide.svg               |  111 +
 images/presets/leisure/casino.svg                  |   59 +
 images/presets/leisure/cinema.svg                  |  227 ++
 images/presets/leisure/common.png                  |  Bin 0 -> 206 bytes
 images/presets/leisure/discoball.svg               |  220 ++
 images/presets/leisure/dog.png                     |  Bin 0 -> 473 bytes
 images/presets/{ => leisure}/dogpark.png           |  Bin
 images/presets/{ => leisure}/equestrian.png        |  Bin
 images/presets/leisure/firepit.svg                 |  875 +++++++
 images/presets/leisure/fitness_station.svg         |   70 +
 images/presets/leisure/garden.png                  |  Bin 0 -> 117 bytes
 images/presets/leisure/nature_reserve.png          |  Bin 0 -> 137 bytes
 images/presets/leisure/nightclub.png               |  Bin 0 -> 594 bytes
 images/presets/leisure/park.png                    |  Bin 0 -> 103 bytes
 images/presets/leisure/picnic.png                  |  Bin 0 -> 337 bytes
 images/presets/leisure/playground.svg              |   70 +
 images/presets/leisure/sauna.png                   |  Bin 0 -> 787 bytes
 images/presets/leisure/stripclub.png               |  Bin 0 -> 634 bytes
 images/presets/{ => leisure}/theater.png           |  Bin
 images/presets/leisure/theme_park.svg              |  335 +++
 images/presets/leisure/water_park.png              |  Bin 0 -> 150 bytes
 images/presets/leisure/zoo.svg                     |  105 +
 images/presets/lift_gate.png                       |  Bin 382 -> 0 bytes
 images/presets/locality.png                        |  Bin 462 -> 0 bytes
 images/presets/lock_gate.png                       |  Bin 313 -> 0 bytes
 images/presets/map.png                             |  Bin 2375 -> 0 bytes
 images/presets/memorial.png                        |  Bin 402 -> 0 bytes
 images/presets/military.png                        |  Bin 145 -> 0 bytes
 images/presets/mine.png                            |  Bin 516 -> 0 bytes
 images/presets/mineshaft.png                       |  Bin 394 -> 0 bytes
 images/presets/{ => misc}/addresses.png            |  Bin
 images/presets/{ => misc}/boundaries.png           |  Bin
 images/presets/misc/boundary_stone.png             |  Bin 0 -> 160 bytes
 images/presets/misc/cliff-pattern.png              |  Bin 0 -> 124 bytes
 images/presets/misc/cliff.svg                      |  106 +
 images/presets/misc/construction.svg               |   66 +
 images/presets/{ => misc}/contact.png              |  Bin
 images/presets/misc/danger.svg                     |   65 +
 images/presets/misc/deprecated.svg                 |  113 +
 images/presets/misc/description.svg                |  102 +
 .../presets/misc/embankment-pattern-centered.png   |  Bin 0 -> 151 bytes
 images/presets/misc/embankment-pattern.png         |  Bin 0 -> 111 bytes
 images/presets/misc/embankment.svg                 |  245 ++
 images/presets/misc/entrance-emergency.png         |  Bin 0 -> 387 bytes
 images/presets/misc/entrance-exit.png              |  Bin 0 -> 304 bytes
 images/presets/misc/entrance-main.png              |  Bin 0 -> 372 bytes
 images/presets/misc/entrance-service.png           |  Bin 0 -> 374 bytes
 images/presets/misc/entrance-yes.png               |  Bin 0 -> 244 bytes
 images/presets/misc/fixme-annotation.png           |  Bin 0 -> 292 bytes
 images/presets/{ => misc}/flag.png                 |  Bin
 images/presets/misc/fountain.png                   |  Bin 0 -> 119 bytes
 images/presets/misc/grit_bin.svg                   |  248 ++
 images/presets/misc/housenumber.png                |  Bin 0 -> 310 bytes
 images/presets/misc/information/board.svg          |  120 +
 images/presets/misc/information/guidepost.svg      |   91 +
 images/presets/misc/information/information.svg    |  115 +
 .../presets/misc/information/informationoffice.svg |   69 +
 images/presets/misc/information/map.svg            |  123 +
 images/presets/{ => misc}/interpolation.png        |  Bin
 images/presets/{ => misc}/message.png              |  Bin
 images/presets/{ => misc}/monitoring_station.png   |  Bin
 images/presets/{ => misc}/multipolygon.png         |  Bin
 images/presets/misc/no_icon.svg                    |   91 +
 images/presets/misc/note-annotation.png            |  Bin 0 -> 541 bytes
 images/presets/misc/note-fixme-annotation.png      |  Bin 0 -> 746 bytes
 images/presets/{ => misc}/path.png                 |  Bin
 images/presets/misc/pipeline_marker.svg            |  176 ++
 images/presets/{ => misc}/relations.png            |  Bin
 images/presets/misc/rock.svg                       |   69 +
 images/presets/misc/stone.svg                      |   64 +
 images/presets/misc/streetlamp.png                 |  Bin 0 -> 410 bytes
 images/presets/misc/valve.svg                      |   57 +
 images/presets/misc/wlan.svg                       |  115 +
 images/presets/money/atm.svg                       |  174 ++
 images/presets/money/bank.svg                      |   80 +
 images/presets/money/dollar.svg                    |    6 +
 images/presets/money/exchange.svg                  |  262 ++
 images/presets/monument.png                        |  Bin 289 -> 0 bytes
 images/presets/motorbike.png                       |  Bin 181 -> 0 bytes
 images/presets/nautical/bay.svg                    |  100 +
 images/presets/nautical/beach.svg                  |  100 +
 images/presets/nautical/boatyard.png               |  Bin 0 -> 473 bytes
 images/presets/nautical/breakwater.svg             |  111 +
 images/presets/nautical/coast_line.svg             |  105 +
 images/presets/nautical/dam.svg                    |  117 +
 images/presets/nautical/ferry.svg                  |  118 +
 images/presets/nautical/groyne.svg                 |  194 ++
 images/presets/nautical/lock_gate.svg              |  139 +
 images/presets/nautical/marina.png                 |  Bin 0 -> 181 bytes
 images/presets/nautical/marine_fuel.png            |  Bin 0 -> 1252 bytes
 images/presets/nautical/pier.svg                   |  139 +
 images/presets/nautical/slipway.png                |  Bin 0 -> 304 bytes
 images/presets/nautical/turning.svg                |   85 +
 images/presets/nautical/water.svg                  |   94 +
 images/presets/nautical/waterfall.svg              |   99 +
 images/presets/nautical/waterway_canal.svg         |   99 +
 images/presets/nautical/waterway_ditch.svg         |   99 +
 images/presets/nautical/waterway_drain.svg         |   98 +
 images/presets/nautical/waterway_river.svg         |   82 +
 images/presets/nautical/waterway_riverbank.svg     |   93 +
 images/presets/nautical/waterway_stream.svg        |   80 +
 images/presets/nautical/weir.svg                   |   78 +
 images/presets/office/accountant.svg               |  113 +
 images/presets/office/administrative.svg           |  103 +
 images/presets/office/advertising_agency.svg       |  148 ++
 images/presets/office/architect.svg                |  138 +
 images/presets/office/association.svg              |  152 ++
 images/presets/office/educational_institution.svg  |  158 ++
 images/presets/office/employment_agency.svg        |  131 +
 images/presets/office/foundation.svg               |  150 ++
 images/presets/office/government.svg               |  103 +
 images/presets/office/insurance.svg                |  119 +
 images/presets/office/it.svg                       |  158 ++
 images/presets/office/lawyer.svg                   |  108 +
 images/presets/office/newspaper.svg                |  198 ++
 images/presets/office/notary.svg                   |  171 ++
 images/presets/office/ong.svg                      |  192 ++
 images/presets/office/political_party.svg          |  128 +
 images/presets/office/private_company.svg          |  193 ++
 images/presets/office/real_state.svg               |  125 +
 images/presets/office/religion.svg                 |  102 +
 images/presets/office/research.svg                 |  123 +
 images/presets/office/tax_advisor.svg              |  126 +
 images/presets/office/telecommunication.svg        |  132 +
 images/presets/parking.png                         |  Bin 329 -> 0 bytes
 images/presets/pelota.png                          |  Bin 263 -> 0 bytes
 images/presets/place/island.svg                    |  118 +
 images/presets/place/islet.svg                     |  104 +
 images/presets/place/locality.svg                  |  116 +
 images/presets/place/settlement/capital.png        |  Bin 0 -> 155 bytes
 images/presets/place/settlement/city.png           |  Bin 0 -> 273 bytes
 images/presets/place/settlement/farm.png           |  Bin 0 -> 275 bytes
 images/presets/place/settlement/hamlet.png         |  Bin 0 -> 258 bytes
 .../presets/place/settlement/isolated_dwelling.png |  Bin 0 -> 153 bytes
 images/presets/place/settlement/neighbourhood.png  |  Bin 0 -> 265 bytes
 images/presets/place/settlement/suburb.png         |  Bin 0 -> 265 bytes
 images/presets/place/settlement/town.png           |  Bin 0 -> 235 bytes
 images/presets/place/settlement/village.png        |  Bin 0 -> 260 bytes
 images/presets/plane.png                           |  Bin 327 -> 0 bytes
 images/presets/power/bay.svg                       |  269 ++
 images/presets/power/busbar.svg                    |  251 ++
 images/presets/power/cable.svg                     |  235 ++
 .../presets/power/cable_distribution_cabinet.svg   |  235 ++
 images/presets/power/compensator.svg               |  240 ++
 images/presets/power/converter.svg                 |  266 ++
 images/presets/power/generator.svg                 |  245 ++
 images/presets/power/insulator.svg                 |  247 ++
 images/presets/power/line.svg                      |  249 ++
 images/presets/power/plant.svg                     |  232 ++
 images/presets/power/pole.svg                      |  226 ++
 images/presets/power/pole_transformer.svg          |  233 ++
 images/presets/power/portal.svg                    |  294 +++
 images/presets/power/power.svg                     |  223 ++
 .../presets/{ => power}/power_source-biofuel.svg   |    0
 images/presets/{ => power}/power_source-coal.svg   |    0
 images/presets/{ => power}/power_source-gas.svg    |    0
 .../{ => power}/power_source-geothermal.svg        |    0
 .../presets/{ => power}/power_source-nuclear.svg   |    0
 images/presets/{ => power}/power_source-oil.svg    |    0
 images/presets/{ => power}/power_source-sun.svg    |    0
 images/presets/{ => power}/power_source-waste.svg  |    0
 images/presets/{ => power}/power_source-water.svg  |    0
 images/presets/{ => power}/power_source-wind.svg   |    0
 images/presets/power/substation.svg                |  318 +++
 images/presets/power/switch.svg                    |  232 ++
 images/presets/power/switchgear.svg                |  290 +++
 images/presets/power/tower.svg                     |  253 ++
 images/presets/power/transformer.svg               |  275 ++
 images/presets/power/transformer_tower.svg         |  234 ++
 images/presets/range.png                           |  Bin 392 -> 0 bytes
 images/presets/religion/bahai.svg                  |   77 +
 images/presets/religion/buddhism.svg               |  115 +
 images/presets/religion/church.svg                 |  129 +
 images/presets/religion/hinduism.svg               |   78 +
 images/presets/religion/jainism.svg                |  436 ++++
 images/presets/religion/jewish.svg                 |  160 ++
 images/presets/religion/muslim.svg                 |  119 +
 images/presets/religion/religion.svg               |  192 ++
 images/presets/religion/shinto.svg                 |  105 +
 images/presets/religion/sikhism.svg                |   79 +
 images/presets/religion/taoism.svg                 |   90 +
 images/presets/religion/wayside_cross.svg          |   99 +
 images/presets/religion/wayside_shrine.svg         |  162 ++
 images/presets/reservoir_covered.png               |  Bin 536 -> 0 bytes
 images/presets/restaurant.png                      |  Bin 196 -> 0 bytes
 images/presets/retaining_wall.png                  |  Bin 324 -> 0 bytes
 images/presets/rowing.png                          |  Bin 540 -> 0 bytes
 images/presets/ruins.png                           |  Bin 427 -> 0 bytes
 images/presets/sauna.png                           |  Bin 534 -> 0 bytes
 images/presets/service/arts_centre.png             |  Bin 0 -> 446 bytes
 images/presets/service/clock.svg                   |   14 +
 images/presets/{ => service}/community_centre.png  |  Bin
 images/presets/service/courthouse.svg              |   14 +
 images/presets/service/elevator.svg                |  243 ++
 images/presets/{ => service}/embassy.png           |  Bin
 images/presets/service/emergency_access_point.svg  |  226 ++
 images/presets/service/excrement_bags.png          |  Bin 0 -> 499 bytes
 images/presets/service/fire_hydrant.svg            |  164 ++
 images/presets/service/firebrigade.svg             |  137 +
 images/presets/{ => service}/network-wireless.svg  |    0
 images/presets/service/police.svg                  |  158 ++
 images/presets/service/post_box.png                |  Bin 0 -> 285 bytes
 images/presets/service/post_office.png             |  Bin 0 -> 428 bytes
 images/presets/service/prison.svg                  |   14 +
 images/presets/service/ranger_station.svg          |   75 +
 images/presets/service/recycling/recycling.svg     |   12 +
 .../presets/service/recycling/recycling_centre.svg |   12 +
 .../service/recycling/recycling_container.svg      |   12 +
 .../service/recycling/sanitary_dump_station.svg    |   87 +
 images/presets/service/recycling/trash-bin.svg     |   87 +
 .../presets/service/recycling/waste_disposal.png   |  Bin 0 -> 215 bytes
 images/presets/service/shower.svg                  |   87 +
 images/presets/service/studio.png                  |  Bin 0 -> 406 bytes
 images/presets/{ => service}/surveillance.png      |  Bin
 images/presets/service/telephone.svg               |  136 +
 images/presets/service/toilets.svg                 |  108 +
 images/presets/{ => service}/townhall.png          |  Bin
 images/presets/shop/alcohol.svg                    |  286 +++
 images/presets/shop/antique.svg                    |  391 +++
 images/presets/shop/art.svg                        |  168 ++
 images/presets/shop/bag.svg                        |  202 ++
 images/presets/shop/beauty.svg                     |  103 +
 images/presets/shop/bed.svg                        |   75 +
 images/presets/shop/beverages.svg                  |  373 +++
 images/presets/shop/bicycle.svg                    |   93 +
 images/presets/shop/body.svg                       |   53 +
 images/presets/shop/book.svg                       |   67 +
 images/presets/{ => shop}/boutique.png             |  Bin
 images/presets/shop/chemist.svg                    |   90 +
 images/presets/shop/clothes.svg                    |   73 +
 images/presets/shop/computer.svg                   | 2118 ++++++++++++++++
 images/presets/{ => shop}/convenience.png          |  Bin
 images/presets/{ => shop}/copyshop.png             |  Bin
 images/presets/shop/cosmetics.svg                  |  133 +
 images/presets/{ => shop}/curtain.png              |  Bin
 images/presets/shop/diy_store.svg                  |  388 +++
 images/presets/shop/electronics.svg                |  512 ++++
 images/presets/{ => shop}/erotic.png               |  Bin
 images/presets/{ => shop}/fabric.png               |  Bin
 images/presets/shop/florist.svg                    |  129 +
 images/presets/{ => shop}/frame.png                |  Bin
 images/presets/shop/funeral_directors.svg          |   90 +
 images/presets/shop/furniture.svg                  |  376 +++
 images/presets/shop/garden_centre.svg              |  232 ++
 images/presets/{ => shop/groceries}/apple.png      |  Bin
 images/presets/shop/groceries/bakery.png           |  Bin 0 -> 178 bytes
 images/presets/shop/groceries/butcher.png          |  Bin 0 -> 84 bytes
 images/presets/shop/groceries/coffee.svg           |  109 +
 images/presets/shop/groceries/confectionery.svg    |   64 +
 images/presets/{ => shop/groceries}/deli.png       |  Bin
 .../presets/{ => shop/groceries}/greengrocer.png   |  Bin
 images/presets/{ => shop/groceries}/seafood.png    |  Bin
 images/presets/shop/groceries/tea.svg              |  470 ++++
 images/presets/shop/hairdresser.svg                |  213 ++
 images/presets/{ => shop}/hardware.png             |  Bin
 images/presets/{ => shop}/hearing_aids.png         |  Bin
 images/presets/shop/hifi.svg                       |  121 +
 images/presets/shop/houseware.svg                  |  105 +
 images/presets/shop/interior_decoration.svg        |  243 ++
 images/presets/shop/jewelry.svg                    |  375 +++
 images/presets/shop/kiosk.svg                      |  456 ++++
 images/presets/{ => shop}/kitchen.png              |  Bin
 images/presets/shop/laundry.svg                    |  164 ++
 images/presets/shop/library.png                    |  Bin 0 -> 147 bytes
 images/presets/{ => shop}/lottery.svg              |    0
 images/presets/shop/mall.svg                       |  134 +
 images/presets/shop/marketplace.png                |  Bin 0 -> 600 bytes
 images/presets/shop/medical_supply.svg             |  177 ++
 images/presets/{ => shop}/mobile_phone.png         |  Bin
 images/presets/shop/music.svg                      |  514 ++++
 images/presets/{ => shop}/musical_instrument.png   |  Bin
 images/presets/shop/news.svg                       |   14 +
 images/presets/shop/optician.svg                   |   14 +
 images/presets/shop/outdoor.svg                    |  598 +++++
 images/presets/{ => shop}/paint.png                |  Bin
 images/presets/{ => shop}/pawnbroker.svg           |    0
 images/presets/shop/perfumery.svg                  |  174 ++
 images/presets/shop/pet.svg                        |  857 +++++++
 images/presets/shop/photo.svg                      |  193 ++
 images/presets/{ => shop}/present.svg              |    0
 images/presets/shop/shoes.svg                      |  126 +
 images/presets/{ => shop}/stationery.png           |  Bin
 images/presets/shop/supermarket.svg                |   14 +
 images/presets/shop/tailor.svg                     |  276 ++
 images/presets/shop/tattoo.svg                     |   95 +
 images/presets/shop/ticket.svg                     |  105 +
 images/presets/shop/tobacco.svg                    |   44 +
 images/presets/shop/toys.svg                       |  704 ++++++
 images/presets/{ => shop}/travel.png               |  Bin
 images/presets/{ => shop}/vacuum_cleaner.png       |  Bin
 images/presets/{ => shop}/variety_store.png        |  Bin
 images/presets/shop/vehicle.svg                    |   97 +
 images/presets/shop/video.png                      |  Bin 0 -> 170 bytes
 images/presets/shop/video_games.png                |  Bin 0 -> 226 bytes
 images/presets/shop/wine.svg                       |  115 +
 images/presets/sightseeing.png                     |  Bin 335 -> 0 bytes
 images/presets/sightseeing/archaeological.svg      |  148 ++
 images/presets/sightseeing/attraction.svg          |   91 +
 images/presets/sightseeing/battlefield.svg         |   56 +
 images/presets/sightseeing/castle.svg              |   82 +
 images/presets/sightseeing/memorial.svg            |  139 +
 images/presets/sightseeing/monument.svg            |  123 +
 images/presets/sightseeing/museum.svg              |   14 +
 .../{ => sightseeing}/palaeontological_site.png    |  Bin
 images/presets/sightseeing/peak_viewpoint.svg      |   97 +
 images/presets/sightseeing/ruins.svg               |  116 +
 images/presets/sightseeing/viewpoint.svg           |  103 +
 images/presets/silo.png                            |  Bin 592 -> 0 bytes
 images/presets/skating.png                         |  Bin 373 -> 0 bytes
 images/presets/social_facility/assisted_living.svg |  250 ++
 images/presets/social_facility/food_bank.svg       |  230 ++
 images/presets/social_facility/group_home.svg      |  244 ++
 images/presets/social_facility/nursing_home.svg    |  250 ++
 images/presets/social_facility/outreach.svg        |  247 ++
 images/presets/social_facility/shelter.svg         |  231 ++
 images/presets/sport/10pin.svg                     |  132 +
 images/presets/sport/archery.svg                   |  142 ++
 images/presets/sport/athletics.png                 |  Bin 0 -> 546 bytes
 images/presets/sport/baseball.svg                  |  216 ++
 images/presets/sport/basketball.svg                |  182 ++
 images/presets/sport/beachvolleyball.png           |  Bin 0 -> 653 bytes
 images/presets/sport/billiards.svg                 |  205 ++
 images/presets/sport/boule.svg                     |  127 +
 images/presets/sport/canoe.svg                     |   76 +
 images/presets/sport/centre.png                    |  Bin 0 -> 241 bytes
 images/presets/sport/chess.png                     |  Bin 0 -> 74 bytes
 images/presets/sport/climbing.svg                  |  115 +
 images/presets/sport/cricket.svg                   |  175 ++
 images/presets/sport/croquet.svg                   |  103 +
 images/presets/sport/cycling.svg                   |  367 +++
 images/presets/{ => sport}/field_hockey.png        |  Bin
 images/presets/sport/fishing.png                   |  Bin 0 -> 145 bytes
 .../{gymnastics.png => sport/fitness_centre.png}   |  Bin
 images/presets/sport/football.svg                  |  752 ++++++
 images/presets/sport/golf.svg                      |   70 +
 images/presets/sport/golf/bunker.svg               |  106 +
 images/presets/sport/golf/driving_range.svg        |  156 ++
 images/presets/sport/golf/fairway.svg              |  122 +
 images/presets/sport/golf/golf.svg                 |  164 ++
 images/presets/sport/golf/green.svg                |  116 +
 images/presets/sport/golf/hole.svg                 |  136 +
 images/presets/sport/golf/lateral_water_hazard.svg |  106 +
 images/presets/sport/golf/pin.svg                  |  126 +
 images/presets/sport/golf/rough.svg                |  220 ++
 images/presets/sport/golf/tee.svg                  |  189 ++
 images/presets/sport/golf/water_hazard.svg         |  106 +
 images/presets/sport/gymnastics.svg                |   91 +
 images/presets/sport/handball.svg                  |  108 +
 images/presets/sport/ice_hockey.png                |  Bin 0 -> 413 bytes
 images/presets/sport/karting.png                   |  Bin 0 -> 755 bytes
 images/presets/sport/miniature_golf.svg            |   83 +
 images/presets/sport/motocross.svg                 |  113 +
 images/presets/sport/motor.png                     |  Bin 0 -> 699 bytes
 images/presets/sport/multi.svg                     |  227 ++
 images/presets/sport/pelota.png                    |  Bin 0 -> 593 bytes
 images/presets/sport/pitch.png                     |  Bin 0 -> 577 bytes
 images/presets/sport/raceway.svg                   |   81 +
 images/presets/sport/racquetball.svg               |  415 +++
 images/presets/sport/range.svg                     |   99 +
 images/presets/sport/rc_car.svg                    |  107 +
 images/presets/sport/riding.svg                    |  105 +
 images/presets/sport/roller_skating.svg            |  118 +
 images/presets/sport/rowing.svg                    |  109 +
 images/presets/sport/running.svg                   |  206 ++
 images/presets/sport/scuba_diving.svg              |   73 +
 images/presets/sport/skateboard.svg                |  129 +
 images/presets/sport/skating.png                   |  Bin 0 -> 845 bytes
 images/presets/sport/skiing.svg                    |  367 +++
 images/presets/sport/soccer.svg                    |   58 +
 images/presets/sport/stadium.png                   |  Bin 0 -> 580 bytes
 images/presets/sport/swimming.svg                  |  379 +++
 images/presets/sport/table_tennis.svg              |  128 +
 images/presets/sport/tennis.svg                    |  361 +++
 images/presets/sport/track.png                     |  Bin 0 -> 130 bytes
 images/presets/sport/volleyball.svg                |  264 ++
 images/presets/stadium.png                         |  Bin 291 -> 0 bytes
 images/presets/station.png                         |  Bin 403 -> 0 bytes
 images/presets/station16.png                       |  Bin 415 -> 0 bytes
 images/presets/storage_tank.png                    |  Bin 705 -> 0 bytes
 images/presets/studio.png                          |  Bin 573 -> 0 bytes
 images/presets/swing_gate.png                      |  Bin 323 -> 0 bytes
 images/presets/table_tennis.png                    |  Bin 802 -> 0 bytes
 images/presets/taxi.png                            |  Bin 509 -> 0 bytes
 images/presets/telephone.png                       |  Bin 160 -> 0 bytes
 images/presets/theme_park.png                      |  Bin 1451 -> 0 bytes
 images/presets/toilet.png                          |  Bin 455 -> 0 bytes
 images/presets/tram.png                            |  Bin 137 -> 0 bytes
 images/presets/transport/aerialway/cable_car.svg   |  120 +
 images/presets/transport/aerialway/chair_lift.svg  |  106 +
 images/presets/transport/aerialway/drag_lift.svg   |   97 +
 images/presets/transport/aerialway/gondola.svg     |  104 +
 images/presets/transport/aerialway/goods.svg       |   96 +
 .../presets/transport/aerialway/magic_carpet.png   |  Bin 0 -> 256 bytes
 images/presets/transport/aerialway/mixed_lift.svg  |  131 +
 images/presets/transport/aerialway/pylon.svg       |  128 +
 images/presets/transport/aerialway/station.svg     |  116 +
 images/presets/transport/airport.svg               |  133 +
 images/presets/transport/airport/airfield.svg      |  112 +
 images/presets/transport/airport/apron.svg         |  175 ++
 images/presets/transport/airport/gate.svg          |   83 +
 images/presets/transport/airport/hangar.svg        |   76 +
 images/presets/transport/airport/helipad.svg       |  248 ++
 .../presets/transport/airport/parking_position.png |  Bin 0 -> 180 bytes
 images/presets/{ => transport/airport}/runway.png  |  Bin
 images/presets/{ => transport/airport}/taxiway.png |  Bin
 images/presets/transport/airport/terminal.svg      |  190 ++
 images/presets/transport/airport/windsock.svg      |   92 +
 images/presets/transport/bridge/bridge.svg         |   98 +
 images/presets/transport/bridge/bridge_movable.svg |  109 +
 images/presets/transport/bridge/bridge_outline.svg |   97 +
 images/presets/transport/bridge/bridge_support.svg |  102 +
 images/presets/transport/bus.svg                   |  137 +
 images/presets/transport/bus_old.svg               |  181 ++
 images/presets/transport/bus_small.png             |  Bin 0 -> 329 bytes
 images/presets/transport/passage/arcade.svg        |   81 +
 images/presets/transport/passage/colonnade.svg     |   80 +
 images/presets/transport/passage/tunnel.svg        |   90 +
 .../passage/tunnel_avalanche_protector.svg         |   93 +
 .../transport/passage/tunnel_building_passage.svg  |   92 +
 .../presets/transport/passage/tunnel_culvert.svg   |   99 +
 images/presets/transport/platform.svg              |  101 +
 images/presets/{ => transport}/platform_bus.png    |  Bin
 images/presets/{ => transport}/platform_rail.png   |  Bin
 .../presets/transport/railway/abandoned_rail.svg   |  133 +
 images/presets/transport/railway/buffer_stop.svg   |  113 +
 images/presets/transport/railway/bus_guideway.svg  |  159 ++
 images/presets/transport/railway/crossing.svg      |   84 +
 images/presets/transport/railway/disused_rail.svg  |  124 +
 images/presets/transport/railway/funicular.svg     |  129 +
 .../presets/transport/railway/level_crossing.svg   |   98 +
 images/presets/transport/railway/light_rail.svg    |  144 ++
 images/presets/transport/railway/milestone.svg     |  144 ++
 images/presets/transport/railway/monorail.svg      |  147 ++
 .../transport/railway/narrow_gauge_rail.svg        |  123 +
 images/presets/transport/railway/preserved.svg     |  224 ++
 images/presets/transport/railway/rail.svg          |  123 +
 images/presets/transport/railway/signal.svg        |  143 ++
 images/presets/transport/railway/subway.svg        |  140 +
 images/presets/transport/railway/switch.svg        |  133 +
 images/presets/transport/railway/tram.svg          |  186 ++
 images/presets/transport/railway/turntable.svg     |  129 +
 images/presets/transport/railway_small.png         |  Bin 0 -> 121 bytes
 images/presets/transport/railway_station.svg       |  172 ++
 images/presets/transport/share_taxi.svg            |  162 ++
 images/presets/transport/station.png               |  Bin 0 -> 882 bytes
 images/presets/transport/station.svg               |  161 ++
 images/presets/transport/station16.png             |  Bin 0 -> 412 bytes
 images/presets/transport/taxi.svg                  |  205 ++
 images/presets/transport/ticket-machine.svg        |  116 +
 images/presets/transport/train.svg                 |  167 ++
 images/presets/transport/tram.svg                  |  170 ++
 images/presets/transport/trolleybus.svg            |  169 ++
 images/presets/transport/underground.png           |  Bin 0 -> 566 bytes
 .../transport/way/combined_foot_cycleway.svg       |  159 ++
 images/presets/transport/way/cycle_lane_track.svg  |  156 ++
 .../presets/transport/way/dedicated_bridleway.svg  |   98 +
 .../presets/transport/way/dedicated_cycleway.svg   |  140 +
 images/presets/transport/way/dedicated_footway.svg |  118 +
 images/presets/transport/way/path.svg              |   82 +
 .../transport/way/segregated_foot_cycleway.svg     |  168 ++
 images/presets/transport/way/steps.svg             |  120 +
 images/presets/transport/way/track.svg             |  117 +
 images/presets/transport/way/way_bicycle_road.svg  |  145 ++
 images/presets/transport/way/way_construction.svg  |  154 ++
 images/presets/transport/way/way_escape.svg        |  257 ++
 images/presets/transport/way/way_living_street.svg |  156 ++
 images/presets/transport/way/way_motorway.svg      |  152 ++
 images/presets/transport/way/way_motorway_link.svg |  165 ++
 images/presets/transport/way/way_pedestrian.svg    |  148 ++
 images/presets/transport/way/way_primary.svg       |  114 +
 images/presets/transport/way/way_primary_link.svg  |  131 +
 images/presets/transport/way/way_residential.svg   |  141 ++
 images/presets/transport/way/way_road.svg          |  153 ++
 images/presets/transport/way/way_secondary.svg     |  114 +
 .../presets/transport/way/way_secondary_link.svg   |  135 +
 images/presets/transport/way/way_service.svg       |  100 +
 .../transport/way/way_service_parking_aisle.svg    |  100 +
 images/presets/transport/way/way_tertiary.svg      |  114 +
 images/presets/transport/way/way_tertiary_link.svg |  130 +
 images/presets/transport/way/way_trunk.svg         |  111 +
 images/presets/transport/way/way_trunk_link.svg    |  194 ++
 images/presets/transport/way/way_unclassified.svg  |  114 +
 images/presets/tunnel.png                          |  Bin 125 -> 0 bytes
 images/presets/turning.png                         |  Bin 229 -> 0 bytes
 images/presets/tyres.png                           |  Bin 322 -> 0 bytes
 images/presets/underground.png                     |  Bin 611 -> 0 bytes
 images/presets/vehicle/bicycle_rental.svg          |  219 ++
 images/presets/vehicle/bicycle_repair_station.svg  |  150 ++
 images/presets/vehicle/bump.svg                    |  122 +
 images/presets/vehicle/car_parts.svg               |  152 ++
 images/presets/vehicle/car_rental.svg              |  207 ++
 images/presets/vehicle/car_sharing.svg             |  192 ++
 images/presets/vehicle/car_wash.svg                |  167 ++
 images/presets/vehicle/charging_station.png        |  Bin 0 -> 322 bytes
 images/presets/vehicle/chicane.svg                 |  124 +
 images/presets/vehicle/choker.svg                  |  124 +
 images/presets/vehicle/compressed_air.svg          |  119 +
 images/presets/vehicle/crossing.svg                |  137 +
 images/presets/vehicle/crossing_island.svg         |  115 +
 images/presets/vehicle/crossing_ref_zebra.svg      |  116 +
 .../presets/vehicle/crossing_traffic_signals.svg   |   99 +
 images/presets/vehicle/crossing_unmarked.svg       |  102 +
 images/presets/vehicle/cushion.svg                 |  128 +
 images/presets/vehicle/emergency_phone.svg         |   76 +
 images/presets/vehicle/ford.svg                    |  125 +
 images/presets/vehicle/fuel.svg                    |   91 +
 images/presets/vehicle/hump.svg                    |  122 +
 images/presets/vehicle/island.svg                  |  106 +
 images/presets/vehicle/junction.svg                |  144 ++
 images/presets/vehicle/milestone.svg               |  160 ++
 images/presets/vehicle/motorbike.svg               |  107 +
 images/presets/vehicle/motorway_junction.svg       |  246 ++
 images/presets/vehicle/parking/bicycle.svg         |  168 ++
 images/presets/vehicle/parking/handicapped.svg     |   85 +
 images/presets/vehicle/parking/motorbike.svg       |   98 +
 images/presets/vehicle/parking/multi-storey.svg    |   78 +
 images/presets/vehicle/parking/park_ride.svg       |   97 +
 images/presets/vehicle/parking/parking.svg         |   74 +
 images/presets/vehicle/parking/parking_space.svg   |  106 +
 images/presets/vehicle/parking/underground.svg     |   91 +
 images/presets/vehicle/passing_place.svg           |  233 ++
 images/presets/vehicle/repair_shop.svg             |   82 +
 images/presets/vehicle/rest_area.svg               |  247 ++
 .../vehicle/restriction/bicycle-designated.svg     |   94 +
 images/presets/vehicle/restriction/bicycle.svg     |   98 +
 images/presets/vehicle/restriction/city_limit.svg  |  247 ++
 images/presets/vehicle/restriction/dead_end.svg    |   72 +
 .../vehicle/restriction/foot-designated.svg        |  103 +
 images/presets/vehicle/restriction/foot.svg        |   92 +
 images/presets/vehicle/restriction/give_way.svg    |  220 ++
 images/presets/vehicle/restriction/goods.svg       |  105 +
 .../vehicle/restriction/horse-designated.svg       |  104 +
 images/presets/vehicle/restriction/horse.svg       |   99 +
 images/presets/vehicle/restriction/maxheight.svg   |  110 +
 images/presets/vehicle/restriction/maxlength.svg   |  130 +
 images/presets/vehicle/restriction/maxspeed.svg    |  159 ++
 .../presets/vehicle/restriction/maxspeed_none.svg  |   98 +
 images/presets/vehicle/restriction/maxweight.svg   |   98 +
 images/presets/vehicle/restriction/maxwidth.svg    |   98 +
 .../vehicle/restriction/mini_roundabout_left.svg   |  125 +
 .../vehicle/restriction/mini_roundabout_right.svg  |  124 +
 images/presets/vehicle/restriction/minspeed.svg    |   88 +
 images/presets/vehicle/restriction/motorbike.svg   |  103 +
 images/presets/vehicle/restriction/motorcar.svg    |   98 +
 images/presets/vehicle/restriction/psv.svg         |  133 +
 .../presets/vehicle/restriction/restrictions.svg   |   96 +
 .../vehicle/restriction/roundabout_left.svg        |  114 +
 .../vehicle/restriction/roundabout_right.svg       |  113 +
 .../presets/vehicle/restriction/speed_camera.svg   |  241 ++
 images/presets/vehicle/restriction/stop.svg        |  237 ++
 .../restriction/turn_restrictions/no_left_turn.svg |    8 +
 .../turn_restrictions/no_left_turn_red.png         |  Bin 0 -> 1298 bytes
 .../turn_restrictions/no_right_turn.svg            |   81 +
 .../turn_restrictions/no_right_turn_red.png        |  Bin 0 -> 1304 bytes
 .../turn_restrictions/no_straight_on.svg           |   85 +
 .../turn_restrictions/no_straight_on_red.png       |  Bin 0 -> 1291 bytes
 .../restriction/turn_restrictions/no_u_turn.svg    |   80 +
 .../turn_restrictions/only_left_turn.svg           |   78 +
 .../turn_restrictions/only_right_turn.svg          |   71 +
 .../turn_restrictions/only_straight_on.svg         |   81 +
 images/presets/vehicle/rumble_strip.svg            |  170 ++
 images/presets/vehicle/services.svg                |  274 ++
 images/presets/vehicle/table.svg                   |  149 ++
 images/presets/vehicle/traffic_calming.svg         |  146 ++
 images/presets/vehicle/traffic_mirror.svg          |  270 ++
 images/presets/vehicle/traffic_signals.svg         |  113 +
 .../presets/vehicle/traffic_signals_crossing.svg   |  194 ++
 .../vehicle/traffic_signals_crossing_island.svg    |  172 ++
 .../vehicle/traffic_signals_crossing_ref_zebra.svg |  173 ++
 .../traffic_signals_crossing_traffic_signals.svg   |  136 +
 images/presets/vehicle/turning_circle.svg          |  233 ++
 images/presets/vehicle/turning_loop.svg            |  236 ++
 images/presets/vehicle/tyres.svg                   |  133 +
 images/presets/vehicle/waypoints.svg               |  106 +
 images/presets/volcano.png                         |  Bin 127 -> 0 bytes
 images/presets/wall.png                            |  Bin 362 -> 0 bytes
 images/presets/wastewater_plant.png                |  Bin 847 -> 0 bytes
 images/presets/water_well.png                      |  Bin 387 -> 0 bytes
 images/presets/wayside_cross.png                   |  Bin 146 -> 0 bytes
 images/presets/wayside_shrine.png                  |  Bin 422 -> 0 bytes
 images/presets/works.png                           |  Bin 136 -> 0 bytes
 images/presets/zoo.png                             |  Bin 467 -> 0 bytes
 josm-latest.jnlp                                   |    2 +-
 josm.jnlp                                          |    2 +-
 linux/latest/DEBIAN/control                        |    2 +-
 linux/latest/usr/bin/josm-latest                   |   15 +-
 .../usr/share/applications/josm-latest.desktop     |    2 +-
 linux/latest/usr/share/man/man1/josm-latest.1      |    4 +-
 linux/tested/DEBIAN/control                        |    2 +-
 linux/tested/usr/bin/josm                          |   15 +-
 linux/tested/usr/share/applications/josm.desktop   |    2 +-
 linux/tested/usr/share/man/man1/josm.1             |    4 +-
 netbeans/nbproject/project.properties              |    8 +-
 scripts/TagInfoExtract.groovy                      |    8 +-
 .../jcs/auxiliary/disk/block/BlockDiskCache.java   |  152 +-
 .../debug/CheckThreadViolationRepaintManager.java  |   71 +-
 src/org/openstreetmap/josm/Main.java               |  106 +-
 .../openstreetmap/josm/actions/AboutAction.java    |    2 +
 .../josm/actions/AbstractPasteAction.java          |  103 +
 .../josm/actions/AddImageryLayerAction.java        |   20 +-
 .../josm/actions/AlignInCircleAction.java          |    2 +-
 .../josm/actions/AutoScaleAction.java              |   16 +-
 .../josm/actions/CloseChangesetAction.java         |   17 +-
 .../josm/actions/CombineWayAction.java             |   17 +-
 src/org/openstreetmap/josm/actions/CopyAction.java |   54 +-
 .../josm/actions/CopyCoordinatesAction.java        |    3 +-
 .../josm/actions/CreateMultipolygonAction.java     |   26 +-
 .../josm/actions/DownloadPrimitiveAction.java      |   12 +-
 .../josm/actions/DuplicateAction.java              |   15 +-
 .../josm/actions/ExpertToggleAction.java           |    1 +
 .../josm/actions/ExtensionFileFilter.java          |   44 +-
 .../josm/actions/ImageryAdjustAction.java          |   37 +-
 src/org/openstreetmap/josm/actions/InfoAction.java |    7 +-
 .../josm/actions/JoinAreasAction.java              |    2 +-
 .../josm/actions/JoinNodeWayAction.java            |    6 +-
 src/org/openstreetmap/josm/actions/JosmAction.java |    9 +-
 .../openstreetmap/josm/actions/JumpToAction.java   |    9 +-
 .../josm/actions/MapRectifierWMSmenuAction.java    |    4 +-
 .../josm/actions/MergeLayerAction.java             |   17 +-
 .../josm/actions/MergeNodesAction.java             |   10 +-
 .../josm/actions/MergeSelectionAction.java         |    8 +-
 .../openstreetmap/josm/actions/MoveNodeAction.java |    8 +-
 .../openstreetmap/josm/actions/OpenFileAction.java |   21 +-
 .../josm/actions/OpenLocationAction.java           |    2 +
 .../josm/actions/OrthogonalizeAction.java          |    8 +-
 .../josm/actions/OverpassDownloadAction.java       |   11 +-
 .../openstreetmap/josm/actions/PasteAction.java    |  188 +-
 .../josm/actions/PasteAtSourcePositionAction.java  |   35 +
 .../josm/actions/PasteTagsAction.java              |  287 +--
 .../openstreetmap/josm/actions/PurgeAction.java    |   15 +-
 .../josm/actions/ReverseWayAction.java             |   10 +-
 .../josm/actions/SearchNotesDownloadAction.java    |    4 +-
 .../josm/actions/SelectAllAction.java              |    3 +-
 .../josm/actions/SessionLoadAction.java            |   13 +-
 .../josm/actions/ShowStatusReportAction.java       |   41 +-
 .../openstreetmap/josm/actions/SplitWayAction.java |   63 +-
 .../openstreetmap/josm/actions/UnGlueAction.java   |   22 +-
 .../josm/actions/UpdateSelectionAction.java        |    7 +-
 .../josm/actions/UploadSelectionAction.java        |   15 +-
 .../openstreetmap/josm/actions/ValidateAction.java |   11 +-
 .../josm/actions/audio/package-info.java           |    6 +
 .../AbstractChangesetDownloadTask.java             |    6 +-
 .../actions/downloadtasks/DownloadGeoUrlTask.java  |   30 +
 .../downloadtasks/DownloadReferrersTask.java       |   15 +-
 .../actions/downloadtasks/DownloadTaskList.java    |   41 +-
 .../actions/downloadtasks/PostDownloadHandler.java |   40 +-
 .../josm/actions/downloadtasks/package-info.java   |    7 +
 .../josm/actions/mapmode/DeleteAction.java         |    4 +-
 .../josm/actions/mapmode/DrawAction.java           |   18 +-
 .../josm/actions/mapmode/ExtrudeAction.java        |    6 +-
 .../actions/mapmode/ImproveWayAccuracyAction.java  |    3 +
 .../actions/mapmode/ImproveWayAccuracyHelper.java  |    4 +-
 .../josm/actions/mapmode/ParallelWayAction.java    |    4 +-
 .../josm/actions/mapmode/SelectAction.java         |   16 +-
 .../josm/actions/mapmode/package-info.java         |    7 +
 .../openstreetmap/josm/actions/package-info.java   |    2 +-
 .../actions/relation/AbstractRelationAction.java   |    2 +-
 .../actions/relation/AddSelectionToRelations.java  |    7 +-
 .../actions/relation/DownloadMembersAction.java    |   11 +-
 .../DownloadSelectedIncompleteMembersAction.java   |   17 +-
 .../josm/actions/relation/package-info.java        |    7 +
 .../josm/actions/search/SearchAction.java          |   23 +-
 .../josm/actions/search/SearchCompiler.java        |   64 +-
 .../josm/actions/search/package-info.java          |    6 +
 .../josm/actions/upload/FixDataHook.java           |   15 +-
 .../josm/actions/upload/UploadHook.java            |    1 +
 .../josm/actions/upload/package-info.java          |    6 +
 .../josm/command/ChangeNodesCommand.java           |    5 +-
 .../josm/command/ChangePropertyCommand.java        |    7 +-
 .../josm/command/ChangePropertyKeyCommand.java     |   12 +-
 .../command/ChangeRelationMemberRoleCommand.java   |   10 +-
 src/org/openstreetmap/josm/command/Command.java    |   10 +-
 .../openstreetmap/josm/command/DeleteCommand.java  |   57 +-
 .../openstreetmap/josm/command/MoveCommand.java    |    8 +
 .../openstreetmap/josm/command/PseudoCommand.java  |   12 +-
 .../openstreetmap/josm/command/RotateCommand.java  |   14 +-
 .../openstreetmap/josm/command/ScaleCommand.java   |   12 +-
 .../openstreetmap/josm/command/SelectCommand.java  |    8 +-
 .../josm/command/SequenceCommand.java              |    2 +-
 .../josm/command/TransformNodesCommand.java        |    2 +-
 .../conflict/TagConflictResolveCommand.java        |    3 +-
 .../josm/corrector/ReverseWayNoTagCorrector.java   |    5 +-
 .../openstreetmap/josm/corrector/package-info.java |    6 +
 src/org/openstreetmap/josm/data/APIDataSet.java    |   17 +-
 src/org/openstreetmap/josm/data/AutosaveTask.java  |   39 +-
 src/org/openstreetmap/josm/data/Bounds.java        |    2 +-
 .../josm/data/CustomConfigurator.java              |   86 +-
 src/org/openstreetmap/josm/data/Preferences.java   |   35 +-
 .../josm/data/SelectionChangedListener.java        |    3 +
 .../josm/data/SystemOfMeasurement.java             |    2 +
 .../josm/data/cache/BufferedImageCacheEntry.java   |    2 +-
 .../openstreetmap/josm/data/cache/CacheEntry.java  |    3 +-
 .../josm/data/cache/HostLimitQueue.java            |   25 +-
 .../josm/data/cache/ICachedLoaderListener.java     |    2 +
 .../josm/data/cache/JCSCacheManager.java           |   29 +-
 .../josm/data/cache/JCSCachedTileLoaderJob.java    |   69 +-
 .../josm/data/cache/package-info.java              |    6 +
 .../josm/data/conflict/ConflictCollection.java     |   29 +-
 .../josm/data/conflict/package-info.java           |    7 +
 .../openstreetmap/josm/data/coor/package-info.java |    7 +
 src/org/openstreetmap/josm/data/gpx/GpxData.java   |   11 +-
 .../openstreetmap/josm/data/gpx/package-info.java  |    6 +
 .../CachedAttributionBingAerialTileSource.java     |   34 +-
 .../josm/data/imagery/CachedTileLoaderFactory.java |    5 -
 .../josm/data/imagery/ImageryInfo.java             |   97 +-
 .../josm/data/imagery/OffsetBookmark.java          |    5 +-
 .../josm/data/imagery/TMSCachedTileLoader.java     |    3 +-
 .../josm/data/imagery/TMSCachedTileLoaderJob.java  |    6 +-
 .../josm/data/imagery/TileLoaderFactory.java       |    9 +-
 .../josm/data/imagery/WMTSTileSource.java          |   12 +-
 .../josm/data/imagery/package-info.java            |    6 +
 .../josm/data/notes/package-info.java              |    3 +-
 .../josm/data/oauth/package-info.java              |    6 +
 .../josm/data/osm/AbstractPrimitive.java           |    4 +-
 .../josm/data/osm/ChangesetCache.java              |   25 +-
 .../josm/data/osm/ChangesetCacheListener.java      |    1 +
 src/org/openstreetmap/josm/data/osm/DataSet.java   |   47 +-
 .../josm/data/osm/DatasetConsistencyTest.java      |    1 +
 .../openstreetmap/josm/data/osm/FilterMatcher.java |    4 +-
 .../openstreetmap/josm/data/osm/FilterWorker.java  |    8 +-
 .../josm/data/osm/MultipolygonBuilder.java         |    2 +-
 src/org/openstreetmap/josm/data/osm/Node.java      |    6 +-
 src/org/openstreetmap/josm/data/osm/NoteData.java  |   73 +-
 .../openstreetmap/josm/data/osm/OsmPrimitive.java  |  163 +-
 src/org/openstreetmap/josm/data/osm/OsmUtils.java  |    6 +-
 .../openstreetmap/josm/data/osm/PrimitiveData.java |    2 +
 .../josm/data/osm/PrimitiveDeepCopy.java           |  132 -
 .../openstreetmap/josm/data/osm/QuadBuckets.java   |   36 +-
 src/org/openstreetmap/josm/data/osm/Relation.java  |   34 +-
 .../josm/data/osm/RelationMember.java              |    2 +-
 src/org/openstreetmap/josm/data/osm/Storage.java   |    2 +-
 src/org/openstreetmap/josm/data/osm/Tag.java       |   16 +-
 .../openstreetmap/josm/data/osm/TagCollection.java |  217 +-
 src/org/openstreetmap/josm/data/osm/TagMap.java    |   60 +-
 src/org/openstreetmap/josm/data/osm/Tagged.java    |   10 +
 src/org/openstreetmap/josm/data/osm/Way.java       |    2 +-
 .../data/osm/event/DataSetListenerAdapter.java     |    1 +
 .../josm/data/osm/event/SelectionEventManager.java |    9 +-
 .../josm/data/osm/event/package-info.java          |    6 +
 .../josm/data/osm/history/History.java             |   76 +-
 .../josm/data/osm/history/HistoryRelation.java     |    2 +-
 .../josm/data/osm/history/HistoryWay.java          |    2 +-
 .../josm/data/osm/history/package-info.java        |    6 +
 .../openstreetmap/josm/data/osm/package-info.java  |   15 +
 .../josm/data/osm/visitor/package-info.java        |    6 +
 .../data/osm/visitor/paint/MapPaintSettings.java   |    4 +-
 .../visitor/paint/RenderBenchmarkCollector.java    |  152 ++
 .../josm/data/osm/visitor/paint/Rendering.java     |    3 +
 .../data/osm/visitor/paint/StyledMapRenderer.java  |   99 +-
 .../josm/data/osm/visitor/paint/package-info.java  |    8 +
 .../osm/visitor/paint/relations/package-info.java  |    7 +
 .../josm/data/preferences/package-info.java        |    6 +
 .../josm/data/projection/AbstractProjection.java   |   22 +-
 .../josm/data/projection/CustomProjection.java     |    8 +-
 .../josm/data/projection/Ellipsoid.java            |   46 +-
 .../data/projection/ProjectionChangeListener.java  |    1 +
 .../data/projection/datum/NTV2GridShiftFile.java   |    2 +-
 .../josm/data/projection/datum/NTV2SubGrid.java    |    2 +-
 .../data/projection/datum/SevenParameterDatum.java |    2 +-
 .../josm/data/projection/datum/package-info.java   |    6 +
 .../josm/data/projection/proj/AbstractProj.java    |    2 +-
 .../josm/data/projection/proj/CassiniSoldner.java  |    2 +-
 .../projection/proj/ICentralMeridianProvider.java  |    3 +
 .../data/projection/proj/IScaleFactorProvider.java |    3 +
 .../josm/data/projection/proj/ProjFactory.java     |    7 +
 .../josm/data/projection/proj/Sinusoidal.java      |    2 +-
 .../data/projection/proj/TransverseMercator.java   |    2 +-
 .../josm/data/projection/proj/package-info.java    |    6 +
 .../josm/data/validation/OsmValidator.java         |   14 +-
 .../openstreetmap/josm/data/validation/Test.java   |    2 +-
 .../josm/data/validation/TestError.java            |   12 +-
 .../data/validation/routines/DomainValidator.java  |  105 +-
 .../data/validation/routines/RegexValidator.java   |    2 +-
 .../data/validation/routines/UrlValidator.java     |    4 +-
 .../josm/data/validation/tests/Addresses.java      |   14 +-
 .../data/validation/tests/ConditionalKeys.java     |   33 +-
 .../josm/data/validation/tests/CrossingWays.java   |    6 +-
 .../josm/data/validation/tests/Highways.java       |   11 +-
 .../josm/data/validation/tests/Lanes.java          |   26 +-
 .../data/validation/tests/MapCSSTagChecker.java    |   59 +-
 .../data/validation/tests/OverlappingWays.java     |   24 +-
 .../josm/data/validation/tests/PowerLines.java     |    2 +-
 .../data/validation/tests/RelationChecker.java     |   16 +-
 .../data/validation/tests/SimilarNamedWays.java    |    6 +-
 .../josm/data/validation/tests/TagChecker.java     |   12 +-
 .../josm/data/validation/tests/UnclosedWays.java   |   13 +-
 .../data/validation/tests/UnconnectedWays.java     |    3 +-
 .../josm/data/validation/tests/UntaggedNode.java   |    2 +-
 .../data/validation/tests/WayConnectedToArea.java  |    4 +-
 .../josm/data/validation/tests/package-info.java   |    6 +
 .../josm/data/validation/util/package-info.java    |    6 +
 .../josm/gui/DefaultNameFormatter.java             |   91 +-
 src/org/openstreetmap/josm/gui/ExtendedDialog.java |   26 +-
 src/org/openstreetmap/josm/gui/FileDrop.java       |  663 -----
 src/org/openstreetmap/josm/gui/GettingStarted.java |   45 +-
 .../josm/gui/HelpAwareOptionPane.java              |   13 +-
 src/org/openstreetmap/josm/gui/ImageryMenu.java    |   13 +-
 .../openstreetmap/josm/gui/MainApplication.java    |  101 +-
 src/org/openstreetmap/josm/gui/MainFrame.java      |   32 +-
 src/org/openstreetmap/josm/gui/MainMenu.java       |   15 +-
 src/org/openstreetmap/josm/gui/MainPanel.java      |    7 +-
 src/org/openstreetmap/josm/gui/MapFrame.java       |   26 +-
 .../openstreetmap/josm/gui/MapFrameListener.java   |    2 +
 src/org/openstreetmap/josm/gui/MapMover.java       |    6 +-
 src/org/openstreetmap/josm/gui/MapStatus.java      |   82 +-
 src/org/openstreetmap/josm/gui/MapView.java        |  144 +-
 src/org/openstreetmap/josm/gui/MapViewState.java   |   41 +-
 .../josm/gui/NavigatableComponent.java             |   48 +-
 .../josm/gui/NotificationManager.java              |   12 +-
 .../openstreetmap/josm/gui/PleaseWaitRunnable.java |   34 +-
 src/org/openstreetmap/josm/gui/ScrollViewport.java |    9 +-
 .../openstreetmap/josm/gui/SelectionManager.java   |    9 +-
 src/org/openstreetmap/josm/gui/SideButton.java     |   10 +-
 src/org/openstreetmap/josm/gui/SplashScreen.java   |   19 +-
 .../josm/gui/bbox/SlippyMapBBoxChooser.java        |   21 +-
 .../josm/gui/bbox/TileSelectionBBoxChooser.java    |    2 +-
 .../josm/gui/conflict/package-info.java            |    6 +
 .../josm/gui/conflict/pair/ComparePairType.java    |    2 +-
 .../josm/gui/conflict/pair/ListMergeModel.java     |   18 +-
 .../josm/gui/conflict/pair/ListMerger.java         |   14 +-
 .../josm/gui/conflict/pair/tags/TagMerger.java     |    2 +-
 .../tags/CombinePrimitiveResolverDialog.java       |   57 +-
 .../gui/conflict/tags/MultiValueCellEditor.java    |   44 +-
 .../tags/PasteTagsConflictResolverDialog.java      |   15 +-
 .../tags/RelationMemberConflictDecisionEditor.java |    9 +-
 .../RelationMemberConflictResolverColumnModel.java |   11 +-
 .../tags/RelationMemberConflictResolverModel.java  |   22 +-
 .../gui/conflict/tags/TagConflictResolver.java     |   22 +-
 .../conflict/tags/TagConflictResolverModel.java    |   57 +-
 .../josm/gui/datatransfer/ClipboardUtils.java      |  150 ++
 .../josm/gui/datatransfer/FileTransferHandler.java |   44 +
 .../josm/gui/datatransfer/LayerTransferable.java   |   97 +
 .../josm/gui/datatransfer/OsmTransferHandler.java  |  128 +
 .../gui/datatransfer/PrimitiveTransferable.java    |   96 +-
 .../datatransfer/RelationMemberTransferable.java   |   44 +-
 .../gui/datatransfer/SingleLayerTransferable.java  |   56 +
 .../josm/gui/datatransfer/TagTransferable.java     |   62 +
 .../gui/datatransfer/data/LayerTransferData.java   |   62 +
 .../datatransfer/data/OsmLayerTransferData.java    |   63 +
 .../data/PrimitiveTagTransferData.java             |   90 +
 .../datatransfer/data/PrimitiveTransferData.java   |  159 ++
 .../gui/datatransfer/data/TagTransferData.java     |   57 +
 .../josm/gui/datatransfer/data/package-info.java   |    6 +
 .../importers/AbstractOsmDataPaster.java           |   80 +
 .../datatransfer/importers/AbstractTagPaster.java  |   79 +
 .../gui/datatransfer/importers/FilePaster.java     |   40 +
 .../importers/PrimitiveDataPaster.java             |  140 +
 .../importers/PrimitiveTagTransferPaster.java      |  205 ++
 .../datatransfer/importers/TagTransferPaster.java  |   30 +
 .../gui/datatransfer/importers/TextTagPaster.java  |   62 +
 .../gui/datatransfer/importers/package-info.java   |    6 +
 .../josm/gui/datatransfer/package-info.java        |    6 +
 .../josm/gui/dialogs/ChangesetDialog.java          |   50 +-
 .../josm/gui/dialogs/CommandStackDialog.java       |   24 +-
 .../josm/gui/dialogs/ConflictDialog.java           |   47 +-
 .../DeleteFromRelationConfirmationDialog.java      |   31 +-
 .../josm/gui/dialogs/FilterDialog.java             |    8 +-
 .../josm/gui/dialogs/FilterTableModel.java         |    1 +
 .../josm/gui/dialogs/IEnabledStateUpdating.java    |   15 +
 .../josm/gui/dialogs/InspectPrimitiveDialog.java   |   30 +-
 .../josm/gui/dialogs/LatLonDialog.java             |   17 +-
 .../josm/gui/dialogs/LayerListDialog.java          |   59 +-
 .../josm/gui/dialogs/MapPaintDialog.java           |   75 +-
 .../josm/gui/dialogs/MenuItemSearchDialog.java     |    8 +-
 .../josm/gui/dialogs/MinimapDialog.java            |   15 +-
 .../josm/gui/dialogs/NotesDialog.java              |   13 +-
 .../josm/gui/dialogs/OsmIdSelectionDialog.java     |   33 +-
 .../josm/gui/dialogs/RelationListDialog.java       |   33 +-
 .../josm/gui/dialogs/SelectionListDialog.java      |   34 +-
 .../josm/gui/dialogs/ToggleDialog.java             |   71 +-
 .../josm/gui/dialogs/UserListDialog.java           |   24 +-
 .../josm/gui/dialogs/ValidatorDialog.java          |   43 +-
 .../josm/gui/dialogs/changeset/ChangesetAware.java |    2 +
 .../dialogs/changeset/ChangesetCacheManager.java   |   19 +-
 .../changeset/ChangesetCacheManagerModel.java      |   24 +-
 .../dialogs/changeset/ChangesetContentPanel.java   |   25 +-
 .../changeset/ChangesetContentTableModel.java      |   49 +-
 .../changeset/ChangesetDiscussionPanel.java        |    9 +-
 .../gui/dialogs/changeset/ChangesetListModel.java  |   13 +-
 .../query/AdvancedChangesetQueryPanel.java         |    4 +-
 .../changeset/query/BasicChangesetQueryPanel.java  |    2 +-
 .../changeset/query/ChangesetQueryDialog.java      |    2 +
 .../changeset/query/UrlBasedQueryPanel.java        |   18 +-
 .../gui/dialogs/layer/ActivateLayerAction.java     |   20 +-
 .../josm/gui/dialogs/layer/DeleteLayerAction.java  |    1 +
 .../josm/gui/dialogs/layer/DuplicateAction.java    |   23 +-
 .../gui/dialogs/layer/IEnabledStateUpdating.java   |   13 -
 .../dialogs/layer/LayerListTransferHandler.java    |  175 ++
 .../gui/dialogs/layer/LayerVisibilityAction.java   |   40 +-
 .../josm/gui/dialogs/layer/MergeAction.java        |    1 +
 .../josm/gui/dialogs/layer/MoveDownAction.java     |    1 +
 .../josm/gui/dialogs/layer/MoveUpAction.java       |    1 +
 .../gui/dialogs/layer/ShowHideLayerAction.java     |    1 +
 .../gui/dialogs/properties/PropertiesDialog.java   |  118 +-
 .../josm/gui/dialogs/properties/TagEditHelper.java |   61 +-
 .../gui/dialogs/relation/ChildRelationBrowser.java |    7 +-
 .../relation/DownloadRelationMemberTask.java       |   14 +-
 .../gui/dialogs/relation/DownloadRelationTask.java |   15 +-
 .../dialogs/relation/GenericRelationEditor.java    |   57 +-
 .../gui/dialogs/relation/IMemberModelListener.java |    1 +
 .../josm/gui/dialogs/relation/MemberTable.java     |   39 +-
 .../gui/dialogs/relation/MemberTableModel.java     |   86 +-
 .../dialogs/relation/MemberTransferHandler.java    |   99 +-
 .../relation/ParentRelationLoadingTask.java        |   12 +-
 .../relation/ReferringRelationsBrowser.java        |   15 +-
 .../josm/gui/dialogs/relation/RelationTree.java    |    9 +-
 .../relation/actions/CopyMembersAction.java        |   12 +-
 .../relation/actions/PasteMembersAction.java       |   72 +-
 .../gui/dialogs/relation/actions/SavingAction.java |   11 +-
 .../gui/dialogs/relation/actions/package-info.java |    6 +
 .../gui/dialogs/relation/sort/RelationSorter.java  |   23 +-
 .../relation/sort/WayConnectionTypeCalculator.java |  118 +-
 .../gui/dialogs/relation/sort/package-info.java    |    6 +
 .../gui/dialogs/validator/ValidatorTreePanel.java  |   15 +-
 .../josm/gui/download/BookmarkList.java            |    2 +-
 .../josm/gui/download/BookmarkSelection.java       |   11 +-
 .../josm/gui/download/DownloadDialog.java          |   29 +-
 .../josm/gui/download/DownloadObjectDialog.java    |   13 +-
 .../josm/gui/download/PlaceSelection.java          |   19 +-
 .../openstreetmap/josm/gui/help/HelpBrowser.java   |   18 +-
 src/org/openstreetmap/josm/gui/help/Helpful.java   |    2 +
 .../josm/gui/history/HistoryBrowser.java           |   13 +-
 .../gui/history/HistoryBrowserDialogManager.java   |   53 +-
 .../josm/gui/history/HistoryBrowserModel.java      |   13 +-
 .../josm/gui/history/NodeListViewer.java           |   20 +-
 .../josm/gui/history/SelectionSynchronizer.java    |    6 +
 .../josm/gui/history/TagInfoTransferHandler.java   |   47 +
 .../josm/gui/history/TagInfoViewer.java            |   44 +-
 .../josm/gui/history/TagTableCellRenderer.java     |   56 +-
 .../josm/gui/history/TagTableColumnModel.java      |    2 +
 .../josm/gui/history/TwoColumnDiff.java            |    8 +-
 .../josm/gui/history/VersionTable.java             |   17 +-
 .../josm/gui/io/AbstractPrimitiveTask.java         |   13 +-
 .../josm/gui/io/ActionFlagsTableCell.java          |    7 +-
 .../josm/gui/io/BasicUploadSettingsPanel.java      |   16 +-
 .../josm/gui/io/CloseChangesetTask.java            |    9 +-
 .../josm/gui/io/CredentialDialog.java              |    2 +-
 .../josm/gui/io/DownloadOpenChangesetsTask.java    |   14 +-
 .../io/DownloadPrimitivesWithReferrersTask.java    |   52 +-
 .../josm/gui/io/SaveLayersDialog.java              |   43 +-
 .../openstreetmap/josm/gui/io/SaveLayersModel.java |   11 +-
 .../openstreetmap/josm/gui/io/UploadDialog.java    |   12 +-
 .../josm/gui/io/UploadPrimitivesTask.java          |   91 +-
 .../josm/gui/io/UploadSelectionDialog.java         |   22 +-
 .../josm/gui/io/UploadStrategySelectionPanel.java  |    4 +-
 .../josm/gui/layer/AbstractMapViewPaintable.java   |    2 +-
 .../josm/gui/layer/AbstractTileSourceLayer.java    |  587 +++--
 .../josm/gui/layer/AlignImageryPanel.java          |   15 +-
 src/org/openstreetmap/josm/gui/layer/GpxLayer.java |   12 +-
 .../josm/gui/layer/ImageProcessor.java             |    3 +
 .../openstreetmap/josm/gui/layer/ImageryLayer.java |  455 +---
 src/org/openstreetmap/josm/gui/layer/Layer.java    |   47 +-
 .../openstreetmap/josm/gui/layer/LayerManager.java |   23 +-
 .../josm/gui/layer/LayerPositionStrategy.java      |   80 +-
 .../josm/gui/layer/MainLayerManager.java           |   14 +-
 .../josm/gui/layer/MapViewPaintable.java           |    8 +-
 .../josm/gui/layer/NativeScaleLayer.java           |    3 +
 .../openstreetmap/josm/gui/layer/NoteLayer.java    |    7 +-
 .../openstreetmap/josm/gui/layer/OsmDataLayer.java |   70 +-
 src/org/openstreetmap/josm/gui/layer/TMSLayer.java |    9 +-
 src/org/openstreetmap/josm/gui/layer/WMSLayer.java |   19 +-
 .../openstreetmap/josm/gui/layer/WMTSLayer.java    |   17 +-
 .../gui/layer/geoimage/CorrelateGpxWithImages.java |   90 +-
 .../josm/gui/layer/geoimage/GeoImageLayer.java     |   49 +-
 .../josm/gui/layer/geoimage/ImageViewerDialog.java |    2 +-
 .../gui/layer/gpx/ChooseTrackVisibilityAction.java |   30 +-
 .../josm/gui/layer/gpx/DateFilterPanel.java        |   14 +-
 .../josm/gui/layer/gpx/DownloadAlongPanel.java     |    7 +-
 .../josm/gui/layer/gpx/GpxDrawHelper.java          |    4 +-
 .../josm/gui/layer/gpx/ImportAudioAction.java      |   18 +-
 .../josm/gui/layer/gpx/ImportImagesAction.java     |    2 +-
 .../gui/layer/imagery/ColorfulImageProcessor.java  |  185 ++
 .../gui/layer/imagery/GammaImageProcessor.java     |   68 +
 .../gui/layer/imagery/ImageryFilterSettings.java   |  121 +
 .../gui/layer/imagery/SharpenImageProcessor.java   |   94 +
 .../gui/layer/imagery/TileCoordinateConverter.java |   57 +
 .../layer/imagery/TileSourceDisplaySettings.java   |  354 +++
 .../josm/gui/layer/imagery/package-info.java       |    6 +
 .../josm/gui/layer/markerlayer/ImageMarker.java    |   18 +-
 .../josm/gui/layer/markerlayer/Marker.java         |   68 +-
 .../josm/gui/layer/markerlayer/MarkerLayer.java    |    8 +-
 .../gui/layer/markerlayer/MarkerProducers.java     |    3 +
 .../josm/gui/layer/markerlayer/PlayHeadMarker.java |    9 +-
 .../josm/gui/mappaint/ElemStyles.java              |    9 +-
 .../josm/gui/mappaint/MapPaintStyles.java          |   22 +-
 .../josm/gui/mappaint/mapcss/Condition.java        |  283 ++-
 .../josm/gui/mappaint/mapcss/Expression.java       |    3 +
 .../gui/mappaint/mapcss/ExpressionFactory.java     |   41 +-
 .../josm/gui/mappaint/mapcss/Instruction.java      |    1 +
 .../josm/gui/mappaint/mapcss/Selector.java         |   26 +-
 .../josm/gui/mappaint/mapcss/Subpart.java          |    3 +
 .../josm/gui/mappaint/mapcss/package-info.java     |    1 -
 .../gui/mappaint/styleelement/AreaElement.java     |    8 +-
 .../gui/mappaint/styleelement/BoxTextElement.java  |    2 +
 .../styleelement/LabelCompositionStrategy.java     |   15 +-
 .../gui/mappaint/styleelement/LineElement.java     |    4 +-
 .../josm/gui/mappaint/styleelement/MapImage.java   |   34 +-
 .../gui/mappaint/styleelement/NodeElement.java     |   20 +-
 .../josm/gui/mappaint/styleelement/TextLabel.java  |    4 +-
 .../gui/mappaint/styleelement/package-info.java    |    6 +
 .../gui/oauth/FullyAutomaticAuthorizationUI.java   |   22 +-
 .../gui/oauth/OsmOAuthAuthorizationClient.java     |    1 +
 .../josm/gui/oauth/RetrieveAccessTokenTask.java    |    8 +-
 .../josm/gui/oauth/RetrieveRequestTokenTask.java   |    8 +-
 .../gui/oauth/SemiAutomaticAuthorizationUI.java    |   46 +-
 .../preferences/DefaultTabPreferenceSetting.java   |    2 +-
 .../josm/gui/preferences/PreferenceDialog.java     |   10 +-
 .../gui/preferences/PreferenceSettingFactory.java  |    2 +-
 .../josm/gui/preferences/PreferenceTabbedPane.java |   40 +-
 .../josm/gui/preferences/SourceEditor.java         |   93 +-
 .../josm/gui/preferences/SourceProvider.java       |    1 +
 .../josm/gui/preferences/ToolbarPreferences.java   |   61 +-
 .../advanced/AbstractTableListEditor.java          |    2 +-
 .../preferences/advanced/AdvancedPreference.java   |   69 +-
 .../josm/gui/preferences/advanced/ListEditor.java  |   10 +-
 .../gui/preferences/display/ColorPreference.java   |   90 +-
 .../gui/preferences/display/DrawingPreference.java |   17 +-
 .../gui/preferences/display/GPXSettingsPanel.java  |   63 +-
 .../gui/preferences/display/LafPreference.java     |    2 +-
 .../gui/preferences/imagery/AddImageryPanel.java   |   11 +-
 .../gui/preferences/imagery/AddWMSLayerPanel.java  |  121 +-
 .../preferences/imagery/CacheContentsPanel.java    |  137 +-
 .../preferences/imagery/CommonSettingsPanel.java   |   37 +-
 .../gui/preferences/imagery/ImageryPreference.java |   49 +-
 .../gui/preferences/imagery/TMSSettingsPanel.java  |    9 +-
 .../josm/gui/preferences/map/BackupPreference.java |   16 +-
 .../gui/preferences/map/MapPaintPreference.java    |   16 +-
 .../preferences/map/TaggingPresetPreference.java   |   10 +-
 .../gui/preferences/plugin/PluginListPanel.java    |   18 +-
 .../gui/preferences/plugin/PluginPreference.java   |  162 +-
 .../preferences/plugin/PluginPreferencesModel.java |   14 +-
 .../plugin/PluginUpdatePolicyPanel.java            |    4 +-
 .../projection/CodeProjectionChoice.java           |    2 +-
 .../projection/CustomProjectionChoice.java         |   20 +-
 .../projection/ProjectionPreference.java           |   17 +-
 .../remotecontrol/RemoteControlPreference.java     |   86 +-
 .../gui/preferences/server/ApiUrlTestTask.java     |    2 +-
 .../josm/gui/preferences/server/FeaturesPanel.java |    9 +-
 .../OAuthAuthenticationPreferencesPanel.java       |    8 +-
 .../preferences/server/OsmApiUrlInputPanel.java    |   36 +-
 .../server/ProxyPreferenceListener.java            |    2 +
 .../preferences/server/ServerAccessPreference.java |    4 +-
 .../validator/ValidatorTestsPreference.java        |    8 +-
 .../gui/progress/PleaseWaitProgressMonitor.java    |  172 +-
 .../josm/gui/progress/ProgressMonitor.java         |    1 +
 .../progress/SwingRenderingProgressMonitor.java    |   37 +-
 .../josm/gui/tagging/TagEditorModel.java           |   74 +-
 .../josm/gui/tagging/TagEditorPanel.java           |    9 +-
 .../openstreetmap/josm/gui/tagging/TagTable.java   |   71 +-
 .../gui/tagging/ac/AutoCompletingComboBox.java     |   11 +-
 .../gui/tagging/ac/AutoCompletingTextField.java    |    4 +-
 .../josm/gui/tagging/ac/AutoCompletionManager.java |    9 +-
 .../josm/gui/tagging/presets/TaggingPreset.java    |   51 +-
 .../gui/tagging/presets/TaggingPresetHandler.java  |   12 +
 .../gui/tagging/presets/TaggingPresetItem.java     |    4 +-
 .../gui/tagging/presets/TaggingPresetListener.java |    2 +
 .../gui/tagging/presets/TaggingPresetMenu.java     |    3 +-
 .../gui/tagging/presets/TaggingPresetReader.java   |    8 +-
 .../tagging/presets/TaggingPresetSearchDialog.java |    8 +-
 .../TaggingPresetSearchPrimitiveDialog.java        |   12 +-
 .../gui/tagging/presets/TaggingPresetSelector.java |   42 +-
 .../josm/gui/tagging/presets/TaggingPresets.java   |   19 +-
 .../tagging/presets/items/ComboMultiSelect.java    |   11 +-
 .../josm/gui/tagging/presets/items/KeyedItem.java  |   29 +-
 .../gui/tagging/presets/items/MultiSelect.java     |    2 +-
 .../josm/gui/tagging/presets/items/PresetLink.java |   13 +-
 .../josm/gui/tagging/presets/items/Text.java       |   22 +-
 .../josm/gui/util/AdjustmentSynchronizer.java      |   47 +-
 .../josm/gui/util/AdvancedKeyPressDetector.java    |   17 +-
 src/org/openstreetmap/josm/gui/util/GuiHelper.java |   43 +-
 .../josm/gui/util/ModifierListener.java            |    2 +
 .../openstreetmap/josm/gui/util/RotationAngle.java |   19 +-
 .../josm/gui/util/StayOpenCheckBoxMenuItem.java    |   10 +-
 .../josm/gui/widgets/AbstractIdTextField.java      |    4 +-
 .../josm/gui/widgets/ButtonColumn.java             |  119 +
 .../josm/gui/widgets/ChangesetIdTextField.java     |    4 +-
 .../josm/gui/widgets/DateEditorWithSlider.java     |   41 +-
 .../josm/gui/widgets/EditableList.java             |   95 +-
 .../josm/gui/widgets/HistoryChangedListener.java   |    1 +
 .../josm/gui/widgets/JosmPasswordField.java        |    2 +-
 .../josm/gui/widgets/MultiSplitLayout.java         |   20 +-
 .../josm/gui/widgets/MultiSplitPane.java           |    1 +
 .../josm/gui/widgets/NativeFileChooser.java        |    7 +-
 .../josm/gui/widgets/OsmIdTextField.java           |    3 +
 .../josm/gui/widgets/QuadStateCheckBox.java        |    8 +-
 .../josm/gui/widgets/TextContextualPopupMenu.java  |   32 +-
 .../openstreetmap/josm/gui/widgets/UrlLabel.java   |    4 +-
 .../josm/io/BoundingBoxDownloader.java             |    3 +-
 .../openstreetmap/josm/io/CacheCustomContent.java  |    2 +
 src/org/openstreetmap/josm/io/CachedFile.java      |    5 +-
 src/org/openstreetmap/josm/io/Capabilities.java    |    2 +-
 src/org/openstreetmap/josm/io/ChangesetQuery.java  |   17 +-
 src/org/openstreetmap/josm/io/FileImporter.java    |   13 +-
 src/org/openstreetmap/josm/io/FileWatcher.java     |    7 +-
 src/org/openstreetmap/josm/io/GpxExporter.java     |   99 +-
 src/org/openstreetmap/josm/io/GpxImporter.java     |   40 +-
 src/org/openstreetmap/josm/io/MessageNotifier.java |   27 +-
 .../josm/io/MultiFetchOverpassObjectReader.java    |    8 +-
 .../josm/io/MultiFetchServerObjectReader.java      |    9 +-
 src/org/openstreetmap/josm/io/NMEAImporter.java    |   28 +-
 src/org/openstreetmap/josm/io/NmeaReader.java      |    4 +-
 src/org/openstreetmap/josm/io/OsmApi.java          |    1 +
 src/org/openstreetmap/josm/io/OsmApiException.java |    8 +-
 .../openstreetmap/josm/io/OsmChangeImporter.java   |   21 +-
 src/org/openstreetmap/josm/io/OsmConnection.java   |   34 +-
 src/org/openstreetmap/josm/io/OsmExporter.java     |    5 +-
 src/org/openstreetmap/josm/io/OsmImporter.java     |   42 +-
 src/org/openstreetmap/josm/io/OsmReader.java       |   14 +-
 .../josm/io/OsmServerReadPostprocessor.java        |    1 +
 .../josm/io/OsmServerWritePostprocessor.java       |    1 +
 src/org/openstreetmap/josm/io/OsmWriter.java       |   28 +-
 .../openstreetmap/josm/io/WMSLayerImporter.java    |   11 +-
 .../josm/io/auth/AbstractCredentialsAgent.java     |   33 +-
 .../josm/io/auth/CredentialsManager.java           |    3 +
 .../openstreetmap/josm/io/auth/package-info.java   |    6 +
 .../josm/io/imagery/ImageryReader.java             |    2 +
 .../openstreetmap/josm/io/imagery/WMSImagery.java  |  193 +-
 .../josm/io/imagery/package-info.java              |    6 +
 .../josm/io/remotecontrol/AddTagsDialog.java       |   36 +-
 .../io/remotecontrol/RemoteControlHttpServer.java  |    2 +
 .../io/remotecontrol/RemoteControlHttpsServer.java |   22 +-
 .../josm/io/remotecontrol/RequestProcessor.java    |   72 +-
 .../io/remotecontrol/handler/AddNodeHandler.java   |    8 +-
 .../io/remotecontrol/handler/AddWayHandler.java    |    8 +-
 .../io/remotecontrol/handler/ImageryHandler.java   |   20 +-
 .../remotecontrol/handler/LoadAndZoomHandler.java  |   98 +-
 .../remotecontrol/handler/LoadObjectHandler.java   |   30 +-
 .../io/remotecontrol/handler/OpenFileHandler.java  |    6 +-
 .../io/remotecontrol/handler/RequestHandler.java   |    4 +-
 .../io/remotecontrol/handler/package-info.java     |    6 +
 .../josm/io/remotecontrol/package-info.java        |    6 +
 .../josm/io/session/GenericSessionExporter.java    |   37 +-
 .../josm/io/session/GeoImageSessionImporter.java   |    4 +-
 .../josm/io/session/ImagerySessionExporter.java    |    8 +-
 .../josm/io/session/ImagerySessionImporter.java    |   17 +-
 .../josm/io/session/SessionLayerImporter.java      |    2 +
 .../josm/io/session/SessionReader.java             |   26 +-
 .../josm/io/session/package-info.java              |    6 +
 src/org/openstreetmap/josm/plugins/Plugin.java     |    8 +-
 .../openstreetmap/josm/plugins/PluginHandler.java  |  194 +-
 .../josm/plugins/PluginInformation.java            |    1 +
 .../openstreetmap/josm/plugins/PluginProxy.java    |    3 +
 .../plugins/ReadLocalPluginInformationTask.java    |   22 +-
 .../plugins/ReadRemotePluginInformationTask.java   |   47 +-
 src/org/openstreetmap/josm/tools/AudioUtil.java    |    4 +-
 src/org/openstreetmap/josm/tools/Base64.java       |   94 -
 src/org/openstreetmap/josm/tools/Destroyable.java  |    3 +
 src/org/openstreetmap/josm/tools/Diff.java         |   65 +-
 .../openstreetmap/josm/tools/ExceptionUtil.java    |   16 +-
 .../josm/tools/FilteredCollection.java             |    1 +
 src/org/openstreetmap/josm/tools/GBC.java          |   11 +
 .../openstreetmap/josm/tools/GeoUrlToBounds.java   |   58 +
 src/org/openstreetmap/josm/tools/Geometry.java     |    8 +-
 src/org/openstreetmap/josm/tools/I18n.java         |   29 +-
 .../openstreetmap/josm/tools/ImageProvider.java    |  150 +-
 .../openstreetmap/josm/tools/ImageResource.java    |    5 +-
 .../openstreetmap/josm/tools/MemoryManager.java    |  190 ++
 .../josm/tools/MultiLineFlowLayout.java            |  109 +
 .../josm/tools/MultikeyActionsHandler.java         |   15 +-
 src/org/openstreetmap/josm/tools/OpenBrowser.java  |    4 +-
 .../josm/tools/OverpassTurboQueryWizard.java       |    8 +-
 .../openstreetmap/josm/tools/PlatformHookOsx.java  |    8 +-
 .../josm/tools/PlatformHookUnixoid.java            |  117 +-
 .../josm/tools/PlatformHookWindows.java            |    9 +-
 src/org/openstreetmap/josm/tools/Predicate.java    |   18 -
 src/org/openstreetmap/josm/tools/Predicates.java   |  102 +-
 src/org/openstreetmap/josm/tools/StreamUtils.java  |   42 +
 .../josm/tools/SubclassFilteredCollection.java     |   17 +-
 .../openstreetmap/josm/tools/TextTagParser.java    |    7 +-
 src/org/openstreetmap/josm/tools/Utils.java        |  220 +-
 .../openstreetmap/josm/tools/WindowGeometry.java   |    4 +-
 .../openstreetmap/josm/tools/XmlObjectParser.java  |    3 +-
 .../josm/tools/bugreport/BugReport.java            |  145 +-
 .../josm/tools/bugreport/BugReportDialog.java      |  204 ++
 .../tools/bugreport/BugReportExceptionHandler.java |  144 +-
 .../josm/tools/bugreport/BugReportSender.java      |   31 +-
 .../tools/bugreport/BugReportSettingsPanel.java    |   38 +
 .../josm/tools/bugreport/DebugTextDisplay.java     |   57 +-
 .../josm/tools/bugreport/JosmUpdatePanel.java      |  103 +
 .../josm/tools/bugreport/ReportedException.java    |   99 +-
 .../josm/tools/bugreport/package-info.java         |    6 +
 .../template_engine/CompoundTemplateEntry.java     |    2 +-
 .../template_engine/ContextSwitchTemplate.java     |    2 +-
 .../josm/tools/template_engine/package-info.java   |    6 +
 styles/standard/elemstyles.mapcss                  | 1292 +++++-----
 styles/standard/potlatch2.mapcss                   |   14 +-
 styles_nodist/potlatch2/prelude.css                |   14 +-
 .../openstreetmap/josm/data/osm/TaginfoTestIT.java |    2 +-
 .../josm/io/MultiFetchServerObjectReaderTest.java  |    2 +-
 .../josm/io/OsmServerBackreferenceReaderTest.java  |    6 +-
 .../openstreetmap/josm/tools/HttpClientTest.java   |   85 +-
 .../openstreetmap/josm/PerformanceTestUtils.java   |   72 +-
 .../josm/data/osm/KeyValuePerformanceTest.java     |    2 +-
 .../josm/data/osm/RoundingPerformanceTest.java     |    2 +-
 .../gui/mappaint/MapRendererPerformanceTest.java   |   55 +-
 .../mapcss/MapCSSConditionPerformanceTest.java     |   68 +
 .../mapcss/MapCSSStyleSourceFilterTest.java        |   17 +-
 .../josm/io/OsmReaderPerformanceTest.java          |    2 +-
 test/unit/org/CustomMatchers.java                  |    4 +-
 test/unit/org/openstreetmap/josm/TestUtils.java    |    3 +-
 .../josm/actions/AddImageryLayerActionTest.java    |    4 +-
 .../josm/actions/AlignInLineActionTest.java        |    6 +-
 .../josm/actions/CombineWayActionTest.java         |    2 +-
 .../openstreetmap/josm/actions/CopyActionTest.java |  111 +-
 .../josm/actions/CreateCircleActionTest.java       |    4 +-
 .../actions/CreateMultipolygonActionTest.groovy    |   12 +-
 .../josm/actions/ExtensionFileFilterTest.java      |    2 +-
 .../josm/actions/OrthogonalizeActionTest.java      |    4 +-
 .../josm/actions/PasteTagsActionTest.java          |   55 -
 .../josm/actions/SplitWayActionTest.java           |    9 +-
 .../josm/actions/UnJoinNodeWayActionTest.java      |    2 +-
 .../josm/actions/mapmode/SelectActionTest.java     |    2 +-
 .../openstreetmap/josm/command/AddCommandTest.java |  119 +-
 .../josm/command/AddPrimitivesCommandTest.java     |  242 +-
 .../josm/command/ChangeCommandTest.java            |  135 +-
 .../josm/command/ChangeNodesCommandTest.java       |  108 +-
 .../josm/command/ChangePropertyCommandTest.java    |  263 +-
 .../josm/command/ChangePropertyKeyCommandTest.java |  133 +-
 .../ChangeRelationMemberRoleCommandTest.java       |  129 +-
 .../openstreetmap/josm/command/CommandTest.java    |  186 +-
 .../josm/command/DeleteCommandTest.java            |  361 ++-
 .../josm/command/MoveCommandTest.java              |  243 +-
 .../josm/command/PurgeCommandTest.java             |  124 +-
 .../josm/command/RemoveNodesCommandTest.java       |  106 +-
 .../josm/command/RotateCommandTest.java            |  133 +-
 .../josm/command/ScaleCommandTest.java             |  117 +-
 .../josm/command/SelectCommandTest.java            |  132 +-
 .../josm/command/SequenceCommandTest.java          |  200 +-
 .../josm/command/TransformNodesCommandTest.java    |    2 +-
 .../command/conflict/ConflictAddCommandTest.java   |    2 +-
 .../conflict/ConflictResolveCommandTest.java       |    2 +-
 .../CoordinateConflictResolveCommandTest.java      |    2 +-
 .../DeletedStateConflictResolveCommandTest.java    |    2 +-
 .../ModifiedConflictResolveCommandTest.java        |    2 +-
 .../RelationMemberConflictResolverCommandTest.java |    2 +-
 .../conflict/TagConflictResolveCommandTest.java    |    2 +-
 .../VersionConflictResolveCommandTest.java         |    2 +-
 .../WayNodesConflictResolverCommandTest.java       |    2 +-
 .../org/openstreetmap/josm/data/BoundsTest.java    |    2 +-
 .../josm/data/cache/JCSCacheManagerTest.java       |   35 +-
 .../data/cache/JCSCachedTileLoaderJobTest.java     |   42 +-
 .../josm/data/coor/CachedLatLonTest.java           |    2 +-
 .../openstreetmap/josm/data/coor/LatLonTest.java   |    2 +-
 .../josm/data/imagery/ImageryInfoTest.java         |   12 +
 .../data/imagery/TemplatedWMSTileSourceTest.java   |    8 +-
 .../josm/data/imagery/WMTSTileSourceTest.java      |    2 +-
 .../openstreetmap/josm/data/notes/NoteTest.java    |    2 +-
 .../josm/data/oauth/OAuthParametersTest.java       |    2 +-
 .../josm/data/oauth/OAuthTokenTest.java            |    2 +-
 .../josm/data/osm/APIDataSetTest.java              |   14 +-
 .../org/openstreetmap/josm/data/osm/BBoxTest.java  |    2 +-
 .../josm/data/osm/DataSetMergerTest.java           |   56 +-
 .../openstreetmap/josm/data/osm/FilterTest.java    |    6 +-
 .../openstreetmap/josm/data/osm/NodeDataTest.java  |    6 +-
 .../josm/data/osm/OsmPrimitiveKeyHandlingTest.java |   14 +-
 .../josm/data/osm/OsmPrimitiveTest.java            |   16 +-
 .../openstreetmap/josm/data/osm/RelationTest.java  |    4 +-
 .../josm/data/osm/TagCollectionTest.java           |  708 ++++++
 .../openstreetmap/josm/data/osm/WayDataTest.java   |    6 +-
 .../josm/data/osm/history/HistoryWayTest.java      |    4 +-
 .../josm/data/projection/EllipsoidTest.java        |    2 +-
 .../josm/data/projection/ProjectionRefTest.java    |    2 +-
 .../data/projection/ProjectionRegressionTest.java  |    2 +-
 .../josm/data/projection/ProjectionTest.java       |    4 +-
 .../josm/data/projection/SwissGridTest.java        |   18 +-
 .../validation/routines/DomainValidatorTestIT.java |   11 +-
 .../data/validation/tests/DuplicateNodeTest.java   |    2 +-
 .../validation/tests/MapCSSTagCheckerTest.java     |   14 +-
 .../data/validation/tests/NameMismatchTest.java    |    8 +-
 .../tests/PublicTransportRouteTestTest.java        |    2 +-
 .../josm/data/validation/tests/TagCheckerTest.java |    7 +-
 .../josm/gui/TableCellRendererTest.java            |    2 +-
 .../pair/nodes/NodeListMergeModelTest.java         |   56 +-
 .../pair/properties/PropertiesMergeModelTest.java  |    4 +-
 .../gui/conflict/pair/tags/TagMergeItemTest.java   |   32 +-
 .../gui/conflict/pair/tags/TagMergeModelTest.java  |   20 +-
 .../gui/correction/RoleCorrectionTableTest.java    |    6 +-
 .../gui/correction/TagCorrectionTableTest.java     |    8 +-
 .../josm/gui/datatransfer/ClipboardUtilsTest.java  |  122 +
 .../gui/datatransfer/LayerTransferableTest.java    |   98 +
 .../datatransfer/PrimitiveTransferableTest.java    |   60 +-
 .../RelationMemberTransferableTest.java            |   24 +-
 .../data/PrimitiveTagTransferDataTest.java         |  120 +
 .../properties/RecentTagCollectionTest.java        |    3 +-
 .../actions/AbstractRelationEditorActionTest.java  |   74 +
 .../relation/actions/PasteMembersActionTest.java   |  126 +
 .../actions/RelationEditorActionsTest.java         |   20 +-
 .../josm/gui/layer/ImageryLayerTest.java           |   31 +-
 .../josm/gui/layer/LayerManagerTest.java           |   10 +-
 .../josm/gui/layer/MainLayerManagerTest.java       |    3 +-
 .../josm/gui/layer/NoteLayerTest.java              |   30 +
 .../layer/imagery/ColorfulImageProcessorTest.java  |  155 ++
 .../gui/layer/imagery/GammaImageProcessorTest.java |   61 +
 .../layer/imagery/SharpenImageProcessorTest.java   |   61 +
 .../josm/gui/mappaint/mapcss/ConditionTest.java    |  251 ++
 .../gui/preferences/ToolbarPreferencesTest.java    |    2 +-
 .../gui/preferences/advanced/PrefEntryTest.java    |    2 +-
 .../map/TaggingPresetPreferenceTestIT.java         |   10 +-
 .../tagging/presets/PresetClassificationsTest.java |    9 +-
 .../tagging/presets/TaggingPresetReaderTest.java   |   15 +-
 .../org/openstreetmap/josm/io/GpxReaderTest.java   |    4 +-
 .../org/openstreetmap/josm/io/NmeaReaderTest.java  |    2 +-
 .../org/openstreetmap/josm/io/OsmWriterTest.java   |   15 +-
 .../josm/io/remotecontrol/DNSNameTest.java         |    2 +-
 .../josm/io/session/SessionReaderTest.java         |    7 +-
 .../josm/io/session/SessionWriterTest.java         |    5 +-
 .../josm/plugins/PluginHandlerTest.java            |    2 +-
 .../josm/plugins/PluginHandlerTestIT.java          |    5 +
 .../josm/testutils/JOSMTestRules.java              |  138 +-
 .../openstreetmap/josm/tools/ExifReaderTest.java   |    2 +-
 .../josm/tools/GeoUrlToBoundsTest.java             |   57 +
 .../org/openstreetmap/josm/tools/GeometryTest.java |   22 +-
 .../josm/tools/MemoryManagerTest.java              |  168 ++
 .../josm/tools/MultiLineFlowLayoutTest.java        |  136 +
 .../org/openstreetmap/josm/tools/MultiMapTest.java |    2 +-
 .../josm/tools/OsmUrlToBoundsTest.java             |    4 +-
 .../josm/tools/OverpassTurboQueryWizardTest.java   |   17 +-
 .../org/openstreetmap/josm/tools/PairTest.java     |    2 +-
 .../openstreetmap/josm/tools/PredicatesTest.java   |  157 +-
 .../josm/tools/TextTagParserTest.java              |   18 +-
 .../org/openstreetmap/josm/tools/UtilsTest.java    |   59 +-
 .../josm/tools/WindowGeometryTest.java             |   20 +-
 .../bugreport/BugReportExceptionHandlerTest.java   |    9 -
 .../josm/tools/date/DateUtilsTest.java             |    2 +
 tools/checkstyle/josm_filters.xml                  |    1 +
 1664 files changed, 118233 insertions(+), 26511 deletions(-)

diff --cc debian/changelog
index 4dff757,5a1d0b2..12b6978
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,23 +1,29 @@@
+ josm (0.0.svn10786+dfsg-2) unstable; urgency=medium
+ 
+   * Add patch to fix two SVG files, causing exception.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 12 Aug 2016 17:11:41 +0200
+ 
+ josm (0.0.svn10786+dfsg-1) unstable; urgency=medium
+ 
+   * New tested snapshot.
+     - switch to Java 8
+   * Update JDK & JRE dependencies to require at least version 1.8.
+   * Switch more URLs to HTTPS.
+   * Bump minimum required openstreetmap-map-icons-classic to 1:0.0.svn32805.
+   * Bump minimum required jmapviewer version to 2.0.
+   * Refresh patches.
+   * Update copyright file, changes:
+     - Drop license & copyright for FileDrop.java, removed upstream
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Fri, 12 Aug 2016 15:17:12 +0200
+ 
 +josm (0.0.svn10526+dfsg-1~bpo8+1) jessie-backports; urgency=medium
 +
 +  * Rebuild for jessie-backports.
 +
 + -- Bas Couwenberg <sebastic at debian.org>  Sun, 17 Jul 2016 19:22:02 +0200
 +
  josm (0.0.svn10526+dfsg-1) unstable; urgency=medium
  
    * New tested snapshot.
diff --cc debian/control
index 1495a7d,0bda0fe..5c5b4b5
--- a/debian/control
+++ b/debian/control
@@@ -19,11 -20,10 +20,10 @@@ Build-Depends: debhelper (>= 9~)
                 libgettext-commons-java (>= 0.9.6),
                 liboauth-signpost-java (>= 1.2),
                 libsvgsalamander-java,
-                libterm-readkey-perl,
-                jmapviewer (>= 1.17)
+                libterm-readkey-perl
  Standards-Version: 3.9.8
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/josm.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/josm.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/josm.git -b jessie-backports
  Homepage: https://josm.openstreetmap.de
  
  Package: josm

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/josm.git



More information about the Pkg-grass-devel mailing list