[Talk-cz] Plakat

[Pavel Machek]

Ahoj!

> Committed revision 11336.
> 
> k nalezeni:
> http://svn.openstreetmap.org/misc/pr_material/czech_poster_2008_10/

Zajimave, jak se ziskavaji commitovaci prava? Mel bych update knihovny
aby chodila s novym API a nameit programek...

								Pavel

Index: applications/lib/libosm/Way.cpp
===================================================================
--- applications/lib/libosm/Way.cpp	(revision 10789)
+++ applications/lib/libosm/Way.cpp	(working copy)
@@ -63,9 +63,12 @@
 {
 
 	if (hasTags() || segments.size()) {
-		strm << "  <way id='" << id << "'>" << endl;
+		strm << "  <way id='" << id << "'";
+		if (changed)
+			strm << " action='modify'";
+		strm << ">" << endl;
 		for(int count=0; count<segments.size(); count++)
-			strm  << "    <seg id='" << segments[count] << "'/>" << endl;
+			strm  << "    <nd ref='" << segments[count] << "'/>" << endl;
 		tagsToXML(strm);
 		strm << "  </way>" << endl;
 	} else {
Index: applications/lib/libosm/Way.h
===================================================================
--- applications/lib/libosm/Way.h	(revision 10789)
+++ applications/lib/libosm/Way.h	(working copy)
@@ -38,14 +38,18 @@
 	vector<int> segments;
 
 public:
+	int changed;
+
 	Way()
 	{
 		id = 0;
+		changed = 0;
 	}
 
 	Way(int id)
 	{
 		this->id=id;
+		changed = 0;
 	}
 
 	void addSegment (int s)
Index: applications/lib/libosm/Components.cpp
===================================================================
--- applications/lib/libosm/Components.cpp	(revision 10789)
+++ applications/lib/libosm/Components.cpp	(working copy)
@@ -17,7 +17,6 @@
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 USA
 
  */
-// 180306 updated for 0.3    
 #include "Components.h"
 #include <iostream>
 #include <fstream>
@@ -355,7 +354,7 @@
 
 void Components::toXML(std::ostream &strm)
 {
-	strm << "<?xml version='1.0'?>"<<endl<<"<osm version='0.3'>" << endl;
+	strm << "<?xml version='1.0'?>"<<endl<<"<osm version='0.5'>" << endl;
 	rewindNodes();
 	while(hasMoreNodes())
 	{
Index: applications/lib/libosm/Parser.cpp
===================================================================
--- applications/lib/libosm/Parser.cpp	(revision 10789)
+++ applications/lib/libosm/Parser.cpp	(working copy)
@@ -45,23 +45,6 @@
 			
 
 		}
-		else if(!strcmp(element,"segment"))
-		{
-			curID=0;
-			inSegment = true;
-			for(int count=0; attrs[count]; count+=2)
-			{
-				if(!strcmp(attrs[count],"from"))
-					from = atoi(attrs[count+1]);
-				if(!strcmp(attrs[count],"to"))
-					to = atoi(attrs[count+1]);
-				if(!strcmp(attrs[count],"id"))
-					curID = atoi(attrs[count+1]);
-			}
-
-			curObject = new Segment(curID,from,to);
-			components->addSegment ((Segment*)curObject);
-		}
 		else if (!strcmp(element,"way"))
 		{
 			curID=0;
@@ -74,13 +57,13 @@
 			curObject  =  new Way(curID);
 			components->addWay((Way*)curObject);
 		}
-		else if (!strcmp(element,"seg") && (inWay))
+		else if (!strcmp(element,"nd") && (inWay))
 		{
 			int segID;
 
 			for(int count=0; attrs[count]; count+=2)
 			{
-				if(!strcmp(attrs[count],"id"))
+				if(!strcmp(attrs[count],"ref"))
 				{
 					segID=atoi(attrs[count+1]);
 					((Way*)curObject)->addSegment(segID);
Index: applications/lib/libosm/Makefile
===================================================================
--- applications/lib/libosm/Makefile	(revision 10789)
+++ applications/lib/libosm/Makefile	(working copy)
@@ -3,6 +3,7 @@
 OBJ = Object.o Way.o Parser.o Components.o functions.o llgr.o FeaturesParser.o
 NETOBJ = Client.o
 TESTOBJ = test.o
+NAMEITOBJ = nameit.o
 RULESTESTOBJ = rulestest.o
 CXX = g++
 
@@ -15,6 +16,9 @@
 test: $(TESTOBJ) libosm.a libosmnet.a
 	$(CXX) -o test $(TESTOBJ) libosm.a libosmnet.a $(LDFLAGS)
 
+nameit: $(NAMEITOBJ) libosm.a libosmnet.a
+	$(CXX) -o nameit $(NAMEITOBJ) libosm.a libosmnet.a $(LDFLAGS)
+
 rulestest: $(RULESTESTOBJ) libosm.a 
 	$(CXX) -o rulestest $(RULESTESTOBJ) libosm.a $(LDFLAGS)
 

-- 
(english) http://www.livejournal.com/~pavelmachek
(cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html
------------- další část ---------------
A non-text attachment was scrubbed...
Name: nameit.cpp
Type: text/x-c++src
Size: 3692 bytes
Desc: [žádný popis není k dispozici]
URL: <https://lists.openstreetmap.org/pipermail/talk-cz/attachments/20081020/63a086c1/attachment.cpp>