From 41b62c6bfeeb670cc4a871d10bd69a1417eb3241 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Tue, 28 Aug 2018 10:42:33 +0200
Subject: [PATCH] [xml] Removed writing of web-based xsd reference in GML and
STN files.
---
Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp | 3 ---
GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp | 2 --
GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp | 1 -
GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp | 1 -
.../TestPolyline.gml | 4 ++--
.../set-properties-in-polygonal-region/Regions.gml | 4 ++--
.../set-properties-in-polygonal-region/TestPolylines.gml | 4 ++--
7 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
index 9b313402a2c..29fcbdf5439 100644
--- a/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
+++ b/Applications/FileIO/XmlIO/Qt/XmlPrjInterface.cpp
@@ -313,9 +313,6 @@ bool XmlPrjInterface::write()
QDomElement root = doc.createElement("OpenGeoSysProject");
root.setAttribute("xmlns:ogs", "http://www.opengeosys.org");
root.setAttribute("xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
- root.setAttribute(
- "xsi:noNamespaceSchemaLocation",
- "https://www.opengeosys.org/images/xsd/OpenGeoSysProject.xsd");
doc.appendChild(root);
diff --git a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp
index 2b6b60696cb..4db9cc4ad5a 100644
--- a/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp
+++ b/GeoLib/IO/XmlIO/Boost/BoostXmlGmlInterface.cpp
@@ -283,8 +283,6 @@ bool BoostXmlGmlInterface::write()
// put header in property tree
pt.put("<xmlattr>.xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance");
- pt.put("<xmlattr>.xsi:noNamespaceSchemaLocation",
- "https://www.opengeosys.org/images/xsd/OpenGeoSysGLI.xsd");
pt.put("<xmlattr>.xmlns:ogs", "http://www.opengeosys.net");
auto& geometry_set = pt.add("OpenGeoSysGLI", "");
diff --git a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
index 0bbcd9ce59c..31b59e35967 100644
--- a/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
+++ b/GeoLib/IO/XmlIO/Qt/XmlGmlInterface.cpp
@@ -314,7 +314,6 @@ bool XmlGmlInterface::write()
QDomElement root = doc.createElement("OpenGeoSysGLI");
root.setAttribute( "xmlns:ogs", "http://www.opengeosys.org" );
root.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
- root.setAttribute( "xsi:noNamespaceSchemaLocation", "https://www.opengeosys.org/images/xsd/OpenGeoSysGLI.xsd" );
doc.appendChild(root);
diff --git a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp
index ac35e4048f4..25d33cf38ee 100644
--- a/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp
+++ b/GeoLib/IO/XmlIO/Qt/XmlStnInterface.cpp
@@ -208,7 +208,6 @@ bool XmlStnInterface::write()
QDomElement root = doc.createElement("OpenGeoSysSTN");
root.setAttribute( "xmlns:ogs", "http://www.opengeosys.org" );
root.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
- root.setAttribute( "xsi:noNamespaceSchemaLocation", "https://www.opengeosys.org/images/xsd/OpenGeoSysSTN.xsd" );
const std::vector<GeoLib::Point*>* stations (_geo_objs.getStationVec(_exportName));
bool isBorehole = static_cast<GeoLib::Station*>((*stations)[0])->type() ==
diff --git a/web/content/docs/tools/model-preparation/map-geometric-object-to-the-surface-of-a-mesh/TestPolyline.gml b/web/content/docs/tools/model-preparation/map-geometric-object-to-the-surface-of-a-mesh/TestPolyline.gml
index e31cb24b8a8..39d4392344d 100644
--- a/web/content/docs/tools/model-preparation/map-geometric-object-to-the-surface-of-a-mesh/TestPolyline.gml
+++ b/web/content/docs/tools/model-preparation/map-geometric-object-to-the-surface-of-a-mesh/TestPolyline.gml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:389bd8ddd06904ff40401050ae16adb22f47d771a6d52643231bf182d7342327
-size 523
+oid sha256:63eed468d1305baa1910c0702daefb7ad1da84d108ea20e620ca0ad708f06771
+size 420
diff --git a/web/content/docs/tools/model-preparation/set-properties-in-polygonal-region/Regions.gml b/web/content/docs/tools/model-preparation/set-properties-in-polygonal-region/Regions.gml
index 07883b10e18..94ccc12bb22 100644
--- a/web/content/docs/tools/model-preparation/set-properties-in-polygonal-region/Regions.gml
+++ b/web/content/docs/tools/model-preparation/set-properties-in-polygonal-region/Regions.gml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:81f2f7b0571faa6109ffb7a1608f38606c355ca12a6101ebdd775c938ecb21d2
-size 1149
+oid sha256:9e13b0e21d013f40491db408e5cebe2aeb8bda1f34469691b95103afc84331a4
+size 1079
diff --git a/web/content/docs/tools/model-preparation/set-properties-in-polygonal-region/TestPolylines.gml b/web/content/docs/tools/model-preparation/set-properties-in-polygonal-region/TestPolylines.gml
index ff985bc4eed..e11f83ef7fa 100644
--- a/web/content/docs/tools/model-preparation/set-properties-in-polygonal-region/TestPolylines.gml
+++ b/web/content/docs/tools/model-preparation/set-properties-in-polygonal-region/TestPolylines.gml
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:553e47bcc7dd7f1fe30e65940c18a24d264a6d9406669a9a82127feae5d9ee6d
-size 2560
+oid sha256:0af2bdb7ccd9362e3834851e371a9d1863cb97c33ebb17c4ad0ed38c0a569766
+size 2490
--
GitLab