Commit 9fd5f0a1 authored by Bas Couwenberg's avatar Bas Couwenberg

New upstream version 0.0.svn12545+dfsg

parent b7a81dfd
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
revision="12545"
kind="dir"
path="trunk"
revision="12542">
path="trunk">
<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="12542">
revision="12545">
<author>Don-vip</author>
<date>2017-07-30T15:07:42.868633Z</date>
<date>2017-07-30T23:02:55.524183Z</date>
</commit>
</entry>
</info>
......@@ -46,13 +46,20 @@
</target>
<target name="po/josm.pot" description="Extracts message keys from the source code" depends="trans_.java,init">
<gettext-extract keysFile="josm.raw.pot" poDirectory="po" keywords="-k -ktrc:1c,2 -kmarktrc:1c,2 -ktr -kmarktr -ktrn:1,2 -ktrnc:1c,2,3">
<!-- core.port -->
<fileset dir="${josm.build.dir}/src" includes="**/*.java"/>
<fileset dir="${i18n.build.dir}" includes="specialmessages.java"/>
<fileset dir="${i18n.build.dir}" includes="trans_*.java"/>
<!-- <fileset dir="${i18n.build.dir}/josmfiles" includes="trans_*.*"/> disable for now -->
<fileset dir="${i18n.build.dir}" includes="trans_presets.java"/>
<fileset dir="${i18n.build.dir}" includes="trans_maps.java"/>
<fileset dir="${josm.build.dir}/data/validator" includes="*.mapcss"/>
<fileset dir="${josm.build.dir}/styles/standard" includes="*.mapcss"/>
<!-- data.pot -->
<fileset dir="${i18n.build.dir}" includes="trans_plugins.java"/>
<!-- <fileset dir="${i18n.build.dir}/josmfiles" includes="trans_*.*"/> disable for now -->
<!-- plugins.pot -->
<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>
<exec executable="msggrep" failonerror="true">
<arg line="--msgid --regexp='---DUMMY-MARKER---' --invert-match --output-file=po/josm.pot po/josm.raw.pot"/>
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
<?xml version="1.0" encoding="UTF-8"?>
<application>
<id type="desktop">josm-latest.desktop</id>
<component type="desktop-application">
<id>josm-latest.desktop</id>
<metadata_license>CC-BY-SA-3.0</metadata_license>
<project_license>GPL-2.0+</project_license>
<name>JOSM</name>
......@@ -14,9 +14,14 @@
editing existing nodes, ways, metadata tags and relations from the OSM database.
</p>
</description>
<categories>
<category>Education</category>
<category>Geoscience</category>
<category>Maps</category>
</categories>
<screenshots>
<screenshot type="default" width="1024" height="576">https://josm.openstreetmap.de/svn/trunk/linux/josm-screenshot.png</screenshot>
</screenshots>
<url type="homepage">https://josm.openstreetmap.de</url>
<updatecontact>josm-dev_at_openstreetmap.org</updatecontact>
</application>
\ No newline at end of file
</component>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?>
<application>
<id type="desktop">josm.desktop</id>
<component type="desktop-application">
<id>josm.desktop</id>
<metadata_license>CC-BY-SA-3.0</metadata_license>
<project_license>GPL-2.0+</project_license>
<name>JOSM</name>
......@@ -14,9 +14,14 @@
editing existing nodes, ways, metadata tags and relations from the OSM database.
</p>
</description>
<categories>
<category>Education</category>
<category>Geoscience</category>
<category>Maps</category>
</categories>
<screenshots>
<screenshot type="default" width="1024" height="576">https://josm.openstreetmap.de/svn/trunk/linux/josm-screenshot.png</screenshot>
</screenshots>
<url type="homepage">https://josm.openstreetmap.de</url>
<updatecontact>josm-dev_at_openstreetmap.org</updatecontact>
</application>
\ No newline at end of file
</component>
\ No newline at end of file
......@@ -281,9 +281,9 @@ public interface Selector {
@Override
public void visit(Node n) {
if (e.child == null && left.matches(new Environment(n).withParent(e.osm))
&& (e.osm instanceof Way && Geometry.nodeInsidePolygon(n, ((Way) e.osm).getNodes()))
&& ((e.osm instanceof Way && Geometry.nodeInsidePolygon(n, ((Way) e.osm).getNodes()))
|| (e.osm instanceof Relation && (
(Relation) e.osm).isMultipolygon() && Geometry.isNodeInsideMultiPolygon(n, (Relation) e.osm, null))) {
(Relation) e.osm).isMultipolygon() && Geometry.isNodeInsideMultiPolygon(n, (Relation) e.osm, null)))) {
e.child = n;
}
}
......@@ -291,11 +291,11 @@ public interface Selector {
@Override
public void visit(Way w) {
if (e.child == null && left.matches(new Environment(w).withParent(e.osm))
&& (e.osm instanceof Way && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(
&& ((e.osm instanceof Way && Geometry.PolygonIntersection.FIRST_INSIDE_SECOND.equals(
Geometry.polygonIntersection(w.getNodes(), ((Way) e.osm).getNodes())))
|| (e.osm instanceof Relation && (
(Relation) e.osm).isMultipolygon()
&& Geometry.isPolygonInsideMultiPolygon(w.getNodes(), (Relation) e.osm, null))) {
&& Geometry.isPolygonInsideMultiPolygon(w.getNodes(), (Relation) e.osm, null)))) {
e.child = w;
}
}
......
......@@ -26,6 +26,7 @@ import org.openstreetmap.josm.tools.I18n;
import org.openstreetmap.josm.tools.JosmRuntimeException;
import org.openstreetmap.josm.tools.Logging;
import org.openstreetmap.josm.tools.MemoryManagerTest;
import org.openstreetmap.josm.tools.Territories;
import org.openstreetmap.josm.tools.date.DateUtils;
import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
......@@ -50,6 +51,7 @@ public class JOSMTestRules implements TestRule {
private boolean allowMemoryManagerLeaks;
private boolean useMapStyles;
private boolean useHttps;
private boolean territories;
/**
* Disable the default timeout for this test. Use with care.
......@@ -155,9 +157,9 @@ public class JOSMTestRules implements TestRule {
}
/**
* Allow the execution of commands using {@link Main#undoRedo}
* @return this instance, for easy chaining
*/
* Allow the execution of commands using {@link Main#undoRedo}
* @return this instance, for easy chaining
*/
public JOSMTestRules commands() {
commands = true;
return this;
......@@ -183,6 +185,16 @@ public class JOSMTestRules implements TestRule {
return this;
}
/**
* Use boundaries dataset in this test.
* @return this instance, for easy chaining
* @since 12545
*/
public JOSMTestRules territories() {
territories = true;
return this;
}
@Override
public Statement apply(Statement base, Description description) {
Statement statement = base;
......@@ -275,6 +287,10 @@ public class JOSMTestRules implements TestRule {
MapPaintStyles.readFromPreferences();
}
if (territories) {
Territories.initialize();
}
if (commands) {
// TODO: Implement a more selective version of this once Main is restructured.
JOSMFixture.createUnitTestFixture().init(true);
......
......@@ -20,7 +20,7 @@ public class TerritoriesTest {
*/
@Rule
@SuppressFBWarnings(value = "URF_UNREAD_PUBLIC_OR_PROTECTED_FIELD")
public JOSMTestRules rules = new JOSMTestRules().platform().projection().commands();
public JOSMTestRules rules = new JOSMTestRules().platform().projection().territories();
/**
* Tests that {@code Territories} satisfies utility class criterias.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment