natas_hw
/
OSM-binary
mirror of https://github.com/openstreetmap/OSM-binary
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix line endings (CRLF->LF), remove spaces at end of lines

This commit is contained in:
Jochen Topf 2013-09-02 20:44:02 +02:00
parent 0ff626d442
commit 73c5bd159d
3 changed files with 91 additions and 91 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

172
src.java/crosby/binary/test/ReadFileExample.java
View File

@ -1,86 +1,86 @@
package crosby.binary.test;
import crosby.binary.*;
import crosby.binary.Osmformat.*;
import crosby.binary.file.*;
import java.io.*;
import java.util.List;
/**
* Demonstrates how to read a file. Reads sample.pbf from the resources folder
* and prints details about it to the standard output.
*
* @author Michael Tandy
*/
public class ReadFileExample {
public static void main(String[] args) throws Exception {
InputStream input = ReadFileExample.class.getResourceAsStream("/sample.pbf");
BlockReaderAdapter brad = new TestBinaryParser();
new BlockInputStream(input, brad).process();
}
private static class TestBinaryParser extends BinaryParser {
@Override
protected void parseRelations(List<Relation> rels) {
if (!rels.isEmpty())
System.out.println("Got some relations to parse.");
Relation r = null;
}
@Override
protected void parseDense(DenseNodes nodes) {
long lastId=0;
long lastLat=0;
long lastLon=0;
for (int i=0 ; i<nodes.getIdCount() ; i++) {
lastId += nodes.getId(i);
lastLat += nodes.getLat(i);
lastLon += nodes.getLon(i);
System.out.printf("Dense node, ID %d @ %.6f,%.6f\n",
lastId,parseLat(lastLat),parseLon(lastLon));
}
}
@Override
protected void parseNodes(List<Node> nodes) {
for (Node n : nodes) {
System.out.printf("Regular node, ID %d @ %.6f,%.6f\n",
n.getId(),parseLat(n.getLat()),parseLon(n.getLon()));
}
}
@Override
protected void parseWays(List<Way> ways) {
for (Way w : ways) {
System.out.println("Way ID " + w.getId());
StringBuilder sb = new StringBuilder();
sb.append(" Nodes: ");
long lastRef = 0;
for (Long ref : w.getRefsList()) {
lastRef+= ref;
sb.append(lastRef).append(" ");
}
sb.append("\n Key=value pairs: ");
for (int i=0 ; i<w.getKeysCount() ; i++) {
sb.append(getStringById(w.getKeys(i))).append("=")
.append(getStringById(w.getVals(i))).append(" ");
}
System.out.println(sb.toString());
}
}
@Override
protected void parse(HeaderBlock header) {
System.out.println("Got header block.");
}
public void complete() {
System.out.println("Complete!");
}
}
}
package crosby.binary.test;
import crosby.binary.*;
import crosby.binary.Osmformat.*;
import crosby.binary.file.*;
import java.io.*;
import java.util.List;
/**
* Demonstrates how to read a file. Reads sample.pbf from the resources folder
* and prints details about it to the standard output.
*
* @author Michael Tandy
*/
public class ReadFileExample {
public static void main(String[] args) throws Exception {
InputStream input = ReadFileExample.class.getResourceAsStream("/sample.pbf");
BlockReaderAdapter brad = new TestBinaryParser();
new BlockInputStream(input, brad).process();
}
private static class TestBinaryParser extends BinaryParser {
@Override
protected void parseRelations(List<Relation> rels) {
if (!rels.isEmpty())
System.out.println("Got some relations to parse.");
Relation r = null;
}
@Override
protected void parseDense(DenseNodes nodes) {
long lastId=0;
long lastLat=0;
long lastLon=0;
for (int i=0 ; i<nodes.getIdCount() ; i++) {
lastId += nodes.getId(i);
lastLat += nodes.getLat(i);
lastLon += nodes.getLon(i);
System.out.printf("Dense node, ID %d @ %.6f,%.6f\n",
lastId,parseLat(lastLat),parseLon(lastLon));
}
}
@Override
protected void parseNodes(List<Node> nodes) {
for (Node n : nodes) {
System.out.printf("Regular node, ID %d @ %.6f,%.6f\n",
n.getId(),parseLat(n.getLat()),parseLon(n.getLon()));
}
}
@Override
protected void parseWays(List<Way> ways) {
for (Way w : ways) {
System.out.println("Way ID " + w.getId());
StringBuilder sb = new StringBuilder();
sb.append(" Nodes: ");
long lastRef = 0;
for (Long ref : w.getRefsList()) {
lastRef+= ref;
sb.append(lastRef).append(" ");
}
sb.append("\n Key=value pairs: ");
for (int i=0 ; i<w.getKeysCount() ; i++) {
sb.append(getStringById(w.getKeys(i))).append("=")
.append(getStringById(w.getVals(i))).append(" ");
}
System.out.println(sb.toString());
}
}
@Override
protected void parse(HeaderBlock header) {
System.out.println("Got header block.");
}
public void complete() {
System.out.println("Complete!");
}
}
}

4
src/CMakeLists.txt
View File

@ -1,9 +1,9 @@
PROTOBUF_GENERATE_CPP(CPPS HS fileformat.proto osmformat.proto)
if(MSVC)
set(CMAKE_CXX_FLAGS "/O3")
set(CMAKE_CXX_FLAGS "/O3")
else()
set(CMAKE_CXX_FLAGS "-O3")
set(CMAKE_CXX_FLAGS "-O3")
endif()
add_library(osmpbf STATIC ${CPPS})

6
tools/CMakeLists.txt
View File

@ -2,7 +2,7 @@ SET(PROJECT osmpbf-outline)
PROJECT(${PROJECT})
if(MSVC)
set(CMAKE_CXX_FLAGS "/O3")
set(CMAKE_CXX_FLAGS "/O3")
else()
set(CMAKE_CXX_FLAGS "-O3 -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64")
endif()
@ -23,10 +23,10 @@ CHECK_INCLUDE_FILES(winsock2.h HAVE_WINSOCK)
if(HAVE_WINSOCK)
add_definitions( -DD_HAVE_WINSOCK )
SET(WINSOCK_LIB ws2_32)
endif()
endif()
find_package(Threads)
target_link_libraries(${PROJECT} ${WINSOCK_LIB} ${ZLIB_LIBRARY} osmpbf ${PROTOBUF_LITE_LIBRARIES})
INSTALL(TARGETS ${PROJECT} RUNTIME DESTINATION bin)
INSTALL(TARGETS ${PROJECT} RUNTIME DESTINATION bin)