Commit 7e128148 authored by Bas Couwenberg's avatar Bas Couwenberg

Imported Upstream version 0.0.svn9060+dfsg

parent b2e053eb
......@@ -2,7 +2,7 @@
<info>
<entry
path="trunk"
revision="8969"
revision="9060"
kind="dir">
<url>https://josm.openstreetmap.de/svn/trunk</url>
<relative-url>^/trunk</relative-url>
......@@ -11,9 +11,9 @@
<uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
</repository>
<commit
revision="8969">
revision="9060">
<author>Don-vip</author>
<date>2015-10-29T21:15:23.556649Z</date>
<date>2015-11-23T23:04:12.027055Z</date>
</commit>
</entry>
</info>
......@@ -603,7 +603,7 @@ Build-Date: ${build.tstamp}
<target name="checkstyle">
<taskdef resource="com/puppycrawl/tools/checkstyle/ant/checkstyle-ant-task.properties"
classpath="tools/checkstyle/checkstyle-6.11.2-all.jar"/>
classpath="tools/checkstyle/checkstyle-6.12.1-all.jar"/>
<checkstyle config="tools/checkstyle/josm_checks.xml">
<fileset dir="${basedir}/src/org/openstreetmap/josm" includes="**/*.java"
excludes="gui/mappaint/mapcss/parsergen/*.java"/>
......
This diff is collapsed.
......@@ -132,8 +132,7 @@ way[junction ][!highway][junction!=yes],
/* {0.key} without {1.key} or {2.tag} */
*[smoothness ][!highway][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking)$/],
*[segregated ][!highway][railway!=crossing],
*[boat ][!waterway][natural!=water] {
*[segregated ][!highway][railway!=crossing] {
throwWarning: tr("{0} without {1} or {2}", "{0.key}", "{1.key}", "{2.tag}");
}
......@@ -149,7 +148,8 @@ way[junction ][!highway][junction!=yes],
}
/* {0.key} without {1.key}, {2.tag} or {3.tag} */
*[intermittent ][!waterway][natural!~/^(water|spring)$/][ford!=yes] {
*[intermittent ][!waterway][natural!~/^(water|spring)$/][ford!=yes],
*[boat ][!waterway][natural!=water][landuse!=basin] {
throwWarning: tr("{0} without {1}, {2} or {3}", "{0.key}", "{1.key}", "{2.tag}", "{3.tag}");
}
......
......@@ -533,4 +533,24 @@ relation[/^..$/][!to] {
throwWarning: tr("{0} is deprecated", "{0.key}");
suggestAlternative: "addr:postcode";
suggestAlternative: "postal_code";
}
\ No newline at end of file
}
*[water=intermittent] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "intermittent=yes";
fixRemove: "water";
fixAdd: "intermittent=yes";
}
*[type][man_made=pipeline],
*[type][pipeline=marker] {
throwWarning: tr("{0} is deprecated", "{0.key}");
suggestAlternative: "substance";
fixChangeKey: "type => substance";
}
*[landuse=farm] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "landuse=farmland";
suggestAlternative: "landuse=farmyard";
}
......@@ -60,6 +60,7 @@ node[natural=beach],
node[natural=sand],
node[natural=wood],
node[natural=bare_rock],
node[natural=glacier],
node[waterway=riverbank],
node[man_made=bridge],
node[man_made=breakwater],
......
......@@ -12,22 +12,36 @@ S:opengeodb
S:openGeoDB
S:name:
S:note:
S:ref:
S:CLC:
S:tiger:
S:gnis:
S:census:
S:local_authority:
S:au.gov.abs:
S:qroti:
S:is_in
S:wikipedia
S:source:
S:source_ref:
S:historic:
S:proposed:
S:planned:
S:construction:
S:disused:
S:abandoned:
S:removed:
S:demolished:
S:TMC:
S:tmc:
S:parking:lane
;
; Ignore valid and semi-valid keys that equal...
;
E:name
E:loc_name
E:attribution
E:admin_level
E:heritage
E:old_name
E:operator
E:usage
......@@ -61,6 +75,28 @@ E:level
E:brand
E:network
E:incline
E:wikidata
E:zone:maxspeed
E:osmc:symbol
E:de:amtlicher_gemeindeschluessel
E:de:regionalschluessel
E:building:colour
E:building:material
E:roof:colour
E:roof:material
E:roof:height
E:roof:orientation
E:roof:shape
E:turn:lanes
E:turn:lanes:forward
E:turn:lanes:backward
E:area:highway
E:tmc
E:memorial:addr
E:memorial:text
E:memorial:ref
E:wheelchair:description
E:denotation
;
; Ignore valid and semi-valid keys that end with...
;
......@@ -74,164 +110,66 @@ F::conditional
; Misc Tags
;
K:type=is_in
K:bridge=viaduct
K:bridge=aqueduct
K:bridge=swing
K:residential=rural
K:residential=urban
K:surface=earth
K:waterway=rapids
K:bicycle=dismount
K:wall=no
K:man_made=petroleum_well
K:railway=construction
K:office=yes
K:pilgrimage=yes
K:bdouble=yes
K:bdouble=no
K:memorial:type=stolperstein
K:toilets:wheelchair=yes
K:toilets:wheelchair=no
;
; Highway Key/Value Pairs
;
K:highway=motorway_link
K:highway=trunk_link
K:highway=primary_link
K:highway=secondary_link
K:oneway=-1
;
; traffic_calming Tags
;
K:traffic_calming=yes
K:traffic_calming=bump
K:traffic_calming=chicane
K:traffic_calming=cushion
K:traffic_calming=hump
K:traffic_calming=rumble_strip
K:traffic_calming=table
K:traffic_calming=choker
;
; Aeroway Key/Value Pairs
;
K:aeroway=apron
K:aeroway=hanger
K:aeroway=helipad
K:aeroway=runway
K:aeroway=taxiway
K:aeroway=terminal
K:aeroway=aerodrome
K:highway=proposed
K:living_street=yes
;
; Amenity Key/Value Pairs
;
K:amenity=arts_centre
K:amenity=atm
K:amenity=baby_hatch
K:amenity=bank
K:amenity=bbq
K:amenity=bench
K:amenity=biergarten
K:amenity=bicycle_parking
K:amenity=bicycle_rental
K:amenity=bureau_de_change
K:amenity=bus_station
K:amenity=brothel
K:amenity=cafe
K:amenity=car_rental
K:amenity=car_sharing
K:amenity=cinema
K:amenity=college
K:amenity=courthouse
K:amenity=crematorium
K:amenity=dentist
K:amenity=doctors
K:amenity=drinking_water
K:amenity=embassy
K:amenity=emergency_phone
K:amenity=fast_food
K:amenity=ferry_terminal
K:amenity=fire_station
K:amenity=food_court
K:amenity=fountain
K:amenity=fuel
K:amenity=gallery
K:amenity=grave_yard
K:amenity=grit_bin
K:amenity=gym
K:amenity=hospital
K:amenity=hunting_stand
K:amenity=kindergarten
K:amenity=library
K:amenity=marketplace
K:amenity=nightclub
K:amenity=parking
K:amenity=pharmacy
K:amenity=place_of_worship
K:amenity=police
K:amenity=post_box
K:amenity=post_office
K:amenity=prison
K:amenity=pub
K:amenity=public_building
K:amenity=recycling
K:amenity=restaurant
K:amenity=school
K:amenity=shelter
K:amenity=signpost
K:amenity=studio
K:amenity=taxi
K:amenity=telephone
K:amenity=theatre
K:amenity=toilets
K:amenity=townhall
K:amenity=university
K:amenity=vending_machine
K:amenity=veterinary
K:amenity=waste_basket
K:amenity=waste_disposal
K:amenity=swimming_pool
;
; Cuisine Tags
;
K:cuisine=coffee_shop
K:cuisine=fish_and_chips
K:cuisine=pie
;
; Cycleway Tags
;
K:cycleway=lane
K:cycleway=track
K:cycleway=opposite_lane
K:cycleway=opposite
K:cycleway=opposite_track
;
; Historic Tags
;
K:historic=castle
K:historic=monument
K:historic=memorial
K:historic=archaeological_site
K:historic=ruins
K:historic=battlefield
K:historic=wreck
K:historic=yes
;
; Lifecycle Tags
;
;K:historic=yes
K:proposed=yes
K:planned=yes
K:construction=yes
;K:disused=yes
K:abandoned=yes
K:removed=yes
K:demolished=yes
;
; Military Tags
;
K:military=airfield
K:military=bunker
K:military=barracks
K:military=danger_area
K:military=range
K:military=naval_base
;
; Natural Tags
;
K:natural=bay
K:natural=beach
K:natural=cave_entrance
K:natural=cliff
K:natural=fell
K:natural=glacier
K:natural=heath
K:natural=marsh
K:natural=mud
K:natural=peak
K:natural=scree
K:natural=scrub
K:natural=spring
K:natural=tree
K:natural=volcano
K:natural=wetland
;
; Surface Key/Value Pairs
;
K:surface=dirt
K:surface=wood
;
; Relation Tags
;
......@@ -240,40 +178,21 @@ K:relation=from
;
; Christian Denominations
;
K:denomination=anglican
K:denomination=apostolic
K:denomination=baptist
K:denomination=catholic
K:denomination=christian_community
K:denomination=christian_scientist
K:denomination=coptic_orthodox
K:denomination=czechoslovak_hussite
K:denomination=dutch_reformed
K:denomination=evangelical
K:denomination=foursquare
K:denomination=greek_orthodox
K:denomination=jehovahs_witness
K:denomination=kabbalah
K:denomination=karaite
K:denomination=living_waters_church
K:denomination=lutheran
K:denomination=maronite
K:denomination=mennonite
K:denomination=methodist
K:denomination=mormon
K:denomination=new_apostolic
K:denomination=nondenominational
K:denomination=old_catholic
K:denomination=orthodox
K:denomination=pentecostal
K:denomination=presbyterian
K:denomination=protestant
K:denomination=quaker
K:denomination=roman_catholic
K:denomination=russian_orthodox
K:denomination=salvation_army
K:denomination=serbian_orthodox
K:denomination=seventh_day_adventist
K:denomination=united
K:denomination=united_reformed
K:denomination=uniting
......@@ -282,17 +201,14 @@ K:denomination=uniting
;
K:denomination=alternative
K:denomination=ashkenazi
K:denomination=conservative
K:denomination=hasidic
K:denomination=humanistic
K:denomination=liberal
K:denomination=modern_orthodox
K:denomination=neo_orthodox
K:denomination=nondenominational
K:denomination=orthodox
K:denomination=progressive
K:denomination=reconstructionist
K:denomination=reform
K:denomination=renewal
K:denomination=samaritan
K:denomination=ultra_orthodox
......@@ -301,11 +217,8 @@ K:denomination=ultra_orthodox
;
K:denomination=alaouite
K:denomination=druze
K:denomination=ibadi
K:denomination=ismaili
K:denomination=nondenominational
K:denomination=shia
K:denomination=sunni
;
; Pastafarian Denominations
;
......@@ -317,44 +230,7 @@ K:denomination=masonic
;
; Shop Key/Value Pairs
;
K:shop=alcohol
K:shop=bakery
K:shop=beverages
K:shop=bicycle
K:shop=books
K:shop=butcher
K:shop=car
K:shop=car_repair
K:shop=chemist
K:shop=clothes
K:shop=computer
K:shop=confectionery
K:shop=convenience
K:shop=department_store
K:shop=dry_cleaning
K:shop=doityourself
K:shop=electronics
K:shop=florist
K:shop=furniture
K:shop=garden_centre
K:shop=greengrocer
K:shop=hairdresser
K:shop=hardware
K:shop=hifi
K:shop=kiosk
K:shop=laundry
K:shop=mall
K:shop=motorcycle
K:shop=optician
K:shop=organic
K:shop=outdoor
K:shop=sports
K:shop=stationery
K:shop=supermarket
K:shop=shoes
K:shop=toys
K:shop=travel_agency
K:shop=video
;
; Sports Tags
;
......@@ -363,24 +239,10 @@ K:sport=netball
;
; Tourism Tags
;
K:tourism=alpine_hut
K:tourism=attraction
K:tourism=artwork
K:tourism=camp_site
K:tourism=caravan_site
K:tourism=chalet
K:tourism=guest_house
K:tourism=hostel
K:tourism=hotel
K:tourism=information
K:tourism=motel
K:tourism=museum
K:tourism=picnic_site
K:tourism=theme_park
K:tourism=viewpoint
K:tourism=zoo
K:tourism=yes
;
; Type Key/Value Pairs
;
K:type=collection
K:type=tmc
K:type=TMC
......@@ -174,3 +174,10 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
assertMatch: "node amenity=cinema screen=led";
assertNoMatch: "node amenity=cinema screen=8";
}
*[admin_level][admin_level !~ /^(1|2|3|4|5|6|7|8|9|10|11|12)$/] {
throwWarning: tr("unusual value of {0}", "{1.key}");
assertMatch: "node admin_level=0";
assertMatch: "node admin_level=-1";
assertMatch: "node admin_level=13";
assertNoMatch: "node admin_level=5";
}
\ No newline at end of file
......@@ -17,11 +17,11 @@ $pwd = '';
my %lang = map {$_ => 1} (
"ast", "bg", "be", "ca", "ca\@valencia", "cs", "da", "de", "el", "en_AU", "en_GB",
"es", "et", "fi", "fr", "gl", "hu", "id",
"it", "ja", "km", "lt", "nl", "pl", "pt", "pt_BR", "ru", "sk",
"it", "ja", "km", "lt", "nb", "nl", "pl", "pt", "pt_BR", "ru", "sk",
"sv", "uk", "vi", "zh_CN", "zh_TW"
);
my $revision = '$Revision: 31139 $';
my $revision = '$Revision: 31724 $';
$revision =~ s/^.*?(\d+).*$/$1/;
my $agent = "JOSM_Launchpad/1.$revision";
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -19,6 +19,7 @@
/* Landuse type used in multipolygons */ trc("landuse", "farmland");
/* Landuse type used in multipolygons */ trc("landuse", "residential");
/* Landuse type used in multipolygons */ trc("natural", "scrub");
/* Landuse type used in multipolygons */ trc("natural", "wood");
/* relation type */ trc("Relation type", "associatedStreet");
/* relation type */ trc("Relation type", "boundary");
/* relation type */ trc("Relation type", "bridge");
......
......@@ -11,52 +11,36 @@ ARCH="`dpkg --print-architecture 2> /dev/null || true`"