Skip to content
Commits on Source (4)
Show whitespace changes
Inline Side-by-side
.classpath
View file @ 898094d5
......@@ -72,7 +72,17 @@
<attribute name="test" value="true"/>
</attributes>
</classpathentry>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8">
<attributes>
<attribute name="module" value="true"/>
</attributes>
<accessrules>
<accessrule kind="discouraged" pattern="sun/security/**"/>
<accessrule kind="discouraged" pattern="javafx/scene/media/**"/>
<accessrule kind="discouraged" pattern="com/sun/javafx/application/PlatformImpl"/>
<accessrule kind="discouraged" pattern="javafx/util/Duration"/>
</accessrules>
</classpathentry>
<classpathentry exported="true" kind="con" path="GROOVY_SUPPORT">
<attributes>
<attribute name="test" value="true"/>
......
REVISION
View file @ 898094d5
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
kind="dir"
path="trunk"
revision="14824"
kind="dir">
revision="14945">
<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="14824">
revision="14945">
<author>Don-vip</author>
<date>2019-03-02T23:16:03.331839Z</date>
<date>2019-03-31T19:17:00.322141Z</date>
</commit>
</entry>
</info>
data/defaultpresets.xml
View file @ 898094d5
......@@ -203,7 +203,7 @@
<combo key="leisure" text="Type" values="pitch,sports_centre,stadium" default="pitch" />
</chunk>
<chunk id="sport">
<combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rugby_league,rugby_union,running,safety_training,shooting,skateboard,ice_skating,roller_skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
<combo key="sport" text="Sport" values="multi,archery,athletics,american_football,australian_football,baseball,basketball,beachvolleyball,billiards,boules,bowls,canadian_football,canoe,climbing,cricket,croquet,cycling,dog_racing,equestrian,field_hockey,gaelic_games,golf,gymnastics,handball,horse_racing,ice_hockey,karting,model_aerodrome,motocross,motor,pelota,racquet,rc_car,rowing,rugby_league,rugby_union,running,safety_training,shooting,skateboard,ice_skating,roller_skating,soccer,swimming,table_tennis,tennis,volleyball,9pin,10pin" values_context="sport" />
</chunk>
<chunk id="fee">
<combo key="fee" text="Fee" values="yes,no" />
......@@ -280,11 +280,35 @@
<list_entry value="semi_evergreen" short_description="Plants that lose most, but not all, of their foliage for a fraction of the year." />
</combo>
</chunk>
<chunk id="religious">
<text key="name" text="Name" />
<combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" />
<combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,greek_catholic,jehovahs_witness,lutheran,methodist,mormon,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,roman_catholic,shia,sunni" />
<!-- start of religions and denominations -->
<chunk id="religious"> <!-- all religions and denominations -->
<combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" values_searchable="true" />
<combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,conservative,evangelical,greek_catholic,greek_orthodox,ibadi,iglesia_ni_cristo,jehovahs_witness,lutheran,mahayana,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reform,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,shaivism,shaktism,shia,smartism,spiritist,sunni,tibetan,theravada,united,united_methodist,vaishnavism,vajrayana" values_searchable="true" />
</chunk>
<chunk id="religious_catholic_christian"> <!-- special case for wayside_shrine and wayside_cross: all religions and catholic denominations with default to catholic christian -->
<combo key="religion" text="Religion" values="bahai,buddhist,caodaism,christian,confucian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" default="christian" values_searchable="true" />
<combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" values_searchable="true" />
</chunk>
<chunk id="other_religions"> <!-- religions which don't have an own preset -->
<combo key="religion" text="Religion" values="bahai,caodaism,confucian,jain,sikh,spiritualist,taoist,tenrikyo,unitarian_universalist,zoroastrian" match="keyvalue!" values_searchable="true" />
</chunk>
<chunk id="christian_denominations"> <!-- christian denominations -->
<combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,old_catholic,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_searchable="true" />
</chunk>
<chunk id="muslim_denominations"> <!-- muslim denominations -->
<combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
</chunk>
<chunk id="jewish_denominations"> <!-- jewish denominations -->
<combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" /> <!-- values_context because of orthodox, #9629 -->
</chunk>
<chunk id="buddhist_denominations"> <!-- buddhist denominations -->
<combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
</chunk>
<chunk id="hindu_denominations"> <!-- hindu denominations -->
<combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
</chunk>
<!-- shinto and the religions which don't have an own preset don't have denominations (yet) -->
<!-- end of religions and denominations -->
<chunk id="voltage">
<combo key="voltage" text="Voltage in Volts (V)" values="1150000,765000,750000,735000,500000,450000,420000,400000,380000,350000,345000,330000,315000,300000,275000,238000,230000,225000,220000,200000,161000,154000,150000,138000,132000,120000,115000,110000,100000,90000,69000,66000,65000,63000,60000,55000,49000,45000,35000,33000,30000,22000,20000,15000;200000,110000;20000" />
</chunk>
......@@ -832,10 +856,10 @@
<combo key="motorcar" text="Motorcar" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
<combo key="goods" text="Light Commercial Vehicles (goods)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
<combo key="hgv" text="Heavy Goods Vehicles (hgv)" values="yes,official,designated,destination,delivery,permissive,private,agricultural,forestry,no" match="key" />
<combo key="agricultural" text="Agricultural Vehicles (with restrictions e.g. max. 25 km/h)" values="yes,official,designated,destination,permissive,private,no" match="key" />
<combo key="4wd_only" text="4WD only" values="yes,recommended,no" match="key" />
<space />
<label text="Vehicles per use" />
<combo key="agricultural" text="Agricultural" values="yes,official,designated,destination,permissive,private,no" match="key" />
<combo key="emergency" text="Emergency vehicles" values="yes,official,designated,destination,no" match="keyvalue" />
<combo key="hov" text="High-occupancy vehicles (hov)" values="yes,official,designated,destination,permissive,private,no" match="key" />
<combo key="psv" text="Public Service Vehicles (psv)" values="yes,official,designated,destination,permissive,private,no" match="key" />
......@@ -2252,7 +2276,7 @@
<link wiki="Tag:amenity=bicycle_parking" />
<space />
<key key="amenity" value="bicycle_parking" />
<combo key="bicycle_parking" text="Type" values="anchors,building,ground_slots,informal,lockers,rack,shed,stands,wall_loops" />
<combo key="bicycle_parking" text="Type" values="anchors,bollard,building,ground_slots,informal,lockers,rack,shed,stands,wall_loops" />
<text key="name" text="Name" />
<text key="capacity" text="Capacity" />
<reference ref="parking_access_fee_operator_surface_smoothness" />
......@@ -3272,7 +3296,7 @@
<key key="religion" value="christian" />
<text key="name" text="Name" />
<combo key="building" text="Building type" values="basilica,cathedral,chapel,church,temple" values_searchable="true" />
<combo key="denomination" text="Denomination" values="anglican,baptist,catholic,church_of_scotland,evangelical,greek_catholic,greek_orthodox,iglesia_ni_cristo,jehovahs_witness,lutheran,methodist,mormon,new_apostolic,nondenominational,orthodox,pentecostal,presbyterian,protestant,quaker,reformed,roman_catholic,romanian_orthodox,russian_orthodox,serbian_orthodox,seventh_day_adventist,spiritist,united,united_methodist" values_context="christian" values_searchable="true" />
<reference ref="christian_denominations" />
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
......@@ -3285,7 +3309,7 @@
<key key="religion" value="muslim" />
<text key="name" text="Name" />
<combo key="building" text="Building type" values="mosque" values_searchable="true" />
<combo key="denomination" text="Denomination" values="ibadi,nondenominational,shia,sunni" values_searchable="true" />
<reference ref="muslim_denominations" />
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
......@@ -3298,7 +3322,7 @@
<key key="religion" value="jewish" />
<text key="name" text="Name" />
<combo key="building" text="Building type" values="synagogue" values_searchable="true" />
<combo key="denomination" text="Denomination" values="orthodox,conservative,nondenominational,reform" values_context="jewish" values_searchable="true" />
<reference ref="jewish_denominations" />
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
......@@ -3310,7 +3334,7 @@
<key key="amenity" value="place_of_worship" />
<key key="religion" value="buddhist" />
<text key="name" text="Name" />
<combo key="denomination" text="Denomination" values="tibetan,theravada,mahayana,vajrayana" values_searchable="true" />
<reference ref="buddhist_denominations" />
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
......@@ -3322,7 +3346,7 @@
<key key="amenity" value="place_of_worship" />
<key key="religion" value="hindu" />
<text key="name" text="Name" />
<combo key="denomination" text="Denomination" values="vaishnavism,shaivism,shaktism,smartism" values_searchable="true" />
<reference ref="hindu_denominations" />
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
......@@ -3344,7 +3368,7 @@
<space />
<key key="amenity" value="place_of_worship" />
<text key="name" text="Name" />
<combo key="religion" text="Religion" values="bahai,jain,sikh,spiritualist,taoist,unitarian,zoroastrian" match="keyvalue!" values_searchable="true" />
<reference ref="other_religions" />
<reference ref="service_times" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
......@@ -3621,9 +3645,9 @@
<!-- <combo key="couplings:type" text="Coupling standard" values="Bayonet,Barcelona,Guillemin,Klaue,Sprawny,Storz,UNI" /> capitalized values which is contrary to general tagging conventions -->
<text key="couplings:diameters" text="Each coupling diameter (separated by ;)" />
<space />
<combo key="colour" text="Colour" values="blue,green,red,yellow,grey" />
<combo key="bonnet:colour" text="Colour of the top section (bonnet)" values="blue,green,red,yellow,grey" />
<combo key="cap:colour" text="Colour of the caps" values="blue,green,red,yellow,grey" />
<combo key="colour" text="Colour" values="blue,green,red,yellow,grey" values_context="color" />
<combo key="bonnet:colour" text="Colour of the top section (bonnet)" values="blue,green,red,yellow,grey" values_context="color" />
<combo key="cap:colour" text="Colour of the caps" values="blue,green,red,yellow,grey" values_context="color" />
<space />
<text key="manufacturer" text="Manufacturer" />
<text key="operator" text="Operator" />
......@@ -4207,6 +4231,12 @@
<key key="sport" value="canoe" />
<text key="name" text="Name" />
</item> <!-- Canoeing/Kayaking -->
<item name="Rowing" icon="presets/sport/rowing.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:sport=rowing" />
<space />
<key key="sport" value="rowing" />
<text key="name" text="Name" />
</item> <!-- Rowing -->
<item name="Cycling" icon="presets/sport/cycling.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:sport=cycling" />
<space />
......@@ -5347,8 +5377,7 @@
<space />
<key key="historic" value="wayside_cross" />
<text key="name" text="Name" />
<combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" default="christian" />
<combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" />
<reference ref="religious_catholic_christian" />
<text key="start_date" text="Start date" />
<text key="inscription" text="Inscription" />
</item> <!-- Wayside Cross -->
......@@ -5357,8 +5386,7 @@
<space />
<key key="historic" value="wayside_shrine" />
<text key="name" text="Name" />
<combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,shinto,sikh,spiritualist,taoist,unitarian,zoroastrian" default="christian" />
<combo key="denomination" text="Denomination" values="catholic,greek_catholic,old_catholic,orthodox,roman_catholic" default="catholic" />
<reference ref="religious_catholic_christian" />
<check key="amenity" text="Place of worship" value_on="place_of_worship" disable_off="true" />
<combo key="building" text="Building" values="wayside_shrine,yes" values_context="building" />
<text key="start_date" text="Start date" />
......@@ -5842,6 +5870,13 @@
</checkgroup>
<reference ref="link_contact_address_payment" />
</item> <!-- Hairdresser/Barber -->
<item name="Massage" icon="presets/shop/massage.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:shop=massage" />
<space />
<key key="shop" value="massage" />
<reference ref="name_oh_wheelchair" />
<reference ref="link_contact_address_payment" />
</item> <!-- Massage -->
<item name="Tattoo" icon="presets/shop/tattoo.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:shop=tattoo" />
<space />
......@@ -5974,8 +6009,7 @@
<key key="shop" value="gift" />
<reference ref="name_operator_oh_wheelchair" />
<optional>
<combo key="religion" text="Religion" values="bahai,buddhist,christian,hindu,jain,jewish,muslim,sikh,spiritualist,taoist,unitarian,zoroastrian" />
<combo key="denomination" text="Denomination" values="anglican,baptist,catholic,evangelical,jehovahs_witness,lutheran,methodist,mormon,orthodox,pentecostal,presbyterian,protestant,quaker,shia,sunni" />
<reference ref="religious" />
</optional>
<reference ref="link_contact_address_payment" />
</item> <!-- Gift/Souvenir -->
......@@ -6230,6 +6264,7 @@
<link wiki="Tag:office=religion" />
<space />
<key key="office" value="religion" />
<text key="name" text="Name" />
<reference ref="religious" />
<reference ref="oh_wheelchair" />
<reference ref="link_contact_address" />
......@@ -6751,7 +6786,7 @@
<text key="name" text="Name" />
<combo key="grassland" text="Type" values="pampas,prairie,puszta,savanna,steppe,veld" />
</item> <!-- Grassland -->
<item name="Nature Reserve" icon="presets/leisure/nature_reserve.svg" type="node,closedway,multipolygon" preset_name_label="true">
<item name="Nature Reserve" icon="presets/leisure/nature_reserve.svg" type="closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:leisure=nature_reserve" />
<space />
<key key="leisure" value="nature_reserve" />
......@@ -6947,18 +6982,21 @@
<link wiki="Tag:amenity=grave_yard" />
<space />
<key key="amenity" value="grave_yard" />
<text key="name" text="Name" />
<reference ref="religious" />
</item> <!-- Graveyard -->
<item name="Cemetery" icon="presets/landuse/cemetery.svg" type="closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:landuse=cemetery" />
<space />
<key key="landuse" value="cemetery" />
<text key="name" text="Name" />
<reference ref="religious" />
</item> <!-- Cemetery -->
<item name="Religious" icon="presets/religion/religion.svg" type="closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:landuse=religious" />
<space />
<key key="landuse" value="religious" />
<text key="name" text="Name" />
<reference ref="religious" />
</item> <!-- Religious -->
<item name="Retail" icon="presets/shop/mall.svg" type="closedway,multipolygon" preset_name_label="true">
......
data/maps.xsd
View file @ 898094d5
......@@ -122,11 +122,13 @@
</xs:sequence>
</xs:complexType>
<!-- ISO3166-1, taken from http://www.iso.org/iso/country_codes/iso_3166_code_lists.htm + "EU" for Europe -->
<!-- ISO3166-1, taken from https://en.wikipedia.org/wiki/ISO_3166-1_alpha-2#Current_codes + "EU" for Europe -->
<xs:simpleType name="iso3166">
<xs:restriction base="xs:string">
<!-- EUROPE (JOSM ONLY) -->
<xs:enumeration value="EU" />
<!-- KOSOVO (TEMPORARY USER-ASSIGNED CODE) -->
<xs:enumeration value="XK" />
<!-- AFGHANISTAN -->
<xs:enumeration value="AF" />
<!-- ÅLAND ISLANDS -->
......
data/validator/combinations.mapcss
View file @ 898094d5
......@@ -242,16 +242,22 @@ way[highway=footway][oneway=no] {
group: tr("suspicious tag combination");
}
/* {0.tag} together with {1.tag}, see #16861, #16147, #10186 */
/* {0.tag} together with {1.tag}, see #17542, #16861, #16147, #10186 */
way[segregated][bicycle=no],
way[segregated][foot=no],
way[man_made=pipeline][tunnel=flooded],
way[waterway=canal][tunnel=yes],
way[highway=footway][bicycle=designated] {
way[waterway=canal][tunnel=yes] {
throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
group: tr("suspicious tag combination");
}
way[highway=footway][bicycle=designated],
way[highway=cycleway][foot=designated] {
throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
group: tr("suspicious tag combination");
suggestAlternative: "highway=path";
}
/* {0.tag} together with {1.tag} (error level) */
relation[type=multipolygon][area=no] {
throwError: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
......@@ -359,7 +365,7 @@ way[highway=footway][cycleway=lane] {
*[tunnel ][!highway][!railway][!waterway][!piste:type][public_transport!=platform][route!=ferry][man_made!=pipeline][man_made!=goods_conveyor],
*[bridge ][!highway][!railway][!waterway][!piste:type][public_transport!=platform][route!=ferry][man_made!=pipeline][man_made!=goods_conveyor][man_made!=bridge][building!=bridge],
*[psv ][!highway][!railway][!waterway][amenity !~ /^parking.*/],
*[width ][!highway][!railway][!waterway][!aeroway][!cycleway][!footway][!barrier][!man_made][!entrance][natural!=stone],
*[width ][!highway][!railway][!waterway][!aeroway][!cycleway][!footway][!barrier][!man_made][!entrance][natural!=stone][leisure!=track],
*[maxspeed][!highway][!railway][traffic_sign !~ /^((.*;)?maxspeed(;.*)?|[A-Z][A-Z]:.+)$/][type != enforcement][waterway !~ /^(river|canal|lock)$/][!traffic_calming][aerialway!=zip_line] {
throwWarning: tr("{0} on suspicious object", "{0.key}");
group: tr("suspicious tag combination");
......@@ -491,12 +497,9 @@ way[waterway][layer][layer=~/^(-1|-2|-3|-4|-5)$/][!tunnel][culvert!=yes][covered
fixAdd: "unisex=yes";
}
/* {1.key} without {2.tag} see #13138, 14468 */
area:closed[water][natural!~/water|bay|strait/][water!=intermittent] { /* water=intermittent is deprecated and has an own warning */
throwWarning: tr("{0} without {1}", "{1.key}", "{2.tag}");
group: tr("missing tag");
}
way!:closed[water][natural!~/water|bay|strait/][water!=intermittent] {
/* {1.key} without {2.tag} see #13138, #14468 */
way!:closed[water][natural!~/water|bay|strait/][water!=intermittent][amenity!=lavoir], /* water=intermittent is deprecated and has an own warning */
area:closed[water][natural!~/water|bay|strait/][water!=intermittent][amenity!=lavoir] {
throwWarning: tr("{0} without {1}", "{1.key}", "{2.tag}");
group: tr("missing tag");
}
......@@ -546,3 +549,28 @@ way[highway][lanes][!lanes:forward][!lanes:backward][oneway!=yes][oneway!=-1][ju
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}");
}
/* #12502 */
node[leisure=park][natural=tree] {
throwWarning: tr("{0} together with {1} on a node. Remove {0}.", "{0.tag}", "{1.tag}");
group: tr("suspicious tag combination");
fixRemove: "leisure";
}
/* #17305 */
area[boundary=administrative][landuse=residential] {
throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
group: tr("suspicious tag combination");
}
/* #17391 */
way[highway=pedestrian][width][width<3] {
throwWarning: tr("{0} together with {1}", "{0.tag}", "{1.tag}");
suggestAlternative: "highway=footway";
group: tr("suspicious tag combination");
fixAdd: "highway=footway";
assertMatch: "way highway=pedestrian width=0.8";
assertMatch: "way highway=pedestrian width=1";
assertNoMatch: "way highway=pedestrian width=3";
assertNoMatch: "way highway=pedestrian width=5.5";
}
\ No newline at end of file
data/validator/deprecated.mapcss
View file @ 898094d5
......@@ -119,6 +119,14 @@ way[class] {
fixAdd: "shop=bag";
}
/* #17527 */
*[shop=fashion] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "shop=clothes";
group: tr("deprecated tagging");
fixAdd: "shop=clothes";
}
*[shop=organic] {
/* from http://wiki.openstreetmap.org/wiki/Tag:shop=organic */
throwWarning: tr("{0} is deprecated", "{0.tag}");
......@@ -1388,3 +1396,27 @@ node[fire_hydrant:water_source] {
fixChangeKey: "natural => waterway";
group: tr("deprecated tagging");
}
/* #17249 */
*[religion=unitarian] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "religion=unitarian_universalist";
fixAdd: "religion=unitarian_universalist";
group: tr("deprecated tagging");
}
*[shop=shopping_centre] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "shop=mall";
fixAdd: "shop=mall";
group: tr("deprecated tagging");
}
/* #17504 */
*[is_in],
node[/^is_in:.*$/],
way[/^is_in:.*$/] {
throwWarning: tr("{0} is deprecated", "{0.key}");
group: tr("deprecated tagging");
fixRemove: "{0.key}";
}
data/validator/geometry.mapcss
View file @ 898094d5
......@@ -52,7 +52,7 @@ node[boundary=administrative] {
throwWarning: tr("{0} on a node. Should be used on a way or relation.", "{0.tag}");
}
/* {0} on a node, should be an area; #10679 #16528 #16792 */
/* {0} on a node, should be an area; #10679 #16528 #16792 #12502 #17402*/
node[golf=green],
node[golf=bunker],
node[golf=fairway],
......@@ -73,6 +73,8 @@ node[natural=sand],
node[natural=wood],
node[natural=bare_rock],
node[natural=glacier],
node[leisure=park][natural!=tree], /* For nodes with both tags another warning is created in combinations.mapcss */
node[leisure=nature_reserve],
node[waterway=riverbank],
node[man_made=bridge],
node[man_made=breakwater],
......@@ -147,16 +149,6 @@ node[man_made!=monitoring_station][at(0.0,0.0)] {
fixDeleteObject: this;
}
/* #12502 */
node[leisure=park][natural=tree] {
throwWarning: tr("{0} together with {1} on a node. Remove {0}.", "{0.tag}", "{1.tag}");
group: tr("suspicious tag combination");
fixRemove: "leisure";
}
node[leisure=park][natural!=tree] {
throwWarning: tr("{0} on a node. Should be drawn as an area.", "{0.tag}");
}
/* see ticket:#10125 */
node[source:geometry] {
throwWarning: tr("{0} on a node", "{0.key}");
......@@ -288,7 +280,7 @@ way[highway] > node[tourism=information][information=guidepost] {
set guidepost;
throwOther: tr("{0} node connected to a highway", "{1.tag}");
}
way[highway] > node[amenity][!entrance][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking|bus_station|car_wash|ferry_terminal|weighbridge|taxi)$/],
way[highway] > node[amenity][!entrance][amenity!~/^(parking|parking_space|parking_entrance|motorcycle_parking|bicycle_parking|bus_station|car_wash|ferry_terminal|weighbridge|taxi|toilets)$/],
way[highway] > node[building][!entrance],
way[highway] > node[leisure][!entrance][leisure!=slipway],
way[highway] > node[office][!entrance],
......
data/validator/ignoretags.cfg
View file @ 898094d5
# JOSM IgnoreTags
; This is used for checks "key/tag not in presets"
; K: the given tag will not produce a "tag not in presets" error, but it is
; used as dictionary entry for spell checking the given key.
; E: ignore tags with this key
; S: ignore tag if key starts with this string
; F: ignore tag if key ends with this string
; used as dictionary entry for spell checking the given key and also
; for the key/value combination.
; E: ignore tags with this key and add the key to the spell check dictionary.
; S: ignore tag if key starts with this string.
; F: ignore tag if key ends with this string.
;
;
; Ignore valid and semi-valid keys that start with...
......@@ -38,6 +39,7 @@ S:TMC:
S:tmc:
S:parking:lane
S:josm
S:capacity:
;
; Ignore valid and semi-valid keys that equal...
;
......@@ -128,6 +130,7 @@ E:layer
E:end_date
E:start_date
E:expressway
E:border_type
;
; Ignore valid and semi-valid keys that end with...
;
......@@ -361,13 +364,15 @@ K:sport=skating
K:surface=hard
;
; Tags not yet decided (to remove from this section when added or deprecated)
; see josm tickets: 10759 15774 16315 16658 16793
; see josm tickets: 10759 15309 15774 16315 16658 16793
;
K:man_made=mast
K:amenity=childcare
K:landuse=logging
K:indoor=wall
K:indoor=room
K:indoor=corridor
K:highway=corridor
K:historic=citywalls
K:crossing=zebra
K:healthcare=dentist
data/validator/numeric.mapcss
View file @ 898094d5
......@@ -344,6 +344,20 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
assertMatch: "node ele=high";
}
/* #17530 */
*[ele][ele =~ /^-?[0-9]+\.[0-9][0-9][0-9]+$/] {
throwWarning: tr("{0}", "{0.tag}");
group: tr("Unnecessary amount of decimal places");
fixAdd: concat("ele=", round(tag("ele")*100)/100);
assertNoMatch: "node ele=12";
assertNoMatch: "node ele=1.12";
assertMatch: "node ele=12.123";
assertMatch: "node ele=12.1234";
assertMatch: "node ele=-12.6789";
assertNoMatch: "node ele=12.123 m";
assertNoMatch: "node ele=high";
}
/* #15774 */
node[fire_hydrant:pressure="#"] {
throwError: tr("unusual value of {0}", "{0.key}");
......
data/validator/religion.mapcss
View file @ 898094d5
......@@ -8,7 +8,7 @@
assertNoMatch: "node religion=foobar";
}
*[religion=christian][denomination][denomination !~ /^(anglican|apostolic|baptist|catholic|christian_community|christian_scientist|coptic_orthodox|czechoslovak_hussite|dutch_reformed|evangelical|foursquare|greek_catholic|greek_orthodox|jehovahs_witness|kabbalah|karaite|living_waters_church|lutheran|maronite|mennonite|methodist|mormon|new_apostolic|nondenominational|old_catholic|orthodox|pentecostal|presbyterian|protestant|quaker|roman_catholic|russian_orthodox|salvation_army|serbian_orthodox|seventh_day_adventist|spiritist|united|united_reformed|uniting)$/] {
*[religion=christian][denomination][denomination !~ /^(anglican|apostolic|baptist|catholic|church_of_scotland|christian_community|christian_scientist|coptic_orthodox|czechoslovak_hussite|dutch_reformed|evangelical|foursquare|greek_catholic|greek_orthodox|iglesia_ni_cristo|jehovahs_witness|kabbalah|karaite|living_waters_church|lutheran|maronite|mennonite|methodist|mormon|new_apostolic|nondenominational|old_catholic|orthodox|pentecostal|presbyterian|protestant|quaker|reformed|roman_catholic|romanian_orthodox|russian_orthodox|salvation_army|serbian_orthodox|seventh_day_adventist|spiritist|united|united_reformed|united|united_methodist|united_reformed|uniting)$/] {
throwOther: tr("unknown christian denomination");
assertMatch: "node religion=christian denomination=foobar";
assertNoMatch: "node religion=christian denomination=catholic";
......@@ -28,3 +28,10 @@
assertNoMatch: "node religion=jewish denomination=alternative";
assertNoMatch: "node religion=jewish";
}
*[religion=catholic] {
throwWarning: tr("{0}", "{0.tag}");
suggestAlternative: "religion=christian + denomination=catholic";
fixChangeKey: "religion => denomination";
fixAdd: "religion=christian";
}
\ No newline at end of file
data/validator/unnecessary.mapcss
View file @ 898094d5
*[access][highway=proposed],
*[motor_vehicle?][vehicle!=no][access!=no][bicycle_road!=yes][highway =~ /^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential|service|living_street)$/],
*[motor_vehicle?][!vehicle][!access][bicycle_road!=yes][highway =~ /^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|unclassified|residential|service|living_street)$/],
*[bridge=no],
*[building=no],
*[elevation="0"],
......@@ -11,6 +11,8 @@
assertMatch: "way layer=0";
assertMatch: "way bridge=no";
assertMatch: "way highway=proposed access=no";
assertMatch: "way highway=motorway motor_vehicle=yes";
assertNoMatch: "way highway=motorway access=no motor_vehicle=yes";
}
area:closed[amenity ][area?][!highway],
......@@ -34,6 +36,23 @@ area:closed[aeroway=helipad][area?] {
fixRemove: "{2.key}";
}
/* #9257, #17482 */
way[foot =~ /^(yes|designated)$/][highway =~ /^(footway|pedestrian)$/][!access],
way[bicycle =~ /^(yes|designated)$/][highway=cycleway][!vehicle][!access][foot!=designated],
*[building:ruian:type=2][building=farm_auxiliary],
*[building:ruian:type=7][building=house],
*[building:ruian:type=11][building=hotel],
*[building:ruian:type=12][building=warehouse],
*[building:ruian:type=13][building=barn],
*[building:ruian:type=18][building=garage],
*[building:ruian:type=21][building=greenhouse] {
throwWarning: tr("{0} is unnecessary for {1}", "{0.tag}", "{1.tag}");
group: tr("unnecessary tag");
fixRemove: "{0.key}";
assertMatch: "way highway=pedestrian foot=designated";
assertNoMatch: "way highway=pedestrian access=no foot=designated";
}
*[emergency=permissive] {
/* see #9458 - emergency=permissive makes no sense */
throwWarning: tr("{0} makes no sense", "{0.tag");
......@@ -71,3 +90,59 @@ node[emergency=fire_hydrant][fire_hydrant:count=1] {
group: tr("unnecessary tag");
fixRemove: "{1.key}";
}
/* #17100, #17471 */
*[name][name=~/^(?i)(parking|parkplatz)$/][amenity=parking],
*[name][name=~/^(?i)(playground|spielplatz)$/][leisure=playground],
*[name][name=~/^(?i)(shop)$/][shop][shop!=no],
*[name][name=~/^(?i)(building)$/][building][building!=no],
*[name][name=~/^(?i)(house|rumah)$/][building=house],
*[name][name=~/^(?i)(kiosk)$/][shop=kiosk],
*[name][name=~/^(?i)(jalan)$/][highway],
*[name][name=~/^(?i)(silo)$/][man_made=silo],
*[name][name=~/^(?i)(silo)$/][building=silo],
*[name][name=~/^(?i)(cemetery|cmentarz)$/][amenity=graveyard],
*[name][name=~/^(?i)(cemetery|cmentarz)$/][amenity=cemetery],
*[name="АГЗС"][amenity=fuel],
*[name="АЗС"][amenity=fuel] {
throwWarning: tr("{0}", "{0.tag}");
group: tr("descriptive name");
fixRemove: "name";
assertMatch: "node name=parking amenity=parking";
assertMatch: "node name=Parking amenity=parking";
assertNoMatch: "node name=Parking_with_suffix amenity=parking";
assertNoMatch: "node name=Megaparking amenity=parking";
assertMatch: "relation name=parking amenity=parking type=multipolygon";
assertMatch: "relation name=Parking amenity=parking type=multipolygon";
assertNoMatch: "way name=parking";
assertMatch: "relation name=PLAYGROUND leisure=playground type=multipolygon";
assertMatch: "node name=PLaYGrOUNd leisure=playground";
assertMatch: "node name=shop shop=whatever";
assertNoMatch: "node name=shop shop=no";
assertNoMatch: "way name=shop leisure=playground";
assertMatch: "way name=building building=yes";
assertMatch: "way name=building building=house";
assertMatch: "way name=Rumah building=house";
assertNoMatch: "way name=Rumah building=yes";
assertMatch: "way name=house building=house";
assertNoMatch: "way name=house building=yes";
assertMatch: "way name=kiosk building=yes shop=kiosk";
assertNoMatch: "way name=kiosk building=yes";
assertMatch: "way name=silo man_made=silo";
assertMatch: "way name=Silo man_made=silo building=silo";
assertMatch: "way name=Silo building=silo";
assertMatch: "way name=cemetery amenity=graveyard";
assertMatch: "way name=Cmentarz amenity=graveyard";
assertNoMatch: "way name=kiosk amenity=graveyard";
}
*[name][name=~/^(?i)(house|rumah)$/][building][building!=house][building!=no] {
throwWarning: tr("{0}", "{0.tag}");
group: tr("descriptive name");
/* without fixRemove to avoid possible information loss */
assertNoMatch: "way name=building building=yes";
assertNoMatch: "way name=building building=house";
assertNoMatch: "way name=Rumah building=house";
assertMatch: "way name=Rumah building=yes";
assertNoMatch: "way name=house building=house";
assertMatch: "way name=house building=yes";
}
\ No newline at end of file
data/validator/words.cfg
View file @ 898094d5
......@@ -7,7 +7,8 @@
#
# 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 different upper/lower case for keys
# which appear in the presets or the ignoreTags.cfg (prefixes E: and K:)
# There is no need to add bad spelling with leading or trailing blanks.
+abutters
......@@ -39,6 +40,8 @@
-amenty
-maenity
-emenity
+barrier
-barier
+bicycle
-bycycle
-biycle
......@@ -49,14 +52,6 @@
-bikes
+commercial
-comercial
+created_by
-cretaed_by
-crated_by
-creared_by
-creayed_by
-{created_by
-creeated_by
-created_bu
+denomination
-denonimation
-denomionation
......@@ -160,9 +155,6 @@
-onway
-oeway
-eway
+osmarender:nameDirection
-name_direction
-osmarender:name_direction
+railway
-raillway
+source
......@@ -177,8 +169,6 @@
-waterwa
-waterwy
-wateway
+unknown
-unknwon
#
# Not sorted.
#
......@@ -207,8 +197,6 @@
-buiding
-bulding
-buildinq
+city
-citya
+complete
-complite
+construction
......@@ -220,15 +208,10 @@
-descripion
-desription
-decription
+feature
-featuer
+freight
-frieght
+full_name:fa
-full_name:Fa
+highway_border
-highway_boarder
-highway_boreder
+int_name
-iint_name
+junction
......@@ -289,11 +272,6 @@
-note2
+old_name
-oldname
+osmarender:renderName
-osmarender:rendername
-soamrender:renderName
+osmarender:renderRef
-osmrender:renderRef
+postal_code
-posatl_code
+private
......@@ -323,8 +301,6 @@
-tractype
-tracltype
-trackype
+tramline
-tram_line
+tunnel
-tunne
-tunel
......