.classpath

@@ -22,7 +22,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="test/lib/jmockit-1.43.jar">
+	<classpathentry kind="lib" path="test/lib/jmockit.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
@@ -37,7 +37,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-2.5.1.jar">
+	<classpathentry exported="true" kind="lib" path="test/lib/equalsverifier-3.1.2.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
@@ -57,7 +57,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="test/lib/system-rules-1.16.1.jar">
+	<classpathentry kind="lib" path="test/lib/system-rules-1.19.0.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
@@ -67,12 +67,12 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.18.0.jar">
+	<classpathentry exported="true" kind="lib" path="test/lib/wiremock-standalone-2.20.0.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.2.jar">
+	<classpathentry exported="true" kind="lib" path="test/lib/awaitility-3.1.5.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
@@ -83,7 +83,7 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="tools/pmd/commons-lang3-3.7.jar">
+	<classpathentry kind="lib" path="tools/pmd/commons-lang3-3.8.1.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
@@ -98,12 +98,12 @@
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="tools/groovy/groovy-cli-commons-2.5.1.jar">
+	<classpathentry kind="lib" path="tools/groovy/groovy-cli-commons-2.5.5.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="tools/groovy/groovy-xml-2.5.1.jar">
+	<classpathentry kind="lib" path="tools/groovy/groovy-xml-2.5.5.jar">
 		<attributes>
 			<attribute name="test" value="true"/>
 		</attributes>

CONTRIBUTION

@@ -79,6 +79,9 @@ The Windows shortcut parsing code is from StackOverflow:
 - https://stackoverflow.com/a/9403438/2257172
 - https://github.com/codebling/WindowsShortcuts
 
+The gui/animation Christmas GPL code is from Jiri Vanek (Red Hat):
+- http://icedtea.classpath.org/hg/icedtea-web/rev/87d3081ab573
+
 ------------------------------- PROJECTION DATA -------------------------------
 
 Australian A66_National NTV2 grid: Source: Intergovernmental Committee on

REVISION

@@ -3,7 +3,7 @@
 <entry
    kind="dir"
    path="trunk"
-   revision="14460">
+   revision="14620">
 <url>https://josm.openstreetmap.de/svn/trunk</url>
 <relative-url>^/trunk</relative-url>
 <repository>
@@ -11,9 +11,9 @@
 <uuid>0c6e7542-c601-0410-84e7-c038aed88b3b</uuid>
 </repository>
 <commit
-   revision="14460">
-<author>Don-vip</author>
-<date>2018-11-28T00:09:01.043023Z</date>
+   revision="14620">
+<author>stoecker</author>
+<date>2018-12-31T14:09:58.107225Z</date>
 </commit>
 </entry>
 </info>

build.xml

@@ -81,7 +81,7 @@
                 <include name="**/*.jar"/>
             </fileset>
             <pathelement path="${dist.jar}"/>
-            <pathelement path="${pmd.dir}/commons-lang3-3.7.jar"/>
+            <pathelement path="${pmd.dir}/commons-lang3-3.8.1.jar"/>
             <pathelement path="${spotbugs.dir}/spotbugs-annotations.jar"/>
         </path>
         <path id="pmd.classpath">
@@ -496,7 +496,7 @@ Build-Date: ${build.tstamp}
                 inclbootstrapclasses="${jacoco.inclbootstrapclasses}" inclnolocationclasses="${jacoco.inclnolocationclasses}">
                 <junit printsummary="${junit.printsummary}" fork="true" forkmode="once" failureproperty="test.@{testfamily}@{testITsuffix}.failed">
                     <jvmarg value="-Dfile.encoding=UTF-8"/>
-                    <jvmarg value="-javaagent:${test.dir}/lib/jmockit-1.43.jar"/>
+                    <jvmarg value="-javaagent:${test.dir}/lib/jmockit.jar"/>
                     <jvmarg value="--add-modules" if:set="isJava9" unless:set="isJava11" />
                     <jvmarg value="java.activation,java.se.ee" if:set="isJava9" unless:set="isJava11" />
                     <jvmarg value="--add-exports" if:set="isJava9" />
@@ -989,6 +989,23 @@ Build-Date: ${build.tstamp}
             <arg value="${base.dir}"/>
         </java>
     </target>
+    <!--
+      ** update projection test files after an update of projection definitions
+    -->
+    <target name="update-proj-files" depends="test-compile">
+        <java classname="org.openstreetmap.josm.data.projection.ProjectionRefTest" failonerror="true" fork="true">
+            <classpath>
+                <path refid="test.classpath"/>
+                <pathelement path="${test.dir}/build/unit"/>
+            </classpath>
+        </java>
+        <java classname="org.openstreetmap.josm.data.projection.ProjectionRegressionTest" failonerror="true" fork="true">
+            <classpath>
+                <path refid="test.classpath"/>
+                <pathelement path="${test.dir}/build/unit"/>
+            </classpath>
+        </java>
+    </target>
     <!--
       ** generate jdeps dependency graph
     -->

data/maps.xsd

@@ -642,7 +642,7 @@
                             <!-- A description of the imagery source -->
                             <xs:element name="description" minOccurs="0" type="tns:description" />
                             <!-- A unique id for the imagery source -->
-                            <xs:element name="id" minOccurs="0" maxOccurs="1" type="tns:id" />
+                            <xs:element name="id" minOccurs="1" maxOccurs="1" type="tns:id" />
                             <!-- Historic id for the imagery source -->
                             <xs:element name="oldid" minOccurs="0" maxOccurs="unbounded" type="tns:oldid" />
                             <!-- The type. Can be tms, wms and html. In addition, there are the special types bing and scanex 
@@ -680,7 +680,7 @@
                             <xs:element name="terms-of-use-url" minOccurs="0" maxOccurs="1" type="xs:string" />
                             <!-- The image category, don't use enumeration, so future extension is possible -->
                             <!-- Currently defined values are: "photo", "map", "historicmap", "osmbasedmap", "historicphoto" and "other" -->
-                            <xs:element name="category" minOccurs="0" maxOccurs="1" type="xs:string" />
+                            <xs:element name="category" minOccurs="1" maxOccurs="1" type="xs:string" />
                             <!-- The ISO 3166 country code -->
                             <xs:element name="country-code" minOccurs="0" maxOccurs="1" type="tns:iso3166" />
                             <!-- A base64-encoded image that is displayed as menu/toolbar icon -->

data/validator/combinations.mapcss

@@ -87,6 +87,7 @@ way[lanes:backward][!lanes:forward][oneway!=yes][oneway!=-1],
 }
 
 /* {0.key} without {1.tag} */
+node[fire_hydrant:type         ][emergency!=fire_hydrant][disused:emergency!=fire_hydrant],
 *[transformer                  ][!power],
 way[fence_type                 ][barrier!=fence],
 *[recycling_type               ][amenity!=recycling],
@@ -115,6 +116,7 @@ way[waterway=pressurised       ][tunnel!=flooded][man_made!=pipeline] {
 }
 
 /* {0.tag} without {1.key} (warning level) */
+node[emergency=fire_hydrant][!fire_hydrant:type],
 way[boundary=administrative][!admin_level],
 relation[boundary=administrative][!admin_level],
 relation[route=bicycle][!network][type=route],
@@ -525,3 +527,8 @@ way[highway][lanes][!lanes:forward][!lanes:backward][oneway!=yes][oneway!=-1][ju
   assertNoMatch: "way highway=primary lanes=4";
   assertMatch: "way highway=primary lanes=3";
 }
+
+/* #15774 */
+node[emergency=fire_hydrant][fire_hydrant:count][fire_hydrant:count!=1] {
+  throwOther: tr("{0} together with {1}. Tag each hydrant separately.", "{0.tag}", "{1.tag}");
+}
\ No newline at end of file

data/validator/deprecated.mapcss

@@ -1337,3 +1337,37 @@ node[telecom=outdoor_dslam] {
   fixAdd: "telecom=service_device";
   group: tr("deprecated tagging");
 }
+
+/* #15774 */
+node[amenity=fire_hydrant] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "emergency=fire_hydrant";
+  fixChangeKey: "amenity => emergency";
+  group: tr("deprecated tagging");
+}
+node[fire_hydrant:type=pond] {
+  throwWarning: tr("{0} is deprecated", "{0.tag}");
+  suggestAlternative: "water_source=pond";
+  fixAdd: "water_source=pond";
+  fixRemove: "{0.key}";
+  group: tr("deprecated tagging");
+}
+node[fire_hydrant:flow_capacity] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "flow_rate";
+  group: tr("deprecated tagging");
+}
+node[emergency=fire_hydrant][in_service=no] {
+  throwWarning: tr("{0} is deprecated", "{1.tag}");
+  suggestAlternative: "disused:emergency=fire_hydrant";
+  fixAdd: "disused:emergency=fire_hydrant";
+  fixRemove: "{1.key}";
+  fixRemove: "{0.key}";
+  group: tr("deprecated tagging");
+}
+node[fire_hydrant:water_source] {
+  throwWarning: tr("{0} is deprecated", "{0.key}");
+  suggestAlternative: "water_source";
+  fixChangeKey: "fire_hydrant:water_source => water_source";
+  group: tr("deprecated tagging");
+}
\ No newline at end of file

data/validator/geometry.mapcss

@@ -57,6 +57,7 @@ node[golf=green],
 node[golf=bunker],
 node[golf=fairway],
 node[area=yes],
+node[area:highway],
 node[landuse],
 node[natural=scree],
 node[natural=scrub],
@@ -91,6 +92,7 @@ node[restriction] {
 }
 
 /* {0} on a way, should be a node */
+way[emergency=fire_hydrant],
 way[entrance],
 way[door],
 way[railway=subway_entrance],
@@ -314,7 +316,7 @@ area:closed[place=island][eval(areasize()) < 500000] {
 
 /* #15648 */
 way[place=island]!:closed {
-  throwError: tr("Way with {1} not closed.", "{0.tag}");
+  throwError: tr("Way with {0} not closed.", "{0.tag}");
 }
 
 /* #12561 - building larger than Aalsmeer Flower Auction (518000) and Tesla factory (510000) */

data/validator/ignoretags.cfg

@@ -120,6 +120,7 @@ E:capacity
 E:cables
 E:circuits
 E:direction
+E:fire_hydrant:pressure
 ;
 ; Ignore valid and semi-valid keys that end with...
 ;
@@ -221,6 +222,7 @@ K:cuisine=pie
 K:historic=building
 K:historic=wreck
 K:historic=charcoal_pile
+K:historic=heritage
 ;
 ; Landcover Tags
 ;
@@ -325,7 +327,7 @@ K:type=tmc
 K:type=TMC
 ;
 ; Tags not yet decided (to remove from this section when added or deprecated) 
-; see josm tickets: 10759 16315 16658 16793
+; see josm tickets: 10759 15774 16315 16658 16793
 ;
 K:man_made=mast
 K:amenity=childcare

data/validator/numeric.mapcss

@@ -343,3 +343,8 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
   assertNoMatch: "node ele=12";
   assertMatch: "node ele=high";
 }
+
+/* #15774 */
+node[fire_hydrant:pressure="#"] {
+  throwError: tr("unusual value of {0}", "{0.key}");
+}
\ No newline at end of file

data/validator/territories.mapcss

@@ -10,8 +10,15 @@
 *[addr:street =~ /(?i).*Strasse.*/][addr:street !~ /(?i).*Strasser.*/][inside("DE,AT")],
 *[name =~ /(?i).*Strasse.*/][name !~ /(?i).*Strasser.*/][inside("DE,AT")] {
   throwError: tr("street name contains ss");
+  assertMatch: "way name=Hauptstrasse";
+  assertNoMatch: "way name=Hauptstraße";
+  assertNoMatch: "way name=Kapitän-Strasser-Straße";
+  assertNoMatch: "way name=Peter-Strasser-Platz";
+  
 }
 *[addr:street =~ /(?i).*Straße.*/][inside("LI,CH")],
 *[name =~ /(?i).*Straße.*/][inside("LI,CH")] {
   throwError: tr("street name contains ß");
+  assertMatch: "way name=Hauptstraße";
+  assertNoMatch: "way name=Hauptstrasse";
 }
\ No newline at end of file

data/validator/unnecessary.mapcss

@@ -64,3 +64,10 @@ way[waterway][oneway=-1] {
   throwWarning: tr("{0} is unnecessary for {1}. The flow direction is defined by the way direction.", "{1.key}", "{0.key}");
   group: tr("unnecessary tag");
 }
+
+/* #15774 */
+node[emergency=fire_hydrant][fire_hydrant:count=1] {
+  throwWarning: tr("{0} is unnecessary for {1}", "{1.tag}", "{0.tag}");
+  group: tr("unnecessary tag");
+  fixRemove: "{1.key}";
+}
\ No newline at end of file

data/validator/words.cfg

@@ -2,11 +2,14 @@
 #
 # special symbols, must be first character:
 #  # Comment
-#  + correctly spelled word
-#  - incorrectly spelled word. Must follow correctly spelled word before next correctly spelled word.
+#  + correctly spelled key
+#  - incorrectly spelled key. Must follow correctly spelled key before next correctly spelled key.
 #
 # There must not be any white space before or after words, unless they are to be included in
 # the bad spelling.
+# There is no need to add bad spelling with different upper/lower case.
+# There is no need to add bad spelling with leading or trailing blanks.
+
 +abutters
 -abuters
 -abbutter
@@ -14,10 +17,6 @@
 -abuttors
 -abuutters
 -ubutters
-+abutter
-+address
-+aka
-+ambulance
 +amenity
 -ameninty
 -amienty
@@ -26,7 +25,6 @@
 -amenety
 -amenitry
 -amnity
--amenity 
 -amentiy
 -aminity
 -amneity
@@ -36,51 +34,29 @@
 -ammenity
 -ameinty
 -anemity
--amneity
 -amemity
 -ameity
--amenity:
 -amenty
--Amenity
 -maenity
 -emenity
-+amenitylanduse
-+atm
-+Atta Oehlaweg
 +bicycle
 -bycycle
 -biycle
 -bycicle
 -bicyle
-+bike
+-cycle
 -bike
-+biological
-+by
-+City
-+class
--Class
-+classification
-+ele
-+emity
-+email
-+code_departement
-+code_INSEE
+-bikes
 +commercial
 -comercial
-+comment
-+COMMENTLINE
-+confirmed
 +created_by
--created by
 -cretaed_by
 -crated_by
 -creared_by
 -creayed_by
 -{created_by
-- created_by
 -creeated_by
 -created_bu
-+crossing
 +denomination
 -denonimation
 -denomionation
@@ -91,18 +67,14 @@
 -denomincation
 -denominatation
 -denoination
-+domination
-+faith
-+footway
 +foot
-- foot
 -foor
 +height
 -hieght
 +highway
 -higwhay
+-highways
 -highwaay
--HighWay
 -huighway
 -highwayt
 -ghway
@@ -114,7 +86,6 @@
 -hiway
 -hihjway
 -higheway
--highwaY
 -hughway
 -hihgway
 -higoway
@@ -123,7 +94,6 @@
 -gighway
 -higyway
 -hichway
--HIGHWAY
 -hingway
 -hhighway
 -highwayu
@@ -133,9 +103,7 @@
 -hifhway
 -hihway
 -hifgway
--highway:
 -highjway
--highway 
 -highwy
 -hgihway
 -highawy
@@ -145,43 +113,22 @@
 -hignway
 -higway
 -highwayx
-- highway
 -hoghway
 -highwa
--Highway
 -hghway
-+highways
-+highspeed
-+highwaytype
-+highway_type
-+highwayunclassified
-+horse
-+hvg
-+iata_ref
-+icao_ref
-+IM2
 +image
 -imaqge
-+island
 +layer
--layer 
 -leyer
 -lyaer
-- layer
-+layer2
-+layers
-+layout
 +leisure
 -leissure
 -leiruse
 -lesure
--leisure 
--Leisure
 -liesure
 -lieusure
 -lesiure
 -leasure
-+naam
 +name
 -nane
 -nme
@@ -195,26 +142,11 @@
 -namw
 -bame
 -nam
-- name
 -namr
--name 
 -anme
--Name
--name:
--NAME
--name;
-+name_1
-+name_4
-+named_by
-+names
-+name_right
-+name_left
-+note
--Note
 +note:fa
 -note:fa 
 -notes:fa
-+Number
 +oneway
 -aneway
 -onewway
@@ -226,39 +158,13 @@
 -omeway
 -one_way
 -onway
-- oneway
 -oeway
 -eway
-+onte
 +osmarender:nameDirection
 -name_direction
--name-direction
 -osmarender:name_direction
-+place
--place 
--Place
-+passing
-+passing_places
 +railway
-- railway
--Railway
 -raillway
-+re
-+regional_name
-+ref
--ref 
--ref:
--Ref
-+ref:fa
-+ref:source
-+ref_nat
-+ref_int
-+retail
-+time
-+seats
-+seventh_wonder_of_world
-+square
-+soccer
 +source
 -sorce
 -soruce
@@ -267,52 +173,15 @@
 -sourec
 -aource
 -sourse
-+source2
-+source:ncn_ref
-+source:highway
-+SSSI
-+status
-+way
 +waterway
-- waterway
 -waterwa
--Waterway
 -waterwy
 -wateway
-+wood
 +unknown
 -unknwon
 #
 # Not sorted.
 #
-+ 
-+1
-+4wd
-+ car
-+ class
-+ horse
-+ sport
-+ open 09:00 - 16:00 daily
-+ General McArthur lived here
-+ Also coaches
-+80n:ibm
-+amenities
-+bar
-+batteries
-+Bezeichnung
-+boder
-+Brand
-+Food
-+Fussweg
-+Hauptstrasse
-+POI
-+Park
-+Strasse
-+abutment
-+abutts
-+access
-+accident_and_emergency
-+active_volcano
 +aerialway
 -areilway
 -areialway
@@ -321,276 +190,47 @@
 -aeoroway
 -areoway
 -airoway
-+ageofdgpsdata
 +airport
 -aeroport
-+airport_ident
-+airport_ref
-+airway
-+alias
-+alt
-+altname
-+alt_name
-+alt_name_2
-+alternative_name
-+altitude
-+alt_ref
-+ame
-+annotation
-+annotate
-+angle
-+angle_to_last
-+appearance
-+approximate
-+area
-+art
-+ascii_name
-+asphalt
-+author
-+autocar
-+b test tag
-+badminton
-+barnvagn
-+barrier
-+bb:name
-+beach
-+bicycleRoute
-+bicycle_Route
-+blackadder:name
-+blackadder:commerce
-+blackadder:cuisine
-+blackadder:service
-+blackadder:civic
-+bicycles
-+boat
-+bogus_footpath_going_nowhere
-+border
-+borded
-+border_edit
-+border_type
-+bottles
-+boundary
-+boundary_name
-+boundary_type
-+branch
-+branch_code:fa
-+branch_name:fa
-+brand
-+brewery
 +bridge
 -brideg
-- bridge
 -brdige
 -bridgde
 -birdge
--   bridge
 -bidge
 -brige
 -brigde
 -bridgw
-+bridge_ref
-+bridge_name
-+bridleway
 +building
 -buidling
 -buillding
 -buiding
 -bulding
-+building_name
-+build_date
-+bus
-+buss
-+busway
-+bus_routes
-+building_type
-+cafe
-+capacity
-+Car
-+car
-+carriage
-+cars
-+car park at rear
-- car park at rear
-+car_repair
-+carsharing
-+category
-+caution
-+charge
-+chemin
-+checked_by
-+cheshire_cycleway_ref
-+christian_denomination
-+cladding
+-buildinq
 +city
 -citya
-+city_id
-+clinic
-+clothes
-+cmt
 +complete
-- complete
 -complite
-+condition
 +construction
-+controlled
-+converted_by
-+core
-+cost
-+country
-+course
-+cover
-+covered
-+creator
-+cycle
--cyle
-+cycleRoute
-+cycle_route
+-constrution
+-contruction
 +cycleway
 -cylceway
--cycleway:
-+cykel
-+cuisine
-+cusine
-+cutting
-+d_lat
-+d_lon
-+danger
-+date
-+date_off
-+day_off
-+day_on
-+dead-end
-+deadend
-+depth
-+desc
 +description
 -descripion
 -desription
 -decription
-+descriptions
-+ details:naco
-+destination
-+difficulty
-+direction
-+direction_to
-+dispensing
-+distance
-+distance_meter
-+disused
-+ECautomaton
-+edited_some_more_by
-+editor
-+editor note
-+ef
-+elevated
-+embankment
-+emergency
-+emergency_ward
-+error
-+exit
-+exit_nr
-+exit_name
-+external_description
-+external_link
-+ev_charge
-+facility
-+farezone
-+farm_vehicles
-+fastfood
-+FACC_CODE
 +feature
 -featuer
-+feature: NGIA map
-- feature: NGIA map
-+features
-+feet
-+ferry
-+fenced
-+fire
-+first_number
-+fix
-+fixme
-+FIXME
-+foobar
-+food
-+footpath
--fottpath
-+forrest
-+foto
-+free
 +freight
 -frieght
-+from_to
-+from_zip
-+fuel_diesel
-+fuel_lpg
-+fuel_octane_91
-+fuel_octane_95
-+fuel_octane_98
 +full_name:fa
 -full_name:Fa
-+full_name
-+gate
-+geoname_id
-+glass
-+glass_bottles
-+glutenfree
-+gluten_free
-+goods
-+gps_network
-+grade
-+grind
-+gym
-+halt
-+hazard
-+hame
-+has_postalcode
-+hdop
-+helped_by
-+heritage
-+hgv
-+highway E-number
 +highway_border
 -highway_boarder
 -highway_boreder
-+hill
-+historic
-+historic name
-+historical
-+history
-+Higgy:ref
-+hotelclass
-+hospital:operator
-+hour_off
-+hour_on
-+hours
-+house_numbers
-+iata
-+icao
-+id
--ID
-+import_ref
-+incomplete
-+incline_steep
-+incline
-+industrial
-+info
-+ info :naco
-+infopoint
-+informal_name
 +int_name
--int name
 -iint_name
-+int_ref
-+interpolation
-+intersection
-+is
-+is_in
--is in
-- is_in
-+in_in
-+is_in:de
-+is_in:es
 +junction
 -junktion
 -junctoin
@@ -599,83 +239,29 @@
 -junctiion
 -jounction
 -jumction
-- junction
 -juction
--Junction
--junction 
-+junction_ref
-+junction:ref
-+junction:name
-+key
-+Kingsmede
-+label
 +landuse
 -land_use
 -lansuse
 -lanudse
 -lanuse
-+lane
-+lanes
--Lanes
-+last_number
-+ Last Edit: Batchoy 2006-12-14
-+learning
-+length
-+level
-+level crossing
-+license
-+liftStation
-+liftType
-+lighthouse
-+line
-+lines
-+link:naming
-+linje
-+lit
-+loc_ref
-+loc_ref:fa
-+loc_name
--loc_name 
-+loc_name:fa
 +local_name
 -local_nama
-+local_ref
-+locality
-+lock
-+lock_gate
-+long_name
-+lorries
-+Loyola Heights
-+ma,e
-+main
-+major
 +man_made
--man-made
--man_made 
 -mand_made
 -nan_made
 -madmade
 -manmade
-+mapkey
-+maplint:error
-+maplint:notice
-+maplint:warning
 +mapping_status
 -mappingstatus
--mappingstatus
-+markedtrail
-+marker
-+marching_step
 +minspeed
 -min_speed
 +maxspeed
 -maspeed
 -max_speed
--max speed
 -maxsepeed
 -maxseep
 -mayspeed
--maxspeed 
 -maxpeed
 +maxheight
 -max_hieght
@@ -685,431 +271,63 @@
 -max_weight
 -max_wieght
 -maxweihgt
-+maxwidth
-+membership
-+memorial
-+menu
-+military
-+missing_street
-+mixed
-+monument
-+more_data
-+motor
-+motorbike
 +motorcar
 -otorcar
-- motorcar
 -motocar
-+motor_car
-+motorcars
+-motorcars
 -motocars
 +motorcycle
 -motorcylce
 -motocycle
--motorcycle 
-+motorway
-+motorway station
-+motorway_junction
-+munro
-+museum
-+nad_ref
-+name.2
-+name.alt
-+name.en
-+name:ar
-+name:af
-+name:cy
-+name:de
-+name:en
-+name:en-cy
-+name:es
-+name:eu
-+name:fa
-+name:fi
-+name:fr
-+name:gd
-+name:la
-+name:my
-+name:nl
-+name:non
-+name:ru
-+name:sv
-+name.se
-+name.short
-+name:zh-Latn
-+name1
-+name2
-+name_alt
-+name int
-+name_int
-+name:source
-+name_source
-+name:cym
-+name_ie
-+name_loc
-+name_segment
-+namelayer
-+name:ref
-+name_ref
-+nat_name
-+nat_ref
-+nat_pref
-+nat_reg
 +natural
 -nataural
-- natural
 -natrual
 -nautral
--natural 
-+natural2
-+nature
-+navigable
-+ncn_name
-+ncn_ref
-+ncn:ref
-+ncn_route
-+needs_to_be
-+network
-+net_ref
-+newforest:pathtype
-+newsagent_code
-+nickb_marker
-+nickname
-+nlanes
-+noat
-+node
-+noentry
-+noexit
-- noexit
-+notes
 +note_1
 -note_!
 +note_2
 -note2
-+note_3
-+note_4
-+note_
-+noturn
-+number
-+numbers
-+obstacles
-+obstruction
-+official
-+ojw2
-+ojw_test
 +old_name
 -oldname
-+old_name:fa
-+old_full_name:fa
-+old_ref
-+opened
-+open_in
-+operator
-+opm:capacity
-+opm:difficulty
-+opm:liftStation
-+opm:liftType
--opm:lifttype
 +osmarender:renderName
 -osmarender:rendername
 -soamrender:renderName
 +osmarender:renderRef
 -osmrender:renderRef
-+owner
-+owners
-+park_and_ride
-+parking
-+parking:cost
-+parking:spaces
-+passenger
-+path
-+paved
-+pcv_only
-+pdop
-+pedestrian
-+pedestrians
-+permissive
-+petrol lhs
-+petrol petron
-+petrol
-+phone
-+phone_number
-+physical
-+place_postal
-+place numbers
-+place_code
-+place_name
-- place_name
-+place_numbers
-+place_of_worship
-+plave
-+playe
-+plant
-+poi
-+point_of_interest
-+population
-+popul
-+port
-+position_accuracy
-+possible_name
-+post_code
 +postal_code
-- postal_code
 -posatl_code
-+postcode
-+post_office
-+power
-+primary
 +private
 -privat
-+provided
-+Properties
-+problem
-+psv
-+public
-+public_transportation
-+punting
-+quality
-+rail
-+railroad
-+railway_tracks
-+ramp
-+recreation
-+recycling
-+recycling:batteries
-+recycling:bicycles
-+recycling:books
-+recycling:clothing
-+recycling:clothes
 +recycling:glas
 -recyling:glas
-+recycling:shoes
-+recycling:engine_oil
-+recycling:glass_bottles
-+recycling:green_waste
-+recycling:magazines
-+recycling:mobile_phones
-+recycling:newspaper
-+recycling:newspapers
-+recycling:printer_cartridges
-+recycling:cardboard
-+recycling:music
 +recycling:paper
 -reycling:paper
-+recycle:plastic_bottles
-+recycle:paper
-+recycle:magazines
-+recycle:cardboard
-+recycle:cans
-+recycling:cans
-+recycling:plastic_bottles
-+recycline:cardboard
-+recycle:glass_bottles
-+recycling:cork
-+recycling:glass
-+recycling:plastic
-+recycling:plastic_bags
-+recycling:plasic_bottles
-+recycling:scrap_metal
-+recycling:white_goods
-+recycling:wood
-+recycling:tyres
-+red
-+reference
-+ref_direction
-+reg
-+reg_name
-+reg_ref
-+reg_reg
-+region_id
 +religion
 -relgion
-+residence
 +residential
 -residentail
 +restriction
 -restrction
--Restriction
-+restricted
-+restrictions
--Restrictions
--Restrictions 
-+riverwidth
-+river_width
-+road
-+rollerblade
-+roundabout
-+route
-+routing
-+rue
-+runway
-+sat
-+sculpture
-+service
-+shape
-+sheltered
-+shortcut
-+sidewalk
-+sign
-+single_track
-+singletrack
-+shop
-+shopping
-+size
-+ski
-+slope
-+snowboarding
-+some_data
-+source:loc_name
-+source:old_name
-+source:old_ref
 +source:name
 -source:Name
-+source:ref
-+source_ref
-+source_ref:ref
-+source_ref:name
-+source:uri
-+source_uri
 +source:url
 -source_url
-+source:oneway
-+southglos:heritagetrail
-+species
-+speed
-+speed_limit
-+speed limit
-+speedlimit
-+speedevil
-+sport
-+sport_2
-+sports
-+stairs
-+start_date
-+state
-+station
-+stream
-+street
-+street_name
-+steps
-+structure
-+subtype
-+suburb
-+suggested
 +surface
 -sruface
-+surfaced
-+survey_ref
-+survey
-- survey
-+svg:font-size
-+svg:stroke-width
-+svg_font-size
-+svg:stroke-dasharray
-+swimming
-+sym
-+symbol
-+symbolic
-+tag
-+taxi
-+telephone
-+telephone:operator
-+telephone_number
-+telephonenumber
-+telephone_type
-+test
-+testing
-+testnode
-+ this was a children's playarea with a path leading through it. Didn't want to look too dodgy :)
-+the Netherlands
-+NL
-+thoroughfare
-+time_diff
-+times
-+tractor
-+track
-+tracktype_1
-+to_zip
-+todo
-+TODO
-+toll
-+tollway
-+topspeed
 +tourism
 -tourismn
 -tourim
--tourism 
 -toursim
 -touristm
-+tourist
-+tourist_attraction
-+towards
-+town
-+towpath
-+tracks
-+traffic
-+traffic_signals
-+train
 +tracktype
 -tractype
 -tracltype
 -trackype
-+tram
 +tramline
 -tram_line
-+true
-+truck
-+tube
-+tune
 +tunnel
 -tunne
--tunnel 
--Tunnel
 -tunel
 -tunnely
-+turn_right
-+typ
 +type
 -tyoe
-+type.en
-+uk:row
-+unclassified
-+upload_tag
-+uploader
-+uploaded_by
-+uri
-+url
-+use
-+use_status
-+usage
-+utility
-+vdop
-+vehicle
-+viaduct
-+vicar
-+view
-+village
-+visited_by
-+volcano
-+voltage
-+warning
-+water
-+waterfall
-+wayclass
-+waypoint
-+web
-+website
-+website:official
-+weight_limit
-+wide
-+width
-+width_restriction
-+wiki
-+wikipedia
-+wikipedia:es
-+wiki:nl
-+wrong
-+www
-+zip
-+zip_code
-+{}