Commit df9eb869 authored by Bas Couwenberg's avatar Bas Couwenberg

Imported Upstream version 0.0.svn11639+dfsg

parent df3c3bde
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry excluding="org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/lzw/|org/apache/commons/compress/compressors/pack200/|org/apache/commons/compress/compressors/snappy/|org/apache/commons/compress/compressors/xz/|org/apache/commons/compress/compressors/z/|org/apache/commons/jcs/JCS.java|org/apache/commons/jcs/access/PartitionedCacheAccess.java|org/apache/commons/jcs/admin/servlet/|org/apache/commons/jcs/auxiliary/disk/jdbc/|org/apache/commons/jcs/auxiliary/lateral/|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCache.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheRestore.java|org/apache/commons/jcs/auxiliary/remote/http/|org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java|org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMISocketFactory.java|org/apache/commons/jcs/engine/ZombieCacheService.java|org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java|org/apache/commons/jcs/engine/ZombieCacheWatch.java|org/apache/commons/jcs/utils/access/|org/apache/commons/jcs/utils/discovery/|org/apache/commons/jcs/utils/net/|org/apache/commons/jcs/utils/props/|org/apache/commons/jcs/utils/servlet/|org/apache/commons/logging/impl/AvalonLogger.java|org/apache/commons/logging/impl/Jdk13LumberjackLogger.java|org/apache/commons/logging/impl/Log4JLogger.java|org/apache/commons/logging/impl/LogKitLogger.java|org/apache/commons/logging/impl/ServletContextCleaner.java|org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheMonitor.java|org/apache/commons/jcs/engine/CacheAdaptor.java|org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java|org/apache/commons/jcs/engine/CacheGroup.java|org/apache/commons/jcs/engine/CacheWatchRepairable.java|org/apache/commons/jcs/access/GroupCacheAccess.java|org/apache/commons/jcs/access/behavior/IGroupCacheAccess.java|org/apache/commons/jcs/access/exception/InvalidGroupException.java|org/openstreetmap/gui/jmapviewer/JMapViewerTree.java|org/openstreetmap/gui/jmapviewer/Demo.java|org/openstreetmap/gui/jmapviewer/checkBoxTree/|org/apache/commons/compress/compressors/CompressorStreamProvider.java|org/apache/commons/compress/compressors/lz4/|org/apache/commons/compress/compressors/lz77support/" kind="src" path="src"/>
<classpathentry excluding="org/apache/commons/compress/compressors/CompressorException.java|org/apache/commons/compress/compressors/CompressorStreamFactory.java|org/apache/commons/compress/compressors/FileNameUtil.java|org/apache/commons/compress/compressors/bzip2/BZip2Utils.java|org/apache/commons/compress/compressors/deflate/|org/apache/commons/compress/compressors/gzip/|org/apache/commons/compress/compressors/lzma/|org/apache/commons/compress/compressors/lzw/|org/apache/commons/compress/compressors/pack200/|org/apache/commons/compress/compressors/snappy/|org/apache/commons/compress/compressors/xz/|org/apache/commons/compress/compressors/z/|org/apache/commons/jcs/JCS.java|org/apache/commons/jcs/access/PartitionedCacheAccess.java|org/apache/commons/jcs/admin/servlet/|org/apache/commons/jcs/auxiliary/disk/jdbc/|org/apache/commons/jcs/auxiliary/lateral/|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteAuxiliaryCache.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/AbstractRemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCache.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFactory.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheFailoverRunner.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheListener.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheManager.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheMonitor.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWait.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheNoWaitFacade.java|org/apache/commons/jcs/auxiliary/remote/RemoteCacheRestore.java|org/apache/commons/jcs/auxiliary/remote/http/|org/apache/commons/jcs/auxiliary/remote/server/RemoteCacheStartupServlet.java|org/apache/commons/jcs/auxiliary/remote/server/TimeoutConfigurableRMISocketFactory.java|org/apache/commons/jcs/engine/ZombieCacheService.java|org/apache/commons/jcs/engine/ZombieCacheServiceNonLocal.java|org/apache/commons/jcs/engine/ZombieCacheWatch.java|org/apache/commons/jcs/utils/access/|org/apache/commons/jcs/utils/discovery/|org/apache/commons/jcs/utils/net/|org/apache/commons/jcs/utils/props/|org/apache/commons/jcs/utils/servlet/|org/apache/commons/logging/impl/AvalonLogger.java|org/apache/commons/logging/impl/Jdk13LumberjackLogger.java|org/apache/commons/logging/impl/Log4JLogger.java|org/apache/commons/logging/impl/LogKitLogger.java|org/apache/commons/logging/impl/ServletContextCleaner.java|org/apache/commons/jcs/auxiliary/AbstractAuxiliaryCacheMonitor.java|org/apache/commons/jcs/engine/CacheAdaptor.java|org/apache/commons/jcs/engine/logging/CacheEventLoggerDebugLogger.java|org/apache/commons/jcs/engine/CacheGroup.java|org/apache/commons/jcs/engine/CacheWatchRepairable.java|org/apache/commons/jcs/access/GroupCacheAccess.java|org/apache/commons/jcs/access/behavior/IGroupCacheAccess.java|org/apache/commons/jcs/access/exception/InvalidGroupException.java|org/openstreetmap/gui/jmapviewer/JMapViewerTree.java|org/openstreetmap/gui/jmapviewer/Demo.java|org/openstreetmap/gui/jmapviewer/checkBoxTree/|org/apache/commons/compress/compressors/CompressorStreamProvider.java|org/apache/commons/compress/compressors/lz4/|org/apache/commons/compress/compressors/lz77support/|org/apache/commons/compress/utils/ArchiveUtils.java" kind="src" path="src"/>
<classpathentry including="data/|images/|resources/|styles/" kind="src" path=""/>
<classpathentry kind="src" path="test/unit"/>
<classpathentry kind="src" path="test/functional"/>
......
......@@ -3,7 +3,7 @@
<entry
kind="dir"
path="trunk"
revision="11526">
revision="11639">
<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="11526">
<author>Don-vip</author>
<date>2017-02-02T00:22:52.193200Z</date>
revision="11639">
<author>stoecker</author>
<date>2017-02-26T22:10:22.403379Z</date>
</commit>
</entry>
</info>
......@@ -240,6 +240,7 @@ Build-Date: ${build.tstamp}
<exclude name="org/apache/commons/compress/compressors/pack200/**"/>
<exclude name="org/apache/commons/compress/compressors/snappy/**"/>
<exclude name="org/apache/commons/compress/compressors/z/**"/>
<exclude name="org/apache/commons/compress/utils/ArchiveUtils.java"/>
<exclude name="org/apache/commons/jcs/JCS.java"/>
<exclude name="org/apache/commons/jcs/access/GroupCacheAccess.java"/>
<exclude name="org/apache/commons/jcs/access/PartitionedCacheAccess.java"/>
......@@ -339,6 +340,10 @@ Build-Date: ${build.tstamp}
<link href="http://docs.oracle.com/javase/8/docs/api"/>
<doctitle><![CDATA[<h2>JOSM - Javadoc</h2>]]></doctitle>
<bottom><![CDATA[<a href="https://josm.openstreetmap.de/">JOSM</a>]]></bottom>
<arg value="--add-exports" if:set="isJava9" />
<arg value="java.base/sun.security.util=ALL-UNNAMED" if:set="isJava9" />
<arg value="--add-exports" if:set="isJava9" />
<arg value="java.base/sun.security.x509=ALL-UNNAMED" if:set="isJava9" />
</javadoc>
</target>
<target name="clean" depends="init-properties">
......@@ -690,8 +695,8 @@ Build-Date: ${build.tstamp}
<target name="imageryindex" depends="init-properties">
<taskdef name="groovy" classname="org.codehaus.groovy.ant.Groovy" classpath="${groovy.jar};tools/commons-cli-1.3.1.jar"/>
<echo message="Checking editor imagery difference"/>
<groovy src="scripts/SyncEditorImageryIndex.groovy" classpath="${dist.dir}/josm-custom.jar">
<!--<arg value="-nomissingeii"/>-->
<groovy src="scripts/SyncEditorLayerIndex.groovy" classpath="${dist.dir}/josm-custom.jar">
<!--<arg value="-nomissingeli"/>-->
</groovy>
</target>
......
......@@ -7831,7 +7831,7 @@
<node id='-46173' lat='50.13434' lon='12.1917' />
<node id='-46175' lat='50.09831' lon='12.20988' />
<node id='-46177' lat='50.0771' lon='12.27433' />
<node id='-46179' lat='50.41002' lon='12.94363' />
<node id='-46179' lat='50.4043' lon='12.955' />
<node id='-46181' lat='50.45738' lon='12.82465' />
<node id='-46183' lat='50.39694' lon='12.51356' />
<node id='-46185' lat='50.39948' lon='12.70731' />
......@@ -7865,12 +7865,12 @@
<node id='-46241' lat='50.74142' lon='13.89444' />
<node id='-46243' lat='50.60527' lon='13.46311' />
<node id='-46245' lat='50.50237' lon='13.19043' />
<node id='-46247' lat='50.50868' lon='13.03343' />
<node id='-46247' lat='50.50944' lon='13.0312' />
<node id='-46249' lat='50.59268' lon='13.25158' />
<node id='-46251' lat='50.65035' lon='13.37717' />
<node id='-46253' lat='50.67654' lon='13.53748' />
<node id='-46255' lat='50.73096' lon='13.65977' />
<node id='-46257' lat='50.44873' lon='13.02021' />
<node id='-46257' lat='50.44261' lon='13.01856' />
<node id='-46259' lat='50.57904' lon='13.29454' />
<node id='-46261' lat='50.58009' lon='13.32594' />
<node id='-46263' lat='50.60317' lon='13.32264' />
......@@ -123,10 +123,10 @@
<combo key="layer" text="Layer" values="5,4,3,2,1,0,-1,-2,-3,-4,-5" length="3" />
</chunk>
<chunk id="service_times">
<combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 09:30,11:00|Sa,Su,PH 09:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" values_no_i18n="true" />
<combo key="service_times" text="Service Times" delimiter="|" values="18:00|sunset,sunrise|Su 09:30,11:00|Sa,Su,PH 09:00|Sa 18:00; Su 10:45|Fr 08:00-18:00; Apr 10-15 off; Jun 07:00-20:00; Aug off; Dec 24 08:00-24:00|Sa 10:00+|week 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" />
</chunk>
<chunk id="oh">
<combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 1-53/2 Fr 09:00-12:00; week 2-52/2 We 09:00-12:00" values_no_i18n="true" />
<combo key="opening_hours" text="Opening Hours" delimiter="|" values="24/7|08:30-12:30,15:30-20:00|Sa-Su 00:00-24:00|Mo-Fr 08:30-20:00; Sa,Su 08:00-15:00; PH off|Mo-Fr 08:30-20:00, Tu-Su 08:00-15:00; Sa 08:00-12:00|Mo-Su 08:00-18:00; Apr 10-15 off; Jun 08:00-14:00; Aug off; Dec 25 off|sunrise-sunset|Su 10:00+|week 01-53/2 Fr 09:00-12:00; week 02-52/2 We 09:00-12:00" values_no_i18n="true" />
</chunk>
<chunk id="wheelchair">
<combo key="wheelchair" text="Wheelchairs" values="yes,limited,no" />
......@@ -5199,12 +5199,18 @@
<key key="amenity" value="shower" />
<combo key="access" text="Access rights" values="yes,permissive,customers" />
<optional>
<checkgroup columns="3">
<check key="female" text="Female" text_context="restroom" />
<check key="male" text="Male" text_context="restroom" />
<check key="unisex" text="Unisex" text_context="restroom" />
</checkgroup>
<text key="description" text="Description" />
<combo key="fee" text="Fee" values="yes,no" />
<text key="operator" text="Operator" />
<reference ref="oh_wheelchair" />
</optional>
</item> <!-- Shower -->
<separator/>
<item name="Post Box" icon="presets/service/post_box.svg" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=post_box"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=post_box"
......@@ -5237,6 +5243,13 @@
<check key="payment:telephone_cards" text="Telephone cards" />
<preset_link preset_name="Payment Methods" />
</item> <!-- Telephone -->
<item name="Internet Cafe" icon="presets/service/internet_cafe.svg" type="node,closedway,multipolygon" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=internet_cafe" />
<space />
<key key="amenity" value="internet_cafe" />
<reference ref="name_operator_oh_wheelchair" />
<reference ref="link_contact_address_payment" />
</item> <!-- Internet Cafe -->
<item name="Internet Access" icon="presets/service/network-wireless.svg" type="node,closedway,multipolygon,relation" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Key:internet_access"
cs.href="http://wiki.openstreetmap.org/wiki/Cs:Key:internet_access"
......@@ -5266,6 +5279,13 @@
<check key="hygrometer" text="Shows humidity" />
</optional>
</item> <!-- Clock -->
<item name="Photo booth" icon="presets/service/photo_booth.svg" type="node" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=photo_booth" />
<space />
<key key="amenity" value="photo_booth" />
<reference ref="name_operator_oh_wheelchair" />
</item> <!-- Photo booth -->
<separator/>
<item name="Recycling Container" icon="presets/service/recycling/recycling_container.svg" type="node,closedway" preset_name_label="true">
<link href="http://wiki.openstreetmap.org/wiki/Tag:amenity=recycling"
de.href="http://wiki.openstreetmap.org/wiki/DE:Tag:amenity=recycling"
......@@ -7114,6 +7134,7 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:historic=castle" />
<space />
<key key="historic" value="castle" />
<combo key="castle_type" text="Type" values="stately,defensive,fortress,manor,palace" />
<reference ref="name_wikipedia" />
<check key="ruins" text="Ruins" />
<reference ref="link_contact_address_payment" />
......@@ -8252,7 +8273,7 @@
ru.href="http://wiki.openstreetmap.org/wiki/RU:Tag:amenity=vending_machine" />
<space />
<key key="amenity" value="vending_machine" />
<multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;photos;public_transport_plans;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys" values_searchable="true" />
<multiselect key="vending" text="Vending products" values="admission_tickets;animal_feed;bicycle_tube;cigarettes;coffee;condoms;drinks;elongated_coin;excrement_bags;food;milk;newspapers;parking_tickets;parcel_pickup;parcel_mail_in;photos;public_transport_tickets;SIM_cards;stamps;sweets;telephone_vouchers;toys" values_searchable="true" />
<text key="operator" text="Operator" />
<text key="ref" text="Reference number" />
<preset_link preset_name="Payment Methods" />
......
......@@ -29,7 +29,6 @@
<xs:enumeration value="wms_endpoint" />
<xs:enumeration value="wmts" />
<xs:enumeration value="tms" />
<xs:enumeration value="html" />
<xs:enumeration value="bing" />
<xs:enumeration value="scanex" />
</xs:restriction>
......@@ -660,6 +659,8 @@
<xs:element name="country-code" minOccurs="0" maxOccurs="1" type="tns:iso3166" />
<!-- A base64-encoded image that is displayed as menu/toolbar icon -->
<xs:element name="icon" minOccurs="0" maxOccurs="1" type="xs:string" />
<!-- Date in form YYYY-MM-DD;YYYY-MM-DD (each element after first year is optional, a single - marks an unknown or open timespan like -;2015) -->
<xs:element name="date" minOccurs="0" maxOccurs="1" type="xs:string" />
<xs:element name="mirror" minOccurs="0">
<xs:complexType>
<xs:all>
......@@ -702,6 +703,7 @@
</xs:choice>
</xs:sequence>
<xs:attribute name="last-check" type="xs:date" use="optional" />
<xs:attribute name="eli-best" type="xs:boolean" use="optional" />
</xs:complexType>
</xs:element>
</xs:sequence>
......
......@@ -259,12 +259,16 @@ way[waterway=weir][bridge=yes][highway] {
group: tr("missing tag");
}
/* #9811, #11491, #12865 */
*[place][place!=farm][/^addr:/],
/* #9811, #11491, #12865, #14310 */
*[place][place!=farm][/^(addr:housenumber|addr:housename|addr:flats|addr:conscriptionnumber|addr:street|addr:place|addr:city|addr:country|addr:full|addr:hamlet|addr:suburb|addr:subdistrict|addr:district|addr:province|addr:state|addr:interpolation|addr:interpolation|addr:inclusion)$/],
/* addr:postcode is used together with place in some countries */
*[boundary][/^addr:/],
*[highway][/^addr:/][highway!=services][highway!=rest_area][!"addr:postcode"] {
throwWarning: tr("{0} together with addr:*", "{0.key}");
group: tr("suspicious tag combination");
assertMatch: "node place=foo addr:housenumber=5";
assertMatch: "node place=foo addr:housenumber=5 addr:postcode=12345";
assertNoMatch: "node place=foo addr:postcode=12345";
}
*[!highway][postal_code]["addr:postcode"][postal_code=*"addr:postcode"] {
throwWarning: tr("{0} together with {1}", "{1.key}", "{2.key}");
......@@ -332,7 +336,7 @@ way[highway][natural][natural!=ridge],
}
/* #9593, #11183, #12418, #12761 */
*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink|horse_riding|fitness_station)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
*[sport][sport!=skiing][!building][!club][tourism != hotel][highway != raceway][leisure !~ /^(sports_centre|stadium|track|pitch|golf_course|water_park|swimming_pool|recreation_ground|ice_rink|horse_riding|fitness_station|bowling_alley)$/][natural !~ /^(beach|bare_rock|cliff|peak|water)$/][amenity !~ /^(pub|restaurant|swimming_pool)$/][landuse !~ /^(recreation_ground|piste|farm|farmland)$/][barrier !~ /^(wall|retaining_wall)$/][!"piste:type"][shop!=sports] {
throwWarning: tr("sport without physical feature");
group: tr("missing tag");
assertMatch: "node sport=tennis";
......@@ -472,8 +476,8 @@ way["addr:housenumber"][!building][!"building:part"][!"demolished:building"][!no
group: tr("missing tag");
}
/* #14125 */
way[highway][lanes][!lanes:forward][!lanes:backward][oneway!=yes][oneway!=-1][lanes>2][get(split(".", tag(lanes)/2), 1)=5] {
/* #14125, #14323 */
way[highway][lanes][!lanes:forward][!lanes:backward][oneway!=yes][oneway!=-1][junction!=roundabout][lanes>2][get(split(".", tag(lanes)/2), 1)=5] {
throwWarning: tr("street with odd number of {0}, but without {1} and {2} or {3}", "{1.key}", "{2.key}", "{3.key}", "{4.key}");
group: tr("missing tag");
assertNoMatch: "way highway=primary lanes=2";
......
......@@ -1046,6 +1046,22 @@ area[landuse=pond] {
fixAdd: "vending=animal_feed";
}
/* #14376 */
node[vending=photos][amenity=vending_machine],
node[vending=photo][amenity=vending_machine] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "amenity=photo_booth";
group: tr("deprecated tagging");
fixRemove: "vending";
fixAdd: "amenity=photo_booth";
}
node[vending=photos][amenity!=vending_machine] {
throwWarning: tr("{0} is deprecated", "{0.tag}");
suggestAlternative: "amenity=photo_booth";
group: tr("deprecated tagging");
}
/* #13653 */
node[highway=emergency_access_point][phone][!emergency_telephone_code],
way[highway=emergency_access_point][phone][!emergency_telephone_code] {
......
......@@ -12,6 +12,7 @@ S:opengeodb
S:openGeoDB
S:name:
S:note:
S:description:
S:ref:
S:CLC:
S:tiger:
......@@ -152,6 +153,7 @@ K:toilets:wheelchair=yes
K:toilets:wheelchair=no
K:locality=townland
K:place=allotments
K:building=bunker
K:building=civic
K:building=houseboat
K:building=static_caravan
......@@ -165,6 +167,8 @@ K:glacier:type=rock
K:glacier:type=mountain
K:glacier:type=ice_tongue
K:glacier:type=icecap
K:place=city_block
K:waterway=drystream
;
; Highway Key/Value Pairs
;
......@@ -183,6 +187,12 @@ K:lanes=7
K:lanes=8
K:lanes=9
K:oneway=-1
K:traffic_signals=blinker
K:traffic_signals=blink_mode
K:traffic_signals=emergency
K:traffic_signals=ramp_meter
K:traffic_signals=signal
K:traffic_signals=crossing
;
; Amenity Key/Value Pairs
;
......
This diff is collapsed.
......@@ -7,6 +7,7 @@
<property name="maps.srcfile" value="http://josm.openstreetmap.de/maps"/>
<property name="wiki.srcfile" value="http://josm.openstreetmap.de/josmfile?mode=en"/>
<property name="surveyor.srcfile" value="${plugin.dir}/surveyor/resources/surveyor.xml"/>
<property name="tag2link.srcfile" value="${plugin.dir}/tag2link/resources/tag2link_sources.xml"/>
<property name="i18n.build.dir" value="build"/>
<property name="i18n.install.dir" value="${josm.build.dir}/data"/>
<property name="i18n_data.install.dir" value="${josm.build.dir}/data_nodist/trans"/>
......@@ -32,6 +33,9 @@
<exec executable="perl" failonerror="true" logError="true" output="${i18n.build.dir}/trans_surveyor.java">
<arg line="convsurveyor.pl ${surveyor.srcfile}"/>
</exec>
<exec executable="perl" failonerror="true" logError="true" output="${i18n.build.dir}/trans_tag2link.java">
<arg line="convtag2link.pl ${tag2link.srcfile}"/>
</exec>
<exec executable="perl" failonerror="true" logError="true" output="${i18n.build.dir}/trans_plugins.java">
<arg line="convplugins.pl ${plugin.dir}/*/build.xml"/>
</exec>
......@@ -84,6 +88,7 @@
<gettext-extract keysFile="plugins.raw.pot" poDirectory="${i18n.build.dir}" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
<fileset dir="${plugin.dir}" includes="**/*.java"/>
<fileset dir="${i18n.build.dir}" includes="trans_surveyor.java"/>
<fileset dir="${i18n.build.dir}" includes="trans_tag2link.java"/>
</gettext-extract>
<copy todir="${po.build.dir}">
<fileset dir="po" includes="core.pot"/>
......@@ -135,7 +140,7 @@
<gettext-extract keysFile="josm.pot" poDirectory="${po.build.dir}/plugin_${dir}" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
<fileset dir="${plugin.dir}/${dir}" includes="**/*.java"/>
<fileset dir="${po.build.dir}/plugin_${dir}" includes="trans_*.java"/>
<fileset dir="${i18n.build.dir}" includes="trans_${dir}.java"/>
<fileset dir="${i18n.build.dir}" includes="trans_${dir}.java"/> <!-- include plugin specific translation -->
</gettext-extract>
<if>
<available file="${po.build.dir}/plugin_${dir}/josm.pot"/>
......
#! /usr/bin/perl -w
# Written by Dirk Stöcker <openstreetmap@dstoecker.de>
# Public domain, no rights reserved.
use strict;
my $item;
my $src = "";
my $country = "";
my $comment = 0;
# This is a simple conversion and in no way a complete XML parser
# but it works with a default Perl installation
# Print a header to write valid Java code. No line break,
# so that the input and output line numbers will match.
print "class trans_tag2link { void tr(String s){} void f() {";
while(my $line = <>)
{
chomp($line);
print "tr(\"---DUMMY-MARKER---\"); ";
if($line =~ /<link name="([^"]+)" /)
{
print "tr(\"$1\") /* src $src country code $country */\n";
}
elsif($line =~ /^$/)
{
print "\n";
}
else
{
if($line =~ /<src name="([^"]+)" country-code="([^"]+)"/)
{
$src = $1; $country = $2;
}
elsif($line =~ /<\/src/)
{
$src = ""; $country = ""
}
print "/* $line */\n";
}
}
print "}}\n";
......@@ -276,9 +276,13 @@ sub checkstring
my $fmte;
my $fmte1 = "";
my $trt = $tr; $trt =~ s/'[{}]'//g;
while($trt =~ /\{(.*?)\}/g) {push @fmt,$1}; $fmt = join("_", sort @fmt); @fmt = ();
while($trt =~ /\{(.*?)\}/g) {push @fmt,$1};
while($trt =~ /\%([a-z]+)\%/g) {push @fmt,$1};
$fmt = join("_", sort @fmt); @fmt = ();
my $ent = $en; $ent =~ s/'[{}]'//g;
while($ent =~ /\{(.*?)\}/g) {push @fmt,$1}; $fmte = join("_", sort @fmt); @fmt = ();
while($ent =~ /\{(.*?)\}/g) {push @fmt,$1};
while($ent =~ /\%([a-z]+)\%/g) {push @fmt,$1};
$fmte = join("_", sort @fmt); @fmt = ();
if($en1)
{
my $en1t = $en1; $en1t =~ s/'[{}]'//g;
......
......@@ -8,7 +8,8 @@ my ($user, $pwd);
# Three ways to handle login data:
# Enter data directly in these two lines (Be careful witn svn checkin later!)
# create a file "launchpad.pl_credits" containing the two lines with proper values
# create a file "launchpad.pl_credits" or ~/.josm_i18n_launchpad.pl_credits
# containing the two lines with proper values
# leave credits empty and enter them on runtime
$user = '';
$pwd = '';
......@@ -21,7 +22,7 @@ my %lang = map {$_ => 1} (
"sv", "uk", "vi", "zh_CN", "zh_TW"
);
my $revision = '$Revision: 31724 $';
my $revision = '$Revision: 33169 $';
$revision =~ s/^.*?(\d+).*$/$1/;
my $agent = "JOSM_Launchpad/1.$revision";
......@@ -291,6 +292,11 @@ sub getcredits
eval <FILE>;
close FILE;
}
elsif(open FILE, "$ENV{HOME}/.josm_i18n_launchpad.pl_credits")
{
eval <FILE>;
close FILE;
}
if(!$user)
{
......
......@@ -7,7 +7,7 @@ msgid ""
msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2017-02-02 03:39+0100\n"
"POT-Creation-Date: 2017-02-26 23:41+0100\n"
"PO-Revision-Date: 2011-10-13 02:39+0000\n"
"Last-Translator: Grant Slater <Unknown>\n"
"Language-Team: Afrikaans <af@li.org>\n"
......@@ -15,8 +15,8 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Launchpad-Export-Date: 2017-02-02 04:33+0000\n"
"X-Generator: Launchpad (build 18315)\n"
"X-Launchpad-Export-Date: 2017-02-27 04:34+0000\n"
"X-Generator: Launchpad (build 18328)\n"
"Language: af\n"
msgid "{0}: option ''{1}'' is ambiguous"
......@@ -3255,9 +3255,27 @@ msgctxt "compass"
msgid "E"
msgstr ""
msgid "Date of imagery: {0}"
msgstr ""
msgid "This imagery is marked as best in this region in other editors."
msgstr ""
msgid "{0} mirror server {1}"
msgstr ""
msgid "{0} mirror server"
msgstr ""
msgid "Update default entries"
msgstr ""
msgid "Update imagery ''{0}''"
msgstr ""
msgid "Drop old imagery ''{0}''"
msgstr ""
msgid "Projection ''{0}'' is not found, bookmark ''{1}'' is not usable"
msgstr ""
......@@ -10816,7 +10834,15 @@ msgid "Foot"
msgstr ""
msgctxt "Heat map"
msgid "User"
msgid "User Normal"
msgstr ""
msgctxt "Heat map"
msgid "User Light"
msgstr ""
msgctxt "Heat map"
msgid "Traffic Lights"
msgstr ""
msgctxt "Heat map"
......@@ -10835,6 +10861,9 @@ msgctxt "Heat map"
msgid "Heat"
msgstr ""
msgid "Use points instead of lines for heat map"
msgstr ""
msgid "Create markers when reading GPX"
msgstr ""
......@@ -10945,6 +10974,22 @@ msgstr ""
msgid "Track and Point Coloring"
msgstr ""
msgid "Overlay gain adjustment"
msgstr ""
msgid "Lower limit of visibility"
msgstr ""
msgid "Adjust the gain of overlay blending."
msgstr ""
msgid "Draw all GPX traces that exceed this threshold."
msgstr ""
msgid ""
"Render engine uses points with simulated position error instead of lines. "
msgstr ""
msgid "Colors points and track segments by data limits."
msgstr ""
......@@ -14885,6 +14930,9 @@ msgstr ""
msgid "SPW(allonie) PICC numerical imagery"
msgstr ""
msgid "SPW(allonie) most recent aerial imagery"
msgstr ""
msgid "SPW(allonie) 2015 aerial imagery"
msgstr ""
......@@ -15152,9 +15200,6 @@ msgstr ""
msgid "NRW-Atlas: Digitale GrundKarte 1:5000"
msgstr ""
msgid "Imagery no longer available"
msgstr ""
msgid "NRW-Atlas: Topographische Karte 1:10000"
msgstr ""
......@@ -15170,6 +15215,30 @@ msgid ""
"(infrared)"
msgstr ""
msgid "Saxony latest aerial imagery"
msgstr ""
msgid "Saxony latest aerial imagery infrared"
msgstr ""
msgid "Saxony aerial imagery 2005"
msgstr ""
msgid "Saxony WebAtlasSN"
msgstr ""
msgid "Saxony topographic map"
msgstr ""
msgid "Saxony digital terrain model"
msgstr ""
msgid "Mainz all aerial imageries"
msgstr ""
msgid "Mainz latest aerial imagery"
msgstr ""
msgid "imagico.de OSM images for mapping: Qasigiannguit"
msgstr ""
......@@ -15205,10 +15274,6 @@ msgstr ""
msgid "Drone Imagery (Haiti)"
msgstr ""
msgid ""
"Temporary inavailable until presumably January 2017 due to a server switch."
msgstr ""
msgid "Drone Imagery 2014 (Haiti)"
msgstr ""
......@@ -15359,7 +15424,10 @@ msgstr ""
msgid "ORT10LT (Lithuania)"
msgstr ""
msgid "geoportail.lu"
msgid "geoportail.lu all layers"
msgstr ""
msgid "geoportail.lu ortho 2016"
msgstr ""
msgid "Luxembourg Inspire Railway"
......@@ -15374,6 +15442,12 @@ msgstr ""
msgid "Niger Delta Oct 2012 Landsat"
msgstr ""
msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMS)"
msgstr ""
msgid "PDOK Luchtfoto Beeldmateriaal 25cm (WMTS)"
msgstr ""
msgid "Svalbard -Orthophoto 2009/2011 EPSG:25833"
msgstr ""
......@@ -15908,6 +15982,9 @@ msgstr ""
msgid "OS Town Plans, Edinburgh 1893-1894 (NLS)"
msgstr ""