xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

GeometryBuffer: add removeLastPoint (#702)

Browse Source
This commit is contained in:
Gustl22 2019-03-19 14:40:45 +01:00 committed by Emux
parent 4e37ae26c9
commit fb8e6dab20
No known key found for this signature in database
GPG Key ID: 64ED9980896038C3
5 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
vtm-extras/src/org/oscim/tiling/source/geojson/GeoJsonTileDecoder.java
View File

@ -259,7 +259,7 @@ public class GeoJsonTileDecoder implements ITileDecoder {
ring++;
parseCoordSequence(jp);
removeLastPoint();
mMapElement.removeLastPoint();
continue;
}
@ -268,11 +268,6 @@ public class GeoJsonTileDecoder implements ITileDecoder {
}
}
private void removeLastPoint() {
mMapElement.pointNextPos -= 2;
mMapElement.index[mMapElement.indexCurrentPos] -= 2;
}
private void parseLineString(JsonParser jp)
throws JsonParseException, IOException {
mMapElement.startLine();

7
vtm-extras/src/org/oscim/tiling/source/overpass/OverpassTileDecoder.java
View File

@ -127,15 +127,10 @@ public class OverpassTileDecoder implements ITileDecoder {
//ring++;
parseCoordSequence(element);
removeLastPoint();
mMapElement.removeLastPoint();
//}
}
private void removeLastPoint() {
mMapElement.pointNextPos -= 2;
mMapElement.index[mMapElement.indexCurrentPos] -= 2;
}
private void parseLine(OsmWay element) {
mMapElement.startLine();
parseCoordSequence(element);

7
vtm-json/src/org/oscim/tiling/source/geojson/TileDecoder.java
View File

@ -256,7 +256,7 @@ public class TileDecoder implements ITileDecoder {
ring++;
parseCoordSequence(jp);
removeLastPoint();
mMapElement.removeLastPoint();
continue;
}
@ -265,11 +265,6 @@ public class TileDecoder implements ITileDecoder {
}
}
private void removeLastPoint() {
mMapElement.pointNextPos -= 2;
mMapElement.index[mMapElement.indexCurrentPos] -= 2;
}
private void parseLineString(JsonParser jp) throws IOException {
mMapElement.startLine();
parseCoordSequence(jp);

35
vtm-tests/test/org/oscim/core/GeometryBufferTest.java Normal file
View File

@ -0,0 +1,35 @@
/*
* Copyright 2019 Gustl22
*
* This program is free software: you can redistribute it and/or modify it under the
* terms of the GNU Lesser General Public License as published by the Free Software
* Foundation, either version 3 of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful, but WITHOUT ANY
* WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
* PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.oscim.core;
import org.junit.Assert;
import org.junit.Test;
public class GeometryBufferTest {
@Test
public void removeLastPointPolyTest() {
GeometryBuffer buffer = new GeometryBuffer(4, 1);
buffer.startPolygon();
buffer.addPoint(0, 0);
buffer.addPoint(10, 0);
buffer.addPoint(10, 10);
buffer.addPoint(0, 10);
buffer.removeLastPoint();
System.out.println(buffer.toString());
Assert.assertEquals(buffer.getNumPoints(), 3);
}
}

10
vtm/src/org/oscim/core/GeometryBuffer.java
View File

@ -468,6 +468,16 @@ public class GeometryBuffer {
return GeometryUtils.isClockwise(points, index[0]);
}
/**
* Remove the last point.
*/
public void removeLastPoint() {
if (!isTris()) {
pointNextPos -= 2;
index[indexCurrentPos] -= 2;
}
}
/**
* Reverse the order of points for lines and polygons.
*/