Index: trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/CommandInteger.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/CommandInteger.java (revision 17991) +++ trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/CommandInteger.java (revision 17994) @@ -2,4 +2,5 @@ package org.openstreetmap.josm.data.imagery.vectortile.mapbox; +import java.util.Arrays; import java.util.stream.Stream; @@ -31,5 +32,5 @@ /** * Add a parameter - * @param parameterInteger The parameter to add (converted to {@link short}). + * @param parameterInteger The parameter to add (converted to {@code short}). */ public void addParameter(Number parameterInteger) { @@ -58,5 +59,10 @@ */ public boolean hasAllExpectedParameters() { - return this.added >= this.parameters.length; + return this.added >= this.parameters.length; + } + + @Override + public String toString() { + return "CommandInteger [type=" + type + ", parameters=" + Arrays.toString(parameters) + ']'; } } Index: trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/Feature.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/Feature.java (revision 17991) +++ trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/Feature.java (revision 17994) @@ -167,4 +167,6 @@ * Get the an object with shapes for the geometry * @return An object with usable geometry information + * @throws IllegalArgumentException if the geometry object cannot be created because arguments are not understood + * or the shoelace formula returns 0 for a polygon ring. */ public Geometry getGeometryObject() { @@ -174,3 +176,11 @@ return this.geometryObject; } + + @Override + public String toString() { + return "Feature [geometry=" + geometry + ", " + + "geometryType=" + geometryType + ", id=" + id + ", " + + (tags != null ? "tags=" + tags + ", " : "") + + (geometryObject != null ? "geometryObject=" + geometryObject : "") + ']'; + } } Index: trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/Geometry.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/Geometry.java (revision 17991) +++ trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/Geometry.java (revision 17994) @@ -25,4 +25,5 @@ * @param geometryType The type of geometry * @param commands The commands used to create the geometry + * @throws IllegalArgumentException if arguments are not understood or if the shoelace formula returns 0 for a polygon ring. */ public Geometry(GeometryTypes geometryType, List commands) { @@ -34,6 +35,5 @@ for (int i = 0; i < operations.length / 2; i++) { // Just using Ellipse2D since it extends Shape - shapes.add(new Ellipse2D.Float(operations[2 * i], - operations[2 * i + 1], 0, 0)); + shapes.add(new Ellipse2D.Float(operations[2 * i], operations[2 * i + 1], 0, 0)); } } else { Index: trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java (revision 17991) +++ trunk/src/org/openstreetmap/josm/data/imagery/vectortile/mapbox/MapboxVectorTileSource.java (revision 17994) @@ -5,4 +5,5 @@ import java.io.IOException; import java.io.InputStream; +import java.nio.file.InvalidPathException; import java.util.List; import java.util.Objects; @@ -48,5 +49,5 @@ mapBoxVectorStyle = MapboxVectorStyle.getMapboxVectorStyle(info.getUrl()); } - } catch (IOException | JsonException e) { + } catch (IOException | InvalidPathException | JsonException e) { Logging.trace(e); } Index: trunk/src/org/openstreetmap/josm/data/vector/VectorDataStore.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/vector/VectorDataStore.java (revision 17991) +++ trunk/src/org/openstreetmap/josm/data/vector/VectorDataStore.java (revision 17994) @@ -1,4 +1,18 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.data.vector; + +import static java.util.stream.Collectors.toCollection; +import static java.util.stream.Collectors.toList; + +import java.awt.Shape; +import java.awt.geom.Area; +import java.awt.geom.Ellipse2D; +import java.awt.geom.Path2D; +import java.awt.geom.PathIterator; +import java.util.ArrayList; +import java.util.Collection; +import java.util.Collections; +import java.util.List; +import java.util.Objects; import org.openstreetmap.gui.jmapviewer.Coordinate; @@ -7,4 +21,5 @@ import org.openstreetmap.josm.data.IQuadBucketType; import org.openstreetmap.josm.data.imagery.vectortile.VectorTile; +import org.openstreetmap.josm.data.imagery.vectortile.mapbox.Feature; import org.openstreetmap.josm.data.imagery.vectortile.mapbox.Layer; import org.openstreetmap.josm.data.osm.BBox; @@ -21,15 +36,4 @@ import org.openstreetmap.josm.tools.JosmRuntimeException; import org.openstreetmap.josm.tools.Logging; - -import java.awt.geom.Area; -import java.awt.geom.Ellipse2D; -import java.awt.geom.Path2D; -import java.awt.geom.PathIterator; -import java.util.ArrayList; -import java.util.Collection; -import java.util.Collections; -import java.util.List; -import java.util.Objects; -import java.util.stream.Collectors; /** @@ -95,5 +99,5 @@ Collection relationWayList = members.stream().map(VectorRelationMember::getMember) .filter(VectorWay.class::isInstance) - .map(VectorWay.class::cast).collect(Collectors.toCollection(ArrayList::new)); + .map(VectorWay.class::cast).collect(toCollection(ArrayList::new)); // Only support way-only relations if (relationWayList.size() != relation.getMemberPrimitivesList().size()) { @@ -206,6 +210,5 @@ final PathIterator pathIterator = shape.getPathIterator(null); final List ways = pathIteratorToObjects(tile, layer, featureObjects, pathIterator).stream() - .filter(VectorWay.class::isInstance).map(VectorWay.class::cast).collect( - Collectors.toList()); + .filter(VectorWay.class::isInstance).map(VectorWay.class::cast).collect(toList()); // These nodes technically do not exist, so we shouldn't show them ways.stream().flatMap(way -> way.getNodes().stream()) @@ -258,8 +261,6 @@ private VectorRelation areaToRelation(T tile, Layer layer, Collection featureObjects, Area area) { - final PathIterator pathIterator = area.getPathIterator(null); - final List members = pathIteratorToObjects(tile, layer, featureObjects, pathIterator); VectorRelation vectorRelation = new VectorRelation(layer.getName()); - for (VectorPrimitive member : members) { + for (VectorPrimitive member : pathIteratorToObjects(tile, layer, featureObjects, area.getPathIterator(null))) { final String role; if (member instanceof VectorWay && ((VectorWay) member).isClosed()) { @@ -280,69 +281,77 @@ public void addDataTile(T tile) { for (Layer layer : tile.getLayers()) { - layer.getFeatures().forEach(feature -> { - org.openstreetmap.josm.data.imagery.vectortile.mapbox.Geometry geometry = feature - .getGeometryObject(); - List featureObjects = new ArrayList<>(); - List primaryFeatureObjects = new ArrayList<>(); - geometry.getShapes().forEach(shape -> { - final VectorPrimitive primitive; - if (shape instanceof Ellipse2D) { - primitive = pointToNode(tile, layer, featureObjects, - (int) ((Ellipse2D) shape).getCenterX(), (int) ((Ellipse2D) shape).getCenterY()); - } else if (shape instanceof Path2D) { - primitive = pathToWay(tile, layer, featureObjects, (Path2D) shape).stream().findFirst() - .orElse(null); - } else if (shape instanceof Area) { - primitive = areaToRelation(tile, layer, featureObjects, (Area) shape); - primitive.put(RELATION_TYPE, MULTIPOLYGON_TYPE); - } else { - // We shouldn't hit this, but just in case - throw new UnsupportedOperationException(); - } - primaryFeatureObjects.add(primitive); - }); - final VectorPrimitive primitive; - if (primaryFeatureObjects.size() == 1) { - primitive = primaryFeatureObjects.get(0); - if (primitive instanceof IRelation && !primitive.isMultipolygon()) { - primitive.put(JOSM_MERGE_TYPE_KEY, "merge"); - } - } else if (!primaryFeatureObjects.isEmpty()) { - VectorRelation relation = new VectorRelation(layer.getName()); - primaryFeatureObjects.stream().map(prim -> new VectorRelationMember("", prim)) - .forEach(relation::addRelationMember); - primitive = relation; - } else { - return; - } - primitive.setId(feature.getId()); - // Version 1 and 2 do not guarantee that non-zero ids are unique - // We depend upon unique ids in the data store - if (feature.getId() != 0 && this.primitivesMap.containsKey(primitive.getPrimitiveId())) { - // This, unfortunately, makes a new string - primitive.put(ORIGINAL_ID, Long.toString(feature.getId())); - primitive.setId(primitive.getIdGenerator().generateUniqueId()); - } - if (feature.getTags() != null) { - feature.getTags().forEach(primitive::put); - } - featureObjects.forEach(this::addPrimitive); - primaryFeatureObjects.forEach(this::addPrimitive); + for (Feature feature : layer.getFeatures()) { try { - this.addPrimitive(primitive); - } catch (JosmRuntimeException e) { - Logging.error("{0}/{1}/{2}: {3}", tile.getZoom(), tile.getXtile(), tile.getYtile(), primitive.get("key")); - throw e; - } - }); + addFeatureData(tile, layer, feature); + } catch (IllegalArgumentException e) { + Logging.error("Cannot add vector data for feature {0} of tile {1}: {2}", feature, tile, e.getMessage()); + Logging.error(e); + } + } } // Replace original_ids with the same object (reduce memory usage) // Strings aren't interned automatically in some GC implementations - Collection primitives = this.getAllPrimitives().stream().filter(p -> p.hasKey(ORIGINAL_ID)) - .collect(Collectors.toList()); - List toReplace = primitives.stream().map(p -> p.get(ORIGINAL_ID)).filter(Objects::nonNull).collect(Collectors.toList()); + Collection primitives = this.getAllPrimitives().stream().filter(p -> p.hasKey(ORIGINAL_ID)).collect(toList()); + List toReplace = primitives.stream().map(p -> p.get(ORIGINAL_ID)).filter(Objects::nonNull).collect(toList()); primitives.stream().filter(p -> toReplace.contains(p.get(ORIGINAL_ID))) .forEach(p -> p.put(ORIGINAL_ID, toReplace.stream().filter(shared -> shared.equals(p.get(ORIGINAL_ID))) .findAny().orElse(null))); + } + + private void addFeatureData(T tile, Layer layer, Feature feature) { + List featureObjects = new ArrayList<>(); + List primaryFeatureObjects = feature.getGeometryObject().getShapes().stream() + .map(shape -> shapeToPrimaryFeatureObject(tile, layer, shape, featureObjects)).collect(toList()); + final VectorPrimitive primitive; + if (primaryFeatureObjects.size() == 1) { + primitive = primaryFeatureObjects.get(0); + if (primitive instanceof IRelation && !primitive.isMultipolygon()) { + primitive.put(JOSM_MERGE_TYPE_KEY, "merge"); + } + } else if (!primaryFeatureObjects.isEmpty()) { + VectorRelation relation = new VectorRelation(layer.getName()); + primaryFeatureObjects.stream().map(prim -> new VectorRelationMember("", prim)) + .forEach(relation::addRelationMember); + primitive = relation; + } else { + return; + } + primitive.setId(feature.getId()); + // Version 1 and 2 do not guarantee that non-zero ids are unique + // We depend upon unique ids in the data store + if (feature.getId() != 0 && this.primitivesMap.containsKey(primitive.getPrimitiveId())) { + // This, unfortunately, makes a new string + primitive.put(ORIGINAL_ID, Long.toString(feature.getId())); + primitive.setId(primitive.getIdGenerator().generateUniqueId()); + } + if (feature.getTags() != null) { + feature.getTags().forEach(primitive::put); + } + featureObjects.forEach(this::addPrimitive); + primaryFeatureObjects.forEach(this::addPrimitive); + try { + this.addPrimitive(primitive); + } catch (JosmRuntimeException e) { + Logging.error("{0}/{1}/{2}: {3}", tile.getZoom(), tile.getXtile(), tile.getYtile(), primitive.get("key")); + throw e; + } + } + + private VectorPrimitive shapeToPrimaryFeatureObject( + T tile, Layer layer, Shape shape, List featureObjects) { + final VectorPrimitive primitive; + if (shape instanceof Ellipse2D) { + primitive = pointToNode(tile, layer, featureObjects, + (int) ((Ellipse2D) shape).getCenterX(), (int) ((Ellipse2D) shape).getCenterY()); + } else if (shape instanceof Path2D) { + primitive = pathToWay(tile, layer, featureObjects, (Path2D) shape).stream().findFirst().orElse(null); + } else if (shape instanceof Area) { + primitive = areaToRelation(tile, layer, featureObjects, (Area) shape); + primitive.put(RELATION_TYPE, MULTIPOLYGON_TYPE); + } else { + // We shouldn't hit this, but just in case + throw new UnsupportedOperationException(Objects.toString(shape)); + } + return primitive; } Index: trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 17991) +++ trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java (revision 17994) @@ -432,5 +432,6 @@ @Override public String toString() { - return rules.stream().map(MapCSSRule::toString).collect(Collectors.joining("\n")); + // Avoids ConcurrentModificationException + return new ArrayList<>(rules).stream().map(MapCSSRule::toString).collect(Collectors.joining("\n")); } }