mirror
/
MapWithAI
kopia lustrzana https://github.com/JOSM/MapWithAI
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Fix an issue with duplicate RapiD URL's being added 

Signed-off-by: Taylor Smock <smocktaylor@gmail.com>
pull/1/head
Taylor Smock 2019-09-22 06:14:13 -06:00
rodzic 330f18409e
commit 35f1166357
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 9FDE4FFEF1C4CCB7
2 zmienionych plików z 22 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

6
src/main/java/org/openstreetmap/josm/plugins/rapid/backend/RapiDDataUtils.java
Wyświetl plik

@ -149,9 +149,11 @@ public final class RapiDDataUtils {
ExtendedSourceEntry rapid = new ExtendedSourceEntry(SourceType.MAP_PAINT_STYLE, "rapid.mapcss", ExtendedSourceEntry rapid = new ExtendedSourceEntry(SourceType.MAP_PAINT_STYLE, "rapid.mapcss",
"https://gitlab.com/smocktaylor/rapid/raw/master/src/resources/styles/standard/rapid.mapcss"); "https://gitlab.com/smocktaylor/rapid/raw/master/src/resources/styles/standard/rapid.mapcss");
List<SourceEntry> paintStyles = MapPaintPrefHelper.INSTANCE.get(); List<SourceEntry> paintStyles = MapPaintPrefHelper.INSTANCE.get();
if (!paintStyles.contains(rapid)) { for (SourceEntry paintStyle : paintStyles) {
paintStyles.add(rapid); if (rapid.url.equals(paintStyle.url))
return;
} }
paintStyles.add(rapid);
MapPaintPrefHelper.INSTANCE.put(paintStyles); MapPaintPrefHelper.INSTANCE.put(paintStyles);
} }
} }

19
test/unit/org/openstreetmap/josm/plugins/rapid/RapiDDataUtilsTest.java
Wyświetl plik

@ -3,6 +3,7 @@ package org.openstreetmap.josm.plugins.rapid;
import java.util.Collection; import java.util.Collection;
import java.util.Collections; import java.util.Collections;
import java.util.List;
import java.util.TreeSet; import java.util.TreeSet;
import org.junit.Assert; import org.junit.Assert;
@ -15,12 +16,14 @@ import org.openstreetmap.josm.data.osm.DataSet;
import org.openstreetmap.josm.data.osm.Node; import org.openstreetmap.josm.data.osm.Node;
import org.openstreetmap.josm.data.osm.OsmPrimitive; import org.openstreetmap.josm.data.osm.OsmPrimitive;
import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.data.osm.Way;
import org.openstreetmap.josm.data.preferences.sources.MapPaintPrefHelper;
import org.openstreetmap.josm.data.preferences.sources.SourceEntry;
import org.openstreetmap.josm.plugins.rapid.backend.RapiDDataUtils; import org.openstreetmap.josm.plugins.rapid.backend.RapiDDataUtils;
import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.JOSMTestRules;
public class RapiDDataUtilsTest { public class RapiDDataUtilsTest {
@Rule @Rule
public JOSMTestRules test = new JOSMTestRules(); public JOSMTestRules test = new JOSMTestRules().preferences();
/** /**
* This gets data from RapiD. This test may fail if someone adds the data to OSM. * This gets data from RapiD. This test may fail if someone adds the data to OSM.
@ -77,4 +80,18 @@ public class RapiDDataUtilsTest {
RapiDDataUtils.removePrimitivesFromDataSet(Collections.singleton(way1)); RapiDDataUtils.removePrimitivesFromDataSet(Collections.singleton(way1));
Assert.assertEquals(0, ds1.allPrimitives().size()); Assert.assertEquals(0, ds1.allPrimitives().size());
} }
@Test
public void testAddPaintStyle() {
List<SourceEntry> paintStyles = MapPaintPrefHelper.INSTANCE.get();
// There are two default paint styles
Assert.assertEquals(2, paintStyles.size());
RapiDDataUtils.addRapiDPaintStyles();
paintStyles = MapPaintPrefHelper.INSTANCE.get();
Assert.assertEquals(3, paintStyles.size());
RapiDDataUtils.addRapiDPaintStyles();
paintStyles = MapPaintPrefHelper.INSTANCE.get();
Assert.assertEquals(3, paintStyles.size());
RapiDDataUtils.addRapiDPaintStyles();
}
} }