[Git][debian-gis-team/josm][upstream] New upstream version 0.0.svn17919+dfsg
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Thu Jun 3 05:24:29 BST 2021
Bas Couwenberg pushed to branch upstream at Debian GIS Project / josm
Commits:
7f67b326 by Bas Couwenberg at 2021-06-03T05:57:41+02:00
New upstream version 0.0.svn17919+dfsg
- - - - -
14 changed files:
- .github/workflows/ant-test.yml
- .github/workflows/ant.yml
- REVISION
- i18n/po/fr.po
- i18n/po/nb.po
- i18n/po/nl.po
- i18n/po/sv.po
- i18n/po/uk.po
- i18n/po/zh_TW.po
- src/org/openstreetmap/josm/gui/mappaint/Cascade.java
- src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
- src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
- test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
- test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java
Changes:
=====================================
.github/workflows/ant-test.yml
=====================================
@@ -41,7 +41,7 @@ jobs:
path: |
~/.ivy2/cache/
~/work/josm/josm/tools/
- key: ${{ runner.os }}-ivy2-${{ hashFiles('ivy.xml') }}
+ key: ${{ runner.os }}-ivy2-${{ hashFiles('build.xml', 'ivy.xml', 'tools/ivy.xml') }}
- name: Setup Java ${{ matrix.java }}
uses: actions/setup-java at v1.4.3
=====================================
.github/workflows/ant.yml
=====================================
@@ -90,7 +90,7 @@ jobs:
path: |
~/.ivy2/cache/
~/work/josm/josm/tools/
- key: ${{ runner.os }}-ivy2-${{ hashFiles('ivy.xml') }}
+ key: ${{ runner.os }}-ivy2-${{ hashFiles('build.xml', 'ivy.xml', 'tools/ivy.xml') }}
- name: Setup Java ${{ matrix.java }}
uses: actions/setup-java at v1.4.3
=====================================
REVISION
=====================================
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="UTF-8"?>
<info>
<entry
- kind="dir"
path="trunk"
- revision="17915">
+ revision="17919"
+ kind="dir">
<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="17915">
+ revision="17919">
<author>simon04</author>
-<date>2021-05-27T17:45:08.748039Z</date>
+<date>2021-06-02T20:03:39.450569Z</date>
</commit>
</entry>
</info>
=====================================
i18n/po/fr.po
=====================================
@@ -6,14 +6,14 @@ msgstr ""
"Project-Id-Version: fr\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-28 03:34+0200\n"
-"PO-Revision-Date: 2021-05-26 11:09+0000\n"
+"PO-Revision-Date: 2021-05-31 07:41+0000\n"
"Last-Translator: lenny.libre <Unknown>\n"
"Language-Team: Fr <>\n"
"MIME-Version: 1.0\n"
"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: 2021-05-29 04:57+0000\n"
+"X-Launchpad-Export-Date: 2021-06-01 04:32+0000\n"
"X-Generator: Launchpad (build 925b661396f90467a0d31fdfb13d4990b7239925)\n"
"Language: fr\n"
"X-Poedit-Bookmarks: -1,-1,-1,2669,-1,-1,-1,-1,-1,-1\n"
@@ -45575,7 +45575,7 @@ msgid "All inside [testing]"
msgstr "Tout l’intérieur [en test]"
msgid "Select all inside selected polygons"
-msgstr "Tout sélectionner à l’intérieur des polygons sélectionnés"
+msgstr "Tout sélectionner à l’intérieur des polygones sélectionnés"
msgid "All inside"
msgstr "Tout à l''intérieur"
=====================================
i18n/po/nb.po
=====================================
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-28 03:34+0200\n"
-"PO-Revision-Date: 2021-05-30 06:28+0000\n"
+"PO-Revision-Date: 2021-06-01 14:59+0000\n"
"Last-Translator: Kjell Cato Heskjestad <Unknown>\n"
"Language-Team: Norwegian Bokmal <nb at li.org>\n"
"MIME-Version: 1.0\n"
"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: 2021-05-31 04:32+0000\n"
+"X-Launchpad-Export-Date: 2021-06-02 04:31+0000\n"
"X-Generator: Launchpad (build 925b661396f90467a0d31fdfb13d4990b7239925)\n"
"Language: nb\n"
@@ -25453,80 +25453,80 @@ msgid "valve_group"
msgstr "ventilgruppe"
msgid "Pipeline Valve"
-msgstr ""
+msgstr "Rørventil"
msgid "Valve type"
-msgstr ""
+msgstr "Ventiltype"
msgctxt "valve"
msgid "butterfly"
-msgstr ""
+msgstr "spjeld"
msgctxt "valve"
msgid "globe"
-msgstr ""
+msgstr "kule"
msgctxt "valve"
msgid "ball"
-msgstr ""
+msgstr "ball"
msgctxt "valve"
msgid "plug"
-msgstr ""
+msgstr "plugg"
msgctxt "valve"
msgid "gate"
-msgstr ""
+msgstr "sluse"
msgctxt "valve"
msgid "needle"
-msgstr ""
+msgstr "nål"
msgctxt "valve"
msgid "spool"
-msgstr ""
+msgstr "spole"
msgid "Actuator"
msgstr "Aktuator"
msgctxt "actuator"
msgid "electric_motor"
-msgstr ""
+msgstr "elektrisk motor"
msgctxt "actuator"
msgid "hydraulic_cylinder"
-msgstr ""
+msgstr "hydraulisk sylinder"
msgctxt "actuator"
msgid "manual"
-msgstr ""
+msgstr "manuell"
msgctxt "actuator"
msgid "pneumatic_cylinder"
-msgstr ""
+msgstr "pneumatisk sylinder"
msgctxt "actuator"
msgid "solenoid"
-msgstr ""
+msgstr "solenoide"
msgctxt "actuator"
msgid "thermostatic"
msgstr "termostatisk"
msgid "Handle"
-msgstr ""
+msgstr "Håndtak"
msgctxt "handle"
msgid "lever"
-msgstr ""
+msgstr "spake"
msgctxt "handle"
msgid "wheel"
-msgstr ""
+msgstr "ratt"
msgctxt "handle"
msgid "cross"
-msgstr ""
+msgstr "kryss"
msgctxt "handle"
msgid "button"
@@ -25536,10 +25536,10 @@ msgid "Direction to close"
msgstr "Lukkeretning"
msgid "anti_clockwise"
-msgstr ""
+msgstr "mot klokka"
msgid "Position sensor"
-msgstr ""
+msgstr "Posisjonsføler"
msgid "optical"
msgstr "optisk"
@@ -25548,37 +25548,37 @@ msgid "inductive"
msgstr "induktiv"
msgid "Marker"
-msgstr ""
+msgstr "Markør"
msgctxt "marker"
msgid "aerial"
-msgstr ""
+msgstr "i lufta"
msgctxt "marker"
msgid "ground"
-msgstr ""
+msgstr "på bakken"
msgctxt "marker"
msgid "pedestal"
-msgstr ""
+msgstr "pidestall"
msgctxt "marker"
msgid "plate"
-msgstr ""
+msgstr "skilt"
msgctxt "marker"
msgid "post"
-msgstr ""
+msgstr "stolpe"
msgctxt "marker"
msgid "stone"
-msgstr ""
+msgstr "stein"
msgid "Utility"
-msgstr ""
+msgstr "Type infrastruktur"
msgid "heating"
-msgstr ""
+msgstr "oppvarming"
msgid "hydrant"
msgstr "hydrant"
@@ -25643,7 +25643,7 @@ msgid "Pump"
msgstr "Pumpe"
msgid "powered"
-msgstr ""
+msgstr "drevet"
msgid "Bridges"
msgstr "Broer"
@@ -25652,25 +25652,25 @@ msgid "aqueduct"
msgstr "akvedukt"
msgid "boardwalk"
-msgstr ""
+msgstr "plankevei"
msgid "cantilever"
-msgstr ""
+msgstr "utkraging"
msgid "covered"
-msgstr ""
+msgstr "overdekket"
msgid "low_water_crossing"
-msgstr ""
+msgstr "lav bru (kan være oversvømt)"
msgid "trestle"
msgstr ""
msgid "viaduct"
-msgstr ""
+msgstr "viadukt"
msgid "Structure"
-msgstr ""
+msgstr "Struktur"
msgid "arch"
msgstr ""
@@ -25682,7 +25682,7 @@ msgid "cable-stayed"
msgstr ""
msgid "floating"
-msgstr ""
+msgstr "flytende"
msgid "humpback"
msgstr ""
@@ -25694,25 +25694,25 @@ msgid "suspension"
msgstr ""
msgid "truss"
-msgstr ""
+msgstr "fagverk"
msgid "Movable Bridge"
-msgstr ""
+msgstr "Flyttbar bru"
msgid "bascule"
-msgstr ""
+msgstr "klaffebro"
msgid "drawbridge"
-msgstr ""
+msgstr "vindebro"
msgid "lift"
msgstr ""
msgid "submersible"
-msgstr ""
+msgstr "senkbar"
msgid "swing"
-msgstr ""
+msgstr "svingebro"
msgid "transporter"
msgstr ""
@@ -25759,47 +25759,47 @@ msgstr "Bunker"
msgctxt "bunker"
msgid "command"
-msgstr ""
+msgstr "kommando"
msgctxt "bunker"
msgid "foxhole"
-msgstr ""
+msgstr "skyttergrav"
msgctxt "bunker"
msgid "gun_emplacement"
-msgstr ""
+msgstr "skytestilling"
msgctxt "bunker"
msgid "hardened_aircraft_shelter"
-msgstr ""
+msgstr "shelter"
msgctxt "bunker"
msgid "mg_nest"
-msgstr ""
+msgstr "maskingeværstilling"
msgctxt "bunker"
msgid "munitions"
-msgstr ""
+msgstr "ammunisjon"
msgctxt "bunker"
msgid "observation"
-msgstr ""
+msgstr "observasjon"
msgctxt "bunker"
msgid "personnel_shelter"
-msgstr ""
+msgstr "personell"
msgctxt "bunker"
msgid "pillbox"
-msgstr ""
+msgstr "pillbox"
msgctxt "bunker"
msgid "technical"
-msgstr ""
+msgstr "teknisk"
msgctxt "bunker"
msgid "tobruk"
-msgstr ""
+msgstr "tobruk"
msgctxt "bunker"
msgid "overground"
@@ -25816,13 +25816,13 @@ msgid "Ruins"
msgstr "Ruiner"
msgid "Range"
-msgstr ""
+msgstr "Skytefelt"
msgid "Power"
-msgstr ""
+msgstr "Strøm"
msgid "Power Plant"
-msgstr ""
+msgstr "Kraftverk"
msgid "Output forms of energy (optional):"
msgstr "Produsert energitype (valgfri):"
=====================================
i18n/po/nl.po
=====================================
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-28 03:34+0200\n"
-"PO-Revision-Date: 2021-05-28 19:52+0000\n"
+"PO-Revision-Date: 2021-05-31 15:39+0000\n"
"Last-Translator: Sanderl <Unknown>\n"
"Language-Team: Dutch\n"
"MIME-Version: 1.0\n"
"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: 2021-05-29 04:53+0000\n"
+"X-Launchpad-Export-Date: 2021-06-01 04:31+0000\n"
"X-Generator: Launchpad (build 925b661396f90467a0d31fdfb13d4990b7239925)\n"
"Language: nl\n"
@@ -25949,7 +25949,7 @@ msgstr "Toren"
msgctxt "mast/tower"
msgid "bell_tower"
-msgstr "klokken_toren"
+msgstr "klokkentoren"
msgctxt "mast/tower"
msgid "cooling"
=====================================
i18n/po/sv.po
=====================================
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-28 03:34+0200\n"
-"PO-Revision-Date: 2021-01-09 14:27+0000\n"
-"Last-Translator: Don-vip <vincent.privat at gmail.com>\n"
+"PO-Revision-Date: 2021-05-31 08:52+0000\n"
+"Last-Translator: Tomas Marklund <tomasmarklund75 at gmail.com>\n"
"Language-Team: Swedish <sv at li.org>\n"
"MIME-Version: 1.0\n"
"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: 2021-05-29 05:53+0000\n"
+"X-Launchpad-Export-Date: 2021-06-01 04:33+0000\n"
"X-Generator: Launchpad (build 925b661396f90467a0d31fdfb13d4990b7239925)\n"
"Language: sv\n"
@@ -21232,10 +21232,10 @@ msgid "default"
msgstr ""
msgid "double_slip"
-msgstr ""
+msgstr "Dubbel korsningsväxel"
msgid "single_slip"
-msgstr ""
+msgstr "enkel korsningsväxel"
msgid "three_way"
msgstr ""
=====================================
i18n/po/uk.po
=====================================
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-28 03:34+0200\n"
-"PO-Revision-Date: 2021-05-25 09:45+0000\n"
+"PO-Revision-Date: 2021-05-31 14:40+0000\n"
"Last-Translator: andygol <Unknown>\n"
"Language-Team: Ukrainian <uk at li.org>\n"
"MIME-Version: 1.0\n"
@@ -16,7 +16,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && "
"n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Launchpad-Export-Date: 2021-05-29 06:00+0000\n"
+"X-Launchpad-Export-Date: 2021-06-01 04:34+0000\n"
"X-Generator: Launchpad (build 925b661396f90467a0d31fdfb13d4990b7239925)\n"
"Language: uk\n"
@@ -34368,7 +34368,7 @@ msgid "Ukraine - Pulyny 2020"
msgstr "України - Пулини 2020"
msgid "Ukraine - Mariupol"
-msgstr ""
+msgstr "Україна - Маріуполь"
msgid "7th Series (OS7)"
msgstr "7-я серія (OS7)"
@@ -45049,16 +45049,19 @@ msgid "Removes all nodes from selection"
msgstr "Зняти виділення з усіх точок"
msgid "Maxspeed consistency"
-msgstr ""
+msgstr "Послідовність значень Maxspeed"
msgid "Looks for short ways that have the same maxspeed on both sides"
msgstr ""
+"Пошук коротких відрізків, які мають однакові значення maxspeed з обох кінців"
msgid "testing"
-msgstr ""
+msgstr "тестування"
msgid "Maxspeed has a blank spot with equal maxspeeds on either side"
msgstr ""
+"У Maxspeed є порожнє місце з однаковими максимальними швидкостями по обидва "
+"боки"
msgid "Way Download"
msgstr "Завантажити лінію"
=====================================
i18n/po/zh_TW.po
=====================================
@@ -8,14 +8,14 @@ msgstr ""
"Project-Id-Version: josm\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2021-05-28 03:34+0200\n"
-"PO-Revision-Date: 2021-05-25 13:30+0000\n"
+"PO-Revision-Date: 2021-06-01 08:37+0000\n"
"Last-Translator: Steve Lee <Unknown>\n"
"Language-Team: Traditional Chinese\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Launchpad-Export-Date: 2021-05-29 06:12+0000\n"
+"X-Launchpad-Export-Date: 2021-06-02 04:32+0000\n"
"X-Generator: Launchpad (build 925b661396f90467a0d31fdfb13d4990b7239925)\n"
"Language: zh_TW\n"
@@ -18199,7 +18199,7 @@ msgid "secondary_link"
msgstr ""
msgid "Tertiary"
-msgstr "鄉道("
+msgstr "鄉道"
msgctxt "highway"
msgid "tertiary"
=====================================
src/org/openstreetmap/josm/gui/mappaint/Cascade.java
=====================================
@@ -141,12 +141,11 @@ public final class Cascade {
* @param klass The class
* @return The converted object or <code>null</code> if the conversion failed
*/
- @SuppressWarnings("unchecked")
public static <T> T convertTo(Object o, Class<T> klass) {
if (o == null)
return null;
if (klass.isInstance(o))
- return (T) o;
+ return klass.cast(o);
return GENERIC_PARSER.supports(klass)
? GENERIC_PARSER.parse(klass, o)
=====================================
src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java
=====================================
@@ -227,7 +227,7 @@ public final class ExpressionFactory {
FACTORY_MAP.put("rgb", Factory.of(float.class, float.class, float.class, null, Functions::rgb));
FACTORY_MAP.put("rgba", Factory.of(float.class, float.class, float.class, float.class, Functions::rgba));
FACTORY_MAP.put("role", Factory.ofEnv(Functions::role));
- FACTORY_MAP.put("round", Factory.of(Math::acos));
+ FACTORY_MAP.put("round", Factory.of(Math::round));
FACTORY_MAP.put("setting", Factory.ofEnv(String.class, Functions::setting));
FACTORY_MAP.put("signum", Factory.of(Math::signum));
FACTORY_MAP.put("sin", Factory.of(Math::sin));
=====================================
src/org/openstreetmap/josm/gui/tagging/presets/items/ComboMultiSelect.java
=====================================
@@ -396,6 +396,14 @@ public abstract class ComboMultiSelect extends KeyedItem {
@Override
public void addCommands(List<Tag> changedTags) {
String value = getSelectedValue();
+
+ // no change if same as before
+ if (originalValue == null) {
+ if (value.isEmpty())
+ return;
+ } else if (value.equals(originalValue.toString()))
+ return;
+
if (isUseLastAsDefault()) {
LAST_VALUES.put(key, value);
}
=====================================
test/unit/org/openstreetmap/josm/data/validation/tests/MapCSSTagCheckerTest.java
=====================================
@@ -424,8 +424,10 @@ class MapCSSTagCheckerTest {
}
/**
- * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/19053">Bug #19053</a>.
- * Mapcss rule with group.
+ * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/19053">Bug #19053</a> and
+ * <a href="https://josm.openstreetmap.de/ticket/20957">Bug #20957</a>
+ * - MapCSS rule with group.
+ * - MapCSS functions round, tag, *, /
* @throws ParseException if a parsing error occurs
*/
@Test
@@ -433,13 +435,20 @@ class MapCSSTagCheckerTest {
final MapCSSTagChecker test = buildTagChecker(
"*[ele][ele =~ /^-?[0-9]+\\.[0-9][0-9][0-9]+$/] {"
+ "throwWarning: tr(\"{0}\",\"{0.tag}\");"
+ + "fixAdd: concat(\"ele=\", round(tag(\"ele\")*100)/100);"
+ "group: tr(\"Unnecessary amount of decimal places\");" + "}");
final OsmPrimitive p = OsmUtils.createPrimitive("node ele=12.123456");
+ new DataSet(p);
final Collection<TestError> errors = test.getErrorsForPrimitive(p, false);
assertEquals(1, errors.size());
assertEquals("Unnecessary amount of decimal places", errors.iterator().next().getMessage());
assertEquals("3000_ele=12.123456", errors.iterator().next().getIgnoreSubGroup());
assertEquals("3000_Unnecessary amount of decimal places", errors.iterator().next().getIgnoreGroup());
+ Command fix = errors.iterator().next().getFix();
+ assertNotNull(fix);
+ assertEquals("12.123456", p.get("ele"));
+ fix.executeCommand();
+ assertEquals("12.12", p.get("ele"));
}
}
=====================================
test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java
=====================================
@@ -614,6 +614,7 @@ class MapCSSParserTest {
"null0: -tag(does_not_exist);" +
"null1: tag(x1) + tag(x2);" +
"null2: 3 + tag(does_not_exist) + 5;" +
+ "rounding: concat(\"ele=\", round(tag(\"ele\")*100)/100);" +
"}");
source.loadStyleSource();
MultiCascade mc = new MultiCascade();
@@ -627,6 +628,7 @@ class MapCSSParserTest {
assertNull(mc.getCascade(null).get("null0"));
assertNull(mc.getCascade(null).get("null1"));
assertEquals(8.0, mc.getCascade(null).get("null2"));
+ assertEquals(8.0, mc.getCascade(null).get("rounding"));
}
@Test
@@ -737,4 +739,16 @@ class MapCSSParserTest {
source.apply(mc, OsmUtils.createPrimitive("node"), 20, false);
assertNull(mc.getCascade(null).get("name"));
}
+
+ /**
+ * Non-regression test for <a href="https://josm.openstreetmap.de/ticket/20957">Bug #20957</a>.
+ */
+ @Test
+ void testTicket20957() {
+ MapCSSStyleSource source = new MapCSSStyleSource("node {fixAdd: concat(\"ele=\", round(tag(\"ele\")*100)/100)}");
+ source.loadStyleSource();
+ MultiCascade mc = new MultiCascade();
+ source.apply(mc, OsmUtils.createPrimitive("node ele=12.123456"), 20, false);
+ assertEquals("ele=12.12", mc.getCascade(null).get("fixAdd"));
+ }
}
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/commit/7f67b326863779ee75496e78eccc65a0badcb624
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/josm/-/commit/7f67b326863779ee75496e78eccc65a0badcb624
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20210603/63588c89/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list