Skip to content
Commits on Source (5)
Show whitespace changes
Inline Side-by-side
REVISION
View file @ 46628bda
......@@ -2,7 +2,7 @@
<info>
<entry
path="trunk"
revision="15322"
revision="15390"
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="15322">
revision="15390">
<author>Don-vip</author>
<date>2019-08-26T06:55:27.395789Z</date>
<date>2019-09-29T21:59:43.125303Z</date>
</commit>
</entry>
</info>
build.xml
View file @ 46628bda
......@@ -197,7 +197,7 @@ Build-Date: ${build.tstamp}
<attribute name="Codebase" value="josm.openstreetmap.de"/>
<attribute name="Application-Name" value="JOSM - Java OpenStreetMap Editor"/>
<!-- Java 9 stuff. Entries are safely ignored by Java 8 -->
<attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509 java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi javafx.graphics/com.sun.javafx.application jdk.deploy/com.sun.deploy.config" />
<attribute name="Add-Exports" value="java.base/sun.security.util java.base/sun.security.x509 java.desktop/com.apple.eawt java.desktop/com.sun.imageio.spi java.desktop/com.sun.imageio.plugins.jpeg javafx.graphics/com.sun.javafx.application jdk.deploy/com.sun.deploy.config" />
<attribute name="Add-Opens" value="java.base/java.lang java.base/java.nio java.base/jdk.internal.loader java.base/jdk.internal.ref java.desktop/javax.imageio.spi java.desktop/javax.swing.text.html java.prefs/java.util.prefs" />
</manifest>
<service type="java.text.spi.DecimalFormatSymbolsProvider" provider="org.openstreetmap.josm.tools.JosmDecimalFormatSymbolsProvider" />
......@@ -786,11 +786,13 @@ Build-Date: ${build.tstamp}
<ignore classname="io.*"/>
<ignore classname="it.*"/>
<ignore classname="java.lang.invoke.MethodHandle"/>
<ignore classname="java.util.list.kotlin.*"/>
<ignore classname="javax.*"/>
<ignore classname="jdk.swing.interop.*"/>
<ignore classname="jogamp.*"/>
<ignore classname="junit.*"/>
<ignore classname="kdu_jni.*"/>
<ignore classname="kotlin.*"/>
<ignore classname="net.*"/>
<ignore classname="netscape.*"/>
<ignore classname="nu.*"/>
......@@ -805,6 +807,8 @@ Build-Date: ${build.tstamp}
<ignore classname="org.ejml.*"/>
<ignore classname="org.fusesource.*"/>
<ignore classname="org.gdal.*"/>
<ignore classname="org.geotools.data.h2.*"/>
<ignore classname="org.geotools.gce.imagemosaic.*"/>
<ignore classname="org.hibernate.*"/>
<ignore classname="org.hsqldb.*"/>
<ignore classname="org.ibex.*"/>
......@@ -823,6 +827,7 @@ Build-Date: ${build.tstamp}
<ignore classname="org.jvnet.*"/>
<ignore classname="org.kxml2.*"/>
<ignore classname="org.objectweb.*"/>
<ignore classname="org.opentest4j.*"/>
<ignore classname="org.osgi.*"/>
<ignore classname="org.postgresql.*"/>
<ignore classname="org.python.*"/>
......
data/defaultpresets.xml
View file @ 46628bda
......@@ -336,7 +336,7 @@
<combo key="circuits" text="Amount of circuits" values="1,2,3,4" />
</chunk>
<chunk id="power_loc">
<combo key="location" text="Location" values="outdoor,indoor,underground,platform,rooftop" values_context="power" />
<combo key="location" text="Location" values="outdoor,indoor,underground,platform,roof" values_context="power" />
</chunk>
<chunk id="power_extra">
<reference ref="power_loc" />
......@@ -2110,7 +2110,7 @@
</group> <!-- Aerialway -->
<separator/>
<group name="Car" icon="presets/shop/vehicle.svg">
<item name="Parking" icon="presets/vehicle/parking/parking.svg" type="node,closedway,multipolygon" preset_name_label="true">
<item name="Parking" name_context="car" icon="presets/vehicle/parking/parking.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:amenity=parking" />
<space />
<key key="amenity" value="parking" />
......@@ -2313,7 +2313,7 @@
</item> <!-- Sharing -->
</group> <!-- Car -->
<group name="Motorcycle" icon="presets/vehicle/motorbike.svg">
<item name="Parking" icon="presets/vehicle/parking/motorbike.svg" type="node,closedway,multipolygon" preset_name_label="true">
<item name="Parking" name_context="motorcycle" icon="presets/vehicle/parking/motorbike.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:amenity=motorcycle_parking" />
<space />
<key key="amenity" value="motorcycle_parking" />
......@@ -2345,7 +2345,7 @@
</item> <!-- Motorcycle Dealer -->
</group> <!-- Motorcycle -->
<group name="Bicycle" icon="presets/shop/bicycle.svg">
<item name="Parking" icon="presets/vehicle/parking/bicycle.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
<item name="Parking" name_context="bicycle" icon="presets/vehicle/parking/bicycle.svg" type="node,way,closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:amenity=bicycle_parking" />
<space />
<key key="amenity" value="bicycle_parking" />
......@@ -2670,6 +2670,9 @@
<key key="aeroway" value="helipad" />
<optional>
<text key="ref" text="Reference" />
<text key="iata" text="IATA" />
<text key="icao" text="ICAO" />
<text key="wikipedia" text="Wikipedia" />
</optional>
</item> <!-- Helipad -->
<item name="Apron" icon="presets/transport/airport/apron.svg" type="closedway,multipolygon" preset_name_label="true">
......@@ -6622,7 +6625,7 @@
<reference ref="name_operator_oh_wheelchair" />
<reference ref="link_contact_address" />
</item> <!-- Window construction -->
<item name="Carpenter" type="node,closedway,multipolygon" preset_name_label="true">
<item name="Carpenter" icon="presets/craft/carpenter.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:craft=carpenter" />
<space />
<key key="craft" value="carpenter" />
......@@ -6694,7 +6697,7 @@
<reference ref="name_operator_oh_wheelchair" />
<reference ref="link_contact_address" />
</item> <!-- Blacksmith -->
<item name="Metal construction" type="node,closedway,multipolygon" preset_name_label="true">
<item name="Metal construction" icon="presets/craft/metal_construction.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link wiki="Tag:craft=metal_construction" />
<space />
<key key="craft" value="metal_construction" />
......
data/validator/combinations.mapcss
View file @ 46628bda
......@@ -115,7 +115,9 @@ way[cutline ][man_made!=cutline],
group: tr("missing tag");
}
/* {0.key} without {1.tag} or {2.tag} */
/* {0.key} without {1.tag} or {2.tag}, #15107 */
*[iata ][aeroway!=aerodrome][aeroway!=helipad],
*[icao ][aeroway!=aerodrome][aeroway!=helipad],
*[bridge:movable ][bridge!=movable][man_made!=bridge],
*[substation ][power!=substation][pipeline!=substation],
*[reservoir_type ][landuse!=reservoir][water!=reservoir],
......@@ -140,13 +142,16 @@ relation[route=ski ][!piste:type][type=route],
*[leisure=pitch][!sport],
*[aeroway=terminal][!building],
*[power=generator][!generator:source],
*[amenity=recycling][!/^recycling:/],
*[amenity=social_facility][!social_facility],
*[amenity=place_of_worship][!religion] {
throwWarning: tr("{0} without {1}", "{0.tag}", "{1.key}");
group: tr("missing tag");
}
/* {0.tag} without {1.key} (info level) */
/* {0.tag} without {1.key} (info level), #15107 */
*[aeroway=runway ][!ref],
*[aeroway=runway ][!surface],
way[highway=track ][!tracktype],
way[power=cable ][!location],
node[power=transformer ][!voltage:primary],
......
data/validator/deprecated.mapcss
View file @ 46628bda
......@@ -189,6 +189,20 @@ way[class] {
fixAdd: "power=substation";
}
*[location=rooftop] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "location=roof";
group: tr("deprecated tagging");
fixAdd: "location=roof";
}
*[generator:location] {
throwWarning: tr("{0} is deprecated", "{0.key}");
suggestAlternative: "location";
group: tr("deprecated tagging");
fixChangeKey: "generator:location => location";
}
*[generator:method=dam] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "generator:method=water-storage";
......@@ -1771,3 +1785,11 @@ way[/^is_in:.*$/] {
fixRemove: "crossing";
fixAdd: "crossing:island=yes";
}
/* #18152 */
*[recycling:metal] {
throwWarning: tr("{0} is deprecated", "{0.key}");
suggestAlternative: "recycling:scrap_metal";
group: tr("deprecated tagging");
fixChangeKey: "recycling:metal => recycling:scrap_metal";
}
data/validator/ignoretags.cfg
View file @ 46628bda
......@@ -63,7 +63,14 @@ E:source:boundary
E:hour_on
E:hour_off
E:tower:type
E:icn
E:ncn
E:rcn
E:lcn
E:icn_ref
E:ncn_ref
E:rcn_ref
E:lcn_ref
E:place_name
E:cycleway
E:abutters
......@@ -132,6 +139,8 @@ E:end_date
E:start_date
E:expressway
E:border_type
E:faa
E:dataset
;
; Ignore valid and semi-valid keys that end with...
;
......@@ -194,6 +203,7 @@ K:glacier:type=rock
K:glacier:type=mountain
K:glacier:type=ice_tongue
K:glacier:type=icecap
K:waterway=artificial
K:waterway=drystream
K:allotments=plot
K:land_area=administrative
......@@ -371,7 +381,7 @@ K:sport=skating
K:surface=hard
;
; Tags not yet decided (to remove from this section when added or deprecated)
; see josm tickets: 17770 10759 15309 15774 16315 16658 16793
; see josm tickets: 17770 10759 15309 15774 16315 16658 16793 17541
;
K:service=irrigation
K:man_made=mast
......@@ -385,3 +395,4 @@ K:historic=citywalls
K:crossing=zebra
K:healthcare=dentist
K:golf=cartpath
K:historic=fort
data/validator/numeric.mapcss
View file @ 46628bda
......@@ -277,12 +277,7 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
/* #14989 */
*[direction][direction<0],
*[direction][direction>=360] {
throwWarning: tr("unusual value of {0}", "{0.key}");
assertMatch: "node direction=-10";
assertMatch: "node direction=360";
assertNoMatch: "node direction=0";
}
*[direction][direction>=360],
*[direction][direction !~ /^([0-9][0-9]?[0-9]?|north|east|south|west|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW|forward|backward|both|clockwise|anti-clockwise|anticlockwise|up|down)(-([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW))?(;([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW)-([0-9][0-9]?[0-9]?|N|E|S|W|NE|SE|SW|NW|NNE|ENE|ESE|SSE|SSW|WSW|WNW|NNW))*$/] {
throwWarning: tr("unusual value of {0}", "{0.key}");
assertMatch: "node direction=north-down";
......@@ -298,9 +293,10 @@ way["lanes:forward"]["lanes:forward" !~ /^[1-9]([0-9]*)$/][highway],
assertMatch: "node direction=45-100;190-250;300";
assertNoMatch: "node direction=up";
assertNoMatch: "node direction=down"; /* up/down are replaced by incline tag, has separate warning */
assertMatch: "node direction=-10";
assertNoMatch: "node direction=0";
assertNoMatch: "node direction=45";
assertNoMatch: "node direction=360";
assertMatch: "node direction=360";
assertNoMatch: "node direction=N";
assertNoMatch: "node direction=NNE";
assertNoMatch: "node direction=west";
......@@ -374,3 +370,30 @@ node[fire_hydrant:pressure="#"] {
assertMatch: "way interval=0:5:0";
assertMatch: "way interval=00:65:00";
}
/* #15107 */
*[aeroway=helipad ][iata][iata!~/^[A-Z]{3}$/],
*[aeroway=aerodrome][iata][iata!~/^[A-Z]{3}$/] {
throwWarning: tr("wrong value: {0}", "{1.tag}");
group: tr("Airport tagging");
assertNoMatch: "way aeroway=aerodrome iata=BER";
assertMatch: "way aeroway=aerodrome iata=BERL";
assertMatch: "way aeroway=aerodrome iata=BE";
assertMatch: "way aeroway=aerodrome iata=ber";
}
*[aeroway=helipad ][icao][icao!~/^[A-Z]{4}$/],
*[aeroway=aerodrome][icao][icao!~/^[A-Z]{4}$/] {
throwWarning: tr("wrong value: {0}", "{1.tag}");
group: tr("Airport tagging");
assertNoMatch: "way aeroway=aerodrome icao=EDDB";
assertMatch: "way aeroway=aerodrome icao=EDDBA";
assertMatch: "way aeroway=aerodrome icao=EDD";
assertMatch: "way aeroway=aerodrome icao=eddb";
}
*[aeroway=helipad ][icao][icao!~/^(AG|AN|AY|BG|BI|BK|C|DA|DB|DF|DG|DI|DN|DR|DT|DX|EB|ED|EE|EF|EG|EH|EI|EK|EL|EN|EP|ES|ET|EV|EY|FA|FB|FC|FD|FE|FG|FH|FI|FJ|FK|FL|FM|FN|FO|FP|FQ|FS|FT|FV|FW|FX|FY|FZ|GA|GB|GC|GE|GF|GG|GL|GM|GO|GQ|GS|GU|GV|HA|HB|HC|HD|HE|HH|HK|HL|HR|HS|HT|HU|K|LA|LB|LC|LD|LE|LF|LG|LH|LI|LJ|LK|LL|LM|LN|LO|LP|LQ|LR|LS|LT|LU|LV|LW|LX|LY|LZ|MB|MD|MG|MH|MK|MM|MN|MP|MR|MS|MT|MU|MW|MY|MZ|NC|NF|NG|NI|NL|NS|NT|NV|NW|NZ|OA|OB|OE|OI|OJ|OK|OL|OM|OO|OP|OR|OS|OT|OY|PA|PB|PC|PF|PG|PH|PJ|PK|PL|PM|PO|PP|PT|PW|RC|RJ|RK|RO|RP|SA|SB|SC|SD|SE|SF|SG|SH|SI|SJ|SK|SL|SM|SN|SO|SP|SS|SU|SV|SW|SY|TA|TB|TD|TF|TG|TI|TJ|TK|TL|TN|TQ|TR|TT|TU|TV|TX|U|UA|UB|UC|UD|UG|UK|UM|UT|VA|VC|VD|VE|VG|VH|VI|VL|VM|VN|VO|VQ|VR|VT|VV|VY|WA|WB|WI|WM|WP|WQ|WR|WS|Y|Z|ZK|ZM)/],
*[aeroway=aerodrome][icao][icao!~/^(AG|AN|AY|BG|BI|BK|C|DA|DB|DF|DG|DI|DN|DR|DT|DX|EB|ED|EE|EF|EG|EH|EI|EK|EL|EN|EP|ES|ET|EV|EY|FA|FB|FC|FD|FE|FG|FH|FI|FJ|FK|FL|FM|FN|FO|FP|FQ|FS|FT|FV|FW|FX|FY|FZ|GA|GB|GC|GE|GF|GG|GL|GM|GO|GQ|GS|GU|GV|HA|HB|HC|HD|HE|HH|HK|HL|HR|HS|HT|HU|K|LA|LB|LC|LD|LE|LF|LG|LH|LI|LJ|LK|LL|LM|LN|LO|LP|LQ|LR|LS|LT|LU|LV|LW|LX|LY|LZ|MB|MD|MG|MH|MK|MM|MN|MP|MR|MS|MT|MU|MW|MY|MZ|NC|NF|NG|NI|NL|NS|NT|NV|NW|NZ|OA|OB|OE|OI|OJ|OK|OL|OM|OO|OP|OR|OS|OT|OY|PA|PB|PC|PF|PG|PH|PJ|PK|PL|PM|PO|PP|PT|PW|RC|RJ|RK|RO|RP|SA|SB|SC|SD|SE|SF|SG|SH|SI|SJ|SK|SL|SM|SN|SO|SP|SS|SU|SV|SW|SY|TA|TB|TD|TF|TG|TI|TJ|TK|TL|TN|TQ|TR|TT|TU|TV|TX|U|UA|UB|UC|UD|UG|UK|UM|UT|VA|VC|VD|VE|VG|VH|VI|VL|VM|VN|VO|VQ|VR|VT|VV|VY|WA|WB|WI|WM|WP|WQ|WR|WS|Y|Z|ZK|ZM)/] {
throwWarning: tr("wrong value: {0}", "{1.tag}");
group: tr("Airport tagging");
assertNoMatch: "way aeroway=aerodrome icao=EDDB";
assertMatch: "way aeroway=aerodrome icao=EQQQ";
}
\ No newline at end of file
data/validator/territories.mapcss
View file @ 46628bda
......@@ -29,3 +29,17 @@ relation[type=associatedStreet][inside("DE")] {
suggestAlternative: "addr:street";
group: tr("deprecated tagging");
}
/* #15107 */
*[aeroway=helipad ][!faa][inside("US")],
*[aeroway=aerodrome][!faa][inside("US")] {
throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}");
group: tr("Airport tagging");
}
*[aeroway=aerodrome][!icao][faa!~/\d/][inside("US")],
*[aeroway=aerodrome][!iata][faa!~/\d/][inside("US")] {
throwOther: tr("{0} without {1}", "{0.tag}", "{1.key}");
group: tr("Airport tagging");
assertNoMatch: "way aeroway=aerodrome faa=OK12";
assertMatch: "way aeroway=aerodrome faa=ORD";
}
data_nodist/rtklib_example2.pos 0 → 100644
View file @ 46628bda
% program : RTKPOST ver.demo5 b29e
% inp file : ..\..\RINEX\2019\2050\0\igu20500_18.sp3
% obs start : 2019/04/21 08:20:32.0 GPST (week2050 30032.0s)
% obs end : 2019/04/21 08:22:34.0 GPST (week2050 30154.0s)
% pos mode : kinematic
% freqs : L1
% solution : forward
% elev mask : 15.0 deg
% dynamics : on
% tidecorr : off
% ionos opt : broadcast
% tropo opt : saastamoinen
% ephemeris : precise
% amb res : fix and hold
% val thres : 3.0
% antenna1 : ( 0.0000 0.0000 0.0000)
% antenna2 : ( 0.0000 0.0000 0.0000)
% ref pos : 54.330394848 48.402636321 219.1427
%
% (lat/lon/height=WGS84/ellipsoidal,Q=1:fix,2:float,3:sbas,4:dgps,5:single,6:ppp,ns=# of satellites)
% GPST latitude(deg) longitude(deg) height(m) Q ns sdn(m) sde(m) sdu(m) sdne(m) sdeu(m) sdun(m) age(s) ratio
2019/04/21 08:20:32 54.262930227 48.325420725 141.8619 2 4 3.5277 3.7156 17.2873 2.3856 -7.2184 -5.7246 2.00 0.0
2019/04/21 08:20:32 54.262958214 48.325449059 143.0793 2 4 2.6540 2.8837 13.7886 1.9062 -5.7620 -4.5848 2.50 0.0
2019/04/21 08:20:33 54.262986445 48.325467024 140.3774 2 5 1.6763 1.3406 5.2964 -0.5547 -1.6719 -0.2926 3.00 0.0
2019/04/21 08:20:33 54.263015765 48.325492927 138.4168 2 4 1.4856 1.2305 5.0426 -0.3606 -1.7052 -0.7839 3.50 0.0
2019/04/21 08:20:34 54.263041845 48.325512930 138.8902 2 4 1.3541 1.1540 4.8558 -0.1657 -1.7117 -0.9512 4.00 0.0
2019/04/21 08:20:34 54.263066740 48.325531409 139.6451 2 6 1.1759 0.9257 3.4257 -0.4701 -1.0110 0.5915 4.50 0.0
data_nodist/trans/en_AU.lang
View file @ 46628bda
File suppressed by a .gitattributes entry or the file's encoding is unsupported.