Attachment #234648 for bug #264641

View | Details | Raw Unified | Return to bug 264641
Collapse All | Expand All

Lines 2-8 Link Here

(-)b/astro/merkaartor/Makefile (-1 / +1 lines)
2		2
3	PORTNAME= merkaartor	3	PORTNAME= merkaartor
4	PORTVERSION= 0.19.0	4	PORTVERSION= 0.19.0
5	PORTREVISION= 3	5	PORTREVISION= 4
6	CATEGORIES= astro	6	CATEGORIES= astro
7		7
8	MAINTAINER= dev2@heesakkers.info	8	MAINTAINER= dev2@heesakkers.info




--- src/Config.pri.orig	2022-06-11 16:26:36 UTC
+++ src/Config.pri
@@ -1,11 +1,7 @@
 # see http://merkaartor.be/wiki/merkaartor/Compiling
 
-REVISION = $$system( git describe --tags )
-VERSION = $$system( git describe --tags HEAD | sed "'s/-g.*//;s/-/./g'" )
-isEmpty( REVISION ) {
-	REVISION = $$system(head -n 3 ../CHANGELOG | tail -n 1 | sed "'s/^v//'")
-	VERSION = $$REVISION
-}
+REVISION = $$system(head -n 3 ../CHANGELOG | tail -n 1 | sed "'s/^v//'")
+VERSION = $$REVISION
 
 ARCH=""
 BITS=""




--- src/ImportExport/ImportOSM.cpp.orig	2022-06-11 16:30:43 UTC
+++ src/ImportExport/ImportOSM.cpp
@@ -541,9 +541,9 @@ bool importOSM(QWidget* aParent, QIODevice& File, Docu
         }
 
         if (EmptyFeature.size()) {
-            if (QMessageBox::warning(aParent,QApplication::translate("Downloader","Empty roads/relations detected"),
+            if (QMessageBox::warning(aParent,QApplication::translate("Downloader","Empty ways/relations detected"),
                     QApplication::translate("Downloader",
-                    "Empty roads/relations are probably errors.\n"
+                    "Empty ways/relations are probably errors.\n"
                     "Do you want to mark them for deletion?"),
                     QMessageBox::Ok | QMessageBox::Cancel,
                     QMessageBox::Cancel
@@ -590,6 +590,3 @@ bool importOSM(QWidget* aParent, QByteArray& Content, 
     File.open(QIODevice::ReadOnly);
     return importOSM(aParent, File, theDocument, theLayer, theDownloader);
 }
-
-
-




--- src/Sync/DirtyList.cpp.orig	2022-06-11 16:32:14 UTC
+++ src/Sync/DirtyList.cpp
@@ -342,7 +342,7 @@ bool DirtyListDescriber::showChanges(QWidget* aParent)
 
 bool DirtyListDescriber::addRoad(Way* R)
 {
-    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD road %1").arg(R->id().numId) + userName(R), theListWidget);
+    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD way %1").arg(R->id().numId) + userName(R), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
     ++glbAdded;
     ++glbWaysAdded;
@@ -351,7 +351,7 @@ bool DirtyListDescriber::addRoad(Way* R)
 
 bool DirtyListDescriber::addPoint(Node* Pt)
 {
-    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD trackpoint %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
+    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD node %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(Pt->id()));
     ++glbAdded;
     ++glbNodesAdded;
@@ -369,7 +369,7 @@ bool DirtyListDescriber::addRelation(Relation* R)
 
 bool DirtyListDescriber::updatePoint(Node* Pt)
 {
-    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE trackpoint %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
+    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE node %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(Pt->id()));
     ++glbUpdated;
     ++glbNodesUpdated;
@@ -387,7 +387,7 @@ bool DirtyListDescriber::updateRelation(Relation* R)
 
 bool DirtyListDescriber::updateRoad(Way* R)
 {
-    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE road %1").arg(R->id().numId) + userName(R), theListWidget);
+    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE way %1").arg(R->id().numId) + userName(R), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
     ++glbUpdated;
     ++glbWaysUpdated;
@@ -396,7 +396,7 @@ bool DirtyListDescriber::updateRoad(Way* R)
 
 bool DirtyListDescriber::erasePoint(Node* Pt)
 {
-    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE trackpoint %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
+    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE node %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(Pt->id()));
     ++glbDeleted;
     ++glbNodesDeleted;
@@ -405,7 +405,7 @@ bool DirtyListDescriber::erasePoint(Node* Pt)
 
 bool DirtyListDescriber::eraseRoad(Way* R)
 {
-    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE road %1").arg(R->id().numId) + userName(R), theListWidget);
+    QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE way %1").arg(R->id().numId) + userName(R), theListWidget);
     it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
     ++glbDeleted;
     ++glbWaysDeleted;
@@ -593,9 +593,9 @@ bool DirtyListExecutor::addRoad(Way *R)
 {
     Progress->setValue(++Done);
 
-    qDebug() << QString("ADD road %1").arg(R->id().numId);
+    qDebug() << QString("ADD way %1").arg(R->id().numId);
 
-    Progress->setLabelText(tr("ADD road %1").arg(R->id().numId) + userName(R));
+    Progress->setLabelText(tr("ADD way %1").arg(R->id().numId) + userName(R));
     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
 
     QString DataIn, DataOut;
@@ -627,9 +627,9 @@ bool DirtyListExecutor::addPoint(Node* Pt)
 {
     Progress->setValue(++Done);
 
-    qDebug() << QString("ADD trackpoint %1").arg(Pt->id().numId);
+    qDebug() << QString("ADD node %1").arg(Pt->id().numId);
 
-    Progress->setLabelText(tr("ADD trackpoint %1").arg(Pt->id().numId) + userName(Pt));
+    Progress->setLabelText(tr("ADD node %1").arg(Pt->id().numId) + userName(Pt));
     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
 
     QString DataIn, DataOut;
@@ -693,9 +693,9 @@ bool DirtyListExecutor::updateRoad(Way* R)
 {
     Progress->setValue(++Done);
 
-    qDebug() << QString("UPDATE road %1").arg(R->id().numId);
+    qDebug() << QString("UPDATE way %1").arg(R->id().numId);
 
-    Progress->setLabelText(tr("UPDATE road %1").arg(R->id().numId) + userName(R));
+    Progress->setLabelText(tr("UPDATE way %1").arg(R->id().numId) + userName(R));
     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
     QString URL = theDownloader->getURLToUpdate("way",stripToOSMId(R->id()));
     QString DataIn, DataOut;
@@ -724,9 +724,9 @@ bool DirtyListExecutor::updatePoint(Node* Pt)
 {
     Progress->setValue(++Done);
 
-    qDebug() << QString("UPDATE trackpoint %1").arg(Pt->id().numId);
+    qDebug() << QString("UPDATE node %1").arg(Pt->id().numId);
 
-    Progress->setLabelText(tr("UPDATE trackpoint %1").arg(Pt->id().numId) + userName(Pt));
+    Progress->setLabelText(tr("UPDATE node %1").arg(Pt->id().numId) + userName(Pt));
     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
 //	QString URL("/api/0.3/node/%1");
 //	URL = URL.arg(stripToOSMId(Pt->id()));
@@ -757,9 +757,9 @@ bool DirtyListExecutor::erasePoint(Node *Pt)
 {
     Progress->setValue(++Done);
 
-    qDebug() << QString("REMOVE trackpoint %1").arg(Pt->id().numId);
+    qDebug() << QString("REMOVE node %1").arg(Pt->id().numId);
 
-    Progress->setLabelText(tr("REMOVE trackpoint %1").arg(Pt->id().numId) + userName(Pt));
+    Progress->setLabelText(tr("REMOVE node %1").arg(Pt->id().numId) + userName(Pt));
     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
 //	QString URL("/api/0.3/node/%1");
 //	URL = URL.arg(stripToOSMId(Pt->id()));
@@ -784,9 +784,9 @@ bool DirtyListExecutor::eraseRoad(Way *R)
 {
     Progress->setValue(++Done);
 
-    qDebug() << QString("REMOVE road %1").arg(R->id().numId);
+    qDebug() << QString("REMOVE way %1").arg(R->id().numId);
 
-    Progress->setLabelText(tr("REMOVE road %1").arg(R->id().numId) + userName(R));
+    Progress->setLabelText(tr("REMOVE way %1").arg(R->id().numId) + userName(R));
     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
 //	QString URL("/api/0.3/way/%1");
 //	URL = URL.arg(stripToOSMId(R->id()));




--- src/Sync/DirtyListExecutorOSC.cpp.orig	2022-06-11 16:33:19 UTC
+++ src/Sync/DirtyListExecutorOSC.cpp
@@ -368,9 +368,9 @@ bool DirtyListExecutorOSC::addRoad(Way *F)
 {
     Progress->setValue(++Done);
 
-    qDebug() << QString("ADD road %1").arg(F->id().numId);
+    qDebug() << QString("ADD way %1").arg(F->id().numId);
 
-    Progress->setLabelText(tr("ADD road %1").arg(F->id().numId) + userName(F));
+    Progress->setLabelText(tr("ADD way %1").arg(F->id().numId) + userName(F));
     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
 
     OscCreate(F);
@@ -383,9 +383,9 @@ bool DirtyListExecutorOSC::addPoint(Node* F)
 {
     Progress->setValue(++Done);
 
-    qDebug() << QString("ADD trackpoint %1").arg(F->id().numId);
+    qDebug() << QString("ADD node %1").arg(F->id().numId);
 
-    Progress->setLabelText(tr("ADD trackpoint %1").arg(F->id().numId) + userName(F));
+    Progress->setLabelText(tr("ADD node %1").arg(F->id().numId) + userName(F));
     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
 
     OscCreate(F);
@@ -414,9 +414,9 @@ bool DirtyListExecutorOSC::updateRoad(Way* F)
 {
     Progress->setValue(++Done);
 
-    qDebug() << QString("UPDATE road %1").arg(F->id().numId);
+    qDebug() << QString("UPDATE way %1").arg(F->id().numId);
 
-    Progress->setLabelText(tr("UPDATE road %1").arg(F->id().numId) + userName(F));
+    Progress->setLabelText(tr("UPDATE way %1").arg(F->id().numId) + userName(F));
     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
 
     OscModify(F);
@@ -428,9 +428,9 @@ bool DirtyListExecutorOSC::updatePoint(Node* F)
 {
     Progress->setValue(++Done);
 
-    qDebug() << QString("UPDATE trackpoint %1").arg(F->id().numId);
+    qDebug() << QString("UPDATE node %1").arg(F->id().numId);
 
-    Progress->setLabelText(tr("UPDATE trackpoint %1").arg(F->id().numId) + userName(F));
+    Progress->setLabelText(tr("UPDATE node %1").arg(F->id().numId) + userName(F));
     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
 
     OscModify(F);
@@ -442,9 +442,9 @@ bool DirtyListExecutorOSC::erasePoint(Node *F)
 {
     Progress->setValue(++Done);
 
-    qDebug() << QString("REMOVE trackpoint %1").arg(F->id().numId);
+    qDebug() << QString("REMOVE node %1").arg(F->id().numId);
 
-    Progress->setLabelText(tr("REMOVE trackpoint %1").arg(F->id().numId) + userName(F));
+    Progress->setLabelText(tr("REMOVE node %1").arg(F->id().numId) + userName(F));
     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
 
     OscDelete(F);
@@ -456,9 +456,9 @@ bool DirtyListExecutorOSC::eraseRoad(Way *F)
 {
     Progress->setValue(++Done);
 
-    qDebug() << QString("REMOVE road %1").arg(F->id().numId);
+    qDebug() << QString("REMOVE way %1").arg(F->id().numId);
 
-    Progress->setLabelText(tr("REMOVE road %1").arg(F->id().numId) + userName(F));
+    Progress->setLabelText(tr("REMOVE way %1").arg(F->id().numId) + userName(F));
     QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
 
     OscDelete(F);

Return to bug 264641

Added Link Here

(-)b/astro/merkaartor/files/patch-src_Config.pri (+16 lines)
1	--- src/Config.pri.orig 2022-06-11 16:26:36 UTC
2	+++ src/Config.pri
3	@@ -1,11 +1,7 @@
4	# see http://merkaartor.be/wiki/merkaartor/Compiling
5
6	-REVISION = $$system( git describe --tags )
7	-VERSION = $$system( git describe --tags HEAD \| sed "'s/-g.*//;s/-/./g'" )
8	-isEmpty( REVISION ) {
9	- REVISION = $$system(head -n 3 ../CHANGELOG \| tail -n 1 \| sed "'s/^v//'")
10	- VERSION = $$REVISION
11	-}
12	+REVISION = $$system(head -n 3 ../CHANGELOG \| tail -n 1 \| sed "'s/^v//'")
13	+VERSION = $$REVISION
14
15	ARCH=""
16	BITS=""

Added Link Here

(-)b/astro/merkaartor/files/patch-src_ImportExport_ImportOSM.cpp (+21 lines)
1	--- src/ImportExport/ImportOSM.cpp.orig 2022-06-11 16:30:43 UTC
2	+++ src/ImportExport/ImportOSM.cpp
3	@@ -541,9 +541,9 @@ bool importOSM(QWidget* aParent, QIODevice& File, Docu
4	}
5
6	if (EmptyFeature.size()) {
7	- if (QMessageBox::warning(aParent,QApplication::translate("Downloader","Empty roads/relations detected"),
8	+ if (QMessageBox::warning(aParent,QApplication::translate("Downloader","Empty ways/relations detected"),
9	QApplication::translate("Downloader",
10	- "Empty roads/relations are probably errors.\n"
11	+ "Empty ways/relations are probably errors.\n"
12	"Do you want to mark them for deletion?"),
13	QMessageBox::Ok \| QMessageBox::Cancel,
14	QMessageBox::Cancel
15	@@ -590,6 +590,3 @@ bool importOSM(QWidget* aParent, QByteArray& Content,
16	File.open(QIODevice::ReadOnly);
17	return importOSM(aParent, File, theDocument, theLayer, theDownloader);
18	}
19	-
20	-
21	-

Added Link Here

(-)b/astro/merkaartor/files/patch-src_Sync_DirtyList.cpp (+128 lines)
1	--- src/Sync/DirtyList.cpp.orig 2022-06-11 16:32:14 UTC
2	+++ src/Sync/DirtyList.cpp
3	@@ -342,7 +342,7 @@ bool DirtyListDescriber::showChanges(QWidget* aParent)
4
5	bool DirtyListDescriber::addRoad(Way* R)
6	{
7	- QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD road %1").arg(R->id().numId) + userName(R), theListWidget);
8	+ QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD way %1").arg(R->id().numId) + userName(R), theListWidget);
9	it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
10	++glbAdded;
11	++glbWaysAdded;
12	@@ -351,7 +351,7 @@ bool DirtyListDescriber::addRoad(Way* R)
13
14	bool DirtyListDescriber::addPoint(Node* Pt)
15	{
16	- QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD trackpoint %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
17	+ QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","ADD node %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
18	it->setData(Qt::UserRole, QVariant::fromValue(Pt->id()));
19	++glbAdded;
20	++glbNodesAdded;
21	@@ -369,7 +369,7 @@ bool DirtyListDescriber::addRelation(Relation* R)
22
23	bool DirtyListDescriber::updatePoint(Node* Pt)
24	{
25	- QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE trackpoint %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
26	+ QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE node %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
27	it->setData(Qt::UserRole, QVariant::fromValue(Pt->id()));
28	++glbUpdated;
29	++glbNodesUpdated;
30	@@ -387,7 +387,7 @@ bool DirtyListDescriber::updateRelation(Relation* R)
31
32	bool DirtyListDescriber::updateRoad(Way* R)
33	{
34	- QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE road %1").arg(R->id().numId) + userName(R), theListWidget);
35	+ QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","UPDATE way %1").arg(R->id().numId) + userName(R), theListWidget);
36	it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
37	++glbUpdated;
38	++glbWaysUpdated;
39	@@ -396,7 +396,7 @@ bool DirtyListDescriber::updateRoad(Way* R)
40
41	bool DirtyListDescriber::erasePoint(Node* Pt)
42	{
43	- QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE trackpoint %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
44	+ QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE node %1").arg(Pt->id().numId) + userName(Pt), theListWidget);
45	it->setData(Qt::UserRole, QVariant::fromValue(Pt->id()));
46	++glbDeleted;
47	++glbNodesDeleted;
48	@@ -405,7 +405,7 @@ bool DirtyListDescriber::erasePoint(Node* Pt)
49
50	bool DirtyListDescriber::eraseRoad(Way* R)
51	{
52	- QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE road %1").arg(R->id().numId) + userName(R), theListWidget);
53	+ QListWidgetItem* it = new QListWidgetItem(QApplication::translate("DirtyListExecutor","REMOVE way %1").arg(R->id().numId) + userName(R), theListWidget);
54	it->setData(Qt::UserRole, QVariant::fromValue(R->id()));
55	++glbDeleted;
56	++glbWaysDeleted;
57	@@ -593,9 +593,9 @@ bool DirtyListExecutor::addRoad(Way *R)
58	{
59	Progress->setValue(++Done);
60
61	- qDebug() << QString("ADD road %1").arg(R->id().numId);
62	+ qDebug() << QString("ADD way %1").arg(R->id().numId);
63
64	- Progress->setLabelText(tr("ADD road %1").arg(R->id().numId) + userName(R));
65	+ Progress->setLabelText(tr("ADD way %1").arg(R->id().numId) + userName(R));
66	QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
67
68	QString DataIn, DataOut;
69	@@ -627,9 +627,9 @@ bool DirtyListExecutor::addPoint(Node* Pt)
70	{
71	Progress->setValue(++Done);
72
73	- qDebug() << QString("ADD trackpoint %1").arg(Pt->id().numId);
74	+ qDebug() << QString("ADD node %1").arg(Pt->id().numId);
75
76	- Progress->setLabelText(tr("ADD trackpoint %1").arg(Pt->id().numId) + userName(Pt));
77	+ Progress->setLabelText(tr("ADD node %1").arg(Pt->id().numId) + userName(Pt));
78	QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
79
80	QString DataIn, DataOut;
81	@@ -693,9 +693,9 @@ bool DirtyListExecutor::updateRoad(Way* R)
82	{
83	Progress->setValue(++Done);
84
85	- qDebug() << QString("UPDATE road %1").arg(R->id().numId);
86	+ qDebug() << QString("UPDATE way %1").arg(R->id().numId);
87
88	- Progress->setLabelText(tr("UPDATE road %1").arg(R->id().numId) + userName(R));
89	+ Progress->setLabelText(tr("UPDATE way %1").arg(R->id().numId) + userName(R));
90	QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
91	QString URL = theDownloader->getURLToUpdate("way",stripToOSMId(R->id()));
92	QString DataIn, DataOut;
93	@@ -724,9 +724,9 @@ bool DirtyListExecutor::updatePoint(Node* Pt)
94	{
95	Progress->setValue(++Done);
96
97	- qDebug() << QString("UPDATE trackpoint %1").arg(Pt->id().numId);
98	+ qDebug() << QString("UPDATE node %1").arg(Pt->id().numId);
99
100	- Progress->setLabelText(tr("UPDATE trackpoint %1").arg(Pt->id().numId) + userName(Pt));
101	+ Progress->setLabelText(tr("UPDATE node %1").arg(Pt->id().numId) + userName(Pt));
102	QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
103	// QString URL("/api/0.3/node/%1");
104	// URL = URL.arg(stripToOSMId(Pt->id()));
105	@@ -757,9 +757,9 @@ bool DirtyListExecutor::erasePoint(Node *Pt)
106	{
107	Progress->setValue(++Done);
108
109	- qDebug() << QString("REMOVE trackpoint %1").arg(Pt->id().numId);
110	+ qDebug() << QString("REMOVE node %1").arg(Pt->id().numId);
111
112	- Progress->setLabelText(tr("REMOVE trackpoint %1").arg(Pt->id().numId) + userName(Pt));
113	+ Progress->setLabelText(tr("REMOVE node %1").arg(Pt->id().numId) + userName(Pt));
114	QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
115	// QString URL("/api/0.3/node/%1");
116	// URL = URL.arg(stripToOSMId(Pt->id()));
117	@@ -784,9 +784,9 @@ bool DirtyListExecutor::eraseRoad(Way *R)
118	{
119	Progress->setValue(++Done);
120
121	- qDebug() << QString("REMOVE road %1").arg(R->id().numId);
122	+ qDebug() << QString("REMOVE way %1").arg(R->id().numId);
123
124	- Progress->setLabelText(tr("REMOVE road %1").arg(R->id().numId) + userName(R));
125	+ Progress->setLabelText(tr("REMOVE way %1").arg(R->id().numId) + userName(R));
126	QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
127	// QString URL("/api/0.3/way/%1");
128	// URL = URL.arg(stripToOSMId(R->id()));

Added Link Here

(-)b/astro/merkaartor/files/patch-src_Sync_DirtyListExecutorOSC.cpp (-1 / +74 lines)
0	-	1	--- src/Sync/DirtyListExecutorOSC.cpp.orig 2022-06-11 16:33:19 UTC
		2	+++ src/Sync/DirtyListExecutorOSC.cpp
		3	@@ -368,9 +368,9 @@ bool DirtyListExecutorOSC::addRoad(Way *F)
		4	{
		5	Progress->setValue(++Done);
		6
		7	- qDebug() << QString("ADD road %1").arg(F->id().numId);
		8	+ qDebug() << QString("ADD way %1").arg(F->id().numId);
		9
		10	- Progress->setLabelText(tr("ADD road %1").arg(F->id().numId) + userName(F));
		11	+ Progress->setLabelText(tr("ADD way %1").arg(F->id().numId) + userName(F));
		12	QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
		13
		14	OscCreate(F);
		15	@@ -383,9 +383,9 @@ bool DirtyListExecutorOSC::addPoint(Node* F)
		16	{
		17	Progress->setValue(++Done);
		18
		19	- qDebug() << QString("ADD trackpoint %1").arg(F->id().numId);
		20	+ qDebug() << QString("ADD node %1").arg(F->id().numId);
		21
		22	- Progress->setLabelText(tr("ADD trackpoint %1").arg(F->id().numId) + userName(F));
		23	+ Progress->setLabelText(tr("ADD node %1").arg(F->id().numId) + userName(F));
		24	QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
		25
		26	OscCreate(F);
		27	@@ -414,9 +414,9 @@ bool DirtyListExecutorOSC::updateRoad(Way* F)
		28	{
		29	Progress->setValue(++Done);
		30
		31	- qDebug() << QString("UPDATE road %1").arg(F->id().numId);
		32	+ qDebug() << QString("UPDATE way %1").arg(F->id().numId);
		33
		34	- Progress->setLabelText(tr("UPDATE road %1").arg(F->id().numId) + userName(F));
		35	+ Progress->setLabelText(tr("UPDATE way %1").arg(F->id().numId) + userName(F));
		36	QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
		37
		38	OscModify(F);
		39	@@ -428,9 +428,9 @@ bool DirtyListExecutorOSC::updatePoint(Node* F)
		40	{
		41	Progress->setValue(++Done);
		42
		43	- qDebug() << QString("UPDATE trackpoint %1").arg(F->id().numId);
		44	+ qDebug() << QString("UPDATE node %1").arg(F->id().numId);
		45
		46	- Progress->setLabelText(tr("UPDATE trackpoint %1").arg(F->id().numId) + userName(F));
		47	+ Progress->setLabelText(tr("UPDATE node %1").arg(F->id().numId) + userName(F));
		48	QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
		49
		50	OscModify(F);
		51	@@ -442,9 +442,9 @@ bool DirtyListExecutorOSC::erasePoint(Node *F)
		52	{
		53	Progress->setValue(++Done);
		54
		55	- qDebug() << QString("REMOVE trackpoint %1").arg(F->id().numId);
		56	+ qDebug() << QString("REMOVE node %1").arg(F->id().numId);
		57
		58	- Progress->setLabelText(tr("REMOVE trackpoint %1").arg(F->id().numId) + userName(F));
		59	+ Progress->setLabelText(tr("REMOVE node %1").arg(F->id().numId) + userName(F));
		60	QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
		61
		62	OscDelete(F);
		63	@@ -456,9 +456,9 @@ bool DirtyListExecutorOSC::eraseRoad(Way *F)
		64	{
		65	Progress->setValue(++Done);
66
67	- qDebug() << QString("REMOVE road %1").arg(F->id().numId);
68	+ qDebug() << QString("REMOVE way %1").arg(F->id().numId);
69
70	- Progress->setLabelText(tr("REMOVE road %1").arg(F->id().numId) + userName(F));
71	+ Progress->setLabelText(tr("REMOVE way %1").arg(F->id().numId) + userName(F));
72	QEventLoop L; L.processEvents(QEventLoop::ExcludeUserInputEvents);
73
74	OscDelete(F);